wechaty-web-panel 1.1.9 → 1.1.11

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

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const aibotk_js_1 = require("../proxy/aibotk.js");
+const mqtt_js_1 = require("../proxy/mqtt.js");
 /**
  * 登出事件
  */
 async function onLogout(user) {
     await (0, aibotk_js_1.setQrCode)('qrcode', '6');
     console.log(`用户${user}已登出`);
+    (0, mqtt_js_1.closeMqtt)();
 }
 exports.default = onLogout;
 //# sourceMappingURL=on-logout.js.map

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.1.9",
+    "version": "1.1.11",
     "description": "",
     "exports": {
         ".": {

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

@@ -1,3 +1,4 @@
+export function closeMqtt(): void;
 declare namespace _default {
     export { initMqtt };
 }

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

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initMqtt = void 0;
+exports.initMqtt = exports.closeMqtt = void 0;
 const mqtt = __importStar(require("mqtt"));
 const configDb_js_1 = require("../db/configDb.js");
 const index_js_1 = require("../common/index.js");
@@ -31,6 +31,7 @@ const aibotk_js_1 = require("./aibotk.js");
 const event_dispatch_service_js_1 = require("../service/event-dispatch-service.js");
 const index_js_2 = require("../task/index.js");
 const index_js_3 = require("../lib/index.js");
+let mqttclient = null;
 async function initMqtt(that) {
     try {
         await (0, aibotk_js_1.getConfig)(); // 获取配置文件
@@ -39,13 +40,15 @@ async function initMqtt(that) {
         if (role === 'vip') {
             const config = await (0, aibotk_js_1.getMqttConfig)();
             const { host, port, username, password, clientId } = config;
-            let mqttclient = host
-                ? mqtt.connect(`${host}:${port}`, {
-                    username: username,
-                    password: password,
-                    clientId: clientId + (0, index_js_3.randomRange)(1, 10000),
-                })
-                : null;
+            if (!mqttclient) {
+                mqttclient = host
+                    ? mqtt.connect(`${host}:${port}`, {
+                        username: username,
+                        password: password,
+                        clientId: clientId + (0, index_js_3.randomRange)(1, 10000),
+                    })
+                    : null;
+            }
             if (mqttclient) {
                 mqttclient.on('connect', function () {
                     console.debug('connect to Wechaty mqtt----------');
@@ -118,6 +121,13 @@ async function initMqtt(that) {
     }
 }
 exports.initMqtt = initMqtt;
+function closeMqtt() {
+    if (mqttclient && mqttclient.connected) {
+        mqttclient.end();
+        mqttclient = null;
+    }
+}
+exports.closeMqtt = closeMqtt;
 exports.default = {
     initMqtt,
 };

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

@@ -1,27 +1,4 @@
 "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 };
 };
@@ -29,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTencentOpenReply = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const configDb_js_1 = require("../db/configDb.js");
-const axios = __importStar(require("axios"));
+const axios_1 = __importDefault(require("axios"));
 async function getSignature(id, encodingAESKey) {
     const token = jsonwebtoken_1.default.sign({
         userid: id,
@@ -188,7 +165,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
             signature,
             query: msg,
         };
-        const res = await axios.post(`https://openai.weixin.qq.com/openapi/aibot/${config.tencentToken}`, data, {});
+        const res = await axios_1.default.post(`https://openai.weixin.qq.com/openapi/aibot/${config.tencentToken}`, data, {});
         const resData = res.data;
         if (!resData.errcode) {
             let answer = resData.answer; // 存放回答

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

@@ -175,6 +175,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
             case 'updateConfig':
                 await (0, aibotk_js_1.getConfig)();
                 await (0, index_js_2.initTaskLocalSchedule)(that);
+                await (0, index_js_2.initTimeSchedule)(that);
                 content = '更新配置成功，请稍等一分钟后生效';
                 break;
             default:

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

@@ -1,10 +1,12 @@
 import { setQrCode } from '../proxy/aibotk.js';
+import { closeMqtt } from '../proxy/mqtt.js';
 /**
  * 登出事件
  */
 async function onLogout(user) {
     await setQrCode('qrcode', '6');
     console.log(`用户${user}已登出`);
+    closeMqtt();
 }
 export default onLogout;
 //# sourceMappingURL=on-logout.js.map

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.1.9",
+    "version": "1.1.11",
     "description": "",
     "exports": {
         ".": {

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

@@ -1,3 +1,4 @@
+export function closeMqtt(): void;
 declare namespace _default {
     export { initMqtt };
 }

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

@@ -5,6 +5,7 @@ import { getConfig, getMqttConfig } from './aibotk.js';
 import { dispatchEventContent } from '../service/event-dispatch-service.js';
 import { sendRoomTaskMessage, sendContactTaskMessage } from '../task/index.js';
 import { randomRange } from '../lib/index.js';
+let mqttclient = null;
 async function initMqtt(that) {
     try {
         await getConfig(); // 获取配置文件
@@ -13,13 +14,15 @@ async function initMqtt(that) {
         if (role === 'vip') {
             const config = await getMqttConfig();
             const { host, port, username, password, clientId } = config;
-            let mqttclient = host
-                ? mqtt.connect(`${host}:${port}`, {
-                    username: username,
-                    password: password,
-                    clientId: clientId + randomRange(1, 10000),
-                })
-                : null;
+            if (!mqttclient) {
+                mqttclient = host
+                    ? mqtt.connect(`${host}:${port}`, {
+                        username: username,
+                        password: password,
+                        clientId: clientId + randomRange(1, 10000),
+                    })
+                    : null;
+            }
             if (mqttclient) {
                 mqttclient.on('connect', function () {
                     console.debug('connect to Wechaty mqtt----------');
@@ -91,6 +94,12 @@ async function initMqtt(that) {
         console.log('mqtt 创建链接失败', e);
     }
 }
+export function closeMqtt() {
+    if (mqttclient && mqttclient.connected) {
+        mqttclient.end();
+        mqttclient = null;
+    }
+}
 export { initMqtt };
 export default {
     initMqtt,

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

@@ -1,6 +1,6 @@
 import jwt from 'jsonwebtoken';
 import { allConfig } from '../db/configDb.js';
-import * as axios from 'axios';
+import axios from 'axios';
 async function getSignature(id, encodingAESKey) {
     const token = jwt.sign({
         userid: id,

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

@@ -2,7 +2,7 @@ import api from '../proxy/api.js';
 import { getConfig, getRoomPhotoConfig, getMeiNv, getWordCloudConfig, getWordCloud } from '../proxy/aibotk.js';
 import { getConstellation, msgArr, getRoomAvatar, getNewsType } from '../lib/index.js';
 import { generateAvatar, generateRoomImg } from '../puppeteer-paint/lanuch.js';
-import { initTaskLocalSchedule } from '../task/index.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';
@@ -169,6 +169,7 @@ async function dispatchEventContent(that, eName, msg, name, id, avatar, room) {
             case 'updateConfig':
                 await getConfig();
                 await initTaskLocalSchedule(that);
+                await initTimeSchedule(that);
                 content = '更新配置成功，请稍等一分钟后生效';
                 break;
             default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "",
   "exports": {
     ".": {