wx2tg-puppet 2.2.1 → 2.2.3

package/dist/index.d.ts

@@ -36,6 +36,8 @@ export declare class WxBot extends EventEmitter {
     private recentMsgIds;
     private syncFailureCount;
     private httpServer;
+    private loggingOut;
+    private loggingIn;
     constructor({ baseUrl, databasePath, deviceType, mode, callbackPort, ProxyIp, ProxyPassword, ProxyUser }: WxBotOptions);
     qrcode(style?: number): Promise<{
         qrCode: any;

package/dist/index.js

@@ -41,9 +41,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UrlLink = exports.WeVideo = exports.Voice = exports.Emoji = exports.Message = exports.Room = exports.Contact = exports.WxBot = exports.AppDataSource = void 0;
 require("reflect-metadata");
@@ -52,7 +49,6 @@ const data_source_1 = require("./database/data-source");
 const LoginApi_1 = require("./api/LoginApi");
 const MsgApi_1 = require("./api/MsgApi");
 const FriendApi_1 = require("./api/FriendApi");
-const qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 const config_service_1 = require("./services/config.service");
 const events_1 = require("events");
 const Message_1 = require("./core/Message");
@@ -88,6 +84,8 @@ class WxBot extends events_1.EventEmitter {
         this.recentMsgIds = []; // Store recent message IDs
         this.syncFailureCount = 0; // Sync failure counter
         this.httpServer = null; // HTTP回调服务器
+        this.loggingOut = false; // Flag to prevent concurrent logOut calls
+        this.loggingIn = false; // Flag to prevent concurrent login calls
         this.baseUrl = baseUrl;
         this.databasePath = databasePath;
         this.deviceType = deviceType;
@@ -197,8 +195,6 @@ class WxBot extends events_1.EventEmitter {
                 const match = data.Data.QrUrl.match(/[?&]data=([^&]+)/);
                 if (match && match[1]) {
                     const qrLink = decodeURIComponent(match[1]);
-                    console.log('二维码内容链接:', qrLink);
-                    qrcode_terminal_1.default.generate(qrLink, { small: true });
                     this.emit('scan', {
                         content: qrLink
                     });
@@ -242,7 +238,6 @@ class WxBot extends events_1.EventEmitter {
                     return;
                 }
                 const statusResp = yield LoginApi_1.loginApi.LoginCheckQR(this.uuid);
-                console.log('CheckQR response:', statusResp.data);
                 const statusData = statusResp.data;
                 if (statusData.Success) {
                     if (statusData.Message === '登录成功') {
@@ -256,9 +251,14 @@ class WxBot extends events_1.EventEmitter {
                     }
                 }
                 else if (statusData.Message.includes('数据不存在') || statusData.Message.includes('未知的错误')) {
-                    console.log('二维码已失效，正在获取新的二维码...');
                     yield this.fetchAndShowQRCode();
                 }
+                else if (statusData.Message.includes('请提交验证码后登录')) {
+                    yield this.login();
+                    this.emit('loginFail', {
+                        msg: statusData.Message
+                    });
+                }
                 else {
                     console.log('登录失败:', (_a = statusData.Data.baseResponse) === null || _a === void 0 ? void 0 : _a.errMsg);
                 }
@@ -441,7 +441,7 @@ class WxBot extends events_1.EventEmitter {
     checkLoginAfterDelay(userName) {
         return __awaiter(this, void 0, void 0, function* () {
             // 等待20秒
-            yield new Promise(resolve => setTimeout(resolve, 20000));
+            yield new Promise(resolve => setTimeout(resolve, 60000));
             // 再次检查登录状态
             const resp = yield MsgApi_1.msgApi.Sync({
                 "Wxid": userName,
@@ -467,7 +467,7 @@ class WxBot extends events_1.EventEmitter {
                     this.syncFailureCount = 0; // 重置计数器
                     // 先尝试二次登录
                     yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                    // 等待20秒后再次检查
+                    // 等待60秒后再次检查
                     if (yield this.checkLoginAfterDelay(userName)) {
                         return true;
                     }
@@ -481,7 +481,7 @@ class WxBot extends events_1.EventEmitter {
             if (data.Message === '用户可能退出') {
                 // 先尝试二次登录
                 yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
-                // 等待20秒后再次检查
+                // 等待60秒后再次检查
                 if (yield this.checkLoginAfterDelay(userName)) {
                     return true;
                 }
@@ -581,9 +581,18 @@ class WxBot extends events_1.EventEmitter {
     }
     logOut() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.clearAllIntervals(); // 确保清理所有定时器
-            this.syncFailureCount = 0; // 重置失败计数器
-            this.emit('logout');
+            if (this.loggingOut) {
+                return; // Already logging out, prevent concurrent execution
+            }
+            try {
+                this.loggingOut = true;
+                this.clearAllIntervals(); // 确保清理所有定时器
+                this.syncFailureCount = 0; // 重置失败计数器
+                this.emit('logout');
+            }
+            finally {
+                this.loggingOut = false;
+            }
         });
     }
     /**
@@ -604,11 +613,20 @@ class WxBot extends events_1.EventEmitter {
     }
     login() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.clearAllIntervals(); // 确保清理所有定时器
-            yield this.fetchAndShowQRCode();
-            this.interval = setInterval(() => {
-                this.checkLoginStatus();
-            }, 2000);
+            if (this.loggingIn) {
+                return; // Already logging in, prevent concurrent execution
+            }
+            try {
+                this.loggingIn = true;
+                this.clearAllIntervals(); // 确保清理所有定时器
+                yield this.fetchAndShowQRCode();
+                this.interval = setInterval(() => {
+                    this.checkLoginStatus();
+                }, 2000);
+            }
+            finally {
+                this.loggingIn = false;
+            }
         });
     }
     start() {

package/package.json

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