wechaty-web-panel 1.2.0 → 1.2.3

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("../lib/index.js");
 const configDb_js_1 = require("../db/configDb.js");
+const index_js_2 = require("../common/index.js");
 /**
  * 好友添加
  */
@@ -32,7 +33,13 @@ async function onFriend(friendship) {
                     break;
                 case 1:
                     logMsg = '已确认添加好友：' + name;
-                    console.log(logMsg);
+                    console.log(`新添加好友：${name}，默认回复`);
+                    if (config.newFriendReplys && config.newFriendReplys.length) {
+                        for (let reply of config.newFriendReplys) {
+                            await (0, index_js_1.delay)(1000);
+                            await index_js_2.contactSay.call(this, friendship.contact(), reply);
+                        }
+                    }
                     break;
                 case 0:
                     logMsg = '未知错误' + name;

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_js_1 = require("../lib/index.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const userDb_js_1 = require("../db/userDb.js");
-const index_js_2 = require("../task/index.js");
 const mqtt_js_1 = require("../proxy/mqtt.js");
 const configDb_js_1 = require("../db/configDb.js");
 /**
@@ -29,13 +28,11 @@ async function onLogin(user) {
         if (file) {
             const base = await file.toBase64();
             const avatarUrl = await (0, aibotk_js_1.putqn)(base, userId);
-            await (0, aibotk_js_1.sendRobotInfo)(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
-            await (0, index_js_1.delay)(1000);
+            (0, aibotk_js_1.sendRobotInfo)(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
         }
         else {
             console.log('头像未获取到，不影响项目正常使用');
         }
-        await (0, index_js_2.initAllSchedule)(this); // 初始化任务
         await (0, mqtt_js_1.initMqtt)(this); // 初始化mqtt任务
     }
     catch (e) {

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

@@ -7,17 +7,19 @@ const index_js_1 = __importDefault(require("../common/index.js"));
 const index_js_2 = require("../lib/index.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const userDb_js_1 = require("../db/userDb.js");
+const index_js_3 = require("../task/index.js");
 /**
  * 准备好的事件
  */
 async function onReady() {
     try {
+        (0, index_js_3.initAllSchedule)(this); // 初始化任务
         await (0, userDb_js_1.getUser)();
         console.log(`所有数据准备完毕`);
-        await (0, aibotk_js_1.sendHeartBeat)('live');
-        await index_js_1.default.updateContactInfo(this);
-        await (0, index_js_2.delay)(5000);
-        await index_js_1.default.updateRoomInfo(this);
+        (0, aibotk_js_1.sendHeartBeat)('live');
+        index_js_1.default.updateContactInfo(this);
+        await (0, index_js_2.delay)(2000);
+        index_js_1.default.updateRoomInfo(this);
     }
     catch (e) {
         console.log('on ready error:', e);

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

@@ -60,7 +60,6 @@ export namespace packageJson {
         puppeteer: string;
         "qrcode-terminal": string;
         superagent: string;
-        "tencentcloud-sdk-nodejs": string;
     };
     namespace publishConfig {
         const registry: string;

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.2.0",
+    "version": "1.2.3",
     "description": "",
     "exports": {
         ".": {
@@ -73,8 +73,7 @@ exports.packageJson = {
         "node-schedule": "^1.3.2",
         "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
-        "superagent": "^5.2.2",
-        "tencentcloud-sdk-nodejs": "^4.0.30"
+        "superagent": "^5.2.2"
     },
     "publishConfig": {
         "registry": " https://registry.npmjs.org/",

package/dist/cjs/src/proxy/tencent-open.js

@@ -169,23 +169,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
         const resData = res.data;
         if (!resData.errcode) {
             let answer = resData.answer; // 存放回答
-            if (resData.answer_type === 'text') {
-                if (isMultiple(answer)) {
-                    const multiList = getMultiList(answer);
-                    const replys = [];
-                    multiList.forEach((item) => {
-                        item = item.replace(/<\/?.+?\/?>/g, '');
-                        const reply = getFormatReply(item, resData.options || [], userInfo, config.puppetType);
-                        replys.push(...reply);
-                    });
-                    return replys;
-                }
-                else {
-                    const replys = getFormatReply(answer, resData.options, userInfo, config.puppetType);
-                    return replys;
-                }
-            }
-            else if (resData.answer_type === 'music') {
+            if (resData.answer_type === 'music') {
                 // web 端协议以文字和图片的形式发送
                 if (config.puppetType === 'wechaty-puppet-wechat') {
                     const res = JSON.parse(resData.answer);
@@ -211,6 +195,22 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
                     ];
                 }
             }
+            else {
+                if (isMultiple(answer)) {
+                    const multiList = getMultiList(answer);
+                    const replys = [];
+                    multiList.forEach((item) => {
+                        item = item.replace(/<\/?.+?\/?>/g, '');
+                        const reply = getFormatReply(item, resData.options || [], userInfo, config.puppetType);
+                        replys.push(...reply);
+                    });
+                    return replys;
+                }
+                else {
+                    const replys = getFormatReply(answer, resData.options, userInfo, config.puppetType);
+                    return replys;
+                }
+            }
         }
         else {
             console.log('微信开放对话平台报错：', resData.errcode + resData.errmsg);

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

@@ -10,7 +10,6 @@ const index_js_1 = require("../lib/index.js");
 const lanuch_js_1 = require("../puppeteer-paint/lanuch.js");
 const index_js_2 = require("../task/index.js");
 const index_js_3 = require("../common/index.js");
-const tencent_js_1 = require("../proxy/tencent.js");
 const tencent_open_js_1 = require("../proxy/tencent-open.js");
 const roomDb_js_1 = require("../db/roomDb.js");
 /**
@@ -217,8 +216,7 @@ async function dispatchAiBot(bot, msg, name, id) {
                 break;
             case 3:
                 // 微信闲聊
-                res = await (0, tencent_js_1.chatTencent)(msg, id);
-                replys = [{ type: 1, content: res }];
+                replys = [{ type: 1, content: '微信闲聊已下线，建议使用微信对话开放平台: https://openai.weixin.qq.com' }];
                 break;
             case 5:
                 // 微信开放对话平台

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

@@ -44,7 +44,10 @@ export function avatarCrop({ msg, name, config, avatar }: {
     config: any;
     avatar: any;
 }): Promise<any[] | any>;
-export function emptyMsg(): {
+export function emptyMsg({ room, isMention }: {
+    room: any;
+    isMention: any;
+}): {
     type: number;
     content: string;
     url: string;

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

@@ -10,7 +10,9 @@ const index_js_1 = require("../lib/index.js");
 const lanuch_js_1 = require("../puppeteer-paint/lanuch.js");
 const index_js_2 = require("../common/index.js");
 const superagent_js_1 = require("../proxy/superagent.js");
-function emptyMsg() {
+function emptyMsg({ room, isMention }) {
+    if (room && !isMention)
+        return [];
     let msgArr = []; // 返回的消息列表
     let obj = { type: 1, content: '我在呢', url: '' }; // 消息主体
     msgArr.push(obj);

package/dist/cjs/src/service/room-async-service.js

@@ -319,7 +319,12 @@ async function manyToMany(that, config, msg) {
         if (!manyRoomList.length) {
             for (let i = 0; i < config.many.length; i++) {
                 const room = await that.Room.find({ topic: config.many[i] });
-                manyRoomList.push(room);
+                if (room) {
+                    manyRoomList.push(room);
+                }
+                else {
+                    console.log(`没有查找到群:${config.many[i]}`);
+                }
             }
         }
         await matchAndForward(msg, manyRoomList);
@@ -398,7 +403,12 @@ async function oneToMany(that, config, msg) {
         if (!manyRoomList.length) {
             for (let i = 0; i < config.many.length; i++) {
                 const room = await that.Room.find({ topic: config.many[i] });
-                manyRoomList.push(room);
+                if (room) {
+                    manyRoomList.push(room);
+                }
+                else {
+                    console.log(`没有查找到群:${config.many[i]}`);
+                }
             }
         }
         await matchAndForward(msg, manyRoomList);

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

@@ -157,8 +157,13 @@ async function setScheduleTask(that, item, name) {
         (0, index_js_1.setLocalSchedule)(time, async () => {
             try {
                 let contact = await that.Contact.find({ name: item.subscribe });
-                console.log(`${item.subscribe}的专属提醒开启啦！`);
-                await contact.say(item.content);
+                if (contact) {
+                    console.log(`${item.subscribe}的专属提醒开启啦！`);
+                    await contact.say(item.content);
+                }
+                else {
+                    console.log(`没有找到联系人：${item.subscribe}`);
+                }
                 if (!item.isLoop) {
                     await (0, aibotk_js_1.updateSchedule)(item.id);
                 }

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

@@ -1,5 +1,6 @@
 import { delay } from '../lib/index.js';
 import { allConfig } from '../db/configDb.js';
+import { contactSay } from "../common/index.js";
 /**
  * 好友添加
  */
@@ -30,7 +31,13 @@ async function onFriend(friendship) {
                     break;
                 case 1:
                     logMsg = '已确认添加好友：' + name;
-                    console.log(logMsg);
+                    console.log(`新添加好友：${name}，默认回复`);
+                    if (config.newFriendReplys && config.newFriendReplys.length) {
+                        for (let reply of config.newFriendReplys) {
+                            await delay(1000);
+                            await contactSay.call(this, friendship.contact(), reply);
+                        }
+                    }
                     break;
                 case 0:
                     logMsg = '未知错误' + name;

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

@@ -1,7 +1,6 @@
-import { delay, MD5 } from '../lib/index.js';
+import { MD5 } from '../lib/index.js';
 import { getConfig, sendRobotInfo, sendError, putqn, setQrCode, updatePanelVersion } from '../proxy/aibotk.js';
 import { addUser } from '../db/userDb.js';
-import { initAllSchedule } from '../task/index.js';
 import { initMqtt } from '../proxy/mqtt.js';
 import { allConfig } from '../db/configDb.js';
 /**
@@ -27,13 +26,11 @@ async function onLogin(user) {
         if (file) {
             const base = await file.toBase64();
             const avatarUrl = await putqn(base, userId);
-            await sendRobotInfo(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
-            await delay(1000);
+            sendRobotInfo(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
         }
         else {
             console.log('头像未获取到，不影响项目正常使用');
         }
-        await initAllSchedule(this); // 初始化任务
         await initMqtt(this); // 初始化mqtt任务
     }
     catch (e) {

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

@@ -2,17 +2,19 @@ import common from '../common/index.js';
 import { delay } from '../lib/index.js';
 import { sendHeartBeat } from '../proxy/aibotk.js';
 import { getUser } from '../db/userDb.js';
+import { initAllSchedule } from "../task/index.js";
 /**
  * 准备好的事件
  */
 async function onReady() {
     try {
+        initAllSchedule(this); // 初始化任务
         await getUser();
         console.log(`所有数据准备完毕`);
-        await sendHeartBeat('live');
-        await common.updateContactInfo(this);
-        await delay(5000);
-        await common.updateRoomInfo(this);
+        sendHeartBeat('live');
+        common.updateContactInfo(this);
+        await delay(2000);
+        common.updateRoomInfo(this);
     }
     catch (e) {
         console.log('on ready error:', e);

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

@@ -60,7 +60,6 @@ export namespace packageJson {
         puppeteer: string;
         "qrcode-terminal": string;
         superagent: string;
-        "tencentcloud-sdk-nodejs": string;
     };
     namespace publishConfig {
         const registry: string;

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.2.0",
+    "version": "1.2.3",
     "description": "",
     "exports": {
         ".": {
@@ -70,8 +70,7 @@ export const packageJson = {
         "node-schedule": "^1.3.2",
         "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
-        "superagent": "^5.2.2",
-        "tencentcloud-sdk-nodejs": "^4.0.30"
+        "superagent": "^5.2.2"
     },
     "publishConfig": {
         "registry": " https://registry.npmjs.org/",

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

@@ -1,5 +1,5 @@
 import { req, txReq } from './superagent.js';
-import { EMOHOST, TULING, MEINV } from './config.js';
+import { EMOHOST, TULING, ONE, MEINV } from './config.js';
 import { randomRange, MD5 } from '../lib/index.js';
 import { allConfig } from '../db/configDb.js';
 /**

package/dist/esm/src/proxy/tencent-open.js

@@ -163,23 +163,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
         const resData = res.data;
         if (!resData.errcode) {
             let answer = resData.answer; // 存放回答
-            if (resData.answer_type === 'text') {
-                if (isMultiple(answer)) {
-                    const multiList = getMultiList(answer);
-                    const replys = [];
-                    multiList.forEach((item) => {
-                        item = item.replace(/<\/?.+?\/?>/g, '');
-                        const reply = getFormatReply(item, resData.options || [], userInfo, config.puppetType);
-                        replys.push(...reply);
-                    });
-                    return replys;
-                }
-                else {
-                    const replys = getFormatReply(answer, resData.options, userInfo, config.puppetType);
-                    return replys;
-                }
-            }
-            else if (resData.answer_type === 'music') {
+            if (resData.answer_type === 'music') {
                 // web 端协议以文字和图片的形式发送
                 if (config.puppetType === 'wechaty-puppet-wechat') {
                     const res = JSON.parse(resData.answer);
@@ -205,6 +189,22 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
                     ];
                 }
             }
+            else {
+                if (isMultiple(answer)) {
+                    const multiList = getMultiList(answer);
+                    const replys = [];
+                    multiList.forEach((item) => {
+                        item = item.replace(/<\/?.+?\/?>/g, '');
+                        const reply = getFormatReply(item, resData.options || [], userInfo, config.puppetType);
+                        replys.push(...reply);
+                    });
+                    return replys;
+                }
+                else {
+                    const replys = getFormatReply(answer, resData.options, userInfo, config.puppetType);
+                    return replys;
+                }
+            }
         }
         else {
             console.log('微信开放对话平台报错：', resData.errcode + resData.errmsg);

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

@@ -4,7 +4,6 @@ import { getConstellation, msgArr, getRoomAvatar, getNewsType } from '../lib/ind
 import { generateAvatar, generateRoomImg } from '../puppeteer-paint/lanuch.js';
 import { initTaskLocalSchedule, initTimeSchedule } from "../task/index.js";
 import { updateContactAndRoom, updateContactOnly, updateRoomOnly } from '../common/index.js';
-import { chatTencent } from '../proxy/tencent.js';
 import { getTencentOpenReply } from '../proxy/tencent-open.js';
 import { getRoomRecordContent, removeRecord } from "../db/roomDb.js";
 /**
@@ -210,8 +209,7 @@ async function dispatchAiBot(bot, msg, name, id) {
                 break;
             case 3:
                 // 微信闲聊
-                res = await chatTencent(msg, id);
-                replys = [{ type: 1, content: res }];
+                replys = [{ type: 1, content: '微信闲聊已下线，建议使用微信对话开放平台: https://openai.weixin.qq.com' }];
                 break;
             case 5:
                 // 微信开放对话平台

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

@@ -44,7 +44,10 @@ export function avatarCrop({ msg, name, config, avatar }: {
     config: any;
     avatar: any;
 }): Promise<any[] | any>;
-export function emptyMsg(): {
+export function emptyMsg({ room, isMention }: {
+    room: any;
+    isMention: any;
+}): {
     type: number;
     content: string;
     url: string;

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

@@ -4,7 +4,9 @@ import { contentDistinguish, setLocalSchedule, isRealDate } from '../lib/index.j
 import { generateAvatar } from '../puppeteer-paint/lanuch.js';
 import { addRoom } from '../common/index.js';
 import { service, callbackAibotApi } from '../proxy/superagent.js';
-function emptyMsg() {
+function emptyMsg({ room, isMention }) {
+    if (room && !isMention)
+        return [];
     let msgArr = []; // 返回的消息列表
     let obj = { type: 1, content: '我在呢', url: '' }; // 消息主体
     msgArr.push(obj);

package/dist/esm/src/service/room-async-service.js

@@ -290,7 +290,12 @@ async function manyToMany(that, config, msg) {
         if (!manyRoomList.length) {
             for (let i = 0; i < config.many.length; i++) {
                 const room = await that.Room.find({ topic: config.many[i] });
-                manyRoomList.push(room);
+                if (room) {
+                    manyRoomList.push(room);
+                }
+                else {
+                    console.log(`没有查找到群:${config.many[i]}`);
+                }
             }
         }
         await matchAndForward(msg, manyRoomList);
@@ -369,7 +374,12 @@ async function oneToMany(that, config, msg) {
         if (!manyRoomList.length) {
             for (let i = 0; i < config.many.length; i++) {
                 const room = await that.Room.find({ topic: config.many[i] });
-                manyRoomList.push(room);
+                if (room) {
+                    manyRoomList.push(room);
+                }
+                else {
+                    console.log(`没有查找到群:${config.many[i]}`);
+                }
             }
         }
         await matchAndForward(msg, manyRoomList);

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

@@ -152,8 +152,13 @@ async function setScheduleTask(that, item, name) {
         setLocalSchedule(time, async () => {
             try {
                 let contact = await that.Contact.find({ name: item.subscribe });
-                console.log(`${item.subscribe}的专属提醒开启啦！`);
-                await contact.say(item.content);
+                if (contact) {
+                    console.log(`${item.subscribe}的专属提醒开启啦！`);
+                    await contact.say(item.content);
+                }
+                else {
+                    console.log(`没有找到联系人：${item.subscribe}`);
+                }
                 if (!item.isLoop) {
                     await updateSchedule(item.id);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.2.0",
+  "version": "1.2.3",
   "description": "",
   "exports": {
     ".": {
@@ -67,8 +67,7 @@
     "node-schedule": "^1.3.2",
     "puppeteer": "^13.3.2",
     "qrcode-terminal": "^0.12.0",
-    "superagent": "^5.2.2",
-    "tencentcloud-sdk-nodejs": "^4.0.30"
+    "superagent": "^5.2.2"
   },
   "publishConfig": {
     "registry": " https://registry.npmjs.org/",

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

@@ -1,6 +0,0 @@
-declare namespace _default {
-    export { chatTencent };
-}
-export default _default;
-export function chatTencent(word: any): Promise<any>;
-//# sourceMappingURL=tencent.d.ts.map

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

@@ -1,67 +0,0 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.chatTencent = void 0;
-const tencentcloud = __importStar(require("tencentcloud-sdk-nodejs"));
-const configDb_js_1 = require("../db/configDb.js");
-const NlpClient = tencentcloud.nlp.v20190408.Client;
-let client = '';
-async function initClient() {
-    const config = await (0, configDb_js_1.allConfig)();
-    //初始化腾讯闲聊机器人，创建链接
-    const clientConfig = {
-        credential: {
-            secretId: config.tencentSecretId,
-            secretKey: config.tencentSecretKey,
-        },
-        region: 'ap-guangzhou',
-        profile: {
-            httpProfile: {
-                endpoint: 'nlp.tencentcloudapi.com',
-            },
-        },
-    };
-    client = new NlpClient(clientConfig);
-}
-async function chatTencent(word) {
-    try {
-        const params = {
-            Query: word,
-        };
-        if (!client) {
-            await initClient();
-        }
-        const res = await client.ChatBot(params);
-        return res.Reply;
-    }
-    catch (e) {
-        console.log('腾讯闲聊机器人请求失败：', e);
-    }
-}
-exports.chatTencent = chatTencent;
-exports.default = {
-    chatTencent,
-};
-//# sourceMappingURL=tencent.js.map

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

@@ -1,6 +0,0 @@
-declare namespace _default {
-    export { chatTencent };
-}
-export default _default;
-export function chatTencent(word: any): Promise<any>;
-//# sourceMappingURL=tencent.d.ts.map

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

@@ -1,41 +0,0 @@
-import * as tencentcloud from 'tencentcloud-sdk-nodejs';
-import { allConfig } from '../db/configDb.js';
-const NlpClient = tencentcloud.nlp.v20190408.Client;
-let client = '';
-async function initClient() {
-    const config = await allConfig();
-    //初始化腾讯闲聊机器人，创建链接
-    const clientConfig = {
-        credential: {
-            secretId: config.tencentSecretId,
-            secretKey: config.tencentSecretKey,
-        },
-        region: 'ap-guangzhou',
-        profile: {
-            httpProfile: {
-                endpoint: 'nlp.tencentcloudapi.com',
-            },
-        },
-    };
-    client = new NlpClient(clientConfig);
-}
-async function chatTencent(word) {
-    try {
-        const params = {
-            Query: word,
-        };
-        if (!client) {
-            await initClient();
-        }
-        const res = await client.ChatBot(params);
-        return res.Reply;
-    }
-    catch (e) {
-        console.log('腾讯闲聊机器人请求失败：', e);
-    }
-}
-export { chatTencent };
-export default {
-    chatTencent,
-};
-//# sourceMappingURL=tencent.js.map