wechaty-web-panel 1.4.17 → 1.5.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 更新日志
 
+### V1.4.18(2023-04-04)
+1、去除头像处理和群合影功能，因为占用依赖过大，且不稳定
+2、支持chatGPT 模型在线切换
+3、支持chatGPT 网页hook版本切换
+4、log格式优化，添加时间戳
+
 ### V1.4.17(2023-03-16)
 1、支持添加自己搭建或开放的的反向代理地址
 2、支持配置gpt返回内容是否带原问题

package/README.md

@@ -49,7 +49,7 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
   - [x] 获取美女图 例： "美女图"
   - [x] 群合影 例： "群合影"
   - [x] 牛年头像 例： "牛气冲天"
-  - [x] 国旗头像 例： "我要国旗"
+  - [x] 国旗头像 例： "我要国旗"(下线)
   - [ ] 更多待你发现
 - [x] 进群自动欢迎
 - [x] 加好友自动回复
@@ -62,7 +62,7 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
 
 * 特色功能
 
-- [x] 群合影
+- [x] 群合影(下线)
 - [x] 主动发送消息
 - [x] 主动更新配置
 - [x] 主动同步好友和群列表
@@ -184,9 +184,4 @@ $ node mybot.js
 
 群消息同步
 
-<img src="./doc/img/async.png" width="300">
-
-群合影
-
-<img src="./doc/img/group.jpeg" width="300">
-
+<img src="./doc/img/async.png" width="300">

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

@@ -65,37 +65,30 @@ exports.getCountDownContent = getCountDownContent;
 async function updateContactInfo(that) {
     try {
         const contactSelf = await (0, userDb_js_1.getUser)();
-        const hasWeixin = contactSelf && !!contactSelf.weixin;
         const contactList = await that.Contact.findAll() || [];
         let res = [];
         const notids = ['filehelper', 'fmessage'];
-        let realContact = hasWeixin
-            ? contactList.filter((item) => {
-                const payload = item.payload || item._payload;
-                return payload.type === 1 && payload.friend && !notids.includes(payload.id);
-            })
-            : contactList;
+        let realContact = contactList.filter((item) => {
+            const payload = item.payload || item._payload;
+            return payload.friend && !notids.includes(payload.id) && !payload.id.includes('gh_');
+        });
         for (let i of realContact) {
             let contact = i.payload || i._payload;
             let obj = {
-                robotId: hasWeixin ? contactSelf.weixin : (0, index_js_1.MD5)(contactSelf.name),
-                contactId: hasWeixin ? contact.id : (0, index_js_1.MD5)(contactSelf.name + contact.name + contact.alias + contact.province + contact.city + contact.gender),
+                robotId: contactSelf.robotId,
+                contactId: contact.id,
                 wxid: contact.id,
-                name: contact.name,
-                alias: contact.alias,
+                name: contact.name || '',
+                alias: contact.alias || '',
                 gender: contact.gender,
-                province: contact.province,
-                city: contact.city,
-                avatar: hasWeixin ? contact.avatar : '',
+                avatar: contact.avatar || '',
                 friend: contact.friend,
-                signature: contact.signature,
-                star: contact.star,
-                type: hasWeixin ? contact.type : '',
-                weixin: hasWeixin ? contact.weixin : '',
+                type: contact.type || '',
+                weixin: contact.weixin || '',
             };
             res.push(obj);
         }
-        await updateFriendInfo(res, 50);
+        await updateFriendInfo(res, 80);
     }
     catch (e) {
         console.log('e', e);
@@ -121,15 +114,14 @@ async function updateFriendInfo(list, num) {
 async function updateRoomInfo(that) {
     try {
         const contactSelf = await (0, userDb_js_1.getUser)();
-        const hasWeixin = contactSelf && !!contactSelf.weixin;
         const roomList = await that.Room.findAll() || [];
         let res = [];
         for (let i of roomList) {
             let room = i.payload || i._payload;
             let obj = {
-                robotId: hasWeixin ? contactSelf.weixin : (0, index_js_1.MD5)(contactSelf.name),
+                robotId: contactSelf.robotId,
                 wxid: room.id,
-                roomId: (0, index_js_1.MD5)(room.topic),
+                roomId: room.id,
                 topic: room.topic,
                 avatar: room.avatar || '',
                 ownerId: room.ownerId || '',
@@ -138,7 +130,7 @@ async function updateRoomInfo(that) {
             };
             res.push(obj);
         }
-        await updateRoomsInfo(res, 40);
+        await updateRoomsInfo(res, 80);
     }
     catch (e) {
         console.log('e', e);

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

@@ -21,7 +21,7 @@ async function onLogin(user) {
         const payload = user.payload || user._payload;
         const userInfo = {
             ...payload,
-            robotId: payload.weixin || (0, index_js_1.MD5)(user.name()),
+            robotId: payload.wxid || user.id,
         };
         await (0, userDb_js_1.addUser)(userInfo); // 全局存储登录用户信息
         let file = '';

package/dist/cjs/src/index.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WechatyWebPanelPlugin = void 0;
-require("isomorphic-fetch");
 const aiDb_js_1 = require("./db/aiDb.js");
 const on_scan_js_1 = __importDefault(require("./handlers/on-scan.js"));
 const on_login_js_1 = __importDefault(require("./handlers/on-login.js"));
@@ -17,6 +16,15 @@ const on_heartbeat_js_1 = __importDefault(require("./handlers/on-heartbeat.js"))
 const on_error_js_1 = __importDefault(require("./handlers/on-error.js"));
 const on_roomtopic_js_1 = __importDefault(require("./handlers/on-roomtopic.js"));
 const on_roomleave_js_1 = __importDefault(require("./handlers/on-roomleave.js"));
+const dayjs_1 = __importDefault(require("dayjs"));
+const originalConsoleLog = console.log;
+// 重写 console.log 方法
+console.log = function () {
+    // 在原始方法上调用，确保与原始方法相同的行为
+    originalConsoleLog.apply(console, 
+    // 将类数组对象转换为数组，并在其开头添加一个时间戳
+    [`${(0, dayjs_1.default)().format('YYYY-MM-DD HH:mm:ss')} -`].concat(Array.from(arguments)).concat('\n'));
+};
 let envKey = '';
 let envSecret = '';
 if (process.env['AIBOTK_KEY']) {

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

@@ -19,8 +19,6 @@ declare namespace _default {
     export { throttle };
     export { cancelAllSchedule };
     export { groupArray };
-    export { getRoomAvatarList };
-    export { getRoomAvatar };
     export { getNewsType };
 }
 export default _default;
@@ -149,22 +147,6 @@ export function cancelAllSchedule(type: any): void;
  * @param {*} subGroupLength 每个数组长度
  */
 export function groupArray(array: any, subGroupLength: any): any[];
-/**
- * 获取群用户列表
- * @param {*}} room
- * @param {*} name
- */
-export function getRoomAvatarList(room: any, name: any): Promise<({
-    img: any;
-    name: any;
-} | undefined)[] | undefined>;
-/**
- * 获取群头像列表
- * @param {*} roomObj
- * @param {*} roomName
- * @param {*} name
- */
-export function getRoomAvatar(roomObj: any, roomName: any, name: any): Promise<any>;
 /**
  * 获取新闻的英文
  * @param {*} msg

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

@@ -26,11 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewsType = exports.getRoomAvatar = exports.getRoomAvatarList = 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 = 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 = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const schedule = __importStar(require("node-schedule"));
 const fs_1 = __importDefault(require("fs"));
-const roomAvatarDb_js_1 = require("../db/roomAvatarDb.js");
 const dayjs_1 = __importDefault(require("dayjs"));
 /**
  * 设置定时器
@@ -493,81 +492,6 @@ function groupArray(array, subGroupLength) {
     return newArray;
 }
 exports.groupArray = groupArray;
-/**
- * 获取群用户列表
- * @param {*}} room
- * @param {*} name
- */
-async function getRoomAvatarList(room, name) {
-    try {
-        const members = await room.memberAll();
-        let res = [];
-        console.log('正在努力获取群成员信息...');
-        for (let i of members) {
-            let member = i.payload || i._payload;
-            try {
-                const avatar = await i.avatar();
-                if (avatar._mediaType && avatar._name) {
-                    const base64 = member.weixin ? member.avatar : await avatar.toDataURL();
-                    let obj = {
-                        img: base64,
-                        name: member.name,
-                    };
-                    res.push(obj);
-                }
-            }
-            catch (error) {
-                console.log(`获取${member.name}头像失败， 头像文件格式错误，不影响群合影生成`);
-                continue;
-            }
-        }
-        const say = res.splice(res.findIndex((e) => e.name === name), 1);
-        res.unshift(say[0]);
-        console.log('获取群成员信息完成...');
-        return res;
-    }
-    catch (e) {
-        console.log('获取群成员头像列表失败', e);
-    }
-}
-exports.getRoomAvatarList = getRoomAvatarList;
-/**
- * 设置中心位置
- */
-function setFirstAvatr(list, name) {
-    const temp = list;
-    const say = temp.splice(temp.findIndex((e) => e.name === name), 1);
-    temp.unshift(say[0]);
-    return temp;
-}
-/**
- * 获取群头像列表
- * @param {*} roomObj
- * @param {*} roomName
- * @param {*} name
- */
-async function getRoomAvatar(roomObj, roomName, name) {
-    try {
-        let memberList = [];
-        const room = await (0, roomAvatarDb_js_1.getRoom)(roomName); // 先获取缓存中是否存在已经获取的头像
-        if (room && room.list) {
-            memberList = room.list;
-        }
-        else {
-            const list = await getRoomAvatarList(roomObj, name);
-            const obj = { name: roomName, list };
-            await (0, roomAvatarDb_js_1.addRoom)(obj);
-            memberList = list;
-        }
-        console.log('准备绘制...');
-        const list = setFirstAvatr(memberList, name);
-        return list;
-    }
-    catch (e) {
-        console.log('getRoomAvatar error', e);
-    }
-}
-exports.getRoomAvatar = getRoomAvatar;
 exports.default = {
     Base64Encode,
     Base64Decode,
@@ -589,8 +513,6 @@ exports.default = {
     throttle,
     cancelAllSchedule,
     groupArray,
-    getRoomAvatarList,
-    getRoomAvatar,
     getNewsType,
 };
 //# sourceMappingURL=index.js.map

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

@@ -42,6 +42,7 @@ export namespace packageJson {
         "npm-run-all": string;
         prettier: string;
         wechaty: string;
+        "wechaty-puppet-padlocal": string;
     };
     const readme: string;
     namespace engines {
@@ -53,15 +54,12 @@ export namespace packageJson {
         chatgpt: string;
         dayjs: string;
         "https-proxy-agent": string;
-        "isomorphic-fetch": string;
-        ix: string;
         jsonwebtoken: string;
         mqtt: string;
         mustache: string;
         nedb: string;
         "node-fetch": string;
         "node-schedule": string;
-        puppeteer: string;
         "qrcode-terminal": string;
         superagent: string;
     };

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.17",
+    "version": "1.5.1",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -59,27 +59,25 @@ exports.packageJson = {
         "eslint-plugin-prettier": "^3.1.4",
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.5",
-        "wechaty": "^1.20.2"
+        "wechaty": "^1.20.2",
+        "wechaty-puppet-padlocal": "^1.20.1"
     },
     "readme": "README.md",
     "engines": {
-        "node": ">=16",
-        "npm": ">=7"
+        "node": ">=18",
+        "npm": ">=8"
     },
     "dependencies": {
         "axios": "^0.27.2",
-        "chatgpt": "^5.1.1",
+        "chatgpt": "^5.2.2",
         "dayjs": "^1.11.7",
         "https-proxy-agent": "^5.0.1",
-        "isomorphic-fetch": "^3.0.0",
-        "ix": "^4.5.2",
         "jsonwebtoken": "^8.5.1",
         "mqtt": "^4.2.6",
         "mustache": "^4.2.0",
         "nedb": "^1.8.0",
         "node-fetch": "^2.6.9",
         "node-schedule": "^1.3.2",
-        "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
         "superagent": "^5.2.2"
     },

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

@@ -23,9 +23,7 @@ declare namespace _default {
     export { sendFriend };
     export { sendRoom };
     export { asyncData };
-    export { drawRoomPhoto };
     export { updatePanelVersion };
-    export { getRoomPhotoConfig };
     export { getMqttConfig };
     export { getMeiNv };
     export { getOne };
@@ -102,22 +100,11 @@ export function sendRoom(room: any): Promise<void>;
  * type： 1 好友 2 群组
  */
 export function asyncData(robotId: any, type: any): Promise<void>;
-/**
- * 生成群合影
- * @param {*}} roomName 群名
- * @param {*} list 群成员列表
- * @param {*} contactName 触发用户
- */
-export function drawRoomPhoto(roomName: any, list: any, contactName: any): Promise<any>;
 /**
  * 更新插件版本信息
  * @param {*} version
  */
 export function updatePanelVersion(): Promise<any>;
-/**
- * 获取群合影配置
- */
-export function getRoomPhotoConfig(roomName: any): Promise<any>;
 /**
  * 获取mqtt信息
  * @param {*} version

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFireNews = exports.getMaterial = exports.getOne = exports.getMeiNv = exports.getMqttConfig = exports.getRoomPhotoConfig = exports.updatePanelVersion = exports.drawRoomPhoto = exports.asyncData = exports.sendRoom = exports.sendFriend = exports.putqn = exports.sendRobotInfo = exports.sendError = exports.sendHeartBeat = exports.setQrCode = exports.updateSchedule = exports.setSchedule = exports.getScheduleList = exports.getConfig = exports.getWordCloud = exports.getWordCloudConfig = exports.getWordCloudRoom = void 0;
+exports.getFireNews = exports.getMaterial = exports.getOne = exports.getMeiNv = exports.getMqttConfig = exports.updatePanelVersion = exports.asyncData = exports.sendRoom = exports.sendFriend = exports.putqn = exports.sendRobotInfo = exports.sendError = exports.sendHeartBeat = exports.setQrCode = exports.updateSchedule = exports.setSchedule = exports.getScheduleList = exports.getConfig = 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");
@@ -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, showQuestion: true, proxyUrl: '', proxyPassUrl: '', countDownTaskSchedule: [], parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
+        let cres = await (0, configDb_js_1.updateConfig)({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, showQuestion: true, openaiTimeout: 60, openaiAccessToken: '', openaiDebug: false, openaiModel: 'gpt-3.5-turbo', proxyUrl: '', proxyPassUrl: '', countDownTaskSchedule: [], parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
         return cres;
     }
     catch (e) {
@@ -389,45 +389,6 @@ async function getQiToken() {
         console.log('token error', e);
     }
 }
-/**
- * 获取群合影配置
- */
-async function getRoomPhotoConfig(roomName) {
-    try {
-        let option = {
-            method: 'get',
-            url: '/roomPhoto',
-            params: { name: roomName },
-        };
-        let content = await (0, superagent_js_1.aiBotReq)(option);
-        return content.data || '';
-    }
-    catch (e) {
-        console.log('群合影生成错误', e);
-    }
-}
-exports.getRoomPhotoConfig = getRoomPhotoConfig;
-/**
- * 生成群合影
- * @param {*}} roomName 群名
- * @param {*} list 群成员列表
- * @param {*} contactName 触发用户
- */
-async function drawRoomPhoto(roomName, list, contactName) {
-    try {
-        let option = {
-            method: 'POST',
-            url: '/roomPhoto',
-            params: { name: roomName, user: contactName, list: list },
-        };
-        let content = await (0, superagent_js_1.aiBotReq)(option);
-        return content.data;
-    }
-    catch (e) {
-        console.log('群合影生成错误', e);
-    }
-}
-exports.drawRoomPhoto = drawRoomPhoto;
 /**
  * 上传base64图片到七牛云
  * @param base
@@ -531,9 +492,7 @@ exports.default = {
     sendFriend,
     sendRoom,
     asyncData,
-    drawRoomPhoto,
     updatePanelVersion,
-    getRoomPhotoConfig,
     getMqttConfig,
     getMeiNv,
     getOne,

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

@@ -1,26 +1,66 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.geGPT3Reply = exports.initGpt = exports.initChatGPT = void 0;
 const configDb_js_1 = require("../db/configDb.js");
-const chatgpt_1 = require("chatgpt");
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 let chatGPT = null;
 let chatOption = {};
 async function initChatGPT() {
+    const { ChatGPTAPI } = await Promise.resolve().then(() => __importStar(require('chatgpt')));
     const config = await (0, configDb_js_1.allConfig)();
     if (!config.gpttoken) {
         console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
         return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
     }
     console.log('config.gpttoken', config.gpttoken);
+    const baseOptions = {
+        apiKey: config.gpttoken,
+        completionParams: { model: config.openaiModel },
+        debug: config.openaiDebug,
+    };
+    // increase max token limit if use gpt-4
+    if (config.openaiModel.toLowerCase().includes('gpt-4')) {
+        // if use 32k model
+        if (config.openaiModel.toLowerCase().includes('32k')) {
+            baseOptions.maxModelTokens = 32768;
+            baseOptions.maxResponseTokens = 8192;
+        }
+        else {
+            baseOptions.maxModelTokens = 8192;
+            baseOptions.maxResponseTokens = 2048;
+        }
+    }
     if (config.proxyUrl) {
         console.log(`启用代理请求:${config.proxyUrl}`);
-        chatGPT = new chatgpt_1.ChatGPTAPI({
-            apiKey: config.gpttoken,
+        chatGPT = new ChatGPTAPI({
+            ...baseOptions,
             fetch: (url, options = {}) => {
                 const defaultOptions = {
                     agent: (0, https_proxy_agent_1.default)(config.proxyUrl),
@@ -35,15 +75,27 @@ async function initChatGPT() {
     }
     else if (config.proxyPassUrl) {
         console.log(`启用反向代理请求:${config.proxyPassUrl}`);
-        chatGPT = new chatgpt_1.ChatGPTAPI({
+        chatGPT = new ChatGPTAPI({
+            ...baseOptions,
             apiBaseUrl: config.proxyPassUrl,
-            apiKey: config.gpttoken
+            fetch: (url, options = {}) => {
+                const mergedOptions = {
+                    ...options,
+                };
+                return (0, node_fetch_1.default)(url, mergedOptions);
+            },
         });
     }
     else {
         console.log('未启用代理请求，可能会失败');
-        chatGPT = new chatgpt_1.ChatGPTAPI({
-            apiKey: config.gpttoken,
+        chatGPT = new ChatGPTAPI({
+            ...baseOptions,
+            fetch: (url, options = {}) => {
+                const mergedOptions = {
+                    ...options,
+                };
+                return (0, node_fetch_1.default)(url, mergedOptions);
+            },
         });
     }
 }
@@ -67,7 +119,7 @@ async function geGPT3Reply(content, uid) {
             console.log('看到此消息说明已启用最新版chat gpt 3.5 turbo模型');
             await initChatGPT();
         }
-        const { conversationId, text, id } = await chatGPT.sendMessage(content, chatOption[uid]);
+        const { conversationId, text, id } = await chatGPT.sendMessage(content, { ...chatOption[uid], timeoutMs: config.openaiTimeout * 1000 });
         chatOption = {
             [uid]: {
                 conversationId,

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

@@ -0,0 +1,14 @@
+export function initChatGPTHook(): Promise<{
+    type: number;
+    content: string;
+}[] | undefined>;
+/**
+ * 重置apikey
+ * @return {Promise<void>}
+ */
+export function initGptHook(): Promise<void>;
+export function geGPTHookReply(content: any, uid: any): Promise<{
+    type: number;
+    content: any;
+}[]>;
+//# sourceMappingURL=openAiHook.d.ts.map