wx2tg-puppet 3.0.2 → 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.d.ts

@@ -47,6 +47,13 @@ export declare class WxBot extends EventEmitter {
     private checkLoginStatus;
     info(): Promise<Contact | null>;
     private clearAllIntervals;
+    /**
+     * 递归获取所有联系人（支持分页）
+     * @param userName 微信ID
+     * @param currentWxSeq 当前微信联系人序列号
+     * @param currentChatroomSeq 当前群聊联系人序列号
+     */
+    private fetchAllContacts;
     private loginSuccess;
     private startCallbackServer;
     private handleCallbackMessage;

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:
@@ -300,23 +310,68 @@ class WxBot extends events_1.EventEmitter {
             this.httpServer = null;
         }
     }
+    /**
+     * 递归获取所有联系人（支持分页）
+     * @param userName 微信ID
+     * @param currentWxSeq 当前微信联系人序列号
+     * @param currentChatroomSeq 当前群聊联系人序列号
+     */
+    fetchAllContacts(userName_1) {
+        return __awaiter(this, arguments, void 0, function* (userName, currentWxSeq = 0, currentChatroomSeq = 0) {
+            try {
+                const res = yield FriendApi_1.friendApi.GetContractList({
+                    "Wxid": userName,
+                    "CurrentChatRoomContactSeq": currentChatroomSeq,
+                    "CurrentWxcontactSeq": currentWxSeq,
+                });
+                if (res.data.Message === '用户可能退出') {
+                    yield this.logOut();
+                    yield this.login();
+                    return;
+                }
+                const data = res.data;
+                if (!data.Success) {
+                    console.error('获取联系人列表失败:', data.Message);
+                    return;
+                }
+                // 处理当前批次的联系人
+                if (data.Data && data.Data.ContactUsernameList) {
+                    console.log(`获取到 ${data.Data.ContactUsernameList.length} 个联系人`);
+                    data.Data.ContactUsernameList.forEach((contact) => {
+                        if (!contact.endsWith('@chatroom')) {
+                            Contact_1.Contact.fetchAndUpsertContactDetail(userName, contact);
+                        }
+                        else {
+                            Room_1.Room.find({ id: contact });
+                        }
+                    });
+                }
+                // 检查是否还有更多联系人需要获取
+                // CountinueFlag 为 1 表示还有更多数据
+                if (data.Data && data.Data.CountinueFlag === 1) {
+                    const nextWxSeq = data.Data.CurrentWxcontactSeq || 0;
+                    const nextChatroomSeq = data.Data.CurrentChatRoomContactSeq || 0;
+                    console.log(`还有更多联系人，继续获取... (WxSeq: ${nextWxSeq}, ChatroomSeq: ${nextChatroomSeq})`);
+                    // 递归获取下一批联系人
+                    yield this.fetchAllContacts(userName, nextWxSeq, nextChatroomSeq);
+                }
+                else {
+                    console.log('联系人列表获取完成');
+                }
+            }
+            catch (error) {
+                console.error('获取联系人列表时发生错误:', error);
+            }
+        });
+    }
     loginSuccess(userName) {
         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,
-                "CurrentChatRoomContactSeq": 0,
-                "CurrentWxcontactSeq": 0,
-            });
-            if (res.data.Message === '用户可能退出') {
-                yield this.logOut();
-                yield this.login();
-                return;
-            }
-            console.log('好友列表获取成功，开始更新联系人信息');
+            // 分页获取所有联系人
+            yield this.fetchAllContacts(userName, 0, 0);
+            console.log('所有联系人获取完成');
             // 设置设备信息
             const cacheInfo = yield LoginApi_1.loginApi.GetCacheInfo(userName);
             if (cacheInfo.data.Message === '成功') {
@@ -326,16 +381,6 @@ class WxBot extends events_1.EventEmitter {
                     DeviceType: this.deviceType,
                 });
             }
-            // 获取详情
-            const data = res.data;
-            data.Data.ContactUsernameList.forEach((contact) => {
-                if (!contact.endsWith('@chatroom')) {
-                    Contact_1.Contact.fetchAndUpsertContactDetail(userName, contact);
-                }
-                else {
-                    Room_1.Room.find({ id: contact });
-                }
-            });
             // 设置心跳包
             this.setupHeartbeat(userName);
             // 根据模式选择消息监听方式
@@ -615,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();
@@ -636,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.2",
+  "version": "3.0.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [