wx2tg-puppet 2.1.2 → 2.1.4

package/dist/action/common.js

@@ -220,9 +220,9 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
         //   }
         else if (content instanceof EMOJI_1.Emoji) {
             const res = yield MsgApi_1.msgApi.SendEmoji({
-                "Md5": content.emojiMd5,
-                "TotalLen": content.emojiSize,
-                "Base64": content.emojiBase64,
+                "Md5": content.emojiMd5 || null,
+                "TotalLen": content.emojiSize || null,
+                "Base64": content.emojiBase64 || null,
                 "ToWxid": toWxid,
                 "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
             });

package/dist/index.d.ts

@@ -43,6 +43,8 @@ export declare class WxBot extends EventEmitter {
     private startCallbackServer;
     private handleCallbackMessage;
     private startPollingMode;
+    private checkLoginAfterDelay;
+    private checkSyncLoginStatus;
     private handleMsg;
     private logOut;
     /**

package/dist/index.js

@@ -344,37 +344,9 @@ class WxBot extends events_1.EventEmitter {
                         "Scene": 0,
                         "Synckey": ""
                     });
-                    if (resp.data.Code !== 0) {
-                        // Code不为0，增加失败计数
-                        this.syncFailureCount++;
-                        if (this.syncFailureCount >= 10) {
-                            // 连续失败10次，退出登录
-                            this.syncFailureCount = 0; // 重置计数器
-                            // 先尝试二次登录
-                            const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                            if (loginTwice.data.Message === '登录成功') {
-                                return;
-                            }
-                            yield this.logOut();
-                            yield this.login();
-                            return;
-                        }
-                        // 失败次数不足3次，继续等待下次sync
-                        return;
-                    }
-                    if (resp.data.Message === '用户可能退出') {
-                        // 先尝试二次登录
-                        const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                        if (loginTwice.data.Message === '登录成功') {
-                            return;
-                        }
-                        // 用户可能退出，立即退出登录
-                        yield this.logOut();
-                        yield this.login();
+                    if (!(yield this.checkSyncLoginStatus(resp.data, userName))) {
                         return;
                     }
-                    // 成功情况，重置失败计数器
-                    this.syncFailureCount = 0;
                     if (resp.data.Success) {
                         if (resp.data.Message === '当前未有新消息') {
                             break;
@@ -463,15 +435,27 @@ class WxBot extends events_1.EventEmitter {
         }), 1000);
         this.emit('login', userName);
     }
-    handleMsg(userName) {
+    checkLoginAfterDelay(userName) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            // 等待20秒
+            yield new Promise(resolve => setTimeout(resolve, 20000));
+            // 再次检查登录状态
             const resp = yield MsgApi_1.msgApi.Sync({
                 "Wxid": userName,
                 "Scene": 0,
                 "Synckey": ""
             });
-            const data = resp.data;
+            if (resp.data.Code !== 0) {
+                return false;
+            }
+            if (resp.data.Message === '用户可能退出') {
+                return false;
+            }
+            return true;
+        });
+    }
+    checkSyncLoginStatus(data, userName) {
+        return __awaiter(this, void 0, void 0, function* () {
             if (data.Code !== 0) {
                 // Code不为0，增加失败计数
                 this.syncFailureCount++;
@@ -479,30 +463,47 @@ class WxBot extends events_1.EventEmitter {
                     // 连续失败10次，退出登录
                     this.syncFailureCount = 0; // 重置计数器
                     // 先尝试二次登录
-                    const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                    if (loginTwice.data.Message === '登录成功') {
-                        return;
+                    yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                    // 等待20秒后再次检查
+                    if (yield this.checkLoginAfterDelay(userName)) {
+                        return true;
                     }
                     yield this.logOut();
                     yield this.login();
-                    return;
+                    return false;
                 }
                 // 失败次数不足3次，继续等待下次sync
-                return;
+                return false;
             }
             if (data.Message === '用户可能退出') {
                 // 先尝试二次登录
-                const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                if (loginTwice.data.Message === '登录成功') {
-                    return;
+                yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                // 等待20秒后再次检查
+                if (yield this.checkLoginAfterDelay(userName)) {
+                    return true;
                 }
                 // 用户可能退出，立即退出登录
                 yield this.logOut();
                 yield this.login();
-                return;
+                return false;
             }
             // 成功情况，重置失败计数器
             this.syncFailureCount = 0;
+            return true;
+        });
+    }
+    handleMsg(userName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const resp = yield MsgApi_1.msgApi.Sync({
+                "Wxid": userName,
+                "Scene": 0,
+                "Synckey": ""
+            });
+            const data = resp.data;
+            if (!(yield this.checkSyncLoginStatus(data, userName))) {
+                return;
+            }
             if (data.Success) {
                 if (data.Message === '当前未有新消息') {
                     return;

package/package.json

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

package/dist/test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/test.js

@@ -1,51 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = require(".");
-(() => __awaiter(void 0, void 0, void 0, function* () {
-    const wxBot = new _1.WxBot({
-        baseUrl: 'http://192.168.56.101:8088/api',
-        databasePath: './database.sqlite',
-        deviceType: 'ipad',
-        mode: 'polling',
-        callbackPort: 8056
-    });
-    yield wxBot.start();
-    wxBot.on('message', (message) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log(yield message.mentionSelf());
-        console.log('收到消息', message.text());
-        console.log('消息类型', message.type());
-        if (message.type() === 'image') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'video') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'voice') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'file') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'emoji') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        // const room = await message.room()
-        // if(room){
-        //   await room.say('你好','@all')
-        // }
-    }));
-}))();

package/dist/type/MessageType.d.ts

@@ -1,29 +0,0 @@
-export declare const MessageType: {
-    Unknown: string;
-    FileStart: string;
-    File: string;
-    Voice: string;
-    Contact: string;
-    Emoji: string;
-    Image: string;
-    Text: string;
-    Video: string;
-    Url: string;
-    RoomInvitation: string;
-    MiniApp: string;
-    AppMsg: string;
-    Link: string;
-    AddFriend: string;
-    Quote: string;
-    Transfer: string;
-    RedPacket: string;
-    VideoAccount: string;
-    Revoke: string;
-    Pat: string;
-    Location: string;
-    FunctionMsg: string;
-    NewMonmentTimeline: string;
-    ChatHistroy: string;
-    Voip: string;
-    RealTimeLocation: string;
-};

package/dist/type/MessageType.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageType = void 0;
-exports.MessageType = {
-    Unknown: 'unknown', // 未知类型
-    FileStart: 'file_start', // 文件开始
-    File: 'file', // 文件发送结束
-    Voice: 'voice', // 语音
-    Contact: 'contact', // 名片
-    Emoji: 'emoji', // 表情
-    Image: 'image', // 图片
-    Text: 'text', // 文本
-    Video: 'video', // 视频
-    Url: 'link', // 链接
-    RoomInvitation: 'room_invitation', // 群邀请
-    MiniApp: 'mini_app', // 小程序消息
-    AppMsg: 'app_msg', // app消息
-    Link: 'link', // 公众号链接
-    AddFriend: 'add_friend', // 添加好友通知
-    Quote: 'quote', // 引用消息
-    Transfer: 'transfer', //转账
-    RedPacket: 'red_packet', //红包
-    VideoAccount: 'video_account', // 视频号消息
-    Revoke: 'revoke', // 撤回消息
-    Pat: 'pat', // 拍一拍
-    Location: 'location', // 位置消息
-    FunctionMsg: 'function_msg', // 微信团队消息
-    NewMonmentTimeline: 'new_monment_timeline', // 朋友圈更新
-    ChatHistroy: 'chat_histroy', // 聊天记录
-    Voip: 'voip', // voip消息
-    RealTimeLocation: 'real_time_location', // 实时位置共享
-};