wx2tg-puppet 3.0.8 → 6.0.16

package/dist/utils/SolitairePayload.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SOLITAIRE_FALLBACK = void 0;
+exports.isBoundedAppMessageXml = isBoundedAppMessageXml;
+exports.getSolitaireDisplayText = getSolitaireDisplayText;
+const fast_xml_parser_1 = require("fast-xml-parser");
+exports.SOLITAIRE_FALLBACK = '[接龙] 内容暂时无法解析，请在微信查看。';
+const MAX_XML_BYTES = 1024 * 1024;
+/** Bound solitaire display parsing; do not impose this size limit on other app types. */
+function isBoundedAppMessageXml(value) {
+    return typeof value === 'string' && value.length <= MAX_XML_BYTES &&
+        Buffer.byteLength(value, 'utf8') <= MAX_XML_BYTES &&
+        !/<!\s*(?:DOCTYPE|ENTITY)\b/i.test(value);
+}
+function decodeXmlText(value) {
+    const named = { amp: '&', lt: '<', gt: '>', quot: '"', apos: "'" };
+    // A single pass is important: &amp;lt; is visible text "&lt;", not "<".
+    return value.replace(/&([^;]*);|&/g, (match, entity) => {
+        if (entity && Object.prototype.hasOwnProperty.call(named, entity))
+            return named[entity];
+        if (!entity || !/^#(?:[0-9]+|x[0-9a-fA-F]+)$/.test(entity)) {
+            throw new Error('Invalid XML entity');
+        }
+        const code = entity[1] === 'x' ? parseInt(entity.slice(2), 16) : Number(entity.slice(1));
+        if (!(code === 9 || code === 10 || code === 13 ||
+            (code >= 0x20 && code <= 0xd7ff) || (code >= 0xe000 && code <= 0xfffd) ||
+            (code >= 0x10000 && code <= 0x10ffff))) {
+            throw new Error('Invalid XML character');
+        }
+        return String.fromCodePoint(code);
+    });
+}
+/** Only appmsg.title is display text; solitaire_info is deliberately never interpreted. */
+function getSolitaireDisplayText(payload) {
+    var _a;
+    try {
+        if (!isBoundedAppMessageXml(payload))
+            return exports.SOLITAIRE_FALLBACK;
+        // Only a single, identifier-shaped WeChat sender line may precede the XML.
+        const xml = payload.replace(/^[A-Za-z0-9_.@-]{1,256}:\r?\n/, '').trimStart();
+        if (fast_xml_parser_1.XMLValidator.validate(xml) !== true)
+            return exports.SOLITAIRE_FALLBACK;
+        // Convert CDATA before locating scalar title text, so a literal closing
+        // tag inside CDATA cannot end it. Protect CR only inside title text:
+        // replacing XML-declaration/root whitespace would create invalid entities.
+        const escaped = xml.replace(/<!\[CDATA\[([\s\S]*?)\]\]>/g, (_, text) => text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;'))
+            .replace(/(<title\s*>)([\s\S]*?)(<\/title\s*>)/g, (_, open, text, close) => open + text.replace(/\r/g, '&#13;') + close);
+        const parsed = new fast_xml_parser_1.XMLParser({
+            parseTagValue: false,
+            trimValues: false,
+            processEntities: false,
+            ignoreAttributes: false,
+            ignoreDeclaration: true,
+            commentPropName: '#comment',
+        }).parse(escaped);
+        // Require an unambiguous envelope and scalar title (no nested markup/attributes).
+        if (Object.keys(parsed).some(key => key !== 'msg'))
+            return exports.SOLITAIRE_FALLBACK;
+        const app = (_a = parsed.msg) === null || _a === void 0 ? void 0 : _a.appmsg;
+        if (!app || Array.isArray(parsed.msg) || Array.isArray(app) ||
+            typeof app.type !== 'string' || app.type.trim() !== '53' ||
+            typeof app.title !== 'string')
+            return exports.SOLITAIRE_FALLBACK;
+        const title = decodeXmlText(app.title);
+        if (!title.trim() || /[\u0000-\u0008\u000b\u000c\u000e-\u001f\ufffe\uffff]/u.test(title)) {
+            return exports.SOLITAIRE_FALLBACK;
+        }
+        for (const point of title) {
+            const code = point.codePointAt(0);
+            if (code >= 0xd800 && code <= 0xdfff)
+                return exports.SOLITAIRE_FALLBACK;
+        }
+        return title;
+    }
+    catch (_b) {
+        return exports.SOLITAIRE_FALLBACK;
+    }
+}

package/dist/utils/downloadFileSection.d.ts

@@ -0,0 +1,11 @@
+import { AxiosResponse } from 'axios';
+import { ApiResponse } from '../types/ApiResponse';
+export interface FileSection {
+    response: AxiosResponse;
+    buffer: Buffer;
+    legacy?: ApiResponse;
+}
+/** The single section engine; DownloadFile alone bypasses the shared JSON transformer. */
+export declare function fetchFileSection(body: any): Promise<FileSection>;
+/** v6 contract: exactly one section, retaining the Axios response and raw bytes. */
+export declare function downloadFileSection(body: any): Promise<AxiosResponse<Buffer>>;

package/dist/utils/downloadFileSection.js

@@ -0,0 +1,153 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchFileSection = fetchFileSection;
+exports.downloadFileSection = downloadFileSection;
+const json_bigint_1 = __importDefault(require("json-bigint"));
+const axiosInstance_1 = require("./axiosInstance");
+const FileDownloadError_1 = require("./FileDownloadError");
+const json = (0, json_bigint_1.default)();
+const responseJson = (0, json_bigint_1.default)({ storeAsString: true });
+const TRANSIENT_CODES = ['ECONNRESET', 'ECONNABORTED', 'ETIMEDOUT', 'EPIPE', 'EAI_AGAIN', 'ECONNREFUSED'];
+function businessCode(value) {
+    var _a, _b, _c, _d;
+    const native = [(_b = (_a = value === null || value === void 0 ? void 0 : value.Data) === null || _a === void 0 ? void 0 : _a.BaseResponse) === null || _b === void 0 ? void 0 : _b.ret, (_d = (_c = value === null || value === void 0 ? void 0 : value.Data) === null || _c === void 0 ? void 0 : _c.baseResponse) === null || _d === void 0 ? void 0 : _d.ret]
+        .find(ret => Number.isSafeInteger(ret) && ret !== 0);
+    const code = native !== null && native !== void 0 ? native : value === null || value === void 0 ? void 0 : value.Code;
+    return Number.isSafeInteger(code) ? code : undefined;
+}
+function header(response, name) {
+    const key = Object.keys(response.headers || {}).find(key => key.toLowerCase() === name);
+    return key === undefined || response.headers[key] === undefined ? undefined : String(response.headers[key]);
+}
+function decodeLegacy(value, total, start, status) {
+    const payload = value === null || value === void 0 ? void 0 : value.Data;
+    if ((value === null || value === void 0 ? void 0 : value.Success) !== true || (value === null || value === void 0 ? void 0 : value.Code) !== 0 ||
+        [payload === null || payload === void 0 ? void 0 : payload.BaseResponse, payload === null || payload === void 0 ? void 0 : payload.baseResponse].some(native => (native === null || native === void 0 ? void 0 : native.ret) !== undefined && native.ret !== 0)) {
+        const code = businessCode(value);
+        throw new FileDownloadError_1.FileDownloadError(`legacy response failed or malformed${code === undefined ? '' : ` (code ${code})`}`, status, code);
+    }
+    const data = payload === null || payload === void 0 ? void 0 : payload.data;
+    const encoded = data === null || data === void 0 ? void 0 : data.buffer;
+    if (typeof encoded !== 'string' || !/^[A-Za-z0-9+/]*={0,2}$/.test(encoded) ||
+        (encoded.includes('=') && encoded.length % 4 !== 0)) {
+        throw new FileDownloadError_1.FileDownloadError('malformed legacy Base64', status);
+    }
+    const bytes = Buffer.from(encoded, 'base64');
+    if (bytes.toString('base64').replace(/=+$/, '') !== encoded.replace(/=+$/, '')) {
+        throw new FileDownloadError_1.FileDownloadError('malformed legacy Base64', status);
+    }
+    for (const [actual, expected] of [[data.iLen, bytes.length], [payload.dataLen, bytes.length],
+        [payload.totalLen, total], [payload.startPos, start]]) {
+        if (actual !== undefined && actual !== expected) {
+            throw new FileDownloadError_1.FileDownloadError('truncated or inconsistent legacy section metadata', status);
+        }
+    }
+    return bytes;
+}
+/** The single section engine; DownloadFile alone bypasses the shared JSON transformer. */
+function fetchFileSection(body) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const total = body === null || body === void 0 ? void 0 : body.DataLen;
+        const start = (_a = body === null || body === void 0 ? void 0 : body.Section) === null || _a === void 0 ? void 0 : _a.StartPos;
+        const length = (_b = body === null || body === void 0 ? void 0 : body.Section) === null || _b === void 0 ? void 0 : _b.DataLen;
+        if (!Number.isSafeInteger(total) || total <= 0 || total > 0xffffffff ||
+            !Number.isSafeInteger(start) || start < 0 || start >= total ||
+            !Number.isSafeInteger(length) || length <= 0 || length > 0xffffffff) {
+            throw new FileDownloadError_1.FileDownloadError('invalid total or section length');
+        }
+        const expected = Math.min(length, total - start);
+        // JSONbig keeps uint64 message IDs numeric on the wire without rounding them.
+        if (typeof body.NewMsgId === 'number' && !Number.isSafeInteger(body.NewMsgId)) {
+            throw new FileDownloadError_1.FileDownloadError('invalid NewMsgId');
+        }
+        const newMsgId = String((_c = body.NewMsgId) !== null && _c !== void 0 ? _c : 0);
+        if (!/^(0|[1-9]\d*)$/.test(newMsgId) || BigInt(newMsgId) > BigInt('18446744073709551615')) {
+            throw new FileDownloadError_1.FileDownloadError('invalid NewMsgId');
+        }
+        let response;
+        try {
+            response = yield axiosInstance_1.axiosInstance.post('/Tools/DownloadFile', json.stringify(Object.assign(Object.assign({}, body), { NewMsgId: json.parse(newMsgId) })), {
+                headers: { 'Content-Type': 'application/json' },
+                responseType: 'arraybuffer',
+                transformResponse: [data => data],
+                validateStatus: () => true,
+                // First CDN fallback can consume the server's entire 120-second I/O budget.
+                timeout: 180000,
+                maxContentLength: Math.ceil(expected / 3) * 4 + 64 * 1024,
+            });
+        }
+        catch (error) {
+            const code = error === null || error === void 0 ? void 0 : error.code;
+            const timedOut = code === 'ECONNABORTED' || code === 'ETIMEDOUT';
+            throw new FileDownloadError_1.FileDownloadError(timedOut ? 'request timed out' :
+                'transport failed (interrupted, truncated or oversized response)', undefined, undefined, typeof code === 'string' && TRANSIENT_CODES.includes(code));
+        }
+        const contentType = String((_d = header(response, 'content-type')) !== null && _d !== void 0 ? _d : '').split(';')[0].trim().toLowerCase();
+        const isJson = /^application\/(?:[\w.+-]+\+)?json$/.test(contentType);
+        const raw = response.data;
+        const bytes = Buffer.isBuffer(raw) ? raw : raw instanceof ArrayBuffer ? Buffer.from(raw) :
+            ArrayBuffer.isView(raw) ? Buffer.from(raw.buffer, raw.byteOffset, raw.byteLength) :
+                typeof raw === 'string' && isJson ? Buffer.from(raw, 'utf8') : undefined;
+        let value;
+        if (bytes && (isJson || !contentType)) {
+            try {
+                value = responseJson.parse(bytes.toString('utf8'));
+            }
+            catch ( /* Parser diagnostics can expose response contents. */_e) { /* Parser diagnostics can expose response contents. */ }
+        }
+        // HTTP status wins over malformed error bodies, including HTML/invalid JSON 503s.
+        if (response.status !== 200 && response.status !== 206) {
+            const status = Number.isSafeInteger(response.status) ? response.status : undefined;
+            const code = businessCode(value);
+            throw new FileDownloadError_1.FileDownloadError(`HTTP ${status !== null && status !== void 0 ? status : 0} unexpected status${code === undefined ? '' : ` (code ${code})`}`, status, code, [429, 502, 503, 504].includes(status !== null && status !== void 0 ? status : 0));
+        }
+        if (!bytes)
+            throw new FileDownloadError_1.FileDownloadError('expected binary response body', response.status);
+        const declared = header(response, 'content-length');
+        if (declared !== undefined && (!/^\d+$/.test(String(declared)) || Number(declared) !== bytes.length)) {
+            throw new FileDownloadError_1.FileDownloadError('truncated or inconsistent Content-Length', response.status);
+        }
+        const legacy = isJson || !contentType;
+        if (!legacy && contentType !== 'application/octet-stream') {
+            throw new FileDownloadError_1.FileDownloadError('unexpected response Content-Type', response.status);
+        }
+        const buffer = legacy ? decodeLegacy(value, total, start, response.status) : bytes;
+        if (!buffer.length)
+            throw new FileDownloadError_1.FileDownloadError('empty section', response.status);
+        if (buffer.length > expected)
+            throw new FileDownloadError_1.FileDownloadError('oversized section', response.status);
+        const range = header(response, 'content-range');
+        // Binary 206 requires a range; JSON servers may return HTTP 200 per section.
+        if (range !== undefined || (!legacy && response.status === 206)) {
+            const match = /^bytes (\d+)-(\d+)\/(\d+)$/.exec(String(range));
+            if (!match || Number(match[1]) !== start || Number(match[2]) !== start + buffer.length - 1 ||
+                Number(match[3]) !== total) {
+                throw new FileDownloadError_1.FileDownloadError('truncated or inconsistent Content-Range', response.status);
+            }
+        }
+        if (!legacy && response.status === 200 && (start !== 0 || buffer.length !== total)) {
+            throw new FileDownloadError_1.FileDownloadError('HTTP 200 returned an incomplete file', response.status);
+        }
+        return Object.assign({ response, buffer }, (legacy ? { legacy: value } : {}));
+    });
+}
+/** v6 contract: exactly one section, retaining the Axios response and raw bytes. */
+function downloadFileSection(body) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const section = yield fetchFileSection(body);
+        return Object.assign(Object.assign({}, section.response), { data: section.buffer });
+    });
+}

package/dist/utils/fileDownload.d.ts

@@ -0,0 +1,9 @@
+import { AxiosResponse } from 'axios';
+import { ApiResponse } from '../types/ApiResponse';
+import { FileSection } from './downloadFileSection';
+export { fetchFileSection, FileSection } from './downloadFileSection';
+export { FileDownloadError } from './FileDownloadError';
+/** Explicit compatibility API for consumers using Data.data.buffer. */
+export declare function legacyFileSection(section: FileSection, body: any): AxiosResponse<ApiResponse>;
+/** Advance by actual bytes, retrying only transient failures at the same offset. */
+export declare function downloadFileBuffer(body: any): Promise<Buffer>;

package/dist/utils/fileDownload.js

@@ -0,0 +1,57 @@
+"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.FileDownloadError = exports.fetchFileSection = void 0;
+exports.legacyFileSection = legacyFileSection;
+exports.downloadFileBuffer = downloadFileBuffer;
+const buffer_1 = require("buffer");
+const downloadFileSection_1 = require("./downloadFileSection");
+const FileDownloadError_1 = require("./FileDownloadError");
+var downloadFileSection_2 = require("./downloadFileSection");
+Object.defineProperty(exports, "fetchFileSection", { enumerable: true, get: function () { return downloadFileSection_2.fetchFileSection; } });
+var FileDownloadError_2 = require("./FileDownloadError");
+Object.defineProperty(exports, "FileDownloadError", { enumerable: true, get: function () { return FileDownloadError_2.FileDownloadError; } });
+const CHUNK_SIZE = 512 * 1024;
+/** Explicit compatibility API for consumers using Data.data.buffer. */
+function legacyFileSection(section, body) {
+    var _a;
+    const { response, buffer, legacy } = section;
+    return Object.assign(Object.assign({}, response), { data: Object.assign(Object.assign({}, legacy), { Code: 0, Success: true, Message: (legacy === null || legacy === void 0 ? void 0 : legacy.Message) || '成功', Data: Object.assign(Object.assign({}, legacy === null || legacy === void 0 ? void 0 : legacy.Data), { BaseResponse: { ret: 0 }, totalLen: body.DataLen, startPos: body.Section.StartPos, dataLen: buffer.length, data: Object.assign(Object.assign({}, (_a = legacy === null || legacy === void 0 ? void 0 : legacy.Data) === null || _a === void 0 ? void 0 : _a.data), { iLen: buffer.length, buffer: buffer.toString('base64') }) }) }) });
+}
+/** Advance by actual bytes, retrying only transient failures at the same offset. */
+function downloadFileBuffer(body) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const total = body === null || body === void 0 ? void 0 : body.DataLen;
+        if (!Number.isSafeInteger(total) || total <= 0 || total > 0xffffffff || total > buffer_1.constants.MAX_LENGTH) {
+            throw new FileDownloadError_1.FileDownloadError('invalid total length');
+        }
+        const chunks = [];
+        let offset = 0;
+        while (offset < total) {
+            const request = Object.assign(Object.assign({}, body), { Section: { StartPos: offset, DataLen: Math.min(CHUNK_SIZE, total - offset) } });
+            let section;
+            for (let attempt = 0;; attempt++) {
+                try {
+                    section = yield (0, downloadFileSection_1.fetchFileSection)(request);
+                    break;
+                }
+                catch (error) {
+                    if (!(error instanceof FileDownloadError_1.FileDownloadError) || !error.retryable || attempt >= 2)
+                        throw error;
+                    yield new Promise(resolve => setTimeout(resolve, 1000 * (attempt + 1)));
+                }
+            }
+            chunks.push(section.buffer);
+            offset += section.buffer.length;
+        }
+        return Buffer.concat(chunks, total);
+    });
+}

package/package.json

@@ -1,42 +1,50 @@
-{
-  "name": "wx2tg-puppet",
-  "version": "3.0.8",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "README.md"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "start": "node dist/index.js",
-    "dev": "ts-node src/index.ts",
-    "test": "ts-node src/test.ts",
-    "prepublishOnly": "npm run build"
-  },
-  "keywords": [
-    "wechat",
-    "bot",
-    "puppet"
-  ],
-  "author": "",
-  "license": "ISC",
-  "description": "微信机器人核心库，可作为依赖被其他项目引入。",
-  "devDependencies": {
-    "@types/json-bigint": "^1.0.4",
-    "@types/qrcode-terminal": "^0.12.2",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.8.3"
-  },
-  "dependencies": {
-    "axios": "^1.9.0",
-    "fast-xml-parser": "^5.2.3",
-    "file-box": "^1.4.15",
-    "json-bigint": "^1.0.0",
-    "qrcode-terminal": "^0.12.0",
-    "reflect-metadata": "^0.2.2",
-    "sqlite3": "^5.1.7",
-    "typeorm": "^0.3.23",
-    "wx-voice": "^0.2.1"
-  }
-}
+{
+  "name": "wx2tg-puppet",
+  "version": "6.0.16",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "README.md",
+    "VERSION"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/index.js",
+    "dev": "ts-node src/index.ts",
+    "test": "npm run build && node --test test/*.test.cjs tests/*.test.cjs",
+    "test:download": "npm run build && node --test test/download.test.cjs tests/file-download.test.cjs",
+    "check:version": "node scripts/check-version.cjs",
+    "prepack": "npm run check:version && npm run build",
+    "prepublishOnly": "npm run check:version && npm test"
+  },
+  "keywords": [
+    "wechat",
+    "bot",
+    "puppet"
+  ],
+  "author": "",
+  "license": "ISC",
+  "description": "微信机器人核心库，可作为依赖被其他项目引入。",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/finalpi/wx2tg-puppet.git"
+  },
+  "devDependencies": {
+    "@types/json-bigint": "^1.0.4",
+    "@types/qrcode-terminal": "^0.12.2",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.3"
+  },
+  "dependencies": {
+    "axios": "^1.9.0",
+    "fast-xml-parser": "^5.2.3",
+    "file-box": "^1.4.15",
+    "json-bigint": "^1.0.0",
+    "qrcode-terminal": "^0.12.0",
+    "reflect-metadata": "^0.2.2",
+    "sqlite3": "^5.1.7",
+    "typeorm": "^0.3.23",
+    "wx-voice": "^0.2.1"
+  }
+}