wx2tg-puppet 3.0.9 → 6.0.17

package/dist/index.js

@@ -42,7 +42,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+exports.UrlLink = exports.WeVideo = exports.Voice = exports.Emoji = exports.isOfficialAccountVerifyFlag = exports.normalizeContactVerifyFlag = exports.Message = exports.Room = exports.Contact = exports.WxBot = exports.AppDataSource = void 0;
 require("reflect-metadata");
 const axiosInstance_1 = require("./utils/axiosInstance");
 const data_source_1 = require("./database/data-source");
@@ -73,6 +73,7 @@ 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"));
+const CallbackPayload_1 = require("./utils/CallbackPayload");
 class WxBot extends events_1.EventEmitter {
     constructor({ baseUrl, databasePath, deviceType = 'ipad', mode = 'polling', callbackPort = 8056, ProxyIp, ProxyPassword, ProxyUser }) {
         super();
@@ -81,13 +82,15 @@ class WxBot extends events_1.EventEmitter {
         this.heartbeatInterval = null;
         this.callbackInterval = null;
         this.msgInterval = null;
-        this.recentMsgIds = []; // Store recent message IDs
+        this.recentMsgIds = new Map();
+        this.messageQueue = Promise.resolve();
+        this.syncTask = null;
+        this.syncRequested = false;
+        this.loginRecoveryInProgress = false;
         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.syncInProgress = false; // Prevent overlapping message sync calls
-        this.loginRecoveryInProgress = false; // Allow only one login recovery flow
         this.baseUrl = baseUrl;
         this.databasePath = databasePath;
         this.deviceType = deviceType;
@@ -339,14 +342,31 @@ class WxBot extends events_1.EventEmitter {
                 // 处理当前批次的联系人
                 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 });
+                    const contacts = data.Data.ContactUsernameList;
+                    let nextIndex = 0;
+                    let succeeded = 0;
+                    let failed = 0;
+                    // Bound detail requests and finish this page before requesting the next.
+                    const worker = () => __awaiter(this, void 0, void 0, function* () {
+                        while (nextIndex < contacts.length) {
+                            const contact = contacts[nextIndex++];
+                            try {
+                                if (!contact.endsWith('@chatroom')) {
+                                    yield Contact_1.Contact.fetchAndUpsertContactDetail(userName, contact);
+                                }
+                                else {
+                                    yield Room_1.Room.find({ id: contact });
+                                }
+                                succeeded++;
+                            }
+                            catch (_a) {
+                                // A missing/failed item must not abort the page or leak private data.
+                                failed++;
+                            }
                         }
                     });
+                    yield Promise.all(Array.from({ length: Math.min(4, contacts.length) }, () => worker()));
+                    console.log(`联系人批次处理完成: 成功 ${succeeded}，失败 ${failed}`);
                 }
                 // 检查是否还有更多联系人需要获取
                 // CountinueFlag 为 1 表示还有更多数据
@@ -383,95 +403,103 @@ class WxBot extends events_1.EventEmitter {
                     DeviceType: this.deviceType,
                 });
             }
-            // 设置心跳包
-            this.setupHeartbeat(userName);
-            // 根据模式选择消息监听方式
+            // 先监听再启动心跳；不再通过 Sync 清空并丢弃登录期间的消息。
             if (this.mode === 'callback') {
-                // 循环调用至无新消息
-                while (true) {
-                    const resp = yield MsgApi_1.msgApi.Sync({
-                        "Wxid": userName,
-                        "Scene": 0,
-                        "Synckey": ""
-                    });
-                    if (!(yield this.checkSyncLoginStatus(resp.data, userName))) {
-                        return;
-                    }
-                    if (resp.data.Success) {
-                        if (resp.data.Message === '当前未有新消息') {
-                            break;
-                        }
-                    }
-                }
+                yield this.startCallbackServer(userName);
+                this.emit('login', userName);
                 this.callbackInterval = setInterval(() => {
-                    this.handleCallbackMessage(userName);
+                    void this.handleMsg(userName).catch(() => console.error('回调兜底同步失败'));
                 }, 1000 * 60 * 5);
-                this.startCallbackServer(userName);
             }
             else {
                 this.startPollingMode(userName);
             }
+            yield this.setupHeartbeat(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 = '';
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.httpServer) {
+                const previous = this.httpServer;
+                this.httpServer = null;
+                yield new Promise(resolve => previous.close(() => resolve()));
+            }
+            const server = http.createServer((req, res) => {
+                const reply = (status, data) => {
+                    if (!res.writableEnded && !res.destroyed) {
+                        res.writeHead(status, { 'Content-Type': 'application/json' });
+                        res.end(JSON.stringify(data));
+                    }
+                };
+                if (req.method !== 'POST' || req.url !== `/message/callback/${userName}`) {
+                    reply(404, { error: 'Not Found' });
+                    req.resume();
+                    return;
+                }
+                let size = 0;
+                let oversized = false;
                 let chunks = [];
                 req.on('data', (chunk) => {
-                    chunks.push(chunk);
-                    body += chunk.toString('utf8');
+                    size += chunk.length;
+                    if (size > CallbackPayload_1.MAX_CALLBACK_BYTES) {
+                        oversized = true;
+                        chunks = [];
+                        reply(413, { error: 'Callback body too large' });
+                    }
+                    else if (!oversized) {
+                        chunks.push(chunk);
+                    }
                 });
-                req.on('end', () => {
+                req.on('end', () => __awaiter(this, void 0, void 0, function* () {
+                    if (oversized || res.destroyed)
+                        return;
+                    let data;
                     try {
-                        this.handleCallbackMessage(userName);
-                        res.writeHead(200, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify({ success: true }));
+                        // Decode once, after joining chunks, so split UTF-8 characters are preserved.
+                        data = (0, CallbackPayload_1.parseCallbackPayload)(Buffer.concat(chunks).toString('utf8'));
+                        chunks = [];
                     }
-                    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 }));
+                    catch (_a) {
+                        reply(400, { error: 'Invalid callback payload' });
+                        return;
                     }
+                    try {
+                        yield this.handleCallbackMessage(userName, data);
+                        reply(200, { success: true });
+                    }
+                    catch (_b) {
+                        console.error('回调消息处理失败');
+                        reply(500, { error: 'Callback processing failed' });
+                    }
+                }));
+                req.on('error', () => reply(400, { error: 'Request error' }));
+            });
+            this.httpServer = server;
+            server.requestTimeout = 30000;
+            yield new Promise((resolve, reject) => {
+                const failed = (error) => {
+                    if (this.httpServer === server)
+                        this.httpServer = null;
+                    reject(error);
+                };
+                server.once('error', failed);
+                server.listen(this.callbackPort, '0.0.0.0', () => {
+                    server.removeListener('error', failed);
+                    server.on('error', () => console.error('回调服务器错误'));
+                    resolve();
                 });
-                req.on('error', (error) => {
-                    console.error('请求处理错误:', error);
-                    res.writeHead(500, { 'Content-Type': 'application/json' });
-                    res.end(JSON.stringify({ error: 'Request error' }));
-                });
+            });
+        });
+    }
+    handleCallbackMessage(userName_1) {
+        return __awaiter(this, arguments, void 0, function* (userName, data = null) {
+            if (data === null) {
+                yield this.handleMsg(userName);
             }
             else {
-                res.writeHead(404, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ error: 'Not Found' }));
+                yield this.enqueueMessages(userName, data);
             }
         });
-        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) {
         // 防止重复定时
@@ -480,9 +508,9 @@ class WxBot extends events_1.EventEmitter {
             this.msgInterval = null;
         }
         // 监听消息，每秒掉一次
-        this.msgInterval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-            yield this.handleMsg(userName);
-        }), 1000);
+        this.msgInterval = setInterval(() => {
+            void this.handleMsg(userName).catch(() => console.error('消息轮询失败'));
+        }, 1000);
         this.emit('login', userName);
     }
     checkLoginAfterDelay(userName) {
@@ -501,14 +529,17 @@ class WxBot extends events_1.EventEmitter {
             if (resp.data.Message === '用户可能退出') {
                 return false;
             }
+            // Recovery checks also consume Sync; preserve messages returned by that check.
+            (0, CallbackPayload_1.validateSyncResponse)(resp.data);
+            yield this.processMessages(userName, resp.data);
             return true;
         });
     }
+    // Preserve the single-flight login recovery fix from published puppet 3.0.8.
     recoverLogin(userName) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.loginRecoveryInProgress) {
+            if (this.loginRecoveryInProgress)
                 return false;
-            }
             this.loginRecoveryInProgress = true;
             try {
                 yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
@@ -549,99 +580,130 @@ class WxBot extends events_1.EventEmitter {
     }
     handleMsg(userName) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.syncInProgress) {
-                return;
-            }
-            this.syncInProgress = true;
+            this.syncRequested = true;
+            if (this.syncTask)
+                return this.syncTask;
+            this.syncTask = (() => __awaiter(this, void 0, void 0, function* () {
+                do {
+                    this.syncRequested = false;
+                    const resp = yield MsgApi_1.msgApi.Sync({ Wxid: userName, Scene: 0, Synckey: '' });
+                    yield this.enqueueMessages(userName, resp.data);
+                } while (this.syncRequested);
+            }))();
             try {
-                yield this.handleMsgOnce(userName);
+                yield this.syncTask;
             }
             finally {
-                this.syncInProgress = false;
+                this.syncTask = null;
             }
         });
     }
-    handleMsgOnce(userName) {
+    enqueueMessages(userName, data) {
+        (0, CallbackPayload_1.validateSyncResponse)(data);
+        const task = this.messageQueue.then(() => this.processMessages(userName, data));
+        // Both polling and callbacks use one parser/queue. A failed batch must not poison later ones.
+        this.messageQueue = task.catch(() => { });
+        return task;
+    }
+    processMessages(userName, data) {
         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 (!(yield this.checkSyncLoginStatus(data, userName))) {
+            if (!(yield this.checkSyncLoginStatus(data, userName)))
                 return;
-            }
-            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
-                    }
-                    // 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
-                    }
-                    // 将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();
+            if (!data.Success || !((_a = data.Data) === null || _a === void 0 ? void 0 : _a.AddMsgs))
+                return;
+            let failed = false;
+            for (const msg of data.Data.AddMsgs) {
+                try {
+                    // One malformed entry must not discard unrelated messages in this consumed batch.
+                    (0, CallbackPayload_1.validateRawMessage)(msg);
+                    for (let attempt = 0; attempt < 3; attempt++) {
+                        try {
+                            yield this.processMessage(userName, msg);
+                            break;
+                        }
+                        catch (error) {
+                            if (attempt === 2)
+                                throw error;
+                            yield new Promise(resolve => setTimeout(resolve, 100));
                         }
-                        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);
                     }
                 }
+                catch (_b) {
+                    failed = true;
+                    console.error('单条微信消息处理失败，其余消息继续处理');
+                }
+            }
+            if (failed)
+                throw new Error('Some messages could not be processed');
+        });
+    }
+    processMessage(userName, msg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const now = Date.now();
+            for (const [key, seenAt] of this.recentMsgIds) {
+                if (now - seenAt < 120000)
+                    break;
+                this.recentMsgIds.delete(key);
+            }
+            const newMsgId = String(msg.NewMsgId);
+            const identity = newMsgId !== '0' ? newMsgId
+                : `${msg.MsgId}:${msg.FromUserName.string}:${msg.ToUserName.string}:${msg.CreateTime}`;
+            const key = `${userName}:${identity}`;
+            if (this.recentMsgIds.has(key))
+                return;
+            // 将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: ((_a = msg.ImgBuf) === null || _a === void 0 ? void 0 : _a.iLen) || 0,
+                CreateTime: msg.CreateTime,
+                MsgSource: msg.MsgSource,
+                NewMsgId: 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 ((_b = message.fromId) === null || _b === void 0 ? void 0 : _b.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';
+                yield contact_service_1.contactService.upsertByUsername(contactE.userName, contactE);
+            }
+            if (message.type() === MessageType_1.MessageType.AddFriend) { // 好友请求
+                const obj = Message_1.Message.getXmlToJson(message.text());
+                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);
+            }
+            // Mark only after successful dispatch so a synchronous failure can be retried.
+            this.recentMsgIds.set(key, now);
+            if (this.recentMsgIds.size > 10000) {
+                this.recentMsgIds.delete(this.recentMsgIds.keys().next().value);
             }
         });
     }
@@ -713,6 +775,7 @@ class WxBot extends events_1.EventEmitter {
                     });
                     if (resp.data.Code === 0) {
                         yield this.loginSuccess(config.wxid);
+                        yield this.enqueueMessages(config.wxid, resp.data);
                     }
                     else {
                         yield this.login();
@@ -742,6 +805,7 @@ class WxBot extends events_1.EventEmitter {
             yield LoginApi_1.loginApi.LoginTwiceAutoAuth(config === null || config === void 0 ? void 0 : config.wxid);
             if (yield this.checkSyncLoginStatus(resp.data, config === null || config === void 0 ? void 0 : config.wxid)) {
                 yield this.loginSuccess(config.wxid);
+                yield this.enqueueMessages(config.wxid, resp.data);
                 return true;
             }
             else {
@@ -769,3 +833,6 @@ class WxBot extends events_1.EventEmitter {
     }
 }
 exports.WxBot = WxBot;
+var ContactClassification_1 = require("./utils/ContactClassification");
+Object.defineProperty(exports, "normalizeContactVerifyFlag", { enumerable: true, get: function () { return ContactClassification_1.normalizeContactVerifyFlag; } });
+Object.defineProperty(exports, "isOfficialAccountVerifyFlag", { enumerable: true, get: function () { return ContactClassification_1.isOfficialAccountVerifyFlag; } });

package/dist/services/contact.service.js

@@ -35,11 +35,11 @@ class ContactService {
     }
     update(userName, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const entity = yield this.getByUserName(userName);
-            if (!entity)
-                return null;
-            Object.assign(entity, update);
-            return this.repo.save(entity);
+            // Update only supplied columns, not a stale snapshot of the whole row.
+            if (Object.values(update).some(value => value !== undefined)) {
+                yield this.repo.update({ userName }, update);
+            }
+            return this.getByUserName(userName);
         });
     }
     clearRoom() {
@@ -56,14 +56,10 @@ class ContactService {
     }
     upsertByUsername(userName, data) {
         return __awaiter(this, void 0, void 0, function* () {
-            let contact = yield this.getByUserName(userName);
-            if (contact) {
-                Object.assign(contact, data);
-            }
-            else {
-                contact = this.repo.create(Object.assign({ userName }, data));
-            }
-            return this.repo.save(contact);
+            // INSERT ... ON CONFLICT avoids concurrent read-then-insert UNIQUE failures.
+            // TypeORM excludes undefined columns from the conflict update.
+            yield this.repo.upsert(Object.assign(Object.assign({}, data), { userName }), ['userName']);
+            return this.repo.findOneByOrFail({ userName });
         });
     }
     delete(userName) {

package/dist/types/MessageType.d.ts

@@ -15,6 +15,7 @@ export declare const MessageType: {
     Link: string;
     AddFriend: string;
     Quote: string;
+    Solitaire: string;
     Transfer: string;
     RedPacket: string;
     VideoAccount: string;

package/dist/types/MessageType.js

@@ -18,6 +18,7 @@ exports.MessageType = {
     Link: 'link', // 公众号链接
     AddFriend: 'add_friend', // 添加好友通知
     Quote: 'quote', // 引用消息
+    Solitaire: 'solitaire', // 接龙
     Transfer: 'transfer', //转账
     RedPacket: 'red_packet', //红包
     VideoAccount: 'video_account', // 视频号消息

package/dist/utils/CallbackPayload.d.ts

@@ -0,0 +1,4 @@
+export declare const MAX_CALLBACK_BYTES: number;
+export declare function validateSyncResponse(data: any): void;
+export declare function validateRawMessage(msg: any): void;
+export declare function parseCallbackPayload(body: string): any | null;

package/dist/utils/CallbackPayload.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_CALLBACK_BYTES = void 0;
+exports.validateSyncResponse = validateSyncResponse;
+exports.validateRawMessage = validateRawMessage;
+exports.parseCallbackPayload = parseCallbackPayload;
+const json_bigint_1 = __importDefault(require("json-bigint"));
+const json = (0, json_bigint_1.default)({ storeAsString: true });
+exports.MAX_CALLBACK_BYTES = 8 * 1024 * 1024;
+// Go time.Time.String(), including its optional monotonic-clock suffix.
+const timestampNotification = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?:\.\d+)? [+-]\d{4} \S+(?: m=[+-]\d+(?:\.\d+)?)?$/;
+function validateSyncResponse(data) {
+    var _a;
+    if (!data || typeof data !== 'object' || !Number.isInteger(data.Code) || typeof data.Success !== 'boolean') {
+        throw new Error('Invalid sync envelope');
+    }
+    if (data.Code !== 0 || !data.Success)
+        return;
+    if (!data.Data || typeof data.Data !== 'object')
+        throw new Error('Invalid sync data');
+    const messages = data.Data.AddMsgs;
+    if (messages == null) {
+        // The v6 server retains AddMsgs. Do not silently acknowledge an unknown message format.
+        if ((_a = data.Data.Messages) === null || _a === void 0 ? void 0 : _a.length)
+            throw new Error('Missing raw messages');
+        return;
+    }
+    if (!Array.isArray(messages))
+        throw new Error('Invalid message list');
+}
+function validateRawMessage(msg) {
+    var _a, _b, _c;
+    if (!msg || typeof ((_a = msg.FromUserName) === null || _a === void 0 ? void 0 : _a.string) !== 'string' || typeof ((_b = msg.ToUserName) === null || _b === void 0 ? void 0 : _b.string) !== 'string'
+        || typeof ((_c = msg.Content) === null || _c === void 0 ? void 0 : _c.string) !== 'string' || !Number.isInteger(msg.MsgType)
+        || !Number.isInteger(msg.CreateTime)
+        || !((typeof msg.NewMsgId === 'string' && /^\d+$/.test(msg.NewMsgId))
+            || (typeof msg.NewMsgId === 'number' && Number.isSafeInteger(msg.NewMsgId) && msg.NewMsgId >= 0))) {
+        throw new Error('Invalid raw message');
+    }
+}
+// null denotes a legacy wake-up notification, not a batch with an empty message list.
+function parseCallbackPayload(body) {
+    const text = body.trim();
+    if (!text || timestampNotification.test(text))
+        return null;
+    const data = json.parse(text);
+    validateSyncResponse(data);
+    return data;
+}

package/dist/utils/ContactClassification.d.ts

@@ -0,0 +1,4 @@
+/** Normalize an API VerifyFlag without turning missing/invalid data into personal contacts. */
+export declare function normalizeContactVerifyFlag(value: unknown): number | null;
+/** MM_USERATTRVERIFYFALG_BIZ_BRAND (8), not a username convention or any nonzero flag. */
+export declare function isOfficialAccountVerifyFlag(value: unknown): boolean | undefined;

package/dist/utils/ContactClassification.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeContactVerifyFlag = normalizeContactVerifyFlag;
+exports.isOfficialAccountVerifyFlag = isOfficialAccountVerifyFlag;
+/** Normalize an API VerifyFlag without turning missing/invalid data into personal contacts. */
+function normalizeContactVerifyFlag(value) {
+    if (typeof value === 'string') {
+        const parsed = Number(value);
+        // uint32 numbers stringify as canonical decimal (no whitespace, signs or leading zeros).
+        if (String(parsed) !== value)
+            return null;
+        value = parsed;
+    }
+    return typeof value === 'number' && Number.isInteger(value) && value >= 0 && value <= 0xffffffff
+        ? value : null;
+}
+/** MM_USERATTRVERIFYFALG_BIZ_BRAND (8), not a username convention or any nonzero flag. */
+function isOfficialAccountVerifyFlag(value) {
+    const flag = normalizeContactVerifyFlag(value);
+    return flag === null ? undefined : (flag & 8) !== 0;
+}