merge master 0.20.19 (#1)

* fix: correct spell mistakes * 0.13.10 * This is a breaking change! * change python proto package name * update the version of chatie_grpc * try to install request (grpc/grpc-node#922 (comment)) * 0.15.2 * add grpc debug client link * update setup.py to fix pypi bug (wechaty#59) * update setup to fix pypi bug * change chatie-grpc generated dir * 0.15.2 * 0.15.3 (wechaty#60) * keep the package dir name in site-packages as `chatie_grpc` (wechaty#62) * 0.15.3 * keep package name as chatie_grpc not chatie-grpc * 0.15.4 (wechaty#63) * deploy release jar (wechaty#61) * fix maven,deploy jar to center oss * fix maven,deploy jar to center oss * add java to README.md * use better relative path for proto_path (zxh0/vscode-proto3#31 (comment)) * 0.15.5 * update pypi install_requires config (wechaty#64) * 0.15.4 * add install_requires * 0.15.5 * 0.15.6 * add NOTICE * 0.13.10 * 0.16.0 * 0.16.1 * Bump @chatie/tsconfig from 0.8.0 to 0.10.1 (wechaty#70) Bumps [@chatie/tsconfig](https://github.com/Chatie/tsconfig) from 0.8.0 to 0.10.1. - [Release notes](https://github.com/Chatie/tsconfig/releases) - [Commits](https://github.com/Chatie/tsconfig/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump grpc_tools_node_protoc_ts from 2.5.11 to 4.0.0 (wechaty#69) Bumps [grpc_tools_node_protoc_ts](https://github.com/agreatfool/grpc_tools_node_protoc_ts) from 2.5.11 to 4.0.0. - [Release notes](https://github.com/agreatfool/grpc_tools_node_protoc_ts/releases) - [Commits](agreatfool/grpc_tools_node_protoc_ts@v2.5.11...v4.0.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump @chatie/git-scripts from 0.2.5 to 0.6.2 (wechaty#68) Bumps [@chatie/git-scripts](https://github.com/Chatie/git-scripts) from 0.2.5 to 0.6.2. - [Release notes](https://github.com/Chatie/git-scripts/releases) - [Commits](https://github.com/Chatie/git-scripts/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Update betterproto (wechaty#46) * specify python v3 * 0.16.2 * add php rpc (wechaty#76) * add php grpc * update usage * update usage * update usage * update * update usage * add php rpc * add PHP Grpc & maintainers * 0.16.3 * add all codeowners for languages * 0.16.4 * Bump @chatie/eslint-config from 0.8.1 to 0.12.1 (wechaty#75) Bumps [@chatie/eslint-config](https://github.com/Chatie/eslint-config) from 0.8.1 to 0.12.1. - [Release notes](https://github.com/Chatie/eslint-config/releases) - [Commits](https://github.com/Chatie/eslint-config/commits) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * fix eslint * 0.16.5 * add php action (wechaty#78) * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * add php action * tune layout for source code * Update README.md * v0.17 * fix to v0.17 * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * fix github url * 0.16.2 * 0.17.1 * add dirty rpc function definition for sync data (wechaty#79) * add dirty rpc function definition for sync data * try to fix tests * add rpc roomMemberPayloadDirty * add dirty event type * revise code according to comments * modify dirty methods and event * try to fix build * modify code according to review * fix build * hope this is the final build fix * this must be the final final build fix * fix proto naming convention * change property name according to comment * Update package.json * Update package.json Co-authored-by: Huan (李卓桓) <[email protected]> * add contact phone rpc call definition (wechaty#80) * add more methods related to new wechaty-puppept update (wechaty#81) * add more methods related to new wechaty-puppept update * fix test * fix typo and order * 0.17.3 * fix request structure according to comments * add phone to contact payload (wechaty#82) * bump version to publish new changes (wechaty#83) * add csharp nuget (wechaty#84) * proto add csharp namespace * add csharp solution * update * csharp add build powshell * Create csharp.yml * update csharp.yaml * update copy.ps1 * add test * test * update common.ps1 * test action args key * test powshell args * test github Secrets * update yaml * update nuget package as rohith/publish-nuget@v2 * update version info * github action add nuget VERSION_FILE_PATH * chsarp github action over * recovery github action * clear * update gitgnore * delete .vs folder * update README.md for csharp * README.md update csharp grpc doc * README.md add nuget introduction * add file stream and image stream rpc call (wechaty#88) * add file stream and image stream rpc call * fix test * 0.17.5 * add imageType to MessageImageStreamRequest * add @deprecated to MessageFile and MessageImage rpc * add change history in readme * 0.18.0 * Bump grpc_tools_node_protoc_ts from 4.1.5 to 5.0.0 (wechaty#87) Bumps [grpc_tools_node_protoc_ts](https://github.com/agreatfool/grpc_tools_node_protoc_ts) from 4.1.5 to 5.0.0. - [Release notes](https://github.com/agreatfool/grpc_tools_node_protoc_ts/releases) - [Commits](agreatfool/grpc_tools_node_protoc_ts@v4.1.5...v5.0.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump ts-protoc-gen from 0.12.0 to 0.13.0 (wechaty#86) Bumps [ts-protoc-gen](https://github.com/improbable-eng/ts-protoc-gen) from 0.12.0 to 0.13.0. - [Release notes](https://github.com/improbable-eng/ts-protoc-gen/releases) - [Changelog](https://github.com/improbable-eng/ts-protoc-gen/blob/master/CHANGELOG.md) - [Commits](improbable-eng/ts-protoc-gen@0.12.0...0.13.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Send message stream (wechaty#89) * add sendFileStream rpc call * add sendFileStream into puppet server impl * add readme * 0.18.1 * change filebox to data with bytes type * add name attribute into stream request and response * Fix go ci (wechaty#91) * Fix go ci * Update go.yml * add go_package * debug github action * debug github action * debug github action * keep the latest betterproto version (wechaty#92) * Use metadata (wechaty#93) * use metadata send extra info, remove extra attributes in stream message * 0.18.2 * use common message to send FileBox * rename FileBoxMessage to FileBoxChunk * use data instead of chunk * 0.18.3 * Update README.md * Improve stream message (wechaty#95) * improve stream message definition * 0.18.4 * change names * wip... * normalize name * 0.18.5 * normalize name * 0.18.6 * rename request & responses for more robust * clean name * 0.18.7 Co-authored-by: Huan LI (李卓桓) <[email protected]> * Export file box (wechaty#98) * export filebox from generated ts file * 0.18.8 * add some stream notices comments * 0.18.9 * fix file rename * 0.18.10 * link to wechaty#99 * 0.18.11 * fix go-grpc generate failed (wechaty#101) * 0.18.12 * fix .net grpc for the new file file_box.proto and update TargetFramework to netstandard2.0 (wechaty#104) * init openapi * Rename & Add OpenAPI Specification Generator (wechaty#107) * rename npm name to wechaty-grpc (wechaty#106) * add grpc http annotations (wip) * add grpc gateway image * add swagger info annotation * make payload dirty restful * fix name * add more restful endpoint definitions * fix streaming methods * better protoc tools installer script * clean openapi scripts * rename src/index -> src/mod * generate proto js files with annotation * 0.19.1 * add gRPC Web example * 0.19.2 * wechaty-grpc v0.20 * 0.20.1 * lint * check protoc version to make sure >= 3.5 (wechaty#116) * test ok * upgrade all deps * add more node version for testing * 0.20.2 * use @master version of github actions, enable cache * install 3rd party protos * 0.20.3 * fix npm publish * 0.20.4 * add openApi & proto for export (wechaty#119) * add openApi & proto for export * open-api -> openapi * 0.20.5 * Pypi rename wechaty grpc (wechaty#118) * follow latest grpc proto annotations & rename * deprecate merge-rpoto.sh (wechaty#46) * install third party proto files * 0.20.5 * install proto by github actions * 0.20.6 * add cache for pypi install * 0.20.7 * use abs path for install * 0.20.8 * explicit python3 & pip3 * 0.20.9 * 0.20.10 * 0.20.11 * sync swagger version to gRPC * 0.20.12 * compatible with grpc-dynamic-gateway (konsumer/grpc-dynamic-gateway#50) * cean * fix * 0.20.13 * use proto full path & fix openapi * 0.20.14 * fix python proto path * 0.20.15 * add openapi link * 0.20.16 * a workaround to fix issue wechaty#120 * clean * 0.20.17 * fix name * 0.20.18 * specify beta version for install * 0.20.19 Co-authored-by: Huan (李卓桓) <[email protected]> Co-authored-by: wj-Mcat <[email protected]> Co-authored-by: 犀利豆 <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: 一路向北 <[email protected]> Co-authored-by: Yuan Gao <[email protected]> Co-authored-by: Darren <[email protected]> Co-authored-by: 小雨 <[email protected]> Co-authored-by: Chao Fei <[email protected]>
su-chang · Mar 9, 2021 · f10b0c5 · f10b0c5
1 parent db6a491
commit f10b0c5
Show file tree

Hide file tree

Showing 69 changed files with 1,815 additions and 347 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,8 @@
+#
+# https://help.github.com/articles/about-codeowners/
+#
+
+/php/       @zhangchunsheng
+/python/    @wj-Mcat
+/java/      @diaozxin007
+/go/        @dchaofei
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -0,0 +1,26 @@
+name: "csharp"
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  build-push:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-dotnet@master
+      with:
+        dotnet-version: 3.1.100 
+
+    - name: copy wechaty proto
+      run: .\copy.ps1
+      working-directory: .\csharp\Wechaty.Grpc\buildTool
+      shell: powershell
+
+    - name: publish on version change
+      uses: rohith/publish-nuget@v2
+      with:
+        PROJECT_FILE_PATH: .\csharp\Wechaty.Grpc\Wechaty.Grpc.csproj
+        VERSION_FILE_PATH: .\csharp\Wechaty.Grpc\common.props
+        NUGET_KEY: ${{ secrets.NUGET_APIKEY }}
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -30,6 +30,8 @@ jobs:
       run: |
         cd go
         make generate
+        rm -rf `go env GOPATH`/src/github.com/wechaty/go-grpc/wechaty
+        ln -s `pwd`/generated/wechaty/ `go env GOPATH`/src/github.com/wechaty/go-grpc/wechaty
         go build -v generated/wechaty/puppet.pb.go
 
   publish:

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -22,7 +22,7 @@ jobs:
         settings-path: ${{ github.workspace }} # location for the settings.xml file
 
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package --file java/pom.xml
 
     - name: Publish to GitHub Packages Apache Maven
       run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -21,4 +21,4 @@ jobs:
       with:
         java-version: 1.8
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package --file java/pom.xml
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -14,31 +14,34 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-        node-version: [10.x, 11.x, 12.x]
+        node-version: [10.x, 11.x, 12.x, 14.x, 15]
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@master
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@master
       with:
         node-version: ${{ matrix.node-version }}
-    - name: Set up Go 1.14
+    - name: Set up Go
       uses: actions/setup-go@master
-      with:
-        stable: false
-        go-version: 1.14
       id: go
 
     - name: Install Protoc
       uses: arduino/setup-protoc@master
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+    - uses: actions/cache@master
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
     - name: Install Dependencies
       run: |
         npm install
-        npm run install:lint:protoc
+        npm run install:protoc
 
     - name: Generate gRPC Stubs
       run: npm run generate

diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -7,24 +7,27 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@master
       - name: Use Node.js 12
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@master
         with:
           node-version: 12
-      - name: Set up Go 1.14
+      - name: Set up Go
         uses: actions/setup-go@master
-        with:
-          stable: false
-          go-version: 1.14
         id: go
       - name: Install Protoc
         uses: arduino/setup-protoc@master
 
+      - uses: actions/cache@master
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
       - name: Install Dependencies
         run: |
           npm install
-          npm run install:lint:protoc
+          npm run install:protoc
 
       - name: Generate gRPC Stubs
         run: npm run generate
@@ -37,13 +40,24 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@master
         with:
           node-version: 12
+      - uses: actions/cache@master
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+      - name: Set up Go
+        uses: actions/setup-go@master
+        id: go
 
       - name: Install Protoc
         uses: arduino/setup-protoc@master
+      - name: Install Protoc 3rd party protos
+        run: npm run install:protoc
 
       - name: Install Dependencies
         run: npm install
@@ -60,13 +74,22 @@ jobs:
     needs: [build, pack]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@master
         with:
           node-version: 12
           registry-url: https://registry.npmjs.org/
+      - uses: actions/cache@master
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
       - name: Install Protoc
         uses: arduino/setup-protoc@master
+      - name: Install Protoc 3rd party protos
+        run: npm run install:protoc
 
       - name: Install Dependencies
         run: npm install

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -0,0 +1,40 @@
+# For more information see: https://docs.github.com/en/actions/getting-started-with-github-actions
+# For more setup-php see: https://github.com/shivammathur/setup-php
+# For more setup-php protoc see: https://github.com/shivammathur/setup-php/issues/262
+
+name: PHP
+
+on: [push, pull_request]
+
+jobs:
+  run:
+    name: Run
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ubuntu-20.04]
+        php-versions: ['7.4']
+    env:
+      extensions: xml, opcache, xdebug, pcov, grpc-1.30.0, protobuf-3.12.2
+      key: cache-v3
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup PHP with extensions and custom config
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
+        extensions: ${{ env.extensions }}
+        ini-values: post_max_size=256M, short_open_tag=On, date.timezone=Asia/Shanghai
+        tools: protoc, grpc_php_plugin
+    - name: Testing PHP version
+      run: |
+        php -v
+        php -r "if(strpos(phpversion(), '${{ matrix.php-versions }}') === false) {throw new Exception('Wrong PHP version Installed');}"
+    - name: Test grpc_php_plugin and protoc
+      run: |
+        protoc --version
+        cd php
+        make generate
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -8,21 +8,31 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.7]
 
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: 3.9
+    - uses: actions/cache@master
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('python/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install Protoc
+      uses: arduino/setup-protoc@master
+    - name: Install Protoc 3rd party protos
+      run: scripts/install-protoc.sh
+
     - name: Install dependencies
       run: |
         cd python
         python -m pip install --upgrade pip
-        pip install -r requirements.txt
-        pip install -r requirements-dev.txt
+        make install
     - name: Test
       run: |
         cd python
@@ -37,7 +47,19 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v1
         with:
-          python-version: 3.7
+          python-version: 3.9
+      - uses: actions/cache@master
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('python/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@master
+      - name: Install Protoc 3rd party protos
+        run: scripts/install-protoc.sh
+
       - name: Install dependencies
         run: |
           cd python
@@ -61,12 +83,24 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.9'
+      - uses: actions/cache@master
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('python/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@master
+      - name: Install Protoc 3rd party protos
+        run: scripts/install-protoc.sh
+
       - name: Install dependencies
         run: |
           cd python
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine
+          pip3 install setuptools wheel twine
 
       - name: Check Branch
         id: check-branch
@@ -85,7 +119,7 @@ jobs:
           make install
           make generate
           make dist
-          python setup.py sdist bdist_wheel
+          python3 setup.py sdist bdist_wheel
           twine upload --skip-existing dist/*
 
       - name: Is Not A Publish Branch

diff --git a/.gitignore b/.gitignore
@@ -75,3 +75,20 @@ t.*
 
 .idea
 target/
+
+# csharp
+*.nupkg
+.vs/
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+csharp/Wechaty.Grpc/.vs/
+csharp/Wechaty.Grpc/proto
+csharp/Wechaty.Grpc/obj/
+csharp/Wechaty.Grpc/bin/
+csharp/Wechaty.Grpc/nupkg/package/
+csharp/Wechaty.Grpc/Properties
+
+third-party/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -55,7 +55,7 @@
   },
   "protoc": {
     "options": [
-        "--proto_path=protobuf"
+      "--proto_path=source_relative"  // https://github.com/zxh0/vscode-proto3/issues/31#issuecomment-628162495
     ],
   },
   "alignment": {
@@ -75,6 +75,14 @@
     "javascript",
     "typescript",
   ],
+  "cSpell.words": [
+    "PYPI",
+    "bdist",
+    "proto",
+    "sdist",
+    "setuptools"
+  ],
+  "python.linting.pylintEnabled": true,
 
 }
 
diff --git a/NOTICE b/NOTICE
@@ -0,0 +1,8 @@
+Chatie GRPC Service
+Copyright 2016 Huan LI (李卓桓) <[email protected]>
+
+This product includes software developed at
+The Chatie Organization (https://github.com/chatie).
+
+This software contains code derived from the Stackoverflow,
+including various modifications by GitHub.