wechaty-puppet-matrix 0.0.46 → 0.0.48

package/src/matrix/service/request.ts

@@ -230,7 +230,8 @@ export type ClientEvent =
   | 'contact'
   | 'message'
   | 'scan'
-  | 'verify-code';
+  | 'verify-code'
+  | 'room-leave';
 /**
  * 消息类型：1|文本 3|图片 34|语音 42|名片 43|视频 47|动态表情 48|地理位置 49|分享链接或附件 2001|红包 2002|小程序 2003|群邀请 10000|系统消息
  */
@@ -442,17 +443,17 @@ async function getImageInfo (imageUrl: string) {
 
     await fs.writeFile(finalFilePath, response.data)
 
-    // 4. 获取图片宽高
-    const dimensions = imageSize(finalFilePath)
-
-    // 5. 删除临时文件
-    await fs.unlink(finalFilePath)
-
-    return {
-      file_size: fileSize, // 文件大小（字节）
-      image_width: dimensions.width,
-      image_height: dimensions.height,
-      file_type: dimensions.type,
+    // 4. 获取图片宽高，确保临时文件始终被删除
+    try {
+      const dimensions = imageSize(finalFilePath)
+      return {
+        file_size: fileSize,
+        image_width: dimensions.width,
+        image_height: dimensions.height,
+        file_type: dimensions.type,
+      }
+    } finally {
+      await fs.unlink(finalFilePath).catch(() => undefined)
     }
   } catch (error) {
     console.error('获取图片信息错误:', error)
@@ -696,6 +697,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: 'room-leave', info: any): boolean;
   override emit(event: 'expired', info: boolean): boolean;
 
   override emit (event: ClientEvent, ...args: any[]): boolean {
@@ -721,11 +723,13 @@ class Client extends EventEmitter {
     this.lastInitSeqInfo = { contactSeq: 0, roomSeq: 0 }
   }
 
-  destroy () {
+  async destroy () {
     log.verbose(PRE, 'destroy()')
     this.hasEmitLogout = false
-    this.socket && this.socket.end()
-    this.socket = null
+    if (this.socket) {
+      await new Promise<void>(resolve => this.socket.end(false, undefined, resolve))
+      this.socket = null
+    }
     this.checkExpiredInterval && clearInterval(this.checkExpiredInterval)
     this.checkExpiredInterval = undefined
     this.heartbeatTimer && clearTimeout(this.heartbeatTimer)
@@ -768,7 +772,11 @@ class Client extends EventEmitter {
   }
 
   async initServer () {
-    await this.getTokenInfo()
+    const tokenValid = await this.getTokenInfo()
+    if (!tokenValid) {
+      log.error(PRE, 'initServer: token invalid or expired, abort')
+      return
+    }
     this.checkHasExpired()
     if (this.socket) {
       log.error('socket had already been opened!')
@@ -980,7 +988,6 @@ class Client extends EventEmitter {
         // this.emit('room-join', params)
         break
       case NotifyTypeEnum.RoomMemberDel:
-        // @ts-ignore
         this.emit('room-leave', {
           roomId: data.room_username,
           leaveIds: data.member_list.map((item: any) => item.username),
@@ -1067,6 +1074,10 @@ class Client extends EventEmitter {
       log.error('Token已到期，无法提供服务')
       return
     }
+    if (!this.tokenInfo) {
+      log.error(PRE, 'postData: tokenInfo is null, skip request')
+      return
+    }
     const config: any = {
       data: {
         guid: this.tokenInfo.guid,
@@ -1085,7 +1096,6 @@ class Client extends EventEmitter {
     if (res.data?.errcode === -102) {
       log.warn('request error: %s', res.data?.errmsg)
       if (res.data?.errmsg === 'bridge guid not exist') {
-        await this.setBridgeId('')
         return
       }
       if (!this.hasEmitLogout) {
@@ -1121,22 +1131,28 @@ class Client extends EventEmitter {
    * 获取微信运行状态
    */
   public async getStats (): Promise<StatsResult> {
-    const res = await this.postData({
-      path: '/client/get_client_status',
-      data: {},
-    })
-    // 0: stop, 1: running, 2: online
-    const { errcode, data } = res
-    if (!errcode) {
-      return {
-        status:
-          data.status === 1
-            ? Status.pending
-            : data.status === 2
-              ? Status.normal
-              : Status.offline,
+    try {
+      const res = await this.postData({
+        path: '/client/get_client_status',
+        data: {},
+      })
+      // 0: stop, 1: running, 2: online
+      if (!res) return { status: Status.fail }
+      const { errcode, data } = res
+      if (!errcode) {
+        return {
+          status:
+            data.status === 1
+              ? Status.pending
+              : data.status === 2
+                ? Status.normal
+                : Status.offline,
+        }
+      } else {
+        return { status: Status.fail }
       }
-    } else {
+    } catch (e) {
+      log.error(PRE, 'getStats(): %s', e)
       return { status: Status.fail }
     }
   }
@@ -1185,7 +1201,6 @@ class Client extends EventEmitter {
       }
       if (res.errcode === -11790 && res.errmsg.includes('timeout') && res.errmsg.includes('bridge')) {
         log.info(PRE, 'bridgeId 错误，请启动异地登录器后，重新配置bridgeId参数后重启服务，否则会出现异地登录提醒')
-        await this.setBridgeId('')
         return 'stop'
       }
       log.info(PRE, '请提供此报错信息,或者重启容器获取最新二维码: %s', JSON.stringify(res))
@@ -1292,46 +1307,6 @@ class Client extends EventEmitter {
     })
   }
 
-  public async setBridgeId (bridgeId?: string) {
-    try {
-      const res = await this.postData({
-        path: '/client/set_bridge',
-        data: {
-          bridge: bridgeId,
-        },
-      })
-      if (res.errcode === -1 && res.errmsg === 'bridge guid not exist') {
-        log.info(PRE, 'setBridgeId(%s): %s', bridgeId, 'bridge guid not exist')
-        void this.setBridgeId('')
-        return
-      }
-      log.info(PRE, 'setBridgeId(%s): %s', bridgeId, JSON.stringify(res))
-    } catch (e) {
-      log.error(PRE, 'setBridgeId(%s): %s', bridgeId, e)
-    }
-
-  }
-
-  public async setProxyEmpty () {
-    try {
-      const res = await this.postData({
-        path: '/client/set_proxy',
-        data: {
-          proxy: '',
-          is_long_proxy: false,
-        },
-      })
-      if (res.errcode === -1) {
-        log.info(PRE, 'setProxyEmpty(): %s', res.errmsg)
-        return
-      }
-      log.info(PRE, 'setProxyEmpty(): %s', JSON.stringify(res))
-    } catch (e) {
-      log.error(PRE, 'setProxyEmpty(): %s', e)
-    }
-
-  }
-
   /**
    * 获取当前bot信息
    */
@@ -1589,7 +1564,12 @@ class Client extends EventEmitter {
   /**
    * 同步联系人
    */
-  public async syncContact (init?: boolean): Promise<void> {
+  public async syncContact (init?: boolean, depth = 0): Promise<void> {
+    const maxDepth = 200
+    if (depth >= maxDepth) {
+      log.warn(PRE, 'syncContact: reached max recursion depth %d, stop', maxDepth)
+      return
+    }
     try {
       if (init) {
         this.lastInitSeqInfo = { contactSeq: 0, roomSeq: 0 }
@@ -1615,7 +1595,7 @@ class Client extends EventEmitter {
       }
 
       if (continueFlag) {
-        await this.syncContact()
+        await this.syncContact(undefined, depth + 1)
       }
     } catch (e) {
       log.error(PRE, 'syncContact(): %s', e)
@@ -1638,8 +1618,8 @@ class Client extends EventEmitter {
         },
       })
 
-      const totalPage = res.total_page || 1
-      const contactList: ContactPayload[] = res.contact_list
+      const totalPage = res?.total_page || 1
+      const contactList: ContactPayload[] = (res?.contact_list || [])
         .filter((item: any) => item.username)
         .map((contact: any) => {
           return {
@@ -1679,8 +1659,8 @@ class Client extends EventEmitter {
         },
       })
 
-      const totalPage = res.total_page || 1
-      const contactList: ContactPayload[] = res.contact_list
+      const totalPage = res?.total_page || 1
+      const contactList: ContactPayload[] = (res?.contact_list || [])
         .filter((item: any) => item.username)
         .map((contact: any) => {
           return {
@@ -1722,8 +1702,8 @@ class Client extends EventEmitter {
           page_size: pageSize,
         },
       })
-      const totalPage = res.total_page || 1
-      const groupList: ContactPayload[] = res.room_list
+      const totalPage = res?.total_page || 1
+      const groupList: ContactPayload[] = (res?.room_list || [])
         .filter((item: any) => item.username)
         .map((item: any) => {
           return {
@@ -1741,8 +1721,8 @@ class Client extends EventEmitter {
         this.emit('update-contacts', groupList)
       }
 
-      if (parseInt(page.toString()) < parseInt(totalPage.toString())) {
-        await this.getGroupList(parseInt(page.toString()) + 1, pageSize)
+      if (page < totalPage) {
+        await this.getGroupList(page + 1, pageSize)
       }
     } catch (e) {
       log.error(PRE, 'getGroupList(): %s', e)
@@ -1804,8 +1784,8 @@ class Client extends EventEmitter {
           page_size: pageSize,
         },
       })
-      const totalPage = res.total_page || 1
-      const officeList = res.contact_list
+      const totalPage = res?.total_page || 1
+      const officeList = (res?.contact_list || [])
         .filter((item: any) => item.username)
         .map((contact: any) => {
           return {
@@ -1920,6 +1900,26 @@ class Client extends EventEmitter {
     })
   }
 
+  private async retryDownload (fn: () => Promise<any>): Promise<any> {
+    const maxRetries = 5
+    const delayMs = 2000
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        const res = await fn()
+        if (res?.url) {
+          return res
+        }
+        log.warn(PRE, 'download attempt %d/%d failed (no url in response)', attempt, maxRetries)
+      } catch (e) {
+        log.warn(PRE, 'download attempt %d/%d error: %s', attempt, maxRetries, e)
+      }
+      if (attempt < maxRetries) {
+        await new Promise(resolve => setTimeout(resolve, delayMs))
+      }
+    }
+    return null
+  }
+
   public async downloadImage (imageInfo: ImageMessagePayload): Promise<any> {
     const params = {
       file_type: 2,
@@ -1928,16 +1928,12 @@ class Client extends EventEmitter {
       file_size: imageInfo.file_size,
       file_name: `/微信图片_${format(new Date(), 'yyyyMMddHHmmss')}.png`,
     }
-    const res = await this.postData({
-      path: '/cloud/cdn_download',
-      data: params,
-    })
-    if (res.url) {
+    const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download', data: params }))
+    if (res?.url) {
       return encodeURI(res.url) || ''
-    } else {
-      console.log('downloadImage error:', res, params)
-      return ''
     }
+    log.error(PRE, 'downloadImage failed after %d retries, params: %s', 5, JSON.stringify(params))
+    return ''
   }
 
   public async downloadWWMedia (imageInfo: ImageMessagePayload, type: number): Promise<any> {
@@ -1953,16 +1949,12 @@ class Client extends EventEmitter {
       file_name: typeNameMap[type],
       fast_download: false,
     }
-    const res = await this.postData({
-      path: '/cloud/cdn_download_wwfile',
-      data: params,
-    })
-    if (res.url) {
+    const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download_wwfile', data: params }))
+    if (res?.url) {
       return encodeURI(res.url) || ''
-    } else {
-      console.log('downloadWWMedia error:', res, params)
-      return ''
     }
+    log.error(PRE, 'downloadWWMedia failed after %d retries, params: %s', 5, JSON.stringify(params))
+    return ''
   }
 
   /**
@@ -1977,17 +1969,12 @@ class Client extends EventEmitter {
       file_size: imageInfo.file_size,
       file_name: '/' + sanitizeFilename(imageInfo.file_name),
     }
-    const res = await this.postData({
-      path: '/cloud/cdn_download',
-      data: params,
-    })
-
-    if (res.url) {
+    const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download', data: params }))
+    if (res?.url) {
       return encodeURI(res.url) || ''
-    } else {
-      console.log('downloadFile error:', res, params)
-      return ''
     }
+    log.error(PRE, 'downloadFile failed after %d retries, params: %s', 5, JSON.stringify(params))
+    return ''
   }
 
   /**
@@ -2006,17 +1993,12 @@ class Client extends EventEmitter {
       file_name: '/voice.mp3',
       to_mp3: true,
     }
-    const res = await this.postData({
-      path: '/cloud/download_voice',
-      data: params,
-    })
-
-    if (res.url) {
+    const res = await this.retryDownload(() => this.postData({ path: '/cloud/download_voice', data: params }))
+    if (res?.url) {
       return encodeURI(res.url) || ''
-    } else {
-      console.log('downloadAudio error:', res, params)
-      return ''
     }
+    log.error(PRE, 'downloadAudio failed after %d retries, params: %s', 5, JSON.stringify(params))
+    return ''
   }
 
   /**
@@ -2031,18 +2013,12 @@ class Client extends EventEmitter {
       file_size: videoInfo.file_size,
       file_name: `/微信视频_${format(new Date(), 'yyyyMMddHHmmss')}.mp4`,
     }
-
-    const res = await this.postData({
-      path: '/cloud/cdn_download',
-      data: params,
-    })
-
-    if (res.url) {
+    const res = await this.retryDownload(() => this.postData({ path: '/cloud/cdn_download', data: params }))
+    if (res?.url) {
       return encodeURI(res.url) || ''
-    } else {
-      console.log('downloadVideo error:', res, params)
-      return ''
     }
+    log.error(PRE, 'downloadVideo failed after %d retries, params: %s', 5, JSON.stringify(params))
+    return ''
   }
 
   /**
@@ -2118,7 +2094,7 @@ class Client extends EventEmitter {
       return {
         id: res?.newMsgId || '',
         timeStamp: res?.createTime || getUnixTime(new Date()),
-        msgType: WechatMessageType.Image,
+        msgType: WechatMessageType.Video,
         talkerId: selfId || '',
         text: url,
         msg: url,
@@ -2158,7 +2134,7 @@ class Client extends EventEmitter {
       return {
         id: res?.newMsgId || '',
         timeStamp: res?.createTime || '',
-        msgType: WechatMessageType.Image,
+        msgType: WechatMessageType.File,
         talkerId: selfId || '',
         text: url,
         msg: url,
@@ -2379,7 +2355,7 @@ class Client extends EventEmitter {
       data: {
         username: content,
         from_scene: 0,
-        search_scene: 0,
+        search_scene: 1,
       },
     })
 
@@ -2652,9 +2628,8 @@ class Client extends EventEmitter {
             const imageBaseInfo = await getImageInfo(image)
             imageInfo.push({ ...res, ...imageBaseInfo })
           }
-          xmlContent = genImageSnsXml(wxid, momentInfo.content, imageInfo, momentInfo.location)
-
         }
+        xmlContent = genImageSnsXml(wxid, momentInfo.content, imageInfo, momentInfo.location)
       } else if (momentInfo.videoUrl) {
         const mediaInfo: any = await this.uploadSnsVideo(momentInfo.videoUrl)
         if (mediaInfo) {

package/src/puppet-matrix.ts

@@ -41,7 +41,6 @@ const SEARCH_CONTACT_PREFIX = '$search$-'
 const STRANGER_SUFFIX = '@stranger'
 
 export type PuppetEngineOptions = PUPPET.PuppetOptions & {
-  proxyId?: string,
   token?: string,
   engine?: any
   maxGetQrcoderTimes: number
@@ -81,13 +80,6 @@ class PuppetMatrix extends PUPPET.Puppet {
         this.options.token = token
       }
     }
-
-    if (!this.options.proxyId) {
-      const proxyId = process.env['WECHATY_PUPPET_MATRIX_PROXYID'] || ''
-      if (proxyId) {
-        this.options.proxyId = proxyId
-      }
-    }
   }
 
   public get client () {
@@ -227,13 +219,9 @@ class PuppetMatrix extends PUPPET.Puppet {
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     if (info) {
       log.info(PRE, `login success: ${info.name}`)
-      this.options.proxyId = ''
       this._getQrcodeTimes = 0
-      await this._client?.setBridgeId('')
-      await this._client?.setProxyEmpty()
       await this.onLogin(info)
     } else {
-      await this._client?.setBridgeId(this.options.proxyId)
       if (this._qrcodeInterval) {
         clearInterval(this._qrcodeInterval)
         this._qrcodeInterval = null
@@ -256,8 +244,6 @@ class PuppetMatrix extends PUPPET.Puppet {
   private async _getQrcode () {
     const qrcode = await this._client?.getQrcode()
     if (qrcode === 'stop') {
-      this.options.proxyId = ''
-
       if (this._qrcodeInterval) {
         clearInterval(this._qrcodeInterval)
         this._qrcodeInterval = null