wechaty-web-panel 1.6.123 → 1.6.125

package/dist/common/index.js

@@ -98,7 +98,7 @@ async function updateContactInfo(that, noCache = false) {
             return payload.friend && !notids.includes(payload.id) && !payload.id.includes('gh_');
         });
         for (let i of realContact) {
-            await i.sync();
+            // await i.sync()
             let contact = i.payload || i._payload;
             let obj = {
                 robotId: contactSelf.robotId,

package/dist/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.123",
+    "version": "1.6.125",
     "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(token, baseurl);
+        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.123",
+  "version": "1.6.125",
   "exports": {
     ".": {
       "import": "./dist/index.js"

package/src/common/index.js

@@ -103,7 +103,7 @@ async function updateContactInfo(that, noCache = false) {
           return payload.friend && !notids.includes(payload.id) && !payload.id.includes('gh_')
         })
     for (let i of realContact) {
-      await i.sync()
+      // await i.sync()
       let contact = i.payload || i._payload
       let obj = {
         robotId: contactSelf.robotId,

package/src/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
   "name": "wechaty-web-panel",
-  "version": "1.6.123",
+  "version": "1.6.125",
   "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(token, baseurl);
+        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) {