wechaty-web-panel 1.5.7 → 1.5.8

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 更新日志
 
+### V1.5.8(2023-04-07)
+1、去除报错上报，防止无限请求
+2、限制二维码推送次数超过50次后需要重启服务才能在平台扫码
+
 ### V1.5.7(2023-04-06)
 1、去除only esm的包，解决chatgpt中文回复会中断问题
 2、robotId获取问题修复

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

@@ -1,17 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const aibotk_js_1 = require("../proxy/aibotk.js");
 async function onError(error) {
-    try {
-        console.log('错误', error);
-        await (0, aibotk_js_1.sendError)(error.message
-            .replace(/\ +/g, '')
-            .replace(/[\r\n]/g, '')
-            .replace('Error:type(){returnthis._type;}', ''));
-    }
-    catch (e) {
-        console.log('上报错误失败', e);
-    }
+    console.log('发生了一些错误，如果机器人正常运行，可以无需关心：', error);
 }
 exports.default = onError;
 //# sourceMappingURL=on-error.js.map

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

@@ -1,6 +1,5 @@
 "use strict";
 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 mqtt_js_1 = require("../proxy/mqtt.js");
@@ -14,7 +13,6 @@ async function onLogin(user) {
         console.log(`贴心助理${user}登录了`);
         await (0, aibotk_js_1.updatePanelVersion)();
         await (0, aibotk_js_1.setQrCode)('', 4);
-        await (0, aibotk_js_1.sendError)('');
         await (0, aibotk_js_1.getConfig)(); // 获取配置文件
         const config = await (0, configDb_js_1.allConfig)();
         const { userId } = config && config.userInfo;

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

@@ -6,13 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 const index_js_1 = require("../lib/index.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
+const aiDb_js_1 = require("../db/aiDb.js");
+// 限制推送二维码的次数，防止掉线后，无限推送二维码到服务器
+let scanTime = 0;
 /**
  * 扫描登录，显示二维码
  */
 async function onScan(qrcode, status) {
+    const aibotConfig = await (0, aiDb_js_1.getAibotConfig)();
     qrcode_terminal_1.default.generate(qrcode);
     console.log('扫描状态', status);
-    (0, index_js_1.throttle)((0, aibotk_js_1.setQrCode)(qrcode, status), 30000);
+    if (scanTime >= aibotConfig.scanTimes) {
+        console.log('长时间推送登录状态，平台二维码不再更新，请重启服务，或直接在终端扫码登录');
+    }
+    else {
+        scanTime++;
+        (0, index_js_1.throttle)((0, aibotk_js_1.setQrCode)(qrcode, status), 30000);
+    }
     const qrImgUrl = ['https://api.qrserver.com/v1/create-qr-code/?data=', encodeURIComponent(qrcode)].join('');
     console.log(qrImgUrl);
 }

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

@@ -1,5 +1,6 @@
 export function WechatyWebPanelPlugin(config?: {
     apiKey: any;
     apiSecret: any;
+    scanTimes: any;
 }): (bot: any) => void;
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/index.js

@@ -35,7 +35,7 @@ if (process.env['AIBOTK_SECRET']) {
     console.log('使用环境变量中的 aibotkSecret');
     envSecret = process.env['AIBOTK_SECRET'];
 }
-function WechatyWebPanelPlugin(config = { apiKey, apiSecret }) {
+function WechatyWebPanelPlugin(config = { apiKey, apiSecret, scanTimes }) {
     const initConfig = {
         apiKey: envKey || config.apiKey,
         apiSecret: envSecret || config.apiSecret,
@@ -43,6 +43,7 @@ function WechatyWebPanelPlugin(config = { apiKey, apiSecret }) {
         ignoreMessages: config.ignoreMessages || [],
         // 需要忽略的事件 ['scan', 'login', 'logout', 'friendship', 'room-join', 'room-topic', 'room-leave', 'message', 'ready', 'heartbeat', 'error']
         ignoreEvents: config.ignoreEvents || [],
+        scanTimes: config.scanTimes || 50
     };
     (0, aiDb_js_1.addAibotConfig)(initConfig);
     return function (bot) {

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

@@ -42,7 +42,6 @@ export namespace packageJson {
         "npm-run-all": string;
         prettier: string;
         wechaty: string;
-        "wechaty-puppet-padlocal": string;
     };
     const readme: string;
     namespace engines {
@@ -50,14 +49,13 @@ export namespace packageJson {
         const npm: string;
     }
     const dependencies: {
-        keyv: string;
-        uuid: string;
-        "eventsource-parser": string;
         "@dqbd/tiktoken": string;
         axios: string;
         dayjs: string;
+        "eventsource-parser": string;
         "https-proxy-agent": string;
         jsonwebtoken: string;
+        keyv: string;
         mqtt: string;
         mustache: string;
         nedb: string;
@@ -65,6 +63,7 @@ export namespace packageJson {
         "node-schedule": string;
         "qrcode-terminal": string;
         superagent: string;
+        uuid: 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.5.7",
+    "version": "1.5.8",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -59,8 +59,7 @@ exports.packageJson = {
         "eslint-plugin-prettier": "^3.1.4",
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.5",
-        "wechaty": "^1.20.2",
-        "wechaty-puppet-padlocal": "^1.20.1"
+        "wechaty": "^1.20.2"
     },
     "readme": "README.md",
     "engines": {
@@ -68,21 +67,21 @@ exports.packageJson = {
         "npm": ">=8"
     },
     "dependencies": {
-        "keyv": "^4.5.2",
-        "uuid": "^9.0.0",
-        "eventsource-parser": "^1.0.0",
         "@dqbd/tiktoken": "^1.0.2",
         "axios": "^0.27.2",
         "dayjs": "^1.11.7",
+        "eventsource-parser": "^1.0.0",
         "https-proxy-agent": "^5.0.1",
         "jsonwebtoken": "^8.5.1",
+        "keyv": "^4.5.2",
         "mqtt": "^4.2.6",
         "mustache": "^4.2.0",
         "nedb": "^1.8.0",
         "node-fetch": "^2.6.9",
         "node-schedule": "^1.3.2",
         "qrcode-terminal": "^0.12.0",
-        "superagent": "^5.2.2"
+        "superagent": "^5.2.2",
+        "uuid": "^9.0.0"
     },
     "publishConfig": {
         "registry": " https://registry.npmjs.org/",

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

@@ -17,7 +17,6 @@ declare namespace _default {
     export { updateSchedule };
     export { setQrCode };
     export { sendHeartBeat };
-    export { sendError };
     export { sendRobotInfo };
     export { putqn };
     export { sendFriend };
@@ -63,12 +62,6 @@ export function setQrCode(url: any, status: any): Promise<void>;
  * @returns {Promise<void>}
  */
 export function sendHeartBeat(heart: any): Promise<void>;
-/**
- * 推送错误
- * @param error
- * @returns {Promise<void>}
- */
-export function sendError(error: any): Promise<void>;
 /**
  * 更新头像
  * @returns {Promise<void>}

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.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;
+exports.getFireNews = exports.getMaterial = exports.getOne = exports.getMeiNv = exports.getMqttConfig = exports.updatePanelVersion = exports.asyncData = exports.sendRoom = exports.sendFriend = exports.putqn = exports.sendRobotInfo = 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");
@@ -267,26 +267,6 @@ async function sendHeartBeat(heart) {
     }
 }
 exports.sendHeartBeat = sendHeartBeat;
-/**
- * 推送错误
- * @param error
- * @returns {Promise<void>}
- */
-async function sendError(error) {
-    try {
-        let option = {
-            method: 'GET',
-            url: '/wechat/qrerror',
-            params: { qrError: error },
-        };
-        let content = await (0, superagent_js_1.aiBotReq)(option);
-        console.log('推送错误成功', error);
-    }
-    catch (e) {
-        console.log('推送错误失败', e);
-    }
-}
-exports.sendError = sendError;
 /**
  * 更新头像
  * @returns {Promise<void>}
@@ -486,7 +466,6 @@ exports.default = {
     updateSchedule,
     setQrCode,
     sendHeartBeat,
-    sendError,
     sendRobotInfo,
     putqn,
     sendFriend,

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

@@ -1,15 +1,5 @@
-import { sendError } from '../proxy/aibotk.js';
 async function onError(error) {
-    try {
-        console.log('错误', error);
-        await sendError(error.message
-            .replace(/\ +/g, '')
-            .replace(/[\r\n]/g, '')
-            .replace('Error:type(){returnthis._type;}', ''));
-    }
-    catch (e) {
-        console.log('上报错误失败', e);
-    }
+    console.log('发生了一些错误，如果机器人正常运行，可以无需关心：', error);
 }
 export default onError;
 //# sourceMappingURL=on-error.js.map

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

@@ -1,5 +1,4 @@
-import { MD5 } from '../lib/index.js';
-import { getConfig, sendRobotInfo, sendError, putqn, setQrCode, updatePanelVersion } from '../proxy/aibotk.js';
+import { getConfig, sendRobotInfo, putqn, setQrCode, updatePanelVersion } from '../proxy/aibotk.js';
 import { addUser } from '../db/userDb.js';
 import { initMqtt } from '../proxy/mqtt.js';
 import { allConfig } from '../db/configDb.js';
@@ -12,7 +11,6 @@ async function onLogin(user) {
         console.log(`贴心助理${user}登录了`);
         await updatePanelVersion();
         await setQrCode('', 4);
-        await sendError('');
         await getConfig(); // 获取配置文件
         const config = await allConfig();
         const { userId } = config && config.userInfo;

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

@@ -1,13 +1,23 @@
 import Qrterminal from 'qrcode-terminal';
 import { throttle } from '../lib/index.js';
 import { setQrCode } from '../proxy/aibotk.js';
+import { getAibotConfig } from "../db/aiDb.js";
+// 限制推送二维码的次数，防止掉线后，无限推送二维码到服务器
+let scanTime = 0;
 /**
  * 扫描登录，显示二维码
  */
 async function onScan(qrcode, status) {
+    const aibotConfig = await getAibotConfig();
     Qrterminal.generate(qrcode);
     console.log('扫描状态', status);
-    throttle(setQrCode(qrcode, status), 30000);
+    if (scanTime >= aibotConfig.scanTimes) {
+        console.log('长时间推送登录状态，平台二维码不再更新，请重启服务，或直接在终端扫码登录');
+    }
+    else {
+        scanTime++;
+        throttle(setQrCode(qrcode, status), 30000);
+    }
     const qrImgUrl = ['https://api.qrserver.com/v1/create-qr-code/?data=', encodeURIComponent(qrcode)].join('');
     console.log(qrImgUrl);
 }

package/dist/esm/src/index.d.ts

@@ -1,5 +1,6 @@
 export function WechatyWebPanelPlugin(config?: {
     apiKey: any;
     apiSecret: any;
+    scanTimes: any;
 }): (bot: any) => void;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/src/index.js

@@ -29,7 +29,7 @@ if (process.env['AIBOTK_SECRET']) {
     console.log('使用环境变量中的 aibotkSecret');
     envSecret = process.env['AIBOTK_SECRET'];
 }
-function WechatyWebPanelPlugin(config = { apiKey, apiSecret }) {
+function WechatyWebPanelPlugin(config = { apiKey, apiSecret, scanTimes }) {
     const initConfig = {
         apiKey: envKey || config.apiKey,
         apiSecret: envSecret || config.apiSecret,
@@ -37,6 +37,7 @@ function WechatyWebPanelPlugin(config = { apiKey, apiSecret }) {
         ignoreMessages: config.ignoreMessages || [],
         // 需要忽略的事件 ['scan', 'login', 'logout', 'friendship', 'room-join', 'room-topic', 'room-leave', 'message', 'ready', 'heartbeat', 'error']
         ignoreEvents: config.ignoreEvents || [],
+        scanTimes: config.scanTimes || 50
     };
     addAibotConfig(initConfig);
     return function (bot) {

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

@@ -42,7 +42,6 @@ export namespace packageJson {
         "npm-run-all": string;
         prettier: string;
         wechaty: string;
-        "wechaty-puppet-padlocal": string;
     };
     const readme: string;
     namespace engines {
@@ -50,14 +49,13 @@ export namespace packageJson {
         const npm: string;
     }
     const dependencies: {
-        keyv: string;
-        uuid: string;
-        "eventsource-parser": string;
         "@dqbd/tiktoken": string;
         axios: string;
         dayjs: string;
+        "eventsource-parser": string;
         "https-proxy-agent": string;
         jsonwebtoken: string;
+        keyv: string;
         mqtt: string;
         mustache: string;
         nedb: string;
@@ -65,6 +63,7 @@ export namespace packageJson {
         "node-schedule": string;
         "qrcode-terminal": string;
         superagent: string;
+        uuid: 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.5.7",
+    "version": "1.5.8",
     "description": "智能微秘书插件",
     "exports": {
         ".": {
@@ -56,8 +56,7 @@ export const packageJson = {
         "eslint-plugin-prettier": "^3.1.4",
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.5",
-        "wechaty": "^1.20.2",
-        "wechaty-puppet-padlocal": "^1.20.1"
+        "wechaty": "^1.20.2"
     },
     "readme": "README.md",
     "engines": {
@@ -65,21 +64,21 @@ export const packageJson = {
         "npm": ">=8"
     },
     "dependencies": {
-        "keyv": "^4.5.2",
-        "uuid": "^9.0.0",
-        "eventsource-parser": "^1.0.0",
         "@dqbd/tiktoken": "^1.0.2",
         "axios": "^0.27.2",
         "dayjs": "^1.11.7",
+        "eventsource-parser": "^1.0.0",
         "https-proxy-agent": "^5.0.1",
         "jsonwebtoken": "^8.5.1",
+        "keyv": "^4.5.2",
         "mqtt": "^4.2.6",
         "mustache": "^4.2.0",
         "nedb": "^1.8.0",
         "node-fetch": "^2.6.9",
         "node-schedule": "^1.3.2",
         "qrcode-terminal": "^0.12.0",
-        "superagent": "^5.2.2"
+        "superagent": "^5.2.2",
+        "uuid": "^9.0.0"
     },
     "publishConfig": {
         "registry": " https://registry.npmjs.org/",

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

@@ -17,7 +17,6 @@ declare namespace _default {
     export { updateSchedule };
     export { setQrCode };
     export { sendHeartBeat };
-    export { sendError };
     export { sendRobotInfo };
     export { putqn };
     export { sendFriend };
@@ -63,12 +62,6 @@ export function setQrCode(url: any, status: any): Promise<void>;
  * @returns {Promise<void>}
  */
 export function sendHeartBeat(heart: any): Promise<void>;
-/**
- * 推送错误
- * @param error
- * @returns {Promise<void>}
- */
-export function sendError(error: any): Promise<void>;
 /**
  * 更新头像
  * @returns {Promise<void>}

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

@@ -252,25 +252,6 @@ async function sendHeartBeat(heart) {
         console.log('推送心跳失败', error);
     }
 }
-/**
- * 推送错误
- * @param error
- * @returns {Promise<void>}
- */
-async function sendError(error) {
-    try {
-        let option = {
-            method: 'GET',
-            url: '/wechat/qrerror',
-            params: { qrError: error },
-        };
-        let content = await aiBotReq(option);
-        console.log('推送错误成功', error);
-    }
-    catch (e) {
-        console.log('推送错误失败', e);
-    }
-}
 /**
  * 更新头像
  * @returns {Promise<void>}
@@ -461,7 +442,6 @@ export { setSchedule };
 export { updateSchedule };
 export { setQrCode };
 export { sendHeartBeat };
-export { sendError };
 export { sendRobotInfo };
 export { putqn };
 export { sendFriend };
@@ -480,7 +460,6 @@ export default {
     updateSchedule,
     setQrCode,
     sendHeartBeat,
-    sendError,
     sendRobotInfo,
     putqn,
     sendFriend,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "description": "智能微秘书插件",
   "exports": {
     ".": {
@@ -53,8 +53,7 @@
     "eslint-plugin-prettier": "^3.1.4",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
-    "wechaty": "^1.20.2",
-    "wechaty-puppet-padlocal": "^1.20.1"
+    "wechaty": "^1.20.2"
   },
   "readme": "README.md",
   "engines": {
@@ -62,21 +61,21 @@
     "npm": ">=8"
   },
   "dependencies": {
-    "keyv": "^4.5.2",
-    "uuid": "^9.0.0",
-    "eventsource-parser": "^1.0.0",
     "@dqbd/tiktoken": "^1.0.2",
     "axios": "^0.27.2",
     "dayjs": "^1.11.7",
+    "eventsource-parser": "^1.0.0",
     "https-proxy-agent": "^5.0.1",
     "jsonwebtoken": "^8.5.1",
+    "keyv": "^4.5.2",
     "mqtt": "^4.2.6",
     "mustache": "^4.2.0",
     "nedb": "^1.8.0",
     "node-fetch": "^2.6.9",
     "node-schedule": "^1.3.2",
     "qrcode-terminal": "^0.12.0",
-    "superagent": "^5.2.2"
+    "superagent": "^5.2.2",
+    "uuid": "^9.0.0"
   },
   "publishConfig": {
     "registry": " https://registry.npmjs.org/",