wx2tg-puppet 3.0.0 → 3.0.2

package/dist/action/common.js

@@ -136,17 +136,19 @@ 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 = await content.toBuffer();
-                    // const fileBlob = new Blob([fileBuffer], { type: 'application/octet-stream' });
+                    const fileBuffer = yield content.toBuffer();
+                    const fileBlob = new Blob([fileBuffer], { type: 'application/octet-stream' });
                     // 创建 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
-                    });
+                    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 fileBase64 = await content.toBase64()
+                    //
+                    // const res = await toolsApi.UploadAppAttachApi({
+                    //   "Wxid": config?.wxid,
+                    //   "fileData": fileBase64
+                    // })
                     if (res.data.Code !== 0) {
                         throw new Error(`上传文件失败: ${res.data.Message}`);
                     }

package/dist/index.js

@@ -192,9 +192,9 @@ class WxBot extends events_1.EventEmitter {
                 }
                 const data = response.data;
                 this.uuid = data.Data.Uuid;
-                const match = data.Data.QrUrl.match(/[?&]url=([^&]+)/);
-                if (match && match[1]) {
-                    const qrLink = decodeURIComponent(match[1]);
+                const match = data.Data.QrUrl.match(/[?&](url|data)=([^&]+)/);
+                if (match && match[2]) {
+                    const qrLink = decodeURIComponent(match[2]);
                     this.emit('scan', {
                         content: qrLink
                     });

package/package.json

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