wechaty-web-panel 1.6.5 → 1.6.6

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 更新日志
 
+### V1.6.6(2023-05-12)
+1、自定义对话填加不同关键词触发不同角色，更灵活，更强大
+
 ### V1.6.5(2023-05-11)
 1、回调函数添加自定义超时时间
 

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

@@ -59,7 +59,7 @@ declare class OfficialOpenAi {
      * @return {Promise<void>}
      */
     reset(): Promise<void>;
-    getReply(content: any, uid: any, adminId?: string): Promise<{
+    getReply(content: any, uid: any, adminId?: string, systemMessage?: string): Promise<{
         type: number;
         content: any;
     }[]>;

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

@@ -108,7 +108,7 @@ class OfficialOpenAi {
     reset() {
         this.chatGPT = null;
     }
-    async getReply(content, uid, adminId = '') {
+    async getReply(content, uid, adminId = '', systemMessage = '') {
         try {
             if (!this.chatGPT) {
                 console.log('看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
@@ -119,15 +119,15 @@ class OfficialOpenAi {
                 const censor = await this.contentCensor.checkText(content);
                 if (!censor) {
                     console.log(`问题:${content},包含违规词，已拦截`);
-                    return [{ type: 1, content: '' }];
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
-            const { conversationId, text, id } = await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 });
+            const { conversationId, text, id } = await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 });
             if (this.config.filter) {
                 const censor = await this.contentCensor.checkText(text);
                 if (!censor) {
                     console.log(`回复: ${text},包含违规词，已拦截`);
-                    return [{ type: 1, content: '' }];
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
             if (this.config.record) {

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

@@ -36,7 +36,7 @@ declare class UnOfficialOpenAi {
      * @return {Promise<void>}
      */
     reset(): Promise<void>;
-    getReply(content: any, uid: any, adminId?: string): Promise<{
+    getReply(content: any, uid: any, adminId?: string, systemMessage?: string): Promise<{
         type: number;
         content: any;
     }[]>;

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

@@ -76,14 +76,17 @@ class UnOfficialOpenAi {
     reset() {
         this.chatGPT = null;
     }
-    async getReply(content, uid, adminId = '') {
+    async getReply(content, uid, adminId = '', systemMessage = '') {
         try {
             if (!this.chatGPT) {
                 console.log('看到此消息说明已启用chatGPT 网页hook版');
                 await this.init();
             }
-            const question = this.config.systemMessage ? this.config.systemMessage + content : content;
-            const { conversationId, text, id } = await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 });
+            let question = this.config.systemMessage ? this.config.systemMessage + content : content;
+            if (systemMessage) {
+                question = systemMessage + content;
+            }
+            const { conversationId, text, id } = await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 });
             if (this.config.record) {
                 void (0, aichatDb_js_1.addAichatRecord)({
                     contactId: uid,

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

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

package/dist/cjs/src/proxy/bot/chatgpt-web.d.ts

@@ -8,5 +8,6 @@ export function getChatGPTWebReply(content: any, uid: any, adminId: any, config?
     systemMessage: string;
     showQuestion: boolean;
     timeoutMs: number;
+    keywordSystemMessages: never[];
 }): Promise<any>;
 //# sourceMappingURL=chatgpt-web.d.ts.map

package/dist/cjs/src/proxy/bot/chatgpt-web.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChatGPTWebReply = exports.resetAll = exports.reset = void 0;
 const unOfficialOpenAi_js_1 = __importDefault(require("../../lib/unOfficialOpenAi.js"));
+const aibotk_js_1 = require("../aibotk.js");
 let chatGPT = {};
 function reset(adminId) {
     if (!chatGPT[adminId])
@@ -22,7 +23,7 @@ function resetAll() {
     chatGPT = {};
 }
 exports.resetAll = resetAll;
-async function getChatGPTWebReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", systemMessage: '', showQuestion: false, timeoutMs: 0 }) {
+async function getChatGPTWebReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", systemMessage: '', showQuestion: false, timeoutMs: 0, keywordSystemMessages: [] }) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置openaiAccessToken参数方可使用');
         return [{ type: 1, content: '请到平台配置Openai openaiAccessToken参数方可使用' }];
@@ -30,7 +31,17 @@ async function getChatGPTWebReply(content, uid, adminId, config = { token: "", d
     if (!chatGPT[adminId]) {
         chatGPT[adminId] = new unOfficialOpenAi_js_1.default(config);
     }
-    return await chatGPT[adminId].getReply(content, uid, adminId);
+    let systemMessage = '';
+    if (config.keywordSystemMessages && config.keywordSystemMessages.length) {
+        const finalSystemMsg = config.keywordSystemMessages.find(item => content.startsWith(item.keyword));
+        if (finalSystemMsg) {
+            const promotInfo = await (0, aibotk_js_1.getPromotInfo)(finalSystemMsg.promotId);
+            console.log(`触发关键词角色功能，使用对应预设角色:${promotInfo.name}`);
+            systemMessage = promotInfo.promot;
+            content = content.replace(finalSystemMsg.keyword, '');
+        }
+    }
+    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage);
 }
 exports.getChatGPTWebReply = getChatGPTWebReply;
 //# sourceMappingURL=chatgpt-web.js.map

package/dist/cjs/src/proxy/bot/chatgpt.d.ts

@@ -9,5 +9,6 @@ export function getChatGPTReply(content: any, uid: any, adminId: any, config?: {
     timeoutMs: number;
     model: string;
     systemMessage: string;
+    keywordSystemMessages: never[];
 }): Promise<any>;
 //# sourceMappingURL=chatgpt.d.ts.map

package/dist/cjs/src/proxy/bot/chatgpt.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getChatGPTReply = exports.resetAll = exports.reset = void 0;
 const officialOpenAi_js_1 = __importDefault(require("../../lib/officialOpenAi.js"));
+const aibotk_js_1 = require("../aibotk.js");
 let chatGPT = {};
 function reset(adminId) {
     if (!chatGPT[adminId])
@@ -22,7 +23,7 @@ function resetAll() {
     chatGPT = {};
 }
 exports.resetAll = resetAll;
-async function getChatGPTReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 0, model: "", systemMessage: "" }) {
+async function getChatGPTReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 0, model: "", systemMessage: "", keywordSystemMessages: [] }) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
         return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
@@ -30,7 +31,17 @@ async function getChatGPTReply(content, uid, adminId, config = { token: "", debu
     if (!chatGPT[adminId]) {
         chatGPT[adminId] = new officialOpenAi_js_1.default(config);
     }
-    return await chatGPT[adminId].getReply(content, uid, adminId);
+    let systemMessage = '';
+    if (config.keywordSystemMessages && config.keywordSystemMessages.length) {
+        const finalSystemMsg = config.keywordSystemMessages.find(item => content.startsWith(item.keyword));
+        if (finalSystemMsg) {
+            const promotInfo = await (0, aibotk_js_1.getPromotInfo)(finalSystemMsg.promotId);
+            console.log(`触发关键词角色功能，使用对应预设角色:${promotInfo.name}`);
+            systemMessage = promotInfo.promot;
+            content = content.replace(finalSystemMsg.keyword, '');
+        }
+    }
+    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage);
 }
 exports.getChatGPTReply = getChatGPTReply;
 //# sourceMappingURL=chatgpt.js.map

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

@@ -86,7 +86,7 @@ async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention, roo
         const resArray = [
             { bool: msg === '', method: 'emptyMsg' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },
-            { bool: config.preventWords, method: 'preventWordCheck' },
+            { bool: !!config.preventWords, method: 'preventWordCheck' },
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },
             { bool: true, method: 'keywordsMsg' },
             { bool: gptConfig && gptConfig.length > 0, method: 'customChat' },

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

@@ -114,8 +114,10 @@ export function customChat({ msg, name, id, config, isMention, room, roomId, roo
  * @param config
  * @return {*[]}
  */
-export function preventWordCheck({ msg, config }: {
+export function preventWordCheck({ msg, config, isMention, room }: {
     msg: any;
     config: any;
+    isMention: any;
+    room: any;
 }): any[];
 //# sourceMappingURL=msg-filters.d.ts.map

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

@@ -350,13 +350,17 @@ exports.customChat = customChat;
  * @param config
  * @return {*[]}
  */
-function preventWordCheck({ msg, config }) {
+function preventWordCheck({ msg, config, isMention, room }) {
     const preventWords = config.preventWords.replaceAll('，', ',').split(',');
+    // 如果是群消息，但是没有提及机器人，则不需要返回任何消息 因为可能是正常交流而已
+    if (room && !isMention) {
+        return [];
+    }
     if (preventWords && preventWords.length) {
         for (let item of preventWords) {
             if (item && item !== '' && msg.includes(item)) {
                 console.log(`触发禁止词【${item}】，不回复用户`);
-                return [{ type: 1, content: '' }];
+                return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
             }
         }
     }

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

@@ -59,7 +59,7 @@ declare class OfficialOpenAi {
      * @return {Promise<void>}
      */
     reset(): Promise<void>;
-    getReply(content: any, uid: any, adminId?: string): Promise<{
+    getReply(content: any, uid: any, adminId?: string, systemMessage?: string): Promise<{
         type: number;
         content: any;
     }[]>;

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

@@ -103,7 +103,7 @@ class OfficialOpenAi {
     reset() {
         this.chatGPT = null;
     }
-    async getReply(content, uid, adminId = '') {
+    async getReply(content, uid, adminId = '', systemMessage = '') {
         try {
             if (!this.chatGPT) {
                 console.log('看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
@@ -114,15 +114,15 @@ class OfficialOpenAi {
                 const censor = await this.contentCensor.checkText(content);
                 if (!censor) {
                     console.log(`问题:${content},包含违规词，已拦截`);
-                    return [{ type: 1, content: '' }];
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
-            const { conversationId, text, id } = await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 });
+            const { conversationId, text, id } = await this.chatGPT.sendMessage(content, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 });
             if (this.config.filter) {
                 const censor = await this.contentCensor.checkText(text);
                 if (!censor) {
                     console.log(`回复: ${text},包含违规词，已拦截`);
-                    return [{ type: 1, content: '' }];
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
                 }
             }
             if (this.config.record) {

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

@@ -36,7 +36,7 @@ declare class UnOfficialOpenAi {
      * @return {Promise<void>}
      */
     reset(): Promise<void>;
-    getReply(content: any, uid: any, adminId?: string): Promise<{
+    getReply(content: any, uid: any, adminId?: string, systemMessage?: string): Promise<{
         type: number;
         content: any;
     }[]>;

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

@@ -71,14 +71,17 @@ class UnOfficialOpenAi {
     reset() {
         this.chatGPT = null;
     }
-    async getReply(content, uid, adminId = '') {
+    async getReply(content, uid, adminId = '', systemMessage = '') {
         try {
             if (!this.chatGPT) {
                 console.log('看到此消息说明已启用chatGPT 网页hook版');
                 await this.init();
             }
-            const question = this.config.systemMessage ? this.config.systemMessage + content : content;
-            const { conversationId, text, id } = await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], timeoutMs: this.config.timeoutMs * 1000 });
+            let question = this.config.systemMessage ? this.config.systemMessage + content : content;
+            if (systemMessage) {
+                question = systemMessage + content;
+            }
+            const { conversationId, text, id } = await this.chatGPT.sendMessage(question, { ...this.chatOption[uid], systemMessage, timeoutMs: this.config.timeoutMs * 1000 });
             if (this.config.record) {
                 void addAichatRecord({
                     contactId: uid,

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

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

package/dist/esm/src/proxy/bot/chatgpt-web.d.ts

@@ -8,5 +8,6 @@ export function getChatGPTWebReply(content: any, uid: any, adminId: any, config?
     systemMessage: string;
     showQuestion: boolean;
     timeoutMs: number;
+    keywordSystemMessages: never[];
 }): Promise<any>;
 //# sourceMappingURL=chatgpt-web.d.ts.map

package/dist/esm/src/proxy/bot/chatgpt-web.js

@@ -1,4 +1,5 @@
 import UnOfficialOpenAi from '../../lib/unOfficialOpenAi.js';
+import { getPromotInfo } from "../aibotk.js";
 let chatGPT = {};
 export function reset(adminId) {
     if (!chatGPT[adminId])
@@ -14,7 +15,7 @@ export function resetAll() {
     });
     chatGPT = {};
 }
-export async function getChatGPTWebReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", systemMessage: '', showQuestion: false, timeoutMs: 0 }) {
+export async function getChatGPTWebReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", systemMessage: '', showQuestion: false, timeoutMs: 0, keywordSystemMessages: [] }) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置openaiAccessToken参数方可使用');
         return [{ type: 1, content: '请到平台配置Openai openaiAccessToken参数方可使用' }];
@@ -22,6 +23,16 @@ export async function getChatGPTWebReply(content, uid, adminId, config = { token
     if (!chatGPT[adminId]) {
         chatGPT[adminId] = new UnOfficialOpenAi(config);
     }
-    return await chatGPT[adminId].getReply(content, uid, adminId);
+    let systemMessage = '';
+    if (config.keywordSystemMessages && config.keywordSystemMessages.length) {
+        const finalSystemMsg = config.keywordSystemMessages.find(item => content.startsWith(item.keyword));
+        if (finalSystemMsg) {
+            const promotInfo = await getPromotInfo(finalSystemMsg.promotId);
+            console.log(`触发关键词角色功能，使用对应预设角色:${promotInfo.name}`);
+            systemMessage = promotInfo.promot;
+            content = content.replace(finalSystemMsg.keyword, '');
+        }
+    }
+    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage);
 }
 //# sourceMappingURL=chatgpt-web.js.map

package/dist/esm/src/proxy/bot/chatgpt.d.ts

@@ -9,5 +9,6 @@ export function getChatGPTReply(content: any, uid: any, adminId: any, config?: {
     timeoutMs: number;
     model: string;
     systemMessage: string;
+    keywordSystemMessages: never[];
 }): Promise<any>;
 //# sourceMappingURL=chatgpt.d.ts.map

package/dist/esm/src/proxy/bot/chatgpt.js

@@ -1,4 +1,5 @@
 import OfficialOpenAi from "../../lib/officialOpenAi.js";
+import { getPromotInfo } from "../aibotk.js";
 let chatGPT = {};
 export function reset(adminId) {
     if (!chatGPT[adminId])
@@ -14,7 +15,7 @@ export function resetAll() {
     });
     chatGPT = {};
 }
-export async function getChatGPTReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 0, model: "", systemMessage: "" }) {
+export async function getChatGPTReply(content, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 0, model: "", systemMessage: "", keywordSystemMessages: [] }) {
     if (!config.token) {
         console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
         return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
@@ -22,6 +23,16 @@ export async function getChatGPTReply(content, uid, adminId, config = { token: "
     if (!chatGPT[adminId]) {
         chatGPT[adminId] = new OfficialOpenAi(config);
     }
-    return await chatGPT[adminId].getReply(content, uid, adminId);
+    let systemMessage = '';
+    if (config.keywordSystemMessages && config.keywordSystemMessages.length) {
+        const finalSystemMsg = config.keywordSystemMessages.find(item => content.startsWith(item.keyword));
+        if (finalSystemMsg) {
+            const promotInfo = await getPromotInfo(finalSystemMsg.promotId);
+            console.log(`触发关键词角色功能，使用对应预设角色:${promotInfo.name}`);
+            systemMessage = promotInfo.promot;
+            content = content.replace(finalSystemMsg.keyword, '');
+        }
+    }
+    return await chatGPT[adminId].getReply(content, uid, adminId, systemMessage);
 }
 //# sourceMappingURL=chatgpt.js.map

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

@@ -79,7 +79,7 @@ async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention, roo
         const resArray = [
             { bool: msg === '', method: 'emptyMsg' },
             { bool: config.callBackEvents && config.callBackEvents.length > 0, method: 'callbackEvent' },
-            { bool: config.preventWords, method: 'preventWordCheck' },
+            { bool: !!config.preventWords, method: 'preventWordCheck' },
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },
             { bool: true, method: 'keywordsMsg' },
             { bool: gptConfig && gptConfig.length > 0, method: 'customChat' },

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

@@ -114,8 +114,10 @@ export function customChat({ msg, name, id, config, isMention, room, roomId, roo
  * @param config
  * @return {*[]}
  */
-export function preventWordCheck({ msg, config }: {
+export function preventWordCheck({ msg, config, isMention, room }: {
     msg: any;
     config: any;
+    isMention: any;
+    room: any;
 }): any[];
 //# sourceMappingURL=msg-filters.d.ts.map

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

@@ -333,13 +333,17 @@ async function customChat({ msg, name, id, config, isMention, room, roomId, room
  * @param config
  * @return {*[]}
  */
-function preventWordCheck({ msg, config }) {
+function preventWordCheck({ msg, config, isMention, room }) {
     const preventWords = config.preventWords.replaceAll('，', ',').split(',');
+    // 如果是群消息，但是没有提及机器人，则不需要返回任何消息 因为可能是正常交流而已
+    if (room && !isMention) {
+        return [];
+    }
     if (preventWords && preventWords.length) {
         for (let item of preventWords) {
             if (item && item !== '' && msg.includes(item)) {
                 console.log(`触发禁止词【${item}】，不回复用户`);
-                return [{ type: 1, content: '' }];
+                return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
             }
         }
     }

package/package.json

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