@juzi/wechaty-puppet-service 1.0.73 → 1.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juzi/wechaty-puppet-service",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "description": "Puppet Service for Wechaty",
   "type": "module",
   "exports": {

package/src/client/payload-store.ts

@@ -51,7 +51,7 @@ class PayloadStore {
   public room?         : FlashStore<string, PUPPET.payloads.Room>
   public tag?          : FlashStore<string, PUPPET.payloads.Tag>
   public tagGroup?     : FlashStore<string, PUPPET.payloads.TagGroup>
-  public miscellaneous : FlashStore<string, string>
+  public miscellaneous?: FlashStore<string, string>
 
   protected storeDir:   string
   protected accountId?: string
@@ -72,7 +72,11 @@ class PayloadStore {
       fs.mkdirSync(this.storeDir, { recursive: true })
     }
 
-    this.miscellaneous = new FlashStore(path.join(this.storeDir, 'miscellaneous')) // account-free data
+    try {
+      this.miscellaneous = new FlashStore(path.join(this.storeDir, 'miscellaneous')) // account-free data
+    } catch (e) {
+      log.error('PayloadStore', 'constructor() store failed to init, will continue without it.')
+    }
   }
 
   /**
@@ -155,7 +159,7 @@ class PayloadStore {
       throw new Error('Can not destroy() a start()-ed store. Call stop() to stop it first')
     }
 
-    await this.miscellaneous.close()
+    await this.miscellaneous?.close()
 
     /**
      * Huan(202108): `fs.rm` was introduced from Node.js v14.14

package/src/client/puppet-service.ts

@@ -143,9 +143,9 @@ class PuppetService extends PUPPET.Puppet {
       this._grpcManager = undefined
     }
 
-    log.verbose('PuppetService', 'start() instanciating GrpcManager ...')
+    log.info('PuppetService', 'start() instanciating GrpcManager ...')
     const grpcManager = new GrpcManager(this.options)
-    log.verbose('PuppetService', 'start() instanciating GrpcManager ... done')
+    log.info('PuppetService', 'start() instanciating GrpcManager ... done')
 
     /**
      * Huan(202108): when we started the event stream,
@@ -153,35 +153,35 @@ class PuppetService extends PUPPET.Puppet {
      */
     this._grpcManager = grpcManager
 
-    log.verbose('PuppetService', 'start() setting up bridge grpc event stream ...')
+    log.info('PuppetService', 'start() setting up bridge grpc event stream ...')
     this.bridgeGrpcEventStream(grpcManager)
-    log.verbose('PuppetService', 'start() setting up bridge grpc event stream ... done')
+    log.info('PuppetService', 'start() setting up bridge grpc event stream ... done')
 
-    log.verbose('PuppetService', 'start() starting grpc manager...')
+    log.info('PuppetService', 'start() starting grpc manager...')
     const { lastEventSeq } = await this.getEventData()
-    const accountId = await this._payloadStore.miscellaneous.get('accountId')
+    const accountId = await this._payloadStore.miscellaneous?.get('accountId') || ''
     await grpcManager.start(lastEventSeq, accountId)
-    log.verbose('PuppetService', 'start() starting grpc manager... done')
+    log.info('PuppetService', 'start() starting grpc manager... done')
 
-    log.verbose('PuppetService', 'start healthCheck')
+    log.info('PuppetService', 'start healthCheck')
     this.startHealthCheck()
 
-    log.verbose('PuppetService', 'onStart() ... done')
+    log.info('PuppetService', 'onStart() ... done')
   }
 
   override async onStop (): Promise<void> {
-    log.verbose('PuppetService', 'onStop()')
+    log.info('PuppetService', 'onStop()')
 
     if (this._grpcManager) {
-      log.verbose('PuppetService', 'onStop() stopping grpc manager ...')
+      log.info('PuppetService', 'onStop() stopping grpc manager ...')
       const grpcManager = this._grpcManager
       this._grpcManager = undefined
       await grpcManager.stop()
-      log.verbose('PuppetService', 'onStop() stopping grpc manager ... done')
+      log.info('PuppetService', 'onStop() stopping grpc manager ... done')
     }
 
-    log.verbose('PuppetService', 'onStop() ... done')
-    log.verbose('PuppetService', 'stop healthCheck')
+    log.info('PuppetService', 'onStop() ... done')
+    log.info('PuppetService', 'stop healthCheck')
     this.stopHealthCheck()
   }
 
@@ -262,10 +262,12 @@ class PuppetService extends PUPPET.Puppet {
     }
 
     if (seq) {
-      const lastEventSeq = await this._payloadStore.miscellaneous.get('eventSeq')
-      if (!lastEventSeq || (seq > Number(lastEventSeq) || seq === 1)) {
-        await this._payloadStore.miscellaneous.set('eventSeq', String(seq))
-        await this._payloadStore.miscellaneous.set('eventTimestamp', timestamp)
+      if (this._payloadStore.miscellaneous) {
+        const lastEventSeq = await this._payloadStore.miscellaneous.get('eventSeq')
+        if (!lastEventSeq || (seq > Number(lastEventSeq) || seq === 1)) {
+          await this._payloadStore.miscellaneous.set('eventSeq', String(seq))
+          await this._payloadStore.miscellaneous.set('eventTimestamp', timestamp)
+        }
       }
     }
 
@@ -289,12 +291,14 @@ class PuppetService extends PUPPET.Puppet {
             return
           }
           const loginPayload = JSON.parse(payload) as PUPPET.payloads.EventLogin
-          const accountId = await this._payloadStore.miscellaneous.get('accountId')
-          if (accountId !== loginPayload.contactId) {
-            await this._payloadStore.miscellaneous.delete('eventSeq')
+          if (this._payloadStore.miscellaneous) {
+            const accountId = await this._payloadStore.miscellaneous.get('accountId')
+            if (accountId !== loginPayload.contactId) {
+              await this._payloadStore.miscellaneous.delete('eventSeq')
+            }
+            await this._payloadStore.miscellaneous.set('accountId', loginPayload.contactId)
           }
-          await this._payloadStore.miscellaneous.set('accountId', loginPayload.contactId)
-          ;(
+          (
             async () => this.login(loginPayload.contactId)
           )().catch(e =>
             log.error('PuppetService', 'onGrpcStreamEvent() this.login() rejection %s',
@@ -306,7 +310,7 @@ class PuppetService extends PUPPET.Puppet {
       case grpcPuppet.EventType.EVENT_TYPE_LOGOUT:
         {
           const logoutPayload = JSON.parse(payload) as PUPPET.payloads.EventLogout
-          await this._payloadStore.miscellaneous.delete('accountId')
+          await this._payloadStore.miscellaneous?.delete('accountId')
           ;(
             async () => this.logout(logoutPayload.data)
           )().catch(e =>
@@ -2649,7 +2653,7 @@ class PuppetService extends PUPPET.Puppet {
     return contactIdsList
   }
 
-  healthCheckInterval?: NodeJS.Timer
+  healthCheckInterval?: NodeJS.Timeout
   startHealthCheck () {
     this.healthCheckInterval = setInterval(() => {
       this.ding('healthCheck')
@@ -2686,7 +2690,7 @@ class PuppetService extends PUPPET.Puppet {
 
     this.grpcManager.stopStream()
     const { lastEventSeq } = await this.getEventData()
-    const accountId = await this._payloadStore.miscellaneous.get('accountId')
+    const accountId = await this._payloadStore.miscellaneous?.get('accountId') || ''
 
     const onLoginResolve = (resolve: () => void) => {
       const onLogin = (event: grpcPuppet.EventResponse) => {
@@ -2771,8 +2775,8 @@ class PuppetService extends PUPPET.Puppet {
   }
 
   async getEventData () {
-    const lastEventTimestamp = await this._payloadStore.miscellaneous.get('eventTimestamp')
-    let lastEventSeq = await this._payloadStore.miscellaneous.get('eventSeq')
+    const lastEventTimestamp = await this._payloadStore.miscellaneous?.get('eventTimestamp') || 0
+    let lastEventSeq = await this._payloadStore.miscellaneous?.get('eventSeq')
     if ((Date.now() - Number(lastEventTimestamp || 0)) > this.timeoutMilliseconds) {
       log.warn(`last event was ${(Date.now() - Number(lastEventTimestamp || 0)) / 1000} seconds ago, will not request event cache`)
       lastEventSeq = undefined

package/src/package-json.ts

@@ -4,7 +4,7 @@
 import type { PackageJson } from 'type-fest'
 export const packageJson: PackageJson = {
   "name": "@juzi/wechaty-puppet-service",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "description": "Puppet Service for Wechaty",
   "type": "module",
   "exports": {