wx2tg-puppet 3.0.7 → 3.0.8

package/dist/action/common.d.ts

@@ -1,4 +1,4 @@
 import { ResponseMsg } from "../core/Message";
 export declare const say: (content: any, toWxid: string, ats: any) => Promise<ResponseMsg | null | undefined>;
 export declare const quote: (obj: any, toWxid: string) => Promise<ResponseMsg | null>;
-export declare const revoke: (content: any) => Promise<import("axios").AxiosResponse<import("../types/ApiResponse").ApiResponse, any, {}>>;
+export declare const revoke: (content: any) => Promise<import("axios").AxiosResponse<import("../types/ApiResponse").ApiResponse, any>>;

package/dist/core/Message.d.ts

@@ -67,7 +67,7 @@ export declare class Message {
      * Get the room from the message. Returns null if not in a room.
      */
     room(): Promise<Room | null>;
-    static revoke(obj: any): Promise<Axios.AxiosResponse<import("../types/ApiResponse").ApiResponse, any, {}>>;
+    static revoke(obj: any): Promise<Axios.AxiosResponse<import("../types/ApiResponse").ApiResponse, any>>;
     static forwardTo(text: any, to: any, type: any): void;
     /**
      * Get the text content of the message.

package/dist/index.d.ts

@@ -38,6 +38,8 @@ export declare class WxBot extends EventEmitter {
     private httpServer;
     private loggingOut;
     private loggingIn;
+    private syncInProgress;
+    private loginRecoveryInProgress;
     constructor({ baseUrl, databasePath, deviceType, mode, callbackPort, ProxyIp, ProxyPassword, ProxyUser }: WxBotOptions);
     qrcode(style?: number): Promise<{
         qrCode: any;
@@ -59,8 +61,10 @@ export declare class WxBot extends EventEmitter {
     private handleCallbackMessage;
     private startPollingMode;
     private checkLoginAfterDelay;
+    private recoverLogin;
     private checkSyncLoginStatus;
     private handleMsg;
+    private handleMsgOnce;
     private logOut;
     /**
      * 清空登录信息

package/dist/index.js

@@ -86,6 +86,8 @@ class WxBot extends events_1.EventEmitter {
         this.httpServer = null; // HTTP回调服务器
         this.loggingOut = false; // Flag to prevent concurrent logOut calls
         this.loggingIn = false; // Flag to prevent concurrent login calls
+        this.syncInProgress = false; // Prevent overlapping message sync calls
+        this.loginRecoveryInProgress = false; // Allow only one login recovery flow
         this.baseUrl = baseUrl;
         this.databasePath = databasePath;
         this.deviceType = deviceType;
@@ -502,6 +504,27 @@ class WxBot extends events_1.EventEmitter {
             return true;
         });
     }
+    recoverLogin(userName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.loginRecoveryInProgress) {
+                return false;
+            }
+            this.loginRecoveryInProgress = true;
+            try {
+                yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                if (yield this.checkLoginAfterDelay(userName)) {
+                    this.syncFailureCount = 0;
+                    return true;
+                }
+                yield this.logOut();
+                yield this.login();
+                return false;
+            }
+            finally {
+                this.loginRecoveryInProgress = false;
+            }
+        });
+    }
     checkSyncLoginStatus(data, userName) {
         return __awaiter(this, void 0, void 0, function* () {
             if (data.Code !== 0) {
@@ -511,30 +534,13 @@ class WxBot extends events_1.EventEmitter {
                 if (this.syncFailureCount >= 10) {
                     // 连续失败10次，退出登录
                     this.syncFailureCount = 0; // 重置计数器
-                    // 先尝试二次登录
-                    yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                    // 等待60秒后再次检查
-                    if (yield this.checkLoginAfterDelay(userName)) {
-                        return true;
-                    }
-                    yield this.logOut();
-                    yield this.login();
-                    return false;
+                    return yield this.recoverLogin(userName);
                 }
                 // 失败次数不足3次，继续等待下次sync
                 return false;
             }
             if (data.Message === '用户可能退出') {
-                // 先尝试二次登录
-                yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                // 等待60秒后再次检查
-                if (yield this.checkLoginAfterDelay(userName)) {
-                    return true;
-                }
-                // 用户可能退出，立即退出登录
-                yield this.logOut();
-                yield this.login();
-                return false;
+                return yield this.recoverLogin(userName);
             }
             // 成功情况，重置失败计数器
             this.syncFailureCount = 0;
@@ -542,6 +548,20 @@ class WxBot extends events_1.EventEmitter {
         });
     }
     handleMsg(userName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.syncInProgress) {
+                return;
+            }
+            this.syncInProgress = true;
+            try {
+                yield this.handleMsgOnce(userName);
+            }
+            finally {
+                this.syncInProgress = false;
+            }
+        });
+    }
+    handleMsgOnce(userName) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const resp = yield MsgApi_1.msgApi.Sync({

package/package.json

@@ -1,42 +1,42 @@
-{
-  "name": "wx2tg-puppet",
-  "version": "3.0.7",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "start": "node dist/index.js",
-    "dev": "ts-node src/index.ts",
-    "test": "ts-node src/test.ts",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "wechat",
-    "bot",
-    "puppet"
-  ],
-  "author": "",
-  "license": "ISC",
-  "description": "微信机器人核心库，可作为依赖被其他项目引入。",
-  "devDependencies": {
-    "@types/json-bigint": "^1.0.4",
-    "@types/qrcode-terminal": "^0.12.2",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.8.3"
-  },
-  "dependencies": {
-    "axios": "^1.9.0",
-    "fast-xml-parser": "^5.2.3",
-    "file-box": "^1.4.15",
-    "json-bigint": "^1.0.0",
-    "qrcode-terminal": "^0.12.0",
-    "reflect-metadata": "^0.2.2",
-    "sqlite3": "^5.1.7",
-    "typeorm": "^0.3.23",
-    "wx-voice": "^0.2.1"
-  }
-}
+{
+  "name": "wx2tg-puppet",
+  "version": "3.0.8",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/index.js",
+    "dev": "ts-node src/index.ts",
+    "test": "ts-node src/test.ts",
+    "prepublishOnly": "npm run build"
+  },
+  "keywords": [
+    "wechat",
+    "bot",
+    "puppet"
+  ],
+  "author": "",
+  "license": "ISC",
+  "description": "微信机器人核心库，可作为依赖被其他项目引入。",
+  "devDependencies": {
+    "@types/json-bigint": "^1.0.4",
+    "@types/qrcode-terminal": "^0.12.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.3"
+  },
+  "dependencies": {
+    "axios": "^1.9.0",
+    "fast-xml-parser": "^5.2.3",
+    "file-box": "^1.4.15",
+    "json-bigint": "^1.0.0",
+    "qrcode-terminal": "^0.12.0",
+    "reflect-metadata": "^0.2.2",
+    "sqlite3": "^5.1.7",
+    "typeorm": "^0.3.23",
+    "wx-voice": "^0.2.1"
+  }
+}