wechaty-puppet-matrix 0.0.42 → 0.0.47

package/dist/esm/src/matrix/service/request.js

@@ -129,14 +129,18 @@ async function getImageInfo(imageUrl) {
         }
         const finalFilePath = path.join(tempFilePath, 'temp_image_' + Date.now() + path.extname(imageUrl));
         await fs.writeFile(finalFilePath, response.data);
-        const dimensions = imageSize(finalFilePath);
-        await fs.unlink(finalFilePath);
-        return {
-            file_size: fileSize,
-            image_width: dimensions.width,
-            image_height: dimensions.height,
-            file_type: dimensions.type,
-        };
+        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);
@@ -358,11 +362,13 @@ class Client extends EventEmitter {
         this.hasExpired = false;
         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(resolve => this.socket.end(false, undefined, resolve));
+            this.socket = null;
+        }
         this.checkExpiredInterval && clearInterval(this.checkExpiredInterval);
         this.checkExpiredInterval = undefined;
         this.heartbeatTimer && clearTimeout(this.heartbeatTimer);
@@ -404,7 +410,11 @@ class Client extends EventEmitter {
         }, 1000 * 60 * 60 * 12);
     }
     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!');
@@ -517,6 +527,10 @@ class Client extends EventEmitter {
                 });
                 break;
             case NotifyTypeEnum.NewMsg:
+                if (data.create_time < Math.floor(Date.now() / 1000) - 60) {
+                    log.warn('消息时间超过60秒，可能是重复消息，已忽略', data);
+                    return;
+                }
                 if (data.is_chatroom_msg) {
                     atWxidList = await getAtWxidList(data.source);
                 }
@@ -635,6 +649,10 @@ class Client extends EventEmitter {
             log.error('Token已到期，无法提供服务');
             return;
         }
+        if (!this.tokenInfo) {
+            log.error(PRE, 'postData: tokenInfo is null, skip request');
+            return;
+        }
         const config = {
             data: {
                 guid: this.tokenInfo.guid,
@@ -677,21 +695,29 @@ class Client extends EventEmitter {
         log.info(PRE, 'restore() res: %s', res);
     }
     async getStats() {
-        const res = await this.postData({
-            path: '/client/get_client_status',
-            data: {},
-        });
-        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: {},
+            });
+            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 };
         }
     }
@@ -818,7 +844,11 @@ class Client extends EventEmitter {
                 },
             });
             if (res.errcode === -1 && res.errmsg === 'bridge guid not exist') {
-                log.info(PRE, 'setBridgeId(%s): %s', bridgeId, 'bridge guid not exist');
+                if (bridgeId === '') {
+                    log.warn(PRE, 'setBridgeId: empty bridgeId still invalid, skip retry to avoid infinite recursion');
+                    return;
+                }
+                log.info(PRE, 'setBridgeId(%s): %s', bridgeId, 'bridge guid not exist, retrying with empty bridgeId');
                 void this.setBridgeId('');
                 return;
             }
@@ -1080,7 +1110,12 @@ class Client extends EventEmitter {
             };
         }
     }
-    async syncContact(init) {
+    async syncContact(init, depth = 0) {
+        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 };
@@ -1102,7 +1137,7 @@ class Client extends EventEmitter {
                 this.emit('update-contacts', contactsInfo || []);
             }
             if (continueFlag) {
-                await this.syncContact();
+                await this.syncContact(undefined, depth + 1);
             }
         }
         catch (e) {
@@ -1118,8 +1153,8 @@ class Client extends EventEmitter {
                     page_size: pageSize,
                 },
             });
-            const totalPage = res.total_page || 1;
-            const contactList = res.contact_list
+            const totalPage = res?.total_page || 1;
+            const contactList = (res?.contact_list || [])
                 .filter((item) => item.username)
                 .map((contact) => {
                 return {
@@ -1154,8 +1189,8 @@ class Client extends EventEmitter {
                     page_size: pageSize,
                 },
             });
-            const totalPage = res.total_page || 1;
-            const contactList = res.contact_list
+            const totalPage = res?.total_page || 1;
+            const contactList = (res?.contact_list || [])
                 .filter((item) => item.username)
                 .map((contact) => {
                 return {
@@ -1190,8 +1225,8 @@ class Client extends EventEmitter {
                     page_size: pageSize,
                 },
             });
-            const totalPage = res.total_page || 1;
-            const groupList = res.room_list
+            const totalPage = res?.total_page || 1;
+            const groupList = (res?.room_list || [])
                 .filter((item) => item.username)
                 .map((item) => {
                 return {
@@ -1207,8 +1242,8 @@ class Client extends EventEmitter {
             if (groupList.length > 0) {
                 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) {
@@ -1262,8 +1297,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) => item.username)
                 .map((contact) => {
                 return {
@@ -1346,6 +1381,26 @@ class Client extends EventEmitter {
             },
         });
     }
+    async retryDownload(fn) {
+        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;
+    }
     async downloadImage(imageInfo) {
         const params = {
             file_type: 2,
@@ -1354,17 +1409,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 '';
     }
     async downloadWWMedia(imageInfo, type) {
         const typeNameMap = {
@@ -1379,17 +1429,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 '';
     }
     async downloadFile(imageInfo) {
         const params = {
@@ -1399,17 +1444,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 '';
     }
     async downloadAudio(msgId, voiceInfo, roomId) {
         const params = {
@@ -1419,17 +1459,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 '';
     }
     async downloadVideo(videoInfo) {
         const params = {
@@ -1439,17 +1474,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 '';
     }
     async sendUrlImg(contactId, url, selfId) {
         try {
@@ -1505,7 +1535,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,
@@ -1536,7 +1566,7 @@ class Client extends EventEmitter {
             return {
                 id: res?.newMsgId || '',
                 timeStamp: res?.createTime || '',
-                msgType: WechatMessageType.Image,
+                msgType: WechatMessageType.File,
                 talkerId: selfId || '',
                 text: url,
                 msg: url,
@@ -1859,8 +1889,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 = await this.uploadSnsVideo(momentInfo.videoUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.42",
+  "version": "0.0.47",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",
@@ -41,7 +41,6 @@
   ],
   "devDependencies": {
     "@chatie/eslint-config": "^1.0.4",
-    "@chatie/git-scripts": "^0.6.2",
     "@chatie/semver": "^0.4.7",
     "@grpc/grpc-js": "1.9.14",
     "@juzi/wechaty": "^1.0.104",
@@ -94,10 +93,5 @@
     "bin/",
     "dist/",
     "src/"
-  ],
-  "git": {
-    "scripts": {
-      "pre-push": "npx git-scripts-pre-push"
-    }
-  }
+  ]
 }