wx2tg-puppet 3.0.2 → 3.0.3

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

@@ -300,23 +300,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 +371,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);
             // 根据模式选择消息监听方式

package/package.json

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