wechaty-web-panel 1.6.79 → 1.6.80

package/dist/cjs/src/bot/fastgpt/index.js

@@ -1,12 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastGPTAPI = void 0;
-const axios = require('axios');
-const axiosRetry = require('axios-retry').default;
-axiosRetry(axios, { retries: 3, retryDelay: () => 1000 });
+const axios_1 = __importDefault(require("axios"));
 class FastGPTAPI {
     constructor(opts) {
-        const { apiKey, apiBaseUrl = 'https://api.openai.com/v1', debug, } = opts;
+        const { apiKey, apiBaseUrl = 'https://cloud.fastgpt.cn/api/v1', debug, } = opts;
         this._apiKey = apiKey;
         this._apiBaseUrl = apiBaseUrl;
         this._debug = debug;
@@ -31,7 +32,7 @@ class FastGPTAPI {
         if (this._debug) {
             console.log('request body', body);
         }
-        const response = await axios({
+        const response = await (0, axios_1.default)({
             method: 'POST',
             url: `${this._apiBaseUrl}/chat/completions`,
             data: body || null,
@@ -43,9 +44,11 @@ class FastGPTAPI {
             responseType: 'json',
         });
         if (response.status === 200) {
-            console.log('response.data.choices', JSON.stringify(response.data));
+            if (this._debug) {
+                console.log('response.data', JSON.stringify(response.data));
+            }
             if (response.data.code) {
-                console.log('私有知识库请求出错', JSON.stringify(response.data));
+                console.log('FastGPT请求出错', JSON.stringify(response.data));
                 return {
                     text: '',
                 };

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

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// import { CozeV3Api } from "./sdk/cozev3.js";
 const index_js_1 = require("../bot/coze/sdk/index.js");
 const aichatDb_js_1 = require("../db/aichatDb.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");

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

@@ -0,0 +1,32 @@
+export default FastGPTAi;
+declare class FastGPTAi {
+    constructor(config?: {
+        token: string;
+        debug: number;
+        proxyPass: string;
+        showQuestion: boolean;
+        timeoutMs: number;
+    });
+    fastGPT: FastGPTAPI | null;
+    config: {
+        token: string;
+        debug: number;
+        proxyPass: string;
+        showQuestion: boolean;
+        timeoutMs: number;
+    };
+    contentCensor: ContentCensor | null;
+    chatOption: {};
+    eol: string;
+    iswindows: boolean;
+    init(): Promise<void>;
+    /**
+     * 重置apikey
+     * @return {Promise<void>}
+     */
+    reset(): Promise<void>;
+    getReply(content: any, uid: any, adminId: string | undefined, variables: any): Promise<any>;
+}
+import { FastGPTAPI } from "../bot/fastgpt/index.js";
+import { ContentCensor } from "../lib/contentCensor.js";
+//# sourceMappingURL=fastgpt.d.ts.map

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

@@ -0,0 +1,128 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_js_1 = require("../bot/fastgpt/index.js");
+const aichatDb_js_1 = require("../db/aichatDb.js");
+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_2 = require("../lib/index.js");
+const multimodal_js_1 = require("../proxy/multimodal.js");
+class FastGPTAi {
+    constructor(config = {
+        token: '',
+        debug: 0,
+        proxyPass: '',
+        showQuestion: true,
+        timeoutMs: 60, // 超时时间 s
+    }) {
+        this.fastGPT = null;
+        this.config = config;
+        this.contentCensor = null;
+        this.chatOption = {};
+        this.eol = '\n';
+        this.iswindows = false;
+    }
+    async init() {
+        this.eol = await (0, puppet_type_js_1.getPuppetEol)();
+        this.iswindows = await (0, puppet_type_js_1.isWindowsPlatform)();
+        if (this.config.filter) {
+            this.contentCensor = new contentCensor_js_1.ContentCensor(this.config.filterConfig);
+        }
+        console.log(`请求地址:${this.config.proxyPass}`);
+        const baseOptions = {
+            apiKey: this.config.token,
+            debug: this.config.debug,
+            apiBaseUrl: this.config.proxyPass
+        };
+        this.fastGPT = new index_js_1.FastGPTAPI(baseOptions);
+    }
+    /**
+     * 重置apikey
+     * @return {Promise<void>}
+     */
+    reset() {
+        this.fastGPT = null;
+    }
+    async getReply(content, uid, adminId = '', variables) {
+        try {
+            if (!this.fastGPT) {
+                console.log('看到此消息说明已启用FastGPT');
+                await this.init();
+            }
+            if (this.config.filter) {
+                const censor = await this.contentCensor.checkText(content);
+                if (!censor) {
+                    console.log(`问题:${content},包含违规词，已拦截`);
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
+                }
+            }
+            const resetWord = ['reset', '重置', '重置对话', '忽略上下文', '重置上下文', '重新开始', '清除对话', '清除上下文'];
+            if (resetWord.includes(content)) {
+                console.log('重新更新上下文对话');
+                this.chatOption[uid] = null;
+                return [{ type: 1, content: '上下文已重置' }];
+            }
+            if (!this.chatOption[uid]) {
+                this.chatOption[uid] = {
+                    chatId: (0, uuid_1.v4)()
+                };
+            }
+            const sendParams = { ...this.chatOption[uid], variables, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 };
+            console.log('FastGPT sendParams---', sendParams);
+            const { chatId, text, id } = await this.fastGPT.sendMessage(content, sendParams);
+            if (this.config.filter) {
+                const censor = await this.contentCensor.checkText(text);
+                if (!censor) {
+                    console.log(`回复: ${text},包含违规词，已拦截`);
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
+                }
+            }
+            if (this.config.record) {
+                void (0, aichatDb_js_1.addAichatRecord)({ contactId: uid, adminId, input: content, output: text, time: (0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss') });
+            }
+            this.chatOption[uid] = { chatId };
+            let replys = [];
+            if (this.config?.openTTS) {
+                replys = await (0, multimodal_js_1.getText2Speech)(text, this.config.ttsConfig);
+                if (replys.length) {
+                    return replys;
+                }
+            }
+            let message;
+            if (this.config.showQuestion) {
+                message = `${content}${this.eol}-----------${this.eol}` + (this.iswindows ? text.replaceAll('\n', this.eol) : text);
+            }
+            else {
+                message = this.iswindows ? text.replaceAll('\n', this.eol) : text;
+            }
+            const imgs = (0, index_js_2.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 => {
+                return {
+                    type: 1,
+                    content: item.trim()
+                };
+            });
+            if (imgs.length) {
+                console.log('提取到内容中的图片', imgs);
+                replys = replys.concat(imgs);
+            }
+            return replys;
+        }
+        catch (e) {
+            console.log('FastGPT报错：' + e);
+            return [];
+        }
+    }
+}
+exports.default = FastGPTAi;
+//# sourceMappingURL=fastgpt.js.map

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

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
-const node_fetch_1 = __importDefault(require("node-fetch"));
 const index_js_1 = require("../bot/chatgpt/index.js");
 const aichatDb_js_1 = require("../db/aichatDb.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");

package/dist/cjs/src/handlers/on-callback-message.js

@@ -27,7 +27,7 @@ async function onRecordMessage(msg) {
         const timestamp = msg.timestamp || (0, dayjs_1.default)().unix();
         const robotInfo = this.currentUser;
         const isOfficial = contact.type() === this.Contact.Type.Official;
-        if (msgSelf || isOfficial)
+        if (isOfficial)
             return;
         console.log('msg', msg);
         const baseMsg = {
@@ -37,6 +37,7 @@ async function onRecordMessage(msg) {
             chatName: contactName,
             chatId: contact.id,
             chatAlias: contactAlias,
+            isMyself: !!msgSelf,
             time: timestamp.length > 10 ? parseInt(timestamp / 1000) : timestamp
         };
         switch (type) {
@@ -130,7 +131,7 @@ async function onRecordMessage(msg) {
     }
 }
 function sendMessage(msgInfo, recordConfig, robotInfo) {
-    const blackKey = ['conversationId', 'conversionName', 'isRoom', 'isRobot', 'chatName', 'chatId', 'chatAlias', 'time', 'type', 'url', 'mediaInfo', 'content'];
+    const blackKey = ['conversationId', 'conversionName', 'isRoom', 'isRobot', 'chatName', 'chatId', 'chatAlias', 'time', 'type', 'url', 'mediaInfo', 'content', 'isMyself'];
     const baseData = {
         ...msgInfo
     };

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.6.79",
+    "version": "1.6.80",
     "exports": {
         ".": {
             "import": "./dist/esm/src/index.js",

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

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dispatchBot = void 0;
 const chatgpt_js_1 = require("./chatgpt.js");
+const fastgpt_js_1 = require("./fastgpt.js");
 const dify_js_1 = require("./dify.js");
 const coze_js_1 = require("./coze.js");
 const cozev3_js_1 = require("./cozev3.js");
@@ -38,7 +39,7 @@ async function dispatchBot({ botType, userAlias, userWeixin, content, id, uid, u
             case 9:
                 // fastGPT api
                 console.log('进入FastGPT聊天');
-                res = await (0, chatgpt_js_1.getChatGPTReply)({ content, variables: { uid, ualias: userAlias, uweixin: userWeixin, uname, roomId, roomName, robotId: contactSelf.robotId, robotName: contactSelf.name } }, id, adminId, config, true);
+                res = await (0, fastgpt_js_1.getFastGPTReply)({ content, variables: { uid, ualias: userAlias, uweixin: userWeixin, uname, roomId, roomName, robotId: contactSelf.robotId, robotName: contactSelf.name } }, id, adminId, config);
                 replys = res;
                 break;
             case 11:

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

@@ -0,0 +1,14 @@
+export function reset(adminId: any): void;
+export function resetAll(): void;
+export function getFastGPTReply({ content, variables }: {
+    content: any;
+    variables: any;
+}, uid: any, adminId: any, config?: {
+    token: string;
+    debug: boolean;
+    proxyPass: string;
+    proxyUrl: string;
+    showQuestion: boolean;
+    timeoutMs: number;
+}): Promise<any>;
+//# sourceMappingURL=fastgpt.d.ts.map

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

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFastGPTReply = exports.resetAll = exports.reset = void 0;
+const fastgpt_js_1 = __importDefault(require("../../botInstance/fastgpt.js"));
+let fastGPT = {};
+function reset(adminId) {
+    if (!fastGPT[adminId])
+        return;
+    fastGPT[adminId].reset();
+    fastGPT[adminId] = null;
+}
+exports.reset = reset;
+function resetAll() {
+    Object.keys(fastGPT).forEach(key => {
+        if (fastGPT[key]) {
+            fastGPT[key].reset();
+        }
+    });
+    fastGPT = {};
+}
+exports.resetAll = resetAll;
+async function getFastGPTReply({ content, variables }, uid, adminId, config = { token: "", debug: false, proxyPass: "", proxyUrl: "", showQuestion: false, timeoutMs: 80 }) {
+    if (!config.token) {
+        console.log('请到智能微秘书平台配置FastGPT apikey参数方可使用');
+        return [{ type: 1, content: '请到平台配置FastGPT apikey参数方可使用' }];
+    }
+    if (!fastGPT[adminId]) {
+        fastGPT[adminId] = new fastgpt_js_1.default(config);
+    }
+    return await fastGPT[adminId].getReply(content, uid, adminId, variables);
+}
+exports.getFastGPTReply = getFastGPTReply;
+//# sourceMappingURL=fastgpt.js.map

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

@@ -0,0 +1,12 @@
+/**
+ * 重置实例
+ */
+export function reset(): void;
+export function getFastGPTReply(content: any, uid: any, variables: any): Promise<any>;
+export function getSimpleFastGptReply({ content, uid, config, variables }: {
+    content: any;
+    uid: any;
+    config: any;
+    variables: any;
+}): Promise<any>;
+//# sourceMappingURL=fastgpt.d.ts.map

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

@@ -0,0 +1,62 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSimpleFastGptReply = exports.getFastGPTReply = exports.reset = void 0;
+const configDb_js_1 = require("../db/configDb.js");
+const fastgpt_js_1 = __importDefault(require("../botInstance/fastgpt.js"));
+let fastGPT = null;
+/**
+ * 重置实例
+ */
+function reset() {
+    if (fastGPT) {
+        fastGPT.reset();
+        fastGPT = null;
+    }
+}
+exports.reset = reset;
+async function getFastGPTReply(content, uid, variables) {
+    const config = await (0, configDb_js_1.allConfig)();
+    if (!config.gpttoken) {
+        console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
+        return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
+    }
+    const chatConfig = {
+        token: config.gpttoken,
+        debug: config.openaiDebug,
+        proxyPass: config.proxyPassUrl,
+        showQuestion: config.showQuestion,
+        timeoutMs: config.openaiTimeout,
+        filter: config.chatFilter,
+        filterConfig: {
+            type: 1,
+            appId: config.filterAppid,
+            apiKey: config.filterApiKey,
+            secretKey: config.filterSecretKey
+        }
+    };
+    if (!fastGPT) {
+        fastGPT = new fastgpt_js_1.default(chatConfig);
+    }
+    return await fastGPT.getReply(content, uid, '', variables);
+}
+exports.getFastGPTReply = getFastGPTReply;
+async function getSimpleFastGptReply({ content, uid, config, variables }) {
+    if (!config.token) {
+        console.log('请到智能微秘书平台配置聊天总结的FastGPT API Token参数方可使用');
+        return [{ type: 1, content: '请到平台配置聊天总结的FastGPT API Token参数方可使用' }];
+    }
+    const chatConfig = {
+        token: config.token,
+        debug: config.debug,
+        proxyPass: config.baseUrl,
+        proxyUrl: '',
+        showQuestion: false,
+        timeoutMs: config.timeout, // 超时时间 s
+    };
+    return await new fastgpt_js_1.default(chatConfig).getReply(content, uid, '', variables);
+}
+exports.getSimpleFastGptReply = getSimpleFastGptReply;
+//# sourceMappingURL=fastgpt.js.map

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

@@ -9,6 +9,7 @@ const index_js_3 = require("../common/index.js");
 const tencent_open_js_1 = require("../proxy/tencent-open.js");
 const roomDb_js_1 = require("../db/roomDb.js");
 const openAi_js_1 = require("../proxy/openAi.js");
+const fastgpt_js_1 = require("../proxy/fastgpt.js");
 const difyAi_js_1 = require("../proxy/difyAi.js");
 const cozeV3Ai_js_1 = require("../proxy/cozeV3Ai.js");
 const cozeAi_js_1 = require("../proxy/cozeAi.js");
@@ -130,6 +131,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room, ro
                 (0, cozeAi_js_1.reset)();
                 (0, qAnyAi_js_1.reset)();
                 (0, cozeV3Ai_js_1.reset)();
+                (0, fastgpt_js_1.reset)();
                 content = '更新配置成功，请稍等一分钟后生效';
                 break;
             case 'autoRoomCreate':
@@ -205,7 +207,7 @@ async function dispatchAiBot({ bot, msg, name, id, uid, uname, roomId, userAlias
                 break;
             case 9:
                 // fast gpt
-                res = await (0, openAi_js_1.getGptOfficialReply)(msg, id, true, { uid, uname, ualias: userAlias, uweixin: userWeixin, roomId, roomName, robotId: contactSelf.robotId, robotName: contactSelf.name });
+                res = await (0, fastgpt_js_1.getFastGPTReply)(msg, id, { uid, uname, ualias: userAlias, uweixin: userWeixin, roomId, roomName, robotId: contactSelf.robotId, robotName: contactSelf.name });
                 replys = res;
                 break;
             case 11:
@@ -252,7 +254,7 @@ async function dispatchSummerBot({ content, id, uid, uname, roomId, roomName, us
                 break;
             case 9:
                 // fast gpt
-                res = await (0, openAi_js_1.getSimpleGptReply)({ content, uid: id, config, isFastGPT: true, variables: { uid, ualias: userAlias, uweixin: userWeixin, uname, roomId, roomName, robotId: contactSelf.robotId, robotName: contactSelf.name } });
+                res = await (0, fastgpt_js_1.getSimpleFastGptReply)({ content, uid: id, config, variables: { uid, ualias: userAlias, uweixin: userWeixin, uname, roomId, roomName, robotId: contactSelf.robotId, robotName: contactSelf.name } });
                 replys = res;
                 break;
             case 11:

package/dist/esm/src/bot/fastgpt/index.js

@@ -1,9 +1,7 @@
-const axios = require('axios');
-const axiosRetry = require('axios-retry').default;
-axiosRetry(axios, { retries: 3, retryDelay: () => 1000 });
+import axios from 'axios';
 export class FastGPTAPI {
     constructor(opts) {
-        const { apiKey, apiBaseUrl = 'https://api.openai.com/v1', debug, } = opts;
+        const { apiKey, apiBaseUrl = 'https://cloud.fastgpt.cn/api/v1', debug, } = opts;
         this._apiKey = apiKey;
         this._apiBaseUrl = apiBaseUrl;
         this._debug = debug;
@@ -40,9 +38,11 @@ export class FastGPTAPI {
             responseType: 'json',
         });
         if (response.status === 200) {
-            console.log('response.data.choices', JSON.stringify(response.data));
+            if (this._debug) {
+                console.log('response.data', JSON.stringify(response.data));
+            }
             if (response.data.code) {
-                console.log('私有知识库请求出错', JSON.stringify(response.data));
+                console.log('FastGPT请求出错', JSON.stringify(response.data));
                 return {
                     text: '',
                 };

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

@@ -1,4 +1,3 @@
-// import { CozeV3Api } from "./sdk/cozev3.js";
 import { CozeV3Api } from "../bot/coze/sdk/index.js";
 import { addAichatRecord } from "../db/aichatDb.js";
 import { getPromotInfo } from "../proxy/aibotk.js";

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

@@ -0,0 +1,32 @@
+export default FastGPTAi;
+declare class FastGPTAi {
+    constructor(config?: {
+        token: string;
+        debug: number;
+        proxyPass: string;
+        showQuestion: boolean;
+        timeoutMs: number;
+    });
+    fastGPT: FastGPTAPI | null;
+    config: {
+        token: string;
+        debug: number;
+        proxyPass: string;
+        showQuestion: boolean;
+        timeoutMs: number;
+    };
+    contentCensor: ContentCensor | null;
+    chatOption: {};
+    eol: string;
+    iswindows: boolean;
+    init(): Promise<void>;
+    /**
+     * 重置apikey
+     * @return {Promise<void>}
+     */
+    reset(): Promise<void>;
+    getReply(content: any, uid: any, adminId: string | undefined, variables: any): Promise<any>;
+}
+import { FastGPTAPI } from "../bot/fastgpt/index.js";
+import { ContentCensor } from "../lib/contentCensor.js";
+//# sourceMappingURL=fastgpt.d.ts.map

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

@@ -0,0 +1,123 @@
+import { FastGPTAPI } from "../bot/fastgpt/index.js";
+import { addAichatRecord } from "../db/aichatDb.js";
+import { ContentCensor } from "../lib/contentCensor.js";
+import { getPuppetEol, isWindowsPlatform } from '../const/puppet-type.js';
+import { v4 as uuidv4 } from "uuid";
+import dayjs from "dayjs";
+import { extractImageLinks } from '../lib/index.js';
+import { getText2Speech } from "../proxy/multimodal.js";
+class FastGPTAi {
+    constructor(config = {
+        token: '',
+        debug: 0,
+        proxyPass: '',
+        showQuestion: true,
+        timeoutMs: 60, // 超时时间 s
+    }) {
+        this.fastGPT = null;
+        this.config = config;
+        this.contentCensor = null;
+        this.chatOption = {};
+        this.eol = '\n';
+        this.iswindows = false;
+    }
+    async init() {
+        this.eol = await getPuppetEol();
+        this.iswindows = await isWindowsPlatform();
+        if (this.config.filter) {
+            this.contentCensor = new ContentCensor(this.config.filterConfig);
+        }
+        console.log(`请求地址:${this.config.proxyPass}`);
+        const baseOptions = {
+            apiKey: this.config.token,
+            debug: this.config.debug,
+            apiBaseUrl: this.config.proxyPass
+        };
+        this.fastGPT = new FastGPTAPI(baseOptions);
+    }
+    /**
+     * 重置apikey
+     * @return {Promise<void>}
+     */
+    reset() {
+        this.fastGPT = null;
+    }
+    async getReply(content, uid, adminId = '', variables) {
+        try {
+            if (!this.fastGPT) {
+                console.log('看到此消息说明已启用FastGPT');
+                await this.init();
+            }
+            if (this.config.filter) {
+                const censor = await this.contentCensor.checkText(content);
+                if (!censor) {
+                    console.log(`问题:${content},包含违规词，已拦截`);
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
+                }
+            }
+            const resetWord = ['reset', '重置', '重置对话', '忽略上下文', '重置上下文', '重新开始', '清除对话', '清除上下文'];
+            if (resetWord.includes(content)) {
+                console.log('重新更新上下文对话');
+                this.chatOption[uid] = null;
+                return [{ type: 1, content: '上下文已重置' }];
+            }
+            if (!this.chatOption[uid]) {
+                this.chatOption[uid] = {
+                    chatId: uuidv4()
+                };
+            }
+            const sendParams = { ...this.chatOption[uid], variables, timeoutMs: this.config.timeoutMs * 1000 || 80 * 1000 };
+            console.log('FastGPT sendParams---', sendParams);
+            const { chatId, text, id } = await this.fastGPT.sendMessage(content, sendParams);
+            if (this.config.filter) {
+                const censor = await this.contentCensor.checkText(text);
+                if (!censor) {
+                    console.log(`回复: ${text},包含违规词，已拦截`);
+                    return [{ type: 1, content: '这个话题不适合讨论，换个话题吧。' }];
+                }
+            }
+            if (this.config.record) {
+                void addAichatRecord({ contactId: uid, adminId, input: content, output: text, time: dayjs().format('YYYY-MM-DD HH:mm:ss') });
+            }
+            this.chatOption[uid] = { chatId };
+            let replys = [];
+            if (this.config?.openTTS) {
+                replys = await getText2Speech(text, this.config.ttsConfig);
+                if (replys.length) {
+                    return replys;
+                }
+            }
+            let message;
+            if (this.config.showQuestion) {
+                message = `${content}${this.eol}-----------${this.eol}` + (this.iswindows ? text.replaceAll('\n', this.eol) : text);
+            }
+            else {
+                message = this.iswindows ? text.replaceAll('\n', this.eol) : text;
+            }
+            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 => {
+                return {
+                    type: 1,
+                    content: item.trim()
+                };
+            });
+            if (imgs.length) {
+                console.log('提取到内容中的图片', imgs);
+                replys = replys.concat(imgs);
+            }
+            return replys;
+        }
+        catch (e) {
+            console.log('FastGPT报错：' + e);
+            return [];
+        }
+    }
+}
+export default FastGPTAi;
+//# sourceMappingURL=fastgpt.js.map

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

@@ -1,5 +1,3 @@
-import proxy from "https-proxy-agent";
-import nodeFetch from "node-fetch";
 import { ChatGPTAPI } from "../bot/chatgpt/index.js";
 import { addAichatRecord } from "../db/aichatDb.js";
 import { getPromotInfo } from "../proxy/aibotk.js";

package/dist/esm/src/handlers/on-callback-message.js

@@ -22,7 +22,7 @@ async function onRecordMessage(msg) {
         const timestamp = msg.timestamp || dayjs().unix();
         const robotInfo = this.currentUser;
         const isOfficial = contact.type() === this.Contact.Type.Official;
-        if (msgSelf || isOfficial)
+        if (isOfficial)
             return;
         console.log('msg', msg);
         const baseMsg = {
@@ -32,6 +32,7 @@ async function onRecordMessage(msg) {
             chatName: contactName,
             chatId: contact.id,
             chatAlias: contactAlias,
+            isMyself: !!msgSelf,
             time: timestamp.length > 10 ? parseInt(timestamp / 1000) : timestamp
         };
         switch (type) {
@@ -125,7 +126,7 @@ async function onRecordMessage(msg) {
     }
 }
 function sendMessage(msgInfo, recordConfig, robotInfo) {
-    const blackKey = ['conversationId', 'conversionName', 'isRoom', 'isRobot', 'chatName', 'chatId', 'chatAlias', 'time', 'type', 'url', 'mediaInfo', 'content'];
+    const blackKey = ['conversationId', 'conversionName', 'isRoom', 'isRobot', 'chatName', 'chatId', 'chatAlias', 'time', 'type', 'url', 'mediaInfo', 'content', 'isMyself'];
     const baseData = {
         ...msgInfo
     };