wechaty-web-panel 1.6.33 → 1.6.34

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## 更新日志
 
+### V1.6.34(2024-01-15)
+1、添加定制内容和定制技能
+2、优化 token配置
+3、提取文字中的图片内容进行发送
+4、支持配置默认回复内容
+5、优化二维码拉取
+
 ### V1.6.33(2023-12-07)
 1、优化FastGPT对话重置功能
 2、添加GPT-4V识图功能

package/dist/cjs/src/botInstance/dify.js

@@ -9,6 +9,7 @@ const aibotk_js_1 = require("../proxy/aibotk.js");
 const contentCensor_js_1 = require("../lib/contentCensor.js");
 const puppet_type_js_1 = require("../const/puppet-type.js");
 const dayjs_1 = __importDefault(require("dayjs"));
+const index_js_1 = require("../lib/index.js");
 class DifyAi {
     constructor(config = {
         token: '',
@@ -100,9 +101,10 @@ class DifyAi {
             else {
                 message = text.replaceAll('\n', this.eol);
             }
-            while (message.length > 1000) {
-                replys.push(message.slice(0, 1000));
-                message = message.slice(1000);
+            const imgs = (0, index_js_1.extractImageLinks)(message);
+            while (message.length > 1500) {
+                replys.push(message.slice(0, 1500));
+                message = message.slice(1500);
             }
             replys.push(message);
             replys = replys.map(item => {
@@ -111,6 +113,10 @@ class DifyAi {
                     content: item.trim()
                 };
             });
+            if (imgs.length) {
+                console.log('提取到内容中的图片', imgs);
+                replys = replys.concat(imgs);
+            }
             return replys;
         }
         catch (e) {

package/dist/cjs/src/botInstance/officialOpenAi.d.ts

@@ -15,10 +15,7 @@ declare class OfficialOpenAi {
         _apiKey: any;
         _apiOrg: any;
         _apiBaseUrl: any;
-        _debug: boolean; /**
-         * 重置apikey
-         * @return {Promise<void>}
-         */
+        _debug: boolean;
         _fetch: any;
         _completionParams: any;
         _systemMessage: any;

package/dist/cjs/src/botInstance/officialOpenAi.js

@@ -12,6 +12,7 @@ const contentCensor_js_1 = require("../lib/contentCensor.js");
 const puppet_type_js_1 = require("../const/puppet-type.js");
 const uuid_1 = require("uuid");
 const dayjs_1 = __importDefault(require("dayjs"));
+const index_js_1 = require("../lib/index.js");
 let chatGPT = null;
 class OfficialOpenAi {
     constructor(config = {
@@ -54,15 +55,24 @@ class OfficialOpenAi {
             if (this.config.model.toLowerCase().includes('32k')) {
                 baseOptions.maxModelTokens = 32768;
                 baseOptions.maxResponseTokens = 8192;
+            } // if use GPT-4 Turbo
+            else if (this.config.model.toLowerCase().includes('1106-preview')) {
+                baseOptions.maxModelTokens = 128000;
+                baseOptions.maxResponseTokens = 4096;
             }
             else {
                 baseOptions.maxModelTokens = 8192;
                 baseOptions.maxResponseTokens = 2048;
             }
         }
-        if (this.config.model.toLowerCase().includes('gpt-3.5-turbo-16k')) {
-            baseOptions.maxModelTokens = 16384;
-            baseOptions.maxResponseTokens = 4096;
+        if (this.config.model.toLowerCase().includes('gpt-3.5')) {
+            if (this.config.model.toLowerCase().includes('16k') || this.config.model.toLowerCase().includes('turbo-1106')) {
+                baseOptions.maxModelTokens = 16385;
+                baseOptions.maxResponseTokens = 4096;
+            }
+            else {
+                baseOptions.maxResponseTokens = 1000;
+            }
         }
         if (this.config.proxyUrl) {
             console.log(`启用代理请求:${this.config.proxyUrl}`);
@@ -116,7 +126,7 @@ class OfficialOpenAi {
     async getReply(content, uid, adminId = '', systemMessage = '', isFastGPT) {
         try {
             if (!this.chatGPT) {
-                console.log(isFastGPT ? '看到此消息说明启用了fastgpt' : '看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
+                console.log(isFastGPT ? '看到此消息说明启用了FastGPT' : '看到此消息说明已启用ChatGPT');
                 await this.init();
             }
             if (this.config.filter) {
@@ -173,9 +183,11 @@ class OfficialOpenAi {
             else {
                 message = text.replaceAll('\n', this.eol);
             }
-            while (message.length > 1000) {
-                replys.push(message.slice(0, 1000));
-                message = message.slice(1000);
+            const imgs = (0, index_js_1.extractImageLinks)(message);
+            console.log('imgs', imgs);
+            while (message.length > 1500) {
+                replys.push(message.slice(0, 1500));
+                message = message.slice(1500);
             }
             replys.push(message);
             replys = replys.map(item => {
@@ -184,6 +196,10 @@ class OfficialOpenAi {
                     content: item.trim()
                 };
             });
+            if (imgs.length) {
+                console.log('提取到内容中的图片', imgs);
+                replys = replys.concat(imgs);
+            }
             return replys;
         }
         catch (e) {

package/dist/cjs/src/common/index.d.ts

@@ -1,3 +1,11 @@
+/**
+ * 获取自定义定制内容
+ * @param {*} sortId 定制Id
+ */
+export function getCustomContent(sortId: any): Promise<any[] | [{
+    type: number;
+    content: string;
+}]>;
 declare namespace _default {
     export { updateRoomOnly };
     export { updateContactOnly };

package/dist/cjs/src/common/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendRoomNotice = exports.getCountDownContent = exports.getRoomEveryDayContent = exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getNewsContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = void 0;
+exports.sendRoomNotice = exports.getCountDownContent = exports.getRoomEveryDayContent = exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getNewsContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = exports.getCustomContent = void 0;
 const api_js_1 = require("../proxy/api.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const userDb_js_1 = require("../db/userDb.js");
@@ -28,6 +28,15 @@ async function getNewsContent(sortId, endWord = '', num = 10) {
     return content;
 }
 exports.getNewsContent = getNewsContent;
+/**
+ * 获取自定义定制内容
+ * @param {*} sortId 定制Id
+ */
+async function getCustomContent(sortId) {
+    let news = await (0, aibotk_js_1.getCustomNews)(sortId);
+    return news;
+}
+exports.getCustomContent = getCustomContent;
 /**
  * 获取每日说内容
  * @param {*} date 与朋友的纪念日

package/dist/cjs/src/handlers/on-scan.d.ts

@@ -1,3 +1,4 @@
+export function resetScanTime(): void;
 export default onScan;
 /**
  * 扫描登录，显示二维码

package/dist/cjs/src/handlers/on-scan.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetScanTime = void 0;
 const qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 const index_js_1 = require("../lib/index.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
@@ -11,6 +12,10 @@ const puppetDb_js_1 = require("../db/puppetDb.js");
 const global_js_1 = __importDefault(require("../db/global.js"));
 // 限制推送二维码的次数，防止掉线后，无限推送二维码到服务器
 let scanTime = 0;
+function resetScanTime() {
+    scanTime = 0;
+}
+exports.resetScanTime = resetScanTime;
 function getQrcodeKey(qrcode) {
     if (!qrcode || !qrcode.startsWith('http'))
         return;

package/dist/cjs/src/lib/index.d.ts

@@ -1,4 +1,11 @@
 export function delHtmlTag(str: any): any;
+/**
+ * 提取文字中的图片链接
+ * @param text
+ * @returns {*[]}
+ */
+export function extractImageLinks(text: any): any[];
+export function convertMdToText(mdContent: any): any;
 declare namespace _default {
     export { Base64Encode };
     export { Base64Decode };

package/dist/cjs/src/lib/index.js

@@ -26,11 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewsType = exports.groupArray = exports.cancelAllSchedule = exports.throttle = exports.msgArr = exports.contentDistinguish = exports.getFormatQuery = exports.MD5 = exports.writeFile = exports.randomRange = exports.getConstellation = exports.isRealDate = exports.formatDate = exports.getDay = exports.convertTime = exports.getToday = exports.delay = exports.parseBody = exports.setLocalSchedule = exports.Base64Decode = exports.Base64Encode = exports.delHtmlTag = void 0;
+exports.getNewsType = exports.groupArray = exports.cancelAllSchedule = exports.throttle = exports.msgArr = exports.contentDistinguish = exports.getFormatQuery = exports.MD5 = exports.writeFile = exports.randomRange = exports.getConstellation = exports.isRealDate = exports.formatDate = exports.getDay = exports.convertTime = exports.getToday = exports.delay = exports.parseBody = exports.setLocalSchedule = exports.Base64Decode = exports.Base64Encode = exports.convertMdToText = exports.extractImageLinks = exports.delHtmlTag = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const schedule = __importStar(require("node-schedule"));
 const fs_1 = __importDefault(require("fs"));
 const dayjs_1 = __importDefault(require("dayjs"));
+const marked_1 = require("marked");
 /**
  * 设置定时器
  * @param {*} date 日期
@@ -496,6 +497,37 @@ function delHtmlTag(str) {
     return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
 }
 exports.delHtmlTag = delHtmlTag;
+/**
+ * 提取文字中的图片链接
+ * @param text
+ * @returns {*[]}
+ */
+function extractImageLinks(text) {
+    const httpRegex = /(http:\/\/\S+\.(?:jpg|png|gif|webp|jpeg))/g;
+    const httpsRegex = /(https:\/\/\S+\.(?:jpg|png|gif|webp|jpeg))/g;
+    const mdRegexHttps = /!\[[^\]]*\]\((https?:\/\/\S+)\)/g;
+    const mdRegexHttp = /!\[[^\]]*\]\((http?:\/\/\S+)\)/g;
+    let imageLinks = [];
+    let match;
+    while ((match = httpRegex.exec(text)) !== null) {
+        imageLinks.push(match[0]);
+    }
+    while ((match = httpsRegex.exec(text)) !== null) {
+        imageLinks.push(match[0]);
+    }
+    while ((match = mdRegexHttp.exec(text)) !== null || (match = mdRegexHttps.exec(text)) !== null) {
+        imageLinks.push(match[1]);
+    }
+    return imageLinks.map(item => ({ type: 2, url: item }));
+}
+exports.extractImageLinks = extractImageLinks;
+function convertMdToText(mdContent) {
+    // 使用 marked 库将 md 格式的内容转换成文本格式
+    const textContent = (0, marked_1.marked)(mdContent, { gfm: true });
+    return textContent;
+}
+exports.convertMdToText = convertMdToText;
+;
 exports.default = {
     Base64Encode,
     Base64Decode,

package/dist/cjs/src/package-json.js

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.33",
+    "version": "1.6.34",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

package/dist/cjs/src/proxy/aibotk.d.ts

@@ -10,6 +10,24 @@ export function getWordCloudConfig(roomName: any): Promise<any>;
  * 获取词云图片
  */
 export function getWordCloud(wordcontent: any, background: any, border: any): Promise<string | undefined>;
+/**
+ * 获取自定义内容
+ * @param id
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+export function getCustomNews(id: any): Promise<[{
+    type: number;
+    content: string;
+}] | any[]>;
+/**
+ * 获取自定义技能
+ * @param params
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+export function getCustomEvents(params: any): Promise<[{
+    type: number;
+    content: string;
+}] | any[]>;
 /**
  * 获取gpt配置
  * @return {Promise<*>}

package/dist/cjs/src/proxy/aibotk.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPromotInfo = exports.updateChatRecord = exports.getFireNews = exports.getMaterial = exports.getOne = exports.getMeiNv = exports.getMqttConfig = exports.updatePanelVersion = exports.asyncData = exports.sendRoom = exports.sendFriend = exports.putqn = exports.sendRobotInfo = exports.sendHeartBeat = exports.setQrCode = exports.updateSchedule = exports.setSchedule = exports.getScheduleList = exports.getConfig = exports.clearVerifyCode = exports.getVerifyCode = exports.getPanelVersion = exports.getRssConfig = exports.getTasks = exports.getGptConfig = exports.getWordCloud = exports.getWordCloudConfig = exports.getWordCloudRoom = void 0;
+exports.getPromotInfo = exports.updateChatRecord = exports.getFireNews = exports.getMaterial = exports.getOne = exports.getMeiNv = exports.getMqttConfig = exports.updatePanelVersion = exports.asyncData = exports.sendRoom = exports.sendFriend = exports.putqn = exports.sendRobotInfo = exports.sendHeartBeat = exports.setQrCode = exports.updateSchedule = exports.setSchedule = exports.getScheduleList = exports.getConfig = exports.clearVerifyCode = exports.getVerifyCode = exports.getPanelVersion = exports.getRssConfig = exports.getTasks = exports.getGptConfig = exports.getCustomEvents = exports.getCustomNews = exports.getWordCloud = exports.getWordCloudConfig = exports.getWordCloudRoom = void 0;
 const superagent_js_1 = require("./superagent.js");
 const configDb_js_1 = require("../db/configDb.js");
 const package_json_js_1 = require("../package-json.js");
@@ -140,7 +140,7 @@ async function getFireNews(id, num) {
             1001: '您可以 @消防小助手+新闻标题，通过ChatGPT为您分析时事新闻！',
             1002: '您可以 @消防小助手+新闻标题，通过ChatGPT为您分析今日消防行业招标信息！',
         };
-        return `${news}…………………………${eol}${eol}${endMap[id]}`;
+        return `${news}…………………………${eol}${eol}${endMap[id] || ''}`;
     }
     catch (e) {
         console.log('获取每日一句失败', e);
@@ -148,6 +148,52 @@ async function getFireNews(id, num) {
     }
 }
 exports.getFireNews = getFireNews;
+/**
+ * 获取自定义内容
+ * @param id
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+async function getCustomNews(id) {
+    try {
+        let option = {
+            method: 'GET',
+            url: '/customnews',
+            params: {
+                id
+            },
+        };
+        let content = await (0, superagent_js_1.aiBotReq)(option);
+        let newContent = content.data || [];
+        return newContent;
+    }
+    catch (e) {
+        console.log('定制内容获取失败', e);
+        return [{ type: 1, content: '定制内容获取失败' }];
+    }
+}
+exports.getCustomNews = getCustomNews;
+/**
+ * 获取自定义技能
+ * @param params
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+async function getCustomEvents(params) {
+    try {
+        let option = {
+            method: 'POST',
+            url: '/customevent',
+            params,
+        };
+        let content = await (0, superagent_js_1.aiBotReq)(option);
+        let newContent = content.data || [];
+        return newContent;
+    }
+    catch (e) {
+        console.log('自定义技能获取失败', e);
+        return [{ type: 1, content: '自定义技能获取失败' }];
+    }
+}
+exports.getCustomEvents = getCustomEvents;
 /**
  * 获取配置文件
  * @returns {Promise<*>}

package/dist/cjs/src/proxy/mqtt.js

@@ -39,6 +39,7 @@ const chatgpt_web_js_1 = require("./bot/chatgpt-web.js");
 const dify_js_1 = require("./bot/dify.js");
 const rss_js_1 = require("../task/rss.js");
 const global_js_1 = __importDefault(require("../db/global.js"));
+const on_scan_js_1 = require("../handlers/on-scan.js");
 let mqttclient = null;
 async function sendRoomSay(that, room, messages) {
     console.log(`收到群：${room.name}批量发送消息请求， 消息数量【${messages.length}】`);
@@ -191,6 +192,10 @@ async function initMqtt(that) {
                             console.log('强制更新二维码');
                             await this.refreshQrCode();
                         }
+                        else if (content.target === 'getNewQrCode') {
+                            console.log('获取最新二维码');
+                            (0, on_scan_js_1.resetScanTime)();
+                        }
                         else if (content.target === 'verifyCode') {
                             console.log('触发了输入验证码事件');
                             if (global_js_1.default.getVerifyId() === global_js_1.default.getQrKey()) {

package/dist/cjs/src/service/event-dispatch-service.d.ts

@@ -12,7 +12,7 @@ export default _default;
  * @param avatar
  * @returns {string} 内容
  */
-export function dispatchEventContent(that: any, eName: string, msg: string, name: any, id: any, avatar: any, room: any): string;
+export function dispatchEventContent(that: any, eName: string, msg: string, name: any, id: any, avatar: any, room: any, roomName: any, sourceMsg: any): string;
 /**
  * 派发不同的机器人处理回复内容
  * @param {*} bot 机器人类别 0 天行机器人 1 天行的图灵机器人 2 图灵机器人 3 腾讯闲聊机器人

package/dist/cjs/src/service/event-dispatch-service.js

@@ -23,9 +23,13 @@ const difyAi_js_1 = require("../proxy/difyAi.js");
  * @param avatar
  * @returns {string} 内容
  */
-async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
+async function dispatchEventContent(that, eName, msg, name, id, avatar, room, roomName, sourceMsg) {
     try {
         let content = '', type = 1, url = '';
+        if (eName.includes('event-')) {
+            const res = await (0, aibotk_js_1.getCustomEvents)({ msg: msg || '', sourceMsg: sourceMsg || '', wxid: id, name, eventId: eName, roomName: roomName || '' });
+            return res;
+        }
         switch (eName) {
             case 'rubbish':
                 content = await api_js_1.default.getRubbishType(msg);
@@ -112,6 +116,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
                 await (0, aibotk_js_1.getConfig)();
                 await (0, index_js_2.initTaskLocalSchedule)(that);
                 await (0, index_js_2.initTimeSchedule)(that);
+                await (0, index_js_2.initMultiTask)(that);
                 (0, openAiHook_js_1.reset)();
                 (0, openAi_js_1.reset)();
                 (0, difyAi_js_1.reset)();

package/dist/cjs/src/service/msg-filters.d.ts

@@ -45,11 +45,11 @@ export function callbackEvent({ that, msg, name, id, config, room, isMention }:
 export function emptyMsg({ room, isMention }: {
     room: any;
     isMention: any;
-}): {
+}): Promise<{
     type: number;
-    content: string;
+    content: any;
     url: string;
-}[];
+}[]>;
 export function officialMsg(): {
     type: number;
     content: string;
@@ -74,7 +74,7 @@ export function scheduleJobMsg({ that, msg, name }: {
     msg: any;
     name: any;
 }): Promise<any>;
-export function eventMsg({ that, msg, name, id, avatar, config, room, isMention }: {
+export function eventMsg({ that, msg, name, id, avatar, config, room, isMention, roomName }: {
     that: any;
     msg: any;
     name: any;
@@ -83,6 +83,7 @@ export function eventMsg({ that, msg, name, id, avatar, config, room, isMention
     config: any;
     room: any;
     isMention: any;
+    roomName: any;
 }): Promise<string | never[]>;
 /**
  * 关键词回复

package/dist/cjs/src/service/msg-filters.js

@@ -12,11 +12,13 @@ const superagent_js_1 = require("../proxy/superagent.js");
 const dispatch_js_1 = require("../proxy/bot/dispatch.js");
 const global_js_1 = __importDefault(require("../db/global.js"));
 const userDb_js_1 = require("../db/userDb.js");
-function emptyMsg({ room, isMention }) {
+const configDb_js_1 = require("../db/configDb.js");
+async function emptyMsg({ room, isMention }) {
+    const config = await (0, configDb_js_1.allConfig)();
     if (room && !isMention)
         return [];
     let msgArr = []; // 返回的消息列表
-    let obj = { type: 1, content: "我在呢", url: "" }; // 消息主体
+    let obj = { type: 1, content: config.defaultReply, url: "" }; // 消息主体
     msgArr.push(obj);
     return msgArr;
 }
@@ -136,9 +138,9 @@ exports.scheduleJobMsg = scheduleJobMsg;
  * @param avatar 用户头像
  * @returns {String}
  */
-async function getEventReply(that, event, msg, name, id, avatar, room) {
+async function getEventReply(that, event, msg, name, id, avatar, room, roomName, sourceMsg) {
     try {
-        let reply = await event_dispatch_service_js_1.default.dispatchEventContent(that, event, msg, name, id, avatar, room);
+        let reply = await event_dispatch_service_js_1.default.dispatchEventContent(that, event, msg, name, id, avatar, room, roomName, sourceMsg);
         return reply;
     }
     catch (e) {
@@ -201,7 +203,7 @@ async function callbackEvent({ that, msg, name, id, config, room, isMention }) {
     }
 }
 exports.callbackEvent = callbackEvent;
-async function eventMsg({ that, msg, name, id, avatar, config, room, isMention }) {
+async function eventMsg({ that, msg, name, id, avatar, config, room, isMention, roomName }) {
     try {
         for (let item of config.eventKeywords) {
             for (let key of item.keywords) {
@@ -210,8 +212,8 @@ async function eventMsg({ that, msg, name, id, avatar, config, room, isMention }
                     if ((room && item.needAt === 1 && !isMention) || (room && item.needAt === undefined && !isMention) || (room && item.scope === "friend") || (!room && item.scope === "room")) {
                         return [];
                     }
-                    msg = msg.replace(key, "");
-                    let res = await getEventReply(that, item.event, msg, name, id, avatar, room);
+                    const replaceMsg = msg.replace(key, "");
+                    let res = await getEventReply(that, item.event, replaceMsg, name, id, avatar, room, roomName, msg);
                     return res;
                 }
             }

package/dist/cjs/src/task/index.js

@@ -146,6 +146,45 @@ const sendNews = async ({ that, target, item, isMulti, targets }) => {
         }
     }
 };
+/**
+ * 发送自定义定制内容
+ * @param that
+ * @param target
+ * @param type 类型 room contact
+ * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
+ * @return {Promise<void>}
+ */
+const sendCustomContent = async ({ that, target, type, item, isMulti, targets }) => {
+    let contents = await (0, index_js_2.getCustomContent)(item.sortId);
+    console.log("定制内容发送", contents);
+    if (!isMulti) {
+        for (const reply of contents) {
+            await (0, index_js_2.contactSay)(target, reply);
+            await (0, index_js_1.delay)(200);
+        }
+    }
+    else {
+        for (let single of targets) {
+            try {
+                for (const reply of contents) {
+                    type === 'room' ? await (0, index_js_2.roomSay)(single, '', reply) : await (0, index_js_2.contactSay)(single, reply);
+                    await (0, index_js_1.delay)(200);
+                }
+                if (item.delay) {
+                    await (0, index_js_1.delay)(item.delay);
+                }
+                else {
+                    await (0, index_js_1.delay)(800);
+                }
+            }
+            catch (e) {
+                console.log(`定时任务失败，可能群已经解散或者好友不存在: ${e}`);
+            }
+        }
+    }
+};
 /**
  * 发送每日说
  * @param that
@@ -379,6 +418,9 @@ async function sendMultiTaskMessage(that, task) {
         else if (task.taskType === "countdown") {
             await sendCountDown({ that, isMulti: true, targets, item: task.taskInfo });
         }
+        else if (task.taskType === "customContent") {
+            await sendCustomContent({ that, isMulti: true, targets, type: task.type, item: task.taskInfo });
+        }
     }
     catch (error) {
         console.log("立即发送定时任务失败：", error);
@@ -414,6 +456,14 @@ async function startSendMultiTask({ that, task }) {
             item: task.taskInfo
         });
     }
+    else if (task.taskType === "customContent") {
+        await sendCustomContent({
+            that,
+            isMulti: true,
+            targets,
+            item: task.taskInfo
+        });
+    }
 }
 async function setMultiTask(that, task) {
     try {
@@ -435,6 +485,12 @@ async function setMultiTask(that, task) {
                 task
             }), `schedule_countdown_${task.id}`);
         }
+        else if (task.taskType === "customContent") {
+            (0, index_js_1.setLocalSchedule)(task.cron, startSendMultiTask.bind(null, {
+                that,
+                task
+            }), `schedule_customcontent_${task.id}`);
+        }
     }
     catch (e) {
         console.log("catch error:" + e);

package/dist/esm/src/botInstance/dify.js

@@ -4,6 +4,7 @@ import { getPromotInfo } from "../proxy/aibotk.js";
 import { ContentCensor } from "../lib/contentCensor.js";
 import { getPuppetEol } from "../const/puppet-type.js";
 import dayjs from "dayjs";
+import { extractImageLinks } from '../lib/index.js';
 class DifyAi {
     constructor(config = {
         token: '',
@@ -95,9 +96,10 @@ class DifyAi {
             else {
                 message = text.replaceAll('\n', this.eol);
             }
-            while (message.length > 1000) {
-                replys.push(message.slice(0, 1000));
-                message = message.slice(1000);
+            const imgs = extractImageLinks(message);
+            while (message.length > 1500) {
+                replys.push(message.slice(0, 1500));
+                message = message.slice(1500);
             }
             replys.push(message);
             replys = replys.map(item => {
@@ -106,6 +108,10 @@ class DifyAi {
                     content: item.trim()
                 };
             });
+            if (imgs.length) {
+                console.log('提取到内容中的图片', imgs);
+                replys = replys.concat(imgs);
+            }
             return replys;
         }
         catch (e) {

package/dist/esm/src/botInstance/officialOpenAi.d.ts

@@ -15,10 +15,7 @@ declare class OfficialOpenAi {
         _apiKey: any;
         _apiOrg: any;
         _apiBaseUrl: any;
-        _debug: boolean; /**
-         * 重置apikey
-         * @return {Promise<void>}
-         */
+        _debug: boolean;
         _fetch: any;
         _completionParams: any;
         _systemMessage: any;

package/dist/esm/src/botInstance/officialOpenAi.js

@@ -7,6 +7,7 @@ import { ContentCensor } from "../lib/contentCensor.js";
 import { getPuppetEol } from "../const/puppet-type.js";
 import { v4 as uuidv4 } from "uuid";
 import dayjs from "dayjs";
+import { extractImageLinks } from '../lib/index.js';
 let chatGPT = null;
 class OfficialOpenAi {
     constructor(config = {
@@ -49,15 +50,24 @@ class OfficialOpenAi {
             if (this.config.model.toLowerCase().includes('32k')) {
                 baseOptions.maxModelTokens = 32768;
                 baseOptions.maxResponseTokens = 8192;
+            } // if use GPT-4 Turbo
+            else if (this.config.model.toLowerCase().includes('1106-preview')) {
+                baseOptions.maxModelTokens = 128000;
+                baseOptions.maxResponseTokens = 4096;
             }
             else {
                 baseOptions.maxModelTokens = 8192;
                 baseOptions.maxResponseTokens = 2048;
             }
         }
-        if (this.config.model.toLowerCase().includes('gpt-3.5-turbo-16k')) {
-            baseOptions.maxModelTokens = 16384;
-            baseOptions.maxResponseTokens = 4096;
+        if (this.config.model.toLowerCase().includes('gpt-3.5')) {
+            if (this.config.model.toLowerCase().includes('16k') || this.config.model.toLowerCase().includes('turbo-1106')) {
+                baseOptions.maxModelTokens = 16385;
+                baseOptions.maxResponseTokens = 4096;
+            }
+            else {
+                baseOptions.maxResponseTokens = 1000;
+            }
         }
         if (this.config.proxyUrl) {
             console.log(`启用代理请求:${this.config.proxyUrl}`);
@@ -111,7 +121,7 @@ class OfficialOpenAi {
     async getReply(content, uid, adminId = '', systemMessage = '', isFastGPT) {
         try {
             if (!this.chatGPT) {
-                console.log(isFastGPT ? '看到此消息说明启用了fastgpt' : '看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
+                console.log(isFastGPT ? '看到此消息说明启用了FastGPT' : '看到此消息说明已启用ChatGPT');
                 await this.init();
             }
             if (this.config.filter) {
@@ -168,9 +178,11 @@ class OfficialOpenAi {
             else {
                 message = text.replaceAll('\n', this.eol);
             }
-            while (message.length > 1000) {
-                replys.push(message.slice(0, 1000));
-                message = message.slice(1000);
+            const imgs = extractImageLinks(message);
+            console.log('imgs', imgs);
+            while (message.length > 1500) {
+                replys.push(message.slice(0, 1500));
+                message = message.slice(1500);
             }
             replys.push(message);
             replys = replys.map(item => {
@@ -179,6 +191,10 @@ class OfficialOpenAi {
                     content: item.trim()
                 };
             });
+            if (imgs.length) {
+                console.log('提取到内容中的图片', imgs);
+                replys = replys.concat(imgs);
+            }
             return replys;
         }
         catch (e) {

package/dist/esm/src/common/index.d.ts

@@ -1,3 +1,11 @@
+/**
+ * 获取自定义定制内容
+ * @param {*} sortId 定制Id
+ */
+export function getCustomContent(sortId: any): Promise<any[] | [{
+    type: number;
+    content: string;
+}]>;
 declare namespace _default {
     export { updateRoomOnly };
     export { updateContactOnly };

package/dist/esm/src/common/index.js

@@ -1,5 +1,5 @@
 import { getNews, getTXweather, getSweetWord } from '../proxy/api.js';
-import { sendFriend, sendRoom, asyncData, getOne, getMaterial } from '../proxy/aibotk.js';
+import { sendFriend, sendRoom, asyncData, getOne, getMaterial, getCustomNews } from '../proxy/aibotk.js';
 import { getUser } from '../db/userDb.js';
 import { formatDate, getDay, groupArray, delay } from '../lib/index.js';
 import { FileBox } from 'file-box';
@@ -24,6 +24,14 @@ async function getNewsContent(sortId, endWord = '', num = 10) {
     let content = `${today}${eol}${news}${eol}${endWord ? '————————' : ''}${endWord}`;
     return content;
 }
+/**
+ * 获取自定义定制内容
+ * @param {*} sortId 定制Id
+ */
+export async function getCustomContent(sortId) {
+    let news = await getCustomNews(sortId);
+    return news;
+}
 /**
  * 获取每日说内容
  * @param {*} date 与朋友的纪念日

package/dist/esm/src/handlers/on-scan.d.ts

@@ -1,3 +1,4 @@
+export function resetScanTime(): void;
 export default onScan;
 /**
  * 扫描登录，显示二维码

package/dist/esm/src/handlers/on-scan.js

@@ -6,6 +6,9 @@ import { updatePuppetConfig } from "../db/puppetDb.js";
 import globalConfig from '../db/global.js';
 // 限制推送二维码的次数，防止掉线后，无限推送二维码到服务器
 let scanTime = 0;
+export function resetScanTime() {
+    scanTime = 0;
+}
 function getQrcodeKey(qrcode) {
     if (!qrcode || !qrcode.startsWith('http'))
         return;

package/dist/esm/src/lib/index.d.ts

@@ -1,4 +1,11 @@
 export function delHtmlTag(str: any): any;
+/**
+ * 提取文字中的图片链接
+ * @param text
+ * @returns {*[]}
+ */
+export function extractImageLinks(text: any): any[];
+export function convertMdToText(mdContent: any): any;
 declare namespace _default {
     export { Base64Encode };
     export { Base64Decode };

package/dist/esm/src/lib/index.js

@@ -2,6 +2,7 @@ import Crypto from 'crypto';
 import * as schedule from 'node-schedule';
 import fs from 'fs';
 import dayjs from "dayjs";
+import { marked } from 'marked';
 /**
  * 设置定时器
  * @param {*} date 日期
@@ -445,6 +446,35 @@ function groupArray(array, subGroupLength) {
 export function delHtmlTag(str) {
     return str.replace(/<[^>]+>/g, ""); //去掉所有的html标记
 }
+/**
+ * 提取文字中的图片链接
+ * @param text
+ * @returns {*[]}
+ */
+export function extractImageLinks(text) {
+    const httpRegex = /(http:\/\/\S+\.(?:jpg|png|gif|webp|jpeg))/g;
+    const httpsRegex = /(https:\/\/\S+\.(?:jpg|png|gif|webp|jpeg))/g;
+    const mdRegexHttps = /!\[[^\]]*\]\((https?:\/\/\S+)\)/g;
+    const mdRegexHttp = /!\[[^\]]*\]\((http?:\/\/\S+)\)/g;
+    let imageLinks = [];
+    let match;
+    while ((match = httpRegex.exec(text)) !== null) {
+        imageLinks.push(match[0]);
+    }
+    while ((match = httpsRegex.exec(text)) !== null) {
+        imageLinks.push(match[0]);
+    }
+    while ((match = mdRegexHttp.exec(text)) !== null || (match = mdRegexHttps.exec(text)) !== null) {
+        imageLinks.push(match[1]);
+    }
+    return imageLinks.map(item => ({ type: 2, url: item }));
+}
+export function convertMdToText(mdContent) {
+    // 使用 marked 库将 md 格式的内容转换成文本格式
+    const textContent = marked(mdContent, { gfm: true });
+    return textContent;
+}
+;
 export { Base64Encode };
 export { Base64Decode };
 export { setLocalSchedule };

package/dist/esm/src/package-json.js

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.33",
+    "version": "1.6.34",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

package/dist/esm/src/proxy/aibotk.d.ts

@@ -10,6 +10,24 @@ export function getWordCloudConfig(roomName: any): Promise<any>;
  * 获取词云图片
  */
 export function getWordCloud(wordcontent: any, background: any, border: any): Promise<string | undefined>;
+/**
+ * 获取自定义内容
+ * @param id
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+export function getCustomNews(id: any): Promise<[{
+    type: number;
+    content: string;
+}] | any[]>;
+/**
+ * 获取自定义技能
+ * @param params
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+export function getCustomEvents(params: any): Promise<[{
+    type: number;
+    content: string;
+}] | any[]>;
 /**
  * 获取gpt配置
  * @return {Promise<*>}

package/dist/esm/src/proxy/aibotk.js

@@ -129,13 +129,57 @@ async function getFireNews(id, num) {
             1001: '您可以 @消防小助手+新闻标题，通过ChatGPT为您分析时事新闻！',
             1002: '您可以 @消防小助手+新闻标题，通过ChatGPT为您分析今日消防行业招标信息！',
         };
-        return `${news}…………………………${eol}${eol}${endMap[id]}`;
+        return `${news}…………………………${eol}${eol}${endMap[id] || ''}`;
     }
     catch (e) {
         console.log('获取每日一句失败', e);
         return '今日一句似乎已经消失';
     }
 }
+/**
+ * 获取自定义内容
+ * @param id
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+export async function getCustomNews(id) {
+    try {
+        let option = {
+            method: 'GET',
+            url: '/customnews',
+            params: {
+                id
+            },
+        };
+        let content = await aiBotReq(option);
+        let newContent = content.data || [];
+        return newContent;
+    }
+    catch (e) {
+        console.log('定制内容获取失败', e);
+        return [{ type: 1, content: '定制内容获取失败' }];
+    }
+}
+/**
+ * 获取自定义技能
+ * @param params
+ * @returns {Promise<[{type: number, content: string}]|*[]>}
+ */
+export async function getCustomEvents(params) {
+    try {
+        let option = {
+            method: 'POST',
+            url: '/customevent',
+            params,
+        };
+        let content = await aiBotReq(option);
+        let newContent = content.data || [];
+        return newContent;
+    }
+    catch (e) {
+        console.log('自定义技能获取失败', e);
+        return [{ type: 1, content: '自定义技能获取失败' }];
+    }
+}
 /**
  * 获取配置文件
  * @returns {Promise<*>}

package/dist/esm/src/proxy/mqtt.js

@@ -10,6 +10,7 @@ import { reset as webReset } from './bot/chatgpt-web.js';
 import { reset as difyReset } from './bot/dify.js';
 import { initRssTask, sendRssTaskMessage } from "../task/rss.js";
 import globalConfig from "../db/global.js";
+import { resetScanTime } from '../handlers/on-scan.js';
 let mqttclient = null;
 async function sendRoomSay(that, room, messages) {
     console.log(`收到群：${room.name}批量发送消息请求， 消息数量【${messages.length}】`);
@@ -162,6 +163,10 @@ async function initMqtt(that) {
                             console.log('强制更新二维码');
                             await this.refreshQrCode();
                         }
+                        else if (content.target === 'getNewQrCode') {
+                            console.log('获取最新二维码');
+                            resetScanTime();
+                        }
                         else if (content.target === 'verifyCode') {
                             console.log('触发了输入验证码事件');
                             if (globalConfig.getVerifyId() === globalConfig.getQrKey()) {

package/dist/esm/src/service/event-dispatch-service.d.ts

@@ -12,7 +12,7 @@ export default _default;
  * @param avatar
  * @returns {string} 内容
  */
-export function dispatchEventContent(that: any, eName: string, msg: string, name: any, id: any, avatar: any, room: any): string;
+export function dispatchEventContent(that: any, eName: string, msg: string, name: any, id: any, avatar: any, room: any, roomName: any, sourceMsg: any): string;
 /**
  * 派发不同的机器人处理回复内容
  * @param {*} bot 机器人类别 0 天行机器人 1 天行的图灵机器人 2 图灵机器人 3 腾讯闲聊机器人

package/dist/esm/src/service/event-dispatch-service.js

@@ -1,7 +1,7 @@
 import api from '../proxy/api.js';
-import { getConfig, getMeiNv, getWordCloudConfig } from '../proxy/aibotk.js';
+import { getConfig, getMeiNv, getWordCloudConfig, getCustomEvents } from '../proxy/aibotk.js';
 import { getConstellation, msgArr, getNewsType } from '../lib/index.js';
-import { initTaskLocalSchedule, initTimeSchedule } from "../task/index.js";
+import { initTaskLocalSchedule, initTimeSchedule, initMultiTask } from "../task/index.js";
 import { updateContactAndRoom, updateContactOnly, updateRoomOnly } from '../common/index.js';
 import { getTencentOpenReply } from '../proxy/tencent-open.js';
 import { removeRecord } from "../db/roomDb.js";
@@ -17,9 +17,13 @@ import { getDifyReply, reset as difyReset } from "../proxy/difyAi.js";
  * @param avatar
  * @returns {string} 内容
  */
-async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
+async function dispatchEventContent(that, eName, msg, name, id, avatar, room, roomName, sourceMsg) {
     try {
         let content = '', type = 1, url = '';
+        if (eName.includes('event-')) {
+            const res = await getCustomEvents({ msg: msg || '', sourceMsg: sourceMsg || '', wxid: id, name, eventId: eName, roomName: roomName || '' });
+            return res;
+        }
         switch (eName) {
             case 'rubbish':
                 content = await api.getRubbishType(msg);
@@ -106,6 +110,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
                 await getConfig();
                 await initTaskLocalSchedule(that);
                 await initTimeSchedule(that);
+                await initMultiTask(that);
                 reset();
                 officialReset();
                 difyReset();

package/dist/esm/src/service/msg-filters.d.ts

@@ -45,11 +45,11 @@ export function callbackEvent({ that, msg, name, id, config, room, isMention }:
 export function emptyMsg({ room, isMention }: {
     room: any;
     isMention: any;
-}): {
+}): Promise<{
     type: number;
-    content: string;
+    content: any;
     url: string;
-}[];
+}[]>;
 export function officialMsg(): {
     type: number;
     content: string;
@@ -74,7 +74,7 @@ export function scheduleJobMsg({ that, msg, name }: {
     msg: any;
     name: any;
 }): Promise<any>;
-export function eventMsg({ that, msg, name, id, avatar, config, room, isMention }: {
+export function eventMsg({ that, msg, name, id, avatar, config, room, isMention, roomName }: {
     that: any;
     msg: any;
     name: any;
@@ -83,6 +83,7 @@ export function eventMsg({ that, msg, name, id, avatar, config, room, isMention
     config: any;
     room: any;
     isMention: any;
+    roomName: any;
 }): Promise<string | never[]>;
 /**
  * 关键词回复

package/dist/esm/src/service/msg-filters.js

@@ -1,16 +1,18 @@
 import dispatch from "./event-dispatch-service.js";
-import { setSchedule, updateSchedule } from "../proxy/aibotk.js";
+import { getConfig, setSchedule, updateSchedule } from '../proxy/aibotk.js';
 import { contentDistinguish, setLocalSchedule, isRealDate } from "../lib/index.js";
 import { addRoom } from "../common/index.js";
 import { service, callbackAibotApi } from "../proxy/superagent.js";
 import { dispatchBot } from "../proxy/bot/dispatch.js";
 import globalConfig from "../db/global.js";
 import { getUser } from "../db/userDb.js";
-function emptyMsg({ room, isMention }) {
+import { allConfig } from '../db/configDb.js';
+async function emptyMsg({ room, isMention }) {
+    const config = await allConfig();
     if (room && !isMention)
         return [];
     let msgArr = []; // 返回的消息列表
-    let obj = { type: 1, content: "我在呢", url: "" }; // 消息主体
+    let obj = { type: 1, content: config.defaultReply, url: "" }; // 消息主体
     msgArr.push(obj);
     return msgArr;
 }
@@ -124,9 +126,9 @@ async function scheduleJobMsg({ that, msg, name }) {
  * @param avatar 用户头像
  * @returns {String}
  */
-async function getEventReply(that, event, msg, name, id, avatar, room) {
+async function getEventReply(that, event, msg, name, id, avatar, room, roomName, sourceMsg) {
     try {
-        let reply = await dispatch.dispatchEventContent(that, event, msg, name, id, avatar, room);
+        let reply = await dispatch.dispatchEventContent(that, event, msg, name, id, avatar, room, roomName, sourceMsg);
         return reply;
     }
     catch (e) {
@@ -188,7 +190,7 @@ async function callbackEvent({ that, msg, name, id, config, room, isMention }) {
         return [];
     }
 }
-async function eventMsg({ that, msg, name, id, avatar, config, room, isMention }) {
+async function eventMsg({ that, msg, name, id, avatar, config, room, isMention, roomName }) {
     try {
         for (let item of config.eventKeywords) {
             for (let key of item.keywords) {
@@ -197,8 +199,8 @@ async function eventMsg({ that, msg, name, id, avatar, config, room, isMention }
                     if ((room && item.needAt === 1 && !isMention) || (room && item.needAt === undefined && !isMention) || (room && item.scope === "friend") || (!room && item.scope === "room")) {
                         return [];
                     }
-                    msg = msg.replace(key, "");
-                    let res = await getEventReply(that, item.event, msg, name, id, avatar, room);
+                    const replaceMsg = msg.replace(key, "");
+                    let res = await getEventReply(that, item.event, replaceMsg, name, id, avatar, room, roomName, msg);
                     return res;
                 }
             }

package/dist/esm/src/task/index.js

@@ -1,7 +1,7 @@
 import { setLocalSchedule, delay, cancelAllSchedule } from "../lib/index.js";
 import { allConfig } from "../db/configDb.js";
 import { getScheduleList, updateSchedule } from "../proxy/aibotk.js";
-import { getNewsContent, getEveryDayContent, roomSay, getRoomEveryDayContent, contactSay, getCountDownContent } from "../common/index.js";
+import { getNewsContent, getEveryDayContent, roomSay, getRoomEveryDayContent, contactSay, getCountDownContent, getCustomContent } from "../common/index.js";
 import globalConfig from "../db/global.js";
 const typeMap = {
     contact: "用户名", room: "群名"
@@ -140,6 +140,45 @@ const sendNews = async ({ that, target, item, isMulti, targets }) => {
         }
     }
 };
+/**
+ * 发送自定义定制内容
+ * @param that
+ * @param target
+ * @param type 类型 room contact
+ * @param item
+ * @param isMulti 是否多个目标
+ * @param targets 发送的多个目标
+ * @return {Promise<void>}
+ */
+const sendCustomContent = async ({ that, target, type, item, isMulti, targets }) => {
+    let contents = await getCustomContent(item.sortId);
+    console.log("定制内容发送", contents);
+    if (!isMulti) {
+        for (const reply of contents) {
+            await contactSay(target, reply);
+            await delay(200);
+        }
+    }
+    else {
+        for (let single of targets) {
+            try {
+                for (const reply of contents) {
+                    type === 'room' ? await roomSay(single, '', reply) : await contactSay(single, reply);
+                    await delay(200);
+                }
+                if (item.delay) {
+                    await delay(item.delay);
+                }
+                else {
+                    await delay(800);
+                }
+            }
+            catch (e) {
+                console.log(`定时任务失败，可能群已经解散或者好友不存在: ${e}`);
+            }
+        }
+    }
+};
 /**
  * 发送每日说
  * @param that
@@ -370,6 +409,9 @@ async function sendMultiTaskMessage(that, task) {
         else if (task.taskType === "countdown") {
             await sendCountDown({ that, isMulti: true, targets, item: task.taskInfo });
         }
+        else if (task.taskType === "customContent") {
+            await sendCustomContent({ that, isMulti: true, targets, type: task.type, item: task.taskInfo });
+        }
     }
     catch (error) {
         console.log("立即发送定时任务失败：", error);
@@ -404,6 +446,14 @@ async function startSendMultiTask({ that, task }) {
             item: task.taskInfo
         });
     }
+    else if (task.taskType === "customContent") {
+        await sendCustomContent({
+            that,
+            isMulti: true,
+            targets,
+            item: task.taskInfo
+        });
+    }
 }
 async function setMultiTask(that, task) {
     try {
@@ -425,6 +475,12 @@ async function setMultiTask(that, task) {
                 task
             }), `schedule_countdown_${task.id}`);
         }
+        else if (task.taskType === "customContent") {
+            setLocalSchedule(task.cron, startSendMultiTask.bind(null, {
+                that,
+                task
+            }), `schedule_customcontent_${task.id}`);
+        }
     }
     catch (e) {
         console.log("catch error:" + e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.6.33",
+  "version": "1.6.34",
   "description": "智能微秘书插件",
   "exports": {
     ".": {