@juzi/wechaty-puppet-service 1.0.123 → 1.0.124
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/grpc-manager.d.ts +1 -0
- package/dist/cjs/src/client/grpc-manager.d.ts.map +1 -1
- package/dist/cjs/src/client/grpc-manager.js +49 -47
- package/dist/cjs/src/client/grpc-manager.js.map +1 -1
- package/dist/cjs/src/client/payload-store.d.ts +3 -0
- package/dist/cjs/src/client/payload-store.d.ts.map +1 -1
- package/dist/cjs/src/client/payload-store.js +8 -6
- package/dist/cjs/src/client/payload-store.js.map +1 -1
- package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
- package/dist/cjs/src/client/puppet-service.js +221 -216
- package/dist/cjs/src/client/puppet-service.js.map +1 -1
- package/dist/cjs/src/package-json.d.ts.map +1 -1
- package/dist/cjs/src/package-json.js +4 -3
- package/dist/cjs/src/package-json.js.map +1 -1
- package/dist/esm/src/client/grpc-manager.d.ts +1 -0
- package/dist/esm/src/client/grpc-manager.d.ts.map +1 -1
- package/dist/esm/src/client/grpc-manager.js +50 -48
- package/dist/esm/src/client/grpc-manager.js.map +1 -1
- package/dist/esm/src/client/payload-store.d.ts +3 -0
- package/dist/esm/src/client/payload-store.d.ts.map +1 -1
- package/dist/esm/src/client/payload-store.js +8 -6
- package/dist/esm/src/client/payload-store.js.map +1 -1
- package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
- package/dist/esm/src/client/puppet-service.js +221 -216
- package/dist/esm/src/client/puppet-service.js.map +1 -1
- package/dist/esm/src/package-json.d.ts.map +1 -1
- package/dist/esm/src/package-json.js +4 -3
- package/dist/esm/src/package-json.js.map +1 -1
- package/package.json +4 -3
- package/src/client/grpc-manager.ts +54 -48
- package/src/client/payload-store.ts +13 -7
- package/src/client/puppet-service.ts +222 -217
- package/src/package-json.ts +4 -3
|
@@ -81,6 +81,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
81
81
|
this.options = options;
|
|
82
82
|
this._payloadStore = new PayloadStore({
|
|
83
83
|
token: envVars.WECHATY_PUPPET_SERVICE_TOKEN(this.options.token),
|
|
84
|
+
logger: this.options.logger,
|
|
84
85
|
});
|
|
85
86
|
this.hookPayloadStore();
|
|
86
87
|
this.FileBoxUuid = uuidifyFileBoxGrpc(() => this.grpcManager.client);
|
|
@@ -110,77 +111,77 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
110
111
|
return packageJson.version || '0.0.0';
|
|
111
112
|
}
|
|
112
113
|
async onStart() {
|
|
113
|
-
log.verbose('PuppetService', 'onStart()');
|
|
114
|
+
this.log.verbose('PuppetService', 'onStart()');
|
|
114
115
|
this.waitingForLogin = false;
|
|
115
116
|
this.waitingForReady = false;
|
|
116
117
|
if (this._grpcManager) {
|
|
117
|
-
log.warn('PuppetService', 'onStart() found this.grpc is already existed. dropped.');
|
|
118
|
+
this.log.warn('PuppetService', 'onStart() found this.grpc is already existed. dropped.');
|
|
118
119
|
this._grpcManager = undefined;
|
|
119
120
|
}
|
|
120
|
-
log.info('PuppetService', 'start() instanciating GrpcManager ...');
|
|
121
|
+
this.log.info('PuppetService', 'start() instanciating GrpcManager ...');
|
|
121
122
|
const grpcManager = new GrpcManager(this.options);
|
|
122
|
-
log.info('PuppetService', 'start() instanciating GrpcManager ... done');
|
|
123
|
+
this.log.info('PuppetService', 'start() instanciating GrpcManager ... done');
|
|
123
124
|
/**
|
|
124
125
|
* Huan(202108): when we started the event stream,
|
|
125
126
|
* the `this.grpc` need to be available for all listeners.
|
|
126
127
|
*/
|
|
127
128
|
this._grpcManager = grpcManager;
|
|
128
|
-
log.info('PuppetService', 'start() setting up bridge grpc event stream ...');
|
|
129
|
+
this.log.info('PuppetService', 'start() setting up bridge grpc event stream ...');
|
|
129
130
|
this.bridgeGrpcEventStream(grpcManager);
|
|
130
|
-
log.info('PuppetService', 'start() setting up bridge grpc event stream ... done');
|
|
131
|
-
log.info('PuppetService', 'start() starting grpc manager...');
|
|
131
|
+
this.log.info('PuppetService', 'start() setting up bridge grpc event stream ... done');
|
|
132
|
+
this.log.info('PuppetService', 'start() starting grpc manager...');
|
|
132
133
|
const { lastEventSeq, accountId } = await this.getMiscellaneousStoreData();
|
|
133
134
|
await grpcManager.start(lastEventSeq, accountId);
|
|
134
|
-
log.info('PuppetService', 'start() starting grpc manager... done');
|
|
135
|
-
log.info('PuppetService', 'start healthCheck');
|
|
135
|
+
this.log.info('PuppetService', 'start() starting grpc manager... done');
|
|
136
|
+
this.log.info('PuppetService', 'start healthCheck');
|
|
136
137
|
this.startHealthCheck();
|
|
137
|
-
log.info('PuppetService', 'onStart() ... done');
|
|
138
|
+
this.log.info('PuppetService', 'onStart() ... done');
|
|
138
139
|
}
|
|
139
140
|
async onStop() {
|
|
140
|
-
log.info('PuppetService', 'onStop()');
|
|
141
|
+
this.log.info('PuppetService', 'onStop()');
|
|
141
142
|
if (this._grpcManager) {
|
|
142
|
-
log.info('PuppetService', 'onStop() stopping grpc manager ...');
|
|
143
|
+
this.log.info('PuppetService', 'onStop() stopping grpc manager ...');
|
|
143
144
|
const grpcManager = this._grpcManager;
|
|
144
145
|
this._grpcManager = undefined;
|
|
145
146
|
await grpcManager.stop();
|
|
146
|
-
log.info('PuppetService', 'onStop() stopping grpc manager ... done');
|
|
147
|
+
this.log.info('PuppetService', 'onStop() stopping grpc manager ... done');
|
|
147
148
|
}
|
|
148
|
-
log.info('PuppetService', 'onStop() ... done');
|
|
149
|
-
log.info('PuppetService', 'stop healthCheck');
|
|
149
|
+
this.log.info('PuppetService', 'onStop() ... done');
|
|
150
|
+
this.log.info('PuppetService', 'stop healthCheck');
|
|
150
151
|
this.stopHealthCheck();
|
|
151
152
|
}
|
|
152
153
|
hookPayloadStore() {
|
|
153
|
-
log.verbose('PuppetService', 'hookPayloadStore()');
|
|
154
|
+
this.log.verbose('PuppetService', 'hookPayloadStore()');
|
|
154
155
|
this.on('login', async ({ contactId }) => {
|
|
155
156
|
try {
|
|
156
|
-
log.verbose('PuppetService', 'hookPayloadStore() this.on(login) contactId: "%s"', contactId);
|
|
157
|
+
this.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) contactId: "%s"', contactId);
|
|
157
158
|
await this._payloadStore.start(contactId);
|
|
158
159
|
}
|
|
159
160
|
catch (e) {
|
|
160
|
-
log.verbose('PuppetService', 'hookPayloadStore() this.on(login) rejection "%s"', e.message);
|
|
161
|
+
this.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) rejection "%s"', e.message);
|
|
161
162
|
}
|
|
162
163
|
});
|
|
163
164
|
this.on('logout', async ({ contactId }) => {
|
|
164
|
-
log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) contactId: "%s"', contactId);
|
|
165
|
+
this.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) contactId: "%s"', contactId);
|
|
165
166
|
try {
|
|
166
167
|
await this._payloadStore.stop();
|
|
167
168
|
}
|
|
168
169
|
catch (e) {
|
|
169
|
-
log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) rejection "%s"', e.message);
|
|
170
|
+
this.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) rejection "%s"', e.message);
|
|
170
171
|
}
|
|
171
172
|
});
|
|
172
173
|
}
|
|
173
174
|
bridgeGrpcEventStream(client) {
|
|
174
|
-
log.verbose('PuppetService', 'bridgeGrpcEventStream(client)');
|
|
175
|
+
this.log.verbose('PuppetService', 'bridgeGrpcEventStream(client)');
|
|
175
176
|
client
|
|
176
177
|
.on('data', this.onGrpcStreamEvent.bind(this))
|
|
177
178
|
.on('end', () => {
|
|
178
|
-
log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(end)');
|
|
179
|
+
this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(end)');
|
|
179
180
|
})
|
|
180
181
|
.on('error', (e) => {
|
|
181
182
|
this.emit('error', e);
|
|
182
183
|
// https://github.com/wechaty/wechaty-puppet-service/issues/16
|
|
183
|
-
// log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(error) %s', e)
|
|
184
|
+
// this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(error) %s', e)
|
|
184
185
|
// const reason = 'bridgeGrpcEventStream() eventStream.on(error) ' + e
|
|
185
186
|
/**
|
|
186
187
|
* Huan(202110): simple reset puppet when grpc client has error? (or not?)
|
|
@@ -195,7 +196,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
195
196
|
// }
|
|
196
197
|
})
|
|
197
198
|
.on('cancel', (...args) => {
|
|
198
|
-
log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(cancel), %s', JSON.stringify(args));
|
|
199
|
+
this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(cancel), %s', JSON.stringify(args));
|
|
199
200
|
});
|
|
200
201
|
}
|
|
201
202
|
async onGrpcStreamEvent(event) {
|
|
@@ -204,9 +205,9 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
204
205
|
const seq = event.getSeq();
|
|
205
206
|
const timestamp = String(Date.now());
|
|
206
207
|
if (!NO_LOG_EVENTS.includes(type)) {
|
|
207
|
-
log.info('PuppetService', `received grpc event ${EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}, seq: ${seq}, timestamp: ${timestamp}`);
|
|
208
|
+
this.log.info('PuppetService', `received grpc event ${EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}, seq: ${seq}, timestamp: ${timestamp}`);
|
|
208
209
|
}
|
|
209
|
-
log.silly('PuppetService', 'onGrpcStreamEvent({type:%s(%s), payload:"%s"})', EventTypeRev[type], type, payload);
|
|
210
|
+
this.log.silly('PuppetService', 'onGrpcStreamEvent({type:%s(%s), payload:"%s"})', EventTypeRev[type], type, payload);
|
|
210
211
|
if (type !== grpcPuppet.EventType.EVENT_TYPE_HEARTBEAT) {
|
|
211
212
|
this.emit('heartbeat', {
|
|
212
213
|
data: `onGrpcStreamEvent(${EventTypeRev[type]})`,
|
|
@@ -237,7 +238,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
237
238
|
case grpcPuppet.EventType.EVENT_TYPE_LOGIN:
|
|
238
239
|
{
|
|
239
240
|
if (this.waitingForLogin && this.isLoggedIn) {
|
|
240
|
-
log.warn('PuppetService', 'this login event is ignored because the it is expected by event stream reconnect and this puppet is already logged in');
|
|
241
|
+
this.log.warn('PuppetService', 'this login event is ignored because the it is expected by event stream reconnect and this puppet is already logged in');
|
|
241
242
|
return;
|
|
242
243
|
}
|
|
243
244
|
const loginPayload = JSON.parse(payload);
|
|
@@ -250,7 +251,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
250
251
|
});
|
|
251
252
|
}
|
|
252
253
|
}
|
|
253
|
-
(async () => this.login(loginPayload.contactId))().catch(e => log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s', e.message));
|
|
254
|
+
(async () => this.login(loginPayload.contactId))().catch(e => this.log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s', e.message));
|
|
254
255
|
}
|
|
255
256
|
break;
|
|
256
257
|
case grpcPuppet.EventType.EVENT_TYPE_LOGOUT:
|
|
@@ -260,7 +261,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
260
261
|
await this.resetMiscellaneousStoreData();
|
|
261
262
|
}
|
|
262
263
|
;
|
|
263
|
-
(async () => this.logout(logoutPayload.data))().catch(e => log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s', e.message));
|
|
264
|
+
(async () => this.logout(logoutPayload.data))().catch(e => this.log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s', e.message));
|
|
264
265
|
}
|
|
265
266
|
break;
|
|
266
267
|
case grpcPuppet.EventType.EVENT_TYPE_DIRTY: {
|
|
@@ -283,7 +284,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
283
284
|
break;
|
|
284
285
|
case grpcPuppet.EventType.EVENT_TYPE_READY:
|
|
285
286
|
if (this.waitingForReady && this.readyIndicator.value()) {
|
|
286
|
-
log.warn('PuppetService', 'this ready event is ignored because the it is expected by event stream reconnect and this puppet is already ready');
|
|
287
|
+
this.log.warn('PuppetService', 'this ready event is ignored because the it is expected by event stream reconnect and this puppet is already ready');
|
|
287
288
|
return;
|
|
288
289
|
}
|
|
289
290
|
this.emit('ready', JSON.parse(payload));
|
|
@@ -313,14 +314,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
313
314
|
this.emit('tag-group', JSON.parse(payload));
|
|
314
315
|
break;
|
|
315
316
|
case grpcPuppet.EventType.EVENT_TYPE_RESET:
|
|
316
|
-
log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?');
|
|
317
|
+
this.log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?');
|
|
317
318
|
// the `reset` event should be dealed not send out
|
|
318
319
|
break;
|
|
319
320
|
case grpcPuppet.EventType.EVENT_TYPE_VERIFY_CODE:
|
|
320
321
|
this.emit('verify-code', JSON.parse(payload));
|
|
321
322
|
break;
|
|
322
323
|
case grpcPuppet.EventType.EVENT_TYPE_UNSPECIFIED:
|
|
323
|
-
log.error('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_UNSPECIFIED ?');
|
|
324
|
+
this.log.error('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_UNSPECIFIED ?');
|
|
324
325
|
break;
|
|
325
326
|
case grpcPuppet.EventType.EVENT_TYPE_VERIFY_SLIDE:
|
|
326
327
|
this.emit('verify-slide', JSON.parse(payload));
|
|
@@ -330,27 +331,27 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
330
331
|
break;
|
|
331
332
|
default:
|
|
332
333
|
// Huan(202003): in default, the `type` type should be `never`, please check.
|
|
333
|
-
log.error(`eventType ${type} unsupported! data: ${payload}`);
|
|
334
|
+
this.log.error(`eventType ${type} unsupported! data: ${payload}`);
|
|
334
335
|
}
|
|
335
336
|
}
|
|
336
337
|
async logout(reason) {
|
|
337
|
-
log.verbose('PuppetService', 'logout(%s)', reason ? `"${reason}"` : '');
|
|
338
|
+
this.log.verbose('PuppetService', 'logout(%s)', reason ? `"${reason}"` : '');
|
|
338
339
|
await super.logout(reason);
|
|
339
340
|
try {
|
|
340
341
|
await util.promisify(this.grpcManager.client.logout
|
|
341
342
|
.bind(this.grpcManager.client))(new grpcPuppet.LogoutRequest());
|
|
342
343
|
}
|
|
343
344
|
catch (e) {
|
|
344
|
-
log.silly('PuppetService', 'logout() no grpc client');
|
|
345
|
+
this.log.silly('PuppetService', 'logout() no grpc client');
|
|
345
346
|
}
|
|
346
347
|
}
|
|
347
348
|
ding(data) {
|
|
348
|
-
log.silly('PuppetService', 'ding(%s)', data);
|
|
349
|
+
this.log.silly('PuppetService', 'ding(%s)', data);
|
|
349
350
|
const request = new grpcPuppet.DingRequest();
|
|
350
351
|
request.setData(data || '');
|
|
351
352
|
this.grpcManager.client.ding(request, (error, _response) => {
|
|
352
353
|
if (error) {
|
|
353
|
-
log.error('PuppetService', 'ding() rejection: %s', error);
|
|
354
|
+
this.log.error('PuppetService', 'ding() rejection: %s', error);
|
|
354
355
|
}
|
|
355
356
|
});
|
|
356
357
|
}
|
|
@@ -363,7 +364,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
363
364
|
*
|
|
364
365
|
*/
|
|
365
366
|
async dirtyPayload(type, id) {
|
|
366
|
-
log.verbose('PuppetService', 'dirtyPayload(%s, %s)', type, id);
|
|
367
|
+
this.log.verbose('PuppetService', 'dirtyPayload(%s, %s)', type, id);
|
|
367
368
|
const request = new grpcPuppet.DirtyPayloadRequest();
|
|
368
369
|
request.setId(id);
|
|
369
370
|
request.setType(type);
|
|
@@ -372,7 +373,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
372
373
|
.bind(this.grpcManager.client))(request);
|
|
373
374
|
}
|
|
374
375
|
catch (e) {
|
|
375
|
-
log.error('PuppetService', 'dirtyPayload() rejection: %s', e && e.message);
|
|
376
|
+
this.log.error('PuppetService', 'dirtyPayload() rejection: %s', e && e.message);
|
|
376
377
|
throw e;
|
|
377
378
|
}
|
|
378
379
|
}
|
|
@@ -454,7 +455,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
454
455
|
[PUPPET.types.Dirty.Call]: async (_) => { },
|
|
455
456
|
[PUPPET.types.Dirty.Unspecified]: async (id) => {
|
|
456
457
|
const msg = `fastDirty() received Unspecified dirty type (id=${id}); upstream puppet is leaking protobuf default — this is a server-side contract bug`;
|
|
457
|
-
log.error('PuppetService', msg);
|
|
458
|
+
this.log.error('PuppetService', msg);
|
|
458
459
|
this.emit('error', new Error(msg));
|
|
459
460
|
},
|
|
460
461
|
};
|
|
@@ -464,14 +465,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
464
465
|
* the event listener will be registered in `start()` from the `PuppetAbstract` class
|
|
465
466
|
*/
|
|
466
467
|
async fastDirty({ payloadType, payloadId, }) {
|
|
467
|
-
log.verbose('PuppetService', 'fastDirty(%s<%s>, %s)', PUPPET.types.Dirty[payloadType], payloadType, payloadId);
|
|
468
|
+
this.log.verbose('PuppetService', 'fastDirty(%s<%s>, %s)', PUPPET.types.Dirty[payloadType], payloadType, payloadId);
|
|
468
469
|
// payloadType is typed as the enum, but at runtime the server may emit a
|
|
469
470
|
// value outside our enum (forward-compat). Look it up via a
|
|
470
471
|
// possibly-undefined view so the runtime guard stays meaningful.
|
|
471
472
|
const lookup = this._dirtyHandlerMap;
|
|
472
473
|
const handler = lookup[payloadType];
|
|
473
474
|
if (!handler) {
|
|
474
|
-
log.warn('PuppetService', 'fastDirty() no handler for payloadType=%s', payloadType);
|
|
475
|
+
this.log.warn('PuppetService', 'fastDirty() no handler for payloadType=%s', payloadType);
|
|
475
476
|
return;
|
|
476
477
|
}
|
|
477
478
|
try {
|
|
@@ -482,7 +483,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
482
483
|
}
|
|
483
484
|
}
|
|
484
485
|
async enterVerifyCode(id, code) {
|
|
485
|
-
log.verbose('PuppetService', 'enterVerifyCode(%s, %s)', id, code);
|
|
486
|
+
this.log.verbose('PuppetService', 'enterVerifyCode(%s, %s)', id, code);
|
|
486
487
|
const request = new grpcPuppet.EnterVerifyCodeRequest();
|
|
487
488
|
request.setId(id);
|
|
488
489
|
request.setCode(code);
|
|
@@ -490,20 +491,20 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
490
491
|
.bind(this.grpcManager.client))(request);
|
|
491
492
|
}
|
|
492
493
|
async cancelVerifyCode(id) {
|
|
493
|
-
log.verbose('PuppetService', 'cancelVerifyCode(%s)', id);
|
|
494
|
+
this.log.verbose('PuppetService', 'cancelVerifyCode(%s)', id);
|
|
494
495
|
const request = new grpcPuppet.CancelVerifyCodeRequest();
|
|
495
496
|
request.setId(id);
|
|
496
497
|
await util.promisify(this.grpcManager.client.cancelVerifyCode
|
|
497
498
|
.bind(this.grpcManager.client))(request);
|
|
498
499
|
}
|
|
499
500
|
async refreshQRCode() {
|
|
500
|
-
log.verbose('PuppetService', 'refreshQRCode(%s)');
|
|
501
|
+
this.log.verbose('PuppetService', 'refreshQRCode(%s)');
|
|
501
502
|
const request = new grpcPuppet.RefreshQRCodeRequest();
|
|
502
503
|
await util.promisify(this.grpcManager.client.refreshQRCode
|
|
503
504
|
.bind(this.grpcManager.client))(request);
|
|
504
505
|
}
|
|
505
506
|
async contactAlias(contactId, alias) {
|
|
506
|
-
log.verbose('PuppetService', 'contactAlias(%s, %s)', contactId, alias);
|
|
507
|
+
this.log.verbose('PuppetService', 'contactAlias(%s, %s)', contactId, alias);
|
|
507
508
|
/**
|
|
508
509
|
* Get alias
|
|
509
510
|
*/
|
|
@@ -541,7 +542,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
541
542
|
.bind(this.grpcManager.client))(request);
|
|
542
543
|
}
|
|
543
544
|
async contactPhone(contactId, phoneList) {
|
|
544
|
-
log.verbose('PuppetService', 'contactPhone(%s, %s)', contactId, phoneList);
|
|
545
|
+
this.log.verbose('PuppetService', 'contactPhone(%s, %s)', contactId, phoneList);
|
|
545
546
|
const request = new grpcPuppet.ContactPhoneRequest();
|
|
546
547
|
request.setContactId(contactId);
|
|
547
548
|
request.setPhonesList(phoneList);
|
|
@@ -549,7 +550,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
549
550
|
.bind(this.grpcManager.client))(request);
|
|
550
551
|
}
|
|
551
552
|
async contactCorporationRemark(contactId, corporationRemark) {
|
|
552
|
-
log.verbose('PuppetService', 'contactCorporationRemark(%s, %s)', contactId, corporationRemark);
|
|
553
|
+
this.log.verbose('PuppetService', 'contactCorporationRemark(%s, %s)', contactId, corporationRemark);
|
|
553
554
|
const request = new grpcPuppet.ContactCorporationRemarkRequest();
|
|
554
555
|
request.setContactId(contactId);
|
|
555
556
|
if (corporationRemark) {
|
|
@@ -567,7 +568,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
567
568
|
.bind(this.grpcManager.client))(request);
|
|
568
569
|
}
|
|
569
570
|
async contactDescription(contactId, description) {
|
|
570
|
-
log.verbose('PuppetService', 'contactDescription(%s, %s)', contactId, description);
|
|
571
|
+
this.log.verbose('PuppetService', 'contactDescription(%s, %s)', contactId, description);
|
|
571
572
|
const request = new grpcPuppet.ContactDescriptionRequest();
|
|
572
573
|
request.setContactId(contactId);
|
|
573
574
|
if (description) {
|
|
@@ -585,13 +586,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
585
586
|
.bind(this.grpcManager.client))(request);
|
|
586
587
|
}
|
|
587
588
|
async contactList() {
|
|
588
|
-
log.verbose('PuppetService', 'contactList()');
|
|
589
|
+
this.log.verbose('PuppetService', 'contactList()');
|
|
589
590
|
const response = await util.promisify(this.grpcManager.client.contactList
|
|
590
591
|
.bind(this.grpcManager.client))(new grpcPuppet.ContactListRequest());
|
|
591
592
|
return response.getIdsList();
|
|
592
593
|
}
|
|
593
594
|
async contactAvatar(contactId, fileBox) {
|
|
594
|
-
log.verbose('PuppetService', 'contactAvatar(%s)', contactId);
|
|
595
|
+
this.log.verbose('PuppetService', 'contactAvatar(%s)', contactId);
|
|
595
596
|
/**
|
|
596
597
|
* 1. set
|
|
597
598
|
*/
|
|
@@ -628,10 +629,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
628
629
|
return this.FileBoxUuid.fromJSON(jsonText);
|
|
629
630
|
}
|
|
630
631
|
async contactRawPayload(id) {
|
|
631
|
-
log.verbose('PuppetService', 'contactRawPayload(%s)', id);
|
|
632
|
+
this.log.verbose('PuppetService', 'contactRawPayload(%s)', id);
|
|
632
633
|
const cachedPayload = await this._payloadStore.contact?.get(id);
|
|
633
634
|
if (cachedPayload) {
|
|
634
|
-
log.silly('PuppetService', 'contactRawPayload(%s) cache HIT', id);
|
|
635
|
+
this.log.silly('PuppetService', 'contactRawPayload(%s) cache HIT', id);
|
|
635
636
|
return cachedPayload;
|
|
636
637
|
}
|
|
637
638
|
const request = new grpcPuppet.ContactPayloadRequest();
|
|
@@ -672,16 +673,16 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
672
673
|
aka: response.getAka(),
|
|
673
674
|
};
|
|
674
675
|
await this._payloadStore.contact?.set(id, payload);
|
|
675
|
-
log.silly('PuppetService', 'contactRawPayload(%s) cache SET', id);
|
|
676
|
+
this.log.silly('PuppetService', 'contactRawPayload(%s) cache SET', id);
|
|
676
677
|
return payload;
|
|
677
678
|
}
|
|
678
679
|
async contactRawPayloadParser(payload) {
|
|
679
|
-
// log.silly('PuppetService', 'contactRawPayloadParser({id:%s})', payload.id)
|
|
680
|
+
// this.log.silly('PuppetService', 'contactRawPayloadParser({id:%s})', payload.id)
|
|
680
681
|
// passthrough
|
|
681
682
|
return payload;
|
|
682
683
|
}
|
|
683
684
|
async batchContactRawPayload(contactIdList) {
|
|
684
|
-
log.verbose('PuppetService', 'batchContactRawPayload(%s)', contactIdList);
|
|
685
|
+
this.log.verbose('PuppetService', 'batchContactRawPayload(%s)', contactIdList);
|
|
685
686
|
const result = new Map();
|
|
686
687
|
const contactIdSet = new Set(contactIdList);
|
|
687
688
|
const needGetSet = new Set();
|
|
@@ -709,7 +710,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
709
710
|
}
|
|
710
711
|
}
|
|
711
712
|
catch (e) {
|
|
712
|
-
log.error('PuppetService', 'batchContactRawPayload(%s, %s) error: %s, use one by one method', contactIdList, needGetSet, e);
|
|
713
|
+
this.log.error('PuppetService', 'batchContactRawPayload(%s, %s) error: %s, use one by one method', contactIdList, needGetSet, e);
|
|
713
714
|
for (const contactId of needGetSet) {
|
|
714
715
|
const payload = await this.contactRawPayload(contactId);
|
|
715
716
|
result.set(contactId, payload);
|
|
@@ -719,7 +720,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
719
720
|
return result;
|
|
720
721
|
}
|
|
721
722
|
async contactPayloadModify(contactId, payload) {
|
|
722
|
-
log.verbose('PuppetService', 'contactPayloadModify(%s, %s)', contactId, JSON.stringify(payload));
|
|
723
|
+
this.log.verbose('PuppetService', 'contactPayloadModify(%s, %s)', contactId, JSON.stringify(payload));
|
|
723
724
|
const request = new grpcPuppet.ContactPayloadModifyRequest();
|
|
724
725
|
request.setId(contactId);
|
|
725
726
|
if (payload.id) {
|
|
@@ -789,41 +790,41 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
789
790
|
.bind(this.grpcManager.client))(request);
|
|
790
791
|
}
|
|
791
792
|
async contactSelfName(name) {
|
|
792
|
-
log.verbose('PuppetService', 'contactSelfName(%s)', name);
|
|
793
|
+
this.log.verbose('PuppetService', 'contactSelfName(%s)', name);
|
|
793
794
|
const request = new grpcPuppet.ContactSelfNameRequest();
|
|
794
795
|
request.setName(name);
|
|
795
796
|
await util.promisify(this.grpcManager.client.contactSelfName
|
|
796
797
|
.bind(this.grpcManager.client))(request);
|
|
797
798
|
}
|
|
798
799
|
async contactSelfRealName(realName) {
|
|
799
|
-
log.verbose('PuppetService', 'contactSelfRealName(%s)', realName);
|
|
800
|
+
this.log.verbose('PuppetService', 'contactSelfRealName(%s)', realName);
|
|
800
801
|
const request = new grpcPuppet.ContactSelfRealNameRequest();
|
|
801
802
|
request.setRealName(realName);
|
|
802
803
|
await util.promisify(this.grpcManager.client.contactSelfRealName
|
|
803
804
|
.bind(this.grpcManager.client))(request);
|
|
804
805
|
}
|
|
805
806
|
async contactSelfAka(aka) {
|
|
806
|
-
log.verbose('PuppetService', 'contactSelfAka(%s)', aka);
|
|
807
|
+
this.log.verbose('PuppetService', 'contactSelfAka(%s)', aka);
|
|
807
808
|
const request = new grpcPuppet.ContactSelfAkaRequest();
|
|
808
809
|
request.setAka(aka);
|
|
809
810
|
await util.promisify(this.grpcManager.client.contactSelfAka
|
|
810
811
|
.bind(this.grpcManager.client))(request);
|
|
811
812
|
}
|
|
812
813
|
async contactSelfQRCode() {
|
|
813
|
-
log.verbose('PuppetService', 'contactSelfQRCode()');
|
|
814
|
+
this.log.verbose('PuppetService', 'contactSelfQRCode()');
|
|
814
815
|
const response = await util.promisify(this.grpcManager.client.contactSelfQRCode
|
|
815
816
|
.bind(this.grpcManager.client))(new grpcPuppet.ContactSelfQRCodeRequest());
|
|
816
817
|
return response.getQrcode();
|
|
817
818
|
}
|
|
818
819
|
async contactSelfSignature(signature) {
|
|
819
|
-
log.verbose('PuppetService', 'contactSelfSignature(%s)', signature);
|
|
820
|
+
this.log.verbose('PuppetService', 'contactSelfSignature(%s)', signature);
|
|
820
821
|
const request = new grpcPuppet.ContactSelfSignatureRequest();
|
|
821
822
|
request.setSignature(signature);
|
|
822
823
|
await util.promisify(this.grpcManager.client.contactSelfSignature
|
|
823
824
|
.bind(this.grpcManager.client))(request);
|
|
824
825
|
}
|
|
825
826
|
async contactSelfRoomAlias(roomId, alias) {
|
|
826
|
-
log.verbose('PuppetService', 'contactSelfRoomAlias(%s, %s)', roomId, alias);
|
|
827
|
+
this.log.verbose('PuppetService', 'contactSelfRoomAlias(%s, %s)', roomId, alias);
|
|
827
828
|
const request = new grpcPuppet.ContactSelfRoomAliasRequest();
|
|
828
829
|
request.setRoomId(roomId);
|
|
829
830
|
request.setAlias(alias);
|
|
@@ -831,7 +832,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
831
832
|
.bind(this.grpcManager.client))(request);
|
|
832
833
|
}
|
|
833
834
|
async contactDelete(contactId) {
|
|
834
|
-
log.verbose('PuppetService', 'contactDelete(%s)', contactId);
|
|
835
|
+
this.log.verbose('PuppetService', 'contactDelete(%s)', contactId);
|
|
835
836
|
const request = new grpcPuppet.ContactDeleteRequest();
|
|
836
837
|
request.setContactId(contactId);
|
|
837
838
|
await util.promisify(this.grpcManager.client.contactDelete
|
|
@@ -843,7 +844,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
843
844
|
*
|
|
844
845
|
*/
|
|
845
846
|
async conversationReadMark(conversationId, hasRead = true) {
|
|
846
|
-
log.verbose('PuppetService', 'conversationMarkRead(%s, %s)', conversationId, hasRead);
|
|
847
|
+
this.log.verbose('PuppetService', 'conversationMarkRead(%s, %s)', conversationId, hasRead);
|
|
847
848
|
const request = new grpcPuppet.ConversationReadRequest();
|
|
848
849
|
request.setConversationId(conversationId);
|
|
849
850
|
request.setHasRead(hasRead);
|
|
@@ -856,7 +857,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
856
857
|
*
|
|
857
858
|
*/
|
|
858
859
|
async messageMiniProgram(messageId) {
|
|
859
|
-
log.verbose('PuppetService', 'messageMiniProgram(%s)', messageId);
|
|
860
|
+
this.log.verbose('PuppetService', 'messageMiniProgram(%s)', messageId);
|
|
860
861
|
const request = new grpcPuppet.MessageMiniProgramRequest();
|
|
861
862
|
request.setId(messageId);
|
|
862
863
|
const response = await util.promisify(this.grpcManager.client.messageMiniProgram
|
|
@@ -875,7 +876,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
875
876
|
return payload;
|
|
876
877
|
}
|
|
877
878
|
async messageLocation(messageId) {
|
|
878
|
-
log.verbose('PuppetService', 'messageLocation(%s)', messageId);
|
|
879
|
+
this.log.verbose('PuppetService', 'messageLocation(%s)', messageId);
|
|
879
880
|
const request = new grpcPuppet.MessageLocationRequest();
|
|
880
881
|
request.setId(messageId);
|
|
881
882
|
const response = await util.promisify(this.grpcManager.client.messageLocation
|
|
@@ -891,7 +892,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
891
892
|
return payload;
|
|
892
893
|
}
|
|
893
894
|
async messageImage(messageId, imageType) {
|
|
894
|
-
log.verbose('PuppetService', 'messageImage(%s, %s[%s])', messageId, imageType, PUPPET.types.Image[imageType]);
|
|
895
|
+
this.log.verbose('PuppetService', 'messageImage(%s, %s[%s])', messageId, imageType, PUPPET.types.Image[imageType]);
|
|
895
896
|
const request = new grpcPuppet.MessageImageRequest();
|
|
896
897
|
request.setId(messageId);
|
|
897
898
|
request.setType(imageType);
|
|
@@ -904,7 +905,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
904
905
|
throw new Error(`failed to get image filebox for message ${messageId}`);
|
|
905
906
|
}
|
|
906
907
|
async messageContact(messageId) {
|
|
907
|
-
log.verbose('PuppetService', 'messageContact(%s)', messageId);
|
|
908
|
+
this.log.verbose('PuppetService', 'messageContact(%s)', messageId);
|
|
908
909
|
const request = new grpcPuppet.MessageContactRequest();
|
|
909
910
|
request.setId(messageId);
|
|
910
911
|
const response = await util.promisify(this.grpcManager.client.messageContact
|
|
@@ -913,7 +914,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
913
914
|
return contactId;
|
|
914
915
|
}
|
|
915
916
|
async messageChannel(messageId) {
|
|
916
|
-
log.verbose('PuppetService', 'messageChannel(%s)', messageId);
|
|
917
|
+
this.log.verbose('PuppetService', 'messageChannel(%s)', messageId);
|
|
917
918
|
const request = new grpcPuppet.MessageChannelRequest();
|
|
918
919
|
request.setId(messageId);
|
|
919
920
|
const response = await util.promisify(this.grpcManager.client.messageChannel
|
|
@@ -922,7 +923,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
922
923
|
return payload;
|
|
923
924
|
}
|
|
924
925
|
async messageChannelCard(messageId) {
|
|
925
|
-
log.verbose('PuppetService', 'messageChannelCard(%s)', messageId);
|
|
926
|
+
this.log.verbose('PuppetService', 'messageChannelCard(%s)', messageId);
|
|
926
927
|
const request = new grpcPuppet.MessageChannelCardRequest();
|
|
927
928
|
request.setId(messageId);
|
|
928
929
|
const response = await util.promisify(this.grpcManager.client.messageChannelCard
|
|
@@ -931,7 +932,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
931
932
|
return payload;
|
|
932
933
|
}
|
|
933
934
|
async messageCallRecord(messageId) {
|
|
934
|
-
log.verbose('PuppetService', 'messageCallRecord(%s)', messageId);
|
|
935
|
+
this.log.verbose('PuppetService', 'messageCallRecord(%s)', messageId);
|
|
935
936
|
const request = new grpcPuppet.MessageCallRecordRequest();
|
|
936
937
|
request.setId(messageId);
|
|
937
938
|
const response = await util.promisify(this.grpcManager.client.messageCallRecord
|
|
@@ -940,7 +941,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
940
941
|
return payload;
|
|
941
942
|
}
|
|
942
943
|
async callInvite(contactIds, media) {
|
|
943
|
-
log.verbose('PuppetService', 'callInvite(%s, %s)', contactIds, media);
|
|
944
|
+
this.log.verbose('PuppetService', 'callInvite(%s, %s)', contactIds, media);
|
|
944
945
|
const request = new grpcPuppet.CallInviteRequest();
|
|
945
946
|
request.setContactIdsList(contactIds);
|
|
946
947
|
request.setMedia(puppetCallMediaTypeToGrpc(media));
|
|
@@ -953,20 +954,20 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
953
954
|
return callId;
|
|
954
955
|
}
|
|
955
956
|
async callAdd(callId, contactIds) {
|
|
956
|
-
log.verbose('PuppetService', 'callAdd(%s, %s)', callId, contactIds);
|
|
957
|
+
this.log.verbose('PuppetService', 'callAdd(%s, %s)', callId, contactIds);
|
|
957
958
|
const request = new grpcPuppet.CallAddRequest();
|
|
958
959
|
request.setCallId(callId);
|
|
959
960
|
request.setContactIdsList(contactIds);
|
|
960
961
|
await this.grpcUnary(this.grpcManager.client.callAdd, request);
|
|
961
962
|
}
|
|
962
963
|
async callAccept(callId) {
|
|
963
|
-
log.verbose('PuppetService', 'callAccept(%s)', callId);
|
|
964
|
+
this.log.verbose('PuppetService', 'callAccept(%s)', callId);
|
|
964
965
|
const request = new grpcPuppet.CallAcceptRequest();
|
|
965
966
|
request.setCallId(callId);
|
|
966
967
|
await this.grpcUnary(this.grpcManager.client.callAccept, request);
|
|
967
968
|
}
|
|
968
969
|
async callReject(callId, reason) {
|
|
969
|
-
log.verbose('PuppetService', 'callReject(%s, %s)', callId, reason);
|
|
970
|
+
this.log.verbose('PuppetService', 'callReject(%s, %s)', callId, reason);
|
|
970
971
|
const request = new grpcPuppet.CallRejectRequest();
|
|
971
972
|
request.setCallId(callId);
|
|
972
973
|
if (reason !== undefined && reason !== '') {
|
|
@@ -975,13 +976,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
975
976
|
await this.grpcUnary(this.grpcManager.client.callReject, request);
|
|
976
977
|
}
|
|
977
978
|
async callCancel(callId) {
|
|
978
|
-
log.verbose('PuppetService', 'callCancel(%s)', callId);
|
|
979
|
+
this.log.verbose('PuppetService', 'callCancel(%s)', callId);
|
|
979
980
|
const request = new grpcPuppet.CallCancelRequest();
|
|
980
981
|
request.setCallId(callId);
|
|
981
982
|
await this.grpcUnary(this.grpcManager.client.callCancel, request);
|
|
982
983
|
}
|
|
983
984
|
async callHangup(callId, reason) {
|
|
984
|
-
log.verbose('PuppetService', 'callHangup(%s, %s)', callId, reason);
|
|
985
|
+
this.log.verbose('PuppetService', 'callHangup(%s, %s)', callId, reason);
|
|
985
986
|
const request = new grpcPuppet.CallHangupRequest();
|
|
986
987
|
request.setCallId(callId);
|
|
987
988
|
if (reason !== undefined && reason !== '') {
|
|
@@ -990,7 +991,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
990
991
|
await this.grpcUnary(this.grpcManager.client.callHangup, request);
|
|
991
992
|
}
|
|
992
993
|
async callMediaEndpoint(callId) {
|
|
993
|
-
log.verbose('PuppetService', 'callMediaEndpoint(%s)', callId);
|
|
994
|
+
this.log.verbose('PuppetService', 'callMediaEndpoint(%s)', callId);
|
|
994
995
|
const request = new grpcPuppet.CallMediaEndpointRequest();
|
|
995
996
|
request.setCallId(callId);
|
|
996
997
|
const response = await util.promisify(this.grpcManager.client.callMediaEndpoint
|
|
@@ -1014,7 +1015,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1014
1015
|
return payload;
|
|
1015
1016
|
}
|
|
1016
1017
|
async callRawPayload(callId) {
|
|
1017
|
-
log.verbose('PuppetService', 'callRawPayload(%s)', callId);
|
|
1018
|
+
this.log.verbose('PuppetService', 'callRawPayload(%s)', callId);
|
|
1018
1019
|
const request = new grpcPuppet.CallPayloadRequest();
|
|
1019
1020
|
request.setId(callId);
|
|
1020
1021
|
const response = await util.promisify(this.grpcManager.client.callPayload
|
|
@@ -1022,6 +1023,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1022
1023
|
return response.toObject();
|
|
1023
1024
|
}
|
|
1024
1025
|
async callRawPayloadParser(rawPayload) {
|
|
1026
|
+
// Intentionally uses the module-level `log` instead of `this.log`: the
|
|
1027
|
+
// matching unit spec invokes this parser via `prototype.call({}, raw)` and
|
|
1028
|
+
// never binds a real PuppetService instance. Keep this `this`-free so that
|
|
1029
|
+
// contract survives the pluggable-logger migration.
|
|
1025
1030
|
log.verbose('PuppetService', 'callRawPayloadParser({id:%s})', rawPayload.id);
|
|
1026
1031
|
const media = grpcCallTypeToPuppetMedia(rawPayload.media);
|
|
1027
1032
|
if (media === undefined) {
|
|
@@ -1045,7 +1050,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1045
1050
|
return payload;
|
|
1046
1051
|
}
|
|
1047
1052
|
async messageChatHistory(messageId) {
|
|
1048
|
-
log.verbose('PuppetService', 'messageChatHistory(%s)', messageId);
|
|
1053
|
+
this.log.verbose('PuppetService', 'messageChatHistory(%s)', messageId);
|
|
1049
1054
|
const request = new grpcPuppet.MessageChatHistoryRequest();
|
|
1050
1055
|
request.setId(messageId);
|
|
1051
1056
|
const response = await util.promisify(this.grpcManager.client.messageChatHistory
|
|
@@ -1054,7 +1059,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1054
1059
|
return payload;
|
|
1055
1060
|
}
|
|
1056
1061
|
async messageSendMiniProgram(conversationId, miniProgramPayload) {
|
|
1057
|
-
log.verbose('PuppetService', 'messageSendMiniProgram(%s, "%s")', conversationId, JSON.stringify(miniProgramPayload));
|
|
1062
|
+
this.log.verbose('PuppetService', 'messageSendMiniProgram(%s, "%s")', conversationId, JSON.stringify(miniProgramPayload));
|
|
1058
1063
|
const request = new grpcPuppet.MessageSendMiniProgramRequest();
|
|
1059
1064
|
request.setConversationId(conversationId);
|
|
1060
1065
|
const pbMiniProgramPayload = new grpcPuppet.MiniProgramPayload();
|
|
@@ -1090,11 +1095,11 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1090
1095
|
* Deprecated: will be removed after Dec 31, 2022
|
|
1091
1096
|
*/
|
|
1092
1097
|
request.setMiniProgramDeprecated(JSON.stringify(miniProgramPayload));
|
|
1093
|
-
log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) about to call grpc`);
|
|
1098
|
+
this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) about to call grpc`);
|
|
1094
1099
|
const response = await util.promisify(this.grpcManager.client.messageSendMiniProgram
|
|
1095
1100
|
.bind(this.grpcManager.client))(request);
|
|
1096
1101
|
const messageId = response.getId();
|
|
1097
|
-
log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) grpc called, messageId: ${messageId}`);
|
|
1102
|
+
this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) grpc called, messageId: ${messageId}`);
|
|
1098
1103
|
if (messageId) {
|
|
1099
1104
|
return messageId;
|
|
1100
1105
|
}
|
|
@@ -1109,7 +1114,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1109
1114
|
}
|
|
1110
1115
|
}
|
|
1111
1116
|
async messageSendLocation(conversationId, locationPayload) {
|
|
1112
|
-
log.verbose('PuppetService', 'messageSendLocation(%s)', conversationId, JSON.stringify(locationPayload));
|
|
1117
|
+
this.log.verbose('PuppetService', 'messageSendLocation(%s)', conversationId, JSON.stringify(locationPayload));
|
|
1113
1118
|
const request = new grpcPuppet.MessageSendLocationRequest();
|
|
1114
1119
|
request.setConversationId(conversationId);
|
|
1115
1120
|
const pbLocationPayload = new grpcPuppet.LocationPayload();
|
|
@@ -1119,47 +1124,47 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1119
1124
|
pbLocationPayload.setLongitude(locationPayload.longitude);
|
|
1120
1125
|
pbLocationPayload.setName(locationPayload.name);
|
|
1121
1126
|
request.setLocation(pbLocationPayload);
|
|
1122
|
-
log.info('PuppetService', `messageSendLocation(${conversationId}, ${locationPayload.name}) about to call grpc`);
|
|
1127
|
+
this.log.info('PuppetService', `messageSendLocation(${conversationId}, ${locationPayload.name}) about to call grpc`);
|
|
1123
1128
|
const response = await util.promisify(this.grpcManager.client.messageSendLocation
|
|
1124
1129
|
.bind(this.grpcManager.client))(request);
|
|
1125
1130
|
const id = response.getId();
|
|
1126
|
-
log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${locationPayload.name}) grpc called, messageId: ${id}`);
|
|
1131
|
+
this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${locationPayload.name}) grpc called, messageId: ${id}`);
|
|
1127
1132
|
if (id) {
|
|
1128
1133
|
return id;
|
|
1129
1134
|
}
|
|
1130
1135
|
}
|
|
1131
1136
|
async messageSendChannel(conversationId, channelPayload) {
|
|
1132
|
-
log.verbose('PuppetService', 'messageSendChannel(%s, "%s")', conversationId, JSON.stringify(channelPayload));
|
|
1137
|
+
this.log.verbose('PuppetService', 'messageSendChannel(%s, "%s")', conversationId, JSON.stringify(channelPayload));
|
|
1133
1138
|
const request = new grpcPuppet.MessageSendChannelRequest();
|
|
1134
1139
|
request.setConversationId(conversationId);
|
|
1135
1140
|
const pbChannelPayload = channelPayloadToPb(grpcPuppet, channelPayload);
|
|
1136
1141
|
request.setChannel(pbChannelPayload);
|
|
1137
|
-
log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) about to call grpc`);
|
|
1142
|
+
this.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) about to call grpc`);
|
|
1138
1143
|
const response = await util.promisify(this.grpcManager.client.messageSendChannel
|
|
1139
1144
|
.bind(this.grpcManager.client))(request);
|
|
1140
1145
|
const messageId = response.getId();
|
|
1141
|
-
log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) grpc called, messageId: ${messageId}`);
|
|
1146
|
+
this.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) grpc called, messageId: ${messageId}`);
|
|
1142
1147
|
if (messageId) {
|
|
1143
1148
|
return messageId;
|
|
1144
1149
|
}
|
|
1145
1150
|
}
|
|
1146
1151
|
async messageSendChannelCard(conversationId, channelCardPayload) {
|
|
1147
|
-
log.verbose('PuppetService', 'messageSendChannelCard(%s, "%s")', conversationId, JSON.stringify(channelCardPayload));
|
|
1152
|
+
this.log.verbose('PuppetService', 'messageSendChannelCard(%s, "%s")', conversationId, JSON.stringify(channelCardPayload));
|
|
1148
1153
|
const request = new grpcPuppet.MessageSendChannelCardRequest();
|
|
1149
1154
|
request.setConversationId(conversationId);
|
|
1150
1155
|
const pbChannelCardPayload = channelCardPayloadToPb(grpcPuppet, channelCardPayload);
|
|
1151
1156
|
request.setChannelCard(pbChannelCardPayload);
|
|
1152
|
-
log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) about to call grpc`);
|
|
1157
|
+
this.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) about to call grpc`);
|
|
1153
1158
|
const response = await util.promisify(this.grpcManager.client.messageSendChannelCard
|
|
1154
1159
|
.bind(this.grpcManager.client))(request);
|
|
1155
1160
|
const messageId = response.getId();
|
|
1156
|
-
log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) grpc called, messageId: ${messageId}`);
|
|
1161
|
+
this.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) grpc called, messageId: ${messageId}`);
|
|
1157
1162
|
if (messageId) {
|
|
1158
1163
|
return messageId;
|
|
1159
1164
|
}
|
|
1160
1165
|
}
|
|
1161
1166
|
async messageRecall(messageId) {
|
|
1162
|
-
log.verbose('PuppetService', 'messageRecall(%s)', messageId);
|
|
1167
|
+
this.log.verbose('PuppetService', 'messageRecall(%s)', messageId);
|
|
1163
1168
|
const request = new grpcPuppet.MessageRecallRequest();
|
|
1164
1169
|
request.setId(messageId);
|
|
1165
1170
|
const response = await util.promisify(this.grpcManager.client.messageRecall
|
|
@@ -1167,7 +1172,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1167
1172
|
return response.getSuccess();
|
|
1168
1173
|
}
|
|
1169
1174
|
async messageFile(id) {
|
|
1170
|
-
log.verbose('PuppetService', 'messageFile(%s)', id);
|
|
1175
|
+
this.log.verbose('PuppetService', 'messageFile(%s)', id);
|
|
1171
1176
|
const request = new grpcPuppet.MessageFileRequest();
|
|
1172
1177
|
request.setId(id);
|
|
1173
1178
|
const response = await util.promisify(this.grpcManager.client.messageFile
|
|
@@ -1179,7 +1184,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1179
1184
|
throw new Error(`failed to get filebox for message ${id}`);
|
|
1180
1185
|
}
|
|
1181
1186
|
async messageVoice(id) {
|
|
1182
|
-
log.verbose('PuppetService', 'messageVoice(%s)', id);
|
|
1187
|
+
this.log.verbose('PuppetService', 'messageVoice(%s)', id);
|
|
1183
1188
|
const request = new grpcPuppet.MessageVoiceRequest();
|
|
1184
1189
|
request.setId(id);
|
|
1185
1190
|
const response = await util.promisify(this.grpcManager.client.messageVoice
|
|
@@ -1191,7 +1196,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1191
1196
|
throw new Error(`failed to get voice filebox for message ${id}`);
|
|
1192
1197
|
}
|
|
1193
1198
|
async messageVoiceText(id) {
|
|
1194
|
-
log.verbose('PuppetService', 'messageVoiceText(%s)', id);
|
|
1199
|
+
this.log.verbose('PuppetService', 'messageVoiceText(%s)', id);
|
|
1195
1200
|
const request = new grpcPuppet.MessageVoiceTextRequest();
|
|
1196
1201
|
request.setId(id);
|
|
1197
1202
|
const response = await util.promisify(this.grpcManager.client.messageVoiceText
|
|
@@ -1202,7 +1207,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1202
1207
|
};
|
|
1203
1208
|
}
|
|
1204
1209
|
async messagePreview(id) {
|
|
1205
|
-
log.verbose('PuppetService', 'messagePreview(%s)', id);
|
|
1210
|
+
this.log.verbose('PuppetService', 'messagePreview(%s)', id);
|
|
1206
1211
|
const request = new grpcPuppet.MessagePreviewRequest();
|
|
1207
1212
|
request.setId(id);
|
|
1208
1213
|
const response = await util.promisify(this.grpcManager.client.messagePreview
|
|
@@ -1214,7 +1219,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1214
1219
|
return undefined;
|
|
1215
1220
|
}
|
|
1216
1221
|
async messageForward(conversationId, messageIds) {
|
|
1217
|
-
log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId, messageIds);
|
|
1222
|
+
this.log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId, messageIds);
|
|
1218
1223
|
const request = new grpcPuppet.MessageForwardRequest();
|
|
1219
1224
|
request.setConversationId(conversationId);
|
|
1220
1225
|
if (Array.isArray(messageIds)) {
|
|
@@ -1226,11 +1231,11 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1226
1231
|
else {
|
|
1227
1232
|
request.setMessageId(messageIds);
|
|
1228
1233
|
}
|
|
1229
|
-
log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) about to call grpc`);
|
|
1234
|
+
this.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) about to call grpc`);
|
|
1230
1235
|
const response = await util.promisify(this.grpcManager.client.messageForward
|
|
1231
1236
|
.bind(this.grpcManager.client))(request);
|
|
1232
1237
|
const forwardedMessageId = response.getId();
|
|
1233
|
-
log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) grpc called, messageId: ${forwardedMessageId}`);
|
|
1238
|
+
this.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) grpc called, messageId: ${forwardedMessageId}`);
|
|
1234
1239
|
if (forwardedMessageId) {
|
|
1235
1240
|
return forwardedMessageId;
|
|
1236
1241
|
}
|
|
@@ -1245,10 +1250,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1245
1250
|
}
|
|
1246
1251
|
}
|
|
1247
1252
|
async messageRawPayload(id) {
|
|
1248
|
-
log.verbose('PuppetService', 'messageRawPayload(%s)', id);
|
|
1253
|
+
this.log.verbose('PuppetService', 'messageRawPayload(%s)', id);
|
|
1249
1254
|
// const cachedPayload = await this.payloadStore.message?.get(id)
|
|
1250
1255
|
// if (cachedPayload) {
|
|
1251
|
-
// log.silly('PuppetService', 'messageRawPayload(%s) cache HIT', id)
|
|
1256
|
+
// this.log.silly('PuppetService', 'messageRawPayload(%s) cache HIT', id)
|
|
1252
1257
|
// return cachedPayload
|
|
1253
1258
|
// }
|
|
1254
1259
|
const request = new grpcPuppet.MessagePayloadRequest();
|
|
@@ -1297,21 +1302,21 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1297
1302
|
break;
|
|
1298
1303
|
}
|
|
1299
1304
|
default:
|
|
1300
|
-
log.warn('PuppetService', `unknown text content type ${type}`);
|
|
1305
|
+
this.log.warn('PuppetService', `unknown text content type ${type}`);
|
|
1301
1306
|
}
|
|
1302
1307
|
payload.textContent?.push(contentData);
|
|
1303
1308
|
}
|
|
1304
|
-
// log.silly('PuppetService', 'messageRawPayload(%s) cache SET', id)
|
|
1309
|
+
// this.log.silly('PuppetService', 'messageRawPayload(%s) cache SET', id)
|
|
1305
1310
|
// await this.payloadStore.message?.set(id, payload)
|
|
1306
1311
|
return payload;
|
|
1307
1312
|
}
|
|
1308
1313
|
async messageRawPayloadParser(payload) {
|
|
1309
|
-
// log.silly('PuppetService', 'messagePayload({id:%s})', payload.id)
|
|
1314
|
+
// this.log.silly('PuppetService', 'messagePayload({id:%s})', payload.id)
|
|
1310
1315
|
// passthrough
|
|
1311
1316
|
return payload;
|
|
1312
1317
|
}
|
|
1313
1318
|
async messageSendText(conversationId, text, options) {
|
|
1314
|
-
log.verbose('PuppetService', 'messageSend(%s, %s)', conversationId, text);
|
|
1319
|
+
this.log.verbose('PuppetService', 'messageSend(%s, %s)', conversationId, text);
|
|
1315
1320
|
let mentionIdList;
|
|
1316
1321
|
let quoteId;
|
|
1317
1322
|
if (Array.isArray(options)) {
|
|
@@ -1330,11 +1335,11 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1330
1335
|
if (typeof quoteId !== 'undefined') {
|
|
1331
1336
|
request.setQuoteId(quoteId);
|
|
1332
1337
|
}
|
|
1333
|
-
log.info('PuppetService', `messageSend(${conversationId}, ${text}) about to call grpc`);
|
|
1338
|
+
this.log.info('PuppetService', `messageSend(${conversationId}, ${text}) about to call grpc`);
|
|
1334
1339
|
const response = await util.promisify(this.grpcManager.client.messageSendText
|
|
1335
1340
|
.bind(this.grpcManager.client))(request);
|
|
1336
1341
|
const messageId = response.getId();
|
|
1337
|
-
log.info('PuppetService', `messageSend(${conversationId}, ${text}) grpc called, messageId: ${messageId}`);
|
|
1342
|
+
this.log.info('PuppetService', `messageSend(${conversationId}, ${text}) grpc called, messageId: ${messageId}`);
|
|
1338
1343
|
if (messageId) {
|
|
1339
1344
|
return messageId;
|
|
1340
1345
|
}
|
|
@@ -1349,7 +1354,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1349
1354
|
}
|
|
1350
1355
|
}
|
|
1351
1356
|
async messageBatchSendText(conversationIds, text, batchTaskId) {
|
|
1352
|
-
log.verbose('PuppetService', 'messageBatchSendText(%s)', conversationIds.join(','));
|
|
1357
|
+
this.log.verbose('PuppetService', 'messageBatchSendText(%s)', conversationIds.join(','));
|
|
1353
1358
|
const request = new grpcPuppet.MessageBatchSendTextRequest();
|
|
1354
1359
|
request.setConversationIdsList(conversationIds);
|
|
1355
1360
|
request.setText(text);
|
|
@@ -1360,7 +1365,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1360
1365
|
return grpcBatchResultsToPayload(response);
|
|
1361
1366
|
}
|
|
1362
1367
|
async messageBatchSendFile(conversationIds, fileBox, batchTaskId) {
|
|
1363
|
-
log.verbose('PuppetService', 'messageBatchSendFile(%s)', conversationIds.join(','));
|
|
1368
|
+
this.log.verbose('PuppetService', 'messageBatchSendFile(%s)', conversationIds.join(','));
|
|
1364
1369
|
const request = new grpcPuppet.MessageBatchSendFileRequest();
|
|
1365
1370
|
request.setConversationIdsList(conversationIds);
|
|
1366
1371
|
request.setFileBox(await this.serializeFileBox(fileBox));
|
|
@@ -1371,7 +1376,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1371
1376
|
return grpcBatchResultsToPayload(response);
|
|
1372
1377
|
}
|
|
1373
1378
|
async messageBatchForward(conversationIds, messageIds, batchTaskId) {
|
|
1374
|
-
log.verbose('PuppetService', 'messageBatchForward(%s, %s)', conversationIds.join(','), messageIds);
|
|
1379
|
+
this.log.verbose('PuppetService', 'messageBatchForward(%s, %s)', conversationIds.join(','), messageIds);
|
|
1375
1380
|
const request = new grpcPuppet.MessageBatchForwardRequest();
|
|
1376
1381
|
request.setConversationIdsList(conversationIds);
|
|
1377
1382
|
if (Array.isArray(messageIds)) {
|
|
@@ -1390,7 +1395,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1390
1395
|
return grpcBatchResultsToPayload(response);
|
|
1391
1396
|
}
|
|
1392
1397
|
async messageBatchSendContact(conversationIds, contactId, batchTaskId) {
|
|
1393
|
-
log.verbose('PuppetService', 'messageBatchSendContact(%s, %s)', conversationIds.join(','), contactId);
|
|
1398
|
+
this.log.verbose('PuppetService', 'messageBatchSendContact(%s, %s)', conversationIds.join(','), contactId);
|
|
1394
1399
|
const request = new grpcPuppet.MessageBatchSendContactRequest();
|
|
1395
1400
|
request.setConversationIdsList(conversationIds);
|
|
1396
1401
|
request.setContactId(contactId);
|
|
@@ -1401,7 +1406,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1401
1406
|
return grpcBatchResultsToPayload(response);
|
|
1402
1407
|
}
|
|
1403
1408
|
async messageBatchSendUrl(conversationIds, urlLinkPayload, batchTaskId) {
|
|
1404
|
-
log.verbose('PuppetService', 'messageBatchSendUrl(%s)', conversationIds.join(','));
|
|
1409
|
+
this.log.verbose('PuppetService', 'messageBatchSendUrl(%s)', conversationIds.join(','));
|
|
1405
1410
|
const request = new grpcPuppet.MessageBatchSendUrlRequest();
|
|
1406
1411
|
request.setConversationIdsList(conversationIds);
|
|
1407
1412
|
request.setUrlLink(urlLinkPayloadToPb(grpcPuppet, urlLinkPayload));
|
|
@@ -1412,7 +1417,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1412
1417
|
return grpcBatchResultsToPayload(response);
|
|
1413
1418
|
}
|
|
1414
1419
|
async messageBatchSendMiniProgram(conversationIds, miniProgramPayload, batchTaskId) {
|
|
1415
|
-
log.verbose('PuppetService', 'messageBatchSendMiniProgram(%s)', conversationIds.join(','));
|
|
1420
|
+
this.log.verbose('PuppetService', 'messageBatchSendMiniProgram(%s)', conversationIds.join(','));
|
|
1416
1421
|
const request = new grpcPuppet.MessageBatchSendMiniProgramRequest();
|
|
1417
1422
|
request.setConversationIdsList(conversationIds);
|
|
1418
1423
|
request.setMiniProgram(miniProgramPayloadToPb(grpcPuppet, miniProgramPayload));
|
|
@@ -1423,7 +1428,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1423
1428
|
return grpcBatchResultsToPayload(response);
|
|
1424
1429
|
}
|
|
1425
1430
|
async messageBatchSendLocation(conversationIds, locationPayload, batchTaskId) {
|
|
1426
|
-
log.verbose('PuppetService', 'messageBatchSendLocation(%s)', conversationIds.join(','));
|
|
1431
|
+
this.log.verbose('PuppetService', 'messageBatchSendLocation(%s)', conversationIds.join(','));
|
|
1427
1432
|
const request = new grpcPuppet.MessageBatchSendLocationRequest();
|
|
1428
1433
|
request.setConversationIdsList(conversationIds);
|
|
1429
1434
|
request.setLocation(locationPayloadToPb(grpcPuppet, locationPayload));
|
|
@@ -1434,7 +1439,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1434
1439
|
return grpcBatchResultsToPayload(response);
|
|
1435
1440
|
}
|
|
1436
1441
|
async messageBatchSendChannel(conversationIds, channelPayload, batchTaskId) {
|
|
1437
|
-
log.verbose('PuppetService', 'messageBatchSendChannel(%s)', conversationIds.join(','));
|
|
1442
|
+
this.log.verbose('PuppetService', 'messageBatchSendChannel(%s)', conversationIds.join(','));
|
|
1438
1443
|
const request = new grpcPuppet.MessageBatchSendChannelRequest();
|
|
1439
1444
|
request.setConversationIdsList(conversationIds);
|
|
1440
1445
|
request.setChannel(channelPayloadToPb(grpcPuppet, channelPayload));
|
|
@@ -1445,7 +1450,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1445
1450
|
return grpcBatchResultsToPayload(response);
|
|
1446
1451
|
}
|
|
1447
1452
|
async messageBatchSendChannelCard(conversationIds, channelCardPayload, batchTaskId) {
|
|
1448
|
-
log.verbose('PuppetService', 'messageBatchSendChannelCard(%s)', conversationIds.join(','));
|
|
1453
|
+
this.log.verbose('PuppetService', 'messageBatchSendChannelCard(%s)', conversationIds.join(','));
|
|
1449
1454
|
const request = new grpcPuppet.MessageBatchSendChannelCardRequest();
|
|
1450
1455
|
request.setConversationIdsList(conversationIds);
|
|
1451
1456
|
request.setChannelCard(channelCardPayloadToPb(grpcPuppet, channelCardPayload));
|
|
@@ -1456,16 +1461,16 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1456
1461
|
return grpcBatchResultsToPayload(response);
|
|
1457
1462
|
}
|
|
1458
1463
|
async messageSendFile(conversationId, fileBox) {
|
|
1459
|
-
log.verbose('PuppetService', 'messageSendFile(%s, %s)', conversationId, fileBox);
|
|
1464
|
+
this.log.verbose('PuppetService', 'messageSendFile(%s, %s)', conversationId, fileBox);
|
|
1460
1465
|
const request = new grpcPuppet.MessageSendFileRequest();
|
|
1461
1466
|
request.setConversationId(conversationId);
|
|
1462
1467
|
const serializedFileBox = await this.serializeFileBox(fileBox);
|
|
1463
1468
|
request.setFileBox(serializedFileBox);
|
|
1464
|
-
log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`);
|
|
1469
|
+
this.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`);
|
|
1465
1470
|
const response = await util.promisify(this.grpcManager.client.messageSendFile
|
|
1466
1471
|
.bind(this.grpcManager.client))(request);
|
|
1467
1472
|
const messageId = response.getId();
|
|
1468
|
-
log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`);
|
|
1473
|
+
this.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`);
|
|
1469
1474
|
if (messageId) {
|
|
1470
1475
|
return messageId;
|
|
1471
1476
|
}
|
|
@@ -1480,15 +1485,15 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1480
1485
|
}
|
|
1481
1486
|
}
|
|
1482
1487
|
async messageSendContact(conversationId, contactId) {
|
|
1483
|
-
log.verbose('PuppetService', 'messageSend("%s", %s)', conversationId, contactId);
|
|
1488
|
+
this.log.verbose('PuppetService', 'messageSend("%s", %s)', conversationId, contactId);
|
|
1484
1489
|
const request = new grpcPuppet.MessageSendContactRequest();
|
|
1485
1490
|
request.setConversationId(conversationId);
|
|
1486
1491
|
request.setContactId(contactId);
|
|
1487
|
-
log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) about to call grpc`);
|
|
1492
|
+
this.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) about to call grpc`);
|
|
1488
1493
|
const response = await util.promisify(this.grpcManager.client.messageSendContact
|
|
1489
1494
|
.bind(this.grpcManager.client))(request);
|
|
1490
1495
|
const messageId = response.getId();
|
|
1491
|
-
log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) grpc called, messageId: ${messageId}`);
|
|
1496
|
+
this.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) grpc called, messageId: ${messageId}`);
|
|
1492
1497
|
if (messageId) {
|
|
1493
1498
|
return messageId;
|
|
1494
1499
|
}
|
|
@@ -1503,7 +1508,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1503
1508
|
}
|
|
1504
1509
|
}
|
|
1505
1510
|
async messageSendUrl(conversationId, urlLinkPayload) {
|
|
1506
|
-
log.verbose('PuppetService', 'messageSendUrl("%s", %s)', conversationId, JSON.stringify(urlLinkPayload));
|
|
1511
|
+
this.log.verbose('PuppetService', 'messageSendUrl("%s", %s)', conversationId, JSON.stringify(urlLinkPayload));
|
|
1507
1512
|
const request = new grpcPuppet.MessageSendUrlRequest();
|
|
1508
1513
|
request.setConversationId(conversationId);
|
|
1509
1514
|
const pbUrlLinkPayload = new grpcPuppet.UrlLinkPayload();
|
|
@@ -1518,11 +1523,11 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1518
1523
|
request.setUrlLink(pbUrlLinkPayload);
|
|
1519
1524
|
// Deprecated: will be removed after Dec 31, 2022
|
|
1520
1525
|
request.setUrlLinkDeprecated(JSON.stringify(urlLinkPayload));
|
|
1521
|
-
log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) about to call grpc`);
|
|
1526
|
+
this.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) about to call grpc`);
|
|
1522
1527
|
const response = await util.promisify(this.grpcManager.client.messageSendUrl
|
|
1523
1528
|
.bind(this.grpcManager.client))(request);
|
|
1524
1529
|
const messageId = response.getId();
|
|
1525
|
-
log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) grpc called, messageId: ${messageId}`);
|
|
1530
|
+
this.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) grpc called, messageId: ${messageId}`);
|
|
1526
1531
|
if (messageId) {
|
|
1527
1532
|
return messageId;
|
|
1528
1533
|
}
|
|
@@ -1537,22 +1542,22 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1537
1542
|
}
|
|
1538
1543
|
}
|
|
1539
1544
|
async messageSendPost(conversationId, postPayload) {
|
|
1540
|
-
log.verbose('PuppetService', 'messageSendPost("%s", %s)', conversationId, JSON.stringify(postPayload));
|
|
1545
|
+
this.log.verbose('PuppetService', 'messageSendPost("%s", %s)', conversationId, JSON.stringify(postPayload));
|
|
1541
1546
|
const request = new grpcPuppet.MessageSendPostRequest();
|
|
1542
1547
|
const post = await postPayloadToPb(grpcPuppet, postPayload, this.serializeFileBox.bind(this));
|
|
1543
1548
|
request.setContent(post);
|
|
1544
1549
|
request.setConversationId(conversationId);
|
|
1545
|
-
log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) about to call grpc`);
|
|
1550
|
+
this.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) about to call grpc`);
|
|
1546
1551
|
const response = await util.promisify(this.grpcManager.client.messageSendPost
|
|
1547
1552
|
.bind(this.grpcManager.client))(request);
|
|
1548
1553
|
const messageId = response.getId();
|
|
1549
|
-
log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) grpc called, messageId: ${messageId}`);
|
|
1554
|
+
this.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) grpc called, messageId: ${messageId}`);
|
|
1550
1555
|
if (messageId) {
|
|
1551
1556
|
return messageId;
|
|
1552
1557
|
}
|
|
1553
1558
|
}
|
|
1554
1559
|
async messageUrl(messageId) {
|
|
1555
|
-
log.verbose('PuppetService', 'messageUrl(%s)', messageId);
|
|
1560
|
+
this.log.verbose('PuppetService', 'messageUrl(%s)', messageId);
|
|
1556
1561
|
const request = new grpcPuppet.MessageUrlRequest();
|
|
1557
1562
|
request.setId(messageId);
|
|
1558
1563
|
const response = await util.promisify(this.grpcManager.client.messageUrl
|
|
@@ -1571,7 +1576,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1571
1576
|
return payload;
|
|
1572
1577
|
}
|
|
1573
1578
|
async getMessageBroadcastTarget() {
|
|
1574
|
-
log.verbose('PuppetService', 'getMessageBroadcastTarget()');
|
|
1579
|
+
this.log.verbose('PuppetService', 'getMessageBroadcastTarget()');
|
|
1575
1580
|
const request = new grpcPuppet.GetMessageBroadcastTargetRequest();
|
|
1576
1581
|
const response = await util.promisify(this.grpcManager.client.getMessageBroadcastTarget.bind(this.grpcManager.client))(request);
|
|
1577
1582
|
return {
|
|
@@ -1580,7 +1585,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1580
1585
|
};
|
|
1581
1586
|
}
|
|
1582
1587
|
async createMessageBroadcast(targets, content) {
|
|
1583
|
-
log.verbose('PuppetService', 'createMessageBroadcast()');
|
|
1588
|
+
this.log.verbose('PuppetService', 'createMessageBroadcast()');
|
|
1584
1589
|
if (!PUPPET.payloads.isPostClient(content)) {
|
|
1585
1590
|
throw new Error('can only create broadcast with client post');
|
|
1586
1591
|
}
|
|
@@ -1592,7 +1597,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1592
1597
|
return response.getId();
|
|
1593
1598
|
}
|
|
1594
1599
|
async getMessageBroadcastStatus(id) {
|
|
1595
|
-
log.verbose('PuppetService', 'getMessageBroadcastStatus()');
|
|
1600
|
+
this.log.verbose('PuppetService', 'getMessageBroadcastStatus()');
|
|
1596
1601
|
const request = new grpcPuppet.GetMessageBroadcastStatusRequest();
|
|
1597
1602
|
request.setId(id);
|
|
1598
1603
|
const response = await util.promisify(this.grpcManager.client.getMessageBroadcastStatus.bind(this.grpcManager.client))(request);
|
|
@@ -1616,10 +1621,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1616
1621
|
*
|
|
1617
1622
|
*/
|
|
1618
1623
|
async roomRawPayload(id) {
|
|
1619
|
-
log.verbose('PuppetService', 'roomRawPayload(%s)', id);
|
|
1624
|
+
this.log.verbose('PuppetService', 'roomRawPayload(%s)', id);
|
|
1620
1625
|
const cachedPayload = await this._payloadStore.room?.get(id);
|
|
1621
1626
|
if (cachedPayload) {
|
|
1622
|
-
log.silly('PuppetService', 'roomRawPayload(%s) cache HIT', id);
|
|
1627
|
+
this.log.silly('PuppetService', 'roomRawPayload(%s) cache HIT', id);
|
|
1623
1628
|
return cachedPayload;
|
|
1624
1629
|
}
|
|
1625
1630
|
const request = new grpcPuppet.RoomPayloadRequest();
|
|
@@ -1643,16 +1648,16 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1643
1648
|
payload.createTime = millisecondsFromTimestamp(createTime);
|
|
1644
1649
|
}
|
|
1645
1650
|
await this._payloadStore.room?.set(id, payload);
|
|
1646
|
-
log.silly('PuppetService', 'roomRawPayload(%s) cache SET', id);
|
|
1651
|
+
this.log.silly('PuppetService', 'roomRawPayload(%s) cache SET', id);
|
|
1647
1652
|
return payload;
|
|
1648
1653
|
}
|
|
1649
1654
|
async roomRawPayloadParser(payload) {
|
|
1650
|
-
// log.silly('PuppetService', 'roomRawPayloadParser({id:%s})', payload.id)
|
|
1655
|
+
// this.log.silly('PuppetService', 'roomRawPayloadParser({id:%s})', payload.id)
|
|
1651
1656
|
// passthrough
|
|
1652
1657
|
return payload;
|
|
1653
1658
|
}
|
|
1654
1659
|
async batchRoomRawPayload(roomIdList) {
|
|
1655
|
-
log.verbose('PuppetService', 'batchRoomRawPayload(%s)', roomIdList);
|
|
1660
|
+
this.log.verbose('PuppetService', 'batchRoomRawPayload(%s)', roomIdList);
|
|
1656
1661
|
const result = new Map();
|
|
1657
1662
|
const roomIdSet = new Set(roomIdList);
|
|
1658
1663
|
const needGetSet = new Set();
|
|
@@ -1695,7 +1700,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1695
1700
|
}
|
|
1696
1701
|
}
|
|
1697
1702
|
catch (e) {
|
|
1698
|
-
log.error('PuppetService', 'batchRoomRawPayload(%s, %s) error: %s, use one by one method', roomIdList, needGetSet, e);
|
|
1703
|
+
this.log.error('PuppetService', 'batchRoomRawPayload(%s, %s) error: %s, use one by one method', roomIdList, needGetSet, e);
|
|
1699
1704
|
for (const roomId of needGetSet) {
|
|
1700
1705
|
const payload = await this.roomRawPayload(roomId);
|
|
1701
1706
|
result.set(roomId, payload);
|
|
@@ -1705,13 +1710,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1705
1710
|
return result;
|
|
1706
1711
|
}
|
|
1707
1712
|
async roomList() {
|
|
1708
|
-
log.verbose('PuppetService', 'roomList()');
|
|
1713
|
+
this.log.verbose('PuppetService', 'roomList()');
|
|
1709
1714
|
const response = await util.promisify(this.grpcManager.client.roomList
|
|
1710
1715
|
.bind(this.grpcManager.client))(new grpcPuppet.RoomListRequest());
|
|
1711
1716
|
return response.getIdsList();
|
|
1712
1717
|
}
|
|
1713
1718
|
async roomDel(roomId, contactIds) {
|
|
1714
|
-
log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds);
|
|
1719
|
+
this.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds);
|
|
1715
1720
|
const request = new grpcPuppet.RoomDelRequest();
|
|
1716
1721
|
request.setId(roomId);
|
|
1717
1722
|
if (Array.isArray(contactIds)) {
|
|
@@ -1727,7 +1732,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1727
1732
|
.bind(this.grpcManager.client))(request);
|
|
1728
1733
|
}
|
|
1729
1734
|
async roomDelV2(roomId, contactIds) {
|
|
1730
|
-
log.verbose('PuppetService', 'roomDelV2(%s, %s)', roomId, contactIds);
|
|
1735
|
+
this.log.verbose('PuppetService', 'roomDelV2(%s, %s)', roomId, contactIds);
|
|
1731
1736
|
const request = new grpcPuppet.RoomDelV2Request();
|
|
1732
1737
|
request.setId(roomId);
|
|
1733
1738
|
request.setContactIdsList(contactIds);
|
|
@@ -1740,7 +1745,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1740
1745
|
};
|
|
1741
1746
|
}
|
|
1742
1747
|
async roomAvatar(roomId) {
|
|
1743
|
-
log.verbose('PuppetService', 'roomAvatar(%s)', roomId);
|
|
1748
|
+
this.log.verbose('PuppetService', 'roomAvatar(%s)', roomId);
|
|
1744
1749
|
const request = new grpcPuppet.RoomAvatarRequest();
|
|
1745
1750
|
request.setId(roomId);
|
|
1746
1751
|
const response = await util.promisify(this.grpcManager.client.roomAvatar
|
|
@@ -1749,7 +1754,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1749
1754
|
return this.FileBoxUuid.fromJSON(jsonText);
|
|
1750
1755
|
}
|
|
1751
1756
|
async roomAdd(roomId, contactId, inviteOnly, quoteIds) {
|
|
1752
|
-
log.verbose('PuppetService', 'roomAdd(%s, %s)', roomId, contactId);
|
|
1757
|
+
this.log.verbose('PuppetService', 'roomAdd(%s, %s)', roomId, contactId);
|
|
1753
1758
|
const request = new grpcPuppet.RoomAddRequest();
|
|
1754
1759
|
request.setId(roomId);
|
|
1755
1760
|
if (Array.isArray(contactId)) {
|
|
@@ -1764,7 +1769,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1764
1769
|
.bind(this.grpcManager.client))(request);
|
|
1765
1770
|
}
|
|
1766
1771
|
async roomAddV2(roomId, contactIds, inviteOnly, quoteIds) {
|
|
1767
|
-
log.verbose('PuppetService', 'roomAddV2(%s, %s)', roomId, contactIds);
|
|
1772
|
+
this.log.verbose('PuppetService', 'roomAddV2(%s, %s)', roomId, contactIds);
|
|
1768
1773
|
const request = new grpcPuppet.RoomAddV2Request();
|
|
1769
1774
|
request.setId(roomId);
|
|
1770
1775
|
request.setContactIdsList(contactIds);
|
|
@@ -1779,7 +1784,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1779
1784
|
};
|
|
1780
1785
|
}
|
|
1781
1786
|
async roomTopic(roomId, topic) {
|
|
1782
|
-
log.verbose('PuppetService', 'roomTopic(%s, %s)', roomId, topic);
|
|
1787
|
+
this.log.verbose('PuppetService', 'roomTopic(%s, %s)', roomId, topic);
|
|
1783
1788
|
/**
|
|
1784
1789
|
* Get
|
|
1785
1790
|
*/
|
|
@@ -1817,7 +1822,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1817
1822
|
.bind(this.grpcManager.client))(request);
|
|
1818
1823
|
}
|
|
1819
1824
|
async roomRemark(roomId, remark) {
|
|
1820
|
-
log.verbose('PuppetService', 'roomRemark(%s)', roomId);
|
|
1825
|
+
this.log.verbose('PuppetService', 'roomRemark(%s)', roomId);
|
|
1821
1826
|
const request = new grpcPuppet.RoomRemarkRequest();
|
|
1822
1827
|
request.setId(roomId);
|
|
1823
1828
|
request.setRemark(remark);
|
|
@@ -1825,7 +1830,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1825
1830
|
.bind(this.grpcManager.client))(request);
|
|
1826
1831
|
}
|
|
1827
1832
|
async roomCreate(contactIdList, topic) {
|
|
1828
|
-
log.verbose('PuppetService', 'roomCreate(%s, %s)', contactIdList, topic);
|
|
1833
|
+
this.log.verbose('PuppetService', 'roomCreate(%s, %s)', contactIdList, topic);
|
|
1829
1834
|
const request = new grpcPuppet.RoomCreateRequest();
|
|
1830
1835
|
request.setContactIdsList(contactIdList);
|
|
1831
1836
|
request.setTopic(topic);
|
|
@@ -1834,14 +1839,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1834
1839
|
return response.getId();
|
|
1835
1840
|
}
|
|
1836
1841
|
async roomQuit(roomId) {
|
|
1837
|
-
log.verbose('PuppetService', 'roomQuit(%s)', roomId);
|
|
1842
|
+
this.log.verbose('PuppetService', 'roomQuit(%s)', roomId);
|
|
1838
1843
|
const request = new grpcPuppet.RoomQuitRequest();
|
|
1839
1844
|
request.setId(roomId);
|
|
1840
1845
|
await util.promisify(this.grpcManager.client.roomQuit
|
|
1841
1846
|
.bind(this.grpcManager.client))(request);
|
|
1842
1847
|
}
|
|
1843
1848
|
async roomQRCode(roomId) {
|
|
1844
|
-
log.verbose('PuppetService', 'roomQRCode(%s)', roomId);
|
|
1849
|
+
this.log.verbose('PuppetService', 'roomQRCode(%s)', roomId);
|
|
1845
1850
|
const request = new grpcPuppet.RoomQRCodeRequest();
|
|
1846
1851
|
request.setId(roomId);
|
|
1847
1852
|
const response = await util.promisify(this.grpcManager.client.roomQRCode
|
|
@@ -1849,7 +1854,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1849
1854
|
return response.getQrcode();
|
|
1850
1855
|
}
|
|
1851
1856
|
async roomParseDynamicQRCode(url) {
|
|
1852
|
-
log.verbose('PuppetService', 'roomParseDynamicQRCode(%s)', url);
|
|
1857
|
+
this.log.verbose('PuppetService', 'roomParseDynamicQRCode(%s)', url);
|
|
1853
1858
|
const request = new grpcPuppet.RoomParseDynamicQRCodeRequest();
|
|
1854
1859
|
request.setUrl(url);
|
|
1855
1860
|
const response = await util.promisify(this.grpcManager.client.roomParseDynamicQRCode
|
|
@@ -1861,7 +1866,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1861
1866
|
};
|
|
1862
1867
|
}
|
|
1863
1868
|
async roomMemberList(roomId) {
|
|
1864
|
-
log.verbose('PuppetService', 'roomMemberList(%s)', roomId);
|
|
1869
|
+
this.log.verbose('PuppetService', 'roomMemberList(%s)', roomId);
|
|
1865
1870
|
const request = new grpcPuppet.RoomMemberListRequest();
|
|
1866
1871
|
request.setId(roomId);
|
|
1867
1872
|
const response = await util.promisify(this.grpcManager.client.roomMemberList
|
|
@@ -1869,11 +1874,11 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1869
1874
|
return response.getMemberIdsList();
|
|
1870
1875
|
}
|
|
1871
1876
|
async roomMemberRawPayload(roomId, contactId) {
|
|
1872
|
-
log.verbose('PuppetService', 'roomMemberRawPayload(%s, %s)', roomId, contactId);
|
|
1877
|
+
this.log.verbose('PuppetService', 'roomMemberRawPayload(%s, %s)', roomId, contactId);
|
|
1873
1878
|
const cachedPayload = await this._payloadStore.roomMember?.get(roomId);
|
|
1874
1879
|
const cachedRoomMemberPayload = cachedPayload && cachedPayload[contactId];
|
|
1875
1880
|
if (cachedRoomMemberPayload) {
|
|
1876
|
-
log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache HIT', roomId, contactId);
|
|
1881
|
+
this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache HIT', roomId, contactId);
|
|
1877
1882
|
return cachedRoomMemberPayload;
|
|
1878
1883
|
}
|
|
1879
1884
|
const request = new grpcPuppet.RoomMemberPayloadRequest();
|
|
@@ -1895,16 +1900,16 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1895
1900
|
...cachedPayload,
|
|
1896
1901
|
[contactId]: payload,
|
|
1897
1902
|
});
|
|
1898
|
-
log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET', roomId, contactId);
|
|
1903
|
+
this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET', roomId, contactId);
|
|
1899
1904
|
return payload;
|
|
1900
1905
|
}
|
|
1901
1906
|
async roomMemberRawPayloadParser(payload) {
|
|
1902
|
-
// log.silly('PuppetService', 'roomMemberRawPayloadParser({id:%s})', payload.id)
|
|
1907
|
+
// this.log.silly('PuppetService', 'roomMemberRawPayloadParser({id:%s})', payload.id)
|
|
1903
1908
|
// passthrough
|
|
1904
1909
|
return payload;
|
|
1905
1910
|
}
|
|
1906
1911
|
async batchRoomMemberRawPayload(roomId, contactIdList) {
|
|
1907
|
-
log.verbose('PuppetService', 'batchRoomMemberRawPayload(%s, %s)', roomId, contactIdList);
|
|
1912
|
+
this.log.verbose('PuppetService', 'batchRoomMemberRawPayload(%s, %s)', roomId, contactIdList);
|
|
1908
1913
|
const result = new Map();
|
|
1909
1914
|
const contactIdSet = new Set(contactIdList);
|
|
1910
1915
|
let needGetSet = new Set();
|
|
@@ -1940,7 +1945,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1940
1945
|
await this._payloadStore.roomMember?.set(roomId, cachedPayload);
|
|
1941
1946
|
}
|
|
1942
1947
|
catch (e) {
|
|
1943
|
-
log.error('PuppetService', 'batchRoomMemberRawPayload(%s, %s) error: %s, use one by one method', roomId, needGetSet, e);
|
|
1948
|
+
this.log.error('PuppetService', 'batchRoomMemberRawPayload(%s, %s) error: %s, use one by one method', roomId, needGetSet, e);
|
|
1944
1949
|
for (const contactId of needGetSet) {
|
|
1945
1950
|
const payload = await this.roomMemberRawPayload(roomId, contactId);
|
|
1946
1951
|
result.set(contactId, payload);
|
|
@@ -1950,7 +1955,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1950
1955
|
return result;
|
|
1951
1956
|
}
|
|
1952
1957
|
async roomAnnounce(roomId, text) {
|
|
1953
|
-
log.verbose('PuppetService', 'roomAnnounce(%s%s)', roomId, typeof text === 'undefined'
|
|
1958
|
+
this.log.verbose('PuppetService', 'roomAnnounce(%s%s)', roomId, typeof text === 'undefined'
|
|
1954
1959
|
? ''
|
|
1955
1960
|
: `, ${text}`);
|
|
1956
1961
|
/**
|
|
@@ -1991,14 +1996,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
1991
1996
|
return '';
|
|
1992
1997
|
}
|
|
1993
1998
|
async roomInvitationAccept(roomInvitationId) {
|
|
1994
|
-
log.verbose('PuppetService', 'roomInvitationAccept(%s)', roomInvitationId);
|
|
1999
|
+
this.log.verbose('PuppetService', 'roomInvitationAccept(%s)', roomInvitationId);
|
|
1995
2000
|
const request = new grpcPuppet.RoomInvitationAcceptRequest();
|
|
1996
2001
|
request.setId(roomInvitationId);
|
|
1997
2002
|
await util.promisify(this.grpcManager.client.roomInvitationAccept
|
|
1998
2003
|
.bind(this.grpcManager.client))(request);
|
|
1999
2004
|
}
|
|
2000
2005
|
async roomInvitationAcceptByQRCode(qrcode) {
|
|
2001
|
-
log.verbose('PuppetService', 'roomInvitationAcceptByQRCode(%s)', qrcode);
|
|
2006
|
+
this.log.verbose('PuppetService', 'roomInvitationAcceptByQRCode(%s)', qrcode);
|
|
2002
2007
|
const request = new grpcPuppet.RoomInvitationAcceptByQRCodeRequest();
|
|
2003
2008
|
request.setQrcode(qrcode);
|
|
2004
2009
|
const response = await util.promisify(this.grpcManager.client.roomInvitationAcceptByQRCode
|
|
@@ -2009,7 +2014,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2009
2014
|
};
|
|
2010
2015
|
}
|
|
2011
2016
|
async roomInvitationRawPayload(id) {
|
|
2012
|
-
log.verbose('PuppetService', 'roomInvitationRawPayload(%s)', id);
|
|
2017
|
+
this.log.verbose('PuppetService', 'roomInvitationRawPayload(%s)', id);
|
|
2013
2018
|
const request = new grpcPuppet.RoomInvitationPayloadRequest();
|
|
2014
2019
|
request.setId(id);
|
|
2015
2020
|
const response = await util.promisify(this.grpcManager.client.roomInvitationPayload
|
|
@@ -2043,12 +2048,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2043
2048
|
return payload;
|
|
2044
2049
|
}
|
|
2045
2050
|
async roomInvitationRawPayloadParser(payload) {
|
|
2046
|
-
// log.silly('PuppetService', 'roomInvitationRawPayloadParser({id:%s})', payload.id)
|
|
2051
|
+
// this.log.silly('PuppetService', 'roomInvitationRawPayloadParser({id:%s})', payload.id)
|
|
2047
2052
|
// passthrough
|
|
2048
2053
|
return payload;
|
|
2049
2054
|
}
|
|
2050
2055
|
async roomPermission(roomId, permission) {
|
|
2051
|
-
log.verbose('PuppetService', 'roomPermission(%s, %s)', roomId, JSON.stringify(permission));
|
|
2056
|
+
this.log.verbose('PuppetService', 'roomPermission(%s, %s)', roomId, JSON.stringify(permission));
|
|
2052
2057
|
const request = new grpcPuppet.RoomPermissionRequest();
|
|
2053
2058
|
request.setId(roomId);
|
|
2054
2059
|
let set = false;
|
|
@@ -2074,7 +2079,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2074
2079
|
return set ? undefined : result;
|
|
2075
2080
|
}
|
|
2076
2081
|
async roomOwnerTransfer(roomId, contactId) {
|
|
2077
|
-
log.verbose('PuppetService', 'roomOwnerTransfer(%s, %s)', roomId, contactId);
|
|
2082
|
+
this.log.verbose('PuppetService', 'roomOwnerTransfer(%s, %s)', roomId, contactId);
|
|
2078
2083
|
const request = new grpcPuppet.RoomOwnerTransferRequest();
|
|
2079
2084
|
request.setId(roomId);
|
|
2080
2085
|
request.setContactId(contactId);
|
|
@@ -2082,7 +2087,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2082
2087
|
.bind(this.grpcManager.client))(request);
|
|
2083
2088
|
}
|
|
2084
2089
|
async roomAddAdmins(roomId, contactIdList) {
|
|
2085
|
-
log.verbose('PuppetService', 'roomAddAdmins(%s, %s)', roomId, contactIdList);
|
|
2090
|
+
this.log.verbose('PuppetService', 'roomAddAdmins(%s, %s)', roomId, contactIdList);
|
|
2086
2091
|
const request = new grpcPuppet.RoomAdminsRequest();
|
|
2087
2092
|
request.setId(roomId);
|
|
2088
2093
|
request.setContactIdsList(contactIdList);
|
|
@@ -2090,7 +2095,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2090
2095
|
.bind(this.grpcManager.client))(request);
|
|
2091
2096
|
}
|
|
2092
2097
|
async roomDelAdmins(roomId, contactIdList) {
|
|
2093
|
-
log.verbose('PuppetService', 'roomDelAdmins(%s, %s)', roomId, contactIdList);
|
|
2098
|
+
this.log.verbose('PuppetService', 'roomDelAdmins(%s, %s)', roomId, contactIdList);
|
|
2094
2099
|
const request = new grpcPuppet.RoomAdminsRequest();
|
|
2095
2100
|
request.setId(roomId);
|
|
2096
2101
|
request.setContactIdsList(contactIdList);
|
|
@@ -2098,7 +2103,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2098
2103
|
.bind(this.grpcManager.client))(request);
|
|
2099
2104
|
}
|
|
2100
2105
|
async roomDismiss(roomId) {
|
|
2101
|
-
log.verbose('PuppetService', 'roomDelAdmins(%s)', roomId);
|
|
2106
|
+
this.log.verbose('PuppetService', 'roomDelAdmins(%s)', roomId);
|
|
2102
2107
|
const request = new grpcPuppet.RoomDismissRequest();
|
|
2103
2108
|
request.setId(roomId);
|
|
2104
2109
|
await util.promisify(this.grpcManager.client.roomDismiss
|
|
@@ -2110,7 +2115,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2110
2115
|
*
|
|
2111
2116
|
*/
|
|
2112
2117
|
async friendshipSearchPhone(phone, type) {
|
|
2113
|
-
log.verbose('PuppetService', 'friendshipSearchPhone(%s)', phone);
|
|
2118
|
+
this.log.verbose('PuppetService', 'friendshipSearchPhone(%s)', phone);
|
|
2114
2119
|
const request = new grpcPuppet.FriendshipSearchPhoneRequest();
|
|
2115
2120
|
request.setPhone(phone);
|
|
2116
2121
|
if (typeof (type) === 'undefined') {
|
|
@@ -2135,7 +2140,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2135
2140
|
return null;
|
|
2136
2141
|
}
|
|
2137
2142
|
async friendshipSearchHandle(handle, type) {
|
|
2138
|
-
log.verbose('PuppetService', 'friendshipSearchHandle(%s)', handle);
|
|
2143
|
+
this.log.verbose('PuppetService', 'friendshipSearchHandle(%s)', handle);
|
|
2139
2144
|
const request = new grpcPuppet.FriendshipSearchHandleRequest();
|
|
2140
2145
|
/**
|
|
2141
2146
|
* TODO: use `setHandle()` in v2.0.0
|
|
@@ -2164,7 +2169,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2164
2169
|
return null;
|
|
2165
2170
|
}
|
|
2166
2171
|
async friendshipRawPayload(id) {
|
|
2167
|
-
log.verbose('PuppetService', 'friendshipRawPayload(%s)', id);
|
|
2172
|
+
this.log.verbose('PuppetService', 'friendshipRawPayload(%s)', id);
|
|
2168
2173
|
const request = new grpcPuppet.FriendshipPayloadRequest();
|
|
2169
2174
|
request.setId(id);
|
|
2170
2175
|
const response = await util.promisify(this.grpcManager.client.friendshipPayload
|
|
@@ -2181,12 +2186,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2181
2186
|
return payload;
|
|
2182
2187
|
}
|
|
2183
2188
|
async friendshipRawPayloadParser(payload) {
|
|
2184
|
-
// log.silly('PuppetService', 'friendshipRawPayloadParser({id:%s})', payload.id)
|
|
2189
|
+
// this.log.silly('PuppetService', 'friendshipRawPayloadParser({id:%s})', payload.id)
|
|
2185
2190
|
// passthrough
|
|
2186
2191
|
return payload;
|
|
2187
2192
|
}
|
|
2188
2193
|
async friendshipAdd(contactId, options) {
|
|
2189
|
-
log.verbose('PuppetService', 'friendshipAdd(%s, %s)', contactId, JSON.stringify(options));
|
|
2194
|
+
this.log.verbose('PuppetService', 'friendshipAdd(%s, %s)', contactId, JSON.stringify(options));
|
|
2190
2195
|
const request = new grpcPuppet.FriendshipAddRequest();
|
|
2191
2196
|
request.setContactId(contactId);
|
|
2192
2197
|
// FIXME: for backward compatibility, need to be removed after all puppet has updated.
|
|
@@ -2217,7 +2222,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2217
2222
|
.bind(this.grpcManager.client))(request);
|
|
2218
2223
|
}
|
|
2219
2224
|
async friendshipAccept(friendshipId) {
|
|
2220
|
-
log.verbose('PuppetService', 'friendshipAccept(%s)', friendshipId);
|
|
2225
|
+
this.log.verbose('PuppetService', 'friendshipAccept(%s)', friendshipId);
|
|
2221
2226
|
const request = new grpcPuppet.FriendshipAcceptRequest();
|
|
2222
2227
|
request.setId(friendshipId);
|
|
2223
2228
|
await util.promisify(this.grpcManager.client.friendshipAccept
|
|
@@ -2229,7 +2234,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2229
2234
|
*
|
|
2230
2235
|
*/
|
|
2231
2236
|
async tagContactTagAdd(tagIds, contactIds) {
|
|
2232
|
-
log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', tagIds, contactIds);
|
|
2237
|
+
this.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', tagIds, contactIds);
|
|
2233
2238
|
const request = new grpcPuppet.TagContactTagAddRequest();
|
|
2234
2239
|
request.setTagIdsList(tagIds);
|
|
2235
2240
|
request.setContactIdsList(contactIds);
|
|
@@ -2237,7 +2242,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2237
2242
|
.bind(this.grpcManager.client))(request);
|
|
2238
2243
|
}
|
|
2239
2244
|
async tagContactTagRemove(tagIds, contactIds) {
|
|
2240
|
-
log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', tagIds, contactIds);
|
|
2245
|
+
this.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', tagIds, contactIds);
|
|
2241
2246
|
const request = new grpcPuppet.TagContactTagRemoveRequest();
|
|
2242
2247
|
request.setTagIdsList(tagIds);
|
|
2243
2248
|
request.setContactIdsList(contactIds);
|
|
@@ -2245,7 +2250,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2245
2250
|
.bind(this.grpcManager.client))(request);
|
|
2246
2251
|
}
|
|
2247
2252
|
async tagGroupAdd(tagGroupName) {
|
|
2248
|
-
log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName);
|
|
2253
|
+
this.log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName);
|
|
2249
2254
|
const request = new grpcPuppet.TagGroupAddRequest();
|
|
2250
2255
|
request.setTagGroupName(tagGroupName);
|
|
2251
2256
|
const result = await util.promisify(this.grpcManager.client.tagGroupAdd
|
|
@@ -2254,14 +2259,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2254
2259
|
return id;
|
|
2255
2260
|
}
|
|
2256
2261
|
async tagGroupDelete(tagGroupId) {
|
|
2257
|
-
log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId);
|
|
2262
|
+
this.log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId);
|
|
2258
2263
|
const request = new grpcPuppet.TagGroupDeleteRequest();
|
|
2259
2264
|
request.setTagGroupId(tagGroupId);
|
|
2260
2265
|
await util.promisify(this.grpcManager.client.tagGroupDelete
|
|
2261
2266
|
.bind(this.grpcManager.client))(request);
|
|
2262
2267
|
}
|
|
2263
2268
|
async tagTagAdd(tagNameList, tagGroupId) {
|
|
2264
|
-
log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagNameList, tagGroupId);
|
|
2269
|
+
this.log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagNameList, tagGroupId);
|
|
2265
2270
|
const request = new grpcPuppet.TagTagAddRequest();
|
|
2266
2271
|
if (typeof tagGroupId !== 'undefined') {
|
|
2267
2272
|
request.setTagGroupId(tagGroupId);
|
|
@@ -2276,14 +2281,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2276
2281
|
return tagInfoList;
|
|
2277
2282
|
}
|
|
2278
2283
|
async tagTagDelete(tagIdList) {
|
|
2279
|
-
log.verbose('PuppetService', 'tagTagDelete(%s)', tagIdList);
|
|
2284
|
+
this.log.verbose('PuppetService', 'tagTagDelete(%s)', tagIdList);
|
|
2280
2285
|
const request = new grpcPuppet.TagTagDeleteRequest();
|
|
2281
2286
|
request.setTagIdList(tagIdList);
|
|
2282
2287
|
await util.promisify(this.grpcManager.client.tagTagDelete
|
|
2283
2288
|
.bind(this.grpcManager.client))(request);
|
|
2284
2289
|
}
|
|
2285
2290
|
async tagTagModify(tagNewInfoList) {
|
|
2286
|
-
log.verbose('PuppetService', 'tagTagModify(%o)', tagNewInfoList);
|
|
2291
|
+
this.log.verbose('PuppetService', 'tagTagModify(%o)', tagNewInfoList);
|
|
2287
2292
|
const request = new grpcPuppet.TagTagModifyRequest();
|
|
2288
2293
|
const newInfoList = tagNewInfoList.map(i => {
|
|
2289
2294
|
const tagInfo = new grpcPuppet.TagTagInfo();
|
|
@@ -2301,7 +2306,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2301
2306
|
return tagInfoList;
|
|
2302
2307
|
}
|
|
2303
2308
|
async tagGroupList() {
|
|
2304
|
-
log.verbose('PuppetService', 'tagGroupList()');
|
|
2309
|
+
this.log.verbose('PuppetService', 'tagGroupList()');
|
|
2305
2310
|
const request = new grpcPuppet.TagGroupListRequest();
|
|
2306
2311
|
const result = await util.promisify(this.grpcManager.client.tagGroupList
|
|
2307
2312
|
.bind(this.grpcManager.client))(request);
|
|
@@ -2309,7 +2314,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2309
2314
|
return groupIds;
|
|
2310
2315
|
}
|
|
2311
2316
|
async tagGroupTagList(tagGroupId) {
|
|
2312
|
-
log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId);
|
|
2317
|
+
this.log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId);
|
|
2313
2318
|
const request = new grpcPuppet.TagGroupTagListRequest();
|
|
2314
2319
|
if (typeof tagGroupId !== 'undefined') {
|
|
2315
2320
|
request.setTagGroupId(tagGroupId);
|
|
@@ -2320,7 +2325,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2320
2325
|
return tagIds;
|
|
2321
2326
|
}
|
|
2322
2327
|
async tagTagList() {
|
|
2323
|
-
log.verbose('PuppetService', 'tagTagList()');
|
|
2328
|
+
this.log.verbose('PuppetService', 'tagTagList()');
|
|
2324
2329
|
const request = new grpcPuppet.TagTagListRequest();
|
|
2325
2330
|
const result = await util.promisify(this.grpcManager.client.tagTagList
|
|
2326
2331
|
.bind(this.grpcManager.client))(request);
|
|
@@ -2328,7 +2333,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2328
2333
|
return tagIds;
|
|
2329
2334
|
}
|
|
2330
2335
|
async tagContactTagList(contactId) {
|
|
2331
|
-
log.verbose('PuppetService', 'tagContactTagList(%s)', contactId);
|
|
2336
|
+
this.log.verbose('PuppetService', 'tagContactTagList(%s)', contactId);
|
|
2332
2337
|
const request = new grpcPuppet.TagContactTagListRequest();
|
|
2333
2338
|
request.setContactId(contactId);
|
|
2334
2339
|
const result = await util.promisify(this.grpcManager.client.tagContactTagList
|
|
@@ -2337,7 +2342,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2337
2342
|
return tagIds;
|
|
2338
2343
|
}
|
|
2339
2344
|
async tagTagContactList(tagId) {
|
|
2340
|
-
log.verbose('PuppetService', 'tagTagContactList(%s)', tagId);
|
|
2345
|
+
this.log.verbose('PuppetService', 'tagTagContactList(%s)', tagId);
|
|
2341
2346
|
const request = new grpcPuppet.TagTagContactListRequest();
|
|
2342
2347
|
request.setTagId(tagId);
|
|
2343
2348
|
const result = await util.promisify(this.grpcManager.client.tagTagContactList
|
|
@@ -2346,10 +2351,10 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2346
2351
|
return contactIds;
|
|
2347
2352
|
}
|
|
2348
2353
|
async tagGroupPayloadPuppet(id) {
|
|
2349
|
-
log.verbose('PuppetService', 'tagGroupPayload(%s)', id);
|
|
2354
|
+
this.log.verbose('PuppetService', 'tagGroupPayload(%s)', id);
|
|
2350
2355
|
const cachedPayload = await this._payloadStore.tagGroup?.get(id);
|
|
2351
2356
|
if (cachedPayload) {
|
|
2352
|
-
log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id);
|
|
2357
|
+
this.log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id);
|
|
2353
2358
|
return cachedPayload;
|
|
2354
2359
|
}
|
|
2355
2360
|
const request = new grpcPuppet.TagGroupPayloadRequest();
|
|
@@ -2366,14 +2371,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2366
2371
|
type: grpcPayload.getType(),
|
|
2367
2372
|
};
|
|
2368
2373
|
await this._payloadStore.tagGroup?.set(id, payload);
|
|
2369
|
-
log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id);
|
|
2374
|
+
this.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id);
|
|
2370
2375
|
return payload;
|
|
2371
2376
|
}
|
|
2372
2377
|
async tagPayloadPuppet(tagId) {
|
|
2373
|
-
log.verbose('PuppetService', 'tagPayloadPuppet(%s)', tagId);
|
|
2378
|
+
this.log.verbose('PuppetService', 'tagPayloadPuppet(%s)', tagId);
|
|
2374
2379
|
const cachedPayload = await this._payloadStore.tag?.get(tagId);
|
|
2375
2380
|
if (cachedPayload) {
|
|
2376
|
-
log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId);
|
|
2381
|
+
this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId);
|
|
2377
2382
|
return cachedPayload;
|
|
2378
2383
|
}
|
|
2379
2384
|
const request = new grpcPuppet.TagPayloadRequest();
|
|
@@ -2391,7 +2396,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2391
2396
|
type: grpcPayload.getType(),
|
|
2392
2397
|
};
|
|
2393
2398
|
await this._payloadStore.tag?.set(tagId, payload);
|
|
2394
|
-
log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId);
|
|
2399
|
+
this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId);
|
|
2395
2400
|
return payload;
|
|
2396
2401
|
}
|
|
2397
2402
|
/**
|
|
@@ -2400,7 +2405,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2400
2405
|
*
|
|
2401
2406
|
*/
|
|
2402
2407
|
async postPublish(payload) {
|
|
2403
|
-
log.verbose('PuppetService', 'postPublish(%s)', payload);
|
|
2408
|
+
this.log.verbose('PuppetService', 'postPublish(%s)', payload);
|
|
2404
2409
|
if (!PUPPET.payloads.isPostClient(payload)) {
|
|
2405
2410
|
throw new Error('can only publish client post now');
|
|
2406
2411
|
}
|
|
@@ -2413,13 +2418,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2413
2418
|
return momentId;
|
|
2414
2419
|
}
|
|
2415
2420
|
async postUnpublish(id) {
|
|
2416
|
-
log.verbose('PuppetService', 'postUnpublish(%s)', id);
|
|
2421
|
+
this.log.verbose('PuppetService', 'postUnpublish(%s)', id);
|
|
2417
2422
|
const request = new grpcPuppet.MomentUnpublishRequest();
|
|
2418
2423
|
request.setMomentId(id);
|
|
2419
2424
|
await util.promisify(this.grpcManager.client.momentUnpublish.bind(this.grpcManager.client))(request);
|
|
2420
2425
|
}
|
|
2421
2426
|
async momentSignature(text) {
|
|
2422
|
-
log.verbose('PuppetService', 'momentSignature(%s)', text);
|
|
2427
|
+
this.log.verbose('PuppetService', 'momentSignature(%s)', text);
|
|
2423
2428
|
const request = new grpcPuppet.MomentSignatureRequest();
|
|
2424
2429
|
if (text) {
|
|
2425
2430
|
request.setText(text);
|
|
@@ -2430,7 +2435,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2430
2435
|
return signature;
|
|
2431
2436
|
}
|
|
2432
2437
|
async momentCoverage(cover) {
|
|
2433
|
-
log.verbose('PuppetService', 'momentCoverage(%s)', JSON.stringify(cover));
|
|
2438
|
+
this.log.verbose('PuppetService', 'momentCoverage(%s)', JSON.stringify(cover));
|
|
2434
2439
|
const request = new grpcPuppet.MomentCoverageRequest();
|
|
2435
2440
|
if (cover) {
|
|
2436
2441
|
const serializedFileBox = await this.serializeFileBox(cover);
|
|
@@ -2444,7 +2449,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2444
2449
|
}
|
|
2445
2450
|
}
|
|
2446
2451
|
async postPayloadSayable(postId, sayableId) {
|
|
2447
|
-
log.verbose('PuppetService', 'postPayloadSayable(%s, %s)', postId, sayableId);
|
|
2452
|
+
this.log.verbose('PuppetService', 'postPayloadSayable(%s, %s)', postId, sayableId);
|
|
2448
2453
|
const request = new grpcPuppet.PostPayloadSayableRequest();
|
|
2449
2454
|
request.setPostId(postId);
|
|
2450
2455
|
request.setSayableId(sayableId);
|
|
@@ -2496,7 +2501,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2496
2501
|
}
|
|
2497
2502
|
}
|
|
2498
2503
|
async postRawPayload(id) {
|
|
2499
|
-
log.verbose('PuppetService', 'postRawPayload(%s)', id);
|
|
2504
|
+
this.log.verbose('PuppetService', 'postRawPayload(%s)', id);
|
|
2500
2505
|
const request = new grpcPuppet.PostPayloadRequest();
|
|
2501
2506
|
request.setPostId(id);
|
|
2502
2507
|
const response = await util.promisify(this.grpcManager.client.postPayload
|
|
@@ -2540,12 +2545,12 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2540
2545
|
return payload;
|
|
2541
2546
|
}
|
|
2542
2547
|
async postRawPayloadParser(payload) {
|
|
2543
|
-
// log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
|
|
2548
|
+
// this.log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
|
|
2544
2549
|
// passthrough
|
|
2545
2550
|
return payload;
|
|
2546
2551
|
}
|
|
2547
2552
|
async tap(postId, type, tap = true) {
|
|
2548
|
-
log.verbose('PuppetService', 'tap(%s, %s, %s)', postId, type, tap);
|
|
2553
|
+
this.log.verbose('PuppetService', 'tap(%s, %s, %s)', postId, type, tap);
|
|
2549
2554
|
const request = new grpcPuppet.PostTapRequest();
|
|
2550
2555
|
request.setPostId(postId);
|
|
2551
2556
|
if (type) {
|
|
@@ -2558,14 +2563,14 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2558
2563
|
return result;
|
|
2559
2564
|
}
|
|
2560
2565
|
async momentVisibleList() {
|
|
2561
|
-
log.verbose('PuppetService', 'momentVisibleList()');
|
|
2566
|
+
this.log.verbose('PuppetService', 'momentVisibleList()');
|
|
2562
2567
|
const request = new grpcPuppet.MomentVisibleListRequest();
|
|
2563
2568
|
const response = await util.promisify(this.grpcManager.client.momentVisibleList.bind(this.grpcManager.client))(request);
|
|
2564
2569
|
const contactIdsList = response.getContactIdsList();
|
|
2565
2570
|
return contactIdsList;
|
|
2566
2571
|
}
|
|
2567
2572
|
async getContactExternalUserId(contactIds, serviceProviderId) {
|
|
2568
|
-
log.verbose('PuppetService', 'getContactExternalUserId(%s, %s)', JSON.stringify(contactIds), serviceProviderId);
|
|
2573
|
+
this.log.verbose('PuppetService', 'getContactExternalUserId(%s, %s)', JSON.stringify(contactIds), serviceProviderId);
|
|
2569
2574
|
const request = new grpcPuppet.GetContactExternalUserIdRequest();
|
|
2570
2575
|
request.setContactIdsList(contactIds);
|
|
2571
2576
|
if (serviceProviderId) {
|
|
@@ -2583,7 +2588,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2583
2588
|
return result;
|
|
2584
2589
|
}
|
|
2585
2590
|
async getRoomAntiSpamStrategyList() {
|
|
2586
|
-
log.verbose('PuppetService', 'getRoomAntiSpamStrategyList()');
|
|
2591
|
+
this.log.verbose('PuppetService', 'getRoomAntiSpamStrategyList()');
|
|
2587
2592
|
const request = new grpcPuppet.GetRoomAntiSpamStrategyListRequest();
|
|
2588
2593
|
const response = await util.promisify(this.grpcManager.client.getRoomAntiSpamStrategyList.bind(this.grpcManager.client))(request);
|
|
2589
2594
|
const result = [];
|
|
@@ -2597,7 +2602,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2597
2602
|
return result;
|
|
2598
2603
|
}
|
|
2599
2604
|
async getRoomAntiSpamStrategyEffectRoomList(strategyId) {
|
|
2600
|
-
log.verbose('PuppetService', 'getRoomAntiSpamStrategyEffectRoomList(%s)', strategyId);
|
|
2605
|
+
this.log.verbose('PuppetService', 'getRoomAntiSpamStrategyEffectRoomList(%s)', strategyId);
|
|
2601
2606
|
const request = new grpcPuppet.GetRoomAntiSpamStrategyEffectRoomListRequest();
|
|
2602
2607
|
request.setStrategyId(strategyId);
|
|
2603
2608
|
const response = await util.promisify(this.grpcManager.client.getRoomAntiSpamStrategyEffectRoomList.bind(this.grpcManager.client))(request);
|
|
@@ -2605,7 +2610,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2605
2610
|
return result;
|
|
2606
2611
|
}
|
|
2607
2612
|
async applyRoomAntiSpamStrategy(strategyId, roomIds, active) {
|
|
2608
|
-
log.verbose('PuppetService', 'applyRoomAntiSpamStrategy(%s, %s, %s)', strategyId, roomIds, active);
|
|
2613
|
+
this.log.verbose('PuppetService', 'applyRoomAntiSpamStrategy(%s, %s, %s)', strategyId, roomIds, active);
|
|
2609
2614
|
const request = new grpcPuppet.ApplyRoomAntiSpamStrategyRequest();
|
|
2610
2615
|
request.setStrategyId(strategyId);
|
|
2611
2616
|
request.setRoomIdsList(roomIds);
|
|
@@ -2613,7 +2618,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2613
2618
|
await util.promisify(this.grpcManager.client.applyRoomAntiSpamStrategy.bind(this.grpcManager.client))(request);
|
|
2614
2619
|
}
|
|
2615
2620
|
async getCorpMessageInterceptionStrategies() {
|
|
2616
|
-
log.verbose('PuppetService', 'getCorpMessageInterceptionStrategies()');
|
|
2621
|
+
this.log.verbose('PuppetService', 'getCorpMessageInterceptionStrategies()');
|
|
2617
2622
|
const request = new grpcPuppet.GetCorpMessageInterceptionStrategiesRequest();
|
|
2618
2623
|
const response = await util.promisify(this.grpcManager.client.getCorpMessageInterceptionStrategies.bind(this.grpcManager.client))(request);
|
|
2619
2624
|
const result = [];
|
|
@@ -2646,15 +2651,15 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2646
2651
|
reconnectIndicator;
|
|
2647
2652
|
async reset() {
|
|
2648
2653
|
if (!this._grpcManager) {
|
|
2649
|
-
log.warn('PuppetService', 'grpc manager not constructed, perform regular reset');
|
|
2654
|
+
this.log.warn('PuppetService', 'grpc manager not constructed, perform regular reset');
|
|
2650
2655
|
return super.reset();
|
|
2651
2656
|
}
|
|
2652
2657
|
if (!this.isLoggedIn) {
|
|
2653
|
-
log.warn('PuppetService', 'puppet not logged in, perform regular reset');
|
|
2658
|
+
this.log.warn('PuppetService', 'puppet not logged in, perform regular reset');
|
|
2654
2659
|
return super.reset();
|
|
2655
2660
|
}
|
|
2656
2661
|
if (this.reconnectIndicator.value()) {
|
|
2657
|
-
log.warn('PuppetService', 'already trying to reconnect, pass this one');
|
|
2662
|
+
this.log.warn('PuppetService', 'already trying to reconnect, pass this one');
|
|
2658
2663
|
return;
|
|
2659
2664
|
}
|
|
2660
2665
|
this.reconnectIndicator.value(true);
|
|
@@ -2704,13 +2709,13 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2704
2709
|
}
|
|
2705
2710
|
catch (e) {
|
|
2706
2711
|
if (Date.now() - startTime < timeoutMilliseconds) {
|
|
2707
|
-
log.warn('failed to start stream, will try again in 15 seconds');
|
|
2712
|
+
this.log.warn('failed to start stream, will try again in 15 seconds');
|
|
2708
2713
|
await new Promise(resolve => {
|
|
2709
2714
|
setTimeout(resolve, 5000);
|
|
2710
2715
|
});
|
|
2711
2716
|
}
|
|
2712
2717
|
else {
|
|
2713
|
-
log.warn('failed to start stream and reaches timeout, will perform regular reset');
|
|
2718
|
+
this.log.warn('failed to start stream and reaches timeout, will perform regular reset');
|
|
2714
2719
|
this.reconnectIndicator.value(false);
|
|
2715
2720
|
return super.reset();
|
|
2716
2721
|
}
|
|
@@ -2727,7 +2732,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2727
2732
|
});
|
|
2728
2733
|
}
|
|
2729
2734
|
catch (e) {
|
|
2730
|
-
log.warn('PuppetService', 'waiting for event reset login error, will perform regular reset');
|
|
2735
|
+
this.log.warn('PuppetService', 'waiting for event reset login error, will perform regular reset');
|
|
2731
2736
|
return super.reset();
|
|
2732
2737
|
}
|
|
2733
2738
|
try {
|
|
@@ -2738,7 +2743,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2738
2743
|
});
|
|
2739
2744
|
}
|
|
2740
2745
|
catch (e) {
|
|
2741
|
-
log.warn('PuppetService', 'waiting for event reset ready error, will do nothing');
|
|
2746
|
+
this.log.warn('PuppetService', 'waiting for event reset ready error, will do nothing');
|
|
2742
2747
|
}
|
|
2743
2748
|
}
|
|
2744
2749
|
async getMiscellaneousStoreData() {
|
|
@@ -2752,7 +2757,7 @@ class PuppetService extends PUPPET.Puppet {
|
|
|
2752
2757
|
const lastEventTimestamp = await this._payloadStore.miscellaneous?.get('lastEventTimestamp');
|
|
2753
2758
|
let lastEventSeq = await this._payloadStore.miscellaneous?.get('lastEventSeq');
|
|
2754
2759
|
if ((Date.now() - Number(lastEventTimestamp || 0)) > this.timeoutMilliseconds) {
|
|
2755
|
-
log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`);
|
|
2760
|
+
this.log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`);
|
|
2756
2761
|
lastEventSeq = undefined;
|
|
2757
2762
|
}
|
|
2758
2763
|
const accountId = await this._payloadStore.miscellaneous?.get('accountId');
|