@juzi/wechaty-puppet-service 1.0.72 → 1.0.74
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 +1 -1
- package/dist/cjs/src/client/payload-store.d.ts.map +1 -1
- package/dist/cjs/src/client/payload-store.js +7 -2
- package/dist/cjs/src/client/payload-store.js.map +1 -1
- package/dist/cjs/src/client/puppet-service.d.ts +2 -2
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +30 -26
- package/dist/cjs/src/client/puppet-service.js.map +1 -1
- package/dist/cjs/src/package-json.js +3 -3
- package/dist/esm/src/client/payload-store.d.ts +1 -1
- package/dist/esm/src/client/payload-store.d.ts.map +1 -1
- package/dist/esm/src/client/payload-store.js +7 -2
- package/dist/esm/src/client/payload-store.js.map +1 -1
- package/dist/esm/src/client/puppet-service.d.ts +2 -2
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +30 -26
- package/dist/esm/src/client/puppet-service.js.map +1 -1
- package/dist/esm/src/package-json.js +3 -3
- package/package.json +3 -3
- package/src/client/payload-store.ts +7 -3
- package/src/client/puppet-service.ts +32 -28
- package/src/package-json.ts +3 -3
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.packageJson = void 0;
|
|
4
4
|
exports.packageJson = {
|
|
5
5
|
"name": "@juzi/wechaty-puppet-service",
|
|
6
|
-
"version": "1.0.
|
|
6
|
+
"version": "1.0.74",
|
|
7
7
|
"description": "Puppet Service for Wechaty",
|
|
8
8
|
"type": "module",
|
|
9
9
|
"exports": {
|
|
@@ -54,7 +54,7 @@ exports.packageJson = {
|
|
|
54
54
|
"@chatie/eslint-config": "^1.0.4",
|
|
55
55
|
"@chatie/semver": "^0.4.7",
|
|
56
56
|
"@chatie/tsconfig": "^4.6.3",
|
|
57
|
-
"@juzi/wechaty-puppet": "^1.0.
|
|
57
|
+
"@juzi/wechaty-puppet": "^1.0.64",
|
|
58
58
|
"@juzi/wechaty-puppet-mock": "^1.0.1",
|
|
59
59
|
"@swc/core": "1.3.39",
|
|
60
60
|
"@types/google-protobuf": "^3.15.5",
|
|
@@ -74,7 +74,7 @@ exports.packageJson = {
|
|
|
74
74
|
"@juzi/wechaty-puppet": "^1.0.62"
|
|
75
75
|
},
|
|
76
76
|
"dependencies": {
|
|
77
|
-
"@juzi/wechaty-grpc": "^1.0.
|
|
77
|
+
"@juzi/wechaty-grpc": "^1.0.67",
|
|
78
78
|
"clone-class": "^1.1.1",
|
|
79
79
|
"ducks": "^1.0.2",
|
|
80
80
|
"file-box": "^1.5.5",
|
|
@@ -13,7 +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
|
|
16
|
+
miscellaneous?: FlashStore<string, string>;
|
|
17
17
|
protected storeDir: string;
|
|
18
18
|
protected accountId?: string;
|
|
19
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;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,
|
|
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,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;IAuBjD;;;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"}
|
|
@@ -43,7 +43,12 @@ class PayloadStore {
|
|
|
43
43
|
if (!fs.existsSync(this.storeDir)) {
|
|
44
44
|
fs.mkdirSync(this.storeDir, { recursive: true });
|
|
45
45
|
}
|
|
46
|
-
|
|
46
|
+
try {
|
|
47
|
+
this.miscellaneous = new FlashStore(path.join(this.storeDir, 'miscellaneous')); // account-free data
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
log.error('PayloadStore', 'constructor() store failed to init, will continue without it.');
|
|
51
|
+
}
|
|
47
52
|
}
|
|
48
53
|
/**
|
|
49
54
|
* When starting the store, we need to know the accountId
|
|
@@ -113,7 +118,7 @@ class PayloadStore {
|
|
|
113
118
|
if (this.accountId) {
|
|
114
119
|
throw new Error('Can not destroy() a start()-ed store. Call stop() to stop it first');
|
|
115
120
|
}
|
|
116
|
-
await this.miscellaneous
|
|
121
|
+
await this.miscellaneous?.close();
|
|
117
122
|
/**
|
|
118
123
|
* Huan(202108): `fs.rm` was introduced from Node.js v14.14
|
|
119
124
|
* 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,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,SAAS,MAAM,QAAQ,CAAA;AAI9B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EACL,OAAO,EACP,GAAG,GACJ,MAAkB,cAAc,CAAA;AAEjC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,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,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QAEvE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CACvB,EAAE,CAAC,OAAO,EAAE,EACZ,UAAU,EACV,wBAAwB,EACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CACvC,CAAA;QACD,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,8BAA8B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAExE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SACjD;QAED,IAAI,CAAC,aAAa,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA,CAAC,oBAAoB;
|
|
1
|
+
{"version":3,"file":"payload-store.js","sourceRoot":"","sources":["../../../../src/client/payload-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,SAAS,MAAM,QAAQ,CAAA;AAI9B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,OAAO,EACL,OAAO,EACP,GAAG,GACJ,MAAkB,cAAc,CAAA;AAEjC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS,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,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;QAEvE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CACvB,EAAE,CAAC,OAAO,EAAE,EACZ,UAAU,EACV,wBAAwB,EACxB,IAAI,CAAC,OAAO,CAAC,KAAK,EAClB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CACvC,CAAA;QACD,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,8BAA8B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;QAExE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACjC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SACjD;QAED,IAAI;YACF,IAAI,CAAC,aAAa,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA,CAAC,oBAAoB;SACpG;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,+DAA+D,CAAC,CAAA;SAC3F;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK,CAAE,SAAiB;QAC5B,GAAG,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,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAEtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;YAC9B,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SAC9C;QAED,IAAI,CAAC,OAAO,GAAM,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC,CAAA;QAC1E,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAA;QAC9E,IAAI,CAAC,IAAI,GAAS,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAA;QACvE,IAAI,CAAC,GAAG,GAAU,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAA;QACtE,IAAI,CAAC,QAAQ,GAAK,IAAI,UAAU,CAAC,IAAI,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,GAAG,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,GAAG,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,EAAE,KAAK,EAAE,CAAA;QAEjC;;;WAGG;QACH,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;YACrC,eAAe;YACf,SAAS,EAAE,IAAI;SAChB,CAAC,CAAA;IACJ,CAAC;CAEF;AAED,OAAO,EAAE,YAAY,EAAE,CAAA"}
|
|
@@ -191,7 +191,7 @@ declare class PuppetService extends PUPPET.Puppet {
|
|
|
191
191
|
postRawPayloadParser(payload: PUPPET.payloads.Post): Promise<PUPPET.payloads.Post>;
|
|
192
192
|
tap(postId: string, type?: PUPPET.types.Tap, tap?: boolean): Promise<boolean | void>;
|
|
193
193
|
momentVisibleList(): Promise<string[]>;
|
|
194
|
-
healthCheckInterval?: NodeJS.
|
|
194
|
+
healthCheckInterval?: NodeJS.Timeout;
|
|
195
195
|
startHealthCheck(): void;
|
|
196
196
|
stopHealthCheck(): void;
|
|
197
197
|
private waitingForLogin;
|
|
@@ -200,7 +200,7 @@ declare class PuppetService extends PUPPET.Puppet {
|
|
|
200
200
|
reset(): Promise<void>;
|
|
201
201
|
getEventData(): Promise<{
|
|
202
202
|
lastEventSeq: string | undefined;
|
|
203
|
-
lastEventTimestamp: string |
|
|
203
|
+
lastEventTimestamp: string | number;
|
|
204
204
|
}>;
|
|
205
205
|
}
|
|
206
206
|
export { 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;IAqCzB,MAAM,IAAK,OAAO,CAAC,IAAI,CAAC;IAgBvC,SAAS,CAAC,gBAAgB,IAAK,IAAI;IAsBnC,SAAS,CAAC,qBAAqB,CAAE,MAAM,EAAE,WAAW,GAAG,IAAI;YA8B7C,iBAAiB;
|
|
1
|
+
{"version":3,"file":"puppet-service.d.ts","sourceRoot":"","sources":["../../../../src/client/puppet-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,37 +89,37 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
89
89
|
log.warn('PuppetService', 'onStart() found this.grpc is already existed. dropped.');
|
|
90
90
|
this._grpcManager = undefined;
|
|
91
91
|
}
|
|
92
|
-
log.
|
|
92
|
+
log.info('PuppetService', 'start() instanciating GrpcManager ...');
|
|
93
93
|
const grpcManager = new GrpcManager(this.options);
|
|
94
|
-
log.
|
|
94
|
+
log.info('PuppetService', 'start() instanciating GrpcManager ... done');
|
|
95
95
|
/**
|
|
96
96
|
* Huan(202108): when we started the event stream,
|
|
97
97
|
* the `this.grpc` need to be available for all listeners.
|
|
98
98
|
*/
|
|
99
99
|
this._grpcManager = grpcManager;
|
|
100
|
-
log.
|
|
100
|
+
log.info('PuppetService', 'start() setting up bridge grpc event stream ...');
|
|
101
101
|
this.bridgeGrpcEventStream(grpcManager);
|
|
102
|
-
log.
|
|
103
|
-
log.
|
|
102
|
+
log.info('PuppetService', 'start() setting up bridge grpc event stream ... done');
|
|
103
|
+
log.info('PuppetService', 'start() starting grpc manager...');
|
|
104
104
|
const { lastEventSeq } = await this.getEventData();
|
|
105
|
-
const accountId = await this._payloadStore.miscellaneous
|
|
105
|
+
const accountId = await this._payloadStore.miscellaneous?.get('accountId') || '';
|
|
106
106
|
await grpcManager.start(lastEventSeq, accountId);
|
|
107
|
-
log.
|
|
108
|
-
log.
|
|
107
|
+
log.info('PuppetService', 'start() starting grpc manager... done');
|
|
108
|
+
log.info('PuppetService', 'start healthCheck');
|
|
109
109
|
this.startHealthCheck();
|
|
110
|
-
log.
|
|
110
|
+
log.info('PuppetService', 'onStart() ... done');
|
|
111
111
|
}
|
|
112
112
|
async onStop() {
|
|
113
|
-
log.
|
|
113
|
+
log.info('PuppetService', 'onStop()');
|
|
114
114
|
if (this._grpcManager) {
|
|
115
|
-
log.
|
|
115
|
+
log.info('PuppetService', 'onStop() stopping grpc manager ...');
|
|
116
116
|
const grpcManager = this._grpcManager;
|
|
117
117
|
this._grpcManager = undefined;
|
|
118
118
|
await grpcManager.stop();
|
|
119
|
-
log.
|
|
119
|
+
log.info('PuppetService', 'onStop() stopping grpc manager ... done');
|
|
120
120
|
}
|
|
121
|
-
log.
|
|
122
|
-
log.
|
|
121
|
+
log.info('PuppetService', 'onStop() ... done');
|
|
122
|
+
log.info('PuppetService', 'stop healthCheck');
|
|
123
123
|
this.stopHealthCheck();
|
|
124
124
|
}
|
|
125
125
|
hookPayloadStore() {
|
|
@@ -186,10 +186,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
186
186
|
});
|
|
187
187
|
}
|
|
188
188
|
if (seq) {
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
189
|
+
if (this._payloadStore.miscellaneous) {
|
|
190
|
+
const lastEventSeq = await this._payloadStore.miscellaneous.get('eventSeq');
|
|
191
|
+
if (!lastEventSeq || (seq > Number(lastEventSeq) || seq === 1)) {
|
|
192
|
+
await this._payloadStore.miscellaneous.set('eventSeq', String(seq));
|
|
193
|
+
await this._payloadStore.miscellaneous.set('eventTimestamp', timestamp);
|
|
194
|
+
}
|
|
193
195
|
}
|
|
194
196
|
}
|
|
195
197
|
switch (type) {
|
|
@@ -212,18 +214,20 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
212
214
|
return;
|
|
213
215
|
}
|
|
214
216
|
const loginPayload = JSON.parse(payload);
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
217
|
+
if (this._payloadStore.miscellaneous) {
|
|
218
|
+
const accountId = await this._payloadStore.miscellaneous.get('accountId');
|
|
219
|
+
if (accountId !== loginPayload.contactId) {
|
|
220
|
+
await this._payloadStore.miscellaneous.delete('eventSeq');
|
|
221
|
+
}
|
|
222
|
+
await this._payloadStore.miscellaneous.set('accountId', loginPayload.contactId);
|
|
218
223
|
}
|
|
219
|
-
await this._payloadStore.miscellaneous.set('accountId', loginPayload.contactId);
|
|
220
224
|
(async () => this.login(loginPayload.contactId))().catch(e => log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s', e.message));
|
|
221
225
|
}
|
|
222
226
|
break;
|
|
223
227
|
case grpcPuppet.EventType.EVENT_TYPE_LOGOUT:
|
|
224
228
|
{
|
|
225
229
|
const logoutPayload = JSON.parse(payload);
|
|
226
|
-
await this._payloadStore.miscellaneous
|
|
230
|
+
await this._payloadStore.miscellaneous?.delete('accountId');
|
|
227
231
|
(async () => this.logout(logoutPayload.data))().catch(e => log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s', e.message));
|
|
228
232
|
}
|
|
229
233
|
break;
|
|
@@ -1896,7 +1900,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1896
1900
|
this.reconnectIndicator.value(true);
|
|
1897
1901
|
this.grpcManager.stopStream();
|
|
1898
1902
|
const { lastEventSeq } = await this.getEventData();
|
|
1899
|
-
const accountId = await this._payloadStore.miscellaneous
|
|
1903
|
+
const accountId = await this._payloadStore.miscellaneous?.get('accountId') || '';
|
|
1900
1904
|
const onLoginResolve = (resolve) => {
|
|
1901
1905
|
const onLogin = (event) => {
|
|
1902
1906
|
const type = event.getType();
|
|
@@ -1979,8 +1983,8 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1979
1983
|
}
|
|
1980
1984
|
}
|
|
1981
1985
|
async getEventData() {
|
|
1982
|
-
const lastEventTimestamp = await this._payloadStore.miscellaneous
|
|
1983
|
-
let lastEventSeq = await this._payloadStore.miscellaneous
|
|
1986
|
+
const lastEventTimestamp = await this._payloadStore.miscellaneous?.get('eventTimestamp') || 0;
|
|
1987
|
+
let lastEventSeq = await this._payloadStore.miscellaneous?.get('eventSeq');
|
|
1984
1988
|
if ((Date.now() - Number(lastEventTimestamp || 0)) > this.timeoutMilliseconds) {
|
|
1985
1989
|
log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`);
|
|
1986
1990
|
lastEventSeq = undefined;
|