wx2tg-puppet 3.0.8 → 6.0.16

package/README.md

@@ -0,0 +1,86 @@
+# wx2tg-puppet
+
+微信机器人核心库，供 `wechat2tg` 调用 `wx2tg-server`。
+
+## v6 配套版本
+
+| 仓库 | 维护分支 | 本次 Git 标签 | npm / Docker 版本 |
+| --- | --- | --- | --- |
+| wechat2tg | `v6` | `v6.0.16` | 包版本 `6.0.16`；镜像 `finalpi/wechat2tg:v6.0.16` |
+| wx2tg-puppet | `v6` | `v6.0.16` | npm 格式包 `wx2tg-puppet@6.0.16` |
+| wx2tg-server（fk-zhang） | `v6`，继承 `875` | `v6.0.16` | 镜像 `finalpi/wx2tg-server:v6.0.16` |
+
+**只维护 `v6` 分支，开发版和稳定版用 tag 区分，不建立 `v6-dev` 分支。** `v6.X.Y-dev.N` 为开发版，`v6.X.Y` 为稳定版；npm 不带前面的 `v`。三个仓库使用相同配套版本。Docker 的 `v6-dev` 指向开发版、`v6` 指向稳定版，开发构建不得覆盖稳定别名。历史 `3.x`、`875`、`v51.*`、裸 `v6` 标签保留，不移动。
+
+根目录 `VERSION`、`package.json`、`package-lock.json` 必须一致；发布标签必须为 `v${VERSION}`。创建本地标签不代表已推送或已发布 npm。发布前执行：
+
+```sh
+npm ci
+npm run check:version
+npm test
+npm pack
+```
+
+`test.yml` 负责测试和 Actions 制品；`publish.yml` 在完整 `v6.*` 标签触发后重新验证、测试、打包并执行 `npm publish`。正式版使用 npm `latest`，开发版使用 `v6-dev`，不覆盖稳定标签。发布使用仓库 `NPM_TOKEN`，凭据缺失或失效会明确失败；还会检查 registry 确实能读取该版本。当前源码仓库为私有，不声称提供 npm provenance。分支推送和 PR 不发布 npm；可手动重试已有不可变标签。
+
+`wechat2tg` 可继续锁定同版本本地制品以保证构建可重现；若切换 registry 来源，必须重新生成 lockfile 并校验制品，不要手工伪造 integrity。
+
+## 消息接收
+
+### polling（保持默认）
+
+```ts
+new WxBot({baseUrl: 'http://wx2tg-server:8058/api', databasePath: 'storage/db/puppet.db',
+  deviceType: 'ipad', mode: 'polling'})
+```
+
+server 对应 `syncmessage=false`、`msgpush=false`。每秒拉取 `/Msg/Sync`，同一实例不会并发 Sync；同步进行中又收到通知时，会追加一次拉取。
+
+### callback
+
+设 `mode: 'callback'`、`callbackPort: 8056`；server 的 `syncmessagebusinessuri` 指向 `http://bot:8056/message/callback/{0}`，启用 `msgpush=true`，按需启用 `syncmessage=true` 作为短链兜底。
+
+- 带正文回调直接处理 `Data.AddMsgs`，不再丢弃正文后二次拉取。当前 server 同时提供 `Data.Messages` 和兼容的 `Data.AddMsgs`。
+- 兼容空通知和 Go 时间戳通知；它们才触发 Sync。每 5 分钟保留一次兜底 Sync。
+- 64 位消息 ID 无损解析；回调和轮询通过同一队列、同一去重逻辑处理。进程内去重窗口 2 分钟，最多 10,000 项。
+- 回调服务启动成功后发出 `login`；启动/恢复检查取得的消息也会处理，不再直接丢弃。
+- 单个回调正文最大 8 MiB；非法信封 400，错误账号路径 404，超限 413，处理失败 500。单条消息失败最多在本地尝试 3 次，不阻断同批其他消息；部分失败也返回 500，不会回显消息正文。
+- 只允许可信网络访问回调端口。当前 server 没有签名/token，本库不提供公网鉴权。
+
+HTTP 200 仅表示 puppet 处理并同步发出了事件，不代表异步业务监听器或 Telegram 已成功处理。进程重启会清空去重与队列；server 的异步消息归档也不是可靠回调重试队列。需要端到端补发时，仍需单独设计持久化投递/游标补偿。
+
+## 公众号识别
+
+`Contact.verifyFlag` 保存 `/api/Friend/GetContractDetail` 返回的 `VerifyFlag`，`Contact.isOfficialAccount()` 返回 `true` / `false` / `undefined`。只有品牌位 `(VerifyFlag & 8) !== 0` 才判断为公众号，不根据 `gh_` 前缀，也不把任意非零值当作公众号。例如 `0`、`1`、`2`、`4`、`16` 均不是公众号，`8`、`24`、`136` 是公众号。
+
+根入口导出 `normalizeContactVerifyFlag` 与 `isOfficialAccountVerifyFlag`。字段缺失或非法时保持未知，不能转换成 `0`。旧缓存通过 `Contact.find()` 按需补查，同一账号/联系人共享请求，未知结果有 30 秒冷却。显式 `0` 会更新旧分类，缺失字段不会抹掉已知标志。联系人详情请求有 15 秒超时，不再无限递归；缓存写入使用原子 upsert 避免并发重复主键。
+
+此 SDK 管理 `puppet.db` 的联系人 schema。其他读取连接不要再次用不完整的镜像实体执行 schema synchronize，否则会删除新增字段。服务端目录接口的 `profile.verify_flag` 可用于批量补齐，但必须验证账号范围，不覆盖更新的已知值。
+
+## 接龙消息
+
+`Message.Type.Solitaire` 对应外层 `49`、应用子类型 `53`。`Message.text()` 返回接龙完整可见标题、名单和尾注；原始 `Content`、`_text`、`_xml` 保持不变，不把内部 `solitaire_info` 当正文输出。CDATA、实体转义、前导零、Unicode 和换行保留；无法安全解析时返回明确的接龙占位提示。此功能只负责识别/读取，不自动参与、发送或重放历史接龙。
+
+## 对齐 860-v3
+
+当前 v6 源码合入 `860-v3` 的 `7d9590c`。登录恢复和同步互斥已经由 v6 独立覆盖，本轮保留其更完整的回调队列；补齐下载校验、选择性重试及兼容入口。详见 [上游对齐记录](docs/upstream-860-v3.md)。此源码整合不覆盖已发布 `v6.0.15` 制品，后续发布使用新协调版本。
+
+## 文件下载
+
+`6.0.13-dev.1` 新增 `toolsApi.DownloadFileBuffer(body): Promise<Buffer>`，从偏移 0 以最多 512 KiB 分片组装完整文件，保留参数和 64 位 ID，供合并的 WebUI / 消息中心使用。原有 v6 `DownloadFile()` 仍返回单片 `AxiosResponse<Buffer>`，没有替换为 npm 3.0.9 的不同契约，也没有回退带正文回调修复。
+
+`v6.0.12` 支持 `/Tools/DownloadFile` 的 HTTP 200/206 二进制分片，按实际收到的字节数推进偏移，验证长度/范围，保留 64 位 `NewMsgId`。同时兼容旧 JSON/Base64 成功响应。
+
+每次分片请求超时为 180 秒，以覆盖 server 首次 CDN 回退约 120 秒的预算。明确的暂时性网络错误及 HTTP 429/502/503/504 最多尝试 3 次，按 1/2 秒退避，仍从同一偏移继续；损坏内容、错误范围和确定的业务失败不重试。`FileDownloadError` 提供 `httpStatus`、`businessCode`、`retryable`，但不携带附件密钥、任意 server 正文或 Axios 请求对象。
+
+新增 `DownloadFileBinary` 二进制别名、显式的 `DownloadFileLegacy` JSON/Base64 入口；`dist/utils/fileDownload` 的工具导出与上游兼容，复用同一个校验引擎。保持 v6 `DownloadFile` 返回 `AxiosResponse<Buffer>` 的原契约。
+
+旧 JSON 必须有 `Success=true` 和 `Code=0`；已提供的 native ret、长度、偏移和总长度均需匹配。二进制 `206` 必须提供准确的 `Content-Range`，二进制 `200` 只能是从零开始的完整文件；旧 JSON 分片仍可返回 HTTP 200。响应元数据中的大整数也无损保留。
+
+图片、视频及大于 80 MiB 文件的 `DownloadFileMessage` 路径仍保持原行为。
+
+## 测试与构建
+
+`npm test` 先编译，再同时运行 `test/` 与上游 `tests/` 下的 `node:test` 离线回归：回调正文、空通知、大整数、并发去重、登录事件、续登并发保护、二进制/旧 JSON 下载、分片推进、错误响应和不受影响的图片/视频路径。测试只访问本机随机端口，不登录微信或发送真实消息。
+
+保留已发布 `3.0.8` 的单次续登保护及 v6 更完整的串行同步行为，避免上游早退逻辑丢弃待处理通知。仓库既有 `dist` 为被追踪产物，修改源码后需重新构建并一起提交。

package/VERSION

@@ -0,0 +1 @@
+6.0.16

package/dist/api/FriendApi.js

@@ -13,7 +13,7 @@ class FriendApi {
     }
     /** 获取通讯录好友详情 */
     GetContractDetail(body) {
-        return axiosInstance_1.axiosInstance.post('/Friend/GetContractDetail', body);
+        return axiosInstance_1.axiosInstance.post('/Friend/GetContractDetail', body, { timeout: 15000 });
     }
     /** 获取通讯录好友 */
     GetContractList(body) {

package/dist/api/ToolsApi.d.ts

@@ -8,7 +8,13 @@ declare class ToolsApi {
     /** 抢红包 */
     OpenHongBao(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 文件下载 */
-    DownloadFile(body: any): Promise<AxiosResponse<ApiResponse>>;
+    DownloadFile(body: any): Promise<AxiosResponse<Buffer>>;
+    /** DownloadFile 的二进制别名 */
+    DownloadFileBinary(body: any): Promise<AxiosResponse<Buffer>>;
+    /** 显式兼容旧版 JSON/Base64 响应结构 */
+    DownloadFileLegacy(body: any): Promise<AxiosResponse<ApiResponse>>;
+    /** 分段下载完整文件，返回合并后的二进制内容 */
+    DownloadFileBuffer(body: any): Promise<Buffer>;
     /** 文件消息下载 */
     DownloadFileMessage(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 高清图片下载 */

package/dist/api/ToolsApi.js

@@ -1,7 +1,18 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toolsApi = void 0;
 const axiosInstance_1 = require("../utils/axiosInstance");
+const downloadFileSection_1 = require("../utils/downloadFileSection");
+const fileDownload_1 = require("../utils/fileDownload");
 class ToolsApi {
     /** 生成支付二维码 */
     GeneratePayQCode(wxid) {
@@ -17,7 +28,21 @@ class ToolsApi {
     }
     /** 文件下载 */
     DownloadFile(body) {
-        return axiosInstance_1.axiosInstance.post('/Tools/DownloadFile', body);
+        return (0, downloadFileSection_1.downloadFileSection)(body);
+    }
+    /** DownloadFile 的二进制别名 */
+    DownloadFileBinary(body) {
+        return (0, downloadFileSection_1.downloadFileSection)(body);
+    }
+    /** 显式兼容旧版 JSON/Base64 响应结构 */
+    DownloadFileLegacy(body) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (0, fileDownload_1.legacyFileSection)(yield (0, fileDownload_1.fetchFileSection)(body), body);
+        });
+    }
+    /** 分段下载完整文件，返回合并后的二进制内容 */
+    DownloadFileBuffer(body) {
+        return (0, fileDownload_1.downloadFileBuffer)(body);
     }
     /** 文件消息下载 */
     DownloadFileMessage(body) {

package/dist/core/Contact.d.ts

@@ -10,6 +10,8 @@ export type ContactGender = any;
 export declare class Contact {
     get wxid(): string;
     get nickName(): string;
+    get verifyFlag(): number | null;
+    isOfficialAccount(): boolean | undefined;
     /**
      * Contact id (readonly)
      */
@@ -27,6 +29,8 @@ export declare class Contact {
         id?: string;
         nickName?: string;
     }): Promise<null | Contact>;
+    /** Best-effort backfill for old cache rows; missing flags never imply personal accounts. */
+    private static refreshUnknownContact;
     /**
      * Find contact by name or alias
      */
@@ -80,4 +84,5 @@ export declare class Contact {
      * Fetch and upsert contact details for a given userName and contact.
      */
     static fetchAndUpsertContactDetail(Wxid: string, Towxid: string): Promise<ContactEntity>;
+    private static loadContactDetail;
 }

package/dist/core/Contact.js

@@ -14,6 +14,11 @@ const contact_service_1 = require("../services/contact.service");
 const FriendApi_1 = require("../api/FriendApi");
 const config_service_1 = require("../services/config.service");
 const common_1 = require("../action/common");
+const ContactClassification_1 = require("../utils/ContactClassification");
+const detailFetches = new Map();
+const unknownRefreshAttempts = new Map();
+const UNKNOWN_REFRESH_INTERVAL_MS = 30000;
+const MAX_UNKNOWN_REFRESH_ENTRIES = 5000;
 /**
  * Contact class for handling and interacting with contacts.
  */
@@ -24,6 +29,13 @@ class Contact {
     get nickName() {
         return this._nickName;
     }
+    get verifyFlag() {
+        var _a;
+        return (0, ContactClassification_1.normalizeContactVerifyFlag)((_a = this.contact) === null || _a === void 0 ? void 0 : _a.verifyFlag);
+    }
+    isOfficialAccount() {
+        return (0, ContactClassification_1.isOfficialAccountVerifyFlag)(this.verifyFlag);
+    }
     constructor(contact) {
         this.contact = null;
         this.contact = contact;
@@ -41,7 +53,7 @@ class Contact {
             if (query.id) {
                 const contact = yield contact_service_1.contactService.getByUserName(query.id);
                 if (contact) {
-                    return new Contact(contact);
+                    return new Contact(yield Contact.refreshUnknownContact(contact));
                 }
                 else {
                     const config = yield config_service_1.configService.get();
@@ -55,12 +67,43 @@ class Contact {
             if (query.nickName) {
                 const contact = yield contact_service_1.contactService.searchByNickNameOrRemark(query.nickName);
                 if (contact.length > 0) {
-                    return new Contact(contact[0]);
+                    return new Contact(yield Contact.refreshUnknownContact(contact[0]));
                 }
             }
             return null;
         });
     }
+    /** Best-effort backfill for old cache rows; missing flags never imply personal accounts. */
+    static refreshUnknownContact(contact) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if ((0, ContactClassification_1.normalizeContactVerifyFlag)(contact.verifyFlag) !== null)
+                return contact;
+            try {
+                const config = yield config_service_1.configService.get();
+                if (!(config === null || config === void 0 ? void 0 : config.wxid))
+                    return contact;
+                const key = JSON.stringify([config.wxid, contact.userName]);
+                const pending = detailFetches.get(key);
+                if (pending)
+                    return yield pending;
+                const now = Date.now();
+                const lastAttempt = unknownRefreshAttempts.get(key);
+                if (lastAttempt !== undefined && now - lastAttempt < UNKNOWN_REFRESH_INTERVAL_MS)
+                    return contact;
+                // Reinsertion keeps eviction ordered by attempt time; both successes and failures are throttled.
+                unknownRefreshAttempts.delete(key);
+                unknownRefreshAttempts.set(key, now);
+                if (unknownRefreshAttempts.size > MAX_UNKNOWN_REFRESH_ENTRIES) {
+                    unknownRefreshAttempts.delete(unknownRefreshAttempts.keys().next().value);
+                }
+                return yield Contact.fetchAndUpsertContactDetail(config.wxid, contact.userName);
+            }
+            catch (_a) {
+                // Transient API/configuration errors must not make a cached contact disappear.
+                return contact;
+            }
+        });
+    }
     /**
      * Find contact by name or alias
      */
@@ -169,41 +212,39 @@ class Contact {
      */
     static fetchAndUpsertContactDetail(Wxid, Towxid) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3;
+            const key = JSON.stringify([Wxid, Towxid]);
+            const pending = detailFetches.get(key);
+            if (pending)
+                return pending;
+            const task = Contact.loadContactDetail(Wxid, Towxid);
+            detailFetches.set(key, task);
+            try {
+                return yield task;
+            }
+            finally {
+                detailFetches.delete(key);
+            }
+        });
+    }
+    static loadContactDetail(Wxid, Towxid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
             const detail = yield FriendApi_1.friendApi.GetContractDetail({
                 "ChatRoom": "",
                 "Towxids": Towxid,
                 "Wxid": Wxid
             });
             const detailData = detail.data;
-            const detailDataSave = (_c = (_b = (_a = detailData.Data) === null || _a === void 0 ? void 0 : _a.ContactList) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : {};
-            if (!detailDataSave.UserName) {
-                return this.fetchAndUpsertContactDetail(Wxid, Towxid);
+            const detailDataSave = (_c = (_b = (_a = detailData === null || detailData === void 0 ? void 0 : detailData.Data) === null || _a === void 0 ? void 0 : _a.ContactList) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : {};
+            const userName = (_d = detailDataSave.UserName) === null || _d === void 0 ? void 0 : _d.string;
+            // Fail finitely rather than recursively retrying a missing or unexpected contact.
+            if ((detailData === null || detailData === void 0 ? void 0 : detailData.Success) === false || ((detailData === null || detailData === void 0 ? void 0 : detailData.Code) !== undefined && detailData.Code !== 0)
+                || typeof userName !== 'string' || !userName || userName !== Towxid) {
+                throw new Error('Contact detail response did not contain the requested contact');
             }
-            const contact = {
-                userName: (_e = (_d = detailDataSave.UserName) === null || _d === void 0 ? void 0 : _d.string) !== null && _e !== void 0 ? _e : '',
-                nickName: (_g = (_f = detailDataSave.NickName) === null || _f === void 0 ? void 0 : _f.string) !== null && _g !== void 0 ? _g : 'no name',
-                pyInitial: (_j = (_h = detailDataSave.Pyinitial) === null || _h === void 0 ? void 0 : _h.string) !== null && _j !== void 0 ? _j : '',
-                quanPin: (_l = (_k = detailDataSave.QuanPin) === null || _k === void 0 ? void 0 : _k.string) !== null && _l !== void 0 ? _l : '',
-                sex: (_m = detailDataSave.Sex) !== null && _m !== void 0 ? _m : null,
-                remark: (_p = (_o = detailDataSave.Remark) === null || _o === void 0 ? void 0 : _o.string) !== null && _p !== void 0 ? _p : '',
-                remarkPyInitial: (_r = (_q = detailDataSave.RemarkPyinitial) === null || _q === void 0 ? void 0 : _q.string) !== null && _r !== void 0 ? _r : '',
-                remarkQuanPin: (_t = (_s = detailDataSave.RemarkQuanPin) === null || _s === void 0 ? void 0 : _s.string) !== null && _t !== void 0 ? _t : '',
-                signature: (_u = detailDataSave.Signature) !== null && _u !== void 0 ? _u : '',
-                alias: (_v = detailDataSave.Alias) !== null && _v !== void 0 ? _v : '',
-                snsBgImg: (_x = (_w = detailDataSave.SnsUserInfo) === null || _w === void 0 ? void 0 : _w.SnsBgimgId) !== null && _x !== void 0 ? _x : '',
-                country: (_y = detailDataSave.Country) !== null && _y !== void 0 ? _y : '',
-                bigHeadImgUrl: (_z = detailDataSave.BigHeadImgUrl) !== null && _z !== void 0 ? _z : '',
-                smallHeadImgUrl: (_0 = detailDataSave.SmallHeadImgUrl) !== null && _0 !== void 0 ? _0 : '',
-                description: '', // 详情数据中没有明确字段
-                cardImgUrl: '', // 详情数据中没有明确字段
-                labelList: '', // 详情数据中没有明确字段
-                province: (_1 = detailDataSave.Province) !== null && _1 !== void 0 ? _1 : '',
-                city: (_2 = detailDataSave.City) !== null && _2 !== void 0 ? _2 : '',
-                phoneNumList: '', // 详情数据中没有明确字段
-            };
-            yield contact_service_1.contactService.upsertByUsername((_3 = detailDataSave.UserName) === null || _3 === void 0 ? void 0 : _3.string, contact);
-            return contact;
+            const verifyFlag = (0, ContactClassification_1.normalizeContactVerifyFlag)(detailDataSave.VerifyFlag);
+            const contact = Object.assign(Object.assign({ userName }, (verifyFlag === null ? {} : { verifyFlag })), { nickName: (_f = (_e = detailDataSave.NickName) === null || _e === void 0 ? void 0 : _e.string) !== null && _f !== void 0 ? _f : 'no name', pyInitial: (_h = (_g = detailDataSave.Pyinitial) === null || _g === void 0 ? void 0 : _g.string) !== null && _h !== void 0 ? _h : '', quanPin: (_k = (_j = detailDataSave.QuanPin) === null || _j === void 0 ? void 0 : _j.string) !== null && _k !== void 0 ? _k : '', sex: (_l = detailDataSave.Sex) !== null && _l !== void 0 ? _l : null, remark: (_o = (_m = detailDataSave.Remark) === null || _m === void 0 ? void 0 : _m.string) !== null && _o !== void 0 ? _o : '', remarkPyInitial: (_q = (_p = detailDataSave.RemarkPyinitial) === null || _p === void 0 ? void 0 : _p.string) !== null && _q !== void 0 ? _q : '', remarkQuanPin: (_s = (_r = detailDataSave.RemarkQuanPin) === null || _r === void 0 ? void 0 : _r.string) !== null && _s !== void 0 ? _s : '', signature: (_t = detailDataSave.Signature) !== null && _t !== void 0 ? _t : '', alias: (_u = detailDataSave.Alias) !== null && _u !== void 0 ? _u : '', snsBgImg: (_w = (_v = detailDataSave.SnsUserInfo) === null || _v === void 0 ? void 0 : _v.SnsBgimgId) !== null && _w !== void 0 ? _w : '', country: (_x = detailDataSave.Country) !== null && _x !== void 0 ? _x : '', bigHeadImgUrl: (_y = detailDataSave.BigHeadImgUrl) !== null && _y !== void 0 ? _y : '', smallHeadImgUrl: (_z = detailDataSave.SmallHeadImgUrl) !== null && _z !== void 0 ? _z : '', province: (_0 = detailDataSave.Province) !== null && _0 !== void 0 ? _0 : '', city: (_1 = detailDataSave.City) !== null && _1 !== void 0 ? _1 : '' });
+            return contact_service_1.contactService.upsertByUsername(userName, contact);
         });
     }
 }

package/dist/core/Message.d.ts

@@ -8,6 +8,7 @@ import * as Axios from 'axios';
  */
 export declare class Message {
     private msg;
+    private readonly displayText?;
     readonly newMsgId: string;
     readonly fromId: string;
     readonly _pushContent: string;
@@ -34,6 +35,7 @@ export declare class Message {
         Link: string;
         AddFriend: string;
         Quote: string;
+        Solitaire: string;
         Transfer: string;
         RedPacket: string;
         VideoAccount: string;

package/dist/core/Message.js

@@ -52,6 +52,7 @@ const Room_1 = require("./Room");
 const fast_xml_parser_1 = require("fast-xml-parser");
 const common_1 = require("../action/common");
 const ToolsApi_1 = require("../api/ToolsApi");
+const FileDownloadError_1 = require("../utils/FileDownloadError");
 const file_box_1 = require("file-box");
 const config_service_1 = require("../services/config.service");
 const audioUtil_1 = require("../utils/audioUtil");
@@ -61,6 +62,7 @@ const fs = __importStar(require("fs"));
 const FileChunkHelper_1 = require("../utils/FileChunkHelper");
 const GroupApi_1 = require("../api/GroupApi");
 const contact_service_1 = require("../services/contact.service");
+const SolitairePayload_1 = require("../utils/SolitairePayload");
 const MAX_RETRIES = 3;
 const RETRY_DELAY = 1000; // 1 second
 const LARGE_FILE_THRESHOLD = 80 * 1024 * 1024;
@@ -72,18 +74,23 @@ function retryDownload(downloadFn) {
         for (let i = 0; i < MAX_RETRIES; i++) {
             try {
                 const response = yield downloadFn();
-                if (((_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.Data) === null || _b === void 0 ? void 0 : _b.BaseResponse) === null || _c === void 0 ? void 0 : _c.ret) === 0) {
+                if (Buffer.isBuffer(response === null || response === void 0 ? void 0 : response.data) || ((_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.Data) === null || _b === void 0 ? void 0 : _b.BaseResponse) === null || _c === void 0 ? void 0 : _c.ret) === 0) {
                     return response;
                 }
                 lastError = new Error(`Download failed with ret code: ${(_f = (_e = (_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.Data) === null || _e === void 0 ? void 0 : _e.BaseResponse) === null || _f === void 0 ? void 0 : _f.ret}`);
             }
             catch (error) {
+                if (error instanceof FileDownloadError_1.FileDownloadError && !error.retryable)
+                    throw error;
                 lastError = error;
             }
             if (i < MAX_RETRIES - 1) {
-                yield new Promise(resolve => setTimeout(resolve, RETRY_DELAY));
+                const delay = lastError instanceof FileDownloadError_1.FileDownloadError ? RETRY_DELAY * (i + 1) : RETRY_DELAY;
+                yield new Promise(resolve => setTimeout(resolve, delay));
             }
         }
+        if (lastError instanceof FileDownloadError_1.FileDownloadError)
+            throw lastError;
         throw new Error(`Download failed after ${MAX_RETRIES} attempts. Last error: ${lastError === null || lastError === void 0 ? void 0 : lastError.message}`);
     });
 }
@@ -102,7 +109,11 @@ class Message {
         this._createTime = msg.CreateTime;
         this._xml = msg.xml;
         this._text = msg.Content;
-        if (this.type() === MessageType_1.MessageType.Quote) {
+        const messageType = this.type();
+        if (messageType === MessageType_1.MessageType.Solitaire) {
+            this.displayText = (0, SolitairePayload_1.getSolitaireDisplayText)(msg.Content);
+        }
+        else if (messageType === MessageType_1.MessageType.Quote) {
             let obj = Message.getXmlToJson(msg.Content);
             msg.Content = obj.msg.appmsg.title;
             this.refer = obj.msg.appmsg.refermsg;
@@ -215,8 +226,9 @@ class Message {
      * Get the text content of the message.
      */
     text() {
+        var _a;
         // TODO: Implement text content retrieval
-        return this.msg.Content;
+        return (_a = this.displayText) !== null && _a !== void 0 ? _a : this.msg.Content;
     }
     decodeDownloadBuffer(bufferSource) {
         if (Buffer.isBuffer(bufferSource)) {
@@ -326,7 +338,12 @@ class Message {
                     return MessageType_1.MessageType.Location;
                     break;
                 case 49:
-                    jObj = Message.getXmlToJson(xml);
+                    if (typeof xml !== 'string' || /<!\s*(?:DOCTYPE|ENTITY)\b/i.test(xml))
+                        return MessageType_1.MessageType.Unknown;
+                    // Classification only needs a numeric subtype. Avoid coercing long
+                    // titles/record bodies into numbers (which is costly and lossy).
+                    jObj = new fast_xml_parser_1.XMLParser({ ignoreAttributes: false, attributeNamePrefix: '', parseTagValue: false }).parse(xml);
+                    jObj.msg.appmsg.type = Number(jObj.msg.appmsg.type);
                     // console.log(jObj)
                     if (jObj.msg.appmsg.type === 5) {
                         if (jObj.msg.appmsg.title === '邀请你加入群聊') {
@@ -351,6 +368,9 @@ class Message {
                     else if (jObj.msg.appmsg.type === 51) {
                         return MessageType_1.MessageType.VideoAccount;
                     }
+                    else if (jObj.msg.appmsg.type === 53) {
+                        return (0, SolitairePayload_1.isBoundedAppMessageXml)(xml) ? MessageType_1.MessageType.Solitaire : MessageType_1.MessageType.Unknown;
+                    }
                     else if (jObj.msg.appmsg.type === 57) {
                         return MessageType_1.MessageType.Quote;
                     }
@@ -454,7 +474,7 @@ class Message {
     }
     toFileBox() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c, _d;
             if (this.type() === MessageType_1.MessageType.Image) {
                 const xml = this.msg.Content;
                 const json = Message.getXmlToJson(xml);
@@ -553,44 +573,34 @@ class Message {
             }
             else if (this.type() === MessageType_1.MessageType.File) {
                 const xml = this.msg.Content;
-                const json = Message.getXmlToJson(xml);
+                // Preserve uint64 overwrite_newmsgid values from XML without numeric rounding.
+                const json = new fast_xml_parser_1.XMLParser({ ignoreAttributes: false, attributeNamePrefix: '', parseTagValue: false }).parse(xml);
                 const config = yield config_service_1.configService.get();
-                const totalSize = parseInt(json.msg.appmsg.appattach.totallen);
+                const totalSize = Number((_d = (_c = (_b = json === null || json === void 0 ? void 0 : json.msg) === null || _b === void 0 ? void 0 : _b.appmsg) === null || _c === void 0 ? void 0 : _c.appattach) === null || _d === void 0 ? void 0 : _d.totallen);
+                if (!Number.isSafeInteger(totalSize) || totalSize <= 0) {
+                    throw new Error('DownloadFile: invalid total length');
+                }
                 if (totalSize > LARGE_FILE_THRESHOLD) {
                     return yield this.downloadFileMessage();
                 }
-                // Get initial chunk size from first request
-                const firstChunk = FileChunkHelper_1.FileChunkHelper.getChunk(totalSize, 0);
-                if (!firstChunk)
-                    return null;
-                // @ts-ignore - Using any type for response due to mixed axios versions
-                const firstResp = yield retryDownload(() => ToolsApi_1.toolsApi.DownloadFile({
-                    "AppID": json.msg.appmsg.appid,
-                    "AttachId": json.msg.appmsg.appattach.attachid,
-                    "DataLen": totalSize,
-                    "Section": firstChunk,
-                    "UserName": this.msg.FromUserName,
-                    "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
-                }));
-                const downloadedLength = firstResp.data.Data.data.iLen;
-                const chunks = FileChunkHelper_1.FileChunkHelper.calculateChunks(totalSize, downloadedLength);
-                let completeBuffer = Buffer.from(firstResp.data.Data.data.buffer, 'base64');
-                // Start from second chunk since we already have the first one
-                for (let i = 1; i < chunks.length; i++) {
-                    const chunk = chunks[i];
-                    // @ts-ignore - Using any type for response due to mixed axios versions
+                const chunks = [];
+                let position = 0;
+                while (position < totalSize) {
                     const resp = yield retryDownload(() => ToolsApi_1.toolsApi.DownloadFile({
                         "AppID": json.msg.appmsg.appid,
                         "AttachId": json.msg.appmsg.appattach.attachid,
                         "DataLen": totalSize,
-                        "Section": chunk,
-                        "UserName": this.msg.FromUserName,
+                        "Section": { StartPos: position, DataLen: Math.min(512 * 1024, totalSize - position) },
+                        "NewMsgId": this.msg.NewMsgId && String(this.msg.NewMsgId) !== '0'
+                            ? this.msg.NewMsgId : json.msg.appmsg.overwrite_newmsgid || 0,
+                        "Type": 6,
+                        "UserName": this.msg.RoomId || this.msg.FromUserName,
                         "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
                     }));
-                    const chunkData = Buffer.from(resp.data.Data.data.buffer, 'base64');
-                    completeBuffer = Buffer.concat([completeBuffer, chunkData]);
+                    chunks.push(resp.data);
+                    position += resp.data.length;
                 }
-                const fileBox = file_box_1.FileBox.fromBuffer(completeBuffer, json.msg.appmsg.title);
+                const fileBox = file_box_1.FileBox.fromBuffer(Buffer.concat(chunks, totalSize), json.msg.appmsg.title);
                 return fileBox;
             }
             else if (this.type() === MessageType_1.MessageType.Voice) {

package/dist/entities/ContactEntity.d.ts

@@ -4,6 +4,7 @@ export declare class ContactEntity {
     pyInitial: string;
     quanPin: string;
     sex: number;
+    verifyFlag?: number | null;
     remark: string;
     remarkPyInitial: string;
     remarkQuanPin: string;

package/dist/entities/ContactEntity.js

@@ -35,6 +35,10 @@ __decorate([
     (0, typeorm_1.Column)('integer', { nullable: true }),
     __metadata("design:type", Number)
 ], ContactEntity.prototype, "sex", void 0);
+__decorate([
+    (0, typeorm_1.Column)('integer', { nullable: true }),
+    __metadata("design:type", Object)
+], ContactEntity.prototype, "verifyFlag", void 0);
 __decorate([
     (0, typeorm_1.Column)('text', { nullable: true }),
     __metadata("design:type", String)

package/dist/index.d.ts

@@ -34,12 +34,14 @@ export declare class WxBot extends EventEmitter {
     private callbackInterval;
     private msgInterval;
     private recentMsgIds;
+    private messageQueue;
+    private syncTask;
+    private syncRequested;
+    private loginRecoveryInProgress;
     private syncFailureCount;
     private httpServer;
     private loggingOut;
     private loggingIn;
-    private syncInProgress;
-    private loginRecoveryInProgress;
     constructor({ baseUrl, databasePath, deviceType, mode, callbackPort, ProxyIp, ProxyPassword, ProxyUser }: WxBotOptions);
     qrcode(style?: number): Promise<{
         qrCode: any;
@@ -64,7 +66,9 @@ export declare class WxBot extends EventEmitter {
     private recoverLogin;
     private checkSyncLoginStatus;
     private handleMsg;
-    private handleMsgOnce;
+    private enqueueMessages;
+    private processMessages;
+    private processMessage;
     private logOut;
     /**
      * 清空登录信息
@@ -81,4 +85,5 @@ export declare class WxBot extends EventEmitter {
     get Message(): typeof Message;
 }
 export { Contact, Room, Message };
+export { normalizeContactVerifyFlag, isOfficialAccountVerifyFlag } from './utils/ContactClassification';
 export { Emoji, Voice, WeVideo, UrlLink };