wechaty-puppet-matrix 0.0.24 → 0.0.26

package/dist/esm/src/puppet-matrix.js

@@ -164,6 +164,12 @@ class PuppetMatrix extends PUPPET.Puppet {
                     }, 5000);
                 }
             }));
+            this._client.on('expired', this.wrapAsync(async (expired) => {
+                if (expired) {
+                    log.info(PRE, 'Token has expired');
+                    void this.onStop();
+                }
+            }));
         }
         addRunningPuppet(this);
         void this.checkIsLogin();
@@ -364,6 +370,8 @@ class PuppetMatrix extends PUPPET.Puppet {
     async _stopClient() {
         this.__currentUserId = undefined;
         this.__currentUserId = undefined;
+        this._client?.destroy();
+        this._client = undefined;
         if (this._cacheMgr) {
             log.info(PRE, 'colse cache');
             await this._cacheMgr.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",

package/src/matrix/service/request.ts

@@ -644,10 +644,12 @@ class Client extends EventEmitter {
   private readonly HEARTBEAT_TIMEOUT = 5000 // 5秒超时
   private reconnectAttempts = 0
   private heartbeatTimer?: any
+  private checkExpiredInterval?: any
   private heartbeatTimeoutTimer?: any
   private getQrcodeTimes = 0
   private restoreTimes = 0
   private maxRestoreTimes = 1
+  private hasExpired = false
   socket: any
   server: any
   tokenInfo: any
@@ -664,6 +666,7 @@ class Client extends EventEmitter {
   override emit(event: 'verify-code', verifyInfo: VerifyInfo): boolean;
   override emit(event: 'update-contacts', contacts: ContactPayload[]): boolean;
   override emit(event: 'room-join', info: any): boolean;
+  override emit(event: 'expired', info: boolean): boolean;
 
   override emit (event: ClientEvent, ...args: any[]): boolean {
     return super.emit(event, ...args)
@@ -684,6 +687,20 @@ class Client extends EventEmitter {
     this.getQrcodeTimes = 0
     this.restoreTimes = 0
     this.maxRestoreTimes = 1
+    this.hasExpired = false
+  }
+
+  destroy () {
+    log.verbose(PRE, 'destroy()')
+    this.hasEmitLogout = false
+    this.socket && this.socket.end()
+    this.socket = null
+    this.checkExpiredInterval && clearInterval(this.checkExpiredInterval)
+    this.checkExpiredInterval = undefined
+    this.heartbeatTimer && clearTimeout(this.heartbeatTimer)
+    this.heartbeatTimer = undefined
+    this.heartbeatTimeoutTimer && clearTimeout(this.heartbeatTimeoutTimer)
+    this.heartbeatTimeoutTimer = undefined
   }
 
   async getTokenInfo () {
@@ -691,6 +708,16 @@ class Client extends EventEmitter {
       const res = await axios.get(`https://api-bot.aibotk.com/openapi/v1/token/info?secret=5be06b6f8d42a7&token=${this.options.token}`)
       if (res.data.code === 0) {
         this.tokenInfo = res.data.data
+        this.hasExpired = res.data?.data?.hasExpired
+        if (this.hasExpired) {
+          log.error('Token已到期，请及时续费')
+          this.checkExpiredInterval && clearInterval(this.checkExpiredInterval)
+          this.checkExpiredInterval = undefined
+          setTimeout(() => {
+            this.emit('expired', true)
+          }, 3000)
+          return false
+        }
         return true
       } else {
         log.error('Token auth failed, reason: %s', res.data.message)
@@ -702,8 +729,16 @@ class Client extends EventEmitter {
     }
   }
 
+  checkHasExpired () {
+    this.checkExpiredInterval = setInterval(() => {
+      log.info('checkHasExpired')
+      void this.getTokenInfo()
+    }, 1000 * 60 * 60 * 12)
+  }
+
   async initServer () {
     await this.getTokenInfo()
+    this.checkHasExpired()
     if (this.socket) {
       log.error('socket had already been opened!')
       return
@@ -713,6 +748,9 @@ class Client extends EventEmitter {
   }
 
   async createMqttConnection (): Promise<void> {
+    if (this.hasExpired) {
+      return
+    }
     if (!this.tokenInfo) {
       log.error('Token info not available')
       return
@@ -739,7 +777,7 @@ class Client extends EventEmitter {
       this.socket = client
 
       // 订阅主题
-      client.subscribe(`aibotk/msg/${this.tokenInfo.guid}`, (err) => {
+      client.subscribe(`aibotk/msg/${this.tokenInfo.guid}`, (err: any) => {
         if (err) {
           log.error('Failed to subscribe to topic', err)
         } else {
@@ -783,85 +821,6 @@ class Client extends EventEmitter {
     this.startHeartbeat()
   }
 
-  async createWebSocket (): Promise<void> {
-    if (!this.tokenInfo) {
-      log.error('Token info not available')
-      return
-    }
-    const ws = new WebSocket(
-      `${this.tokenInfo.endpoint}?guid=${this.tokenInfo.guid}`,
-      {
-        perMessageDeflate: true,
-        maxPayload: 100 * 1024 * 1024,
-      },
-    )
-
-    // 连接建立前的 Promise
-    await new Promise<void>((resolve, reject) => {
-      ws.once('open', () => {
-        this.connectionStatus.status = 'connected'
-        this.reconnectAttempts = 0
-        log.info('WebSocket connection opened')
-        resolve()
-      })
-
-      ws.once('error', (error: any) => {
-        log.warn('WebSocket connection error', error)
-        reject(error)
-      })
-
-      ws.once('close', (code: any, reason: any) => {
-        void this.handleWebSocketClose(code, reason)
-        reject(new Error(`WebSocket closed: ${code} - ${reason}`))
-      })
-    })
-    this.socket = ws
-
-    // 设置事件处理器
-    this.setupWebSocketListeners(ws)
-  }
-
-  private setupWebSocketListeners (ws: WebSocket): void {
-    // 消息处理
-    ws.on('message', (data: string) => {
-      this.resetHeartbeatTimeout() // 收到任何消息都重置心跳超时
-      log.silly(PRE, 'initWebSocket() ws.on(message): %s', data)
-      if (data.toString() === 'pong') {
-        log.verbose('Received heartbeat')
-        return
-      }
-      try {
-        const payload = JSON.parse(data)
-        log.info('Received payload', JSON.stringify(payload))
-        void this.eventParse(payload)
-      } catch (error) {
-        log.warn(PRE, 'initWebSocket() ws.on(message) exception: %s', error)
-        // @ts-ignore
-        this.emit('error', (error as Error).message)
-      }
-    })
-
-    // 错误处理
-    ws.on('error', (error: Error) => {
-      if ((error as any).code === 'ECONNREFUSED') {
-        log.verbose('Connection refused, potential reconnect scenario')
-        return
-      }
-
-      log.verbose(PRE, 'initWebSocket() ws.on(error) %s', error)
-      // @ts-ignore
-      this.emit('error', error)
-    })
-
-    // 关闭处理
-    ws.on('close', (code:any, reason: any) => {
-      this.stopHeartbeat()
-      void this.handleWebSocketClose(code, reason)
-    })
-    // 启动心跳
-    this.startHeartbeat()
-  }
-
   private startHeartbeat (): void {
     this.stopHeartbeat() // 确保清理现有定时器
     this.heartbeatTimer = setInterval(() => {
@@ -922,6 +881,9 @@ class Client extends EventEmitter {
   }
 
   private async reconnectMqtt (): Promise<void> {
+    if (this.hasExpired) {
+      return
+    }
     if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
       log.error('Max reconnect attempts reached. Stopping reconnection.')
       return
@@ -944,20 +906,10 @@ class Client extends EventEmitter {
     }, delay)
   }
 
-  private async handleWebSocketClose (code?: number, reason?: Buffer | String) {
-    this.connectionStatus.status = 'disconnected'
-    log.warn(`WebSocket closed: Code ${code}, Reason ${reason}`)
-    if (this.socket) {
-      this.socket.close()
-      this.socket = null
-    }
-
-    // 触发重连
-    await this.reconnect()
-
-  }
-
   private async reconnect (): Promise<void> {
+    if (this.hasExpired) {
+      return
+    }
     if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
       log.error('Max reconnect attempts reached. Stopping reconnection.')
       return
@@ -1179,6 +1131,10 @@ class Client extends EventEmitter {
   }
 
   async postData (data: any) {
+    if (this.hasExpired) {
+      log.error('Token已到期，无法提供服务')
+      return
+    }
     const config: any = {
       data: {
         guid: this.tokenInfo.guid,

package/src/puppet-matrix.ts

@@ -207,7 +207,12 @@ class PuppetMatrix extends PUPPET.Puppet {
             } as any)
           }, 5000)
         }
-
+      }))
+      this._client.on('expired', this.wrapAsync(async (expired: boolean) => {
+        if (expired) {
+          log.info(PRE, 'Token has expired')
+          void this.onStop()
+        }
       }))
     }
     addRunningPuppet(this)
@@ -434,6 +439,8 @@ class PuppetMatrix extends PUPPET.Puppet {
   private async _stopClient (): Promise<void> {
     this.__currentUserId = undefined
     this.__currentUserId = undefined
+    this._client?.destroy()
+    this._client = undefined
     if (this._cacheMgr) {
       log.info(PRE, 'colse cache')
       await this._cacheMgr.close()