wx2tg-puppet 2.0.4 → 2.0.6

package/dist/index.js

@@ -37,7 +37,7 @@ 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 MessageType_1 = require("./types/MessageType");
 const Friendship_1 = require("./core/Friendship");
 const UserApi_1 = require("./api/UserApi");
 const ContactEntity_1 = require("./entities/ContactEntity");
@@ -59,6 +59,8 @@ class WxBot extends events_1.EventEmitter {
     qrcode(style) {
         return __awaiter(this, void 0, void 0, function* () {
             const config = yield config_service_1.configService.get();
+            if (!config)
+                return null;
             const res = yield UserApi_1.userApi.GetQRCode({
                 "Style": style || 8,
                 "Wxid": config === null || config === void 0 ? void 0 : config.wxid
@@ -84,7 +86,6 @@ class WxBot extends events_1.EventEmitter {
                         response = yield LoginApi_1.loginApi.LoginGetQRCar({
                             "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
                             "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
-                            "OSModel": "",
                             "Proxy": {
                                 "ProxyIp": "",
                                 "ProxyPassword": "",
@@ -96,7 +97,6 @@ class WxBot extends events_1.EventEmitter {
                         response = yield LoginApi_1.loginApi.LoginGetQRMac({
                             "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
                             "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
-                            "OSModel": "",
                             "Proxy": {
                                 "ProxyIp": "",
                                 "ProxyPassword": "",
@@ -108,7 +108,6 @@ class WxBot extends events_1.EventEmitter {
                         response = yield LoginApi_1.loginApi.LoginGetQRPad({
                             "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
                             "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
-                            "OSModel": "",
                             "Proxy": {
                                 "ProxyIp": "",
                                 "ProxyPassword": "",
@@ -120,7 +119,17 @@ class WxBot extends events_1.EventEmitter {
                         response = yield LoginApi_1.loginApi.LoginGetQRWin({
                             "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
                             "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
-                            "OSModel": "",
+                            "Proxy": {
+                                "ProxyIp": "",
+                                "ProxyPassword": "",
+                                "ProxyUser": ""
+                            }
+                        });
+                        break;
+                    case 'ipadX':
+                        response = yield LoginApi_1.loginApi.LoginGetQRx({
+                            "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
+                            "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
                             "Proxy": {
                                 "ProxyIp": "",
                                 "ProxyPassword": "",
@@ -133,7 +142,6 @@ class WxBot extends events_1.EventEmitter {
                         response = yield LoginApi_1.loginApi.LoginGetQR({
                             "DeviceID": (config === null || config === void 0 ? void 0 : config.deviceId) || "",
                             "DeviceName": (config === null || config === void 0 ? void 0 : config.DeviceName) || "",
-                            "OSModel": "",
                             "Proxy": {
                                 "ProxyIp": "",
                                 "ProxyPassword": "",
@@ -284,7 +292,7 @@ class WxBot extends events_1.EventEmitter {
             this.msgInterval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 const resp = yield MsgApi_1.msgApi.Sync({
-                    "wxid": userName,
+                    "Wxid": userName,
                     "Scene": 0,
                     "Synckey": ""
                 });
@@ -407,7 +415,11 @@ class WxBot extends events_1.EventEmitter {
                 this.clearAllIntervals(); // 确保清理所有定时器
                 const config = yield config_service_1.configService.get();
                 if (config && config.wxid) {
-                    const resp = yield MsgApi_1.msgApi.Sync(config.wxid);
+                    const resp = yield MsgApi_1.msgApi.Sync({
+                        "Wxid": config.wxid,
+                        "Scene": 0,
+                        "Synckey": ""
+                    });
                     if (resp.data.Code === 0) {
                         yield this.loginSuccess(config.wxid);
                     }

package/dist/types/ApiResponse.d.ts

@@ -0,0 +1,14 @@
+export interface ApiResponse {
+    /** 状态码 */
+    Code: number;
+    /** 是否成功 */
+    Success: boolean;
+    /** 响应消息 */
+    Message: string;
+    /** 响应数据 */
+    Data: any;
+    /** 62数据（可选） */
+    Data62?: string;
+    /** 设备ID（可选） */
+    DeviceId?: string;
+}

package/dist/types/ApiResponse.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/MessageType.d.ts

@@ -0,0 +1,29 @@
+export declare const MessageType: {
+    Unknown: string;
+    FileStart: string;
+    File: string;
+    Voice: string;
+    Contact: string;
+    Emoji: string;
+    Image: string;
+    Text: string;
+    Video: string;
+    Url: string;
+    RoomInvitation: string;
+    MiniApp: string;
+    AppMsg: string;
+    Link: string;
+    AddFriend: string;
+    Quote: string;
+    Transfer: string;
+    RedPacket: string;
+    VideoAccount: string;
+    Revoke: string;
+    Pat: string;
+    Location: string;
+    FunctionMsg: string;
+    NewMonmentTimeline: string;
+    ChatHistroy: string;
+    Voip: string;
+    RealTimeLocation: string;
+};

package/dist/types/MessageType.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageType = void 0;
+exports.MessageType = {
+    Unknown: 'unknown', // 未知类型
+    FileStart: 'file_start', // 文件开始
+    File: 'file', // 文件发送结束
+    Voice: 'voice', // 语音
+    Contact: 'contact', // 名片
+    Emoji: 'emoji', // 表情
+    Image: 'image', // 图片
+    Text: 'text', // 文本
+    Video: 'video', // 视频
+    Url: 'link', // 链接
+    RoomInvitation: 'room_invitation', // 群邀请
+    MiniApp: 'mini_app', // 小程序消息
+    AppMsg: 'app_msg', // app消息
+    Link: 'link', // 公众号链接
+    AddFriend: 'add_friend', // 添加好友通知
+    Quote: 'quote', // 引用消息
+    Transfer: 'transfer', //转账
+    RedPacket: 'red_packet', //红包
+    VideoAccount: 'video_account', // 视频号消息
+    Revoke: 'revoke', // 撤回消息
+    Pat: 'pat', // 拍一拍
+    Location: 'location', // 位置消息
+    FunctionMsg: 'function_msg', // 微信团队消息
+    NewMonmentTimeline: 'new_monment_timeline', // 朋友圈更新
+    ChatHistroy: 'chat_histroy', // 聊天记录
+    Voip: 'voip', // voip消息
+    RealTimeLocation: 'real_time_location', // 实时位置共享
+};

package/dist/utils/axiosInstance.d.ts

@@ -1,2 +1,2 @@
-export declare const axiosInstance: Axios.AxiosInstance;
+export declare const axiosInstance: import("axios").AxiosInstance;
 export declare function setBaseUrl(baseUrl: string): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wx2tg-puppet",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -23,7 +23,6 @@
   "license": "ISC",
   "description": "微信机器人核心库，可作为依赖被其他项目引入。",
   "devDependencies": {
-    "@types/axios": "^0.9.36",
     "@types/json-bigint": "^1.0.4",
     "@types/qrcode-terminal": "^0.12.2",
     "ts-node": "^10.9.2",