wechaty-web-panel 1.6.125 → 1.6.127

package/dist/bot/dify/sdk/index.js

@@ -159,11 +159,20 @@ export class DifyClient {
             user,
             streaming
         };
-        return this.sendRequest(routes.textToAudio.method, routes.textToAudio.url(), data, null, streaming);
+        return this.sendRequest({
+            method: routes.textToAudio.method,
+            endpoint: routes.textToAudio.url(),
+            data,
+            stream: streaming
+        });
     }
     getMeta(user) {
         const params = { user };
-        return this.sendRequest(routes.meta.method, routes.meta.url(), null, params);
+        return this.sendRequest({
+            method: routes.getMeta.method,
+            endpoint: routes.getMeta.url(),
+            params
+        });
     }
 }
 export class CompletionClient extends DifyClient {
@@ -187,7 +196,12 @@ export class CompletionClient extends DifyClient {
             user,
             response_mode: stream ? "streaming" : "blocking",
         };
-        return this.sendRequest(routes.runWorkflow.method, routes.runWorkflow.url(), data, null, stream);
+        return this.sendRequest({
+            method: routes.runWorkflow.method,
+            endpoint: routes.runWorkflow.url(),
+            data,
+            stream
+        });
     }
 }
 export class ChatClient extends DifyClient {
@@ -219,7 +233,7 @@ export class ChatClient extends DifyClient {
         function unicodeToChar(text) {
             if (!text)
                 return '';
-            return text.replace(/\\u[0-9a-f]{4}/g, (_match, p1) => {
+            return text.replace(/\\u([0-9a-f]{4})/g, (_match, p1) => {
                 return String.fromCharCode(parseInt(p1, 16));
             });
         }
@@ -303,7 +317,7 @@ export class ChatClient extends DifyClient {
                 if (this.debug) {
                     console.log('dify request error', res.data.code, res.data.message);
                 }
-                return Promise.reject(res.message);
+                return Promise.reject(res.data.message);
             }
             const response = res.data;
             return {
@@ -345,15 +359,26 @@ export class ChatClient extends DifyClient {
     }
     getSuggested(message_id, user) {
         const data = { user };
-        return this.sendRequest(routes.getSuggested.method, routes.getSuggested.url(message_id), data);
+        return this.sendRequest({
+            method: routes.getSuggested.method,
+            endpoint: routes.getSuggested.url(message_id),
+            params: data
+        });
     }
     stopMessage(task_id, user) {
         const data = { user };
-        return this.sendRequest(routes.stopChatMessage.method, routes.stopChatMessage.url(task_id), data);
+        return this.sendRequest({
+            method: routes.stopChatMessage.method,
+            endpoint: routes.stopChatMessage.url(task_id),
+            data
+        });
     }
     audioToText(data) {
-        return this.sendRequest(routes.audioToText.method, routes.audioToText.url(), data, null, false, {
-            "Content-Type": 'multipart/form-data'
+        return this.sendRequest({
+            method: routes.audioToText.method,
+            endpoint: routes.audioToText.url(),
+            data,
+            headerParams: { 'Content-Type': 'multipart/form-data' }
         });
     }
 }
@@ -364,25 +389,42 @@ export class WorkflowClient extends DifyClient {
             response_mode: stream ? "streaming" : "blocking",
             user
         };
-        return this.sendRequest(routes.runWorkflow.method, routes.runWorkflow.url(), data, null, stream);
+        return this.sendRequest({
+            method: routes.runWorkflow.method,
+            endpoint: routes.runWorkflow.url(),
+            data,
+            stream
+        });
     }
     stop(task_id, user) {
         const data = { user };
-        return this.sendRequest(routes.stopWorkflow.method, routes.stopWorkflow.url(task_id), data);
+        return this.sendRequest({
+            method: routes.stopWorkflow.method,
+            endpoint: routes.stopWorkflow.url(task_id),
+            data
+        });
     }
     info(user) {
         const params = { user };
-        return this.sendRequest(routes.getWorkflowInfo.method, routes.getWorkflowInfo.url(), null, params);
+        console.log('获取工作流信息', routes.getWorkflowInfo.method, routes.getWorkflowInfo.url());
+        return this.sendRequest({
+            method: routes.getWorkflowInfo.method,
+            endpoint: routes.getWorkflowInfo.url(),
+            params
+        });
     }
     result(task_id) {
-        return this.sendRequest(routes.getWorkflowResult.method, routes.getWorkflowResult.url(task_id), null);
+        return this.sendRequest({
+            method: routes.getWorkflowResult.method,
+            endpoint: routes.getWorkflowResult.url(task_id)
+        });
     }
     async getWorkflowResult(input, user, isStream) {
         const res = await this.run(input, user, isStream);
         function unicodeToChar(text) {
             if (!text)
                 return '';
-            return text.replace(/\\u[0-9a-f]{4}/g, (_match, p1) => {
+            return text.replace(/\\u([0-9a-f]{4})/g, (_match, p1) => {
                 return String.fromCharCode(parseInt(p1, 16));
             });
         }
@@ -413,6 +455,7 @@ export class WorkflowClient extends DifyClient {
                                     task_id = res?.workflow_run_id;
                                     console.log('工作流node节点执行任务中');
                                 }
+                                console.log('工作流输出结果', res.event, res.data);
                                 if (res.event === 'workflow_finished' || res.event === 'tts_message_end') {
                                     console.log('工作流执行完毕，正在组装数据进行发送');
                                     task_id = res?.workflow_run_id;
@@ -421,12 +464,13 @@ export class WorkflowClient extends DifyClient {
                         });
                     });
                     stream.on('end', async () => {
+                        console.log('执行工作流结束');
                         const { data } = task_id ? await this.result(task_id) : { data: { outputs: '' } };
                         console.log('获取工作流执行结果', task_id, JSON.stringify(data.outputs));
                         let outputs = {};
                         if (data.outputs) {
                             try {
-                                outputs = JSON.parse(data.outputs);
+                                outputs = typeof data.outputs === 'object' ? data.outputs : JSON.parse(data.outputs);
                             }
                             catch (error) {
                                 console.log(`获取工作流执行结果,失败:${error}`);
@@ -443,7 +487,7 @@ export class WorkflowClient extends DifyClient {
         if (!isStream) {
             if (res.data.code) {
                 console.log('Dify 工作流执行失败', res.data.code, res.data.message);
-                return Promise.reject(res.message);
+                return Promise.reject(res.data.message);
             }
             const response = res.data;
             return {

package/dist/handlers/on-scan.js

@@ -24,11 +24,9 @@ function getQrcodeKey(qrcode) {
     let url = new URL(qrcode);
     let searchParams = new URLSearchParams(url.search.slice(1));
     if (searchParams.get('key')) {
-        console.log('获取到二维码信息中的key');
         globalConfig.setQrKey(searchParams.get('key'));
     }
     else if (extractLastPathWithCheck(qrcode)) {
-        console.log('获取到二维码信息中的key');
         globalConfig.setQrKey(extractLastPathWithCheck(qrcode));
     }
     else {
@@ -44,8 +42,13 @@ async function onScan(qrcode, status) {
         const aibotConfig = await getAibotConfig();
         await getVerifyCode();
         getQrcodeKey(qrcode);
-        Qrterminal.generate(qrcode);
-        console.log('扫描状态', status);
+        if (this.puppet.constructor.name === 'PuppetMatrix') {
+            console.log('请使用快速登录器扫码登录成功后，再启动本服务，现在请关闭当前容器，快速登录器请保持2-3天再关闭，防止出现网络异常');
+        }
+        else {
+            Qrterminal.generate(qrcode);
+            console.log('扫描状态', status);
+        }
         if (scanTime >= aibotConfig.scanTimes) {
             console.log('长时间推送登录状态，平台二维码不再更新，请重启服务，或直接在终端扫码登录');
         }
@@ -53,8 +56,6 @@ async function onScan(qrcode, status) {
             scanTime++;
             throttle(setQrCode(qrcode, status), 15000);
         }
-        const qrImgUrl = ['https://api.qrserver.com/v1/create-qr-code/?data=', encodeURIComponent(qrcode)].join('');
-        console.log(qrImgUrl);
     }
     catch (e) {
         console.log('二维码推送报错', e);

package/dist/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.125",
+    "version": "1.6.127",
     "exports": {
         ".": {
             "import": "./dist/index.js"
@@ -35,7 +35,7 @@ export const packageJson = {
         "prettier": "^2.0.5",
         "tsup": "^8.5.1",
         "typescript": "^5.4",
-        "wechaty-puppet-matrix": "^0.0.34"
+        "wechaty-puppet-matrix": "^0.0.48"
     },
     "readme": "README.md",
     "engines": {

package/dist/proxy/aibotk.js

@@ -500,10 +500,7 @@ async function setQrCode(url, status) {
             params: { qrUrl: url, qrStatus: status },
         };
         let content = await aiBotReq(option);
-        if (content) {
-            console.log('推送二维码成功');
-        }
-        else {
+        if (!content) {
             console.log('推送登录二维码失败');
         }
     }

package/dist/task/customTask.js

@@ -3,7 +3,7 @@ const getDifyWorkflowContent = async (baseurl, token, inputs) => {
     try {
         const user = 'dify-schedule';
         console.log('getDifyWorkflowContent request info:', baseurl, token, inputs);
-        const workflow = new WorkflowClient(token, baseurl);
+        const workflow = new WorkflowClient({ apiKey: token, baseUrl: baseurl, stream: true });
         console.log(`正在获取Dify工作流基础信息...`);
         const info = await workflow.info(user);
         console.log(`Dify工作流【${info.data.name}】开始执行...`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.6.125",
+  "version": "1.6.127",
   "exports": {
     ".": {
       "import": "./dist/index.js"
@@ -32,7 +32,7 @@
     "prettier": "^2.0.5",
     "tsup": "^8.5.1",
     "typescript": "^5.4",
-    "wechaty-puppet-matrix": "^0.0.34"
+    "wechaty-puppet-matrix": "^0.0.48"
   },
   "readme": "README.md",
   "engines": {

package/src/bot/dify/sdk/index.js

@@ -179,22 +179,20 @@ export class DifyClient {
             user,
             streaming
         };
-        return this.sendRequest(
-            routes.textToAudio.method,
-            routes.textToAudio.url(),
+        return this.sendRequest({
+            method: routes.textToAudio.method,
+            endpoint: routes.textToAudio.url(),
             data,
-            null,
-            streaming
-        );
+            stream: streaming
+        });
     }
     getMeta(user) {
         const params = { user };
-        return this.sendRequest(
-            routes.meta.method,
-            routes.meta.url(),
-            null,
+        return this.sendRequest({
+            method: routes.getMeta.method,
+            endpoint: routes.getMeta.url(),
             params
-        );
+        });
     }
 }
 
@@ -219,13 +217,12 @@ export class CompletionClient extends DifyClient {
             user,
             response_mode: stream ? "streaming" : "blocking",
         };
-        return this.sendRequest(
-            routes.runWorkflow.method,
-            routes.runWorkflow.url(),
+        return this.sendRequest({
+            method: routes.runWorkflow.method,
+            endpoint: routes.runWorkflow.url(),
             data,
-            null,
             stream
-        );
+        });
     }
 }
 
@@ -261,7 +258,7 @@ export class ChatClient extends DifyClient {
             if (!text)
                 return ''
 
-            return text.replace(/\\u[0-9a-f]{4}/g, (_match, p1) => {
+            return text.replace(/\\u([0-9a-f]{4})/g, (_match, p1) => {
                 return String.fromCharCode(parseInt(p1, 16))
             })
         }
@@ -344,7 +341,7 @@ export class ChatClient extends DifyClient {
                 if (this.debug) {
                     console.log('dify request error', res.data.code, res.data.message)
                 }
-                return Promise.reject(res.message)
+                return Promise.reject(res.data.message)
             }
 
             const response = res.data
@@ -390,31 +387,27 @@ export class ChatClient extends DifyClient {
     }
     getSuggested(message_id, user) {
         const data = { user };
-        return this.sendRequest(
-            routes.getSuggested.method,
-            routes.getSuggested.url(message_id),
-            data
-        );
+        return this.sendRequest({
+            method: routes.getSuggested.method,
+            endpoint: routes.getSuggested.url(message_id),
+            params: data
+        });
     }
     stopMessage(task_id, user) {
         const data = { user };
-        return this.sendRequest(
-            routes.stopChatMessage.method,
-            routes.stopChatMessage.url(task_id),
+        return this.sendRequest({
+            method: routes.stopChatMessage.method,
+            endpoint: routes.stopChatMessage.url(task_id),
             data
-        );
+        });
     }
     audioToText(data) {
-        return this.sendRequest(
-            routes.audioToText.method,
-            routes.audioToText.url(),
+        return this.sendRequest({
+            method: routes.audioToText.method,
+            endpoint: routes.audioToText.url(),
             data,
-            null,
-            false,
-            {
-                "Content-Type": 'multipart/form-data'
-            }
-        );
+            headerParams: { 'Content-Type': 'multipart/form-data' }
+        });
     }
 }
 
@@ -427,38 +420,37 @@ export class WorkflowClient extends DifyClient {
         user
       };
   
-      return this.sendRequest(
-          routes.runWorkflow.method,
-          routes.runWorkflow.url(),
+      return this.sendRequest({
+          method: routes.runWorkflow.method,
+          endpoint: routes.runWorkflow.url(),
           data,
-          null,
           stream
-      );
+      });
     }
   
     stop(task_id, user) {
       const data = { user };
-      return this.sendRequest(
-        routes.stopWorkflow.method,
-        routes.stopWorkflow.url(task_id),
+      return this.sendRequest({
+        method: routes.stopWorkflow.method,
+        endpoint: routes.stopWorkflow.url(task_id),
         data
-      );
+      });
     }
     info(user) {
       const params = { user };
-      return this.sendRequest(
-        routes.getWorkflowInfo.method,
-        routes.getWorkflowInfo.url(),
-        null,
+      console.log('获取工作流信息', routes.getWorkflowInfo.method,
+        routes.getWorkflowInfo.url())
+      return this.sendRequest({
+        method: routes.getWorkflowInfo.method,
+        endpoint: routes.getWorkflowInfo.url(),
         params
-      );
+      });
     }
     result(task_id) {
-      return this.sendRequest(
-        routes.getWorkflowResult.method,
-        routes.getWorkflowResult.url(task_id),
-        null
-      );
+      return this.sendRequest({
+        method: routes.getWorkflowResult.method,
+        endpoint: routes.getWorkflowResult.url(task_id)
+      });
     }
     async getWorkflowResult(input, user, isStream) {
       const res = await this.run(input, user, isStream)
@@ -466,7 +458,7 @@ export class WorkflowClient extends DifyClient {
           if (!text)
             return ''
   
-          return text.replace(/\\u[0-9a-f]{4}/g, (_match, p1) => {
+          return text.replace(/\\u([0-9a-f]{4})/g, (_match, p1) => {
             return String.fromCharCode(parseInt(p1, 16))
           })
         }
@@ -497,6 +489,7 @@ export class WorkflowClient extends DifyClient {
                       task_id = res?.workflow_run_id
                       console.log('工作流node节点执行任务中')
                     }
+                    console.log('工作流输出结果', res.event, res.data)
                     if (res.event === 'workflow_finished' || res.event === 'tts_message_end') {
                       console.log('工作流执行完毕，正在组装数据进行发送')
                       task_id = res?.workflow_run_id
@@ -505,13 +498,13 @@ export class WorkflowClient extends DifyClient {
                 })
               })
               stream.on('end', async () => {
-  
+                console.log('执行工作流结束')
                 const { data } = task_id ? await this.result(task_id) : { data: { outputs: '' } }
                 console.log('获取工作流执行结果', task_id, JSON.stringify(data.outputs))
                 let outputs = {}
                 if(data.outputs) {
                     try {
-                      outputs = JSON.parse(data.outputs)
+                      outputs = typeof data.outputs === 'object' ? data.outputs : JSON.parse(data.outputs)
                     } catch (error) {
                       console.log(`获取工作流执行结果,失败:${error}`)
                     }
@@ -527,7 +520,7 @@ export class WorkflowClient extends DifyClient {
       if (!isStream) {
         if (res.data.code) {
           console.log('Dify 工作流执行失败', res.data.code, res.data.message)
-          return Promise.reject(res.message)
+          return Promise.reject(res.data.message)
         }
         const response = res.data
         return {

package/src/handlers/on-scan.js

@@ -26,10 +26,8 @@ function getQrcodeKey(qrcode) {
   let url = new URL(qrcode);
   let searchParams = new URLSearchParams(url.search.slice(1));
   if(searchParams.get('key')) {
-    console.log('获取到二维码信息中的key')
     globalConfig.setQrKey(searchParams.get('key'))
   } else if(extractLastPathWithCheck(qrcode)) {
-    console.log('获取到二维码信息中的key');
     globalConfig.setQrKey(extractLastPathWithCheck(qrcode));
   } else {
     globalConfig.setQrKey('')
@@ -41,20 +39,22 @@ function getQrcodeKey(qrcode) {
 async function onScan(qrcode, status) {
   try {
     await updatePuppetConfig({ puppetType: this.puppet.constructor.name })
+    
     const aibotConfig = await getAibotConfig();
     await getVerifyCode();
     getQrcodeKey(qrcode)
-    Qrterminal.generate(qrcode)
-    console.log('扫描状态', status)
+    if (this.puppet.constructor.name === 'PuppetMatrix') {
+      console.log('请使用快速登录器扫码登录成功后，再启动本服务，现在请关闭当前容器，快速登录器请保持2-3天再关闭，防止出现网络异常')
+    } else {
+      Qrterminal.generate(qrcode)
+      console.log('扫描状态', status)
+    }
     if(scanTime >= aibotConfig.scanTimes) {
       console.log('长时间推送登录状态，平台二维码不再更新，请重启服务，或直接在终端扫码登录');
     } else {
       scanTime++
       throttle(setQrCode(qrcode, status), 15000)
     }
-
-    const qrImgUrl = ['https://api.qrserver.com/v1/create-qr-code/?data=', encodeURIComponent(qrcode)].join('')
-    console.log(qrImgUrl)
   } catch (e) {
     console.log('二维码推送报错', e)
   }

package/src/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
   "name": "wechaty-web-panel",
-  "version": "1.6.125",
+  "version": "1.6.127",
   "exports": {
     ".": {
       "import": "./dist/index.js"
@@ -35,7 +35,7 @@ export const packageJson = {
     "prettier": "^2.0.5",
     "tsup": "^8.5.1",
     "typescript": "^5.4",
-    "wechaty-puppet-matrix": "^0.0.34"
+    "wechaty-puppet-matrix": "^0.0.48"
   },
   "readme": "README.md",
   "engines": {

package/src/proxy/aibotk.js

@@ -497,10 +497,8 @@ async function setQrCode(url, status) {
       params: { qrUrl: url, qrStatus: status },
     }
     let content = await aiBotReq(option)
-    if (content) {
-      console.log('推送二维码成功')
-    } else {
-      console.log('推送登录二维码失败')
+    if (!content) {
+       console.log('推送登录二维码失败')
     }
   } catch (error) {
     console.log('推送登录二维码失败', error)

package/src/task/customTask.js

@@ -6,7 +6,7 @@ const getDifyWorkflowContent = async (baseurl, token, inputs) => {
     try {
         const user = 'dify-schedule'
         console.log('getDifyWorkflowContent request info:', baseurl, token, inputs)
-        const workflow = new WorkflowClient(token, baseurl);
+        const workflow = new WorkflowClient({apiKey: token, baseUrl: baseurl, stream: true});
         console.log(`正在获取Dify工作流基础信息...`)
         const info = await workflow.info(user);
         console.log(`Dify工作流【${info.data.name}】开始执行...`)