@juzi/wechaty-puppet-service 1.0.50 → 1.0.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/dist/cjs/src/client/duck/reducers.d.ts +1 -1
  2. package/dist/cjs/src/client/duck/reducers.d.ts.map +1 -1
  3. package/dist/cjs/src/client/grpc-manager.d.ts +2 -2
  4. package/dist/cjs/src/client/grpc-manager.d.ts.map +1 -1
  5. package/dist/cjs/src/client/grpc-manager.js +11 -4
  6. package/dist/cjs/src/client/grpc-manager.js.map +1 -1
  7. package/dist/cjs/src/client/payload-store.d.ts +1 -0
  8. package/dist/cjs/src/client/payload-store.d.ts.map +1 -1
  9. package/dist/cjs/src/client/payload-store.js +6 -0
  10. package/dist/cjs/src/client/payload-store.js.map +1 -1
  11. package/dist/cjs/src/client/puppet-service.d.ts +2 -1
  12. package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
  13. package/dist/cjs/src/client/puppet-service.js +17 -2
  14. package/dist/cjs/src/client/puppet-service.js.map +1 -1
  15. package/dist/cjs/src/file-box-helper/uuidify-file-box-grpc.d.ts +1 -1
  16. package/dist/cjs/src/file-box-helper/uuidify-file-box-grpc.d.ts.map +1 -1
  17. package/dist/cjs/src/file-box-helper/uuidify-file-box-local.d.ts +1 -1
  18. package/dist/cjs/src/file-box-helper/uuidify-file-box-local.d.ts.map +1 -1
  19. package/dist/cjs/src/package-json.d.ts.map +1 -1
  20. package/dist/cjs/src/package-json.js +3 -2
  21. package/dist/cjs/src/package-json.js.map +1 -1
  22. package/dist/cjs/src/server/grpc-error.d.ts +1 -1
  23. package/dist/cjs/src/server/grpc-error.d.ts.map +1 -1
  24. package/dist/cjs/src/utils/pb-payload-helper.js +1 -1
  25. package/dist/cjs/src/utils/pb-payload-helper.js.map +1 -1
  26. package/dist/cjs/tests/uuid-file-box.spec.js +2 -1
  27. package/dist/cjs/tests/uuid-file-box.spec.js.map +1 -1
  28. package/dist/esm/src/client/duck/reducers.d.ts +1 -1
  29. package/dist/esm/src/client/duck/reducers.d.ts.map +1 -1
  30. package/dist/esm/src/client/grpc-manager.d.ts +2 -2
  31. package/dist/esm/src/client/grpc-manager.d.ts.map +1 -1
  32. package/dist/esm/src/client/grpc-manager.js +11 -4
  33. package/dist/esm/src/client/grpc-manager.js.map +1 -1
  34. package/dist/esm/src/client/payload-store.d.ts +1 -0
  35. package/dist/esm/src/client/payload-store.d.ts.map +1 -1
  36. package/dist/esm/src/client/payload-store.js +6 -0
  37. package/dist/esm/src/client/payload-store.js.map +1 -1
  38. package/dist/esm/src/client/puppet-service.d.ts +2 -1
  39. package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
  40. package/dist/esm/src/client/puppet-service.js +17 -2
  41. package/dist/esm/src/client/puppet-service.js.map +1 -1
  42. package/dist/esm/src/file-box-helper/uuidify-file-box-grpc.d.ts +1 -1
  43. package/dist/esm/src/file-box-helper/uuidify-file-box-grpc.d.ts.map +1 -1
  44. package/dist/esm/src/file-box-helper/uuidify-file-box-local.d.ts +1 -1
  45. package/dist/esm/src/file-box-helper/uuidify-file-box-local.d.ts.map +1 -1
  46. package/dist/esm/src/package-json.d.ts.map +1 -1
  47. package/dist/esm/src/package-json.js +3 -2
  48. package/dist/esm/src/package-json.js.map +1 -1
  49. package/dist/esm/src/server/grpc-error.d.ts +1 -1
  50. package/dist/esm/src/server/grpc-error.d.ts.map +1 -1
  51. package/dist/esm/src/utils/pb-payload-helper.js +1 -1
  52. package/dist/esm/src/utils/pb-payload-helper.js.map +1 -1
  53. package/dist/esm/tests/uuid-file-box.spec.js +2 -1
  54. package/dist/esm/tests/uuid-file-box.spec.js.map +1 -1
  55. package/package.json +3 -2
  56. package/src/client/grpc-manager.ts +12 -4
  57. package/src/client/payload-store.ts +14 -5
  58. package/src/client/puppet-service.ts +21 -3
  59. package/src/package-json.ts +3 -2
  60. package/src/utils/pb-payload-helper.ts +1 -1
package/dist/esm/src/package-json.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,MAAM,EAAE,8BAA8B;IACtC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,4BAA4B;IAC3C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,uCAAuC;QAC/C,eAAe,EAAE,8DAA8D;QAC/E,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,OAAO,EAAE,8FAA8F;QACvG,MAAM,EAAE,mCAAmC;QAC3C,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,8HAA8H;QAC3I,SAAS,EAAE,qEAAqE;KACjF;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,2DAA2D;KACnE;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,MAAM;QACN,QAAQ;QACR,KAAK;KACN;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,0DAA0D;KAClE;IACD,UAAU,EAAE,0DAA0D;IACtE,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,QAAQ;QAC5B,sBAAsB,EAAE,SAAS;QACjC,2BAA2B,EAAE,QAAQ;QACrC,wBAAwB,EAAE,SAAS;QACnC,kBAAkB,EAAE,QAAQ;QAC5B,eAAe,EAAE,QAAQ;QACzB,aAAa,EAAE,QAAQ;QACvB,aAAa,EAAE,QAAQ;QACvB,WAAW,EAAE,QAAQ;QACrB,SAAS,EAAE,OAAO;QAClB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,mBAAmB;QACpC,eAAe,EAAE,SAAS;QAC1B,qBAAqB,EAAE,QAAQ;KAChC;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,oBAAoB,EAAE,SAAS;QAC/B,qBAAqB,EAAE,QAAQ;QAC/B,aAAa,EAAE,QAAQ;QACvB,OAAO,EAAE,QAAQ;QACjB,UAAU,EAAE,QAAQ;QACpB,aAAa,EAAE,QAAQ;QACvB,QAAQ,EAAE,SAAS;QACnB,kBAAkB,EAAE,QAAQ;QAC5B,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,QAAQ;QAClB,wBAAwB,EAAE,QAAQ;QAClC,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;KAC1B;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;CACK,CAAA"}
1
+ {"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../src/package-json.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,MAAM,EAAE,8BAA8B;IACtC,SAAS,EAAE,QAAQ;IACnB,aAAa,EAAE,4BAA4B;IAC3C,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE;QACT,GAAG,EAAE;YACH,QAAQ,EAAE,uBAAuB;YACjC,SAAS,EAAE,uBAAuB;SACnC;KACF;IACD,SAAS,EAAE,yBAAyB;IACpC,SAAS,EAAE;QACT,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,OAAO,EAAE,iCAAiC;QAC1C,OAAO,EAAE,mBAAmB;QAC5B,MAAM,EAAE,uCAAuC;QAC/C,eAAe,EAAE,8DAA8D;QAC/E,MAAM,EAAE,qCAAqC;QAC7C,SAAS,EAAE,wBAAwB;QACnC,SAAS,EAAE,gCAAgC;QAC3C,OAAO,EAAE,8FAA8F;QACvG,MAAM,EAAE,mCAAmC;QAC3C,WAAW,EAAE,qCAAqC;QAClD,WAAW,EAAE,8HAA8H;QAC3I,SAAS,EAAE,qEAAqE;KACjF;IACD,YAAY,EAAE;QACZ,MAAM,EAAE,KAAK;QACb,KAAK,EAAE,2DAA2D;KACnE;IACD,UAAU,EAAE;QACV,QAAQ;QACR,SAAS;QACT,SAAS;QACT,KAAK;QACL,MAAM;QACN,QAAQ;QACR,KAAK;KACN;IACD,QAAQ,EAAE,2BAA2B;IACrC,SAAS,EAAE,YAAY;IACvB,MAAM,EAAE;QACN,KAAK,EAAE,0DAA0D;KAClE;IACD,UAAU,EAAE,0DAA0D;IACtE,iBAAiB,EAAE;QACjB,uBAAuB,EAAE,QAAQ;QACjC,gBAAgB,EAAE,QAAQ;QAC1B,kBAAkB,EAAE,QAAQ;QAC5B,sBAAsB,EAAE,SAAS;QACjC,2BAA2B,EAAE,QAAQ;QACrC,wBAAwB,EAAE,SAAS;QACnC,kBAAkB,EAAE,QAAQ;QAC5B,eAAe,EAAE,QAAQ;QACzB,aAAa,EAAE,QAAQ;QACvB,aAAa,EAAE,QAAQ;QACvB,WAAW,EAAE,QAAQ;QACrB,SAAS,EAAE,OAAO;QAClB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,mBAAmB;QACpC,eAAe,EAAE,SAAS;QAC1B,qBAAqB,EAAE,QAAQ;KAChC;IACD,kBAAkB,EAAE;QAClB,sBAAsB,EAAE,SAAS;KAClC;IACD,cAAc,EAAE;QACd,oBAAoB,EAAE,SAAS;QAC/B,qBAAqB,EAAE,QAAQ;QAC/B,aAAa,EAAE,QAAQ;QACvB,OAAO,EAAE,QAAQ;QACjB,UAAU,EAAE,QAAQ;QACpB,aAAa,EAAE,QAAQ;QACvB,QAAQ,EAAE,SAAS;QACnB,kBAAkB,EAAE,QAAQ;QAC5B,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,QAAQ;QAClB,wBAAwB,EAAE,QAAQ;QAClC,YAAY,EAAE,QAAQ;QACtB,MAAM,EAAE,QAAQ;QAChB,eAAe,EAAE,QAAQ;KAC1B;IACD,eAAe,EAAE;QACf,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM;KACd;IACD,OAAO,EAAE;QACP,MAAM;QACN,OAAO;QACP,MAAM;KACP;IACD,KAAK,EAAE;QACL,gBAAgB,EAAE,KAAK;KACxB;CACK,CAAA"}
package/dist/esm/src/server/grpc-error.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { grpc } from '@juzi/wechaty-grpc';
2
- type GErrorCallback = (gerror: Partial<grpc.StatusObject>, value: null) => void;
2
+ declare type GErrorCallback = (gerror: Partial<grpc.StatusObject>, value: null) => void;
3
3
  export declare function grpcError(method: string, error: any, callback: GErrorCallback): void;
4
4
  export {};
5
5
  //# sourceMappingURL=grpc-error.d.ts.map
package/dist/esm/src/server/grpc-error.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"grpc-error.d.ts","sourceRoot":"","sources":["../../../../src/server/grpc-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAO,oBAAoB,CAAA;AAI/C,KAAK,cAAc,GAAG,CACpB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAClC,KAAK,EAAE,IAAI,KACR,IAAI,CAAA;AAET,wBAAgB,SAAS,CACvB,MAAM,EAAK,MAAM,EACjB,KAAK,EAAM,GAAG,EACd,QAAQ,EAAG,cAAc,GACxB,IAAI,CASN"}
1
+ {"version":3,"file":"grpc-error.d.ts","sourceRoot":"","sources":["../../../../src/server/grpc-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAO,oBAAoB,CAAA;AAI/C,aAAK,cAAc,GAAG,CACpB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,EAClC,KAAK,EAAE,IAAI,KACR,IAAI,CAAA;AAET,wBAAgB,SAAS,CACvB,MAAM,EAAK,MAAM,EACjB,KAAK,EAAM,GAAG,EACd,QAAQ,EAAG,cAAc,GACxB,IAAI,CASN"}
package/dist/esm/src/utils/pb-payload-helper.js CHANGED
@@ -87,7 +87,7 @@ export const channelPayloadToPb = (grpcPuppet, channelPayload) => {
87
87
  pbChannelPayload.setObjectId(channelPayload.objectId);
88
88
  }
89
89
  if (channelPayload.objectNonceId) {
90
- pbChannelPayload.setObjectId(channelPayload.objectNonceId);
90
+ pbChannelPayload.setObjectNonceId(channelPayload.objectNonceId);
91
91
  }
92
92
  return pbChannelPayload;
93
93
  };
package/dist/esm/src/utils/pb-payload-helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pb-payload-helper.js","sourceRoot":"","sources":["../../../../src/utils/pb-payload-helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pb-payload-helper.js","sourceRoot":"","sources":["../../../../src/utils/pb-payload-helper.ts"],"names":[],"mappings":"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"}
package/dist/esm/tests/uuid-file-box.spec.js CHANGED
@@ -8,6 +8,7 @@ import temp from 'temp';
8
8
  import { FileBox, FileBoxType } from 'file-box';
9
9
  import PuppetService, { PuppetServer } from '../src/mod.js';
10
10
  const NIL_UUID_V4 = '00000000-0000-0000-0000-000000000000';
11
+ const NIL_UUID_V4_2 = '00000000-0000-0000-0000-000000000001';
11
12
  const __dirname = path.resolve();
12
13
  test('message file test', async (t) => {
13
14
  const PORT = await getPort();
@@ -49,7 +50,7 @@ test('message file test', async (t) => {
49
50
  });
50
51
  test('buffer file test', async (t) => {
51
52
  const PORT = await getPort();
52
- const TOKEN = `insecure_${NIL_UUID_V4}`;
53
+ const TOKEN = `insecure_${NIL_UUID_V4_2}`;
53
54
  const ENDPOINT = `0.0.0.0:${PORT}`;
54
55
  const FILE = path.join(__dirname, 'tests', 'fixtures', 'smoke-testing.ts');
55
56
  const EXPECTED_SIZE = fs.statSync(FILE).size;
package/dist/esm/tests/uuid-file-box.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"uuid-file-box.spec.js","sourceRoot":"","sources":["../../../tests/uuid-file-box.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"uuid-file-box.spec.js","sourceRoot":"","sources":["../../../tests/uuid-file-box.spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@juzi/wechaty-puppet-service",
3
- "version": "1.0.50",
3
+ "version": "1.0.52",
4
4
  "description": "Puppet Service for Wechaty",
5
5
  "type": "module",
6
6
  "exports": {
@@ -70,7 +70,7 @@
70
70
  "@juzi/wechaty-puppet": "^1.0.51"
71
71
  },
72
72
  "dependencies": {
73
- "@juzi/wechaty-grpc": "^1.0.53",
73
+ "@juzi/wechaty-grpc": "^1.0.54",
74
74
  "@juzi/wechaty-redux": "^1.0.1",
75
75
  "clone-class": "^1.1.1",
76
76
  "ducks": "^1.0.2",
@@ -81,6 +81,7 @@
81
81
  "rxjs": "^7.5.5",
82
82
  "semver": "^7.3.5",
83
83
  "stronger-typed-streams": "^0.2.0",
84
+ "typescript": "^4.7.3",
84
85
  "uuid": "^8.3.2",
85
86
  "wechaty-token": "^1.0.6"
86
87
  },
package/src/client/grpc-manager.ts CHANGED
@@ -144,7 +144,7 @@ class GrpcManager extends EventEmitter {
144
144
  log.verbose('GrpcManager', 'constructor() serverName(SNI): "%s"', this.serverName)
145
145
  }
146
146
 
147
- async start (): Promise<void> {
147
+ async start (lastEventSeq?: string, accountId?: string): Promise<void> {
148
148
  log.verbose('GrpcManager', 'start()')
149
149
 
150
150
  /**
@@ -158,7 +158,7 @@ class GrpcManager extends EventEmitter {
158
158
  * 2. Connect to stream
159
159
  */
160
160
  log.verbose('GrpcManager', 'start() starting stream ...')
161
- await this.startStream()
161
+ await this.startStream(lastEventSeq, accountId)
162
162
  log.verbose('GrpcManager', 'start() starting stream ... done')
163
163
 
164
164
  /**
@@ -287,7 +287,7 @@ class GrpcManager extends EventEmitter {
287
287
  }
288
288
  }
289
289
 
290
- protected async startStream (): Promise<void> {
290
+ protected async startStream (lastEventSeq?: string, accountId?: string): Promise<void> {
291
291
  log.verbose('GrpcManager', 'startStream()')
292
292
 
293
293
  if (this.eventStream) {
@@ -296,7 +296,15 @@ class GrpcManager extends EventEmitter {
296
296
  }
297
297
 
298
298
  log.verbose('GrpcManager', 'startStream() grpc -> event() ...')
299
- const eventStream = this.client.event(new puppet.EventRequest())
299
+
300
+ const eventRequest = new puppet.EventRequest()
301
+ if (lastEventSeq) {
302
+ eventRequest.setSeq(Number(lastEventSeq))
303
+ }
304
+ if (accountId) {
305
+ eventRequest.setAccountId(accountId)
306
+ }
307
+ const eventStream = this.client.event(eventRequest)
300
308
  log.verbose('GrpcManager', 'startStream() grpc -> event() ... done')
301
309
 
302
310
  /**
package/src/client/payload-store.ts CHANGED
@@ -46,11 +46,12 @@ class PayloadStore {
46
46
 
47
47
  // public message? : LRU<string, MessagePayload>
48
48
 
49
- public contact? : FlashStore<string, PUPPET.payloads.Contact>
50
- public roomMember? : FlashStore<string, StoreRoomMemberPayload>
51
- public room? : FlashStore<string, PUPPET.payloads.Room>
52
- public tag? : FlashStore<string, PUPPET.payloads.Tag>
53
- public tagGroup? : FlashStore<string, PUPPET.payloads.TagGroup>
49
+ public contact? : FlashStore<string, PUPPET.payloads.Contact>
50
+ public roomMember? : FlashStore<string, StoreRoomMemberPayload>
51
+ public room? : FlashStore<string, PUPPET.payloads.Room>
52
+ public tag? : FlashStore<string, PUPPET.payloads.Tag>
53
+ public tagGroup? : FlashStore<string, PUPPET.payloads.TagGroup>
54
+ public miscellaneous : FlashStore<string, string>
54
55
 
55
56
  protected storeDir: string
56
57
  protected accountId?: string
@@ -66,6 +67,12 @@ class PayloadStore {
66
67
  `v${major(VERSION)}.${minor(VERSION)}`,
67
68
  )
68
69
  log.silly('PayloadStore', 'constructor() storeDir: "%s"', this.storeDir)
70
+
71
+ if (!fs.existsSync(this.storeDir)) {
72
+ fs.mkdirSync(this.storeDir, { recursive: true })
73
+ }
74
+
75
+ this.miscellaneous = new FlashStore(path.join(this.storeDir, 'miscellaneous')) // account-free data
69
76
  }
70
77
 
71
78
  /**
@@ -148,6 +155,8 @@ class PayloadStore {
148
155
  throw new Error('Can not destroy() a start()-ed store. Call stop() to stop it first')
149
156
  }
150
157
 
158
+ await this.miscellaneous.close()
159
+
151
160
  /**
152
161
  * Huan(202108): `fs.rm` was introduced from Node.js v14.14
153
162
  * https://nodejs.org/api/fs.html#fs_fspromises_rm_path_options
package/src/client/puppet-service.ts CHANGED
@@ -87,6 +87,8 @@ class PuppetService extends PUPPET.Puppet {
87
87
  protected _ducks: Ducks<{ puppet: typeof PuppetDuck }>
88
88
  protected _store: Store
89
89
 
90
+ private timeoutMilliseconds: number
91
+
90
92
  protected _grpcManager?: GrpcManager
91
93
  get grpcManager (): GrpcManager {
92
94
  if (!this._grpcManager) {
@@ -119,6 +121,7 @@ class PuppetService extends PUPPET.Puppet {
119
121
  this._cleanupCallbackList = []
120
122
 
121
123
  this.FileBoxUuid = uuidifyFileBoxGrpc(() => this.grpcManager.client)
124
+ this.timeoutMilliseconds = (options.timeoutSeconds || 2) * 1000 * 10 // 20min default, 40min for xiaoju-bot
122
125
  }
123
126
 
124
127
  protected async serializeFileBox (fileBox: FileBoxInterface): Promise<string> {
@@ -164,7 +167,10 @@ class PuppetService extends PUPPET.Puppet {
164
167
  log.verbose('PuppetService', 'start() setting up bridge grpc event stream ... done')
165
168
 
166
169
  log.verbose('PuppetService', 'start() starting grpc manager...')
167
- await grpcManager.start()
170
+ const lastEventTimestamp = await this._payloadStore.miscellaneous.get('eventTimestamp')
171
+ const lastEventSeq = (Date.now() - Number(lastEventTimestamp || 0)) < this.timeoutMilliseconds ? await this._payloadStore.miscellaneous.get('eventSeq') : undefined
172
+ const accountId = await this._payloadStore.miscellaneous.get('accountId')
173
+ await grpcManager.start(lastEventSeq, accountId)
168
174
  log.verbose('PuppetService', 'start() starting grpc manager... done')
169
175
 
170
176
  log.verbose('PuppetService', 'start healthCheck')
@@ -228,7 +234,7 @@ class PuppetService extends PUPPET.Puppet {
228
234
  log.verbose('PuppetService', 'bridgeGrpcEventStream(client)')
229
235
 
230
236
  client
231
- .on('data', this.onGrpcStreamEvent.bind(this))
237
+ .on('data', this.onGrpcStreamEvent.bind(this) as any)
232
238
  .on('end', () => {
233
239
  log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(end)')
234
240
  })
@@ -254,9 +260,11 @@ class PuppetService extends PUPPET.Puppet {
254
260
  })
255
261
  }
256
262
 
257
- private onGrpcStreamEvent (event: grpcPuppet.EventResponse): void {
263
+ private async onGrpcStreamEvent (event: grpcPuppet.EventResponse): Promise<void> {
264
+
258
265
  const type = event.getType()
259
266
  const payload = event.getPayload()
267
+ const seq = event.getSeq()
260
268
 
261
269
  if (!NO_LOG_EVENTS.includes(type)) {
262
270
  log.info('PuppetService', `received grpc event ${EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}`)
@@ -275,6 +283,14 @@ class PuppetService extends PUPPET.Puppet {
275
283
  })
276
284
  }
277
285
 
286
+ if (seq) {
287
+ const lastEventSeq = await this._payloadStore.miscellaneous.get('eventSeq')
288
+ if (!lastEventSeq || (seq > Number(lastEventSeq) || seq === 1)) {
289
+ await this._payloadStore.miscellaneous.set('eventSeq', String(seq))
290
+ await this._payloadStore.miscellaneous.set('eventTimestamp', String(Date.now()))
291
+ }
292
+ }
293
+
278
294
  switch (type) {
279
295
  case grpcPuppet.EventType.EVENT_TYPE_DONG:
280
296
  this.emit('dong', JSON.parse(payload) as PUPPET.payloads.EventDong)
@@ -291,6 +307,7 @@ class PuppetService extends PUPPET.Puppet {
291
307
  case grpcPuppet.EventType.EVENT_TYPE_LOGIN:
292
308
  {
293
309
  const loginPayload = JSON.parse(payload) as PUPPET.payloads.EventLogin
310
+ await this._payloadStore.miscellaneous.set('accountId', loginPayload.contactId)
294
311
  ;(
295
312
  async () => this.login(loginPayload.contactId)
296
313
  )().catch(e =>
@@ -303,6 +320,7 @@ class PuppetService extends PUPPET.Puppet {
303
320
  case grpcPuppet.EventType.EVENT_TYPE_LOGOUT:
304
321
  {
305
322
  const logoutPayload = JSON.parse(payload) as PUPPET.payloads.EventLogout
323
+ await this._payloadStore.miscellaneous.delete('accountId')
306
324
  ;(
307
325
  async () => this.logout(logoutPayload.data)
308
326
  )().catch(e =>
package/src/package-json.ts CHANGED
@@ -4,7 +4,7 @@
4
4
  import type { PackageJson } from 'type-fest'
5
5
  export const packageJson: PackageJson = {
6
6
  "name": "@juzi/wechaty-puppet-service",
7
- "version": "1.0.50",
7
+ "version": "1.0.52",
8
8
  "description": "Puppet Service for Wechaty",
9
9
  "type": "module",
10
10
  "exports": {
@@ -74,7 +74,7 @@ export const packageJson: PackageJson = {
74
74
  "@juzi/wechaty-puppet": "^1.0.51"
75
75
  },
76
76
  "dependencies": {
77
- "@juzi/wechaty-grpc": "^1.0.53",
77
+ "@juzi/wechaty-grpc": "^1.0.54",
78
78
  "@juzi/wechaty-redux": "^1.0.1",
79
79
  "clone-class": "^1.1.1",
80
80
  "ducks": "^1.0.2",
@@ -85,6 +85,7 @@ export const packageJson: PackageJson = {
85
85
  "rxjs": "^7.5.5",
86
86
  "semver": "^7.3.5",
87
87
  "stronger-typed-streams": "^0.2.0",
88
+ "typescript": "^4.7.3",
88
89
  "uuid": "^8.3.2",
89
90
  "wechaty-token": "^1.0.6"
90
91
  },
package/src/utils/pb-payload-helper.ts CHANGED
@@ -58,7 +58,7 @@ export const channelPayloadToPb = (grpcPuppet: grpcPuppet, channelPayload: PUPPE
58
58
  if (channelPayload.thumbUrl) { pbChannelPayload.setThumbUrl(channelPayload.thumbUrl) }
59
59
  if (channelPayload.url) { pbChannelPayload.setUrl(channelPayload.url) }
60
60
  if (channelPayload.objectId) { pbChannelPayload.setObjectId(channelPayload.objectId) }
61
- if (channelPayload.objectNonceId) { pbChannelPayload.setObjectId(channelPayload.objectNonceId) }
61
+ if (channelPayload.objectNonceId) { pbChannelPayload.setObjectNonceId(channelPayload.objectNonceId) }
62
62
  return pbChannelPayload
63
63
  }
64
64