wx2tg-puppet 3.0.3 → 3.0.4

package/dist/api/LoginApi.d.ts

@@ -126,6 +126,8 @@ declare class LoginApi {
     LoginGetQRWinUwp(body: LoginGetQRReq): Promise<AxiosResponse<ApiResponse>>;
     /** 获取二维码(iPad-绕过验证码) */
     LoginGetQRx(body: LoginGetQRReq): Promise<AxiosResponse<ApiResponse>>;
+    /** 获取二维码(绕过验证码-推送确认) */
+    LoginGetQRNotCodePush(body: LoginGetQRReq): Promise<AxiosResponse<ApiResponse>>;
     /** 二次登录 */
     LoginTwiceAutoAuth(wxid: string): Promise<AxiosResponse<ApiResponse>>;
     /** 初始化 */

package/dist/api/LoginApi.js

@@ -163,6 +163,10 @@ class LoginApi {
     LoginGetQRx(body) {
         return axiosInstance_1.axiosInstance.post('/Login/LoginGetQRx', body);
     }
+    /** 获取二维码(绕过验证码-推送确认) */
+    LoginGetQRNotCodePush(body) {
+        return axiosInstance_1.axiosInstance.post('/Login/LoginGetQRNotCodePush', body);
+    }
     /** 二次登录 */
     LoginTwiceAutoAuth(wxid) {
         return axiosInstance_1.axiosInstance.post('/Login/LoginTwiceAutoAuth', null, { params: { wxid } });

package/dist/index.js

@@ -167,15 +167,25 @@ class WxBot extends events_1.EventEmitter {
                         });
                         break;
                     case 'ipadX':
-                        response = yield LoginApi_1.loginApi.LoginGetQRx({
-                            "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
-                            "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
-                            "Proxy": {
-                                "ProxyIp": this.ProxyIp || "",
-                                "ProxyPassword": this.ProxyPassword || "",
-                                "ProxyUser": this.ProxyUser || ""
-                            }
-                        });
+                        response = (0, axiosInstance_1.isNewProtocol)()
+                            ? yield LoginApi_1.loginApi.LoginGetQRNotCodePush({
+                                "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
+                                "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
+                                "Proxy": {
+                                    "ProxyIp": this.ProxyIp || "",
+                                    "ProxyPassword": this.ProxyPassword || "",
+                                    "ProxyUser": this.ProxyUser || ""
+                                }
+                            })
+                            : yield LoginApi_1.loginApi.LoginGetQRx({
+                                "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
+                                "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
+                                "Proxy": {
+                                    "ProxyIp": this.ProxyIp || "",
+                                    "ProxyPassword": this.ProxyPassword || "",
+                                    "ProxyUser": this.ProxyUser || ""
+                                }
+                            });
                         break;
                     case 'ipad':
                     default:
@@ -650,11 +660,12 @@ class WxBot extends events_1.EventEmitter {
     login() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.loggingIn) {
-                return; // Already logging in, prevent concurrent execution
+                return;
             }
             try {
                 this.loggingIn = true;
-                this.clearAllIntervals(); // 确保清理所有定时器
+                yield (0, axiosInstance_1.detectProtocolVersion)();
+                this.clearAllIntervals();
                 yield this.fetchAndShowQRCode();
                 this.interval = setInterval(() => {
                     this.checkLoginStatus();
@@ -671,7 +682,8 @@ class WxBot extends events_1.EventEmitter {
             try {
                 yield exports.AppDataSource.initialize();
                 console.log('Data Source has been initialized!');
-                this.clearAllIntervals(); // 确保清理所有定时器
+                yield (0, axiosInstance_1.detectProtocolVersion)();
+                this.clearAllIntervals();
                 const config = yield config_service_1.configService.get();
                 if (config && config.wxid) {
                     const resp = yield MsgApi_1.msgApi.Sync({

package/dist/utils/axiosInstance.d.ts

@@ -1,2 +1,8 @@
 export declare const axiosInstance: import("axios").AxiosInstance;
 export declare function setBaseUrl(baseUrl: string): void;
+/**
+ * 检测服务端协议版本
+ * @returns 是否为新协议
+ */
+export declare function detectProtocolVersion(): Promise<boolean>;
+export declare function isNewProtocol(): boolean;

package/dist/utils/axiosInstance.js

@@ -1,10 +1,21 @@
 "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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.axiosInstance = void 0;
 exports.setBaseUrl = setBaseUrl;
+exports.detectProtocolVersion = detectProtocolVersion;
+exports.isNewProtocol = isNewProtocol;
 const axios_1 = __importDefault(require("axios"));
 const json_bigint_1 = __importDefault(require("json-bigint"));
 const JSONbigString = (0, json_bigint_1.default)({
@@ -23,6 +34,37 @@ exports.axiosInstance = axios_1.default.create({
         }
     }
 });
+let protocolDetected = false;
+let newProtocol = false;
 function setBaseUrl(baseUrl) {
     exports.axiosInstance.defaults.baseURL = baseUrl;
+    protocolDetected = false;
+    newProtocol = false;
+}
+/**
+ * 检测服务端协议版本
+ * @returns 是否为新协议
+ */
+function detectProtocolVersion() {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
+        if (protocolDetected)
+            return newProtocol;
+        protocolDetected = true;
+        try {
+            const resp = yield exports.axiosInstance.get('/Tools/Version');
+            if (((_a = resp.data) === null || _a === void 0 ? void 0 : _a.Code) === 0 && ((_b = resp.data) === null || _b === void 0 ? void 0 : _b.Success) && ((_c = resp.data) === null || _c === void 0 ? void 0 : _c.Data)) {
+                newProtocol = true;
+                console.log(`检测到新协议版本: ${resp.data.Data}`);
+                return true;
+            }
+        }
+        catch (_d) {
+            // Version 接口不可用，使用旧协议
+        }
+        return false;
+    });
+}
+function isNewProtocol() {
+    return newProtocol;
 }

package/package.json

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