wx2tg-puppet 1.0.8 → 1.1.0

package/dist/api/ToolsApi.d.ts

@@ -27,6 +27,8 @@ declare class ToolsApi {
     UploadFile(body: any): Axios.IPromise<Axios.AxiosXHR<unknown>>;
     /** 设置/删除代理IP */
     setproxy(body: any): Axios.IPromise<Axios.AxiosXHR<unknown>>;
+    /** CDN图片下载 */
+    CdnDownloadImage(body: any): Axios.IPromise<Axios.AxiosXHR<unknown>>;
 }
 export declare const toolsApi: ToolsApi;
 export {};

package/dist/api/ToolsApi.js

@@ -59,5 +59,9 @@ class ToolsApi {
     setproxy(body) {
         return axiosInstance_1.axiosInstance.post('/Tools/setproxy', body);
     }
+    /** CDN图片下载 */
+    CdnDownloadImage(body) {
+        return axiosInstance_1.axiosInstance.post('/Tools/CdnDownloadImage', body);
+    }
 }
 exports.toolsApi = new ToolsApi();

package/dist/core/Message.js

@@ -341,10 +341,29 @@ class Message {
     }
     toFileBox() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this.type() === MessageType_1.MessageType.Image) {
                 const xml = this.msg.Content;
                 const json = Message.getXmlToJson(xml);
                 const config = yield config_service_1.configService.get();
+                // 优先使用 cdn 下载
+                const aeskey = json.msg.img.aeskey;
+                let url = json.msg.img.cdnbigimgurl;
+                if (!url) {
+                    url = json.msg.img.cdnmidimgurl;
+                }
+                else if (!url) {
+                    url = json.msg.img.cdnthumburl;
+                }
+                const cdnResp = yield ToolsApi_1.toolsApi.CdnDownloadImage({
+                    "FileAesKey": aeskey,
+                    "FileNo": url,
+                    "Wxid": (config === null || config === void 0 ? void 0 : config.wxid) || ''
+                });
+                if (((_a = cdnResp === null || cdnResp === void 0 ? void 0 : cdnResp.data) === null || _a === void 0 ? void 0 : _a.Message) === '成功') {
+                    const fileBox = file_box_1.FileBox.fromBase64(cdnResp.data.Data.Image, `${this.msg.MsgId}.png`);
+                    return fileBox;
+                }
                 const totalSize = parseInt(json.msg.img.length);
                 // Get initial chunk size from first request
                 const firstChunk = FileChunkHelper_1.FileChunkHelper.getChunk(totalSize, 0);

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.js

@@ -51,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": "",
@@ -107,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);
@@ -165,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) => {

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/package.json

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

package/README.md

@@ -1,40 +0,0 @@
-# wx2tg-puppet
-
-微信机器人核心库，可作为依赖被其他项目引入。
-
-## 安装
-
-```bash
-npm install /path/to/your/wx2tg-puppet
-# 或发布到 npm 后
-npm install wx2tg-puppet
-```
-
-## 使用示例
-
-```ts
-import { WxBot } from 'wx2tg-puppet';
-
-const bot = new WxBot({
-  baseUrl: 'http://your-api-url',
-  databasePath: './db.sqlite',
-});
-
-bot.on('scan', (qrcode) => {
-  // 展示二维码
-});
-bot.on('login', (user) => {
-  // 登录成功
-});
-bot.on('message', (msg) => {
-  // 收到消息
-});
-
-bot.start();
-```
-
-## 导出内容
-- WxBot
-- Contact
-- Room
-- Message