@juzi/wechaty-puppet-service 1.0.17 → 1.0.20

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 (47) hide show
  1. package/dist/cjs/src/client/payload-store.d.ts +2 -0
  2. package/dist/cjs/src/client/payload-store.d.ts.map +1 -1
  3. package/dist/cjs/src/client/payload-store.js +10 -0
  4. package/dist/cjs/src/client/payload-store.js.map +1 -1
  5. package/dist/cjs/src/client/puppet-service.d.ts +14 -11
  6. package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
  7. package/dist/cjs/src/client/puppet-service.js +130 -82
  8. package/dist/cjs/src/client/puppet-service.js.map +1 -1
  9. package/dist/cjs/src/config.d.ts +1 -0
  10. package/dist/cjs/src/config.d.ts.map +1 -1
  11. package/dist/cjs/src/config.js +2 -1
  12. package/dist/cjs/src/config.js.map +1 -1
  13. package/dist/cjs/src/package-json.js +5 -5
  14. package/dist/cjs/src/package-json.js.map +1 -1
  15. package/dist/cjs/src/server/event-stream-manager.d.ts.map +1 -1
  16. package/dist/cjs/src/server/event-stream-manager.js +7 -0
  17. package/dist/cjs/src/server/event-stream-manager.js.map +1 -1
  18. package/dist/cjs/src/server/puppet-implementation.d.ts.map +1 -1
  19. package/dist/cjs/src/server/puppet-implementation.js +98 -58
  20. package/dist/cjs/src/server/puppet-implementation.js.map +1 -1
  21. package/dist/esm/src/client/payload-store.d.ts +2 -0
  22. package/dist/esm/src/client/payload-store.d.ts.map +1 -1
  23. package/dist/esm/src/client/payload-store.js +10 -0
  24. package/dist/esm/src/client/payload-store.js.map +1 -1
  25. package/dist/esm/src/client/puppet-service.d.ts +14 -11
  26. package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
  27. package/dist/esm/src/client/puppet-service.js +131 -83
  28. package/dist/esm/src/client/puppet-service.js.map +1 -1
  29. package/dist/esm/src/config.d.ts +1 -0
  30. package/dist/esm/src/config.d.ts.map +1 -1
  31. package/dist/esm/src/config.js +1 -0
  32. package/dist/esm/src/config.js.map +1 -1
  33. package/dist/esm/src/package-json.js +5 -5
  34. package/dist/esm/src/package-json.js.map +1 -1
  35. package/dist/esm/src/server/event-stream-manager.d.ts.map +1 -1
  36. package/dist/esm/src/server/event-stream-manager.js +7 -0
  37. package/dist/esm/src/server/event-stream-manager.js.map +1 -1
  38. package/dist/esm/src/server/puppet-implementation.d.ts.map +1 -1
  39. package/dist/esm/src/server/puppet-implementation.js +98 -58
  40. package/dist/esm/src/server/puppet-implementation.js.map +1 -1
  41. package/package.json +5 -5
  42. package/src/client/payload-store.ts +10 -0
  43. package/src/client/puppet-service.ts +165 -100
  44. package/src/config.ts +1 -0
  45. package/src/package-json.ts +5 -5
  46. package/src/server/event-stream-manager.ts +7 -0
  47. package/src/server/puppet-implementation.ts +106 -58
@@ -11,6 +11,8 @@ declare class PayloadStore {
11
11
  contact?: FlashStore<string, PUPPET.payloads.Contact>;
12
12
  roomMember?: FlashStore<string, StoreRoomMemberPayload>;
13
13
  room?: FlashStore<string, PUPPET.payloads.Room>;
14
+ tag?: FlashStore<string, PUPPET.payloads.Tag>;
15
+ tagGroup?: FlashStore<string, PUPPET.payloads.TagGroup>;
14
16
  protected storeDir: string;
15
17
  protected accountId?: string;
16
18
  constructor(options: PayloadStoreOptions);
@@ -1 +1 @@
1
- {"version":3,"file":"payload-store.d.ts","sourceRoot":"","sources":["../../../../src/client/payload-store.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AASxC,UAAU,mBAAmB;IAC3B,KAAK,EAAE,MAAM,CAAA;CACd;AAED,UAAU,sBAAsB;IAC9B,CAAC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAA;CAC1D;AAED,cAAM,YAAY;IAWH,OAAO,CAAC,OAAO;IAPrB,OAAO,CAAC,EAAM,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACzD,UAAU,CAAC,EAAG,UAAU,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;IACxD,IAAI,CAAC,EAAS,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAE7D,SAAS,CAAC,QAAQ,EAAI,MAAM,CAAA;IAC5B,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;gBAEP,OAAO,EAAE,mBAAmB;IAajD;;;OAGG;IACG,KAAK,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCxC,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IA0BtB,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;CAgBhC;AAED,OAAO,EAAE,YAAY,EAAE,CAAA"}
1
+ {"version":3,"file":"payload-store.d.ts","sourceRoot":"","sources":["../../../../src/client/payload-store.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AASxC,UAAU,mBAAmB;IAC3B,KAAK,EAAE,MAAM,CAAA;CACd;AAED,UAAU,sBAAsB;IAC9B,CAAC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAA;CAC1D;AAED,cAAM,YAAY;IAaH,OAAO,CAAC,OAAO;IATrB,OAAO,CAAC,EAAM,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACzD,UAAU,CAAC,EAAG,UAAU,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;IACxD,IAAI,CAAC,EAAS,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACtD,GAAG,CAAC,EAAU,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACrD,QAAQ,CAAC,EAAK,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAEjE,SAAS,CAAC,QAAQ,EAAI,MAAM,CAAA;IAC5B,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;gBAEP,OAAO,EAAE,mBAAmB;IAajD;;;OAGG;IACG,KAAK,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCxC,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAgCtB,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;CAgBhC;AAED,OAAO,EAAE,YAAY,EAAE,CAAA"}
@@ -36,6 +36,8 @@ class PayloadStore {
36
36
  contact;
37
37
  roomMember;
38
38
  room;
39
+ tag;
40
+ tagGroup;
39
41
  storeDir;
40
42
  accountId;
41
43
  constructor(options) {
@@ -61,6 +63,8 @@ class PayloadStore {
61
63
  this.contact = new flash_store_1.FlashStore(path_1.default.join(accountDir, 'contact-payload'));
62
64
  this.roomMember = new flash_store_1.FlashStore(path_1.default.join(accountDir, 'room-member-payload'));
63
65
  this.room = new flash_store_1.FlashStore(path_1.default.join(accountDir, 'room-payload'));
66
+ this.tag = new flash_store_1.FlashStore(path_1.default.join(accountDir, 'tag-payload'));
67
+ this.tagGroup = new flash_store_1.FlashStore(path_1.default.join(accountDir, 'tag-group'));
64
68
  /**
65
69
  * LRU
66
70
  *
@@ -83,6 +87,8 @@ class PayloadStore {
83
87
  const contactStore = this.contact;
84
88
  const roomMemberStore = this.roomMember;
85
89
  const roomStore = this.room;
90
+ const tagStore = this.tag;
91
+ const tagGroupStore = this.tagGroup;
86
92
  /**
87
93
  * Huan(202108): we must set all the instances of the store to underfined
88
94
  * in the current event loop as soon as possible
@@ -91,6 +97,8 @@ class PayloadStore {
91
97
  this.contact = undefined;
92
98
  this.roomMember = undefined;
93
99
  this.room = undefined;
100
+ this.tag = undefined;
101
+ this.tagGroup = undefined;
94
102
  // LRU
95
103
  // this.message = undefined
96
104
  // clear accountId
@@ -98,6 +106,8 @@ class PayloadStore {
98
106
  await contactStore?.close();
99
107
  await roomMemberStore?.close();
100
108
  await roomStore?.close();
109
+ await tagStore?.close();
110
+ await tagGroupStore?.close();
101
111
  }
102
112
  async destroy() {
103
113
  config_js_1.log.verbose('PayloadStore', 'destroy()');
@@ -1 +1 @@
1
- {"version":3,"file":"payload-store.js","sourceRoot":"","sources":["../../../../src/client/payload-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"payload-store.js","sourceRoot":"","sources":["../../../../src/client/payload-store.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { Ducks } from 'ducks';
6
6
  import type { Store } from 'redux';
7
7
  import { GrpcManager } from './grpc-manager.js';
8
8
  import { PayloadStore } from './payload-store.js';
9
+ import type { TagIdentifier } from '@juzi/wechaty-puppet/filters';
9
10
  export declare type PuppetServiceOptions = PUPPET.PuppetOptions & {
10
11
  authority?: string;
11
12
  tls?: {
@@ -119,7 +120,7 @@ declare class PuppetService extends PUPPET.Puppet {
119
120
  roomRawPayload(id: string): Promise<PUPPET.payloads.Room>;
120
121
  roomRawPayloadParser(payload: PUPPET.payloads.Room): Promise<PUPPET.payloads.Room>;
121
122
  roomList(): Promise<string[]>;
122
- roomDel(roomId: string, contactId: string): Promise<void>;
123
+ roomDel(roomId: string, contactIds: string | string[]): Promise<void>;
123
124
  roomAvatar(roomId: string): Promise<FileBoxInterface>;
124
125
  roomAdd(roomId: string, contactId: string, inviteOnly: boolean): Promise<void>;
125
126
  roomTopic(roomId: string): Promise<string>;
@@ -151,17 +152,19 @@ declare class PuppetService extends PUPPET.Puppet {
151
152
  * Tag
152
153
  *
153
154
  */
154
- tagContactTagAdd(tagGroupId: string | undefined, tagId: string, contactId: string): Promise<void>;
155
- tagContactTagRemove(tagGroupId: string | undefined, tagId: string, contactId: string): Promise<void>;
156
- tagGroupAdd(tagGroupName: string): Promise<PUPPET.payloads.TagGroup | void>;
155
+ tagContactTagAdd(tags: TagIdentifier[], contactIds: string[]): Promise<void>;
156
+ tagContactTagRemove(tags: TagIdentifier[], contactIds: string[]): Promise<void>;
157
+ tagGroupAdd(tagGroupName: string): Promise<string | void>;
157
158
  tagGroupDelete(tagGroupId: string): Promise<void>;
158
- tagTagAdd(tagGroupId: string | undefined, tagName: string): Promise<PUPPET.payloads.Tag | void>;
159
- tagTagDelete(tagGroupId: string | undefined, tagId: string): Promise<void>;
160
- tagGroupList(): Promise<PUPPET.payloads.TagGroup[]>;
161
- tagGroupTagList(tagGroupId: string | undefined): Promise<PUPPET.payloads.Tag[]>;
162
- tagTagList(): Promise<PUPPET.payloads.Tag[]>;
163
- tagContactTagList(contactId: string): Promise<PUPPET.payloads.Tag[]>;
164
- tagTagContactList(tagGroupId: string | undefined, tagId: string): Promise<string[]>;
159
+ tagTagAdd(tagName: string, tagGroupId?: string): Promise<PUPPET.filters.TagIdentifier | void>;
160
+ tagTagDelete(tag: TagIdentifier): Promise<void>;
161
+ tagGroupList(): Promise<string[]>;
162
+ tagGroupTagList(tagGroupId?: string): Promise<PUPPET.filters.TagIdentifier[]>;
163
+ tagTagList(): Promise<PUPPET.filters.TagIdentifier[]>;
164
+ tagContactTagList(contactId: string): Promise<PUPPET.filters.TagIdentifier[]>;
165
+ tagTagContactList(tag: TagIdentifier): Promise<string[]>;
166
+ tagGroupPayloadPuppet(id: string): Promise<PUPPET.payloads.TagGroup>;
167
+ tagPayloadPuppet(tag: PUPPET.filters.TagIdentifier): Promise<PUPPET.payloads.Tag>;
165
168
  /**
166
169
  * @deprecated Will be removed in v2.0
167
170
  */
@@ -1 +1 @@
1
- {"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
@@ -275,6 +275,9 @@ class PuppetService extends PUPPET.Puppet {
275
275
  case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_SCAN:
276
276
  this.emit('scan', JSON.parse(payload));
277
277
  break;
278
+ case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_TAG:
279
+ this.emit('tag', JSON.parse(payload));
280
+ break;
278
281
  case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_RESET:
279
282
  config_js_1.log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?');
280
283
  // the `reset` event should be dealed not send out
@@ -343,6 +346,8 @@ class PuppetService extends PUPPET.Puppet {
343
346
  [PUPPET.types.Dirty.Post]: async (_) => { },
344
347
  [PUPPET.types.Dirty.Room]: async (id) => this._payloadStore.room?.delete(id),
345
348
  [PUPPET.types.Dirty.RoomMember]: async (id) => this._payloadStore.roomMember?.delete(id),
349
+ [PUPPET.types.Dirty.Tag]: async (key) => this._payloadStore.tag?.delete(key),
350
+ [PUPPET.types.Dirty.TagGroup]: async (id) => this._payloadStore.tagGroup?.delete(id),
346
351
  [PUPPET.types.Dirty.Unspecified]: async (id) => { throw new Error('Unspecified type with id: ' + id); },
347
352
  };
348
353
  const dirtyFuncSync = this.wrapAsync(dirtyMap[payloadType]);
@@ -1074,11 +1079,19 @@ class PuppetService extends PUPPET.Puppet {
1074
1079
  .bind(this.grpcManager.client))(new wechaty_grpc_1.puppet.RoomListRequest());
1075
1080
  return response.getIdsList();
1076
1081
  }
1077
- async roomDel(roomId, contactId) {
1078
- config_js_1.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactId);
1082
+ async roomDel(roomId, contactIds) {
1083
+ config_js_1.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds);
1079
1084
  const request = new wechaty_grpc_1.puppet.RoomDelRequest();
1080
1085
  request.setId(roomId);
1081
- request.setContactId(contactId);
1086
+ if (Array.isArray(contactIds)) {
1087
+ request.setContactIdsList(contactIds);
1088
+ if (contactIds.length === 1) {
1089
+ request.setContactId(contactIds[0]);
1090
+ }
1091
+ }
1092
+ else {
1093
+ request.setContactId(contactIds);
1094
+ }
1082
1095
  await util_1.default.promisify(this.grpcManager.client.roomDel
1083
1096
  .bind(this.grpcManager.client))(request);
1084
1097
  }
@@ -1402,25 +1415,29 @@ class PuppetService extends PUPPET.Puppet {
1402
1415
  * Tag
1403
1416
  *
1404
1417
  */
1405
- async tagContactTagAdd(tagGroupId, tagId, contactId) {
1406
- config_js_1.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s, %s)', tagGroupId, tagId, contactId);
1418
+ async tagContactTagAdd(tags, contactIds) {
1419
+ config_js_1.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', JSON.stringify(tags), contactIds);
1407
1420
  const request = new wechaty_grpc_1.puppet.TagContactTagAddRequest();
1408
- if (typeof tagGroupId !== 'undefined') {
1409
- request.setTagGroupId(tagGroupId);
1410
- }
1411
- request.setTagId(tagId);
1412
- request.setContactId(contactId);
1421
+ request.setTagsList(tags.map(t => {
1422
+ const tag = new wechaty_grpc_1.puppet.TagIdentifier();
1423
+ t.groupId && tag.setGroupId(t.groupId);
1424
+ tag.setId(t.id);
1425
+ return tag;
1426
+ }));
1427
+ request.setContactIdsList(contactIds);
1413
1428
  await util_1.default.promisify(this.grpcManager.client.tagContactTagAdd
1414
1429
  .bind(this.grpcManager.client))(request);
1415
1430
  }
1416
- async tagContactTagRemove(tagGroupId, tagId, contactId) {
1417
- config_js_1.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s, %s)', tagGroupId, tagId, contactId);
1431
+ async tagContactTagRemove(tags, contactIds) {
1432
+ config_js_1.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', JSON.stringify(tags), contactIds);
1418
1433
  const request = new wechaty_grpc_1.puppet.TagContactTagRemoveRequest();
1419
- if (typeof tagGroupId !== 'undefined') {
1420
- request.setTagGroupId(tagGroupId);
1421
- }
1422
- request.setTagId(tagId);
1423
- request.setContactId(contactId);
1434
+ request.setTagsList(tags.map(t => {
1435
+ const tag = new wechaty_grpc_1.puppet.TagIdentifier();
1436
+ t.groupId && tag.setGroupId(t.groupId);
1437
+ tag.setId(t.id);
1438
+ return tag;
1439
+ }));
1440
+ request.setContactIdsList(contactIds);
1424
1441
  await util_1.default.promisify(this.grpcManager.client.tagContactTagRemove
1425
1442
  .bind(this.grpcManager.client))(request);
1426
1443
  }
@@ -1430,16 +1447,8 @@ class PuppetService extends PUPPET.Puppet {
1430
1447
  request.setTagGroupName(tagGroupName);
1431
1448
  const result = await util_1.default.promisify(this.grpcManager.client.tagGroupAdd
1432
1449
  .bind(this.grpcManager.client))(request);
1433
- const grpcPayload = result.getPayload();
1434
- const id = grpcPayload?.getId();
1435
- const name = grpcPayload?.getName();
1436
- if (id && name) {
1437
- const payload = {
1438
- id,
1439
- name,
1440
- };
1441
- return payload;
1442
- }
1450
+ const id = result.getTagGroupId();
1451
+ return id;
1443
1452
  }
1444
1453
  async tagGroupDelete(tagGroupId) {
1445
1454
  config_js_1.log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId);
@@ -1448,8 +1457,8 @@ class PuppetService extends PUPPET.Puppet {
1448
1457
  await util_1.default.promisify(this.grpcManager.client.tagGroupDelete
1449
1458
  .bind(this.grpcManager.client))(request);
1450
1459
  }
1451
- async tagTagAdd(tagGroupId, tagName) {
1452
- config_js_1.log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagGroupId, tagName);
1460
+ async tagTagAdd(tagName, tagGroupId) {
1461
+ config_js_1.log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagName, tagGroupId);
1453
1462
  const request = new wechaty_grpc_1.puppet.TagTagAddRequest();
1454
1463
  if (typeof tagGroupId !== 'undefined') {
1455
1464
  request.setTagGroupId(tagGroupId);
@@ -1457,28 +1466,24 @@ class PuppetService extends PUPPET.Puppet {
1457
1466
  request.setTagName(tagName);
1458
1467
  const result = await util_1.default.promisify(this.grpcManager.client.tagTagAdd
1459
1468
  .bind(this.grpcManager.client))(request);
1460
- const grpcPayload = result.getPayload();
1461
- const id = grpcPayload?.getId();
1462
- const name = grpcPayload?.getName();
1463
- const groupId = grpcPayload?.getGroupId();
1464
- const type = grpcPayload?.getType();
1465
- if (id && name && (typeof type !== 'undefined')) {
1466
- const payload = {
1469
+ const tag = result.getTag();
1470
+ const id = tag?.getId();
1471
+ const groupId = tag?.getGroupId();
1472
+ if (id) {
1473
+ return {
1467
1474
  id,
1468
- name,
1469
1475
  groupId,
1470
- type,
1471
1476
  };
1472
- return payload;
1473
1477
  }
1474
1478
  }
1475
- async tagTagDelete(tagGroupId, tagId) {
1476
- config_js_1.log.verbose('PuppetService', 'tagTagDelete(%s, %s)', tagGroupId, tagId);
1479
+ async tagTagDelete(tag) {
1480
+ config_js_1.log.verbose('PuppetService', 'tagTagDelete(%s)', JSON.stringify(tag));
1477
1481
  const request = new wechaty_grpc_1.puppet.TagTagDeleteRequest();
1478
- if (typeof tagGroupId !== 'undefined') {
1479
- request.setTagGroupId(tagGroupId);
1480
- }
1481
- request.setTagId(tagId);
1482
+ const tagProb = new wechaty_grpc_1.puppet.TagIdentifier();
1483
+ tag.groupId && tagProb.setGroupId(tag.groupId);
1484
+ tagProb.setId(tag.id);
1485
+ request.setTag(tagProb);
1486
+ request.setTag(tagProb);
1482
1487
  await util_1.default.promisify(this.grpcManager.client.tagTagDelete
1483
1488
  .bind(this.grpcManager.client))(request);
1484
1489
  }
@@ -1487,14 +1492,8 @@ class PuppetService extends PUPPET.Puppet {
1487
1492
  const request = new wechaty_grpc_1.puppet.TagGroupListRequest();
1488
1493
  const result = await util_1.default.promisify(this.grpcManager.client.tagGroupList
1489
1494
  .bind(this.grpcManager.client))(request);
1490
- const grpcPayloads = result.getPayloadsList();
1491
- const payloads = grpcPayloads.map(payload => {
1492
- return {
1493
- id: payload.getId(),
1494
- name: payload.getName(),
1495
- };
1496
- });
1497
- return payloads;
1495
+ const groupIds = result.getTagGroupIdsList();
1496
+ return groupIds;
1498
1497
  }
1499
1498
  async tagGroupTagList(tagGroupId) {
1500
1499
  config_js_1.log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId);
@@ -1504,32 +1503,28 @@ class PuppetService extends PUPPET.Puppet {
1504
1503
  }
1505
1504
  const result = await util_1.default.promisify(this.grpcManager.client.tagGroupTagList
1506
1505
  .bind(this.grpcManager.client))(request);
1507
- const grpcPayloads = result.getPayloadsList();
1508
- const payloads = grpcPayloads.map(payload => {
1506
+ const tags = result.getTagsList();
1507
+ const tagIdentifiers = tags.map(tag => {
1509
1508
  return {
1510
- id: payload.getId(),
1511
- name: payload.getName(),
1512
- groupId: payload.getGroupId(),
1513
- type: payload.getType(),
1509
+ id: tag.getId(),
1510
+ groupId: tag.getGroupId(),
1514
1511
  };
1515
1512
  });
1516
- return payloads;
1513
+ return tagIdentifiers;
1517
1514
  }
1518
1515
  async tagTagList() {
1519
1516
  config_js_1.log.verbose('PuppetService', 'tagTagList()');
1520
1517
  const request = new wechaty_grpc_1.puppet.TagTagListRequest();
1521
1518
  const result = await util_1.default.promisify(this.grpcManager.client.tagTagList
1522
1519
  .bind(this.grpcManager.client))(request);
1523
- const grpcPayloads = result.getPayloadsList();
1524
- const payloads = grpcPayloads.map(payload => {
1520
+ const tags = result.getTagsList();
1521
+ const tagIdentifiers = tags.map(tag => {
1525
1522
  return {
1526
- id: payload.getId(),
1527
- name: payload.getName(),
1528
- groupId: payload.getGroupId(),
1529
- type: payload.getType(),
1523
+ id: tag.getId(),
1524
+ groupId: tag.getGroupId(),
1530
1525
  };
1531
1526
  });
1532
- return payloads;
1527
+ return tagIdentifiers;
1533
1528
  }
1534
1529
  async tagContactTagList(contactId) {
1535
1530
  config_js_1.log.verbose('PuppetService', 'tagContactTagList(%s)', contactId);
@@ -1537,28 +1532,81 @@ class PuppetService extends PUPPET.Puppet {
1537
1532
  request.setContactId(contactId);
1538
1533
  const result = await util_1.default.promisify(this.grpcManager.client.tagContactTagList
1539
1534
  .bind(this.grpcManager.client))(request);
1540
- const grpcPayloads = result.getPayloadsList();
1541
- const payloads = grpcPayloads.map(payload => {
1535
+ const grpcPayloads = result.getTagsList();
1536
+ const tags = grpcPayloads.map(tag => {
1542
1537
  return {
1543
- id: payload.getId(),
1544
- name: payload.getName(),
1545
- groupId: payload.getGroupId(),
1546
- type: payload.getType(),
1538
+ id: tag.getId(),
1539
+ groupId: tag.getGroupId(),
1547
1540
  };
1548
1541
  });
1549
- return payloads;
1542
+ return tags;
1550
1543
  }
1551
- async tagTagContactList(tagGroupId, tagId) {
1552
- config_js_1.log.verbose('PuppetService', 'tagTagContactList(%s, %s)', tagGroupId, tagId);
1544
+ async tagTagContactList(tag) {
1545
+ config_js_1.log.verbose('PuppetService', 'tagTagContactList(%s)', JSON.stringify(tag));
1553
1546
  const request = new wechaty_grpc_1.puppet.TagTagContactListRequest();
1554
- if (typeof tagGroupId !== 'undefined') {
1555
- request.setTagGroupId(tagGroupId);
1556
- }
1557
- request.setTagId(tagId);
1547
+ const tagProb = new wechaty_grpc_1.puppet.TagIdentifier();
1548
+ tag.groupId && tagProb.setGroupId(tag.groupId);
1549
+ tagProb.setId(tag.id);
1550
+ request.setTag(tagProb);
1558
1551
  const result = await util_1.default.promisify(this.grpcManager.client.tagTagContactList
1559
1552
  .bind(this.grpcManager.client))(request);
1560
- const payloads = result.getPayloadsList();
1561
- return payloads;
1553
+ const contactIds = result.getContactIdsList();
1554
+ return contactIds;
1555
+ }
1556
+ async tagGroupPayloadPuppet(id) {
1557
+ config_js_1.log.verbose('PuppetService', 'tagGroupPayload(%s)', id);
1558
+ const cachedPayload = await this._payloadStore.tagGroup?.get(id);
1559
+ if (cachedPayload) {
1560
+ config_js_1.log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id);
1561
+ return cachedPayload;
1562
+ }
1563
+ const request = new wechaty_grpc_1.puppet.TagGroupPayloadRequest();
1564
+ request.setGroupId(id);
1565
+ const response = await util_1.default.promisify(this.grpcManager.client.tagGroupPayload
1566
+ .bind(this.grpcManager.client))(request);
1567
+ const grpcPayload = response.getPayload();
1568
+ if (!grpcPayload) {
1569
+ throw new Error(`tagGroup ${id} got no payload!`);
1570
+ }
1571
+ const payload = {
1572
+ id: grpcPayload.getId(),
1573
+ name: grpcPayload.getName(),
1574
+ type: grpcPayload.getType(),
1575
+ };
1576
+ await this._payloadStore.tagGroup?.set(id, payload);
1577
+ config_js_1.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id);
1578
+ return payload;
1579
+ }
1580
+ async tagPayloadPuppet(tag) {
1581
+ config_js_1.log.verbose('PuppetService', 'tagPayloadPuppet(%s)', JSON.stringify(tag));
1582
+ const key = tag.groupId || '' + config_js_1.FOUR_PER_EM_SPACE + tag.id;
1583
+ const cachedPayload = await this._payloadStore.tag?.get(key);
1584
+ if (cachedPayload) {
1585
+ config_js_1.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tag);
1586
+ return cachedPayload;
1587
+ }
1588
+ const tagIdentifier = new wechaty_grpc_1.puppet.TagIdentifier();
1589
+ tagIdentifier.setId(tag.id);
1590
+ if (tag.groupId) {
1591
+ tagIdentifier.setGroupId(tag.groupId);
1592
+ }
1593
+ const request = new wechaty_grpc_1.puppet.TagPayloadRequest();
1594
+ request.setTag(tagIdentifier);
1595
+ const response = await util_1.default.promisify(this.grpcManager.client.tagPayload
1596
+ .bind(this.grpcManager.client))(request);
1597
+ const grpcPayload = response.getPayload();
1598
+ if (!grpcPayload) {
1599
+ throw new Error(`tag ${JSON.stringify(tag)} got no payload!`);
1600
+ }
1601
+ const payload = {
1602
+ id: grpcPayload.getId(),
1603
+ name: grpcPayload.getName(),
1604
+ groupId: grpcPayload.getGroupId(),
1605
+ type: grpcPayload.getType(),
1606
+ };
1607
+ await this._payloadStore.tag?.set(key, payload);
1608
+ config_js_1.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', JSON.stringify(tag));
1609
+ return payload;
1562
1610
  }
1563
1611
  /**
1564
1612
  * @deprecated Will be removed in v2.0