@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.
Files changed (33) hide show
  1. package/dist/cjs/src/client/grpc-manager.d.ts +1 -0
  2. package/dist/cjs/src/client/grpc-manager.d.ts.map +1 -1
  3. package/dist/cjs/src/client/grpc-manager.js +49 -47
  4. package/dist/cjs/src/client/grpc-manager.js.map +1 -1
  5. package/dist/cjs/src/client/payload-store.d.ts +3 -0
  6. package/dist/cjs/src/client/payload-store.d.ts.map +1 -1
  7. package/dist/cjs/src/client/payload-store.js +8 -6
  8. package/dist/cjs/src/client/payload-store.js.map +1 -1
  9. package/dist/cjs/src/client/puppet-service.d.ts.map +1 -1
  10. package/dist/cjs/src/client/puppet-service.js +221 -216
  11. package/dist/cjs/src/client/puppet-service.js.map +1 -1
  12. package/dist/cjs/src/package-json.d.ts.map +1 -1
  13. package/dist/cjs/src/package-json.js +4 -3
  14. package/dist/cjs/src/package-json.js.map +1 -1
  15. package/dist/esm/src/client/grpc-manager.d.ts +1 -0
  16. package/dist/esm/src/client/grpc-manager.d.ts.map +1 -1
  17. package/dist/esm/src/client/grpc-manager.js +50 -48
  18. package/dist/esm/src/client/grpc-manager.js.map +1 -1
  19. package/dist/esm/src/client/payload-store.d.ts +3 -0
  20. package/dist/esm/src/client/payload-store.d.ts.map +1 -1
  21. package/dist/esm/src/client/payload-store.js +8 -6
  22. package/dist/esm/src/client/payload-store.js.map +1 -1
  23. package/dist/esm/src/client/puppet-service.d.ts.map +1 -1
  24. package/dist/esm/src/client/puppet-service.js +221 -216
  25. package/dist/esm/src/client/puppet-service.js.map +1 -1
  26. package/dist/esm/src/package-json.d.ts.map +1 -1
  27. package/dist/esm/src/package-json.js +4 -3
  28. package/dist/esm/src/package-json.js.map +1 -1
  29. package/package.json +4 -3
  30. package/src/client/grpc-manager.ts +54 -48
  31. package/src/client/payload-store.ts +13 -7
  32. package/src/client/puppet-service.ts +222 -217
  33. package/src/package-json.ts +4 -3
@@ -148,7 +148,8 @@ class PuppetService extends PUPPET.Puppet {
148
148
  ) {
149
149
  super(options)
150
150
  this._payloadStore = new PayloadStore({
151
- token: envVars.WECHATY_PUPPET_SERVICE_TOKEN(this.options.token),
151
+ token : envVars.WECHATY_PUPPET_SERVICE_TOKEN(this.options.token),
152
+ logger : this.options.logger,
152
153
  })
153
154
 
154
155
  this.hookPayloadStore()
@@ -192,19 +193,19 @@ class PuppetService extends PUPPET.Puppet {
192
193
  }
193
194
 
194
195
  override async onStart (): Promise<void> {
195
- log.verbose('PuppetService', 'onStart()')
196
+ this.log.verbose('PuppetService', 'onStart()')
196
197
 
197
198
  this.waitingForLogin = false
198
199
  this.waitingForReady = false
199
200
 
200
201
  if (this._grpcManager) {
201
- log.warn('PuppetService', 'onStart() found this.grpc is already existed. dropped.')
202
+ this.log.warn('PuppetService', 'onStart() found this.grpc is already existed. dropped.')
202
203
  this._grpcManager = undefined
203
204
  }
204
205
 
205
- log.info('PuppetService', 'start() instanciating GrpcManager ...')
206
+ this.log.info('PuppetService', 'start() instanciating GrpcManager ...')
206
207
  const grpcManager = new GrpcManager(this.options)
207
- log.info('PuppetService', 'start() instanciating GrpcManager ... done')
208
+ this.log.info('PuppetService', 'start() instanciating GrpcManager ... done')
208
209
 
209
210
  /**
210
211
  * Huan(202108): when we started the event stream,
@@ -212,71 +213,71 @@ class PuppetService extends PUPPET.Puppet {
212
213
  */
213
214
  this._grpcManager = grpcManager
214
215
 
215
- log.info('PuppetService', 'start() setting up bridge grpc event stream ...')
216
+ this.log.info('PuppetService', 'start() setting up bridge grpc event stream ...')
216
217
  this.bridgeGrpcEventStream(grpcManager)
217
- log.info('PuppetService', 'start() setting up bridge grpc event stream ... done')
218
+ this.log.info('PuppetService', 'start() setting up bridge grpc event stream ... done')
218
219
 
219
- log.info('PuppetService', 'start() starting grpc manager...')
220
+ this.log.info('PuppetService', 'start() starting grpc manager...')
220
221
  const { lastEventSeq, accountId } = await this.getMiscellaneousStoreData()
221
222
  await grpcManager.start(lastEventSeq, accountId)
222
- log.info('PuppetService', 'start() starting grpc manager... done')
223
+ this.log.info('PuppetService', 'start() starting grpc manager... done')
223
224
 
224
- log.info('PuppetService', 'start healthCheck')
225
+ this.log.info('PuppetService', 'start healthCheck')
225
226
  this.startHealthCheck()
226
227
 
227
- log.info('PuppetService', 'onStart() ... done')
228
+ this.log.info('PuppetService', 'onStart() ... done')
228
229
  }
229
230
 
230
231
  override async onStop (): Promise<void> {
231
- log.info('PuppetService', 'onStop()')
232
+ this.log.info('PuppetService', 'onStop()')
232
233
 
233
234
  if (this._grpcManager) {
234
- log.info('PuppetService', 'onStop() stopping grpc manager ...')
235
+ this.log.info('PuppetService', 'onStop() stopping grpc manager ...')
235
236
  const grpcManager = this._grpcManager
236
237
  this._grpcManager = undefined
237
238
  await grpcManager.stop()
238
- log.info('PuppetService', 'onStop() stopping grpc manager ... done')
239
+ this.log.info('PuppetService', 'onStop() stopping grpc manager ... done')
239
240
  }
240
241
 
241
- log.info('PuppetService', 'onStop() ... done')
242
- log.info('PuppetService', 'stop healthCheck')
242
+ this.log.info('PuppetService', 'onStop() ... done')
243
+ this.log.info('PuppetService', 'stop healthCheck')
243
244
  this.stopHealthCheck()
244
245
  }
245
246
 
246
247
  protected hookPayloadStore (): void {
247
- log.verbose('PuppetService', 'hookPayloadStore()')
248
+ this.log.verbose('PuppetService', 'hookPayloadStore()')
248
249
 
249
250
  this.on('login', async ({ contactId }) => {
250
251
  try {
251
- log.verbose('PuppetService', 'hookPayloadStore() this.on(login) contactId: "%s"', contactId)
252
+ this.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) contactId: "%s"', contactId)
252
253
  await this._payloadStore.start(contactId)
253
254
  } catch (e) {
254
- log.verbose('PuppetService', 'hookPayloadStore() this.on(login) rejection "%s"', (e as Error).message)
255
+ this.log.verbose('PuppetService', 'hookPayloadStore() this.on(login) rejection "%s"', (e as Error).message)
255
256
  }
256
257
  })
257
258
 
258
259
  this.on('logout', async ({ contactId }) => {
259
- log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) contactId: "%s"', contactId)
260
+ this.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) contactId: "%s"', contactId)
260
261
  try {
261
262
  await this._payloadStore.stop()
262
263
  } catch (e) {
263
- log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) rejection "%s"', (e as Error).message)
264
+ this.log.verbose('PuppetService', 'hookPayloadStore() this.on(logout) rejection "%s"', (e as Error).message)
264
265
  }
265
266
  })
266
267
  }
267
268
 
268
269
  protected bridgeGrpcEventStream (client: GrpcManager): void {
269
- log.verbose('PuppetService', 'bridgeGrpcEventStream(client)')
270
+ this.log.verbose('PuppetService', 'bridgeGrpcEventStream(client)')
270
271
 
271
272
  client
272
273
  .on('data', this.onGrpcStreamEvent.bind(this) as any)
273
274
  .on('end', () => {
274
- log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(end)')
275
+ this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(end)')
275
276
  })
276
277
  .on('error', (e: unknown) => {
277
278
  this.emit('error', e)
278
279
  // https://github.com/wechaty/wechaty-puppet-service/issues/16
279
- // log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(error) %s', e)
280
+ // this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(error) %s', e)
280
281
  // const reason = 'bridgeGrpcEventStream() eventStream.on(error) ' + e
281
282
  /**
282
283
  * Huan(202110): simple reset puppet when grpc client has error? (or not?)
@@ -291,7 +292,7 @@ class PuppetService extends PUPPET.Puppet {
291
292
  // }
292
293
  })
293
294
  .on('cancel', (...args: any[]) => {
294
- log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(cancel), %s', JSON.stringify(args))
295
+ this.log.verbose('PuppetService', 'bridgeGrpcEventStream() eventStream.on(cancel), %s', JSON.stringify(args))
295
296
  })
296
297
  }
297
298
 
@@ -303,10 +304,10 @@ class PuppetService extends PUPPET.Puppet {
303
304
  const timestamp = String(Date.now())
304
305
 
305
306
  if (!NO_LOG_EVENTS.includes(type)) {
306
- log.info('PuppetService', `received grpc event ${EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}, seq: ${seq}, timestamp: ${timestamp}`)
307
+ this.log.info('PuppetService', `received grpc event ${EventTypeRev[type]} on ${new Date().toString()}, content: ${JSON.stringify(payload)}, seq: ${seq}, timestamp: ${timestamp}`)
307
308
  }
308
309
 
309
- log.silly('PuppetService',
310
+ this.log.silly('PuppetService',
310
311
  'onGrpcStreamEvent({type:%s(%s), payload:"%s"})',
311
312
  EventTypeRev[type],
312
313
  type,
@@ -345,7 +346,7 @@ class PuppetService extends PUPPET.Puppet {
345
346
  case grpcPuppet.EventType.EVENT_TYPE_LOGIN:
346
347
  {
347
348
  if (this.waitingForLogin && this.isLoggedIn) {
348
- log.warn('PuppetService', 'this login event is ignored because the it is expected by event stream reconnect and this puppet is already logged in')
349
+ 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')
349
350
  return
350
351
  }
351
352
  const loginPayload = JSON.parse(payload) as PUPPET.payloads.EventLogin
@@ -361,7 +362,7 @@ class PuppetService extends PUPPET.Puppet {
361
362
  (
362
363
  async () => this.login(loginPayload.contactId)
363
364
  )().catch(e =>
364
- log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s',
365
+ this.log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s',
365
366
  (e as Error).message,
366
367
  ),
367
368
  )
@@ -376,7 +377,7 @@ class PuppetService extends PUPPET.Puppet {
376
377
  ;(
377
378
  async () => this.logout(logoutPayload.data)
378
379
  )().catch(e =>
379
- log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s',
380
+ this.log.error('PuppetService', 'onGrpcStreamEvent() this.logout() rejection %s',
380
381
  (e as Error).message,
381
382
  ),
382
383
  )
@@ -402,7 +403,7 @@ class PuppetService extends PUPPET.Puppet {
402
403
  break
403
404
  case grpcPuppet.EventType.EVENT_TYPE_READY:
404
405
  if (this.waitingForReady && this.readyIndicator.value()) {
405
- log.warn('PuppetService', 'this ready event is ignored because the it is expected by event stream reconnect and this puppet is already ready')
406
+ this.log.warn('PuppetService', 'this ready event is ignored because the it is expected by event stream reconnect and this puppet is already ready')
406
407
  return
407
408
  }
408
409
  this.emit('ready', JSON.parse(payload) as PUPPET.payloads.EventReady)
@@ -432,14 +433,14 @@ class PuppetService extends PUPPET.Puppet {
432
433
  this.emit('tag-group', JSON.parse(payload) as PUPPET.payloads.EventTagGroup)
433
434
  break
434
435
  case grpcPuppet.EventType.EVENT_TYPE_RESET:
435
- log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?')
436
+ this.log.warn('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_RESET ?')
436
437
  // the `reset` event should be dealed not send out
437
438
  break
438
439
  case grpcPuppet.EventType.EVENT_TYPE_VERIFY_CODE:
439
440
  this.emit('verify-code', JSON.parse(payload) as PUPPET.payloads.EventVerifyCode)
440
441
  break
441
442
  case grpcPuppet.EventType.EVENT_TYPE_UNSPECIFIED:
442
- log.error('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_UNSPECIFIED ?')
443
+ this.log.error('PuppetService', 'onGrpcStreamEvent() got an EventType.EVENT_TYPE_UNSPECIFIED ?')
443
444
  break
444
445
  case grpcPuppet.EventType.EVENT_TYPE_VERIFY_SLIDE:
445
446
  this.emit('verify-slide', JSON.parse(payload) as PUPPET.payloads.EventVerifySlide)
@@ -450,12 +451,12 @@ class PuppetService extends PUPPET.Puppet {
450
451
 
451
452
  default:
452
453
  // Huan(202003): in default, the `type` type should be `never`, please check.
453
- log.error(`eventType ${type} unsupported! data: ${payload}`)
454
+ this.log.error(`eventType ${type} unsupported! data: ${payload}`)
454
455
  }
455
456
  }
456
457
 
457
458
  override async logout (reason?: string): Promise<void> {
458
- log.verbose('PuppetService', 'logout(%s)', reason ? `"${reason}"` : '')
459
+ this.log.verbose('PuppetService', 'logout(%s)', reason ? `"${reason}"` : '')
459
460
 
460
461
  await super.logout(reason)
461
462
 
@@ -466,12 +467,12 @@ class PuppetService extends PUPPET.Puppet {
466
467
  )(new grpcPuppet.LogoutRequest())
467
468
 
468
469
  } catch (e) {
469
- log.silly('PuppetService', 'logout() no grpc client')
470
+ this.log.silly('PuppetService', 'logout() no grpc client')
470
471
  }
471
472
  }
472
473
 
473
474
  override ding (data: string): void {
474
- log.silly('PuppetService', 'ding(%s)', data)
475
+ this.log.silly('PuppetService', 'ding(%s)', data)
475
476
 
476
477
  const request = new grpcPuppet.DingRequest()
477
478
  request.setData(data || '')
@@ -480,7 +481,7 @@ class PuppetService extends PUPPET.Puppet {
480
481
  request,
481
482
  (error, _response) => {
482
483
  if (error) {
483
- log.error('PuppetService', 'ding() rejection: %s', error)
484
+ this.log.error('PuppetService', 'ding() rejection: %s', error)
484
485
  }
485
486
  },
486
487
  )
@@ -495,7 +496,7 @@ class PuppetService extends PUPPET.Puppet {
495
496
  *
496
497
  */
497
498
  override async dirtyPayload (type: PUPPET.types.Dirty, id: string) {
498
- log.verbose('PuppetService', 'dirtyPayload(%s, %s)', type, id)
499
+ this.log.verbose('PuppetService', 'dirtyPayload(%s, %s)', type, id)
499
500
 
500
501
  const request = new grpcPuppet.DirtyPayloadRequest()
501
502
  request.setId(id)
@@ -507,7 +508,7 @@ class PuppetService extends PUPPET.Puppet {
507
508
  )(request)
508
509
 
509
510
  } catch (e) {
510
- log.error('PuppetService', 'dirtyPayload() rejection: %s', e && (e as Error).message)
511
+ this.log.error('PuppetService', 'dirtyPayload() rejection: %s', e && (e as Error).message)
511
512
  throw e
512
513
  }
513
514
  }
@@ -587,7 +588,7 @@ class PuppetService extends PUPPET.Puppet {
587
588
  [PUPPET.types.Dirty.Call]: async (_: string) => {},
588
589
  [PUPPET.types.Dirty.Unspecified]: async (id: string) => {
589
590
  const msg = `fastDirty() received Unspecified dirty type (id=${id}); upstream puppet is leaking protobuf default — this is a server-side contract bug`
590
- log.error('PuppetService', msg)
591
+ this.log.error('PuppetService', msg)
591
592
  this.emit('error', new Error(msg))
592
593
  },
593
594
  }
@@ -603,7 +604,7 @@ class PuppetService extends PUPPET.Puppet {
603
604
  payloadId,
604
605
  }: PUPPET.payloads.EventDirty,
605
606
  ): Promise<void> {
606
- log.verbose('PuppetService', 'fastDirty(%s<%s>, %s)', PUPPET.types.Dirty[payloadType], payloadType, payloadId)
607
+ this.log.verbose('PuppetService', 'fastDirty(%s<%s>, %s)', PUPPET.types.Dirty[payloadType], payloadType, payloadId)
607
608
 
608
609
  // payloadType is typed as the enum, but at runtime the server may emit a
609
610
  // value outside our enum (forward-compat). Look it up via a
@@ -611,7 +612,7 @@ class PuppetService extends PUPPET.Puppet {
611
612
  const lookup = this._dirtyHandlerMap as Partial<Record<PUPPET.types.Dirty, (id: string) => Promise<unknown>>>
612
613
  const handler = lookup[payloadType]
613
614
  if (!handler) {
614
- log.warn('PuppetService', 'fastDirty() no handler for payloadType=%s', payloadType)
615
+ this.log.warn('PuppetService', 'fastDirty() no handler for payloadType=%s', payloadType)
615
616
  return
616
617
  }
617
618
 
@@ -623,7 +624,7 @@ class PuppetService extends PUPPET.Puppet {
623
624
  }
624
625
 
625
626
  override async enterVerifyCode (id: string, code: string): Promise<void> {
626
- log.verbose('PuppetService', 'enterVerifyCode(%s, %s)', id, code)
627
+ this.log.verbose('PuppetService', 'enterVerifyCode(%s, %s)', id, code)
627
628
 
628
629
  const request = new grpcPuppet.EnterVerifyCodeRequest()
629
630
  request.setId(id)
@@ -636,7 +637,7 @@ class PuppetService extends PUPPET.Puppet {
636
637
  }
637
638
 
638
639
  override async cancelVerifyCode (id: string): Promise<void> {
639
- log.verbose('PuppetService', 'cancelVerifyCode(%s)', id)
640
+ this.log.verbose('PuppetService', 'cancelVerifyCode(%s)', id)
640
641
 
641
642
  const request = new grpcPuppet.CancelVerifyCodeRequest()
642
643
  request.setId(id)
@@ -648,7 +649,7 @@ class PuppetService extends PUPPET.Puppet {
648
649
  }
649
650
 
650
651
  override async refreshQRCode (): Promise<void> {
651
- log.verbose('PuppetService', 'refreshQRCode(%s)')
652
+ this.log.verbose('PuppetService', 'refreshQRCode(%s)')
652
653
 
653
654
  const request = new grpcPuppet.RefreshQRCodeRequest()
654
655
 
@@ -667,7 +668,7 @@ class PuppetService extends PUPPET.Puppet {
667
668
  override contactAlias (contactId: string, alias: string | null): Promise<void>
668
669
 
669
670
  override async contactAlias (contactId: string, alias?: string | null): Promise<void | string> {
670
- log.verbose('PuppetService', 'contactAlias(%s, %s)', contactId, alias)
671
+ this.log.verbose('PuppetService', 'contactAlias(%s, %s)', contactId, alias)
671
672
 
672
673
  /**
673
674
  * Get alias
@@ -719,7 +720,7 @@ class PuppetService extends PUPPET.Puppet {
719
720
  }
720
721
 
721
722
  override async contactPhone (contactId: string, phoneList: string[]): Promise<void> {
722
- log.verbose('PuppetService', 'contactPhone(%s, %s)', contactId, phoneList)
723
+ this.log.verbose('PuppetService', 'contactPhone(%s, %s)', contactId, phoneList)
723
724
 
724
725
  const request = new grpcPuppet.ContactPhoneRequest()
725
726
  request.setContactId(contactId)
@@ -732,7 +733,7 @@ class PuppetService extends PUPPET.Puppet {
732
733
  }
733
734
 
734
735
  override async contactCorporationRemark (contactId: string, corporationRemark: string | null) {
735
- log.verbose('PuppetService', 'contactCorporationRemark(%s, %s)', contactId, corporationRemark)
736
+ this.log.verbose('PuppetService', 'contactCorporationRemark(%s, %s)', contactId, corporationRemark)
736
737
 
737
738
  const request = new grpcPuppet.ContactCorporationRemarkRequest()
738
739
  request.setContactId(contactId)
@@ -756,7 +757,7 @@ class PuppetService extends PUPPET.Puppet {
756
757
  }
757
758
 
758
759
  override async contactDescription (contactId: string, description: string | null) {
759
- log.verbose('PuppetService', 'contactDescription(%s, %s)', contactId, description)
760
+ this.log.verbose('PuppetService', 'contactDescription(%s, %s)', contactId, description)
760
761
 
761
762
  const request = new grpcPuppet.ContactDescriptionRequest()
762
763
  request.setContactId(contactId)
@@ -780,7 +781,7 @@ class PuppetService extends PUPPET.Puppet {
780
781
  }
781
782
 
782
783
  override async contactList (): Promise<string[]> {
783
- log.verbose('PuppetService', 'contactList()')
784
+ this.log.verbose('PuppetService', 'contactList()')
784
785
 
785
786
  const response = await util.promisify(
786
787
  this.grpcManager.client.contactList
@@ -794,7 +795,7 @@ class PuppetService extends PUPPET.Puppet {
794
795
  override async contactAvatar (contactId: string, file: FileBoxInterface) : Promise<void>
795
796
 
796
797
  override async contactAvatar (contactId: string, fileBox?: FileBoxInterface): Promise<void | FileBoxInterface> {
797
- log.verbose('PuppetService', 'contactAvatar(%s)', contactId)
798
+ this.log.verbose('PuppetService', 'contactAvatar(%s)', contactId)
798
799
 
799
800
  /**
800
801
  * 1. set
@@ -846,11 +847,11 @@ class PuppetService extends PUPPET.Puppet {
846
847
  }
847
848
 
848
849
  override async contactRawPayload (id: string): Promise<PUPPET.payloads.Contact> {
849
- log.verbose('PuppetService', 'contactRawPayload(%s)', id)
850
+ this.log.verbose('PuppetService', 'contactRawPayload(%s)', id)
850
851
 
851
852
  const cachedPayload = await this._payloadStore.contact?.get(id)
852
853
  if (cachedPayload) {
853
- log.silly('PuppetService', 'contactRawPayload(%s) cache HIT', id)
854
+ this.log.silly('PuppetService', 'contactRawPayload(%s) cache HIT', id)
854
855
  return cachedPayload
855
856
  }
856
857
 
@@ -897,19 +898,19 @@ class PuppetService extends PUPPET.Puppet {
897
898
  }
898
899
 
899
900
  await this._payloadStore.contact?.set(id, payload)
900
- log.silly('PuppetService', 'contactRawPayload(%s) cache SET', id)
901
+ this.log.silly('PuppetService', 'contactRawPayload(%s) cache SET', id)
901
902
 
902
903
  return payload
903
904
  }
904
905
 
905
906
  override async contactRawPayloadParser (payload: PUPPET.payloads.Contact): Promise<PUPPET.payloads.Contact> {
906
- // log.silly('PuppetService', 'contactRawPayloadParser({id:%s})', payload.id)
907
+ // this.log.silly('PuppetService', 'contactRawPayloadParser({id:%s})', payload.id)
907
908
  // passthrough
908
909
  return payload
909
910
  }
910
911
 
911
912
  override async batchContactRawPayload (contactIdList: string[]): Promise<Map<string, PUPPET.payloads.Contact>> {
912
- log.verbose('PuppetService', 'batchContactRawPayload(%s)', contactIdList)
913
+ this.log.verbose('PuppetService', 'batchContactRawPayload(%s)', contactIdList)
913
914
 
914
915
  const result = new Map<string, PUPPET.payloads.Contact>()
915
916
  const contactIdSet = new Set<string>(contactIdList)
@@ -941,7 +942,7 @@ class PuppetService extends PUPPET.Puppet {
941
942
  await this._payloadStore.contact?.set(contactId, puppetPayload)
942
943
  }
943
944
  } catch (e) {
944
- log.error('PuppetService', 'batchContactRawPayload(%s, %s) error: %s, use one by one method', contactIdList, needGetSet, e)
945
+ this.log.error('PuppetService', 'batchContactRawPayload(%s, %s) error: %s, use one by one method', contactIdList, needGetSet, e)
945
946
  for (const contactId of needGetSet) {
946
947
  const payload = await this.contactRawPayload(contactId)
947
948
  result.set(contactId, payload)
@@ -952,7 +953,7 @@ class PuppetService extends PUPPET.Puppet {
952
953
  }
953
954
 
954
955
  override async contactPayloadModify (contactId: string, payload: Partial<PUPPET.payloads.Contact>): Promise<void> {
955
- log.verbose('PuppetService', 'contactPayloadModify(%s, %s)', contactId, JSON.stringify(payload))
956
+ this.log.verbose('PuppetService', 'contactPayloadModify(%s, %s)', contactId, JSON.stringify(payload))
956
957
 
957
958
  const request = new grpcPuppet.ContactPayloadModifyRequest()
958
959
  request.setId(contactId)
@@ -996,7 +997,7 @@ class PuppetService extends PUPPET.Puppet {
996
997
  }
997
998
 
998
999
  override async contactSelfName (name: string): Promise<void> {
999
- log.verbose('PuppetService', 'contactSelfName(%s)', name)
1000
+ this.log.verbose('PuppetService', 'contactSelfName(%s)', name)
1000
1001
 
1001
1002
  const request = new grpcPuppet.ContactSelfNameRequest()
1002
1003
  request.setName(name)
@@ -1008,7 +1009,7 @@ class PuppetService extends PUPPET.Puppet {
1008
1009
  }
1009
1010
 
1010
1011
  override async contactSelfRealName (realName: string): Promise<void> {
1011
- log.verbose('PuppetService', 'contactSelfRealName(%s)', realName)
1012
+ this.log.verbose('PuppetService', 'contactSelfRealName(%s)', realName)
1012
1013
 
1013
1014
  const request = new grpcPuppet.ContactSelfRealNameRequest()
1014
1015
  request.setRealName(realName)
@@ -1020,7 +1021,7 @@ class PuppetService extends PUPPET.Puppet {
1020
1021
  }
1021
1022
 
1022
1023
  override async contactSelfAka (aka: string): Promise<void> {
1023
- log.verbose('PuppetService', 'contactSelfAka(%s)', aka)
1024
+ this.log.verbose('PuppetService', 'contactSelfAka(%s)', aka)
1024
1025
 
1025
1026
  const request = new grpcPuppet.ContactSelfAkaRequest()
1026
1027
  request.setAka(aka)
@@ -1032,7 +1033,7 @@ class PuppetService extends PUPPET.Puppet {
1032
1033
  }
1033
1034
 
1034
1035
  override async contactSelfQRCode (): Promise<string> {
1035
- log.verbose('PuppetService', 'contactSelfQRCode()')
1036
+ this.log.verbose('PuppetService', 'contactSelfQRCode()')
1036
1037
 
1037
1038
  const response = await util.promisify(
1038
1039
  this.grpcManager.client.contactSelfQRCode
@@ -1043,7 +1044,7 @@ class PuppetService extends PUPPET.Puppet {
1043
1044
  }
1044
1045
 
1045
1046
  override async contactSelfSignature (signature: string): Promise<void> {
1046
- log.verbose('PuppetService', 'contactSelfSignature(%s)', signature)
1047
+ this.log.verbose('PuppetService', 'contactSelfSignature(%s)', signature)
1047
1048
 
1048
1049
  const request = new grpcPuppet.ContactSelfSignatureRequest()
1049
1050
  request.setSignature(signature)
@@ -1055,7 +1056,7 @@ class PuppetService extends PUPPET.Puppet {
1055
1056
  }
1056
1057
 
1057
1058
  override async contactSelfRoomAlias (roomId: string, alias: string): Promise<void> {
1058
- log.verbose('PuppetService', 'contactSelfRoomAlias(%s, %s)', roomId, alias)
1059
+ this.log.verbose('PuppetService', 'contactSelfRoomAlias(%s, %s)', roomId, alias)
1059
1060
 
1060
1061
  const request = new grpcPuppet.ContactSelfRoomAliasRequest()
1061
1062
  request.setRoomId(roomId)
@@ -1068,7 +1069,7 @@ class PuppetService extends PUPPET.Puppet {
1068
1069
  }
1069
1070
 
1070
1071
  override async contactDelete (contactId: string): Promise<void> {
1071
- log.verbose('PuppetService', 'contactDelete(%s)', contactId)
1072
+ this.log.verbose('PuppetService', 'contactDelete(%s)', contactId)
1072
1073
  const request = new grpcPuppet.ContactDeleteRequest()
1073
1074
  request.setContactId(contactId)
1074
1075
 
@@ -1087,7 +1088,7 @@ class PuppetService extends PUPPET.Puppet {
1087
1088
  conversationId: string,
1088
1089
  hasRead = true,
1089
1090
  ) : Promise<void> {
1090
- log.verbose('PuppetService', 'conversationMarkRead(%s, %s)', conversationId, hasRead)
1091
+ this.log.verbose('PuppetService', 'conversationMarkRead(%s, %s)', conversationId, hasRead)
1091
1092
 
1092
1093
  const request = new grpcPuppet.ConversationReadRequest()
1093
1094
  request.setConversationId(conversationId)
@@ -1107,7 +1108,7 @@ class PuppetService extends PUPPET.Puppet {
1107
1108
  override async messageMiniProgram (
1108
1109
  messageId: string,
1109
1110
  ): Promise<PUPPET.payloads.MiniProgram> {
1110
- log.verbose('PuppetService', 'messageMiniProgram(%s)', messageId)
1111
+ this.log.verbose('PuppetService', 'messageMiniProgram(%s)', messageId)
1111
1112
 
1112
1113
  const request = new grpcPuppet.MessageMiniProgramRequest()
1113
1114
  request.setId(messageId)
@@ -1136,7 +1137,7 @@ class PuppetService extends PUPPET.Puppet {
1136
1137
  override async messageLocation (
1137
1138
  messageId: string,
1138
1139
  ): Promise<PUPPET.payloads.Location> {
1139
- log.verbose('PuppetService', 'messageLocation(%s)', messageId)
1140
+ this.log.verbose('PuppetService', 'messageLocation(%s)', messageId)
1140
1141
 
1141
1142
  const request = new grpcPuppet.MessageLocationRequest()
1142
1143
  request.setId(messageId)
@@ -1162,7 +1163,7 @@ class PuppetService extends PUPPET.Puppet {
1162
1163
  messageId: string,
1163
1164
  imageType: PUPPET.types.Image,
1164
1165
  ): Promise<FileBoxInterface> {
1165
- log.verbose('PuppetService', 'messageImage(%s, %s[%s])',
1166
+ this.log.verbose('PuppetService', 'messageImage(%s, %s[%s])',
1166
1167
  messageId,
1167
1168
  imageType,
1168
1169
  PUPPET.types.Image[imageType],
@@ -1188,7 +1189,7 @@ class PuppetService extends PUPPET.Puppet {
1188
1189
  override async messageContact (
1189
1190
  messageId: string,
1190
1191
  ): Promise<string> {
1191
- log.verbose('PuppetService', 'messageContact(%s)', messageId)
1192
+ this.log.verbose('PuppetService', 'messageContact(%s)', messageId)
1192
1193
 
1193
1194
  const request = new grpcPuppet.MessageContactRequest()
1194
1195
  request.setId(messageId)
@@ -1205,7 +1206,7 @@ class PuppetService extends PUPPET.Puppet {
1205
1206
  override async messageChannel (
1206
1207
  messageId: string,
1207
1208
  ): Promise<PUPPET.payloads.Channel> {
1208
- log.verbose('PuppetService', 'messageChannel(%s)', messageId)
1209
+ this.log.verbose('PuppetService', 'messageChannel(%s)', messageId)
1209
1210
 
1210
1211
  const request = new grpcPuppet.MessageChannelRequest()
1211
1212
  request.setId(messageId)
@@ -1223,7 +1224,7 @@ class PuppetService extends PUPPET.Puppet {
1223
1224
  override async messageChannelCard (
1224
1225
  messageId: string,
1225
1226
  ): Promise<PUPPET.payloads.ChannelCard> {
1226
- log.verbose('PuppetService', 'messageChannelCard(%s)', messageId)
1227
+ this.log.verbose('PuppetService', 'messageChannelCard(%s)', messageId)
1227
1228
 
1228
1229
  const request = new grpcPuppet.MessageChannelCardRequest()
1229
1230
  request.setId(messageId)
@@ -1241,7 +1242,7 @@ class PuppetService extends PUPPET.Puppet {
1241
1242
  override async messageCallRecord (
1242
1243
  messageId: string,
1243
1244
  ): Promise<PUPPET.payloads.CallRecord> {
1244
- log.verbose('PuppetService', 'messageCallRecord(%s)', messageId)
1245
+ this.log.verbose('PuppetService', 'messageCallRecord(%s)', messageId)
1245
1246
 
1246
1247
  const request = new grpcPuppet.MessageCallRecordRequest()
1247
1248
  request.setId(messageId)
@@ -1260,7 +1261,7 @@ class PuppetService extends PUPPET.Puppet {
1260
1261
  contactIds: string[],
1261
1262
  media: PUPPET.types.CallMediaType,
1262
1263
  ): Promise<string> {
1263
- log.verbose('PuppetService', 'callInvite(%s, %s)', contactIds, media)
1264
+ this.log.verbose('PuppetService', 'callInvite(%s, %s)', contactIds, media)
1264
1265
 
1265
1266
  const request = new grpcPuppet.CallInviteRequest()
1266
1267
  request.setContactIdsList(contactIds)
@@ -1283,7 +1284,7 @@ class PuppetService extends PUPPET.Puppet {
1283
1284
  callId: string,
1284
1285
  contactIds: string[],
1285
1286
  ): Promise<void> {
1286
- log.verbose('PuppetService', 'callAdd(%s, %s)', callId, contactIds)
1287
+ this.log.verbose('PuppetService', 'callAdd(%s, %s)', callId, contactIds)
1287
1288
 
1288
1289
  const request = new grpcPuppet.CallAddRequest()
1289
1290
  request.setCallId(callId)
@@ -1298,7 +1299,7 @@ class PuppetService extends PUPPET.Puppet {
1298
1299
  override async callAccept (
1299
1300
  callId: string,
1300
1301
  ): Promise<void> {
1301
- log.verbose('PuppetService', 'callAccept(%s)', callId)
1302
+ this.log.verbose('PuppetService', 'callAccept(%s)', callId)
1302
1303
 
1303
1304
  const request = new grpcPuppet.CallAcceptRequest()
1304
1305
  request.setCallId(callId)
@@ -1313,7 +1314,7 @@ class PuppetService extends PUPPET.Puppet {
1313
1314
  callId: string,
1314
1315
  reason?: string,
1315
1316
  ): Promise<void> {
1316
- log.verbose('PuppetService', 'callReject(%s, %s)', callId, reason)
1317
+ this.log.verbose('PuppetService', 'callReject(%s, %s)', callId, reason)
1317
1318
 
1318
1319
  const request = new grpcPuppet.CallRejectRequest()
1319
1320
  request.setCallId(callId)
@@ -1330,7 +1331,7 @@ class PuppetService extends PUPPET.Puppet {
1330
1331
  override async callCancel (
1331
1332
  callId: string,
1332
1333
  ): Promise<void> {
1333
- log.verbose('PuppetService', 'callCancel(%s)', callId)
1334
+ this.log.verbose('PuppetService', 'callCancel(%s)', callId)
1334
1335
 
1335
1336
  const request = new grpcPuppet.CallCancelRequest()
1336
1337
  request.setCallId(callId)
@@ -1345,7 +1346,7 @@ class PuppetService extends PUPPET.Puppet {
1345
1346
  callId: string,
1346
1347
  reason?: string,
1347
1348
  ): Promise<void> {
1348
- log.verbose('PuppetService', 'callHangup(%s, %s)', callId, reason)
1349
+ this.log.verbose('PuppetService', 'callHangup(%s, %s)', callId, reason)
1349
1350
 
1350
1351
  const request = new grpcPuppet.CallHangupRequest()
1351
1352
  request.setCallId(callId)
@@ -1362,7 +1363,7 @@ class PuppetService extends PUPPET.Puppet {
1362
1363
  override async callMediaEndpoint (
1363
1364
  callId: string,
1364
1365
  ): Promise<PUPPET.payloads.CallMediaEndpoint> {
1365
- log.verbose('PuppetService', 'callMediaEndpoint(%s)', callId)
1366
+ this.log.verbose('PuppetService', 'callMediaEndpoint(%s)', callId)
1366
1367
 
1367
1368
  const request = new grpcPuppet.CallMediaEndpointRequest()
1368
1369
  request.setCallId(callId)
@@ -1396,7 +1397,7 @@ class PuppetService extends PUPPET.Puppet {
1396
1397
  }
1397
1398
 
1398
1399
  override async callRawPayload (callId: string): Promise<grpcPuppet.CallPayloadResponse.AsObject> {
1399
- log.verbose('PuppetService', 'callRawPayload(%s)', callId)
1400
+ this.log.verbose('PuppetService', 'callRawPayload(%s)', callId)
1400
1401
 
1401
1402
  const request = new grpcPuppet.CallPayloadRequest()
1402
1403
  request.setId(callId)
@@ -1410,6 +1411,10 @@ class PuppetService extends PUPPET.Puppet {
1410
1411
  }
1411
1412
 
1412
1413
  override async callRawPayloadParser (rawPayload: grpcPuppet.CallPayloadResponse.AsObject): Promise<PUPPET.payloads.Call> {
1414
+ // Intentionally uses the module-level `log` instead of `this.log`: the
1415
+ // matching unit spec invokes this parser via `prototype.call({}, raw)` and
1416
+ // never binds a real PuppetService instance. Keep this `this`-free so that
1417
+ // contract survives the pluggable-logger migration.
1413
1418
  log.verbose('PuppetService', 'callRawPayloadParser({id:%s})', rawPayload.id)
1414
1419
 
1415
1420
  const media = grpcCallTypeToPuppetMedia(rawPayload.media)
@@ -1442,7 +1447,7 @@ class PuppetService extends PUPPET.Puppet {
1442
1447
  override async messageChatHistory (
1443
1448
  messageId: string,
1444
1449
  ): Promise<PUPPET.payloads.ChatHistory[]> {
1445
- log.verbose('PuppetService', 'messageChatHistory(%s)', messageId)
1450
+ this.log.verbose('PuppetService', 'messageChatHistory(%s)', messageId)
1446
1451
 
1447
1452
  const request = new grpcPuppet.MessageChatHistoryRequest()
1448
1453
  request.setId(messageId)
@@ -1461,7 +1466,7 @@ class PuppetService extends PUPPET.Puppet {
1461
1466
  conversationId : string,
1462
1467
  miniProgramPayload : PUPPET.payloads.MiniProgram,
1463
1468
  ): Promise<void | string> {
1464
- log.verbose('PuppetService', 'messageSendMiniProgram(%s, "%s")', conversationId, JSON.stringify(miniProgramPayload))
1469
+ this.log.verbose('PuppetService', 'messageSendMiniProgram(%s, "%s")', conversationId, JSON.stringify(miniProgramPayload))
1465
1470
 
1466
1471
  const request = new grpcPuppet.MessageSendMiniProgramRequest()
1467
1472
  request.setConversationId(conversationId)
@@ -1483,14 +1488,14 @@ class PuppetService extends PUPPET.Puppet {
1483
1488
  */
1484
1489
  request.setMiniProgramDeprecated(JSON.stringify(miniProgramPayload))
1485
1490
 
1486
- log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) about to call grpc`)
1491
+ this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) about to call grpc`)
1487
1492
  const response = await util.promisify(
1488
1493
  this.grpcManager.client.messageSendMiniProgram
1489
1494
  .bind(this.grpcManager.client),
1490
1495
  )(request)
1491
1496
 
1492
1497
  const messageId = response.getId()
1493
- log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) grpc called, messageId: ${messageId}`)
1498
+ this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${miniProgramPayload.description}) grpc called, messageId: ${messageId}`)
1494
1499
 
1495
1500
  if (messageId) {
1496
1501
  return messageId
@@ -1512,7 +1517,7 @@ class PuppetService extends PUPPET.Puppet {
1512
1517
  conversationId: string,
1513
1518
  locationPayload: PUPPET.payloads.Location,
1514
1519
  ): Promise<void | string> {
1515
- log.verbose('PuppetService', 'messageSendLocation(%s)', conversationId, JSON.stringify(locationPayload))
1520
+ this.log.verbose('PuppetService', 'messageSendLocation(%s)', conversationId, JSON.stringify(locationPayload))
1516
1521
 
1517
1522
  const request = new grpcPuppet.MessageSendLocationRequest()
1518
1523
  request.setConversationId(conversationId)
@@ -1525,14 +1530,14 @@ class PuppetService extends PUPPET.Puppet {
1525
1530
  pbLocationPayload.setName(locationPayload.name)
1526
1531
  request.setLocation(pbLocationPayload)
1527
1532
 
1528
- log.info('PuppetService', `messageSendLocation(${conversationId}, ${locationPayload.name}) about to call grpc`)
1533
+ this.log.info('PuppetService', `messageSendLocation(${conversationId}, ${locationPayload.name}) about to call grpc`)
1529
1534
  const response = await util.promisify(
1530
1535
  this.grpcManager.client.messageSendLocation
1531
1536
  .bind(this.grpcManager.client),
1532
1537
  )(request)
1533
1538
 
1534
1539
  const id = response.getId()
1535
- log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${locationPayload.name}) grpc called, messageId: ${id}`)
1540
+ this.log.info('PuppetService', `messageSendMiniProgram(${conversationId}, ${locationPayload.name}) grpc called, messageId: ${id}`)
1536
1541
 
1537
1542
  if (id) {
1538
1543
  return id
@@ -1543,7 +1548,7 @@ class PuppetService extends PUPPET.Puppet {
1543
1548
  conversationId: string,
1544
1549
  channelPayload: PUPPET.payloads.Channel,
1545
1550
  ): Promise<void | string> {
1546
- log.verbose('PuppetService', 'messageSendChannel(%s, "%s")', conversationId, JSON.stringify(channelPayload))
1551
+ this.log.verbose('PuppetService', 'messageSendChannel(%s, "%s")', conversationId, JSON.stringify(channelPayload))
1547
1552
 
1548
1553
  const request = new grpcPuppet.MessageSendChannelRequest()
1549
1554
  request.setConversationId(conversationId)
@@ -1552,14 +1557,14 @@ class PuppetService extends PUPPET.Puppet {
1552
1557
 
1553
1558
  request.setChannel(pbChannelPayload)
1554
1559
 
1555
- log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) about to call grpc`)
1560
+ this.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) about to call grpc`)
1556
1561
  const response = await util.promisify(
1557
1562
  this.grpcManager.client.messageSendChannel
1558
1563
  .bind(this.grpcManager.client),
1559
1564
  )(request)
1560
1565
 
1561
1566
  const messageId = response.getId()
1562
- log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) grpc called, messageId: ${messageId}`)
1567
+ this.log.info('PuppetService', `messageSendChannel(${conversationId}, ${channelPayload.desc}) grpc called, messageId: ${messageId}`)
1563
1568
 
1564
1569
  if (messageId) {
1565
1570
  return messageId
@@ -1570,7 +1575,7 @@ class PuppetService extends PUPPET.Puppet {
1570
1575
  conversationId: string,
1571
1576
  channelCardPayload: PUPPET.payloads.ChannelCard,
1572
1577
  ): Promise<void | string> {
1573
- log.verbose('PuppetService', 'messageSendChannelCard(%s, "%s")', conversationId, JSON.stringify(channelCardPayload))
1578
+ this.log.verbose('PuppetService', 'messageSendChannelCard(%s, "%s")', conversationId, JSON.stringify(channelCardPayload))
1574
1579
 
1575
1580
  const request = new grpcPuppet.MessageSendChannelCardRequest()
1576
1581
  request.setConversationId(conversationId)
@@ -1579,14 +1584,14 @@ class PuppetService extends PUPPET.Puppet {
1579
1584
 
1580
1585
  request.setChannelCard(pbChannelCardPayload)
1581
1586
 
1582
- log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) about to call grpc`)
1587
+ this.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) about to call grpc`)
1583
1588
  const response = await util.promisify(
1584
1589
  this.grpcManager.client.messageSendChannelCard
1585
1590
  .bind(this.grpcManager.client),
1586
1591
  )(request)
1587
1592
 
1588
1593
  const messageId = response.getId()
1589
- log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) grpc called, messageId: ${messageId}`)
1594
+ this.log.info('PuppetService', `messageSendChannelCard(${conversationId}, ${channelCardPayload.nickname}) grpc called, messageId: ${messageId}`)
1590
1595
 
1591
1596
  if (messageId) {
1592
1597
  return messageId
@@ -1596,7 +1601,7 @@ class PuppetService extends PUPPET.Puppet {
1596
1601
  override async messageRecall (
1597
1602
  messageId: string,
1598
1603
  ): Promise<boolean> {
1599
- log.verbose('PuppetService', 'messageRecall(%s)', messageId)
1604
+ this.log.verbose('PuppetService', 'messageRecall(%s)', messageId)
1600
1605
 
1601
1606
  const request = new grpcPuppet.MessageRecallRequest()
1602
1607
  request.setId(messageId)
@@ -1610,7 +1615,7 @@ class PuppetService extends PUPPET.Puppet {
1610
1615
  }
1611
1616
 
1612
1617
  override async messageFile (id: string): Promise<FileBoxInterface> {
1613
- log.verbose('PuppetService', 'messageFile(%s)', id)
1618
+ this.log.verbose('PuppetService', 'messageFile(%s)', id)
1614
1619
 
1615
1620
  const request = new grpcPuppet.MessageFileRequest()
1616
1621
  request.setId(id)
@@ -1628,7 +1633,7 @@ class PuppetService extends PUPPET.Puppet {
1628
1633
  }
1629
1634
 
1630
1635
  override async messageVoice (id: string): Promise<FileBoxInterface> {
1631
- log.verbose('PuppetService', 'messageVoice(%s)', id)
1636
+ this.log.verbose('PuppetService', 'messageVoice(%s)', id)
1632
1637
 
1633
1638
  const request = new grpcPuppet.MessageVoiceRequest()
1634
1639
  request.setId(id)
@@ -1646,7 +1651,7 @@ class PuppetService extends PUPPET.Puppet {
1646
1651
  }
1647
1652
 
1648
1653
  override async messageVoiceText (id: string): Promise<PUPPET.payloads.VoiceText> {
1649
- log.verbose('PuppetService', 'messageVoiceText(%s)', id)
1654
+ this.log.verbose('PuppetService', 'messageVoiceText(%s)', id)
1650
1655
 
1651
1656
  const request = new grpcPuppet.MessageVoiceTextRequest()
1652
1657
  request.setId(id)
@@ -1662,7 +1667,7 @@ class PuppetService extends PUPPET.Puppet {
1662
1667
  }
1663
1668
 
1664
1669
  override async messagePreview (id: string): Promise<FileBoxInterface | undefined> {
1665
- log.verbose('PuppetService', 'messagePreview(%s)', id)
1670
+ this.log.verbose('PuppetService', 'messagePreview(%s)', id)
1666
1671
 
1667
1672
  const request = new grpcPuppet.MessagePreviewRequest()
1668
1673
  request.setId(id)
@@ -1682,7 +1687,7 @@ class PuppetService extends PUPPET.Puppet {
1682
1687
  conversationId: string,
1683
1688
  messageIds: string | string[],
1684
1689
  ): Promise<string | void> {
1685
- log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId, messageIds)
1690
+ this.log.verbose('PuppetService', 'messageForward(%s, %s)', conversationId, messageIds)
1686
1691
 
1687
1692
  const request = new grpcPuppet.MessageForwardRequest()
1688
1693
  request.setConversationId(conversationId)
@@ -1695,14 +1700,14 @@ class PuppetService extends PUPPET.Puppet {
1695
1700
  request.setMessageId(messageIds)
1696
1701
  }
1697
1702
 
1698
- log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) about to call grpc`)
1703
+ this.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) about to call grpc`)
1699
1704
  const response = await util.promisify(
1700
1705
  this.grpcManager.client.messageForward
1701
1706
  .bind(this.grpcManager.client),
1702
1707
  )(request)
1703
1708
 
1704
1709
  const forwardedMessageId = response.getId()
1705
- log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) grpc called, messageId: ${forwardedMessageId}`)
1710
+ this.log.info('PuppetService', `messageForward(${conversationId}, ${messageIds}) grpc called, messageId: ${forwardedMessageId}`)
1706
1711
 
1707
1712
  if (forwardedMessageId) {
1708
1713
  return forwardedMessageId
@@ -1721,11 +1726,11 @@ class PuppetService extends PUPPET.Puppet {
1721
1726
  }
1722
1727
 
1723
1728
  override async messageRawPayload (id: string): Promise<PUPPET.payloads.Message> {
1724
- log.verbose('PuppetService', 'messageRawPayload(%s)', id)
1729
+ this.log.verbose('PuppetService', 'messageRawPayload(%s)', id)
1725
1730
 
1726
1731
  // const cachedPayload = await this.payloadStore.message?.get(id)
1727
1732
  // if (cachedPayload) {
1728
- // log.silly('PuppetService', 'messageRawPayload(%s) cache HIT', id)
1733
+ // this.log.silly('PuppetService', 'messageRawPayload(%s) cache HIT', id)
1729
1734
  // return cachedPayload
1730
1735
  // }
1731
1736
 
@@ -1780,19 +1785,19 @@ class PuppetService extends PUPPET.Puppet {
1780
1785
  break
1781
1786
  }
1782
1787
  default:
1783
- log.warn('PuppetService', `unknown text content type ${type}`)
1788
+ this.log.warn('PuppetService', `unknown text content type ${type}`)
1784
1789
  }
1785
1790
  payload.textContent?.push(contentData)
1786
1791
  }
1787
1792
 
1788
- // log.silly('PuppetService', 'messageRawPayload(%s) cache SET', id)
1793
+ // this.log.silly('PuppetService', 'messageRawPayload(%s) cache SET', id)
1789
1794
  // await this.payloadStore.message?.set(id, payload)
1790
1795
 
1791
1796
  return payload
1792
1797
  }
1793
1798
 
1794
1799
  override async messageRawPayloadParser (payload: PUPPET.payloads.Message): Promise<PUPPET.payloads.Message> {
1795
- // log.silly('PuppetService', 'messagePayload({id:%s})', payload.id)
1800
+ // this.log.silly('PuppetService', 'messagePayload({id:%s})', payload.id)
1796
1801
  // passthrough
1797
1802
  return payload
1798
1803
  }
@@ -1802,7 +1807,7 @@ class PuppetService extends PUPPET.Puppet {
1802
1807
  text : string,
1803
1808
  options? : PUPPET.types.MessageSendTextOptions,
1804
1809
  ): Promise<void | string> {
1805
- log.verbose('PuppetService', 'messageSend(%s, %s)', conversationId, text)
1810
+ this.log.verbose('PuppetService', 'messageSend(%s, %s)', conversationId, text)
1806
1811
  let mentionIdList
1807
1812
  let quoteId
1808
1813
  if (Array.isArray(options)) {
@@ -1821,14 +1826,14 @@ class PuppetService extends PUPPET.Puppet {
1821
1826
  request.setQuoteId(quoteId)
1822
1827
  }
1823
1828
 
1824
- log.info('PuppetService', `messageSend(${conversationId}, ${text}) about to call grpc`)
1829
+ this.log.info('PuppetService', `messageSend(${conversationId}, ${text}) about to call grpc`)
1825
1830
  const response = await util.promisify(
1826
1831
  this.grpcManager.client.messageSendText
1827
1832
  .bind(this.grpcManager.client),
1828
1833
  )(request)
1829
1834
 
1830
1835
  const messageId = response.getId()
1831
- log.info('PuppetService', `messageSend(${conversationId}, ${text}) grpc called, messageId: ${messageId}`)
1836
+ this.log.info('PuppetService', `messageSend(${conversationId}, ${text}) grpc called, messageId: ${messageId}`)
1832
1837
 
1833
1838
  if (messageId) {
1834
1839
  return messageId
@@ -1851,7 +1856,7 @@ class PuppetService extends PUPPET.Puppet {
1851
1856
  text : string,
1852
1857
  batchTaskId? : string,
1853
1858
  ): Promise<MessageBatchSendResponse> {
1854
- log.verbose('PuppetService', 'messageBatchSendText(%s)', conversationIds.join(','))
1859
+ this.log.verbose('PuppetService', 'messageBatchSendText(%s)', conversationIds.join(','))
1855
1860
 
1856
1861
  const request = new grpcPuppet.MessageBatchSendTextRequest()
1857
1862
  request.setConversationIdsList(conversationIds)
@@ -1873,7 +1878,7 @@ class PuppetService extends PUPPET.Puppet {
1873
1878
  fileBox : FileBoxInterface,
1874
1879
  batchTaskId? : string,
1875
1880
  ): Promise<MessageBatchSendResponse> {
1876
- log.verbose('PuppetService', 'messageBatchSendFile(%s)', conversationIds.join(','))
1881
+ this.log.verbose('PuppetService', 'messageBatchSendFile(%s)', conversationIds.join(','))
1877
1882
 
1878
1883
  const request = new grpcPuppet.MessageBatchSendFileRequest()
1879
1884
  request.setConversationIdsList(conversationIds)
@@ -1895,7 +1900,7 @@ class PuppetService extends PUPPET.Puppet {
1895
1900
  messageIds : string | string[],
1896
1901
  batchTaskId? : string,
1897
1902
  ): Promise<MessageBatchSendResponse> {
1898
- log.verbose('PuppetService', 'messageBatchForward(%s, %s)', conversationIds.join(','), messageIds)
1903
+ this.log.verbose('PuppetService', 'messageBatchForward(%s, %s)', conversationIds.join(','), messageIds)
1899
1904
 
1900
1905
  const request = new grpcPuppet.MessageBatchForwardRequest()
1901
1906
  request.setConversationIdsList(conversationIds)
@@ -1924,7 +1929,7 @@ class PuppetService extends PUPPET.Puppet {
1924
1929
  contactId : string,
1925
1930
  batchTaskId? : string,
1926
1931
  ): Promise<MessageBatchSendResponse> {
1927
- log.verbose('PuppetService', 'messageBatchSendContact(%s, %s)', conversationIds.join(','), contactId)
1932
+ this.log.verbose('PuppetService', 'messageBatchSendContact(%s, %s)', conversationIds.join(','), contactId)
1928
1933
 
1929
1934
  const request = new grpcPuppet.MessageBatchSendContactRequest()
1930
1935
  request.setConversationIdsList(conversationIds)
@@ -1946,7 +1951,7 @@ class PuppetService extends PUPPET.Puppet {
1946
1951
  urlLinkPayload : PUPPET.payloads.UrlLink,
1947
1952
  batchTaskId? : string,
1948
1953
  ): Promise<MessageBatchSendResponse> {
1949
- log.verbose('PuppetService', 'messageBatchSendUrl(%s)', conversationIds.join(','))
1954
+ this.log.verbose('PuppetService', 'messageBatchSendUrl(%s)', conversationIds.join(','))
1950
1955
 
1951
1956
  const request = new grpcPuppet.MessageBatchSendUrlRequest()
1952
1957
  request.setConversationIdsList(conversationIds)
@@ -1968,7 +1973,7 @@ class PuppetService extends PUPPET.Puppet {
1968
1973
  miniProgramPayload : PUPPET.payloads.MiniProgram,
1969
1974
  batchTaskId? : string,
1970
1975
  ): Promise<MessageBatchSendResponse> {
1971
- log.verbose('PuppetService', 'messageBatchSendMiniProgram(%s)', conversationIds.join(','))
1976
+ this.log.verbose('PuppetService', 'messageBatchSendMiniProgram(%s)', conversationIds.join(','))
1972
1977
 
1973
1978
  const request = new grpcPuppet.MessageBatchSendMiniProgramRequest()
1974
1979
  request.setConversationIdsList(conversationIds)
@@ -1990,7 +1995,7 @@ class PuppetService extends PUPPET.Puppet {
1990
1995
  locationPayload : PUPPET.payloads.Location,
1991
1996
  batchTaskId? : string,
1992
1997
  ): Promise<MessageBatchSendResponse> {
1993
- log.verbose('PuppetService', 'messageBatchSendLocation(%s)', conversationIds.join(','))
1998
+ this.log.verbose('PuppetService', 'messageBatchSendLocation(%s)', conversationIds.join(','))
1994
1999
 
1995
2000
  const request = new grpcPuppet.MessageBatchSendLocationRequest()
1996
2001
  request.setConversationIdsList(conversationIds)
@@ -2012,7 +2017,7 @@ class PuppetService extends PUPPET.Puppet {
2012
2017
  channelPayload : PUPPET.payloads.Channel,
2013
2018
  batchTaskId? : string,
2014
2019
  ): Promise<MessageBatchSendResponse> {
2015
- log.verbose('PuppetService', 'messageBatchSendChannel(%s)', conversationIds.join(','))
2020
+ this.log.verbose('PuppetService', 'messageBatchSendChannel(%s)', conversationIds.join(','))
2016
2021
 
2017
2022
  const request = new grpcPuppet.MessageBatchSendChannelRequest()
2018
2023
  request.setConversationIdsList(conversationIds)
@@ -2034,7 +2039,7 @@ class PuppetService extends PUPPET.Puppet {
2034
2039
  channelCardPayload : PUPPET.payloads.ChannelCard,
2035
2040
  batchTaskId? : string,
2036
2041
  ): Promise<MessageBatchSendResponse> {
2037
- log.verbose('PuppetService', 'messageBatchSendChannelCard(%s)', conversationIds.join(','))
2042
+ this.log.verbose('PuppetService', 'messageBatchSendChannelCard(%s)', conversationIds.join(','))
2038
2043
 
2039
2044
  const request = new grpcPuppet.MessageBatchSendChannelCardRequest()
2040
2045
  request.setConversationIdsList(conversationIds)
@@ -2055,7 +2060,7 @@ class PuppetService extends PUPPET.Puppet {
2055
2060
  conversationId : string,
2056
2061
  fileBox : FileBoxInterface,
2057
2062
  ): Promise<void | string> {
2058
- log.verbose('PuppetService', 'messageSendFile(%s, %s)', conversationId, fileBox)
2063
+ this.log.verbose('PuppetService', 'messageSendFile(%s, %s)', conversationId, fileBox)
2059
2064
 
2060
2065
  const request = new grpcPuppet.MessageSendFileRequest()
2061
2066
  request.setConversationId(conversationId)
@@ -2063,14 +2068,14 @@ class PuppetService extends PUPPET.Puppet {
2063
2068
  const serializedFileBox = await this.serializeFileBox(fileBox)
2064
2069
  request.setFileBox(serializedFileBox)
2065
2070
 
2066
- log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`)
2071
+ this.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) about to call grpc`)
2067
2072
  const response = await util.promisify(
2068
2073
  this.grpcManager.client.messageSendFile
2069
2074
  .bind(this.grpcManager.client),
2070
2075
  )(request)
2071
2076
 
2072
2077
  const messageId = response.getId()
2073
- log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`)
2078
+ this.log.info('PuppetService', `messageSendFile(${conversationId}, ${fileBox}) grpc called, messageId: ${messageId}`)
2074
2079
 
2075
2080
  if (messageId) {
2076
2081
  return messageId
@@ -2089,20 +2094,20 @@ class PuppetService extends PUPPET.Puppet {
2089
2094
  conversationId : string,
2090
2095
  contactId : string,
2091
2096
  ): Promise<void | string> {
2092
- log.verbose('PuppetService', 'messageSend("%s", %s)', conversationId, contactId)
2097
+ this.log.verbose('PuppetService', 'messageSend("%s", %s)', conversationId, contactId)
2093
2098
 
2094
2099
  const request = new grpcPuppet.MessageSendContactRequest()
2095
2100
  request.setConversationId(conversationId)
2096
2101
  request.setContactId(contactId)
2097
2102
 
2098
- log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) about to call grpc`)
2103
+ this.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) about to call grpc`)
2099
2104
  const response = await util.promisify(
2100
2105
  this.grpcManager.client.messageSendContact
2101
2106
  .bind(this.grpcManager.client),
2102
2107
  )(request)
2103
2108
 
2104
2109
  const messageId = response.getId()
2105
- log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) grpc called, messageId: ${messageId}`)
2110
+ this.log.info('PuppetService', `messageSendContact(${conversationId}, ${contactId}) grpc called, messageId: ${messageId}`)
2106
2111
 
2107
2112
  if (messageId) {
2108
2113
  return messageId
@@ -2124,7 +2129,7 @@ class PuppetService extends PUPPET.Puppet {
2124
2129
  conversationId: string,
2125
2130
  urlLinkPayload: PUPPET.payloads.UrlLink,
2126
2131
  ): Promise<void | string> {
2127
- log.verbose('PuppetService', 'messageSendUrl("%s", %s)', conversationId, JSON.stringify(urlLinkPayload))
2132
+ this.log.verbose('PuppetService', 'messageSendUrl("%s", %s)', conversationId, JSON.stringify(urlLinkPayload))
2128
2133
 
2129
2134
  const request = new grpcPuppet.MessageSendUrlRequest()
2130
2135
  request.setConversationId(conversationId)
@@ -2139,14 +2144,14 @@ class PuppetService extends PUPPET.Puppet {
2139
2144
  // Deprecated: will be removed after Dec 31, 2022
2140
2145
  request.setUrlLinkDeprecated(JSON.stringify(urlLinkPayload))
2141
2146
 
2142
- log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) about to call grpc`)
2147
+ this.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) about to call grpc`)
2143
2148
  const response = await util.promisify(
2144
2149
  this.grpcManager.client.messageSendUrl
2145
2150
  .bind(this.grpcManager.client),
2146
2151
  )(request)
2147
2152
 
2148
2153
  const messageId = response.getId()
2149
- log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) grpc called, messageId: ${messageId}`)
2154
+ this.log.info('PuppetService', `messageSendUrl(${conversationId}, ${urlLinkPayload}) grpc called, messageId: ${messageId}`)
2150
2155
 
2151
2156
  if (messageId) {
2152
2157
  return messageId
@@ -2168,21 +2173,21 @@ class PuppetService extends PUPPET.Puppet {
2168
2173
  conversationId: string,
2169
2174
  postPayload: PUPPET.payloads.PostClient,
2170
2175
  ): Promise<void | string> {
2171
- log.verbose('PuppetService', 'messageSendPost("%s", %s)', conversationId, JSON.stringify(postPayload))
2176
+ this.log.verbose('PuppetService', 'messageSendPost("%s", %s)', conversationId, JSON.stringify(postPayload))
2172
2177
 
2173
2178
  const request = new grpcPuppet.MessageSendPostRequest()
2174
2179
  const post = await postPayloadToPb(grpcPuppet, postPayload, this.serializeFileBox.bind(this))
2175
2180
  request.setContent(post)
2176
2181
  request.setConversationId(conversationId)
2177
2182
 
2178
- log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) about to call grpc`)
2183
+ this.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) about to call grpc`)
2179
2184
  const response = await util.promisify(
2180
2185
  this.grpcManager.client.messageSendPost
2181
2186
  .bind(this.grpcManager.client),
2182
2187
  )(request)
2183
2188
 
2184
2189
  const messageId = response.getId()
2185
- log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) grpc called, messageId: ${messageId}`)
2190
+ this.log.info('PuppetService', `messageSendPost(${conversationId}, ${postPayload}) grpc called, messageId: ${messageId}`)
2186
2191
 
2187
2192
  if (messageId) {
2188
2193
  return messageId
@@ -2190,7 +2195,7 @@ class PuppetService extends PUPPET.Puppet {
2190
2195
  }
2191
2196
 
2192
2197
  override async messageUrl (messageId: string): Promise<PUPPET.payloads.UrlLink> {
2193
- log.verbose('PuppetService', 'messageUrl(%s)', messageId)
2198
+ this.log.verbose('PuppetService', 'messageUrl(%s)', messageId)
2194
2199
 
2195
2200
  const request = new grpcPuppet.MessageUrlRequest()
2196
2201
  request.setId(messageId)
@@ -2216,7 +2221,7 @@ class PuppetService extends PUPPET.Puppet {
2216
2221
  }
2217
2222
 
2218
2223
  override async getMessageBroadcastTarget (): Promise<MessageBroadcastTargets> {
2219
- log.verbose('PuppetService', 'getMessageBroadcastTarget()')
2224
+ this.log.verbose('PuppetService', 'getMessageBroadcastTarget()')
2220
2225
 
2221
2226
  const request = new grpcPuppet.GetMessageBroadcastTargetRequest()
2222
2227
 
@@ -2231,7 +2236,7 @@ class PuppetService extends PUPPET.Puppet {
2231
2236
  }
2232
2237
 
2233
2238
  override async createMessageBroadcast (targets: string[], content: PUPPET.payloads.Post): Promise<string | void> {
2234
- log.verbose('PuppetService', 'createMessageBroadcast()')
2239
+ this.log.verbose('PuppetService', 'createMessageBroadcast()')
2235
2240
 
2236
2241
  if (!PUPPET.payloads.isPostClient(content)) {
2237
2242
  throw new Error('can only create broadcast with client post')
@@ -2250,7 +2255,7 @@ class PuppetService extends PUPPET.Puppet {
2250
2255
  }
2251
2256
 
2252
2257
  override async getMessageBroadcastStatus (id: string): Promise<{ status: PUPPET.types.BroadcastStatus; detail: { contactId?: string | undefined; roomId?: string | undefined; status: PUPPET.types.BroadcastTargetStatus }[] }> {
2253
- log.verbose('PuppetService', 'getMessageBroadcastStatus()')
2258
+ this.log.verbose('PuppetService', 'getMessageBroadcastStatus()')
2254
2259
 
2255
2260
  const request = new grpcPuppet.GetMessageBroadcastStatusRequest()
2256
2261
  request.setId(id)
@@ -2290,11 +2295,11 @@ class PuppetService extends PUPPET.Puppet {
2290
2295
  override async roomRawPayload (
2291
2296
  id: string,
2292
2297
  ): Promise<PUPPET.payloads.Room> {
2293
- log.verbose('PuppetService', 'roomRawPayload(%s)', id)
2298
+ this.log.verbose('PuppetService', 'roomRawPayload(%s)', id)
2294
2299
 
2295
2300
  const cachedPayload = await this._payloadStore.room?.get(id)
2296
2301
  if (cachedPayload) {
2297
- log.silly('PuppetService', 'roomRawPayload(%s) cache HIT', id)
2302
+ this.log.silly('PuppetService', 'roomRawPayload(%s) cache HIT', id)
2298
2303
  return cachedPayload
2299
2304
  }
2300
2305
 
@@ -2325,19 +2330,19 @@ class PuppetService extends PUPPET.Puppet {
2325
2330
  }
2326
2331
 
2327
2332
  await this._payloadStore.room?.set(id, payload)
2328
- log.silly('PuppetService', 'roomRawPayload(%s) cache SET', id)
2333
+ this.log.silly('PuppetService', 'roomRawPayload(%s) cache SET', id)
2329
2334
 
2330
2335
  return payload
2331
2336
  }
2332
2337
 
2333
2338
  override async roomRawPayloadParser (payload: PUPPET.payloads.Room): Promise<PUPPET.payloads.Room> {
2334
- // log.silly('PuppetService', 'roomRawPayloadParser({id:%s})', payload.id)
2339
+ // this.log.silly('PuppetService', 'roomRawPayloadParser({id:%s})', payload.id)
2335
2340
  // passthrough
2336
2341
  return payload
2337
2342
  }
2338
2343
 
2339
2344
  override async batchRoomRawPayload (roomIdList: string[]): Promise<Map<string, PUPPET.payloads.Room>> {
2340
- log.verbose('PuppetService', 'batchRoomRawPayload(%s)', roomIdList)
2345
+ this.log.verbose('PuppetService', 'batchRoomRawPayload(%s)', roomIdList)
2341
2346
 
2342
2347
  const result = new Map<string, PUPPET.payloads.Room>()
2343
2348
  const roomIdSet = new Set<string>(roomIdList)
@@ -2384,7 +2389,7 @@ class PuppetService extends PUPPET.Puppet {
2384
2389
  await this._payloadStore.room?.set(roomId, puppetPayload)
2385
2390
  }
2386
2391
  } catch (e) {
2387
- log.error('PuppetService', 'batchRoomRawPayload(%s, %s) error: %s, use one by one method', roomIdList, needGetSet, e)
2392
+ this.log.error('PuppetService', 'batchRoomRawPayload(%s, %s) error: %s, use one by one method', roomIdList, needGetSet, e)
2388
2393
  for (const roomId of needGetSet) {
2389
2394
  const payload = await this.roomRawPayload(roomId)
2390
2395
  result.set(roomId, payload)
@@ -2395,7 +2400,7 @@ class PuppetService extends PUPPET.Puppet {
2395
2400
  }
2396
2401
 
2397
2402
  override async roomList (): Promise<string[]> {
2398
- log.verbose('PuppetService', 'roomList()')
2403
+ this.log.verbose('PuppetService', 'roomList()')
2399
2404
 
2400
2405
  const response = await util.promisify(
2401
2406
  this.grpcManager.client.roomList
@@ -2409,7 +2414,7 @@ class PuppetService extends PUPPET.Puppet {
2409
2414
  roomId : string,
2410
2415
  contactIds : string | string[],
2411
2416
  ): Promise<void> {
2412
- log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds)
2417
+ this.log.verbose('PuppetService', 'roomDel(%s, %s)', roomId, contactIds)
2413
2418
 
2414
2419
  const request = new grpcPuppet.RoomDelRequest()
2415
2420
  request.setId(roomId)
@@ -2429,7 +2434,7 @@ class PuppetService extends PUPPET.Puppet {
2429
2434
  }
2430
2435
 
2431
2436
  override async roomDelV2 (roomId: string, contactIds: string[]): Promise<{ successList: string[]; failList: string[]; failReasonList: string[] }> {
2432
- log.verbose('PuppetService', 'roomDelV2(%s, %s)', roomId, contactIds)
2437
+ this.log.verbose('PuppetService', 'roomDelV2(%s, %s)', roomId, contactIds)
2433
2438
 
2434
2439
  const request = new grpcPuppet.RoomDelV2Request()
2435
2440
  request.setId(roomId)
@@ -2448,7 +2453,7 @@ class PuppetService extends PUPPET.Puppet {
2448
2453
  }
2449
2454
 
2450
2455
  override async roomAvatar (roomId: string): Promise<FileBoxInterface> {
2451
- log.verbose('PuppetService', 'roomAvatar(%s)', roomId)
2456
+ this.log.verbose('PuppetService', 'roomAvatar(%s)', roomId)
2452
2457
 
2453
2458
  const request = new grpcPuppet.RoomAvatarRequest()
2454
2459
  request.setId(roomId)
@@ -2468,7 +2473,7 @@ class PuppetService extends PUPPET.Puppet {
2468
2473
  inviteOnly : boolean,
2469
2474
  quoteIds : string[],
2470
2475
  ): Promise<void> {
2471
- log.verbose('PuppetService', 'roomAdd(%s, %s)', roomId, contactId)
2476
+ this.log.verbose('PuppetService', 'roomAdd(%s, %s)', roomId, contactId)
2472
2477
 
2473
2478
  const request = new grpcPuppet.RoomAddRequest()
2474
2479
  request.setId(roomId)
@@ -2491,7 +2496,7 @@ class PuppetService extends PUPPET.Puppet {
2491
2496
  inviteOnly: boolean,
2492
2497
  quoteIds: string[],
2493
2498
  ): Promise<{ successList: string[]; failList: string[]; failReasonList: string[]; }> {
2494
- log.verbose('PuppetService', 'roomAddV2(%s, %s)', roomId, contactIds)
2499
+ this.log.verbose('PuppetService', 'roomAddV2(%s, %s)', roomId, contactIds)
2495
2500
 
2496
2501
  const request = new grpcPuppet.RoomAddV2Request()
2497
2502
  request.setId(roomId)
@@ -2518,7 +2523,7 @@ class PuppetService extends PUPPET.Puppet {
2518
2523
  roomId: string,
2519
2524
  topic?: string,
2520
2525
  ): Promise<void | string> {
2521
- log.verbose('PuppetService', 'roomTopic(%s, %s)', roomId, topic)
2526
+ this.log.verbose('PuppetService', 'roomTopic(%s, %s)', roomId, topic)
2522
2527
 
2523
2528
  /**
2524
2529
  * Get
@@ -2570,7 +2575,7 @@ class PuppetService extends PUPPET.Puppet {
2570
2575
  }
2571
2576
 
2572
2577
  override async roomRemark (roomId: string, remark: string): Promise<void> {
2573
- log.verbose('PuppetService', 'roomRemark(%s)', roomId)
2578
+ this.log.verbose('PuppetService', 'roomRemark(%s)', roomId)
2574
2579
 
2575
2580
  const request = new grpcPuppet.RoomRemarkRequest()
2576
2581
  request.setId(roomId)
@@ -2586,7 +2591,7 @@ class PuppetService extends PUPPET.Puppet {
2586
2591
  contactIdList : string[],
2587
2592
  topic : string,
2588
2593
  ): Promise<string> {
2589
- log.verbose('PuppetService', 'roomCreate(%s, %s)', contactIdList, topic)
2594
+ this.log.verbose('PuppetService', 'roomCreate(%s, %s)', contactIdList, topic)
2590
2595
 
2591
2596
  const request = new grpcPuppet.RoomCreateRequest()
2592
2597
  request.setContactIdsList(contactIdList)
@@ -2601,7 +2606,7 @@ class PuppetService extends PUPPET.Puppet {
2601
2606
  }
2602
2607
 
2603
2608
  override async roomQuit (roomId: string): Promise<void> {
2604
- log.verbose('PuppetService', 'roomQuit(%s)', roomId)
2609
+ this.log.verbose('PuppetService', 'roomQuit(%s)', roomId)
2605
2610
 
2606
2611
  const request = new grpcPuppet.RoomQuitRequest()
2607
2612
  request.setId(roomId)
@@ -2613,7 +2618,7 @@ class PuppetService extends PUPPET.Puppet {
2613
2618
  }
2614
2619
 
2615
2620
  override async roomQRCode (roomId: string): Promise<string> {
2616
- log.verbose('PuppetService', 'roomQRCode(%s)', roomId)
2621
+ this.log.verbose('PuppetService', 'roomQRCode(%s)', roomId)
2617
2622
 
2618
2623
  const request = new grpcPuppet.RoomQRCodeRequest()
2619
2624
  request.setId(roomId)
@@ -2627,7 +2632,7 @@ class PuppetService extends PUPPET.Puppet {
2627
2632
  }
2628
2633
 
2629
2634
  override async roomParseDynamicQRCode (url: string): Promise<PUPPET.types.RoomParseDynamicQRCode> {
2630
- log.verbose('PuppetService', 'roomParseDynamicQRCode(%s)', url)
2635
+ this.log.verbose('PuppetService', 'roomParseDynamicQRCode(%s)', url)
2631
2636
 
2632
2637
  const request = new grpcPuppet.RoomParseDynamicQRCodeRequest()
2633
2638
  request.setUrl(url)
@@ -2645,7 +2650,7 @@ class PuppetService extends PUPPET.Puppet {
2645
2650
  }
2646
2651
 
2647
2652
  override async roomMemberList (roomId: string) : Promise<string[]> {
2648
- log.verbose('PuppetService', 'roomMemberList(%s)', roomId)
2653
+ this.log.verbose('PuppetService', 'roomMemberList(%s)', roomId)
2649
2654
 
2650
2655
  const request = new grpcPuppet.RoomMemberListRequest()
2651
2656
  request.setId(roomId)
@@ -2659,13 +2664,13 @@ class PuppetService extends PUPPET.Puppet {
2659
2664
  }
2660
2665
 
2661
2666
  override async roomMemberRawPayload (roomId: string, contactId: string): Promise<PUPPET.payloads.RoomMember> {
2662
- log.verbose('PuppetService', 'roomMemberRawPayload(%s, %s)', roomId, contactId)
2667
+ this.log.verbose('PuppetService', 'roomMemberRawPayload(%s, %s)', roomId, contactId)
2663
2668
 
2664
2669
  const cachedPayload = await this._payloadStore.roomMember?.get(roomId)
2665
2670
  const cachedRoomMemberPayload = cachedPayload && cachedPayload[contactId]
2666
2671
 
2667
2672
  if (cachedRoomMemberPayload) {
2668
- log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache HIT', roomId, contactId)
2673
+ this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache HIT', roomId, contactId)
2669
2674
  return cachedRoomMemberPayload
2670
2675
  }
2671
2676
 
@@ -2693,19 +2698,19 @@ class PuppetService extends PUPPET.Puppet {
2693
2698
  ...cachedPayload,
2694
2699
  [contactId]: payload,
2695
2700
  })
2696
- log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET', roomId, contactId)
2701
+ this.log.silly('PuppetService', 'roomMemberRawPayload(%s, %s) cache SET', roomId, contactId)
2697
2702
 
2698
2703
  return payload
2699
2704
  }
2700
2705
 
2701
2706
  override async roomMemberRawPayloadParser (payload: PUPPET.payloads.RoomMember): Promise<PUPPET.payloads.RoomMember> {
2702
- // log.silly('PuppetService', 'roomMemberRawPayloadParser({id:%s})', payload.id)
2707
+ // this.log.silly('PuppetService', 'roomMemberRawPayloadParser({id:%s})', payload.id)
2703
2708
  // passthrough
2704
2709
  return payload
2705
2710
  }
2706
2711
 
2707
2712
  override async batchRoomMemberRawPayload (roomId: string, contactIdList: string[]): Promise<Map<string, PUPPET.payloads.RoomMember>> {
2708
- log.verbose('PuppetService', 'batchRoomMemberRawPayload(%s, %s)', roomId, contactIdList)
2713
+ this.log.verbose('PuppetService', 'batchRoomMemberRawPayload(%s, %s)', roomId, contactIdList)
2709
2714
 
2710
2715
  const result = new Map<string, PUPPET.payloads.RoomMember>()
2711
2716
  const contactIdSet = new Set<string>(contactIdList)
@@ -2744,7 +2749,7 @@ class PuppetService extends PUPPET.Puppet {
2744
2749
  }
2745
2750
  await this._payloadStore.roomMember?.set(roomId, cachedPayload)
2746
2751
  } catch (e) {
2747
- log.error('PuppetService', 'batchRoomMemberRawPayload(%s, %s) error: %s, use one by one method', roomId, needGetSet, e)
2752
+ this.log.error('PuppetService', 'batchRoomMemberRawPayload(%s, %s) error: %s, use one by one method', roomId, needGetSet, e)
2748
2753
  for (const contactId of needGetSet) {
2749
2754
  const payload = await this.roomMemberRawPayload(roomId, contactId)
2750
2755
  result.set(contactId, payload)
@@ -2758,7 +2763,7 @@ class PuppetService extends PUPPET.Puppet {
2758
2763
  override async roomAnnounce (roomId: string, text: string) : Promise<void>
2759
2764
 
2760
2765
  override async roomAnnounce (roomId: string, text?: string) : Promise<void | string> {
2761
- log.verbose('PuppetService', 'roomAnnounce(%s%s)',
2766
+ this.log.verbose('PuppetService', 'roomAnnounce(%s%s)',
2762
2767
  roomId,
2763
2768
  typeof text === 'undefined'
2764
2769
  ? ''
@@ -2818,7 +2823,7 @@ class PuppetService extends PUPPET.Puppet {
2818
2823
  override async roomInvitationAccept (
2819
2824
  roomInvitationId: string,
2820
2825
  ): Promise<void> {
2821
- log.verbose('PuppetService', 'roomInvitationAccept(%s)', roomInvitationId)
2826
+ this.log.verbose('PuppetService', 'roomInvitationAccept(%s)', roomInvitationId)
2822
2827
 
2823
2828
  const request = new grpcPuppet.RoomInvitationAcceptRequest()
2824
2829
  request.setId(roomInvitationId)
@@ -2832,7 +2837,7 @@ class PuppetService extends PUPPET.Puppet {
2832
2837
  override async roomInvitationAcceptByQRCode (
2833
2838
  qrcode: string,
2834
2839
  ): Promise<PUPPET.types.RoomInvitationAcceptByQRCode> {
2835
- log.verbose('PuppetService', 'roomInvitationAcceptByQRCode(%s)', qrcode)
2840
+ this.log.verbose('PuppetService', 'roomInvitationAcceptByQRCode(%s)', qrcode)
2836
2841
 
2837
2842
  const request = new grpcPuppet.RoomInvitationAcceptByQRCodeRequest()
2838
2843
  request.setQrcode(qrcode)
@@ -2851,7 +2856,7 @@ class PuppetService extends PUPPET.Puppet {
2851
2856
  override async roomInvitationRawPayload (
2852
2857
  id: string,
2853
2858
  ): Promise<PUPPET.payloads.RoomInvitation> {
2854
- log.verbose('PuppetService', 'roomInvitationRawPayload(%s)', id)
2859
+ this.log.verbose('PuppetService', 'roomInvitationRawPayload(%s)', id)
2855
2860
 
2856
2861
  const request = new grpcPuppet.RoomInvitationPayloadRequest()
2857
2862
  request.setId(id)
@@ -2896,13 +2901,13 @@ class PuppetService extends PUPPET.Puppet {
2896
2901
  }
2897
2902
 
2898
2903
  override async roomInvitationRawPayloadParser (payload: PUPPET.payloads.RoomInvitation): Promise<PUPPET.payloads.RoomInvitation> {
2899
- // log.silly('PuppetService', 'roomInvitationRawPayloadParser({id:%s})', payload.id)
2904
+ // this.log.silly('PuppetService', 'roomInvitationRawPayloadParser({id:%s})', payload.id)
2900
2905
  // passthrough
2901
2906
  return payload
2902
2907
  }
2903
2908
 
2904
2909
  override async roomPermission (roomId: string, permission?: Partial<PUPPET.types.RoomPermission>): Promise<void | Partial<PUPPET.types.RoomPermission>> {
2905
- log.verbose('PuppetService', 'roomPermission(%s, %s)', roomId, JSON.stringify(permission))
2910
+ this.log.verbose('PuppetService', 'roomPermission(%s, %s)', roomId, JSON.stringify(permission))
2906
2911
 
2907
2912
  const request = new grpcPuppet.RoomPermissionRequest()
2908
2913
  request.setId(roomId)
@@ -2937,7 +2942,7 @@ class PuppetService extends PUPPET.Puppet {
2937
2942
  }
2938
2943
 
2939
2944
  override async roomOwnerTransfer (roomId: string, contactId: string): Promise<void> {
2940
- log.verbose('PuppetService', 'roomOwnerTransfer(%s, %s)', roomId, contactId)
2945
+ this.log.verbose('PuppetService', 'roomOwnerTransfer(%s, %s)', roomId, contactId)
2941
2946
 
2942
2947
  const request = new grpcPuppet.RoomOwnerTransferRequest()
2943
2948
  request.setId(roomId)
@@ -2953,7 +2958,7 @@ class PuppetService extends PUPPET.Puppet {
2953
2958
  roomId : string,
2954
2959
  contactIdList : string[],
2955
2960
  ): Promise<void> {
2956
- log.verbose('PuppetService', 'roomAddAdmins(%s, %s)', roomId, contactIdList)
2961
+ this.log.verbose('PuppetService', 'roomAddAdmins(%s, %s)', roomId, contactIdList)
2957
2962
 
2958
2963
  const request = new grpcPuppet.RoomAdminsRequest()
2959
2964
  request.setId(roomId)
@@ -2969,7 +2974,7 @@ class PuppetService extends PUPPET.Puppet {
2969
2974
  roomId : string,
2970
2975
  contactIdList : string[],
2971
2976
  ): Promise<void> {
2972
- log.verbose('PuppetService', 'roomDelAdmins(%s, %s)', roomId, contactIdList)
2977
+ this.log.verbose('PuppetService', 'roomDelAdmins(%s, %s)', roomId, contactIdList)
2973
2978
 
2974
2979
  const request = new grpcPuppet.RoomAdminsRequest()
2975
2980
  request.setId(roomId)
@@ -2982,7 +2987,7 @@ class PuppetService extends PUPPET.Puppet {
2982
2987
  }
2983
2988
 
2984
2989
  override async roomDismiss (roomId: string): Promise<void> {
2985
- log.verbose('PuppetService', 'roomDelAdmins(%s)', roomId)
2990
+ this.log.verbose('PuppetService', 'roomDelAdmins(%s)', roomId)
2986
2991
 
2987
2992
  const request = new grpcPuppet.RoomDismissRequest()
2988
2993
  request.setId(roomId)
@@ -3002,7 +3007,7 @@ class PuppetService extends PUPPET.Puppet {
3002
3007
  phone: string,
3003
3008
  type?: Contact,
3004
3009
  ): Promise<string | null> {
3005
- log.verbose('PuppetService', 'friendshipSearchPhone(%s)', phone)
3010
+ this.log.verbose('PuppetService', 'friendshipSearchPhone(%s)', phone)
3006
3011
 
3007
3012
  const request = new grpcPuppet.FriendshipSearchPhoneRequest()
3008
3013
  request.setPhone(phone)
@@ -3038,7 +3043,7 @@ class PuppetService extends PUPPET.Puppet {
3038
3043
  handle: string,
3039
3044
  type?: Contact,
3040
3045
  ): Promise<string | null> {
3041
- log.verbose('PuppetService', 'friendshipSearchHandle(%s)', handle)
3046
+ this.log.verbose('PuppetService', 'friendshipSearchHandle(%s)', handle)
3042
3047
 
3043
3048
  const request = new grpcPuppet.FriendshipSearchHandleRequest()
3044
3049
  /**
@@ -3074,7 +3079,7 @@ class PuppetService extends PUPPET.Puppet {
3074
3079
  }
3075
3080
 
3076
3081
  override async friendshipRawPayload (id: string): Promise<PUPPET.payloads.Friendship> {
3077
- log.verbose('PuppetService', 'friendshipRawPayload(%s)', id)
3082
+ this.log.verbose('PuppetService', 'friendshipRawPayload(%s)', id)
3078
3083
 
3079
3084
  const request = new grpcPuppet.FriendshipPayloadRequest()
3080
3085
  request.setId(id)
@@ -3098,7 +3103,7 @@ class PuppetService extends PUPPET.Puppet {
3098
3103
  }
3099
3104
 
3100
3105
  override async friendshipRawPayloadParser (payload: PUPPET.payloads.Friendship) : Promise<PUPPET.payloads.Friendship> {
3101
- // log.silly('PuppetService', 'friendshipRawPayloadParser({id:%s})', payload.id)
3106
+ // this.log.silly('PuppetService', 'friendshipRawPayloadParser({id:%s})', payload.id)
3102
3107
  // passthrough
3103
3108
  return payload
3104
3109
  }
@@ -3107,7 +3112,7 @@ class PuppetService extends PUPPET.Puppet {
3107
3112
  contactId : string,
3108
3113
  options : PUPPET.types.FriendshipAddOptions,
3109
3114
  ): Promise<void> {
3110
- log.verbose('PuppetService', 'friendshipAdd(%s, %s)', contactId, JSON.stringify(options))
3115
+ this.log.verbose('PuppetService', 'friendshipAdd(%s, %s)', contactId, JSON.stringify(options))
3111
3116
 
3112
3117
  const request = new grpcPuppet.FriendshipAddRequest()
3113
3118
  request.setContactId(contactId)
@@ -3143,7 +3148,7 @@ class PuppetService extends PUPPET.Puppet {
3143
3148
  override async friendshipAccept (
3144
3149
  friendshipId : string,
3145
3150
  ): Promise<void> {
3146
- log.verbose('PuppetService', 'friendshipAccept(%s)', friendshipId)
3151
+ this.log.verbose('PuppetService', 'friendshipAccept(%s)', friendshipId)
3147
3152
 
3148
3153
  const request = new grpcPuppet.FriendshipAcceptRequest()
3149
3154
  request.setId(friendshipId)
@@ -3164,7 +3169,7 @@ class PuppetService extends PUPPET.Puppet {
3164
3169
  tagIds: string[],
3165
3170
  contactIds: string[],
3166
3171
  ): Promise<void> {
3167
- log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', tagIds, contactIds)
3172
+ this.log.verbose('PuppetService', 'tagContactTagAdd(%s, %s)', tagIds, contactIds)
3168
3173
 
3169
3174
  const request = new grpcPuppet.TagContactTagAddRequest()
3170
3175
 
@@ -3181,7 +3186,7 @@ class PuppetService extends PUPPET.Puppet {
3181
3186
  tagIds: string[],
3182
3187
  contactIds: string[],
3183
3188
  ): Promise<void> {
3184
- log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', tagIds, contactIds)
3189
+ this.log.verbose('PuppetService', 'tagContactTagRemove(%s, %s)', tagIds, contactIds)
3185
3190
 
3186
3191
  const request = new grpcPuppet.TagContactTagRemoveRequest()
3187
3192
 
@@ -3197,7 +3202,7 @@ class PuppetService extends PUPPET.Puppet {
3197
3202
  override async tagGroupAdd (
3198
3203
  tagGroupName: string,
3199
3204
  ): Promise<string | void> {
3200
- log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName)
3205
+ this.log.verbose('PuppetService', 'tagGroupAdd(%s)', tagGroupName)
3201
3206
 
3202
3207
  const request = new grpcPuppet.TagGroupAddRequest()
3203
3208
 
@@ -3216,7 +3221,7 @@ class PuppetService extends PUPPET.Puppet {
3216
3221
  override async tagGroupDelete (
3217
3222
  tagGroupId: string,
3218
3223
  ): Promise<void> {
3219
- log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId)
3224
+ this.log.verbose('PuppetService', 'tagGroupDelete(%s)', tagGroupId)
3220
3225
 
3221
3226
  const request = new grpcPuppet.TagGroupDeleteRequest()
3222
3227
 
@@ -3233,7 +3238,7 @@ class PuppetService extends PUPPET.Puppet {
3233
3238
  tagNameList: string[],
3234
3239
  tagGroupId?: string,
3235
3240
  ): Promise<PUPPET.types.TagInfo[] | void> {
3236
- log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagNameList, tagGroupId)
3241
+ this.log.verbose('PuppetService', 'tagTagAdd(%s, %s)', tagNameList, tagGroupId)
3237
3242
 
3238
3243
  const request = new grpcPuppet.TagTagAddRequest()
3239
3244
 
@@ -3258,7 +3263,7 @@ class PuppetService extends PUPPET.Puppet {
3258
3263
  override async tagTagDelete (
3259
3264
  tagIdList: string[],
3260
3265
  ): Promise<void> {
3261
- log.verbose('PuppetService', 'tagTagDelete(%s)', tagIdList)
3266
+ this.log.verbose('PuppetService', 'tagTagDelete(%s)', tagIdList)
3262
3267
 
3263
3268
  const request = new grpcPuppet.TagTagDeleteRequest()
3264
3269
  request.setTagIdList(tagIdList)
@@ -3273,7 +3278,7 @@ class PuppetService extends PUPPET.Puppet {
3273
3278
  override async tagTagModify (
3274
3279
  tagNewInfoList: PUPPET.types.TagInfo[],
3275
3280
  ): Promise<PUPPET.types.TagInfo[] | void> {
3276
- log.verbose('PuppetService', 'tagTagModify(%o)', tagNewInfoList)
3281
+ this.log.verbose('PuppetService', 'tagTagModify(%o)', tagNewInfoList)
3277
3282
 
3278
3283
  const request = new grpcPuppet.TagTagModifyRequest()
3279
3284
  const newInfoList = tagNewInfoList.map(i => {
@@ -3298,7 +3303,7 @@ class PuppetService extends PUPPET.Puppet {
3298
3303
  }
3299
3304
 
3300
3305
  override async tagGroupList (): Promise<string[]> {
3301
- log.verbose('PuppetService', 'tagGroupList()')
3306
+ this.log.verbose('PuppetService', 'tagGroupList()')
3302
3307
 
3303
3308
  const request = new grpcPuppet.TagGroupListRequest()
3304
3309
 
@@ -3314,7 +3319,7 @@ class PuppetService extends PUPPET.Puppet {
3314
3319
  override async tagGroupTagList (
3315
3320
  tagGroupId?: string,
3316
3321
  ): Promise<string[]> {
3317
- log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId)
3322
+ this.log.verbose('PuppetService', 'tagGroupTagList(%s)', tagGroupId)
3318
3323
 
3319
3324
  const request = new grpcPuppet.TagGroupTagListRequest()
3320
3325
  if (typeof tagGroupId !== 'undefined') {
@@ -3332,7 +3337,7 @@ class PuppetService extends PUPPET.Puppet {
3332
3337
 
3333
3338
  override async tagTagList (
3334
3339
  ): Promise<string[]> {
3335
- log.verbose('PuppetService', 'tagTagList()')
3340
+ this.log.verbose('PuppetService', 'tagTagList()')
3336
3341
 
3337
3342
  const request = new grpcPuppet.TagTagListRequest()
3338
3343
 
@@ -3348,7 +3353,7 @@ class PuppetService extends PUPPET.Puppet {
3348
3353
  override async tagContactTagList (
3349
3354
  contactId: string,
3350
3355
  ): Promise<string[]> {
3351
- log.verbose('PuppetService', 'tagContactTagList(%s)', contactId)
3356
+ this.log.verbose('PuppetService', 'tagContactTagList(%s)', contactId)
3352
3357
 
3353
3358
  const request = new grpcPuppet.TagContactTagListRequest()
3354
3359
  request.setContactId(contactId)
@@ -3365,7 +3370,7 @@ class PuppetService extends PUPPET.Puppet {
3365
3370
  override async tagTagContactList (
3366
3371
  tagId: string,
3367
3372
  ): Promise<string[]> {
3368
- log.verbose('PuppetService', 'tagTagContactList(%s)', tagId)
3373
+ this.log.verbose('PuppetService', 'tagTagContactList(%s)', tagId)
3369
3374
 
3370
3375
  const request = new grpcPuppet.TagTagContactListRequest()
3371
3376
  request.setTagId(tagId)
@@ -3380,11 +3385,11 @@ class PuppetService extends PUPPET.Puppet {
3380
3385
  }
3381
3386
 
3382
3387
  override async tagGroupPayloadPuppet (id: string): Promise<PUPPET.payloads.TagGroup> {
3383
- log.verbose('PuppetService', 'tagGroupPayload(%s)', id)
3388
+ this.log.verbose('PuppetService', 'tagGroupPayload(%s)', id)
3384
3389
 
3385
3390
  const cachedPayload = await this._payloadStore.tagGroup?.get(id)
3386
3391
  if (cachedPayload) {
3387
- log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id)
3392
+ this.log.silly('PuppetService', 'tagGroupPayload(%s) cache HIT', id)
3388
3393
  return cachedPayload
3389
3394
  }
3390
3395
 
@@ -3408,17 +3413,17 @@ class PuppetService extends PUPPET.Puppet {
3408
3413
  }
3409
3414
 
3410
3415
  await this._payloadStore.tagGroup?.set(id, payload)
3411
- log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id)
3416
+ this.log.silly('PuppetService', 'tagGroupPayloadPuppet(%s) cache SET', id)
3412
3417
 
3413
3418
  return payload
3414
3419
  }
3415
3420
 
3416
3421
  override async tagPayloadPuppet (tagId: string): Promise<PUPPET.payloads.Tag> {
3417
- log.verbose('PuppetService', 'tagPayloadPuppet(%s)', tagId)
3422
+ this.log.verbose('PuppetService', 'tagPayloadPuppet(%s)', tagId)
3418
3423
 
3419
3424
  const cachedPayload = await this._payloadStore.tag?.get(tagId)
3420
3425
  if (cachedPayload) {
3421
- log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId)
3426
+ this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache HIT', tagId)
3422
3427
  return cachedPayload
3423
3428
  }
3424
3429
 
@@ -3443,7 +3448,7 @@ class PuppetService extends PUPPET.Puppet {
3443
3448
  }
3444
3449
 
3445
3450
  await this._payloadStore.tag?.set(tagId, payload)
3446
- log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId)
3451
+ this.log.silly('PuppetService', 'tagPayloadPuppet(%s) cache SET', tagId)
3447
3452
 
3448
3453
  return payload
3449
3454
  }
@@ -3455,7 +3460,7 @@ class PuppetService extends PUPPET.Puppet {
3455
3460
  */
3456
3461
 
3457
3462
  override async postPublish (payload: PUPPET.payloads.Post): Promise<void | string> {
3458
- log.verbose('PuppetService', 'postPublish(%s)', payload)
3463
+ this.log.verbose('PuppetService', 'postPublish(%s)', payload)
3459
3464
 
3460
3465
  if (!PUPPET.payloads.isPostClient(payload)) {
3461
3466
  throw new Error('can only publish client post now')
@@ -3475,7 +3480,7 @@ class PuppetService extends PUPPET.Puppet {
3475
3480
  }
3476
3481
 
3477
3482
  override async postUnpublish (id: string): Promise<void> {
3478
- log.verbose('PuppetService', 'postUnpublish(%s)', id)
3483
+ this.log.verbose('PuppetService', 'postUnpublish(%s)', id)
3479
3484
 
3480
3485
  const request = new grpcPuppet.MomentUnpublishRequest()
3481
3486
  request.setMomentId(id)
@@ -3486,7 +3491,7 @@ class PuppetService extends PUPPET.Puppet {
3486
3491
  }
3487
3492
 
3488
3493
  override async momentSignature (text?: string): Promise<void | string> {
3489
- log.verbose('PuppetService', 'momentSignature(%s)', text)
3494
+ this.log.verbose('PuppetService', 'momentSignature(%s)', text)
3490
3495
 
3491
3496
  const request = new grpcPuppet.MomentSignatureRequest()
3492
3497
  if (text) {
@@ -3504,7 +3509,7 @@ class PuppetService extends PUPPET.Puppet {
3504
3509
  }
3505
3510
 
3506
3511
  override async momentCoverage (cover?: FileBoxInterface | undefined): Promise<void | FileBoxInterface> {
3507
- log.verbose('PuppetService', 'momentCoverage(%s)', JSON.stringify(cover))
3512
+ this.log.verbose('PuppetService', 'momentCoverage(%s)', JSON.stringify(cover))
3508
3513
 
3509
3514
  const request = new grpcPuppet.MomentCoverageRequest()
3510
3515
  if (cover) {
@@ -3524,7 +3529,7 @@ class PuppetService extends PUPPET.Puppet {
3524
3529
  }
3525
3530
 
3526
3531
  override async postPayloadSayable (postId: string, sayableId: string): Promise<PUPPET.payloads.Sayable> {
3527
- log.verbose('PuppetService', 'postPayloadSayable(%s, %s)', postId, sayableId)
3532
+ this.log.verbose('PuppetService', 'postPayloadSayable(%s, %s)', postId, sayableId)
3528
3533
 
3529
3534
  const request = new grpcPuppet.PostPayloadSayableRequest()
3530
3535
  request.setPostId(postId)
@@ -3582,7 +3587,7 @@ class PuppetService extends PUPPET.Puppet {
3582
3587
  }
3583
3588
 
3584
3589
  override async postRawPayload (id: string): Promise<PUPPET.payloads.Post> {
3585
- log.verbose('PuppetService', 'postRawPayload(%s)', id)
3590
+ this.log.verbose('PuppetService', 'postRawPayload(%s)', id)
3586
3591
 
3587
3592
  const request = new grpcPuppet.PostPayloadRequest()
3588
3593
  request.setPostId(id)
@@ -3633,13 +3638,13 @@ class PuppetService extends PUPPET.Puppet {
3633
3638
  }
3634
3639
 
3635
3640
  override async postRawPayloadParser (payload: PUPPET.payloads.Post): Promise<PUPPET.payloads.Post> {
3636
- // log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
3641
+ // this.log.silly('PuppetService', 'postRawPayloadParser({id:%s})', payload.id)
3637
3642
  // passthrough
3638
3643
  return payload
3639
3644
  }
3640
3645
 
3641
3646
  override async tap (postId: string, type?: PUPPET.types.Tap, tap = true): Promise<boolean | void> {
3642
- log.verbose('PuppetService', 'tap(%s, %s, %s)', postId, type, tap)
3647
+ this.log.verbose('PuppetService', 'tap(%s, %s, %s)', postId, type, tap)
3643
3648
 
3644
3649
  const request = new grpcPuppet.PostTapRequest()
3645
3650
  request.setPostId(postId)
@@ -3657,7 +3662,7 @@ class PuppetService extends PUPPET.Puppet {
3657
3662
  }
3658
3663
 
3659
3664
  override async momentVisibleList (): Promise<string[]> {
3660
- log.verbose('PuppetService', 'momentVisibleList()')
3665
+ this.log.verbose('PuppetService', 'momentVisibleList()')
3661
3666
 
3662
3667
  const request = new grpcPuppet.MomentVisibleListRequest()
3663
3668
 
@@ -3674,7 +3679,7 @@ class PuppetService extends PUPPET.Puppet {
3674
3679
  contactIds: string[],
3675
3680
  serviceProviderId?: string,
3676
3681
  ): Promise<PUPPET.types.ContactIdExternalUserIdPair[]> {
3677
- log.verbose('PuppetService', 'getContactExternalUserId(%s, %s)', JSON.stringify(contactIds), serviceProviderId)
3682
+ this.log.verbose('PuppetService', 'getContactExternalUserId(%s, %s)', JSON.stringify(contactIds), serviceProviderId)
3678
3683
 
3679
3684
  const request = new grpcPuppet.GetContactExternalUserIdRequest()
3680
3685
 
@@ -3699,7 +3704,7 @@ class PuppetService extends PUPPET.Puppet {
3699
3704
  }
3700
3705
 
3701
3706
  override async getRoomAntiSpamStrategyList (): Promise<PUPPET.types.RoomAntiSpamStrategy[]> {
3702
- log.verbose('PuppetService', 'getRoomAntiSpamStrategyList()')
3707
+ this.log.verbose('PuppetService', 'getRoomAntiSpamStrategyList()')
3703
3708
 
3704
3709
  const request = new grpcPuppet.GetRoomAntiSpamStrategyListRequest()
3705
3710
 
@@ -3721,7 +3726,7 @@ class PuppetService extends PUPPET.Puppet {
3721
3726
  }
3722
3727
 
3723
3728
  override async getRoomAntiSpamStrategyEffectRoomList (strategyId: string): Promise<string[]> {
3724
- log.verbose('PuppetService', 'getRoomAntiSpamStrategyEffectRoomList(%s)', strategyId)
3729
+ this.log.verbose('PuppetService', 'getRoomAntiSpamStrategyEffectRoomList(%s)', strategyId)
3725
3730
 
3726
3731
  const request = new grpcPuppet.GetRoomAntiSpamStrategyEffectRoomListRequest()
3727
3732
  request.setStrategyId(strategyId)
@@ -3736,7 +3741,7 @@ class PuppetService extends PUPPET.Puppet {
3736
3741
  }
3737
3742
 
3738
3743
  override async applyRoomAntiSpamStrategy (strategyId: string, roomIds: string[], active: boolean): Promise<void> {
3739
- log.verbose('PuppetService', 'applyRoomAntiSpamStrategy(%s, %s, %s)', strategyId, roomIds, active)
3744
+ this.log.verbose('PuppetService', 'applyRoomAntiSpamStrategy(%s, %s, %s)', strategyId, roomIds, active)
3740
3745
 
3741
3746
  const request = new grpcPuppet.ApplyRoomAntiSpamStrategyRequest()
3742
3747
  request.setStrategyId(strategyId)
@@ -3749,7 +3754,7 @@ class PuppetService extends PUPPET.Puppet {
3749
3754
  }
3750
3755
 
3751
3756
  override async getCorpMessageInterceptionStrategies (): Promise<PUPPET.types.CorpMessageInterceptionStrategy[]> {
3752
- log.verbose('PuppetService', 'getCorpMessageInterceptionStrategies()')
3757
+ this.log.verbose('PuppetService', 'getCorpMessageInterceptionStrategies()')
3753
3758
 
3754
3759
  const request = new grpcPuppet.GetCorpMessageInterceptionStrategiesRequest()
3755
3760
 
@@ -3793,17 +3798,17 @@ class PuppetService extends PUPPET.Puppet {
3793
3798
  private reconnectIndicator: BooleanIndicator
3794
3799
  override async reset (): Promise<void> {
3795
3800
  if (!this._grpcManager) {
3796
- log.warn('PuppetService', 'grpc manager not constructed, perform regular reset')
3801
+ this.log.warn('PuppetService', 'grpc manager not constructed, perform regular reset')
3797
3802
  return super.reset()
3798
3803
  }
3799
3804
 
3800
3805
  if (!this.isLoggedIn) {
3801
- log.warn('PuppetService', 'puppet not logged in, perform regular reset')
3806
+ this.log.warn('PuppetService', 'puppet not logged in, perform regular reset')
3802
3807
  return super.reset()
3803
3808
  }
3804
3809
 
3805
3810
  if (this.reconnectIndicator.value()) {
3806
- log.warn('PuppetService', 'already trying to reconnect, pass this one')
3811
+ this.log.warn('PuppetService', 'already trying to reconnect, pass this one')
3807
3812
  return
3808
3813
  }
3809
3814
 
@@ -3857,12 +3862,12 @@ class PuppetService extends PUPPET.Puppet {
3857
3862
  break
3858
3863
  } catch (e) {
3859
3864
  if (Date.now() - startTime < timeoutMilliseconds) {
3860
- log.warn('failed to start stream, will try again in 15 seconds')
3865
+ this.log.warn('failed to start stream, will try again in 15 seconds')
3861
3866
  await new Promise(resolve => {
3862
3867
  setTimeout(resolve, 5000)
3863
3868
  })
3864
3869
  } else {
3865
- log.warn('failed to start stream and reaches timeout, will perform regular reset')
3870
+ this.log.warn('failed to start stream and reaches timeout, will perform regular reset')
3866
3871
  this.reconnectIndicator.value(false)
3867
3872
  return super.reset()
3868
3873
  }
@@ -3880,7 +3885,7 @@ class PuppetService extends PUPPET.Puppet {
3880
3885
  this.grpcManager.off('data', onLogin)
3881
3886
  })
3882
3887
  } catch (e) {
3883
- log.warn('PuppetService', 'waiting for event reset login error, will perform regular reset')
3888
+ this.log.warn('PuppetService', 'waiting for event reset login error, will perform regular reset')
3884
3889
  return super.reset()
3885
3890
  }
3886
3891
  try {
@@ -3890,7 +3895,7 @@ class PuppetService extends PUPPET.Puppet {
3890
3895
  this.grpcManager.off('data', onReady)
3891
3896
  })
3892
3897
  } catch (e) {
3893
- log.warn('PuppetService', 'waiting for event reset ready error, will do nothing')
3898
+ this.log.warn('PuppetService', 'waiting for event reset ready error, will do nothing')
3894
3899
  }
3895
3900
  }
3896
3901
 
@@ -3905,7 +3910,7 @@ class PuppetService extends PUPPET.Puppet {
3905
3910
  const lastEventTimestamp = await this._payloadStore.miscellaneous?.get('lastEventTimestamp')
3906
3911
  let lastEventSeq = await this._payloadStore.miscellaneous?.get('lastEventSeq')
3907
3912
  if ((Date.now() - Number(lastEventTimestamp || 0)) > this.timeoutMilliseconds) {
3908
- log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`)
3913
+ this.log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`)
3909
3914
  lastEventSeq = undefined
3910
3915
  }
3911
3916
  const accountId = await this._payloadStore.miscellaneous?.get('accountId')