wx2tg-puppet 3.0.5 → 3.0.7

package/dist/action/common.js

@@ -137,8 +137,7 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                 case 'other':
                     // 直接从 FileBox 获取文件内容
                     const fileBuffer = yield content.toBuffer();
-                    const fileArrayBuffer = fileBuffer.buffer.slice(fileBuffer.byteOffset, fileBuffer.byteOffset + fileBuffer.byteLength);
-                    const fileBlob = new Blob([fileArrayBuffer], { type: 'application/octet-stream' });
+                    const fileBlob = new Blob([new Uint8Array(fileBuffer)], { type: 'application/octet-stream' });
                     // 创建 FormData
                     const formData = new FormData();
                     formData.append('wxid', (config === null || config === void 0 ? void 0 : config.wxid) || '');

package/dist/api/ToolsApi.d.ts

@@ -9,6 +9,8 @@ declare class ToolsApi {
     OpenHongBao(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 文件下载 */
     DownloadFile(body: any): Promise<AxiosResponse<ApiResponse>>;
+    /** 文件消息下载 */
+    DownloadFileMessage(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 高清图片下载 */
     DownloadImg(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 视频下载 */

package/dist/api/ToolsApi.js

@@ -19,6 +19,10 @@ class ToolsApi {
     DownloadFile(body) {
         return axiosInstance_1.axiosInstance.post('/Tools/DownloadFile', body);
     }
+    /** 文件消息下载 */
+    DownloadFileMessage(body) {
+        return axiosInstance_1.axiosInstance.post('/Tools/DownloadFileMessage', body);
+    }
     /** 高清图片下载 */
     DownloadImg(body) {
         return axiosInstance_1.axiosInstance.post('/Tools/DownloadImg', body);

package/dist/core/Message.d.ts

@@ -73,6 +73,9 @@ export declare class Message {
      * Get the text content of the message.
      */
     text(): string;
+    private decodeDownloadBuffer;
+    private findDownloadBufferSource;
+    downloadFileMessage(sourceXml?: string): Promise<FileBox | null>;
     static getXmlToJson(xml: string): any;
     static getType(type: number, xml: string): string | undefined;
     /**

package/dist/core/Message.js

@@ -63,6 +63,7 @@ const GroupApi_1 = require("../api/GroupApi");
 const contact_service_1 = require("../services/contact.service");
 const MAX_RETRIES = 3;
 const RETRY_DELAY = 1000; // 1 second
+const LARGE_FILE_THRESHOLD = 80 * 1024 * 1024;
 // @ts-ignore - Ignore type errors for the entire function since we're dealing with a mix of old and new axios types
 function retryDownload(downloadFn) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -217,6 +218,77 @@ class Message {
         // TODO: Implement text content retrieval
         return this.msg.Content;
     }
+    decodeDownloadBuffer(bufferSource) {
+        if (Buffer.isBuffer(bufferSource)) {
+            return bufferSource;
+        }
+        if (Array.isArray(bufferSource)) {
+            return Buffer.from(bufferSource);
+        }
+        if (typeof bufferSource === 'string') {
+            const base64 = bufferSource.replace(/^data:[^;]+;base64,/, '');
+            return Buffer.from(base64, 'base64');
+        }
+        throw new Error('Unsupported download response format');
+    }
+    findDownloadBufferSource(value, preferredKeys = []) {
+        if (!value) {
+            return undefined;
+        }
+        if (Buffer.isBuffer(value) || Array.isArray(value) || typeof value === 'string') {
+            return value;
+        }
+        if (typeof value !== 'object') {
+            return undefined;
+        }
+        const fallbackKeys = ['Image', 'image', 'Buffer', 'buffer', 'FileData', 'fileData', 'Base64', 'base64'];
+        for (const key of [...preferredKeys, ...fallbackKeys]) {
+            if (value[key]) {
+                const candidate = this.findDownloadBufferSource(value[key]);
+                if (candidate) {
+                    return candidate;
+                }
+            }
+        }
+        for (const key of Object.keys(value)) {
+            const candidate = this.findDownloadBufferSource(value[key]);
+            if (candidate) {
+                return candidate;
+            }
+        }
+        return undefined;
+    }
+    downloadFileMessage(sourceXml) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            if (this.type() !== MessageType_1.MessageType.File) {
+                return null;
+            }
+            const config = yield config_service_1.configService.get();
+            const xml = sourceXml || this.msg.Content;
+            const json = Message.getXmlToJson(xml);
+            const title = ((_b = (_a = json === null || json === void 0 ? void 0 : json.msg) === null || _a === void 0 ? void 0 : _a.appmsg) === null || _b === void 0 ? void 0 : _b.title) || `${this.msg.MsgId}`;
+            const response = yield ToolsApi_1.toolsApi.DownloadFileMessage({
+                Wxid: (config === null || config === void 0 ? void 0 : config.wxid) || '',
+                Xml: xml,
+                SourceXml: xml,
+                MsgID: Number(this.msg.MsgId || 0),
+                NewMsgID: Number(this.msg.NewMsgId || 0),
+                Talker: this.msg.RoomId || this.msg.FromUserName || this.msg.ToUserName || '',
+                SenderUserName: this.msg.FromUserName || '',
+                MsgType: 49,
+            });
+            if (((_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.Success) !== true) {
+                throw new Error(((_d = response === null || response === void 0 ? void 0 : response.data) === null || _d === void 0 ? void 0 : _d.Message) || 'DownloadFileMessage failed');
+            }
+            const bufferSource = (_k = (_g = (_f = (_e = response === null || response === void 0 ? void 0 : response.data) === null || _e === void 0 ? void 0 : _e.Data) === null || _f === void 0 ? void 0 : _f.FileData) !== null && _g !== void 0 ? _g : (_j = (_h = response === null || response === void 0 ? void 0 : response.data) === null || _h === void 0 ? void 0 : _h.Data) === null || _j === void 0 ? void 0 : _j.fileData) !== null && _k !== void 0 ? _k : this.findDownloadBufferSource((_l = response === null || response === void 0 ? void 0 : response.data) === null || _l === void 0 ? void 0 : _l.Data, ['FileData', 'fileData']);
+            const buffer = this.decodeDownloadBuffer(bufferSource);
+            if (!buffer.length) {
+                throw new Error('DownloadFileMessage returned empty buffer');
+            }
+            return file_box_1.FileBox.fromBuffer(buffer, title);
+        });
+    }
     static getXmlToJson(xml) {
         const parser = new fast_xml_parser_1.XMLParser({
             ignoreAttributes: false, // 不忽略属性
@@ -484,6 +556,9 @@ class Message {
                 const json = Message.getXmlToJson(xml);
                 const config = yield config_service_1.configService.get();
                 const totalSize = parseInt(json.msg.appmsg.appattach.totallen);
+                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)

package/dist/utils/axiosInstance.js

@@ -53,7 +53,7 @@ function detectProtocolVersion() {
         protocolDetected = true;
         try {
             const resp = yield exports.axiosInstance.get('/Tools/Version');
-            if (((_a = resp.data) === null || _a === void 0 ? void 0 : _a.Code) === 0 && ((_b = resp.data) === null || _b === void 0 ? void 0 : _b.Success) && ((_c = resp.data) === null || _c === void 0 ? void 0 : _c.Data)) {
+            if (((_a = resp.data) === null || _a === void 0 ? void 0 : _a.Code) === 0 && ((_b = resp.data) === null || _b === void 0 ? void 0 : _b.Success) && String(((_c = resp.data) === null || _c === void 0 ? void 0 : _c.Data) || '') !== '857') {
                 newProtocol = true;
                 console.log(`检测到新协议版本: ${resp.data.Data}`);
                 return true;

package/package.json

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