@juzi/wechaty-puppet-service 1.0.51 → 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.
- package/dist/cjs/src/client/duck/reducers.d.ts +1 -1
- package/dist/cjs/src/client/duck/reducers.d.ts.map +1 -1
- package/dist/cjs/src/client/grpc-manager.d.ts +2 -2
- package/dist/cjs/src/client/grpc-manager.d.ts.map +1 -1
- package/dist/cjs/src/client/grpc-manager.js +11 -4
- package/dist/cjs/src/client/grpc-manager.js.map +1 -1
- package/dist/cjs/src/client/payload-store.d.ts +1 -0
- package/dist/cjs/src/client/payload-store.d.ts.map +1 -1
- package/dist/cjs/src/client/payload-store.js +6 -0
- package/dist/cjs/src/client/payload-store.js.map +1 -1
- package/dist/cjs/src/client/puppet-service.d.ts +2 -1
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +17 -2
- package/dist/cjs/src/client/puppet-service.js.map +1 -1
- package/dist/cjs/src/file-box-helper/uuidify-file-box-grpc.d.ts +1 -1
- package/dist/cjs/src/file-box-helper/uuidify-file-box-grpc.d.ts.map +1 -1
- package/dist/cjs/src/file-box-helper/uuidify-file-box-local.d.ts +1 -1
- package/dist/cjs/src/file-box-helper/uuidify-file-box-local.d.ts.map +1 -1
- package/dist/cjs/src/package-json.d.ts.map +1 -1
- package/dist/cjs/src/package-json.js +3 -2
- package/dist/cjs/src/package-json.js.map +1 -1
- package/dist/cjs/src/server/grpc-error.d.ts +1 -1
- package/dist/cjs/src/server/grpc-error.d.ts.map +1 -1
- package/dist/cjs/tests/uuid-file-box.spec.js +2 -1
- package/dist/cjs/tests/uuid-file-box.spec.js.map +1 -1
- package/dist/esm/src/client/duck/reducers.d.ts +1 -1
- package/dist/esm/src/client/duck/reducers.d.ts.map +1 -1
- package/dist/esm/src/client/grpc-manager.d.ts +2 -2
- package/dist/esm/src/client/grpc-manager.d.ts.map +1 -1
- package/dist/esm/src/client/grpc-manager.js +11 -4
- package/dist/esm/src/client/grpc-manager.js.map +1 -1
- package/dist/esm/src/client/payload-store.d.ts +1 -0
- package/dist/esm/src/client/payload-store.d.ts.map +1 -1
- package/dist/esm/src/client/payload-store.js +6 -0
- package/dist/esm/src/client/payload-store.js.map +1 -1
- package/dist/esm/src/client/puppet-service.d.ts +2 -1
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +17 -2
- package/dist/esm/src/client/puppet-service.js.map +1 -1
- package/dist/esm/src/file-box-helper/uuidify-file-box-grpc.d.ts +1 -1
- package/dist/esm/src/file-box-helper/uuidify-file-box-grpc.d.ts.map +1 -1
- package/dist/esm/src/file-box-helper/uuidify-file-box-local.d.ts +1 -1
- package/dist/esm/src/file-box-helper/uuidify-file-box-local.d.ts.map +1 -1
- package/dist/esm/src/package-json.d.ts.map +1 -1
- package/dist/esm/src/package-json.js +3 -2
- package/dist/esm/src/package-json.js.map +1 -1
- package/dist/esm/src/server/grpc-error.d.ts +1 -1
- package/dist/esm/src/server/grpc-error.d.ts.map +1 -1
- package/dist/esm/tests/uuid-file-box.spec.js +2 -1
- package/dist/esm/tests/uuid-file-box.spec.js.map +1 -1
- package/package.json +3 -2
- package/src/client/grpc-manager.ts +12 -4
- package/src/client/payload-store.ts +14 -5
- package/src/client/puppet-service.ts +21 -3
- package/src/package-json.ts +3 -2
|
@@ -54,6 +54,6 @@ declare const reducer: import("typesafe-actions").Reducer<import("utility-types/
|
|
|
54
54
|
handlers: Record<"wechaty-puppet-service/NOP", (state: import("utility-types/dist/mapped-types.js")._DeepReadonlyObject<unknown>, action: import("typesafe-actions").EmptyAction<"wechaty-puppet-service/NOP">) => import("utility-types/dist/mapped-types.js")._DeepReadonlyObject<unknown>>;
|
|
55
55
|
};
|
|
56
56
|
};
|
|
57
|
-
export type State = ReturnType<typeof reducer>;
|
|
57
|
+
export declare type State = ReturnType<typeof reducer>;
|
|
58
58
|
export default reducer;
|
|
59
59
|
//# sourceMappingURL=reducers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducers.d.ts","sourceRoot":"","sources":["../../../../../src/client/duck/reducers.ts"],"names":[],"mappings":"AA+BA,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAC0C,CAAA;AAEvD,
|
|
1
|
+
{"version":3,"file":"reducers.d.ts","sourceRoot":"","sources":["../../../../../src/client/duck/reducers.ts"],"names":[],"mappings":"AA+BA,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAC0C,CAAA;AAEvD,oBAAY,KAAK,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAA;AAC9C,eAAe,OAAO,CAAA"}
|
|
@@ -18,11 +18,11 @@ declare class GrpcManager extends EventEmitter {
|
|
|
18
18
|
serverName: string;
|
|
19
19
|
token: WechatyToken;
|
|
20
20
|
constructor(options: PuppetServiceOptions);
|
|
21
|
-
start(): Promise<void>;
|
|
21
|
+
start(lastEventSeq?: string, accountId?: string): Promise<void>;
|
|
22
22
|
stop(): Promise<void>;
|
|
23
23
|
protected initClient(): Promise<void>;
|
|
24
24
|
protected destroyClient(): void;
|
|
25
|
-
protected startStream(): Promise<void>;
|
|
25
|
+
protected startStream(lastEventSeq?: string, accountId?: string): Promise<void>;
|
|
26
26
|
protected stopStream(): void;
|
|
27
27
|
}
|
|
28
28
|
export { GrpcManager, };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-manager.d.ts","sourceRoot":"","sources":["../../../../src/client/grpc-manager.ts"],"names":[],"mappings":";;AAoBA,OAAO,YAAY,MAAM,QAAQ,CAAA;AAIjC,OAAO,EACL,IAAI,EACJ,MAAM,EACP,MAA0B,oBAAoB,CAAA;AAI/C,OAAO,EACL,YAAY,EAEb,MAA0B,eAAe,CAAA;AAc1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAU/D,cAAM,WAAY,SAAQ,YAAY;IAsBvB,OAAO,CAAC,OAAO;IApB5B,SAAS,CAAC,OAAO,CAAC,EAAI,MAAM,CAAC,YAAY,CAAA;IACzC,IAAU,MAAM,IAAM,MAAM,CAAC,YAAY,CAMxC;IAED,WAAW,CAAC,EAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAE9D;;OAEG;IACH,MAAM,EAAO,MAAM,CAAA;IACnB,UAAU,EAAG,OAAO,CAAA;IACpB,QAAQ,EAAK,MAAM,CAAA;IACnB,UAAU,EAAG,MAAM,CAAA;IACnB,KAAK,EAAQ,YAAY,CAAA;gBAEJ,OAAO,EAAE,oBAAoB;IAkE5C,KAAK,
|
|
1
|
+
{"version":3,"file":"grpc-manager.d.ts","sourceRoot":"","sources":["../../../../src/client/grpc-manager.ts"],"names":[],"mappings":";;AAoBA,OAAO,YAAY,MAAM,QAAQ,CAAA;AAIjC,OAAO,EACL,IAAI,EACJ,MAAM,EACP,MAA0B,oBAAoB,CAAA;AAI/C,OAAO,EACL,YAAY,EAEb,MAA0B,eAAe,CAAA;AAc1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAU/D,cAAM,WAAY,SAAQ,YAAY;IAsBvB,OAAO,CAAC,OAAO;IApB5B,SAAS,CAAC,OAAO,CAAC,EAAI,MAAM,CAAC,YAAY,CAAA;IACzC,IAAU,MAAM,IAAM,MAAM,CAAC,YAAY,CAMxC;IAED,WAAW,CAAC,EAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAE9D;;OAEG;IACH,MAAM,EAAO,MAAM,CAAA;IACnB,UAAU,EAAG,OAAO,CAAA;IACpB,QAAQ,EAAK,MAAM,CAAA;IACnB,UAAU,EAAG,MAAM,CAAA;IACnB,KAAK,EAAQ,YAAY,CAAA;gBAEJ,OAAO,EAAE,oBAAoB;IAkE5C,KAAK,CAAE,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BhE,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;cAsCZ,UAAU,IAAK,OAAO,CAAC,IAAI,CAAC;IAqD5C,SAAS,CAAC,aAAa,IAAK,IAAI;cAsBhB,WAAW,CAAE,YAAY,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6HtF,SAAS,CAAC,UAAU,IAAK,IAAI;CA8B9B;AAED,OAAO,EACL,WAAW,GACZ,CAAA"}
|
|
@@ -113,7 +113,7 @@ class GrpcManager extends events_1.default {
|
|
|
113
113
|
this.serverName = serverNameIndication;
|
|
114
114
|
wechaty_puppet_1.log.verbose('GrpcManager', 'constructor() serverName(SNI): "%s"', this.serverName);
|
|
115
115
|
}
|
|
116
|
-
async start() {
|
|
116
|
+
async start(lastEventSeq, accountId) {
|
|
117
117
|
wechaty_puppet_1.log.verbose('GrpcManager', 'start()');
|
|
118
118
|
/**
|
|
119
119
|
* 1. Init grpc client
|
|
@@ -125,7 +125,7 @@ class GrpcManager extends events_1.default {
|
|
|
125
125
|
* 2. Connect to stream
|
|
126
126
|
*/
|
|
127
127
|
wechaty_puppet_1.log.verbose('GrpcManager', 'start() starting stream ...');
|
|
128
|
-
await this.startStream();
|
|
128
|
+
await this.startStream(lastEventSeq, accountId);
|
|
129
129
|
wechaty_puppet_1.log.verbose('GrpcManager', 'start() starting stream ... done');
|
|
130
130
|
/**
|
|
131
131
|
* 3. Start the puppet
|
|
@@ -229,14 +229,21 @@ class GrpcManager extends events_1.default {
|
|
|
229
229
|
wechaty_puppet_1.log.error('GrpcManager', 'destroyClient() client.close() rejection: %s\n%s', e && e.message, e.stack);
|
|
230
230
|
}
|
|
231
231
|
}
|
|
232
|
-
async startStream() {
|
|
232
|
+
async startStream(lastEventSeq, accountId) {
|
|
233
233
|
wechaty_puppet_1.log.verbose('GrpcManager', 'startStream()');
|
|
234
234
|
if (this.eventStream) {
|
|
235
235
|
wechaty_puppet_1.log.verbose('GrpcManager', 'startStream() this.eventStream exists, dropped.');
|
|
236
236
|
this.eventStream = undefined;
|
|
237
237
|
}
|
|
238
238
|
wechaty_puppet_1.log.verbose('GrpcManager', 'startStream() grpc -> event() ...');
|
|
239
|
-
const
|
|
239
|
+
const eventRequest = new wechaty_grpc_1.puppet.EventRequest();
|
|
240
|
+
if (lastEventSeq) {
|
|
241
|
+
eventRequest.setSeq(Number(lastEventSeq));
|
|
242
|
+
}
|
|
243
|
+
if (accountId) {
|
|
244
|
+
eventRequest.setAccountId(accountId);
|
|
245
|
+
}
|
|
246
|
+
const eventStream = this.client.event(eventRequest);
|
|
240
247
|
wechaty_puppet_1.log.verbose('GrpcManager', 'startStream() grpc -> event() ... done');
|
|
241
248
|
/**
|
|
242
249
|
* Store the event data from the stream when we test connection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grpc-manager.js","sourceRoot":"","sources":["../../../../src/client/grpc-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"grpc-manager.js","sourceRoot":"","sources":["../../../../src/client/grpc-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ declare class PayloadStore {
|
|
|
13
13
|
room?: FlashStore<string, PUPPET.payloads.Room>;
|
|
14
14
|
tag?: FlashStore<string, PUPPET.payloads.Tag>;
|
|
15
15
|
tagGroup?: FlashStore<string, PUPPET.payloads.TagGroup>;
|
|
16
|
+
miscellaneous: FlashStore<string, string>;
|
|
16
17
|
protected storeDir: string;
|
|
17
18
|
protected accountId?: string;
|
|
18
19
|
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;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,EAAG,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;IAmBjD;;;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"}
|
|
@@ -38,6 +38,7 @@ class PayloadStore {
|
|
|
38
38
|
room;
|
|
39
39
|
tag;
|
|
40
40
|
tagGroup;
|
|
41
|
+
miscellaneous;
|
|
41
42
|
storeDir;
|
|
42
43
|
accountId;
|
|
43
44
|
constructor(options) {
|
|
@@ -45,6 +46,10 @@ class PayloadStore {
|
|
|
45
46
|
config_js_1.log.verbose('PayloadStore', 'constructor(%s)', JSON.stringify(options));
|
|
46
47
|
this.storeDir = path_1.default.join(os_1.default.homedir(), '.wechaty', 'wechaty-puppet-service', this.options.token, `v${major(config_js_1.VERSION)}.${minor(config_js_1.VERSION)}`);
|
|
47
48
|
config_js_1.log.silly('PayloadStore', 'constructor() storeDir: "%s"', this.storeDir);
|
|
49
|
+
if (!fs_1.default.existsSync(this.storeDir)) {
|
|
50
|
+
fs_1.default.mkdirSync(this.storeDir, { recursive: true });
|
|
51
|
+
}
|
|
52
|
+
this.miscellaneous = new flash_store_1.FlashStore(path_1.default.join(this.storeDir, 'miscellaneous')); // account-free data
|
|
48
53
|
}
|
|
49
54
|
/**
|
|
50
55
|
* When starting the store, we need to know the accountId
|
|
@@ -114,6 +119,7 @@ class PayloadStore {
|
|
|
114
119
|
if (this.accountId) {
|
|
115
120
|
throw new Error('Can not destroy() a start()-ed store. Call stop() to stop it first');
|
|
116
121
|
}
|
|
122
|
+
await this.miscellaneous.close();
|
|
117
123
|
/**
|
|
118
124
|
* Huan(202108): `fs.rm` was introduced from Node.js v14.14
|
|
119
125
|
* https://nodejs.org/api/fs.html#fs_fspromises_rm_path_options
|
|
@@ -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":";;;;;;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;IAcK;IAZrB,mDAAmD;IAE5C,OAAO,CAAoD;IAC3D,UAAU,CAAgD;IAC1D,IAAI,CAAoD;IACxD,GAAG,CAAoD;IACvD,QAAQ,CAAoD;IAC5D,aAAa,CAA6B;IAEvC,QAAQ,CAAU;IAClB,SAAS,CAAS;IAE5B,YAAqB,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAC/C,eAAG,CAAC,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QAEvE,IAAI,CAAC,QAAQ,GAAG,cAAI,CAAC,IAAI,CACvB,YAAE,CAAC,OAAO,EAAE,EACZ,UAAU,EACV,wBAAwB,EACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,IAAI,KAAK,CAAC,mBAAO,CAAC,IAAI,KAAK,CAAC,mBAAO,CAAC,EAAE,CACvC,CAAA;QACD,eAAG,CAAC,KAAK,CAAC,cAAc,EAAE,8BAA8B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAExE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,YAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SACjD;QAED,IAAI,CAAC,aAAa,GAAG,IAAI,wBAAU,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA,CAAC,oBAAoB;IACrG,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,CAAE,SAAiB;QAC5B,eAAG,CAAC,OAAO,CAAC,cAAc,EAAE,WAAW,EAAE,SAAS,CAAC,CAAA;QAEnD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;SACvE;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAE1B,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAEtD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC9B,YAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SAC9C;QAED,IAAI,CAAC,OAAO,GAAM,IAAI,wBAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAA;QAC1E,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAA;QAC9E,IAAI,CAAC,IAAI,GAAS,IAAI,wBAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAA;QACvE,IAAI,CAAC,GAAG,GAAU,IAAI,wBAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAA;QACtE,IAAI,CAAC,QAAQ,GAAK,IAAI,wBAAU,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAA;QAEpE;;;;;;;WAOG;QACH,4DAA4D;QAC5D,yBAAyB;QACzB,oGAAoG;QACpG,OAAO;QACP,qCAAqC;QACrC,wCAAwC;QACxC,IAAI;QACJ,qCAAqC;IACvC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,eAAG,CAAC,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAA;QAErC,MAAM,YAAY,GAAM,IAAI,CAAC,OAAO,CAAA;QACpC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAA;QACvC,MAAM,SAAS,GAAS,IAAI,CAAC,IAAI,CAAA;QACjC,MAAM,QAAQ,GAAU,IAAI,CAAC,GAAG,CAAA;QAChC,MAAM,aAAa,GAAK,IAAI,CAAC,QAAQ,CAAA;QACrC;;;;YAII;QACJ,IAAI,CAAC,OAAO,GAAM,SAAS,CAAA;QAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,IAAI,GAAS,SAAS,CAAA;QAC3B,IAAI,CAAC,GAAG,GAAU,SAAS,CAAA;QAC3B,IAAI,CAAC,QAAQ,GAAK,SAAS,CAAA;QAE3B,MAAM;QACN,8BAA8B;QAE9B,kBAAkB;QAClB,IAAI,CAAC,SAAS,GAAI,SAAS,CAAA;QAE3B,MAAM,YAAY,EAAE,KAAK,EAAE,CAAA;QAC3B,MAAM,eAAe,EAAE,KAAK,EAAE,CAAA;QAC9B,MAAM,SAAS,EAAE,KAAK,EAAE,CAAA;QACxB,MAAM,QAAQ,EAAE,KAAK,EAAE,CAAA;QACvB,MAAM,aAAa,EAAE,KAAK,EAAE,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,eAAG,CAAC,OAAO,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;QACxC,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAA;SACtF;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAA;QAEhC;;;WAGG;QACH,MAAM,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;YACrC,eAAe;YACf,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;IACJ,CAAC;CAEF;AAEQ,oCAAY"}
|
|
@@ -7,7 +7,7 @@ import type { Store } from 'redux';
|
|
|
7
7
|
import { GrpcManager } from './grpc-manager.js';
|
|
8
8
|
import { PayloadStore } from './payload-store.js';
|
|
9
9
|
import type { MessageBroadcastTargets } from '@juzi/wechaty-puppet/dist/esm/src/schemas/message.js';
|
|
10
|
-
export type PuppetServiceOptions = PUPPET.PuppetOptions & {
|
|
10
|
+
export declare type PuppetServiceOptions = PUPPET.PuppetOptions & {
|
|
11
11
|
authority?: string;
|
|
12
12
|
tls?: {
|
|
13
13
|
caCert?: string;
|
|
@@ -31,6 +31,7 @@ declare class PuppetService extends PUPPET.Puppet {
|
|
|
31
31
|
puppet: typeof PuppetDuck;
|
|
32
32
|
}>;
|
|
33
33
|
protected _store: Store;
|
|
34
|
+
private timeoutMilliseconds;
|
|
34
35
|
protected _grpcManager?: GrpcManager;
|
|
35
36
|
get grpcManager(): GrpcManager;
|
|
36
37
|
/**
|
|
@@ -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;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;AAoBtC,OAAO,EAAE,WAAW,EAAE,MAAO,mBAAmB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAA;AAEnG,
|
|
1
|
+
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
70
70
|
*/
|
|
71
71
|
_ducks;
|
|
72
72
|
_store;
|
|
73
|
+
timeoutMilliseconds;
|
|
73
74
|
_grpcManager;
|
|
74
75
|
get grpcManager() {
|
|
75
76
|
if (!this._grpcManager) {
|
|
@@ -95,6 +96,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
95
96
|
this._store = this._ducks.configureStore();
|
|
96
97
|
this._cleanupCallbackList = [];
|
|
97
98
|
this.FileBoxUuid = (0, mod_js_1.uuidifyFileBoxGrpc)(() => this.grpcManager.client);
|
|
99
|
+
this.timeoutMilliseconds = (options.timeoutSeconds || 2) * 1000 * 10; // 20min default, 40min for xiaoju-bot
|
|
98
100
|
}
|
|
99
101
|
async serializeFileBox(fileBox) {
|
|
100
102
|
/**
|
|
@@ -131,7 +133,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
131
133
|
this.bridgeGrpcEventStream(grpcManager);
|
|
132
134
|
config_js_1.log.verbose('PuppetService', 'start() setting up bridge grpc event stream ... done');
|
|
133
135
|
config_js_1.log.verbose('PuppetService', 'start() starting grpc manager...');
|
|
134
|
-
await
|
|
136
|
+
const lastEventTimestamp = await this._payloadStore.miscellaneous.get('eventTimestamp');
|
|
137
|
+
const lastEventSeq = (Date.now() - Number(lastEventTimestamp || 0)) < this.timeoutMilliseconds ? await this._payloadStore.miscellaneous.get('eventSeq') : undefined;
|
|
138
|
+
const accountId = await this._payloadStore.miscellaneous.get('accountId');
|
|
139
|
+
await grpcManager.start(lastEventSeq, accountId);
|
|
135
140
|
config_js_1.log.verbose('PuppetService', 'start() starting grpc manager... done');
|
|
136
141
|
config_js_1.log.verbose('PuppetService', 'start healthCheck');
|
|
137
142
|
this.startHealthCheck();
|
|
@@ -207,9 +212,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
207
212
|
config_js_1.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(cancel), %s', JSON.stringify(args));
|
|
208
213
|
});
|
|
209
214
|
}
|
|
210
|
-
onGrpcStreamEvent(event) {
|
|
215
|
+
async onGrpcStreamEvent(event) {
|
|
211
216
|
const type = event.getType();
|
|
212
217
|
const payload = event.getPayload();
|
|
218
|
+
const seq = event.getSeq();
|
|
213
219
|
if (!config_js_1.NO_LOG_EVENTS.includes(type)) {
|
|
214
220
|
config_js_1.log.info('PuppetService', `received grpc event ${event_type_rev_js_1.EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}`);
|
|
215
221
|
}
|
|
@@ -219,6 +225,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
219
225
|
data: `onGrpcStreamEvent(${event_type_rev_js_1.EventTypeRev[type]})`,
|
|
220
226
|
});
|
|
221
227
|
}
|
|
228
|
+
if (seq) {
|
|
229
|
+
const lastEventSeq = await this._payloadStore.miscellaneous.get('eventSeq');
|
|
230
|
+
if (!lastEventSeq || (seq > Number(lastEventSeq) || seq === 1)) {
|
|
231
|
+
await this._payloadStore.miscellaneous.set('eventSeq', String(seq));
|
|
232
|
+
await this._payloadStore.miscellaneous.set('eventTimestamp', String(Date.now()));
|
|
233
|
+
}
|
|
234
|
+
}
|
|
222
235
|
switch (type) {
|
|
223
236
|
case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_DONG:
|
|
224
237
|
this.emit('dong', JSON.parse(payload));
|
|
@@ -235,12 +248,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
235
248
|
case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_LOGIN:
|
|
236
249
|
{
|
|
237
250
|
const loginPayload = JSON.parse(payload);
|
|
251
|
+
await this._payloadStore.miscellaneous.set('accountId', loginPayload.contactId);
|
|
238
252
|
(async () => this.login(loginPayload.contactId))().catch(e => config_js_1.log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s', e.message));
|
|
239
253
|
}
|
|
240
254
|
break;
|
|
241
255
|
case wechaty_grpc_1.puppet.EventType.EVENT_TYPE_LOGOUT:
|
|
242
256
|
{
|
|
243
257
|
const logoutPayload = JSON.parse(payload);
|
|
258
|
+
await this._payloadStore.miscellaneous.delete('accountId');
|
|
244
259
|
(async () => this.logout(logoutPayload.data))().catch(e => config_js_1.log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s', e.message));
|
|
245
260
|
}
|
|
246
261
|
break;
|