wx2tg-puppet 1.0.9 → 1.1.1

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/Friendship.d.ts

@@ -0,0 +1,32 @@
+interface FriendshipConstructor {
+    fromnickname?: string;
+    nickName?: string;
+    fromusername: string;
+    encryptusername?: string;
+    v3?: string;
+    ticket?: string;
+    v4?: string;
+    BigHeadImgUrl?: string;
+    bigHeadImgUrl?: string;
+    SmallHeadImgUrl?: string;
+    smallHeadImgUrl?: string;
+    content?: string;
+    scene: number;
+}
+export declare class Friendship {
+    private fromName;
+    private formId;
+    private v3;
+    private v4;
+    private bigHeadImgUrl;
+    private smallHeadImgUrl;
+    private content;
+    private scene;
+    constructor(obj: FriendshipConstructor);
+    accept(): Promise<any>;
+    hello(): string;
+    type(): number;
+    static search(mobile: string): Promise<Friendship | undefined>;
+    static add(contact: Friendship, helloMessage?: string): Promise<any>;
+}
+export {};

package/dist/core/Friendship.js

@@ -0,0 +1,121 @@
+"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.Friendship = void 0;
+const FriendApi_1 = require("../api/FriendApi");
+const config_service_1 = require("../services/config.service");
+class Friendship {
+    constructor(obj) {
+        this.fromName = obj.fromnickname || obj.nickName || ''; // 代表联系人的信息
+        this.formId = obj.fromusername;
+        this.v3 = obj.encryptusername || obj.v3 || '';
+        this.v4 = obj.ticket || obj.v4 || '';
+        this.bigHeadImgUrl = obj.BigHeadImgUrl || obj.bigHeadImgUrl || '';
+        this.smallHeadImgUrl = obj.SmallHeadImgUrl || obj.smallHeadImgUrl || '';
+        this.content = obj.content || '';
+        this.scene = obj.scene;
+        /**
+         * 3 ：微信号搜索
+         * 4 ：QQ好友
+         * 8 ：来自群聊
+         * 15：手机号
+         */
+    }
+    // 实例方法1：accept()
+    accept() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = yield config_service_1.configService.get();
+            return FriendApi_1.friendApi.PassVerify({
+                "Scene": parseInt(this.scene + ''),
+                "V1": this.v3,
+                "V2": this.v4,
+                "Wxid": config === null || config === void 0 ? void 0 : config.wxid
+            });
+        });
+    }
+    // 实例方法2：hello()
+    hello() {
+        return this.content;
+    }
+    // 实例方法3：contact()
+    // contact(): Contact {
+    //   const contactEntity: ContactEntity = {
+    //     userName: this.formId,
+    //     nickName: this.fromName,
+    //     bigHeadImgUrl: this.bigHeadImgUrl,
+    //     smallHeadImgUrl: this.smallHeadImgUrl,
+    //     pyInitial: '',
+    //     quanPin: '',
+    //     sex: 0,
+    //     remark: '',
+    //     remarkPyInitial: '',
+    //     remarkQuanPin: '',
+    //     signature: '',
+    //     alias: '',
+    //     snsBgImg: '',
+    //     country: '',
+    //     description: '',
+    //     cardImgUrl: '',
+    //     labelList: '',
+    //     province: '',
+    //     city: '',
+    //     phoneNumList: ''
+    //   };
+    //   return new Contact(contactEntity);
+    // }
+    // 实例方法4：type()
+    type() {
+        return this.scene;
+    }
+    static search(mobile) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            try {
+                const config = yield config_service_1.configService.get();
+                const res = yield FriendApi_1.friendApi.Search({
+                    "FromScene": 0,
+                    "SearchScene": 1,
+                    "ToUserName": mobile,
+                    "Wxid": config === null || config === void 0 ? void 0 : config.wxid
+                });
+                if (res === null || res === void 0 ? void 0 : res.data) {
+                    return new Friendship({
+                        fromnickname: (_a = res.data.Data.NickName) === null || _a === void 0 ? void 0 : _a.string,
+                        fromusername: (_b = res.data.Data.UserName) === null || _b === void 0 ? void 0 : _b.string,
+                        v3: (_c = res.data.Data.UserName) === null || _c === void 0 ? void 0 : _c.string,
+                        v4: res.data.Data.AntispamTicket,
+                        bigHeadImgUrl: res.data.Data.BigHeadImgUrl,
+                        smallHeadImgUrl: res.data.Data.SmallHeadImgUrl,
+                        scene: 0
+                    });
+                }
+            }
+            catch (error) {
+                console.error('Error searching contact:', error);
+            }
+        });
+    }
+    // 静态方法1：add()
+    static add(contact, helloMessage) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = yield config_service_1.configService.get();
+            return FriendApi_1.friendApi.SendRequest({
+                "Opcode": 2,
+                "Scene": 0,
+                "V1": contact.v3,
+                "V2": contact.v4,
+                "VerifyContent": helloMessage || '',
+                "Wxid": config === null || config === void 0 ? void 0 : config.wxid
+            });
+        });
+    }
+}
+exports.Friendship = Friendship;

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/index.d.ts

@@ -22,6 +22,11 @@ export declare class WxBot extends EventEmitter {
     private msgInterval;
     private recentMsgIds;
     constructor({ baseUrl, databasePath }: WxBotOptions);
+    qrcode(style?: number): Promise<{
+        qr: {
+            qrCode: any;
+        };
+    }>;
     private fetchAndShowQRCode;
     private setupHeartbeat;
     private checkLoginStatus;

package/dist/index.js

@@ -36,6 +36,9 @@ const WEVIDEO_1 = require("./core/WEVIDEO");
 Object.defineProperty(exports, "WeVideo", { enumerable: true, get: function () { return WEVIDEO_1.WeVideo; } });
 const URLLINK_1 = require("./core/URLLINK");
 Object.defineProperty(exports, "UrlLink", { enumerable: true, get: function () { return URLLINK_1.UrlLink; } });
+const MessageType_1 = require("./type/MessageType");
+const Friendship_1 = require("./core/Friendship");
+const UserApi_1 = require("./api/UserApi");
 class WxBot extends events_1.EventEmitter {
     constructor({ baseUrl, databasePath }) {
         super();
@@ -48,6 +51,20 @@ class WxBot extends events_1.EventEmitter {
         this.databasePath = databasePath;
         (0, axiosInstance_1.setBaseUrl)(baseUrl);
     }
+    qrcode(style) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = yield config_service_1.configService.get();
+            const res = yield UserApi_1.userApi.GetQRCode({
+                "Style": style || 8,
+                "Wxid": config === null || config === void 0 ? void 0 : config.wxid
+            });
+            return {
+                qr: {
+                    qrCode: res.data.Data.qrcode.buffer
+                }
+            };
+        });
+    }
     fetchAndShowQRCode() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -201,6 +218,9 @@ class WxBot extends events_1.EventEmitter {
                     if (data.Message === '当前未有新消息') {
                         return;
                     }
+                    if (!data.Data.AddMsgs) {
+                        return;
+                    }
                     // 更新联系人或者群组信息
                     // 新增：触发 message 事件
                     for (const msg of data.Data.AddMsgs) {
@@ -232,7 +252,24 @@ class WxBot extends events_1.EventEmitter {
                             IsSelf: msg.FromUserName.string === userName,
                             xml: msg.Content.string
                         });
-                        this.emit('message', message);
+                        if (message.type() === MessageType_1.MessageType.AddFriend) { // 好友请求
+                            const obj = Message_1.Message.getXmlToJson(message.text());
+                            console.log(obj);
+                            const friendship = new Friendship_1.Friendship({
+                                fromnickname: obj.msg.fromnickname,
+                                v3: obj.msg.encryptusername,
+                                v4: obj.msg.ticket,
+                                scene: obj.msg.scene,
+                                fromusername: obj.msg.fromusername,
+                                bigHeadImgUrl: obj.msg.bigHeadImgUrl,
+                                smallHeadImgUrl: obj.msg.smallHeadImgUrl,
+                                content: obj.msg.content
+                            });
+                            this.emit('friendship', friendship);
+                        }
+                        else {
+                            this.emit('message', message);
+                        }
                     }
                 }
                 else if (data.Message === '用户可能退出') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wx2tg-puppet",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "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