wx2tg-puppet 2.0.9 → 2.1.1

package/dist/core/Room.js

@@ -56,7 +56,7 @@ class Room {
      */
     static fetchAndUpsertRoomDetail(chatroomId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const config = yield config_service_1.configService.get();
             if (!config)
                 return null;
@@ -80,7 +80,7 @@ class Room {
                 chatRoomNotify: (_j = respData.ChatRoomNotify) !== null && _j !== void 0 ? _j : 0,
                 chatRoomOwner: respData.ChatRoomOwner || '',
                 smallHeadImgUrl: respData.SmallHeadImgUrl || '',
-                memberList: JSON.stringify(((_k = respData.NewChatroomData) === null || _k === void 0 ? void 0 : _k.ChatRoomMember.map((item) => item.UserName)) || [])
+                memberList: JSON.stringify(((_l = (_k = respData.NewChatroomData) === null || _k === void 0 ? void 0 : _k.ChatRoomMember) === null || _l === void 0 ? void 0 : _l.map((item) => item.UserName)) || [])
             };
             yield room_service_1.roomService.upsertByChatroomId(roomEntity.chatroomId, roomEntity);
             return roomEntity;

package/dist/index.d.ts

@@ -13,18 +13,24 @@ export interface WxBotOptions {
     baseUrl: string;
     databasePath: string;
     deviceType: 'ipad' | 'car' | 'mac' | 'pad' | 'win' | 'ipadX' | string;
+    mode?: 'polling' | 'callback' | string;
+    callbackPort?: number;
 }
 export declare class WxBot extends EventEmitter {
     baseUrl: string;
     databasePath: string;
     deviceType: 'ipad' | 'car' | 'mac' | 'pad' | 'win' | 'ipadX' | string;
+    mode: 'polling' | 'callback' | string;
+    callbackPort: number;
     private uuid;
     private interval;
     private heartbeatInterval;
+    private callbackInterval;
     private msgInterval;
     private recentMsgIds;
     private syncFailureCount;
-    constructor({ baseUrl, databasePath, deviceType }: WxBotOptions);
+    private httpServer;
+    constructor({ baseUrl, databasePath, deviceType, mode, callbackPort }: WxBotOptions);
     qrcode(style?: number): Promise<{
         qrCode: any;
     } | null>;
@@ -34,6 +40,10 @@ export declare class WxBot extends EventEmitter {
     info(): Promise<Contact | null>;
     private clearAllIntervals;
     private loginSuccess;
+    private startCallbackServer;
+    private handleCallbackMessage;
+    private startPollingMode;
+    private handleMsg;
     private logOut;
     /**
      * 清空登录信息

package/dist/index.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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) {
@@ -43,18 +76,23 @@ const UserApi_1 = require("./api/UserApi");
 const ContactEntity_1 = require("./entities/ContactEntity");
 const room_service_1 = require("./services/room.service");
 const message_service_1 = require("./services/message.service");
+const http = __importStar(require("http"));
 class WxBot extends events_1.EventEmitter {
-    constructor({ baseUrl, databasePath, deviceType = 'ipad' }) {
+    constructor({ baseUrl, databasePath, deviceType = 'ipad', mode = 'polling', callbackPort = 8056 }) {
         super();
         this.uuid = '';
         this.interval = null;
         this.heartbeatInterval = null;
+        this.callbackInterval = null;
         this.msgInterval = null;
         this.recentMsgIds = []; // Store recent message IDs
         this.syncFailureCount = 0; // Sync failure counter
+        this.httpServer = null; // HTTP回调服务器
         this.baseUrl = baseUrl;
         this.databasePath = databasePath;
         this.deviceType = deviceType;
+        this.mode = mode;
+        this.callbackPort = callbackPort;
         (0, axiosInstance_1.setBaseUrl)(baseUrl);
     }
     qrcode(style) {
@@ -196,6 +234,10 @@ class WxBot extends events_1.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             try {
+                if (!this.uuid) {
+                    yield this.fetchAndShowQRCode();
+                    return;
+                }
                 const statusResp = yield LoginApi_1.loginApi.LoginCheckQR(this.uuid);
                 console.log('CheckQR response:', statusResp.data);
                 const statusData = statusResp.data;
@@ -246,6 +288,14 @@ class WxBot extends events_1.EventEmitter {
             clearInterval(this.msgInterval);
             this.msgInterval = null;
         }
+        if (this.callbackInterval) {
+            clearInterval(this.callbackInterval);
+            this.callbackInterval = null;
+        }
+        if (this.httpServer) {
+            this.httpServer.close();
+            this.httpServer = null;
+        }
     }
     loginSuccess(userName) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -285,113 +335,244 @@ class WxBot extends events_1.EventEmitter {
             });
             // 设置心跳包
             this.setupHeartbeat(userName);
-            // 防止重复定时
-            if (this.msgInterval) {
-                clearInterval(this.msgInterval);
-                this.msgInterval = null;
-            }
-            // 监听消息，每秒掉一次
-            this.msgInterval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                const resp = yield MsgApi_1.msgApi.Sync({
-                    "Wxid": userName,
-                    "Scene": 0,
-                    "Synckey": ""
-                });
-                const data = resp.data;
-                if (data.Code !== 0) {
-                    // Code不为0，增加失败计数
-                    this.syncFailureCount++;
-                    if (this.syncFailureCount >= 3) {
-                        // 连续失败3次，退出登录
-                        this.syncFailureCount = 0; // 重置计数器
+            // 根据模式选择消息监听方式
+            if (this.mode === 'callback') {
+                // 循环调用至无新消息
+                while (true) {
+                    const resp = yield MsgApi_1.msgApi.Sync({
+                        "Wxid": userName,
+                        "Scene": 0,
+                        "Synckey": ""
+                    });
+                    if (resp.data.Code !== 0) {
+                        // Code不为0，增加失败计数
+                        this.syncFailureCount++;
+                        if (this.syncFailureCount >= 10) {
+                            // 连续失败10次，退出登录
+                            this.syncFailureCount = 0; // 重置计数器
+                            // 先尝试二次登录
+                            const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                            if (loginTwice.data.Message === '登录成功') {
+                                return;
+                            }
+                            yield this.logOut();
+                            yield this.login();
+                            return;
+                        }
+                        // 失败次数不足3次，继续等待下次sync
+                        return;
+                    }
+                    if (resp.data.Message === '用户可能退出') {
+                        // 先尝试二次登录
+                        const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                        if (loginTwice.data.Message === '登录成功') {
+                            return;
+                        }
+                        // 用户可能退出，立即退出登录
                         yield this.logOut();
                         yield this.login();
                         return;
                     }
-                    // 失败次数不足3次，继续等待下次sync
-                    return;
+                    // 成功情况，重置失败计数器
+                    this.syncFailureCount = 0;
+                    if (resp.data.Success) {
+                        if (resp.data.Message === '当前未有新消息') {
+                            break;
+                        }
+                    }
                 }
-                if (data.Message === '用户可能退出') {
-                    // 用户可能退出，立即退出登录
+                this.callbackInterval = setInterval(() => {
+                    this.handleCallbackMessage(userName);
+                }, 1000 * 60 * 5);
+                this.startCallbackServer(userName);
+            }
+            else {
+                this.startPollingMode(userName);
+            }
+        });
+    }
+    startCallbackServer(userName) {
+        if (this.httpServer) {
+            this.httpServer.close();
+            this.httpServer = null;
+        }
+        this.httpServer = http.createServer((req, res) => {
+            // 设置CORS头
+            res.setHeader('Access-Control-Allow-Origin', '*');
+            res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+            res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
+            if (req.method === 'OPTIONS') {
+                res.writeHead(200);
+                res.end();
+                return;
+            }
+            const url = req.url || '';
+            const callbackPattern = `/message/callback/${userName}`;
+            if (req.method === 'POST' && url === callbackPattern) {
+                let body = '';
+                let chunks = [];
+                req.on('data', (chunk) => {
+                    chunks.push(chunk);
+                    body += chunk.toString('utf8');
+                });
+                req.on('end', () => {
+                    try {
+                        this.handleCallbackMessage(userName);
+                        res.writeHead(200, { 'Content-Type': 'application/json' });
+                        res.end(JSON.stringify({ success: true }));
+                    }
+                    catch (error) {
+                        console.error('JSON解析错误:', error);
+                        console.error('原始内容:', body);
+                        res.writeHead(400, { 'Content-Type': 'application/json' });
+                        res.end(JSON.stringify({ error: 'Invalid JSON', body: body }));
+                    }
+                });
+                req.on('error', (error) => {
+                    console.error('请求处理错误:', error);
+                    res.writeHead(500, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ error: 'Request error' }));
+                });
+            }
+            else {
+                res.writeHead(404, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ error: 'Not Found' }));
+            }
+        });
+        this.httpServer.listen(this.callbackPort, '0.0.0.0', () => {
+            console.log(`回调服务器启动成功，监听地址: http://0.0.0.0:${this.callbackPort}${`/message/callback/${userName}`}`);
+        });
+        this.httpServer.on('error', (error) => {
+            console.error('回调服务器启动失败:', error);
+        });
+    }
+    handleCallbackMessage(userName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.handleMsg(userName);
+        });
+    }
+    startPollingMode(userName) {
+        // 防止重复定时
+        if (this.msgInterval) {
+            clearInterval(this.msgInterval);
+            this.msgInterval = null;
+        }
+        // 监听消息，每秒掉一次
+        this.msgInterval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+            yield this.handleMsg(userName);
+        }), 1000);
+        this.emit('login', userName);
+    }
+    handleMsg(userName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const resp = yield MsgApi_1.msgApi.Sync({
+                "Wxid": userName,
+                "Scene": 0,
+                "Synckey": ""
+            });
+            const data = resp.data;
+            if (data.Code !== 0) {
+                // Code不为0，增加失败计数
+                this.syncFailureCount++;
+                if (this.syncFailureCount >= 10) {
+                    // 连续失败10次，退出登录
+                    this.syncFailureCount = 0; // 重置计数器
+                    // 先尝试二次登录
+                    const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                    if (loginTwice.data.Message === '登录成功') {
+                        return;
+                    }
                     yield this.logOut();
                     yield this.login();
                     return;
                 }
-                // 成功情况，重置失败计数器
-                this.syncFailureCount = 0;
-                if (data.Success) {
-                    if (data.Message === '当前未有新消息') {
-                        return;
+                // 失败次数不足3次，继续等待下次sync
+                return;
+            }
+            if (data.Message === '用户可能退出') {
+                // 先尝试二次登录
+                const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                if (loginTwice.data.Message === '登录成功') {
+                    return;
+                }
+                // 用户可能退出，立即退出登录
+                yield this.logOut();
+                yield this.login();
+                return;
+            }
+            // 成功情况，重置失败计数器
+            this.syncFailureCount = 0;
+            if (data.Success) {
+                if (data.Message === '当前未有新消息') {
+                    return;
+                }
+                if (!data.Data.AddMsgs) {
+                    return;
+                }
+                // 更新联系人或者群组信息
+                // 新增：触发 message 事件
+                for (const msg of data.Data.AddMsgs) {
+                    // Check for duplicate messages
+                    const newMsgId = BigInt(msg.NewMsgId);
+                    if (this.recentMsgIds.includes(newMsgId)) {
+                        continue; // Skip duplicate message
                     }
-                    if (!data.Data.AddMsgs) {
-                        return;
+                    // Add to recent messages and maintain only last 40
+                    this.recentMsgIds.push(newMsgId);
+                    if (this.recentMsgIds.length > 40) {
+                        this.recentMsgIds.shift(); // Remove oldest message ID
                     }
-                    // 更新联系人或者群组信息
-                    // 新增：触发 message 事件
-                    for (const msg of data.Data.AddMsgs) {
-                        // Check for duplicate messages
-                        const newMsgId = BigInt(msg.NewMsgId);
-                        if (this.recentMsgIds.includes(newMsgId)) {
-                            continue; // Skip duplicate message
-                        }
-                        // Add to recent messages and maintain only last 10
-                        this.recentMsgIds.push(newMsgId);
-                        if (this.recentMsgIds.length > 10) {
-                            this.recentMsgIds.shift(); // Remove oldest message ID
+                    // 将msg转换为Message类型
+                    const message = new Message_1.Message({
+                        MsgId: msg.MsgId,
+                        FromUserName: msg.FromUserName.string.endsWith('@chatroom') ? msg.Content.string.split(':\n')[0] : msg.FromUserName.string,
+                        ToUserName: msg.FromUserName.string.endsWith('@chatroom') ? msg.FromUserName.string : msg.ToUserName.string,
+                        MsgType: msg.MsgType,
+                        Content: msg.FromUserName.string.endsWith('@chatroom') ? msg.Content.string.split(':\n').slice(1).join(':\n') : msg.Content.string,
+                        Status: msg.Status,
+                        ImgStatus: msg.ImgStatus,
+                        ImgBuf: msg.ImgBuf.iLen,
+                        CreateTime: msg.CreateTime,
+                        MsgSource: msg.MsgSource,
+                        NewMsgId: msg.NewMsgId,
+                        MsgSeq: msg.MsgSeq,
+                        RoomId: (msg.FromUserName.string.endsWith('@chatroom') ? msg.FromUserName.string : '') || (msg.ToUserName.string.endsWith('@chatroom') ? msg.ToUserName.string : ''),
+                        IsSelf: msg.FromUserName.string === userName,
+                        xml: msg.Content.string
+                    });
+                    // 处理企业微信
+                    if ((_a = message.fromId) === null || _a === void 0 ? void 0 : _a.includes('@openim')) {
+                        let contactE = yield contact_service_1.contactService.getByUserName(message.fromId);
+                        if (!contactE) {
+                            contactE = new ContactEntity_1.ContactEntity();
                         }
-                        // 将msg转换为Message类型
-                        const message = new Message_1.Message({
-                            MsgId: msg.MsgId,
-                            FromUserName: msg.FromUserName.string.endsWith('@chatroom') ? msg.Content.string.split(':\n')[0] : msg.FromUserName.string,
-                            ToUserName: msg.FromUserName.string.endsWith('@chatroom') ? msg.FromUserName.string : msg.ToUserName.string,
-                            MsgType: msg.MsgType,
-                            Content: msg.FromUserName.string.endsWith('@chatroom') ? msg.Content.string.split(':\n').slice(1).join(':\n') : msg.Content.string,
-                            Status: msg.Status,
-                            ImgStatus: msg.ImgStatus,
-                            ImgBuf: msg.ImgBuf.iLen,
-                            CreateTime: msg.CreateTime,
-                            MsgSource: msg.MsgSource,
-                            NewMsgId: msg.NewMsgId,
-                            MsgSeq: msg.MsgSeq,
-                            RoomId: (msg.FromUserName.string.endsWith('@chatroom') ? msg.FromUserName.string : '') || (msg.ToUserName.string.endsWith('@chatroom') ? msg.ToUserName.string : ''),
-                            IsSelf: msg.FromUserName.string === userName,
-                            xml: msg.Content.string
+                        contactE.nickName = msg.PushContent.split(':')[0].slice(0, -1);
+                        contactE.userName = message.fromId;
+                        contactE.smallHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
+                        contactE.bigHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
+                        contact_service_1.contactService.upsertByUsername(contactE.userName, contactE);
+                    }
+                    if (message.type() === MessageType_1.MessageType.AddFriend) { // 好友请求
+                        const obj = Message_1.Message.getXmlToJson(message.text());
+                        console.log(obj);
+                        const friendship = new Friendship_1.Friendship({
+                            fromnickname: obj.msg.fromnickname,
+                            v3: obj.msg.encryptusername,
+                            v4: obj.msg.ticket,
+                            scene: obj.msg.scene,
+                            fromusername: obj.msg.fromusername,
+                            bigHeadImgUrl: obj.msg.bigHeadImgUrl,
+                            smallHeadImgUrl: obj.msg.smallHeadImgUrl,
+                            content: obj.msg.content
                         });
-                        // 处理企业微信
-                        if ((_a = message.fromId) === null || _a === void 0 ? void 0 : _a.includes('@openim')) {
-                            let contactE = yield contact_service_1.contactService.getByUserName(message.fromId);
-                            if (!contactE) {
-                                contactE = new ContactEntity_1.ContactEntity();
-                            }
-                            contactE.nickName = msg.PushContent.split(':')[0].slice(0, -1);
-                            contactE.userName = message.fromId;
-                            contactE.smallHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
-                            contactE.bigHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
-                            contact_service_1.contactService.upsertByUsername(contactE.userName, contactE);
-                        }
-                        if (message.type() === MessageType_1.MessageType.AddFriend) { // 好友请求
-                            const obj = Message_1.Message.getXmlToJson(message.text());
-                            console.log(obj);
-                            const friendship = new Friendship_1.Friendship({
-                                fromnickname: obj.msg.fromnickname,
-                                v3: obj.msg.encryptusername,
-                                v4: obj.msg.ticket,
-                                scene: obj.msg.scene,
-                                fromusername: obj.msg.fromusername,
-                                bigHeadImgUrl: obj.msg.bigHeadImgUrl,
-                                smallHeadImgUrl: obj.msg.smallHeadImgUrl,
-                                content: obj.msg.content
-                            });
-                            this.emit('friendship', friendship);
-                        }
-                        else {
-                            this.emit('message', message);
-                        }
+                        this.emit('friendship', friendship);
+                    }
+                    else {
+                        this.emit('message', message);
                     }
                 }
-            }), 1000);
-            this.emit('login', userName);
+            }
         });
     }
     logOut() {

package/dist/test.js

@@ -12,9 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
 (() => __awaiter(void 0, void 0, void 0, function* () {
     const wxBot = new _1.WxBot({
-        baseUrl: 'http://127.0.0.1:8059/api',
+        baseUrl: 'http://192.168.56.101:8088/api',
         databasePath: './database.sqlite',
-        deviceType: 'ipadX'
+        deviceType: 'ipad',
+        mode: 'polling',
+        callbackPort: 8056
     });
     yield wxBot.start();
     wxBot.on('message', (message) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

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