wechaty-web-panel 1.4.14 → 1.4.16

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 更新日志
 
+### V1.4.16(2023-03-16)
+1、支持添加自己搭建或开放的的反向代理地址
+
 ### V1.4.14(2023-03-03)
 1、添加chatgpt proxy 代理配置参数
 

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

@@ -55,7 +55,7 @@ exports.getRoomEveryDayContent = getRoomEveryDayContent;
 function getCountDownContent(date, prefix, suffix, endWord) {
     let countDownDay = (0, index_js_1.getDay)(date); //获取倒计时天数
     let today = (0, index_js_1.formatDate)(new Date()); //获取今天的日期
-    let str = `${today}\r距离${prefix}还有\r\r✦✦✦✦ ${countDownDay}天\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
+    let str = `${today}\r距离${prefix}还有\r\r${countDownDay}天\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
     return str;
 }
 exports.getCountDownContent = getCountDownContent;

package/dist/cjs/src/package-json.d.ts

@@ -61,11 +61,8 @@ export namespace packageJson {
         nedb: string;
         "node-fetch": string;
         "node-schedule": string;
-        openai: string;
         puppeteer: string;
         "qrcode-terminal": string;
-        remark: string;
-        "strip-markdown": string;
         superagent: string;
     };
     namespace publishConfig {

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.14",
+    "version": "1.4.16",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -68,7 +68,7 @@ exports.packageJson = {
     },
     "dependencies": {
         "axios": "^0.27.2",
-        "chatgpt": "^5.0.5",
+        "chatgpt": "^5.1.1",
         "dayjs": "^1.11.7",
         "https-proxy-agent": "^5.0.1",
         "isomorphic-fetch": "^3.0.0",
@@ -79,11 +79,8 @@ exports.packageJson = {
         "nedb": "^1.8.0",
         "node-fetch": "^2.6.9",
         "node-schedule": "^1.3.2",
-        "openai": "^3.1.0",
         "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
-        "remark": "^13.0.0",
-        "strip-markdown": "^4.2.0",
         "superagent": "^5.2.2"
     },
     "publishConfig": {

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

@@ -155,7 +155,7 @@ async function getConfig() {
         let content = await (0, superagent_js_1.aiBotReq)(option);
         const config = JSON.parse(content.data.config);
         const cloudRoom = await getWordCloudRoom();
-        let cres = await (0, configDb_js_1.updateConfig)({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, proxyUrl: '', countDownTaskSchedule: [], parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
+        let cres = await (0, configDb_js_1.updateConfig)({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, proxyUrl: '', proxyPassUrl: '', countDownTaskSchedule: [], parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
         return cres;
     }
     catch (e) {

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

@@ -72,7 +72,7 @@ async function getResByTX(word, id) {
         }
     }
     catch (error) {
-        console.log('天行聊天机器人请求失败：', error);
+        console.log('天行聊天机器人请求失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', error);
     }
 }
 exports.getResByTX = getResByTX;
@@ -147,7 +147,7 @@ async function getRubbishType(word) {
         }
     }
     catch (error) {
-        console.log('垃圾分类请求失败：', error);
+        console.log('垃圾分类请求失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', error);
     }
 }
 exports.getRubbishType = getRubbishType;
@@ -172,7 +172,7 @@ async function getSweetWord() {
         }
     }
     catch (err) {
-        console.log('获取土情话接口失败', err);
+        console.log('获取土情话接口失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', err);
     }
 }
 exports.getSweetWord = getSweetWord;
@@ -200,7 +200,7 @@ async function getTXweather(city) {
         }
     }
     catch (err) {
-        console.log('获取天气接口失败', err);
+        console.log('获取天气接口失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', err);
     }
 }
 exports.getTXweather = getTXweather;
@@ -230,11 +230,11 @@ async function getNews(id, num = 10) {
             return `${news}\r`;
         }
         else {
-            console.log('获取新闻接口失败', content.msg);
+            console.log('获取新闻接口失败：请申请https://www.tianapi.com/apiview/51 这个接口', content.msg);
         }
     }
     catch (error) {
-        console.log('获取天行新闻失败', error);
+        console.log('获取天行新闻失败：请申请https://www.tianapi.com/apiview/51 这个接口', error);
     }
 }
 exports.getNews = getNews;

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

@@ -33,6 +33,13 @@ async function initChatGPT() {
             },
         });
     }
+    else if (config.proxyPassUrl) {
+        console.log(`启用反向代理请求:${config.proxyPassUrl}`);
+        chatGPT = new chatgpt_1.ChatGPTAPI({
+            apiBaseUrl: config.proxyPassUrl,
+            apiKey: config.gpttoken
+        });
+    }
     else {
         console.log('未启用代理请求，可能会失败');
         chatGPT = new chatgpt_1.ChatGPTAPI({

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

@@ -230,10 +230,6 @@ async function dispatchAiBot(bot, msg, name, id) {
             case 6:
                 // ChatGPT3
                 res = await (0, openAi_js_1.geGPT3Reply)(msg, id);
-                if (res.length === 1 && !res[0].content) {
-                    console.log('第一个gpt接口返回失败，开始请求第二个gpt接口');
-                    res = await (0, chatgpt_js_1.geGPTReply)(msg, id);
-                }
                 replys = res;
                 break;
             default:

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

@@ -49,7 +49,7 @@ async function getRoomEveryDayContent(date, city, endWord) {
 function getCountDownContent(date, prefix, suffix, endWord) {
     let countDownDay = getDay(date); //获取倒计时天数
     let today = formatDate(new Date()); //获取今天的日期
-    let str = `${today}\r距离${prefix}还有\r\r✦✦✦✦ ${countDownDay}天\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
+    let str = `${today}\r距离${prefix}还有\r\r${countDownDay}天\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
     return str;
 }
 /**

package/dist/esm/src/package-json.d.ts

@@ -61,11 +61,8 @@ export namespace packageJson {
         nedb: string;
         "node-fetch": string;
         "node-schedule": string;
-        openai: string;
         puppeteer: string;
         "qrcode-terminal": string;
-        remark: string;
-        "strip-markdown": string;
         superagent: string;
     };
     namespace publishConfig {

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.14",
+    "version": "1.4.16",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -65,7 +65,7 @@ export const packageJson = {
     },
     "dependencies": {
         "axios": "^0.27.2",
-        "chatgpt": "^5.0.5",
+        "chatgpt": "^5.1.1",
         "dayjs": "^1.11.7",
         "https-proxy-agent": "^5.0.1",
         "isomorphic-fetch": "^3.0.0",
@@ -76,11 +76,8 @@ export const packageJson = {
         "nedb": "^1.8.0",
         "node-fetch": "^2.6.9",
         "node-schedule": "^1.3.2",
-        "openai": "^3.1.0",
         "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
-        "remark": "^13.0.0",
-        "strip-markdown": "^4.2.0",
         "superagent": "^5.2.2"
     },
     "publishConfig": {

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

@@ -146,7 +146,7 @@ async function getConfig() {
         let content = await aiBotReq(option);
         const config = JSON.parse(content.data.config);
         const cloudRoom = await getWordCloudRoom();
-        let cres = await updateConfig({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, proxyUrl: '', countDownTaskSchedule: [], parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
+        let cres = await updateConfig({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, proxyUrl: '', proxyPassUrl: '', countDownTaskSchedule: [], parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
         return cres;
     }
     catch (e) {

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

@@ -68,7 +68,7 @@ async function getResByTX(word, id) {
         }
     }
     catch (error) {
-        console.log('天行聊天机器人请求失败：', error);
+        console.log('天行聊天机器人请求失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', error);
     }
 }
 /**
@@ -141,7 +141,7 @@ async function getRubbishType(word) {
         }
     }
     catch (error) {
-        console.log('垃圾分类请求失败：', error);
+        console.log('垃圾分类请求失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', error);
     }
 }
 /**
@@ -165,7 +165,7 @@ async function getSweetWord() {
         }
     }
     catch (err) {
-        console.log('获取土情话接口失败', err);
+        console.log('获取土情话接口失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', err);
     }
 }
 /**
@@ -192,7 +192,7 @@ async function getTXweather(city) {
         }
     }
     catch (err) {
-        console.log('获取天气接口失败', err);
+        console.log('获取天气接口失败：参考 http://wechat.aibotk.com/docs/install 在天行申请必选接口', err);
     }
 }
 /**
@@ -221,11 +221,11 @@ async function getNews(id, num = 10) {
             return `${news}\r`;
         }
         else {
-            console.log('获取新闻接口失败', content.msg);
+            console.log('获取新闻接口失败：请申请https://www.tianapi.com/apiview/51 这个接口', content.msg);
         }
     }
     catch (error) {
-        console.log('获取天行新闻失败', error);
+        console.log('获取天行新闻失败：请申请https://www.tianapi.com/apiview/51 这个接口', error);
     }
 }
 /**

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

@@ -27,6 +27,13 @@ export async function initChatGPT() {
             },
         });
     }
+    else if (config.proxyPassUrl) {
+        console.log(`启用反向代理请求:${config.proxyPassUrl}`);
+        chatGPT = new ChatGPTAPI({
+            apiBaseUrl: config.proxyPassUrl,
+            apiKey: config.gpttoken
+        });
+    }
     else {
         console.log('未启用代理请求，可能会失败');
         chatGPT = new ChatGPTAPI({

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

@@ -6,7 +6,7 @@ import { initTaskLocalSchedule, initTimeSchedule } from "../task/index.js";
 import { updateContactAndRoom, updateContactOnly, updateRoomOnly } from '../common/index.js';
 import { getTencentOpenReply } from '../proxy/tencent-open.js';
 import { getRoomRecordContent, removeRecord } from "../db/roomDb.js";
-import { geGPTReply, initOpenApi } from '../proxy/chatgpt.js';
+import { initOpenApi } from '../proxy/chatgpt.js';
 import { geGPT3Reply, initGpt } from '../proxy/openAi.js';
 /**
  * 根据事件名称分配不同的api处理，并获取返回内容
@@ -223,10 +223,6 @@ async function dispatchAiBot(bot, msg, name, id) {
             case 6:
                 // ChatGPT3
                 res = await geGPT3Reply(msg, id);
-                if (res.length === 1 && !res[0].content) {
-                    console.log('第一个gpt接口返回失败，开始请求第二个gpt接口');
-                    res = await geGPTReply(msg, id);
-                }
                 replys = res;
                 break;
             default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "description": "智能微秘书插件",
   "exports": {
     ".": {
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "axios": "^0.27.2",
-    "chatgpt": "^5.0.5",
+    "chatgpt": "^5.1.1",
     "dayjs": "^1.11.7",
     "https-proxy-agent": "^5.0.1",
     "isomorphic-fetch": "^3.0.0",
@@ -73,11 +73,8 @@
     "nedb": "^1.8.0",
     "node-fetch": "^2.6.9",
     "node-schedule": "^1.3.2",
-    "openai": "^3.1.0",
     "puppeteer": "^13.3.2",
     "qrcode-terminal": "^0.12.0",
-    "remark": "^13.0.0",
-    "strip-markdown": "^4.2.0",
     "superagent": "^5.2.2"
   },
   "publishConfig": {

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

@@ -1,10 +0,0 @@
-export function initOpenApi(): void;
-declare namespace _default {
-    export { geGPTReply };
-}
-export default _default;
-export function geGPTReply(content: any): Promise<{
-    type: number;
-    content: any;
-}[]>;
-//# sourceMappingURL=chatgpt.d.ts.map

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

@@ -1,71 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.geGPTReply = exports.initOpenApi = void 0;
-const remark_1 = __importDefault(require("remark"));
-const strip_markdown_1 = __importDefault(require("strip-markdown"));
-const openai_1 = require("openai");
-const configDb_js_1 = require("../db/configDb.js");
-let openai = null;
-function markdownToText(markdown) {
-    return (0, remark_1.default)()
-        .use(strip_markdown_1.default)
-        .processSync(markdown || '')
-        .toString();
-}
-function initOpenApi() {
-    openai = null;
-}
-exports.initOpenApi = initOpenApi;
-async function geGPTReply(content) {
-    try {
-        const config = await (0, configDb_js_1.allConfig)();
-        if (!config.gpttoken) {
-            console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
-            return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
-        }
-        if (!openai) {
-            let configuration = new openai_1.Configuration({
-                apiKey: config.gpttoken,
-            });
-            openai = new openai_1.OpenAIApi(configuration);
-        }
-        let response = await openai.createCompletion({
-            model: 'text-davinci-003',
-            prompt: content,
-            temperature: 0.9,
-            max_tokens: 2000,
-            top_p: 1,
-            frequency_penalty: 0.0,
-            presence_penalty: 0.6,
-            stop: ['Human:', 'AI:'],
-        });
-        console.log('chat gpt返回原始数据：' + response.data.choices[0].text);
-        response = markdownToText(response.data.choices[0].text);
-        let replys = [];
-        let message = response;
-        while (message.length > 500) {
-            replys.push(message.slice(0, 500));
-            message = message.slice(500);
-        }
-        replys.push(message);
-        replys = replys.map(item => {
-            return {
-                type: 1,
-                content: item.trim()
-            };
-        });
-        return replys;
-    }
-    catch (e) {
-        console.log('chat gpt报错：' + e);
-        return [{ type: 1, content: '' }];
-    }
-}
-exports.geGPTReply = geGPTReply;
-exports.default = {
-    geGPTReply,
-};
-//# sourceMappingURL=chatgpt.js.map

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

@@ -1,10 +0,0 @@
-export function initOpenApi(): void;
-declare namespace _default {
-    export { geGPTReply };
-}
-export default _default;
-export function geGPTReply(content: any): Promise<{
-    type: number;
-    content: any;
-}[]>;
-//# sourceMappingURL=chatgpt.d.ts.map

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

@@ -1,64 +0,0 @@
-import remark from 'remark';
-import stripMarkdown from 'strip-markdown';
-import { Configuration, OpenAIApi } from 'openai';
-import { allConfig } from "../db/configDb.js";
-let openai = null;
-function markdownToText(markdown) {
-    return remark()
-        .use(stripMarkdown)
-        .processSync(markdown || '')
-        .toString();
-}
-export function initOpenApi() {
-    openai = null;
-}
-async function geGPTReply(content) {
-    try {
-        const config = await allConfig();
-        if (!config.gpttoken) {
-            console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
-            return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
-        }
-        if (!openai) {
-            let configuration = new Configuration({
-                apiKey: config.gpttoken,
-            });
-            openai = new OpenAIApi(configuration);
-        }
-        let response = await openai.createCompletion({
-            model: 'text-davinci-003',
-            prompt: content,
-            temperature: 0.9,
-            max_tokens: 2000,
-            top_p: 1,
-            frequency_penalty: 0.0,
-            presence_penalty: 0.6,
-            stop: ['Human:', 'AI:'],
-        });
-        console.log('chat gpt返回原始数据：' + response.data.choices[0].text);
-        response = markdownToText(response.data.choices[0].text);
-        let replys = [];
-        let message = response;
-        while (message.length > 500) {
-            replys.push(message.slice(0, 500));
-            message = message.slice(500);
-        }
-        replys.push(message);
-        replys = replys.map(item => {
-            return {
-                type: 1,
-                content: item.trim()
-            };
-        });
-        return replys;
-    }
-    catch (e) {
-        console.log('chat gpt报错：' + e);
-        return [{ type: 1, content: '' }];
-    }
-}
-export { geGPTReply };
-export default {
-    geGPTReply,
-};
-//# sourceMappingURL=chatgpt.js.map