wechaty-web-panel 1.6.124 → 1.6.126

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/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.124",
+    "version": "1.6.126",
     "exports": {
         ".": {
             "import": "./dist/index.js"

package/dist/service/msg-filters.js

@@ -494,8 +494,11 @@ function checkKeyword(forward, msg) {
     }
     return false;
 }
-function getForwardConfig({ name, id, room, roomId, roomName, msg, config }) {
+function getForwardConfig({ name, id, room, roomId, roomName, msg, config, sourceMsg }) {
     const configs = config.forwards;
+    if (room) {
+        msg = sourceMsg.text();
+    }
     if (configs && configs.length) {
         let finalConfig = '';
         if (room) {
@@ -551,17 +554,17 @@ async function getTargets(that, targets, type) {
     }
     return finalTargets;
 }
-export async function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName }) {
+export async function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName, sourceMsg }) {
     try {
         const forwards = config.forwards || [];
         if (forwards.length) {
-            const finalConfig = getForwardConfig({ name, id, room, msg, config, roomId, roomName });
+            const finalConfig = getForwardConfig({ name, id, room, msg, config, roomId, roomName, sourceMsg });
             if (finalConfig) {
                 const finalTargets = await getTargets(that, finalConfig.forwardTargets, finalConfig.forwardType);
                 if (finalTargets.length) {
                     const eol = await getPuppetEol();
                     for (let contact of finalTargets) {
-                        const content = room ? `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到群聊【${roomName}】中【${name}】发送的内容：${msg}` : `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到好友【${name}】发送的内容：${msg}`;
+                        const content = room ? `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到群聊【${roomName}】中【${name}】发送的内容：${sourceMsg.text()}` : `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到好友【${name}】发送的内容：${msg}`;
                         await contact.say(content);
                         await delay(3000);
                     }

package/dist/task/customTask.js

@@ -0,0 +1,49 @@
+import { WorkflowClient } from '../bot/dify/sdk/index.js';
+const getDifyWorkflowContent = async (baseurl, token, inputs) => {
+    try {
+        const user = 'dify-schedule';
+        console.log('getDifyWorkflowContent request info:', baseurl, token, inputs);
+        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}】开始执行...`);
+        const response = await workflow.getWorkflowResult(inputs, user, true);
+        return response;
+    }
+    catch (error) {
+        console.log('getDifyWorkflowContent', error);
+        return error && error.toString();
+    }
+};
+async function getDifyContent(taskInfo) {
+    const baseUrl = taskInfo.baseUrl || '';
+    const token = taskInfo.apikey || '';
+    if (!baseUrl || !token) {
+        return [{ type: 1, content: 'Dify工作流未配置服务地址或密钥，请配置后重新设置定时任务！' }];
+    }
+    const inputs = {};
+    const variables = taskInfo.variables || [];
+    variables.forEach((item) => {
+        if (item.key && item.value) {
+            inputs[item.key] = item.value;
+        }
+    });
+    const res = await getDifyWorkflowContent(baseUrl, token, inputs);
+    const reply = [];
+    if (res.text) {
+        reply.push({ type: 1, content: res.text });
+    }
+    if (res.img) {
+        reply.push({ type: 2, url: encodeURI(res.img) });
+    }
+    return reply;
+}
+export async function dispatchLocalCustomContent(taskId, taskInfo) {
+    if (parseInt(taskId) === 30001) {
+        return await getDifyContent(taskInfo);
+    }
+    else {
+        return [];
+    }
+}
+//# sourceMappingURL=customTask.js.map

package/dist/task/index.js

@@ -3,6 +3,7 @@ import { allConfig } from "../db/configDb.js";
 import { getScheduleList, updateSchedule } from "../proxy/aibotk.js";
 import { getNewsContent, getEveryDayContent, roomSay, getRoomEveryDayContent, contactSay, getCountDownContent, getCustomContent } from "../common/index.js";
 import globalConfig from "../db/global.js";
+import { dispatchLocalCustomContent } from './customTask.js';
 const typeMap = {
     contact: "用户名", room: "群名"
 };
@@ -155,7 +156,13 @@ async function sendNews({ that, target, item, isMulti, targets }) {
  */
 async function sendCustomContent({ that, target, type, item, isMulti, targets, taskId }) {
     console.log("发送定制内容开始，目标：", item.sortId, taskId);
-    let contents = await getCustomContent(item.sortId, taskId);
+    let contents = [];
+    if (item.isLocal) {
+        contents = await dispatchLocalCustomContent(item.sortId, item);
+    }
+    else {
+        contents = await getCustomContent(item.sortId, taskId);
+    }
     console.log("定制内容发送", contents);
     if (!isMulti) {
         for (const reply of contents) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.6.124",
+  "version": "1.6.126",
   "exports": {
     ".": {
       "import": "./dist/index.js"

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/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
   "name": "wechaty-web-panel",
-  "version": "1.6.124",
+  "version": "1.6.126",
   "exports": {
     ".": {
       "import": "./dist/index.js"

package/src/service/msg-filters.js

@@ -485,8 +485,11 @@ function checkKeyword(forward, msg) {
   return false;
 }
 
-function getForwardConfig({ name, id, room, roomId, roomName, msg, config }) {
+function getForwardConfig({ name, id, room, roomId, roomName, msg, config, sourceMsg }) {
   const configs = config.forwards
+  if(room) {
+    msg = sourceMsg.text()
+  }
   if (configs && configs.length) {
     let finalConfig = ''
     if (room) {
@@ -541,17 +544,17 @@ async function getTargets(that, targets, type) {
   return finalTargets;
 }
 
-export async function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName  }) {
+export async function keywordForward({ that, msg, name, id, config, room, isMention, roomId, roomName, sourceMsg  }) {
   try {
     const forwards = config.forwards || [];
     if(forwards.length) {
-      const finalConfig = getForwardConfig({ name, id, room, msg, config, roomId, roomName })
+      const finalConfig = getForwardConfig({ name, id, room, msg, config, roomId, roomName, sourceMsg })
       if(finalConfig) {
         const finalTargets = await getTargets(that, finalConfig.forwardTargets, finalConfig.forwardType)
         if(finalTargets.length) {
           const eol = await getPuppetEol()
           for(let contact of finalTargets) {
-            const content = room ? `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到群聊【${roomName}】中【${name}】发送的内容：${msg}` : `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到好友【${name}】发送的内容：${msg}`
+            const content = room ? `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到群聊【${roomName}】中【${name}】发送的内容：${sourceMsg.text()}` : `【关键词转发】${eol} 时间：${dayjs().format('MM-DD HH:mm:ss')} ${eol}收到好友【${name}】发送的内容：${msg}`
             await contact.say(content)
             await delay(3000)
           }

package/src/task/customTask.js

@@ -0,0 +1,50 @@
+
+
+import { WorkflowClient } from '../bot/dify/sdk/index.js';
+
+const getDifyWorkflowContent = async (baseurl, token, inputs) => {
+    try {
+        const user = 'dify-schedule'
+        console.log('getDifyWorkflowContent request info:', baseurl, token, inputs)
+        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}】开始执行...`)
+        const response = await workflow.getWorkflowResult(inputs, user, true)
+        return response
+    } catch (error) {
+        console.log('getDifyWorkflowContent', error)
+        return error && error.toString()
+    }
+}
+async function getDifyContent(taskInfo) {
+    const baseUrl = taskInfo.baseUrl || '';
+    const token = taskInfo.apikey || '';
+    if (!baseUrl || !token) {
+        return [{ type: 1, content: 'Dify工作流未配置服务地址或密钥，请配置后重新设置定时任务！' }];
+    }
+    const inputs = {}
+    const variables = taskInfo.variables || [];
+    variables.forEach((item) => {
+        if (item.key && item.value) {
+            inputs[item.key] = item.value;
+        }
+    });
+    const res = await getDifyWorkflowContent(baseUrl, token, inputs);
+    const reply = []
+    if (res.text) {
+        reply.push({ type: 1, content: res.text })
+    }
+    if (res.img) {
+        reply.push({ type: 2, url: encodeURI(res.img) })
+    }
+    return reply;
+}
+
+export async function dispatchLocalCustomContent(taskId, taskInfo) {
+    if (parseInt(taskId) === 30001) {
+        return await getDifyContent(taskInfo);
+    } else {
+        return []
+    }
+}

package/src/task/index.js

@@ -5,7 +5,7 @@ import {
   getNewsContent, getEveryDayContent, roomSay, getRoomEveryDayContent, contactSay, getCountDownContent, getCustomContent
 } from "../common/index.js";
 import globalConfig from "../db/global.js";
-
+import { dispatchLocalCustomContent } from './customTask.js'
 const typeMap = {
   contact: "用户名", room: "群名"
 };
@@ -149,7 +149,13 @@ async function sendNews ({ that, target, item, isMulti, targets }) {
  */
 async function  sendCustomContent ({ that, target, type, item, isMulti, targets, taskId }) {
   console.log("发送定制内容开始，目标：", item.sortId, taskId);
-  let contents = await getCustomContent(item.sortId, taskId);
+  let contents = []
+  if(item.isLocal) {
+    contents = await dispatchLocalCustomContent(item.sortId, item)
+  } else {
+    contents = await getCustomContent(item.sortId, taskId);
+  }
+
   console.log("定制内容发送", contents);
 
   if (!isMulti) {