@juzi/wechaty-puppet-service 1.0.16 → 1.0.19
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.
- package/dist/cjs/src/client/payload-store.d.ts +2 -0
- package/dist/cjs/src/client/payload-store.d.ts.map +1 -1
- package/dist/cjs/src/client/payload-store.js +10 -0
- package/dist/cjs/src/client/payload-store.js.map +1 -1
- package/dist/cjs/src/client/puppet-service.d.ts +14 -11
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +127 -82
- package/dist/cjs/src/client/puppet-service.js.map +1 -1
- package/dist/cjs/src/config.d.ts +1 -0
- package/dist/cjs/src/config.d.ts.map +1 -1
- package/dist/cjs/src/config.js +2 -1
- package/dist/cjs/src/config.js.map +1 -1
- package/dist/cjs/src/package-json.js +5 -5
- package/dist/cjs/src/package-json.js.map +1 -1
- package/dist/cjs/src/server/event-stream-manager.d.ts.map +1 -1
- package/dist/cjs/src/server/event-stream-manager.js +7 -0
- package/dist/cjs/src/server/event-stream-manager.js.map +1 -1
- package/dist/cjs/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/cjs/src/server/puppet-implementation.js +98 -59
- package/dist/cjs/src/server/puppet-implementation.js.map +1 -1
- package/dist/esm/src/client/payload-store.d.ts +2 -0
- package/dist/esm/src/client/payload-store.d.ts.map +1 -1
- package/dist/esm/src/client/payload-store.js +10 -0
- package/dist/esm/src/client/payload-store.js.map +1 -1
- package/dist/esm/src/client/puppet-service.d.ts +14 -11
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +128 -83
- package/dist/esm/src/client/puppet-service.js.map +1 -1
- package/dist/esm/src/config.d.ts +1 -0
- package/dist/esm/src/config.d.ts.map +1 -1
- package/dist/esm/src/config.js +1 -0
- package/dist/esm/src/config.js.map +1 -1
- package/dist/esm/src/package-json.js +5 -5
- package/dist/esm/src/package-json.js.map +1 -1
- package/dist/esm/src/server/event-stream-manager.d.ts.map +1 -1
- package/dist/esm/src/server/event-stream-manager.js +7 -0
- package/dist/esm/src/server/event-stream-manager.js.map +1 -1
- package/dist/esm/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/esm/src/server/puppet-implementation.js +98 -59
- package/dist/esm/src/server/puppet-implementation.js.map +1 -1
- package/package.json +5 -5
- package/src/client/payload-store.ts +10 -0
- package/src/client/puppet-service.ts +162 -100
- package/src/config.ts +1 -0
- package/src/package-json.ts +5 -5
- package/src/server/event-stream-manager.ts +7 -0
- package/src/server/puppet-implementation.ts +106 -59
|
@@ -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;
|
|
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":";;;;;;AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,gDAAuB;AACvB,4CAAmB;AACnB,4CAAmB;AAEnB,oDAA8B;AAI9B,6CAAwC;AAExC,4CAGiC;AAEjC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,gBAAS,CAAA;AAUlC,MAAM,YAAY;
|
|
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,
|
|
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(
|
|
155
|
-
tagContactTagRemove(
|
|
156
|
-
tagGroupAdd(tagGroupName: string): Promise<
|
|
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(
|
|
159
|
-
tagTagDelete(
|
|
160
|
-
tagGroupList(): Promise<
|
|
161
|
-
tagGroupTagList(tagGroupId
|
|
162
|
-
tagTagList(): Promise<PUPPET.
|
|
163
|
-
tagContactTagList(contactId: string): Promise<PUPPET.
|
|
164
|
-
tagTagContactList(
|
|
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":";AAqBA,OAAO,KAAK,MAAM,MAAa,sBAAsB,CAAA;AAErD,OAAO,KAAK,EACV,gBAAgB,EAChB,OAAO,EACR,MAA8B,UAAU,CAAA;AAKzC,OAAO,EAEL,IAAI,IAAI,UAAU,EACnB,MAA8B,qBAAqB,CAAA;AACpD,OAAO,EACL,KAAK,EAEN,MAA8B,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAU,OAAO,CAAA;
|
|
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
|
|
@@ -1074,11 +1077,19 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1074
1077
|
.bind(this.grpcManager.client))(new wechaty_grpc_1.puppet.RoomListRequest());
|
|
1075
1078
|
return response.getIdsList();
|
|
1076
1079
|
}
|
|
1077
|
-
async roomDel(roomId,
|
|
1078
|
-
config_js_1.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId,
|
|
1080
|
+
async roomDel(roomId, contactIds) {
|
|
1081
|
+
config_js_1.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds);
|
|
1079
1082
|
const request = new wechaty_grpc_1.puppet.RoomDelRequest();
|
|
1080
1083
|
request.setId(roomId);
|
|
1081
|
-
|
|
1084
|
+
if (Array.isArray(contactIds)) {
|
|
1085
|
+
request.setContactIdsList(contactIds);
|
|
1086
|
+
if (contactIds.length === 1) {
|
|
1087
|
+
request.setContactId(contactIds[0]);
|
|
1088
|
+
}
|
|
1089
|
+
}
|
|
1090
|
+
else {
|
|
1091
|
+
request.setContactId(contactIds);
|
|
1092
|
+
}
|
|
1082
1093
|
await util_1.default.promisify(this.grpcManager.client.roomDel
|
|
1083
1094
|
.bind(this.grpcManager.client))(request);
|
|
1084
1095
|
}
|
|
@@ -1402,25 +1413,29 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1402
1413
|
* Tag
|
|
1403
1414
|
*
|
|
1404
1415
|
*/
|
|
1405
|
-
async tagContactTagAdd(
|
|
1406
|
-
config_js_1.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s
|
|
1416
|
+
async tagContactTagAdd(tags, contactIds) {
|
|
1417
|
+
config_js_1.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', JSON.stringify(tags), contactIds);
|
|
1407
1418
|
const request = new wechaty_grpc_1.puppet.TagContactTagAddRequest();
|
|
1408
|
-
|
|
1409
|
-
|
|
1410
|
-
|
|
1411
|
-
|
|
1412
|
-
|
|
1419
|
+
request.setTagsList(tags.map(t => {
|
|
1420
|
+
const tag = new wechaty_grpc_1.puppet.TagIdentifier();
|
|
1421
|
+
t.groupId && tag.setGroupId(t.groupId);
|
|
1422
|
+
tag.setId(t.id);
|
|
1423
|
+
return tag;
|
|
1424
|
+
}));
|
|
1425
|
+
request.setContactIdsList(contactIds);
|
|
1413
1426
|
await util_1.default.promisify(this.grpcManager.client.tagContactTagAdd
|
|
1414
1427
|
.bind(this.grpcManager.client))(request);
|
|
1415
1428
|
}
|
|
1416
|
-
async tagContactTagRemove(
|
|
1417
|
-
config_js_1.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s
|
|
1429
|
+
async tagContactTagRemove(tags, contactIds) {
|
|
1430
|
+
config_js_1.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', JSON.stringify(tags), contactIds);
|
|
1418
1431
|
const request = new wechaty_grpc_1.puppet.TagContactTagRemoveRequest();
|
|
1419
|
-
|
|
1420
|
-
|
|
1421
|
-
|
|
1422
|
-
|
|
1423
|
-
|
|
1432
|
+
request.setTagsList(tags.map(t => {
|
|
1433
|
+
const tag = new wechaty_grpc_1.puppet.TagIdentifier();
|
|
1434
|
+
t.groupId && tag.setGroupId(t.groupId);
|
|
1435
|
+
tag.setId(t.id);
|
|
1436
|
+
return tag;
|
|
1437
|
+
}));
|
|
1438
|
+
request.setContactIdsList(contactIds);
|
|
1424
1439
|
await util_1.default.promisify(this.grpcManager.client.tagContactTagRemove
|
|
1425
1440
|
.bind(this.grpcManager.client))(request);
|
|
1426
1441
|
}
|
|
@@ -1430,16 +1445,8 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1430
1445
|
request.setTagGroupName(tagGroupName);
|
|
1431
1446
|
const result = await util_1.default.promisify(this.grpcManager.client.tagGroupAdd
|
|
1432
1447
|
.bind(this.grpcManager.client))(request);
|
|
1433
|
-
const
|
|
1434
|
-
|
|
1435
|
-
const name = grpcPayload?.getName();
|
|
1436
|
-
if (id && name) {
|
|
1437
|
-
const payload = {
|
|
1438
|
-
id,
|
|
1439
|
-
name,
|
|
1440
|
-
};
|
|
1441
|
-
return payload;
|
|
1442
|
-
}
|
|
1448
|
+
const id = result.getTagGroupId();
|
|
1449
|
+
return id;
|
|
1443
1450
|
}
|
|
1444
1451
|
async tagGroupDelete(tagGroupId) {
|
|
1445
1452
|
config_js_1.log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId);
|
|
@@ -1448,8 +1455,8 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1448
1455
|
await util_1.default.promisify(this.grpcManager.client.tagGroupDelete
|
|
1449
1456
|
.bind(this.grpcManager.client))(request);
|
|
1450
1457
|
}
|
|
1451
|
-
async tagTagAdd(
|
|
1452
|
-
config_js_1.log.verbose('PuppetService', 'tagTagAdd(%s, %s)',
|
|
1458
|
+
async tagTagAdd(tagName, tagGroupId) {
|
|
1459
|
+
config_js_1.log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagName, tagGroupId);
|
|
1453
1460
|
const request = new wechaty_grpc_1.puppet.TagTagAddRequest();
|
|
1454
1461
|
if (typeof tagGroupId !== 'undefined') {
|
|
1455
1462
|
request.setTagGroupId(tagGroupId);
|
|
@@ -1457,28 +1464,24 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1457
1464
|
request.setTagName(tagName);
|
|
1458
1465
|
const result = await util_1.default.promisify(this.grpcManager.client.tagTagAdd
|
|
1459
1466
|
.bind(this.grpcManager.client))(request);
|
|
1460
|
-
const
|
|
1461
|
-
const id =
|
|
1462
|
-
const
|
|
1463
|
-
|
|
1464
|
-
|
|
1465
|
-
if (id && name && type) {
|
|
1466
|
-
const payload = {
|
|
1467
|
+
const tag = result.getTag();
|
|
1468
|
+
const id = tag?.getId();
|
|
1469
|
+
const groupId = tag?.getGroupId();
|
|
1470
|
+
if (id) {
|
|
1471
|
+
return {
|
|
1467
1472
|
id,
|
|
1468
|
-
name,
|
|
1469
1473
|
groupId,
|
|
1470
|
-
type,
|
|
1471
1474
|
};
|
|
1472
|
-
return payload;
|
|
1473
1475
|
}
|
|
1474
1476
|
}
|
|
1475
|
-
async tagTagDelete(
|
|
1476
|
-
config_js_1.log.verbose('PuppetService', 'tagTagDelete(%s
|
|
1477
|
+
async tagTagDelete(tag) {
|
|
1478
|
+
config_js_1.log.verbose('PuppetService', 'tagTagDelete(%s)', JSON.stringify(tag));
|
|
1477
1479
|
const request = new wechaty_grpc_1.puppet.TagTagDeleteRequest();
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
request.
|
|
1480
|
+
const tagProb = new wechaty_grpc_1.puppet.TagIdentifier();
|
|
1481
|
+
tag.groupId && tagProb.setGroupId(tag.groupId);
|
|
1482
|
+
tagProb.setId(tag.id);
|
|
1483
|
+
request.setTag(tagProb);
|
|
1484
|
+
request.setTag(tagProb);
|
|
1482
1485
|
await util_1.default.promisify(this.grpcManager.client.tagTagDelete
|
|
1483
1486
|
.bind(this.grpcManager.client))(request);
|
|
1484
1487
|
}
|
|
@@ -1487,14 +1490,8 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1487
1490
|
const request = new wechaty_grpc_1.puppet.TagGroupListRequest();
|
|
1488
1491
|
const result = await util_1.default.promisify(this.grpcManager.client.tagGroupList
|
|
1489
1492
|
.bind(this.grpcManager.client))(request);
|
|
1490
|
-
const
|
|
1491
|
-
|
|
1492
|
-
return {
|
|
1493
|
-
id: payload.getId(),
|
|
1494
|
-
name: payload.getName(),
|
|
1495
|
-
};
|
|
1496
|
-
});
|
|
1497
|
-
return payloads;
|
|
1493
|
+
const groupIds = result.getTagGroupIdsList();
|
|
1494
|
+
return groupIds;
|
|
1498
1495
|
}
|
|
1499
1496
|
async tagGroupTagList(tagGroupId) {
|
|
1500
1497
|
config_js_1.log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId);
|
|
@@ -1504,32 +1501,28 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1504
1501
|
}
|
|
1505
1502
|
const result = await util_1.default.promisify(this.grpcManager.client.tagGroupTagList
|
|
1506
1503
|
.bind(this.grpcManager.client))(request);
|
|
1507
|
-
const
|
|
1508
|
-
const
|
|
1504
|
+
const tags = result.getTagsList();
|
|
1505
|
+
const tagIdentifiers = tags.map(tag => {
|
|
1509
1506
|
return {
|
|
1510
|
-
id:
|
|
1511
|
-
|
|
1512
|
-
groupId: payload.getGroupId(),
|
|
1513
|
-
type: payload.getType(),
|
|
1507
|
+
id: tag.getId(),
|
|
1508
|
+
groupId: tag.getGroupId(),
|
|
1514
1509
|
};
|
|
1515
1510
|
});
|
|
1516
|
-
return
|
|
1511
|
+
return tagIdentifiers;
|
|
1517
1512
|
}
|
|
1518
1513
|
async tagTagList() {
|
|
1519
1514
|
config_js_1.log.verbose('PuppetService', 'tagTagList()');
|
|
1520
1515
|
const request = new wechaty_grpc_1.puppet.TagTagListRequest();
|
|
1521
1516
|
const result = await util_1.default.promisify(this.grpcManager.client.tagTagList
|
|
1522
1517
|
.bind(this.grpcManager.client))(request);
|
|
1523
|
-
const
|
|
1524
|
-
const
|
|
1518
|
+
const tags = result.getTagsList();
|
|
1519
|
+
const tagIdentifiers = tags.map(tag => {
|
|
1525
1520
|
return {
|
|
1526
|
-
id:
|
|
1527
|
-
|
|
1528
|
-
groupId: payload.getGroupId(),
|
|
1529
|
-
type: payload.getType(),
|
|
1521
|
+
id: tag.getId(),
|
|
1522
|
+
groupId: tag.getGroupId(),
|
|
1530
1523
|
};
|
|
1531
1524
|
});
|
|
1532
|
-
return
|
|
1525
|
+
return tagIdentifiers;
|
|
1533
1526
|
}
|
|
1534
1527
|
async tagContactTagList(contactId) {
|
|
1535
1528
|
config_js_1.log.verbose('PuppetService', 'tagContactTagList(%s)', contactId);
|
|
@@ -1537,28 +1530,80 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1537
1530
|
request.setContactId(contactId);
|
|
1538
1531
|
const result = await util_1.default.promisify(this.grpcManager.client.tagContactTagList
|
|
1539
1532
|
.bind(this.grpcManager.client))(request);
|
|
1540
|
-
const grpcPayloads = result.
|
|
1541
|
-
const
|
|
1533
|
+
const grpcPayloads = result.getTagsList();
|
|
1534
|
+
const tags = grpcPayloads.map(tag => {
|
|
1542
1535
|
return {
|
|
1543
|
-
id:
|
|
1544
|
-
|
|
1545
|
-
groupId: payload.getGroupId(),
|
|
1546
|
-
type: payload.getType(),
|
|
1536
|
+
id: tag.getId(),
|
|
1537
|
+
groupId: tag.getGroupId(),
|
|
1547
1538
|
};
|
|
1548
1539
|
});
|
|
1549
|
-
return
|
|
1540
|
+
return tags;
|
|
1550
1541
|
}
|
|
1551
|
-
async tagTagContactList(
|
|
1552
|
-
config_js_1.log.verbose('PuppetService', 'tagTagContactList(%s
|
|
1542
|
+
async tagTagContactList(tag) {
|
|
1543
|
+
config_js_1.log.verbose('PuppetService', 'tagTagContactList(%s)', JSON.stringify(tag));
|
|
1553
1544
|
const request = new wechaty_grpc_1.puppet.TagTagContactListRequest();
|
|
1554
|
-
|
|
1555
|
-
|
|
1556
|
-
|
|
1557
|
-
request.
|
|
1545
|
+
const tagProb = new wechaty_grpc_1.puppet.TagIdentifier();
|
|
1546
|
+
tag.groupId && tagProb.setGroupId(tag.groupId);
|
|
1547
|
+
tagProb.setId(tag.id);
|
|
1548
|
+
request.setTag(tagProb);
|
|
1558
1549
|
const result = await util_1.default.promisify(this.grpcManager.client.tagTagContactList
|
|
1559
1550
|
.bind(this.grpcManager.client))(request);
|
|
1560
|
-
const
|
|
1561
|
-
return
|
|
1551
|
+
const contactIds = result.getContactIdsList();
|
|
1552
|
+
return contactIds;
|
|
1553
|
+
}
|
|
1554
|
+
async tagGroupPayloadPuppet(id) {
|
|
1555
|
+
config_js_1.log.verbose('PuppetService', 'tagGroupPayload(%s)', id);
|
|
1556
|
+
const cachedPayload = await this._payloadStore.tagGroup?.get(id);
|
|
1557
|
+
if (cachedPayload) {
|
|
1558
|
+
config_js_1.log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id);
|
|
1559
|
+
return cachedPayload;
|
|
1560
|
+
}
|
|
1561
|
+
const request = new wechaty_grpc_1.puppet.TagGroupPayloadRequest();
|
|
1562
|
+
request.setGroupId(id);
|
|
1563
|
+
const response = await util_1.default.promisify(this.grpcManager.client.tagGroupPayload
|
|
1564
|
+
.bind(this.grpcManager.client))(request);
|
|
1565
|
+
const grpcPayload = response.getPayload();
|
|
1566
|
+
if (!grpcPayload) {
|
|
1567
|
+
throw new Error(`tagGroup ${id} got no payload!`);
|
|
1568
|
+
}
|
|
1569
|
+
const payload = {
|
|
1570
|
+
id: grpcPayload.getId(),
|
|
1571
|
+
name: grpcPayload.getName(),
|
|
1572
|
+
};
|
|
1573
|
+
await this._payloadStore.tagGroup?.set(id, payload);
|
|
1574
|
+
config_js_1.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id);
|
|
1575
|
+
return payload;
|
|
1576
|
+
}
|
|
1577
|
+
async tagPayloadPuppet(tag) {
|
|
1578
|
+
config_js_1.log.verbose('PuppetService', 'tagPayloadPuppet(%s)', JSON.stringify(tag));
|
|
1579
|
+
const key = tag.groupId || '' + config_js_1.FOUR_PER_EM_SPACE + tag.id;
|
|
1580
|
+
const cachedPayload = await this._payloadStore.tag?.get(key);
|
|
1581
|
+
if (cachedPayload) {
|
|
1582
|
+
config_js_1.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tag);
|
|
1583
|
+
return cachedPayload;
|
|
1584
|
+
}
|
|
1585
|
+
const tagIdentifier = new wechaty_grpc_1.puppet.TagIdentifier();
|
|
1586
|
+
tagIdentifier.setId(tag.id);
|
|
1587
|
+
if (tag.groupId) {
|
|
1588
|
+
tagIdentifier.setGroupId(tag.groupId);
|
|
1589
|
+
}
|
|
1590
|
+
const request = new wechaty_grpc_1.puppet.TagPayloadRequest();
|
|
1591
|
+
request.setTag(tagIdentifier);
|
|
1592
|
+
const response = await util_1.default.promisify(this.grpcManager.client.tagPayload
|
|
1593
|
+
.bind(this.grpcManager.client))(request);
|
|
1594
|
+
const grpcPayload = response.getPayload();
|
|
1595
|
+
if (!grpcPayload) {
|
|
1596
|
+
throw new Error(`tag ${JSON.stringify(tag)} got no payload!`);
|
|
1597
|
+
}
|
|
1598
|
+
const payload = {
|
|
1599
|
+
id: grpcPayload.getId(),
|
|
1600
|
+
name: grpcPayload.getName(),
|
|
1601
|
+
groupId: grpcPayload.getGroupId(),
|
|
1602
|
+
type: grpcPayload.getType(),
|
|
1603
|
+
};
|
|
1604
|
+
await this._payloadStore.tag?.set(key, payload);
|
|
1605
|
+
config_js_1.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', JSON.stringify(tag));
|
|
1606
|
+
return payload;
|
|
1562
1607
|
}
|
|
1563
1608
|
/**
|
|
1564
1609
|
* @deprecated Will be removed in v2.0
|