wx2tg-puppet 1.0.7 → 1.0.9

package/dist/core/Message.js

@@ -59,6 +59,32 @@ const audioUtil_1 = require("../utils/audioUtil");
 const path_1 = __importDefault(require("path"));
 const common_2 = require("../action/common");
 const fs = __importStar(require("fs"));
+const FileChunkHelper_1 = require("../utils/FileChunkHelper");
+const MAX_RETRIES = 3;
+const RETRY_DELAY = 1000; // 1 second
+// @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* () {
+        var _a, _b, _c, _d, _e, _f;
+        let lastError;
+        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) {
+                    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) {
+                lastError = error;
+            }
+            if (i < MAX_RETRIES - 1) {
+                yield new Promise(resolve => setTimeout(resolve, RETRY_DELAY));
+            }
+        }
+        throw new Error(`Download failed after ${MAX_RETRIES} attempts. Last error: ${lastError === null || lastError === void 0 ? void 0 : lastError.message}`);
+    });
+}
 /**
  * Message class for handling and interacting with messages in cache.
  */
@@ -319,39 +345,117 @@ class Message {
                 const xml = this.msg.Content;
                 const json = Message.getXmlToJson(xml);
                 const config = yield config_service_1.configService.get();
-                const resp = yield ToolsApi_1.toolsApi.DownloadImg({
+                const totalSize = parseInt(json.msg.img.length);
+                // 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.DownloadImg({
                     "CompressType": 0,
-                    "DataLen": parseInt(json.msg.img.length),
+                    "DataLen": totalSize,
                     "MsgId": this.msg.MsgId,
-                    "Section": {
-                        "DataLen": parseInt(json.msg.img.length),
-                        "StartPos": 0
-                    },
+                    "Section": firstChunk,
                     "ToWxid": this.msg.ToUserName,
                     "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
-                });
-                const base64Data = resp.data.Data.data.buffer;
-                // 你可以给图片起个名字，比如用 MsgId
-                const fileBox = file_box_1.FileBox.fromBase64(base64Data, `${this.msg.MsgId}.png`);
+                }));
+                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 resp = yield retryDownload(() => ToolsApi_1.toolsApi.DownloadImg({
+                        "CompressType": 0,
+                        "DataLen": totalSize,
+                        "MsgId": this.msg.MsgId,
+                        "Section": chunk,
+                        "ToWxid": this.msg.ToUserName,
+                        "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]);
+                }
+                const fileBox = file_box_1.FileBox.fromBuffer(completeBuffer, `${this.msg.MsgId}.png`);
                 return fileBox;
             }
             else if (this.type() === MessageType_1.MessageType.Video) {
                 const xml = this.msg.Content;
                 const json = Message.getXmlToJson(xml);
                 const config = yield config_service_1.configService.get();
-                const resp = yield ToolsApi_1.toolsApi.DownloadVideo({
+                const totalSize = parseInt(json.msg.videomsg.length);
+                // 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.DownloadVideo({
                     "CompressType": 0,
-                    "DataLen": parseInt(json.msg.videomsg.length),
+                    "DataLen": totalSize,
                     "MsgId": this.msg.MsgId,
-                    "Section": {
-                        "DataLen": parseInt(json.msg.videomsg.length),
-                        "StartPos": 0
-                    },
+                    "Section": firstChunk,
                     "ToWxid": this.msg.ToUserName,
                     "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
-                });
-                const base64Data = resp.data.Data.data.buffer;
-                const fileBox = file_box_1.FileBox.fromBase64(base64Data, `${this.msg.MsgId}.mp4`);
+                }));
+                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 resp = yield retryDownload(() => ToolsApi_1.toolsApi.DownloadVideo({
+                        "CompressType": 0,
+                        "DataLen": totalSize,
+                        "MsgId": this.msg.MsgId,
+                        "Section": chunk,
+                        "ToWxid": this.msg.ToUserName,
+                        "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]);
+                }
+                const fileBox = file_box_1.FileBox.fromBuffer(completeBuffer, `${this.msg.MsgId}.mp4`);
+                return fileBox;
+            }
+            else if (this.type() === MessageType_1.MessageType.File) {
+                const xml = this.msg.Content;
+                const json = Message.getXmlToJson(xml);
+                const config = yield config_service_1.configService.get();
+                const totalSize = parseInt(json.msg.appmsg.appattach.totallen);
+                // 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 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,
+                        "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]);
+                }
+                const fileBox = file_box_1.FileBox.fromBuffer(completeBuffer, json.msg.appmsg.title);
                 return fileBox;
             }
             else if (this.type() === MessageType_1.MessageType.Voice) {
@@ -369,35 +473,12 @@ class Message {
                 const silkFileBox = file_box_1.FileBox.fromBase64(base64Data, `${this.msg.MsgId}.silk`);
                 const silkFilePath = path_1.default.resolve(__dirname, `${this.msg.MsgId}.silk`);
                 const mp3FilePath = path_1.default.resolve(__dirname, `${this.msg.MsgId}.mp3`);
-                // 保存 Silk 文件到本地
                 yield silkFileBox.toFile(silkFilePath);
-                // 使用 SilkToMp3Converter 转换为 MP3
                 const converter = new audioUtil_1.SilkToMp3Converter();
                 yield converter.convertToMp3(silkFilePath, mp3FilePath);
-                // 删除 Silk 文件，只保留 MP3
                 fs.unlinkSync(silkFilePath);
-                // 返回 MP3 文件的 FileBox
                 return file_box_1.FileBox.fromFile(mp3FilePath);
             }
-            else if (this.type() === MessageType_1.MessageType.File) {
-                const xml = this.msg.Content;
-                const json = Message.getXmlToJson(xml);
-                const config = yield config_service_1.configService.get();
-                const resp = yield ToolsApi_1.toolsApi.DownloadFile({
-                    "AppID": json.msg.appmsg.appid,
-                    "AttachId": json.msg.appmsg.appattach.attachid,
-                    "DataLen": json.msg.appmsg.appattach.totallen,
-                    "Section": {
-                        "DataLen": json.msg.appmsg.appattach.totallen,
-                        "StartPos": 0
-                    },
-                    "UserName": this.msg.FromUserName,
-                    "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
-                });
-                const base64Data = resp.data.Data.data.buffer;
-                const fileBox = file_box_1.FileBox.fromBase64(base64Data, json.msg.appmsg.title);
-                return fileBox;
-            }
             else if (this.type() === MessageType_1.MessageType.Emoji) {
                 const xml = this.msg.Content;
                 const json = Message.getXmlToJson(xml);

package/dist/entities/config.entity.d.ts

@@ -2,4 +2,6 @@ export declare class Config {
     id: number;
     uuid: string;
     wxid: string;
+    deviceId: string;
+    DeviceName: string;
 }

package/dist/entities/config.entity.js

@@ -26,6 +26,14 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], Config.prototype, "wxid", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], Config.prototype, "deviceId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], Config.prototype, "DeviceName", void 0);
 exports.Config = Config = __decorate([
     (0, typeorm_1.Entity)()
 ], Config);

package/dist/index.d.ts

@@ -20,6 +20,7 @@ export declare class WxBot extends EventEmitter {
     private interval;
     private heartbeatInterval;
     private msgInterval;
+    private recentMsgIds;
     constructor({ baseUrl, databasePath }: WxBotOptions);
     private fetchAndShowQRCode;
     private setupHeartbeat;

package/dist/index.js

@@ -43,6 +43,7 @@ class WxBot extends events_1.EventEmitter {
         this.interval = null;
         this.heartbeatInterval = null;
         this.msgInterval = null;
+        this.recentMsgIds = []; // Store recent message IDs
         this.baseUrl = baseUrl;
         this.databasePath = databasePath;
         (0, axiosInstance_1.setBaseUrl)(baseUrl);
@@ -50,9 +51,10 @@ class WxBot extends events_1.EventEmitter {
     fetchAndShowQRCode() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                const config = yield config_service_1.configService.get();
                 const response = yield LoginApi_1.loginApi.GetQR({
-                    "DeviceID": "",
-                    "DeviceName": "",
+                    "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
+                    "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
                     "OSModel": "",
                     "Proxy": {
                         "ProxyIp": "",
@@ -106,7 +108,10 @@ class WxBot extends events_1.EventEmitter {
                 const statusData = statusResp.data;
                 if (statusData.Success) {
                     if (statusData.Message === '登陆成功') {
-                        yield config_service_1.configService.save(this.uuid, statusData.Data.acctSectResp.userName);
+                        yield config_service_1.configService.save({
+                            uuid: this.uuid,
+                            wxid: statusData.Data.acctSectResp.userName,
+                        });
                         this.loginSuccess(statusData.Data.acctSectResp.userName);
                         if (this.interval)
                             clearInterval(this.interval);
@@ -164,6 +169,14 @@ class WxBot extends events_1.EventEmitter {
                 return;
             }
             console.log('好友列表获取成功，开始更新联系人信息');
+            // 设置设备信息
+            const cacheInfo = yield LoginApi_1.loginApi.GetCacheInfo(userName);
+            if (cacheInfo.data.Message === '成功') {
+                yield config_service_1.configService.save({
+                    deviceId: cacheInfo.data.Data.Deviceid_str,
+                    DeviceName: cacheInfo.data.Data.DeviceName,
+                });
+            }
             // 获取详情
             const data = res.data;
             data.Data.ContactUsernameList.forEach((contact) => {
@@ -191,6 +204,16 @@ class WxBot extends events_1.EventEmitter {
                     // 更新联系人或者群组信息
                     // 新增：触发 message 事件
                     for (const msg of data.Data.AddMsgs) {
+                        // Check for duplicate messages
+                        const newMsgId = BigInt(msg.NewMsgId);
+                        if (this.recentMsgIds.includes(newMsgId)) {
+                            continue; // Skip duplicate message
+                        }
+                        // Add to recent messages and maintain only last 10
+                        this.recentMsgIds.push(newMsgId);
+                        if (this.recentMsgIds.length > 10) {
+                            this.recentMsgIds.shift(); // Remove oldest message ID
+                        }
                         // 将msg转换为Message类型
                         const message = new Message_1.Message({
                             MsgId: msg.MsgId,

package/dist/services/config.service.d.ts

@@ -2,7 +2,7 @@ import { Config } from '../entities/config.entity';
 declare class ConfigService {
     private get repo();
     get(): Promise<Config | null>;
-    save(uuid: string, wxid: string): Promise<Config>;
+    save(config: Partial<Config>): Promise<Config>;
 }
 export declare const configService: ConfigService;
 export {};

package/dist/services/config.service.js

@@ -21,17 +21,17 @@ class ConfigService {
             return this.repo.findOne({ where: {} });
         });
     }
-    save(uuid, wxid) {
+    save(config) {
         return __awaiter(this, void 0, void 0, function* () {
-            let config = yield this.get();
-            if (config) {
-                config.uuid = uuid;
-                config.wxid = wxid;
+            let existingConfig = yield this.get();
+            if (existingConfig) {
+                Object.assign(existingConfig, config);
+                return this.repo.save(existingConfig);
             }
             else {
-                config = this.repo.create({ uuid, wxid });
+                const newConfig = this.repo.create(config);
+                return this.repo.save(newConfig);
             }
-            return this.repo.save(config);
         });
     }
 }

package/dist/utils/FileChunkHelper.d.ts

@@ -0,0 +1,30 @@
+export interface FileChunk {
+    DataLen: number;
+    StartPos: number;
+}
+export declare class FileChunkHelper {
+    private static readonly INITIAL_CHUNK_SIZE;
+    private static lastDownloadedLength;
+    /**
+     * Calculate file chunks based on total file size
+     * @param totalSize Total file size in bytes
+     * @param downloadedLength Optional length from previous download (iLen)
+     * @returns Array of chunks with DataLen and StartPos
+     */
+    static calculateChunks(totalSize: number, downloadedLength?: number): FileChunk[];
+    /**
+     * Get a specific chunk information
+     * @param totalSize Total file size in bytes
+     * @param chunkIndex Chunk index (0-based)
+     * @param downloadedLength Optional length from previous download (iLen)
+     * @returns Chunk information or null if index is out of range
+     */
+    static getChunk(totalSize: number, chunkIndex: number, downloadedLength?: number): FileChunk | null;
+    /**
+     * Get total number of chunks needed for a file
+     * @param totalSize Total file size in bytes
+     * @param downloadedLength Optional length from previous download (iLen)
+     * @returns Total number of chunks
+     */
+    static getTotalChunks(totalSize: number, downloadedLength?: number): number;
+}

package/dist/utils/FileChunkHelper.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileChunkHelper = void 0;
+class FileChunkHelper {
+    /**
+     * Calculate file chunks based on total file size
+     * @param totalSize Total file size in bytes
+     * @param downloadedLength Optional length from previous download (iLen)
+     * @returns Array of chunks with DataLen and StartPos
+     */
+    static calculateChunks(totalSize, downloadedLength) {
+        const chunks = [];
+        let position = 0;
+        // Use consistent chunk size throughout
+        const chunkSize = downloadedLength || this.INITIAL_CHUNK_SIZE;
+        while (position < totalSize) {
+            const remainingSize = totalSize - position;
+            const currentChunkSize = Math.min(chunkSize, remainingSize);
+            chunks.push({
+                DataLen: currentChunkSize,
+                StartPos: position
+            });
+            position += currentChunkSize;
+        }
+        return chunks;
+    }
+    /**
+     * Get a specific chunk information
+     * @param totalSize Total file size in bytes
+     * @param chunkIndex Chunk index (0-based)
+     * @param downloadedLength Optional length from previous download (iLen)
+     * @returns Chunk information or null if index is out of range
+     */
+    static getChunk(totalSize, chunkIndex, downloadedLength) {
+        const chunks = this.calculateChunks(totalSize, downloadedLength);
+        return chunks[chunkIndex] || null;
+    }
+    /**
+     * Get total number of chunks needed for a file
+     * @param totalSize Total file size in bytes
+     * @param downloadedLength Optional length from previous download (iLen)
+     * @returns Total number of chunks
+     */
+    static getTotalChunks(totalSize, downloadedLength) {
+        return this.calculateChunks(totalSize, downloadedLength).length;
+    }
+}
+exports.FileChunkHelper = FileChunkHelper;
+FileChunkHelper.INITIAL_CHUNK_SIZE = 1024; // Initial chunk size for first request
+FileChunkHelper.lastDownloadedLength = null; // Store the last downloaded length

package/package.json

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