wechaty-puppet-matrix 0.0.23 → 0.0.26

package/dist/esm/src/utils/normalize-filebox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-filebox.d.ts","sourceRoot":"","sources":["../../../../src/utils/normalize-filebox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACR,MAA0B,UAAU,CAAA;AACrC,OAAO,EAEL,gBAAgB,EACjB,MAA0B,UAAU,CAAA;AA4BrC,QAAA,MAAM,cAAc,YAAa,gBAAgB,YA8BhD,CAAA;AAED,QAAA,MAAM,oBAAoB,gBAAiB,OAAO,OAAO,eAAqB,gBAAgB,wCAkB7F,CAAA;AAED,OAAO,EACL,cAAc,EACd,oBAAoB,GACrB,CAAA"}
+{"version":3,"file":"normalize-filebox.d.ts","sourceRoot":"","sources":["../../../../src/utils/normalize-filebox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACR,MAA0B,UAAU,CAAA;AACrC,OAAO,EAEL,gBAAgB,EACjB,MAA0B,UAAU,CAAA;AA4BrC,QAAA,MAAM,cAAc,GAAI,SAAS,gBAAgB,YA8BhD,CAAA;AAED,QAAA,MAAM,oBAAoB,GAAI,aAAa,OAAO,OAAO,MAAY,SAAS,gBAAgB,wCAkB7F,CAAA;AAED,OAAO,EACL,cAAc,EACd,oBAAoB,GACrB,CAAA"}

package/dist/esm/src/utils/sns-xml-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sns-xml-generator.d.ts","sourceRoot":"","sources":["../../../../src/utils/sns-xml-generator.ts"],"names":[],"mappings":"AAAA,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,aAAa,SAAU,MAAM,WAAW,MAAM,KAAG,MAkD7D,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,WAAW,MAAM,SAAS,KAAK,KAAG,MAgD5E,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,eAAe,MAAM,aAAa,KAAK,EAAE,KAAG,MAkEtF,CAAA"}
+{"version":3,"file":"sns-xml-generator.d.ts","sourceRoot":"","sources":["../../../../src/utils/sns-xml-generator.ts"],"names":[],"mappings":"AAAA,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,SAAS,MAAM,KAAG,MAkD7D,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,SAAS,MAAM,EAAE,OAAO,KAAK,KAAG,MAgD5E,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,aAAa,MAAM,EAAE,WAAW,KAAK,EAAE,KAAG,MAkEtF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.23",
+  "version": "0.0.26",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",
@@ -77,6 +77,7 @@
     "fs-extra": "^10.1.0",
     "image-size": "^1.1.1",
     "lru-cache": "^6.0.0",
+    "mqtt": "^5.10.4",
     "node-cleanup": "^2.1.2",
     "wechaty-web-panel": "^1.6.76",
     "ws": "^8.18.0",

package/src/matrix/service/request.ts

@@ -11,6 +11,7 @@ import imageSize from 'image-size'
 import fs from 'fs-extra'
 import os from 'os'
 import path from 'path'
+import mqtt from 'mqtt'
 const PRE = '[PuppetMatrix]'
 
 /**
@@ -643,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
@@ -663,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)
@@ -683,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 () {
@@ -690,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)
@@ -701,106 +729,108 @@ 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
     }
 
-    await this.createWebSocket()
+    await this.createMqttConnection()
   }
 
-  async createWebSocket (): Promise<void> {
+  async createMqttConnection (): Promise<void> {
+    if (this.hasExpired) {
+      return
+    }
     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()
-      })
+    function randomRange (min: number, max: number) {
+      // min最小值，max最大值
+      return Math.floor(Math.random() * (max - min)) + min
+    }
 
-      ws.once('error', (error: any) => {
-        log.warn('WebSocket connection error', error)
-        reject(error)
-      })
+    const client = mqtt.connect(this.tokenInfo.mqServer, {
+      username: this.tokenInfo.mqUser,
+      password: this.tokenInfo.mqPsd,
+      keepalive: 60,
+      reconnectPeriod: 1000,
+      connectTimeout: 30 * 1000,
+      clientId: this.tokenInfo.guid + randomRange(1, 10000),
+    })
 
-      ws.once('close', (code: any, reason: any) => {
-        void this.handleWebSocketClose(code, reason)
-        reject(new Error(`WebSocket closed: ${code} - ${reason}`))
+    client.on('connect', () => {
+      this.connectionStatus.status = 'connected'
+      this.reconnectAttempts = 0
+      log.info('MQTT connection opened')
+      this.socket = client
+
+      // 订阅主题
+      client.subscribe(`aibotk/msg/${this.tokenInfo.guid}`, (err: any) => {
+        if (err) {
+          log.error('Failed to subscribe to topic', err)
+        } else {
+          log.info('Subscribed to topic')
+        }
       })
     })
-    this.socket = ws
 
-    // 设置事件处理器
-    this.setupWebSocketListeners(ws)
-  }
+    client.on('error', (error: any) => {
+      log.warn('MQTT connection error', error)
+    })
+
+    client.on('close', () => {
+      this.connectionStatus.status = 'disconnected'
+      log.warn('MQTT connection closed')
+      this.socket = null
+      void this.reconnect()
+    })
 
-  private setupWebSocketListeners (ws: WebSocket): void {
-    // 消息处理
-    ws.on('message', (data: string) => {
+    client.on('message', (topic, message) => {
       this.resetHeartbeatTimeout() // 收到任何消息都重置心跳超时
-      log.silly(PRE, 'initWebSocket() ws.on(message): %s', data)
-      if (data.toString() === 'pong') {
+
+      log.verbose(PRE, 'Received message on topic %s: %s', topic, message.toString())
+      if (message.toString() === 'ping' || message.toString() === 'pong') {
         log.verbose('Received heartbeat')
         return
       }
+
       try {
-        const payload = JSON.parse(data)
+        const payload = JSON.parse(message.toString())
         log.info('Received payload', JSON.stringify(payload))
         void this.eventParse(payload)
       } catch (error) {
-        log.warn(PRE, 'initWebSocket() ws.on(message) exception: %s', error)
+        log.warn(PRE, 'Error parsing message: %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.socket = client
     this.startHeartbeat()
   }
 
   private startHeartbeat (): void {
     this.stopHeartbeat() // 确保清理现有定时器
-    this.socket?.send('ping')
     this.heartbeatTimer = setInterval(() => {
-      if (this.socket?.readyState === WebSocket.OPEN) {
+      if (this.socket?.connected) {
         try {
-          this.socket.send('ping')
+          this.socket.publish(`aibotk/msg/${this.tokenInfo.guid}`, 'pong')
           this.setHeartbeatTimeout()
         } catch (error) {
           log.error('Failed to send heartbeat:', error)
-          void this.handleWebSocketClose(1006, 'Heartbeat failed')
+          void this.handleMqttClose()
         }
       }
     }, this.HEARTBEAT_INTERVAL)
@@ -826,7 +856,7 @@ class Client extends EventEmitter {
     }
     this.heartbeatTimeoutTimer = setTimeout(() => {
       log.warn('Heartbeat timeout, reconnecting...')
-      void this.handleWebSocketClose(1006, 'Heartbeat timeout')
+      void this.handleMqttClose()
     }, this.HEARTBEAT_TIMEOUT)
   }
 
@@ -838,20 +868,48 @@ class Client extends EventEmitter {
     }
   }
 
-  private async handleWebSocketClose (code?: number, reason?: Buffer | String) {
+  private async handleMqttClose () {
     this.connectionStatus.status = 'disconnected'
-    log.warn(`WebSocket closed: Code ${code}, Reason ${reason}`)
+    log.warn('MQTT connection closed')
     if (this.socket) {
-      this.socket.close()
+      this.socket.end()
       this.socket = null
     }
 
     // 触发重连
-    await this.reconnect()
+    await this.reconnectMqtt()
+  }
+
+  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
+    }
+
+    // 指数退避重连策略
+    const delay = Math.min(
+      this.INITIAL_RECONNECT_DELAY * Math.pow(2, this.reconnectAttempts),
+      this.MAX_RECONNECT_DELAY,
+    )
 
+    this.reconnectAttempts++
+    log.info(`Reconnecting in ${delay}ms (Attempt ${this.reconnectAttempts})`)
+    setTimeout(() => {
+      try {
+        void this.createMqttConnection()
+      } catch (error) {
+        log.warn('Reconnection failed', error)
+      }
+    }, delay)
   }
 
   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
@@ -1073,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,