wx2tg-puppet 2.0.6 → 2.0.8

package/dist/action/common.js

@@ -94,6 +94,9 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                 "Type": 1,
                 "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
             });
+            if (res.data.Code !== 0) {
+                throw new Error(`发送文本消息失败: ${res.data.Message}`);
+            }
             return new Message_1.ResponseMsg(res.data.Data.List[0]);
         }
         else if (content instanceof file_box_1.FileBox) { // filebox
@@ -113,20 +116,31 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                 default:
                     fileType = 'other';
             }
-            const base64 = yield content.toBase64();
             switch (fileType) {
                 case 'image':
                     // console.log('上传图片', base64)
-                    return MsgApi_1.msgApi.UploadImg({
+                    const base64 = yield content.toBase64();
+                    const imgRes = yield MsgApi_1.msgApi.UploadImg({
                         "Base64": base64,
                         "ToWxid": toWxid,
                         "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
                     });
+                    if (imgRes.data.Code !== 0) {
+                        throw new Error(`上传图片失败: ${imgRes.data.Message}`);
+                    }
+                    return imgRes;
                 case 'other':
-                    const res = yield ToolsApi_1.toolsApi.UploadFile({
-                        "base64": base64,
-                        "wxid": config === null || config === void 0 ? void 0 : config.wxid
-                    });
+                    // 直接从 FileBox 获取文件内容
+                    const fileBuffer = yield content.toBuffer();
+                    const fileBlob = new Blob([fileBuffer], { type: 'application/octet-stream' });
+                    // 创建 FormData
+                    const formData = new FormData();
+                    formData.append('wxid', (config === null || config === void 0 ? void 0 : config.wxid) || '');
+                    formData.append('file', fileBlob, fileName);
+                    const res = yield ToolsApi_1.toolsApi.UploadFileBinary(formData);
+                    if (res.data.Code !== 0) {
+                        throw new Error(`上传文件失败: ${res.data.Message}`);
+                    }
                     const size = res.data.Data.totalLen;
                     const mediaId = res.data.Data.mediaId;
                     if (!config)
@@ -137,7 +151,10 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                         "Wxid": config === null || config === void 0 ? void 0 : config.wxid,
                         "Xml": `<appmsg appid='wxeb7ec651dd0aefa9' sdkver=''><title>${fileName}</title><des></des><action></action><type>6</type><content></content><url></url><lowurl></lowurl><appattach><totallen>${size}</totallen><attachid>${mediaId}</attachid><fileext>${ext}</fileext></appattach><extinfo></extinfo></appmsg>`
                     });
-                    return new Message_1.ResponseMsg(res1.data.Data.List[0]);
+                    if (res1.data.Code !== 0) {
+                        throw new Error(`发送文件消息失败: ${res1.data.Message}`);
+                    }
+                    return new Message_1.ResponseMsg(res1.data.Data);
             }
         }
         // else if(content instanceof URLLINK){
@@ -165,6 +182,9 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                 "ToWxid": toWxid,
                 "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
             });
+            if (res.data.Code !== 0) {
+                throw new Error(`发送视频失败: ${res.data.Message}`);
+            }
             return new Message_1.ResponseMsg(res.data.Data.List[0]);
         }
         else if (content instanceof VOICE_1.Voice) {
@@ -175,6 +195,9 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                 "VoiceTime": content.voiceDuration,
                 "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
             });
+            if (res.data.Code !== 0) {
+                throw new Error(`发送语音失败: ${res.data.Message}`);
+            }
             return new Message_1.ResponseMsg(res.data.Data.List[0]);
         }
         //   }else if(content instanceof MiniApp){
@@ -203,6 +226,9 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                 "ToWxid": toWxid,
                 "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
             });
+            if (res.data.Code !== 0) {
+                throw new Error(`发送表情失败: ${res.data.Message}`);
+            }
             return new Message_1.ResponseMsg(res.data.Data.emojiItem[0]);
         }
         else {
@@ -211,6 +237,7 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
     }
     catch (e) {
         console.error(e);
+        throw e;
     }
 });
 exports.say = say;
@@ -226,19 +253,26 @@ const quote = (obj, toWxid) => __awaiter(void 0, void 0, void 0, function* () {
         "Wxid": config === null || config === void 0 ? void 0 : config.wxid,
         "Xml": msg
     });
+    if (res.data.Code !== 0) {
+        throw new Error(`发送引用消息失败: ${res.data.Message}`);
+    }
     return new Message_1.ResponseMsg(res.data.Data);
 });
 exports.quote = quote;
 // 撤回
 const revoke = (content) => __awaiter(void 0, void 0, void 0, function* () {
     const config = yield config_service_1.configService.get();
-    return MsgApi_1.msgApi.Revoke({
+    const res = yield MsgApi_1.msgApi.Revoke({
         "ClientMsgId": content.msgId,
         "CreateTime": content.createTime,
         "NewMsgId": content.newMsgId,
         "ToUserName": content.toWxid,
         "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
     });
+    if (res.data.Code !== 0) {
+        throw new Error(`撤回消息失败: ${res.data.Message}`);
+    }
+    return res;
 });
 exports.revoke = revoke;
 //   export const forward = async (content, contact, type) => {

package/dist/api/ToolsApi.d.ts

@@ -33,6 +33,8 @@ declare class ToolsApi {
     UpdateStepNumberApi(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 文件上传 */
     UploadFile(body: any): Promise<AxiosResponse<ApiResponse>>;
+    /** 二进制文件上传 */
+    UploadFileBinary(formData: FormData): Promise<AxiosResponse<ApiResponse>>;
     /** 设置/删除代理IP */
     setproxy(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** CDN图片下载 */

package/dist/api/ToolsApi.js

@@ -67,6 +67,14 @@ class ToolsApi {
     UploadFile(body) {
         return axiosInstance_1.axiosInstance.post('/Tools/UploadFile', body);
     }
+    /** 二进制文件上传 */
+    UploadFileBinary(formData) {
+        return axiosInstance_1.axiosInstance.post('/Tools/UploadFileBinary', formData, {
+            headers: {
+                'Content-Type': 'multipart/form-data',
+            },
+        });
+    }
     /** 设置/删除代理IP */
     setproxy(body) {
         return axiosInstance_1.axiosInstance.post('/Tools/setproxy', body);

package/dist/index.d.ts

@@ -23,6 +23,7 @@ export declare class WxBot extends EventEmitter {
     private heartbeatInterval;
     private msgInterval;
     private recentMsgIds;
+    private syncFailureCount;
     constructor({ baseUrl, databasePath, deviceType }: WxBotOptions);
     qrcode(style?: number): Promise<{
         qrCode: any;

package/dist/index.js

@@ -51,6 +51,7 @@ class WxBot extends events_1.EventEmitter {
         this.heartbeatInterval = null;
         this.msgInterval = null;
         this.recentMsgIds = []; // Store recent message IDs
+        this.syncFailureCount = 0; // Sync failure counter
         this.baseUrl = baseUrl;
         this.databasePath = databasePath;
         this.deviceType = deviceType;
@@ -250,6 +251,7 @@ class WxBot extends events_1.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             contact_service_1.contactService.clearRoom();
             this.clearAllIntervals(); // 确保清理所有定时器
+            this.syncFailureCount = 0; // 重置失败计数器
             // 保存联系人信息
             const res = yield FriendApi_1.friendApi.GetContractList({
                 "Wxid": userName,
@@ -297,6 +299,27 @@ class WxBot extends events_1.EventEmitter {
                     "Synckey": ""
                 });
                 const data = resp.data;
+                if (data.Code !== 0) {
+                    // Code不为0，增加失败计数
+                    this.syncFailureCount++;
+                    if (this.syncFailureCount >= 3) {
+                        // 连续失败3次，退出登录
+                        this.syncFailureCount = 0; // 重置计数器
+                        yield this.logOut();
+                        yield this.login();
+                        return;
+                    }
+                    // 失败次数不足3次，继续等待下次sync
+                    return;
+                }
+                if (data.Message === '用户可能退出') {
+                    // 用户可能退出，立即退出登录
+                    yield this.logOut();
+                    yield this.login();
+                    return;
+                }
+                // 成功情况，重置失败计数器
+                this.syncFailureCount = 0;
                 if (data.Success) {
                     if (data.Message === '当前未有新消息') {
                         return;
@@ -367,10 +390,6 @@ class WxBot extends events_1.EventEmitter {
                         }
                     }
                 }
-                else if (data.Message === '用户可能退出') {
-                    yield this.logOut();
-                    yield this.login();
-                }
             }), 1000);
             this.emit('login', userName);
         });
@@ -378,6 +397,7 @@ class WxBot extends events_1.EventEmitter {
     logOut() {
         return __awaiter(this, void 0, void 0, function* () {
             this.clearAllIntervals(); // 确保清理所有定时器
+            this.syncFailureCount = 0; // 重置失败计数器
             this.emit('logout');
         });
     }

package/dist/test.js

@@ -14,7 +14,7 @@ const _1 = require(".");
     const wxBot = new _1.WxBot({
         baseUrl: 'http://127.0.0.1:8059/api',
         databasePath: './database.sqlite',
-        deviceType: 'ipad'
+        deviceType: 'ipadX'
     });
     yield wxBot.start();
     wxBot.on('message', (message) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wx2tg-puppet",
-  "version": "2.0.6",
+  "version": "2.0.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [