wx2tg-puppet 2.2.4 → 3.0.0

package/dist/action/common.js

@@ -136,13 +136,17 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                     return new Message_1.ResponseMsg(imgRes.data.Data);
                 case 'other':
                     // 直接从 FileBox 获取文件内容
-                    const fileBuffer = yield content.toBuffer();
-                    const fileBlob = new Blob([fileBuffer], { type: 'application/octet-stream' });
+                    // const fileBuffer = await content.toBuffer();
+                    // const fileBlob = new Blob([fileBuffer], { type: 'application/octet-stream' });
                     // 创建 FormData
-                    const formData = new FormData();
-                    formData.append('wxid', (config === null || config === void 0 ? void 0 : config.wxid) || '');
-                    formData.append('file', fileBlob, fileName);
-                    const res = yield ToolsApi_1.toolsApi.UploadFileBinary(formData);
+                    // const formData = new FormData();
+                    // formData.append('wxid', config?.wxid || '');
+                    // formData.append('file', fileBlob, fileName);
+                    const fileBase64 = yield content.toBase64();
+                    const res = yield ToolsApi_1.toolsApi.UploadAppAttachApi({
+                        "Wxid": config === null || config === void 0 ? void 0 : config.wxid,
+                        "fileData": fileBase64
+                    });
                     if (res.data.Code !== 0) {
                         throw new Error(`上传文件失败: ${res.data.Message}`);
                     }

package/dist/api/ToolsApi.d.ts

@@ -33,6 +33,8 @@ declare class ToolsApi {
     UpdateStepNumberApi(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 文件上传 */
     UploadFile(body: any): Promise<AxiosResponse<ApiResponse>>;
+    /** 文件上传 */
+    UploadAppAttachApi(body: any): Promise<AxiosResponse<ApiResponse>>;
     /** 二进制文件上传 */
     UploadFileBinary(formData: FormData): Promise<AxiosResponse<ApiResponse>>;
     /** 设置/删除代理IP */

package/dist/api/ToolsApi.js

@@ -67,6 +67,10 @@ class ToolsApi {
     UploadFile(body) {
         return axiosInstance_1.axiosInstance.post('/Tools/UploadFile', body);
     }
+    /** 文件上传 */
+    UploadAppAttachApi(body) {
+        return axiosInstance_1.axiosInstance.post('/Tools/UploadAppAttachApi', body);
+    }
     /** 二进制文件上传 */
     UploadFileBinary(formData) {
         return axiosInstance_1.axiosInstance.post('/Tools/UploadFileBinary', formData, {

package/dist/index.d.ts

@@ -61,6 +61,7 @@ export declare class WxBot extends EventEmitter {
     clearCache(): Promise<void>;
     login(): Promise<void>;
     start(): Promise<void>;
+    loginTwice(): Promise<boolean>;
     static get Contact(): typeof Contact;
     get Contact(): typeof Contact;
     static get Room(): typeof Room;

package/dist/index.js

@@ -192,7 +192,7 @@ class WxBot extends events_1.EventEmitter {
                 }
                 const data = response.data;
                 this.uuid = data.Data.Uuid;
-                const match = data.Data.QrUrl.match(/[?&]data=([^&]+)/);
+                const match = data.Data.QrUrl.match(/[?&]url=([^&]+)/);
                 if (match && match[1]) {
                     const qrLink = decodeURIComponent(match[1]);
                     this.emit('scan', {
@@ -661,6 +661,27 @@ class WxBot extends events_1.EventEmitter {
             }
         });
     }
+    loginTwice() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = yield config_service_1.configService.get();
+            if (!config) {
+                return false;
+            }
+            const resp = yield MsgApi_1.msgApi.Sync({
+                "Wxid": config === null || config === void 0 ? void 0 : config.wxid,
+                "Scene": 0,
+                "Synckey": ""
+            });
+            yield LoginApi_1.loginApi.LoginTwiceAutoAuth(config === null || config === void 0 ? void 0 : config.wxid);
+            if (yield this.checkSyncLoginStatus(resp.data, config === null || config === void 0 ? void 0 : config.wxid)) {
+                yield this.loginSuccess(config.wxid);
+                return true;
+            }
+            else {
+                return false;
+            }
+        });
+    }
     static get Contact() {
         return Contact_1.Contact;
     }

package/package.json

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