wechaty-web-panel 1.2.10 → 1.2.12

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 更新日志
 
+### V1.2.12(2022-12-21)
+
+1、修改ChatGPT 为官方api版本
+
 ### V1.2.8(2022-12-07)
 
 1、添加ChatGPT让你的机器人更智能

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

@@ -164,7 +164,10 @@ async function roomSay(room, contact, msg) {
     const config = await (0, configDb_js_1.allConfig)();
     const { role } = config.userInfo;
     if (msg.id && role === 'vip') {
-        msg = await (0, aibotk_js_1.getMaterial)(msg.id);
+        const res = await (0, aibotk_js_1.getMaterial)(msg.id);
+        if (res.id) {
+            msg = res;
+        }
     }
     try {
         if (msg.type === 1 && msg.content) {
@@ -226,7 +229,10 @@ async function contactSay(contact, msg, isRoom = false) {
     const config = await (0, configDb_js_1.allConfig)();
     const { role } = config.userInfo;
     if (msg.id && role === 'vip') {
-        msg = await (0, aibotk_js_1.getMaterial)(msg.id);
+        const res = await (0, aibotk_js_1.getMaterial)(msg.id);
+        if (res.id) {
+            msg = res;
+        }
     }
     try {
         if (msg.type === 1 && msg.content) {

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

@@ -115,8 +115,9 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
                 const mentionSelf = await msg.mentionSelf();
+                const metionList = await msg.mentionList();
                 const receiverName = receiver?.name();
-                content = content.replace(receiverName, "").trim();
+                content = content.replace('@' + receiverName, "").replace(/@[^,，：:\s@]+/g, "").trim();
                 // 检测是否需要这条消息
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)

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

@@ -51,16 +51,17 @@ export namespace packageJson {
     }
     const dependencies: {
         axios: string;
-        chatgpt: string;
         ix: string;
         jsonwebtoken: string;
         mqtt: string;
         mustache: string;
         nedb: string;
         "node-schedule": string;
-        "p-timeout": 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.2.10",
+    "version": "1.2.12",
     "description": "",
     "exports": {
         ".": {
@@ -34,7 +34,11 @@ exports.packageJson = {
         "Wechaty",
         "wechatEveryDay",
         "wechaty",
-        "wechaty-plugin"
+        "wechaty-plugin",
+        "chatGPT",
+        "openai",
+        "chatBot",
+        "openGPT"
     ],
     "author": {
         "name": "Leo_chen",
@@ -65,16 +69,17 @@ exports.packageJson = {
     },
     "dependencies": {
         "axios": "^0.27.2",
-        "chatgpt": "^1.4.0",
         "ix": "^4.5.2",
         "jsonwebtoken": "^8.5.1",
         "mqtt": "^4.2.6",
         "mustache": "^4.2.0",
         "nedb": "^1.8.0",
         "node-schedule": "^1.3.2",
-        "p-timeout": "^6.0.0",
+        "openai": "^3.1.0",
         "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
+        "remark": "^14.0.2",
+        "strip-markdown": "^5.0.0",
         "superagent": "^5.2.2"
     },
     "publishConfig": {

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

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

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

@@ -4,36 +4,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.geGPTReply = void 0;
-const chatgpt_1 = require("chatgpt");
-const p_timeout_1 = __importDefault(require("p-timeout"));
+const remark_1 = 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.remark)()
+        .use(strip_markdown_1.default)
+        .processSync(markdown || '')
+        .toString();
+}
 async function geGPTReply(content) {
-    const config = await (0, configDb_js_1.allConfig)();
-    if (!config.gpttoken) {
-        console.log('请到智能微秘书平台配置ChatGPT token参数方可使用');
-        return [{ type: 1, content: '请到平台配置ChatGPT token参数方可使用' }];
+    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:'],
+        });
+        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
+            };
+        });
+        return replys;
     }
-    const api = new chatgpt_1.ChatGPTAPI({ sessionToken: config.gpttoken });
-    await api.ensureAuth();
-    const threeMinutesMs = 3 * 60 * 1000;
-    const response = await (0, p_timeout_1.default)(api.sendMessage(content), {
-        milliseconds: threeMinutesMs,
-        message: 'ChatGPT返回超时了，用的人太多，太火爆了，等会再试吧'
-    });
-    let replys = [];
-    let message = response;
-    while (message.length > 500) {
-        replys.push(message.slice(0, 500));
-        message = message.slice(500);
+    catch (e) {
+        return [{ type: 1, content: '现在询问我的人太多了，请稍后询问' }];
     }
-    replys.push(message);
-    replys = replys.map(item => {
-        return {
-            type: 1,
-            content: item
-        };
-    });
-    return replys;
 }
 exports.geGPTReply = geGPTReply;
 exports.default = {

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

@@ -156,7 +156,10 @@ async function roomSay(room, contact, msg) {
     const config = await allConfig();
     const { role } = config.userInfo;
     if (msg.id && role === 'vip') {
-        msg = await getMaterial(msg.id);
+        const res = await getMaterial(msg.id);
+        if (res.id) {
+            msg = res;
+        }
     }
     try {
         if (msg.type === 1 && msg.content) {
@@ -217,7 +220,10 @@ async function contactSay(contact, msg, isRoom = false) {
     const config = await allConfig();
     const { role } = config.userInfo;
     if (msg.id && role === 'vip') {
-        msg = await getMaterial(msg.id);
+        const res = await getMaterial(msg.id);
+        if (res.id) {
+            msg = res;
+        }
     }
     try {
         if (msg.type === 1 && msg.content) {

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

@@ -113,8 +113,9 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
                 const mentionSelf = await msg.mentionSelf();
+                const metionList = await msg.mentionList();
                 const receiverName = receiver?.name();
-                content = content.replace(receiverName, "").trim();
+                content = content.replace('@' + receiverName, "").replace(/@[^,，：:\s@]+/g, "").trim();
                 // 检测是否需要这条消息
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)

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

@@ -51,16 +51,17 @@ export namespace packageJson {
     }
     const dependencies: {
         axios: string;
-        chatgpt: string;
         ix: string;
         jsonwebtoken: string;
         mqtt: string;
         mustache: string;
         nedb: string;
         "node-schedule": string;
-        "p-timeout": 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.2.10",
+    "version": "1.2.12",
     "description": "",
     "exports": {
         ".": {
@@ -31,7 +31,11 @@ export const packageJson = {
         "Wechaty",
         "wechatEveryDay",
         "wechaty",
-        "wechaty-plugin"
+        "wechaty-plugin",
+        "chatGPT",
+        "openai",
+        "chatBot",
+        "openGPT"
     ],
     "author": {
         "name": "Leo_chen",
@@ -62,16 +66,17 @@ export const packageJson = {
     },
     "dependencies": {
         "axios": "^0.27.2",
-        "chatgpt": "^1.4.0",
         "ix": "^4.5.2",
         "jsonwebtoken": "^8.5.1",
         "mqtt": "^4.2.6",
         "mustache": "^4.2.0",
         "nedb": "^1.8.0",
         "node-schedule": "^1.3.2",
-        "p-timeout": "^6.0.0",
+        "openai": "^3.1.0",
         "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
+        "remark": "^14.0.2",
+        "strip-markdown": "^5.0.0",
         "superagent": "^5.2.2"
     },
     "publishConfig": {

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

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

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

@@ -1,33 +1,56 @@
-import { ChatGPTAPI } from 'chatgpt';
-import pTimeout from 'p-timeout';
+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();
+}
 async function geGPTReply(content) {
-    const config = await allConfig();
-    if (!config.gpttoken) {
-        console.log('请到智能微秘书平台配置ChatGPT token参数方可使用');
-        return [{ type: 1, content: '请到平台配置ChatGPT token参数方可使用' }];
+    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:'],
+        });
+        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
+            };
+        });
+        return replys;
     }
-    const api = new ChatGPTAPI({ sessionToken: config.gpttoken });
-    await api.ensureAuth();
-    const threeMinutesMs = 3 * 60 * 1000;
-    const response = await pTimeout(api.sendMessage(content), {
-        milliseconds: threeMinutesMs,
-        message: 'ChatGPT返回超时了，用的人太多，太火爆了，等会再试吧'
-    });
-    let replys = [];
-    let message = response;
-    while (message.length > 500) {
-        replys.push(message.slice(0, 500));
-        message = message.slice(500);
+    catch (e) {
+        return [{ type: 1, content: '现在询问我的人太多了，请稍后询问' }];
     }
-    replys.push(message);
-    replys = replys.map(item => {
-        return {
-            type: 1,
-            content: item
-        };
-    });
-    return replys;
 }
 export { geGPTReply };
 export default {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.2.10",
+  "version": "1.2.12",
   "description": "",
   "exports": {
     ".": {
@@ -28,7 +28,11 @@
     "Wechaty",
     "wechatEveryDay",
     "wechaty",
-    "wechaty-plugin"
+    "wechaty-plugin",
+    "chatGPT",
+    "openai",
+    "chatBot",
+    "openGPT"
   ],
   "author": {
     "name": "Leo_chen",
@@ -59,16 +63,17 @@
   },
   "dependencies": {
     "axios": "^0.27.2",
-    "chatgpt": "^1.4.0",
     "ix": "^4.5.2",
     "jsonwebtoken": "^8.5.1",
     "mqtt": "^4.2.6",
     "mustache": "^4.2.0",
     "nedb": "^1.8.0",
     "node-schedule": "^1.3.2",
-    "p-timeout": "^6.0.0",
+    "openai": "^3.1.0",
     "puppeteer": "^13.3.2",
     "qrcode-terminal": "^0.12.0",
+    "remark": "^14.0.2",
+    "strip-markdown": "^5.0.0",
     "superagent": "^5.2.2"
   },
   "publishConfig": {