Merge branch 'main' into feat-post-publish

.github/workflows/go.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up Go 1.17
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
       id: go
     - name: Install Protoc
       uses: arduino/setup-protoc@v1
@@ -52,7 +52,7 @@ jobs:
     - name: Set up Go 1.17
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - name: Install Protoc
       uses: arduino/setup-protoc@v1
     - name: Check out code into the Go module directory

.github/workflows/node.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
 
@@ -54,7 +54,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
@@ -86,7 +86,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
       - name: Install Protoc 3rd party protos

.github/workflows/php.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
       id: go
     - name: Install Dependencies
       run: |

.github/workflows/python.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - uses: actions/cache@master
       with:
         path: ~/.cache/pip
@@ -62,7 +62,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - uses: actions/cache@master
         with:
@@ -103,7 +103,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - uses: actions/cache@master
         with:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-grpc",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "gRPC for Wechaty",
   "type": "module",
   "exports": {

proto/wechaty/puppet.proto

@@ -29,6 +29,7 @@ import "wechaty/puppet/room-member.proto";
 import "wechaty/puppet/room.proto";
 import "wechaty/puppet/tag.proto";
 import "wechaty/puppet/post.proto";
+import "wechaty/puppet/conversation.proto";
 
 option java_package="io.github.wechaty.grpc";
 option go_package="github.com/wechaty/go-grpc/wechaty";
@@ -359,6 +360,18 @@ service Puppet {
     };
   }
 
+  /**
+   *
+   * Conversation
+   *
+   */
+  rpc ConversationRead (puppet.ConversationReadRequest) returns (puppet.ConversationReadResponse) {
+    option (google.api.http) = {
+      put: "/conversation/{conversation_id}/read"
+      body: "*"
+    };
+  }
+
   /**
    *
    * Room

proto/wechaty/puppet/conversation.proto

@@ -0,0 +1,15 @@
+syntax = "proto3";
+package wechaty.puppet;
+
+option go_package="github.com/wechaty/go-grpc/wechaty/puppet";
+option java_package="io.github.wechaty.grpc.puppet";
+option csharp_namespace = "github.wechaty.grpc.puppet";
+
+message ConversationReadRequest {
+  string conversation_id = 1;
+  bool   has_read        = 2;
+}
+
+message ConversationReadResponse {
+  bool has_read = 1;
+}

proto/wechaty/puppet/event.proto

@@ -27,6 +27,8 @@ enum EventType {
   EVENT_TYPE_LOGIN       = 25;
   EVENT_TYPE_LOGOUT      = 26;
   EVENT_TYPE_DIRTY       = 27;
+
+  EVENT_TYPE_ROOM_ANNOUNCE = 32;
 }
 
 message EventRequest {}

proto/wechaty/puppet/message.proto

@@ -36,6 +36,10 @@ enum MessageType {
   MESSAGE_TYPE_RED_ENVELOPE = 12;
   MESSAGE_TYPE_RECALLED     = 13;
   MESSAGE_TYPE_URL          = 14;
+  MESSAGE_TYPE_GROUP_NOTE   = 15;
+  MESSAGE_TYPE_POST         = 16;
+
+  MESSAGE_TYPE_SYSTEM       = 18;
 }
 
 message MessagePayloadRequest {

proto/wechaty/puppet/room.proto

@@ -27,8 +27,9 @@ message RoomPayloadResponse {
 
 message RoomAddRequest {
   string id = 1;
-  string contact_id = 2;
+  string contact_id = 2 [deprecated = true];
   bool   invite_only = 3;
+  repeated string contact_ids = 4;
 }
 message RoomAddResponse {}
 
@@ -49,7 +50,8 @@ message RoomCreateResponse {
 
 message RoomDelRequest {
   string id = 1;
-  string contact_id = 2;
+  string contact_id = 2 [deprecated = true];
+  repeated string contact_ids = 3;
 }
 message RoomDelResponse {}
 

scripts/install-protoc.sh

@@ -32,14 +32,10 @@ function check_protoc_version () {
   majorVer=$(echo $protocVersion | cut -d. -f 1)
   minorVer=$(echo $protocVersion | cut -d. -f 2)
 
-  (($majorVer == 3)) || {
-    echo "protoc major version must >= 3 (the installed version is $protocVersion)"
-    exit 1
-  }
-
   # https://github.com/wechaty/grpc/issues/109
-  (($minorVer >= 17)) || {
-    echo "protoc minor version must >= 17 (the installed version is $protocVersion)"
+
+  ((($majorVer == 3 && $minorVer >= 17) || $majorVer > 3)) || {
+    echo "protoc version must >= 3.17 (the installed version is $protocVersion)"
     exit 1
   }
 

tests/puppet-server-impl.ts

@@ -391,4 +391,10 @@ export const puppetServerImpl: IPuppetServer = {
     throw new Error('not implemented.')
   },
 
+  conversationRead: (call, callback) => {
+    void call
+    void callback
+    throw new Error('not implemented.')
+  },
+
 }

tsconfig.json

@@ -2,6 +2,9 @@
   "extends": "@chatie/tsconfig",
   "compilerOptions": {
     "outDir": "dist/esm",
+    "verbatimModuleSyntax": false,
+    // See: https://github.com/wechaty/wechaty/issues/2551
+    "ignoreDeprecations": "5.0"
   },
   "exclude": [
     "node_modules/",