merge master

.github/CODEOWNERS

@@ -0,0 +1,8 @@
+#
+# https://help.github.com/articles/about-codeowners/
+#
+
+/php/       @zhangchunsheng
+/python/    @wj-Mcat
+/java/      @diaozxin007
+/go/        @dchaofei

.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 }}

.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:

.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

.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

.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

.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

.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

.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

.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/

.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,
 
 }
 

NOTICE

@@ -0,0 +1,8 @@
+Chatie GRPC Service
+Copyright 2016 Huan LI (李卓桓) <zixia@zixia.net>
+
+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.