@juzi/wechaty-puppet-service 1.0.74 → 1.0.76
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.map +1 -1
- package/dist/cjs/src/client/payload-store.js +2 -4
- package/dist/cjs/src/client/payload-store.js.map +1 -1
- package/dist/cjs/src/client/puppet-service.d.ts +11 -3
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +75 -24
- 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/env-vars.d.ts +2 -1
- package/dist/cjs/src/env-vars.d.ts.map +1 -1
- package/dist/cjs/src/env-vars.js +5 -1
- package/dist/cjs/src/env-vars.js.map +1 -1
- package/dist/cjs/src/package-json.js +4 -4
- package/dist/cjs/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/cjs/src/server/puppet-implementation.js +21 -0
- package/dist/cjs/src/server/puppet-implementation.js.map +1 -1
- package/dist/cjs/src/utils/pb-payload-helper.d.ts +4 -0
- package/dist/cjs/src/utils/pb-payload-helper.d.ts.map +1 -1
- package/dist/cjs/src/utils/pb-payload-helper.js +126 -8
- package/dist/cjs/src/utils/pb-payload-helper.js.map +1 -1
- package/dist/esm/src/client/payload-store.d.ts.map +1 -1
- package/dist/esm/src/client/payload-store.js +2 -4
- package/dist/esm/src/client/payload-store.js.map +1 -1
- package/dist/esm/src/client/puppet-service.d.ts +11 -3
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +76 -25
- 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/env-vars.d.ts +2 -1
- package/dist/esm/src/env-vars.d.ts.map +1 -1
- package/dist/esm/src/env-vars.js +4 -1
- package/dist/esm/src/env-vars.js.map +1 -1
- package/dist/esm/src/package-json.js +4 -4
- package/dist/esm/src/server/puppet-implementation.d.ts.map +1 -1
- package/dist/esm/src/server/puppet-implementation.js +22 -1
- package/dist/esm/src/server/puppet-implementation.js.map +1 -1
- package/dist/esm/src/utils/pb-payload-helper.d.ts +4 -0
- package/dist/esm/src/utils/pb-payload-helper.d.ts.map +1 -1
- package/dist/esm/src/utils/pb-payload-helper.js +121 -7
- package/dist/esm/src/utils/pb-payload-helper.js.map +1 -1
- package/package.json +4 -4
- package/src/client/payload-store.ts +2 -3
- package/src/client/puppet-service.ts +90 -25
- package/src/env-vars.ts +5 -0
- package/src/package-json.ts +4 -4
- package/src/server/puppet-implementation.ts +28 -1
- package/src/utils/pb-payload-helper.ts +134 -7
|
@@ -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;
|
|
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;AAUxC,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;IAcH,OAAO,CAAC,OAAO;IAVrB,OAAO,CAAC,EAAQ,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC3D,UAAU,CAAC,EAAK,UAAU,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAA;IAC1D,IAAI,CAAC,EAAW,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACxD,GAAG,CAAC,EAAY,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACvD,QAAQ,CAAC,EAAO,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC5D,aAAa,CAAC,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEjD,SAAS,CAAC,QAAQ,EAAI,MAAM,CAAA;IAC5B,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;gBAEP,OAAO,EAAE,mBAAmB;IAqBjD;;;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;CAkBhC;AAED,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
|
@@ -29,6 +29,7 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
29
29
|
const semver_1 = __importDefault(require("semver"));
|
|
30
30
|
const flash_store_1 = require("flash-store");
|
|
31
31
|
const config_js_1 = require("../config.js");
|
|
32
|
+
const env_vars_js_1 = require("../env-vars.js");
|
|
32
33
|
const { major, minor } = semver_1.default;
|
|
33
34
|
class PayloadStore {
|
|
34
35
|
options;
|
|
@@ -49,12 +50,9 @@ class PayloadStore {
|
|
|
49
50
|
if (!fs_1.default.existsSync(this.storeDir)) {
|
|
50
51
|
fs_1.default.mkdirSync(this.storeDir, { recursive: true });
|
|
51
52
|
}
|
|
52
|
-
|
|
53
|
+
if ((0, env_vars_js_1.WECHATY_PUPPET_SERVICE_DISABLE_EVENT_CACHE)()) {
|
|
53
54
|
this.miscellaneous = new flash_store_1.FlashStore(path_1.default.join(this.storeDir, 'miscellaneous')); // account-free data
|
|
54
55
|
}
|
|
55
|
-
catch (e) {
|
|
56
|
-
config_js_1.log.error('PayloadStore', 'constructor() store failed to init, will continue without it.');
|
|
57
|
-
}
|
|
58
56
|
}
|
|
59
57
|
/**
|
|
60
58
|
* When starting the store, we need to know the accountId
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"payload-store.js","sourceRoot":"","sources":["../../../../src/client/payload-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,13 +95,14 @@ declare class PuppetService extends PUPPET.Puppet {
|
|
|
95
95
|
messageContact(messageId: string): Promise<string>;
|
|
96
96
|
messageChannel(messageId: string): Promise<PUPPET.payloads.Channel>;
|
|
97
97
|
messageCallRecord(messageId: string): Promise<PUPPET.payloads.CallRecord>;
|
|
98
|
+
messageChatHistory(messageId: string): Promise<PUPPET.payloads.ChatHistory[]>;
|
|
98
99
|
messageSendMiniProgram(conversationId: string, miniProgramPayload: PUPPET.payloads.MiniProgram): Promise<void | string>;
|
|
99
100
|
messageSendLocation(conversationId: string, locationPayload: PUPPET.payloads.Location): Promise<void | string>;
|
|
100
101
|
messageSendChannel(conversationId: string, channelPayload: PUPPET.payloads.Channel): Promise<void | string>;
|
|
101
102
|
messageRecall(messageId: string): Promise<boolean>;
|
|
102
103
|
messageFile(id: string): Promise<FileBoxInterface>;
|
|
103
104
|
messagePreview(id: string): Promise<FileBoxInterface | undefined>;
|
|
104
|
-
messageForward(conversationId: string,
|
|
105
|
+
messageForward(conversationId: string, messageIds: string | string[]): Promise<string | void>;
|
|
105
106
|
messageRawPayload(id: string): Promise<PUPPET.payloads.Message>;
|
|
106
107
|
messageRawPayloadParser(payload: PUPPET.payloads.Message): Promise<PUPPET.payloads.Message>;
|
|
107
108
|
messageSendText(conversationId: string, text: string, options?: PUPPET.types.MessageSendTextOptions): Promise<void | string>;
|
|
@@ -198,10 +199,17 @@ declare class PuppetService extends PUPPET.Puppet {
|
|
|
198
199
|
private waitingForReady;
|
|
199
200
|
private reconnectIndicator;
|
|
200
201
|
reset(): Promise<void>;
|
|
201
|
-
|
|
202
|
+
getMiscellaneousStoreData(): Promise<{
|
|
202
203
|
lastEventSeq: string | undefined;
|
|
203
|
-
lastEventTimestamp: string |
|
|
204
|
+
lastEventTimestamp: string | undefined;
|
|
205
|
+
accountId: string | undefined;
|
|
204
206
|
}>;
|
|
207
|
+
setMiscellaneousStoreData(data: {
|
|
208
|
+
lastEventSeq?: string;
|
|
209
|
+
lastEventTimestamp?: string;
|
|
210
|
+
accountId?: string;
|
|
211
|
+
}): Promise<void>;
|
|
212
|
+
resetMiscellaneousStoreData(): Promise<void>;
|
|
205
213
|
}
|
|
206
214
|
export { PuppetService, };
|
|
207
215
|
export default PuppetService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":";AAoBA,OAAO,KAAK,MAAM,MAAa,sBAAsB,CAAA;AAErD,OAAO,KAAK,EACV,gBAAgB,EAChB,OAAO,EACR,MAA8B,UAAU,CAAA;AAyBzC,OAAO,EAAE,WAAW,EAAE,MAAO,mBAAmB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAA;AAInG,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC,aAAa,GAAG;IACxD,SAAS,CAAC,EAAI,MAAM,CAAA;IACpB,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAO,MAAM,CAAA;QACpB,UAAU,CAAC,EAAG,MAAM,CAAA;QACpB;;;WAGG;QACH,OAAO,CAAC,EAAG,OAAO,CAAA;KACnB,CAAA;CACF,CAAA;AAKD,cAAM,aAAc,SAAQ,MAAM,CAAC,MAAM;IAyBrB,OAAO,EAAE,oBAAoB;IAvB/C,gBAAyB,OAAO,SAAU;IAE1C,SAAS,CAAC,aAAa,EAAE,YAAY,CAAA;IAErC,OAAO,CAAC,mBAAmB,CAAQ;IAEnC,SAAS,CAAC,YAAY,CAAC,EAAE,WAAW,CAAA;IACpC,IAAI,WAAW,IAAK,WAAW,CAM9B;IAED;;;;OAIG;IACH,SAAS,CAAC,WAAW,EAAE,OAAO,OAAO,CAAA;gBAGnB,OAAO,GAAE,oBAAyB;cAgBpC,gBAAgB,CAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAYpE,IAAI;IAIJ,OAAO;IAID,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,8 +130,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
130
130
|
this.bridgeGrpcEventStream(grpcManager);
|
|
131
131
|
config_js_1.log.info('PuppetService', 'start() setting up bridge grpc event stream ... done');
|
|
132
132
|
config_js_1.log.info('PuppetService', 'start() starting grpc manager...');
|
|
133
|
-
const { lastEventSeq } = await this.
|
|
134
|
-
const accountId = await this._payloadStore.miscellaneous?.get('accountId') || '';
|
|
133
|
+
const { lastEventSeq, accountId } = await this.getMiscellaneousStoreData();
|
|
135
134
|
await grpcManager.start(lastEventSeq, accountId);
|
|
136
135
|
config_js_1.log.info('PuppetService', 'start() starting grpc manager... done');
|
|
137
136
|
config_js_1.log.info('PuppetService', 'start healthCheck');
|
|
@@ -214,13 +213,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
214
213
|
data: `onGrpcStreamEvent(${event_type_rev_js_1.EventTypeRev[type]})`,
|
|
215
214
|
});
|
|
216
215
|
}
|
|
217
|
-
if (seq) {
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
}
|
|
216
|
+
if (seq && !config_js_1.envVars.WECHATY_PUPPET_SERVICE_DISABLE_EVENT_CACHE()) {
|
|
217
|
+
const { lastEventSeq } = await this.getMiscellaneousStoreData();
|
|
218
|
+
if (!lastEventSeq || (seq > Number(lastEventSeq) || seq === 1)) {
|
|
219
|
+
await this.setMiscellaneousStoreData({
|
|
220
|
+
lastEventSeq: seq.toString(),
|
|
221
|
+
lastEventTimestamp: timestamp,
|
|
222
|
+
});
|
|
224
223
|
}
|
|
225
224
|
}
|
|
226
225
|
switch (type) {
|
|
@@ -243,12 +242,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
243
242
|
return;
|
|
244
243
|
}
|
|
245
244
|
const loginPayload = JSON.parse(payload);
|
|
246
|
-
if (
|
|
247
|
-
const accountId = await this.
|
|
245
|
+
if (!config_js_1.envVars.WECHATY_PUPPET_SERVICE_DISABLE_EVENT_CACHE()) {
|
|
246
|
+
const { accountId } = await this.getMiscellaneousStoreData();
|
|
248
247
|
if (accountId !== loginPayload.contactId) {
|
|
249
|
-
await this.
|
|
248
|
+
await this.resetMiscellaneousStoreData();
|
|
249
|
+
await this.setMiscellaneousStoreData({
|
|
250
|
+
accountId,
|
|
251
|
+
});
|
|
250
252
|
}
|
|
251
|
-
await this._payloadStore.miscellaneous.set('accountId', loginPayload.contactId);
|
|
252
253
|
}
|
|
253
254
|
(async () => this.login(loginPayload.contactId))().catch(e => config_js_1.log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s', e.message));
|
|
254
255
|
}
|
|
@@ -256,7 +257,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
256
257
|
case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_LOGOUT:
|
|
257
258
|
{
|
|
258
259
|
const logoutPayload = JSON.parse(payload);
|
|
259
|
-
|
|
260
|
+
if (!config_js_1.envVars.WECHATY_PUPPET_SERVICE_DISABLE_EVENT_CACHE()) {
|
|
261
|
+
await this.resetMiscellaneousStoreData();
|
|
262
|
+
}
|
|
263
|
+
;
|
|
260
264
|
(async () => this.logout(logoutPayload.data))().catch(e => config_js_1.log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s', e.message));
|
|
261
265
|
}
|
|
262
266
|
break;
|
|
@@ -783,6 +787,15 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
783
787
|
const payload = (0, pb_payload_helper_js_1.callRecordPbToPayload)(response.getCallRecord());
|
|
784
788
|
return payload;
|
|
785
789
|
}
|
|
790
|
+
async messageChatHistory(messageId) {
|
|
791
|
+
config_js_1.log.verbose('PuppetService', 'messageChatHistory(%s)', messageId);
|
|
792
|
+
const request = new wechaty_grpc_1.puppet.MessageChatHistoryRequest();
|
|
793
|
+
request.setId(messageId);
|
|
794
|
+
const response = await util_1.default.promisify(this.grpcManager.client.messageChatHistory
|
|
795
|
+
.bind(this.grpcManager.client))(request);
|
|
796
|
+
const payload = (0, pb_payload_helper_js_1.chatHistoryPbToPayload)(this.FileBoxUuid, response.getChatHistoryListList());
|
|
797
|
+
return payload;
|
|
798
|
+
}
|
|
786
799
|
async messageSendMiniProgram(conversationId, miniProgramPayload) {
|
|
787
800
|
config_js_1.log.verbose('PuppetService', 'messageSendMiniProgram(%s, "%s")', conversationId, JSON.stringify(miniProgramPayload));
|
|
788
801
|
const request = new wechaty_grpc_1.puppet.MessageSendMiniProgramRequest();
|
|
@@ -905,16 +918,24 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
905
918
|
}
|
|
906
919
|
return undefined;
|
|
907
920
|
}
|
|
908
|
-
async messageForward(conversationId,
|
|
909
|
-
config_js_1.log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId,
|
|
921
|
+
async messageForward(conversationId, messageIds) {
|
|
922
|
+
config_js_1.log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId, messageIds);
|
|
910
923
|
const request = new wechaty_grpc_1.puppet.MessageForwardRequest();
|
|
911
924
|
request.setConversationId(conversationId);
|
|
912
|
-
|
|
913
|
-
|
|
925
|
+
if (Array.isArray(messageIds)) {
|
|
926
|
+
request.setMessageIdsList(messageIds);
|
|
927
|
+
if (messageIds.length === 1) {
|
|
928
|
+
request.setMessageId(messageIds[0]);
|
|
929
|
+
}
|
|
930
|
+
}
|
|
931
|
+
else {
|
|
932
|
+
request.setMessageId(messageIds);
|
|
933
|
+
}
|
|
934
|
+
config_js_1.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) about to call grpc`);
|
|
914
935
|
const response = await util_1.default.promisify(this.grpcManager.client.messageForward
|
|
915
936
|
.bind(this.grpcManager.client))(request);
|
|
916
937
|
const forwardedMessageId = response.getId();
|
|
917
|
-
config_js_1.log.info('PuppetService', `messageForward(${conversationId}, ${
|
|
938
|
+
config_js_1.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) grpc called, messageId: ${forwardedMessageId}`);
|
|
918
939
|
if (forwardedMessageId) {
|
|
919
940
|
return forwardedMessageId;
|
|
920
941
|
}
|
|
@@ -1928,8 +1949,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1928
1949
|
}
|
|
1929
1950
|
this.reconnectIndicator.value(true);
|
|
1930
1951
|
this.grpcManager.stopStream();
|
|
1931
|
-
const { lastEventSeq } = await this.
|
|
1932
|
-
const accountId = await this._payloadStore.miscellaneous?.get('accountId') || '';
|
|
1952
|
+
const { lastEventSeq, accountId } = await this.getMiscellaneousStoreData();
|
|
1933
1953
|
const onLoginResolve = (resolve) => {
|
|
1934
1954
|
const onLogin = (event) => {
|
|
1935
1955
|
const type = event.getType();
|
|
@@ -2011,19 +2031,50 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2011
2031
|
config_js_1.log.warn('PuppetService', 'waiting for event reset ready error, will do nothing');
|
|
2012
2032
|
}
|
|
2013
2033
|
}
|
|
2014
|
-
async
|
|
2015
|
-
|
|
2034
|
+
async getMiscellaneousStoreData() {
|
|
2035
|
+
if (config_js_1.envVars.WECHATY_PUPPET_SERVICE_DISABLE_EVENT_CACHE()) {
|
|
2036
|
+
return {
|
|
2037
|
+
lastEventSeq: undefined,
|
|
2038
|
+
lastEventTimestamp: undefined,
|
|
2039
|
+
accountId: '',
|
|
2040
|
+
};
|
|
2041
|
+
}
|
|
2042
|
+
const lastEventTimestamp = await this._payloadStore.miscellaneous?.get('eventTimestamp');
|
|
2016
2043
|
let lastEventSeq = await this._payloadStore.miscellaneous?.get('eventSeq');
|
|
2017
2044
|
if ((Date.now() - Number(lastEventTimestamp || 0)) > this.timeoutMilliseconds) {
|
|
2018
2045
|
config_js_1.log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`);
|
|
2019
2046
|
lastEventSeq = undefined;
|
|
2020
2047
|
}
|
|
2021
|
-
|
|
2048
|
+
const accountId = await this._payloadStore.miscellaneous?.get('accountId');
|
|
2049
|
+
config_js_1.log.info(`getMiscellaneousStoreData() timestamp: ${lastEventTimestamp}, seq: ${lastEventSeq}`);
|
|
2022
2050
|
return {
|
|
2023
2051
|
lastEventSeq,
|
|
2024
2052
|
lastEventTimestamp,
|
|
2053
|
+
accountId,
|
|
2025
2054
|
};
|
|
2026
2055
|
}
|
|
2056
|
+
async setMiscellaneousStoreData(data) {
|
|
2057
|
+
if (config_js_1.envVars.WECHATY_PUPPET_SERVICE_DISABLE_EVENT_CACHE()) {
|
|
2058
|
+
return;
|
|
2059
|
+
}
|
|
2060
|
+
if (typeof data.lastEventSeq !== 'undefined') {
|
|
2061
|
+
await this._payloadStore.miscellaneous?.set('lastEventSeq', data.lastEventSeq);
|
|
2062
|
+
}
|
|
2063
|
+
if (typeof data.lastEventTimestamp !== 'undefined') {
|
|
2064
|
+
await this._payloadStore.miscellaneous?.set('lastEventTimestamp', data.lastEventTimestamp);
|
|
2065
|
+
}
|
|
2066
|
+
if (typeof data.accountId !== 'undefined') {
|
|
2067
|
+
await this._payloadStore.miscellaneous?.set('accountId', data.accountId);
|
|
2068
|
+
}
|
|
2069
|
+
}
|
|
2070
|
+
async resetMiscellaneousStoreData() {
|
|
2071
|
+
if (config_js_1.envVars.WECHATY_PUPPET_SERVICE_DISABLE_EVENT_CACHE()) {
|
|
2072
|
+
return;
|
|
2073
|
+
}
|
|
2074
|
+
await this._payloadStore.miscellaneous?.delete('lastEventSeq');
|
|
2075
|
+
await this._payloadStore.miscellaneous?.delete('lastEventTimestamp');
|
|
2076
|
+
await this._payloadStore.miscellaneous?.delete('accountId');
|
|
2077
|
+
}
|
|
2027
2078
|
}
|
|
2028
2079
|
exports.PuppetService = PuppetService;
|
|
2029
2080
|
exports.default = PuppetService;
|