karin-plugin-teamspeak 1.5.7 → 1.5.9

package/lib/apps/command.js

@@ -1,6 +1,7 @@
 import { dirPath } from "../utils/index.js";
 import { karin, render, common, segment, logger } from "node-karin";
 import teamspeak3 from "./ts3.js";
+const loggerPluginName = logger.chalk.hex("#90CAF9")(" ===== ts3 ===== ");
 /**
  * 渲染ts3服务器内存在用户的列表
  * 触发指令: 人数
@@ -50,7 +51,7 @@ export const image = karin.command(/^#?人数$/, async (e) => {
         }
     }
     catch (error) {
-        logger.error(error);
+        logger.error(loggerPluginName, error);
         await e.reply(JSON.stringify(error));
         return true;
     }

package/lib/apps/ts3.js

@@ -3,8 +3,8 @@ import { config } from "../utils/index.js";
 import karin, { logger, segment, app } from "node-karin";
 import moment from "node-karin/moment";
 import express from "node-karin/express";
-const loggerHex = logger.chalk.hex("#90CAF9");
-logger.info(loggerHex(" ===== ts3 ===== ") + "初始化ts3插件");
+const loggerPluginName = logger.chalk.hex("#90CAF9")(" ===== ts3 ===== ");
+logger.info(loggerPluginName + "初始化ts3插件");
 let disNotifyNameList = [];
 class ts3 {
     teamspeak;
@@ -15,7 +15,7 @@ class ts3 {
         const TS = config();
         this.isReConnecting = false;
         disNotifyNameList = [TS.NICKNAME, ...TS.DIS_NOTIFY_NAME_LIST];
-        logger.info(loggerHex(" ===== ts3 ===== ") + "开始连接ts3服务器...");
+        logger.info(loggerPluginName + "开始连接ts3服务器...");
         if (this.teamspeak) {
             await this.quitTs();
         }
@@ -29,22 +29,21 @@ class ts3 {
             nickname: TS.NICKNAME,
         });
         _teamspeak.on("ready", async () => {
-            logger.info(loggerHex(" ===== ts3 ===== ") + "ts3连接成功");
+            logger.info(loggerPluginName + "ts3连接成功");
             this.teamspeak = _teamspeak;
         });
         _teamspeak.on("close", (e) => {
-            logger.error(loggerHex(" ===== ts3 ===== ") + "ts3连接断开", e);
+            logger.error(loggerPluginName + "ts3连接断开", e);
             this.handelReconnect();
         });
         _teamspeak.on("error", (err) => {
-            logger.error(loggerHex(" ===== ts3 ===== ") + "ts3连接出错", err);
+            logger.error(loggerPluginName + "ts3连接出错", err);
             this.handelReconnect();
         });
         _teamspeak.on("clientconnect", (e) => {
             if (!disNotifyNameList.includes(e.client.nickname)) {
-                logger.info(loggerHex(" ===== ts3 ===== ") + e.client.nickname + "进入ts");
+                logger.info(loggerPluginName + e.client.nickname + "进入ts");
                 const msg = segment.text(e.client.nickname + "进入ts");
-                const qq = TS.BOT_SELF_ID;
                 TS.NOTICE_GROUP_NO.forEach((groupNo) => {
                     const contact = karin.contact("group", groupNo + "");
                     karin.sendMsg(karin.getBotAll()[1].account.selfId, contact, msg);
@@ -54,7 +53,7 @@ class ts3 {
         _teamspeak.on("clientdisconnect", (e) => {
             if (e.client) {
                 if (!disNotifyNameList.includes(e.client.nickname)) {
-                    logger.info(loggerHex(" ===== ts3 ===== ") + e.client.nickname + "离开ts");
+                    logger.info(loggerPluginName + e.client.nickname + "离开ts");
                     const msg = segment.text(e.client.nickname + "离开ts");
                     TS.NOTICE_GROUP_NO.forEach((groupNo) => {
                         const contact = karin.contact("group", groupNo + "");
@@ -143,13 +142,13 @@ class ts3 {
         if (!this.teamspeak || this.isReConnecting)
             return;
         this.isReConnecting = true;
-        logger.info(loggerHex(" ===== ts3 ===== ") + "重连中...");
+        logger.info(loggerPluginName + "重连中...");
         try {
             await this.teamspeak.reconnect(TS.RECONNECT_TIMER, 1000);
-            logger.info(loggerHex(" ===== ts3 ===== ") + "重连成功");
+            logger.info(loggerPluginName + "重连成功");
         }
         catch (e) {
-            logger.error(loggerHex(" ===== ts3 ===== ") + "连接TS3失败", e);
+            logger.error(loggerPluginName + "连接TS3失败", e);
         }
         finally {
             this.isReConnecting = false;

package/lib/utils/config.js

@@ -27,8 +27,8 @@ export const pkg = () => requireFileSync(`${dirPath}/package.json`);
 setTimeout(() => {
     const list = filesByExt(dirConfig, ".json", "abs");
     list.forEach((file) => watch(file, (old, now) => {
-        logger.info("旧数据:", old);
-        logger.info("新数据:", now);
+        logger.info("旧数据:\n", old);
+        logger.info("新数据:\n", now);
         teamspeak3.init();
     }));
 }, 2000);

package/lib/web.config.js

@@ -1,6 +1,5 @@
 import { components, logger, writeJsonSync } from "node-karin";
 import { config, dirConfig } from "./utils/index.js";
-const defConfig = config();
 export default {
     info: {
     // 插件信息配置
@@ -9,7 +8,7 @@ export default {
     components: () => [
         components.input.string("HOST", {
             label: "teamspeak 服务器地址或域名(不带端口)",
-            defaultValue: defConfig.HOST,
+            defaultValue: config().HOST,
             variant: "underlined",
             placeholder: "请输入服务器地址或域名",
             rules: [
@@ -22,12 +21,12 @@ export default {
         components.input.string("SERVER_NAME", {
             label: "展示的服务器名(不填写则显示服务器地址)",
             placeholder: "请输入展示的服务器名",
-            defaultValue: defConfig.SERVER_NAME,
+            defaultValue: config().SERVER_NAME,
             variant: "underlined",
             isRequired: false,
         }),
         components.radio.group("PROTOCOL", {
-            defaultValue: defConfig.PROTOCOL,
+            defaultValue: config().PROTOCOL,
             label: "teamspeak 服务器查询 (一般使用默认的RAW即可)",
             size: "sm",
             orientation: "horizontal",
@@ -51,32 +50,32 @@ export default {
             type: "number",
             placeholder: "请输入服务器查询端口",
             variant: "underlined",
-            defaultValue: defConfig.QUERY_PORT + "",
+            defaultValue: config().QUERY_PORT + "",
             rules: [{ min: 1, max: 65535 }],
         }),
         components.input.number("SERVER_PORT", {
             label: "teamspeak 服务器语音端口 (一般使用默认 9987 即可)",
-            defaultValue: defConfig.SERVER_PORT + "",
+            defaultValue: config().SERVER_PORT + "",
             placeholder: "请输入服务器语音端口",
             variant: "underlined",
             rules: [{ min: 1, max: 65535 }],
         }),
         components.input.number("RECONNECT_TIMER", {
             label: "teamspeak 连接断开后重连次数 (-1表示将不断尝试)",
-            defaultValue: defConfig.RECONNECT_TIMER + "",
+            defaultValue: config().RECONNECT_TIMER + "",
             placeholder: "请输入重连次数",
             variant: "underlined",
             rules: [{ min: -1 }],
         }),
         components.input.string("USERNAME", {
             label: "teamspeak 管理员用户名 (建服时出现的,没修改时默认是 serveradmin )",
-            defaultValue: defConfig.USERNAME,
+            defaultValue: config().USERNAME,
             placeholder: "请输入管理员用户名",
             variant: "underlined",
         }),
         components.input.string("PASSWORD", {
             label: "teamspeak 管理员密码 (建服时出现的,每个服务器都不一样)",
-            defaultValue: defConfig.PASSWORD,
+            defaultValue: config().PASSWORD,
             type: "password",
             placeholder: "请输入管理员密码",
             variant: "underlined",
@@ -84,7 +83,7 @@ export default {
         components.input.string("NICKNAME", {
             label: "插件连接进服务器时使用的昵称 (默认为TSBOT,···客户端看不到该用户···) ",
             placeholder: "请输入连接昵称",
-            defaultValue: defConfig.NICKNAME,
+            defaultValue: config().NICKNAME,
             variant: "underlined",
         }),
         components.input.group("NOTICE_GROUP_NO", {
@@ -96,7 +95,7 @@ export default {
                 variant: "faded",
                 placeholder: "请输入群号",
             },
-            data: [...defConfig.NOTICE_GROUP_NO.map((i) => i + "")],
+            data: [...config().NOTICE_GROUP_NO.map((i) => i + "")],
         }),
         components.input.group("DIS_NOTIFY_NAME_LIST", {
             label: "不提醒的昵称列表 可多个 (不会提醒当前机器人，无需添加当前机器人昵称)",
@@ -107,14 +106,13 @@ export default {
                 variant: "faded",
                 placeholder: "请输入昵称",
             },
-            data: [...defConfig.DIS_NOTIFY_NAME_LIST],
+            data: [...config().DIS_NOTIFY_NAME_LIST],
         }),
     ],
     /** 前端点击保存之后调用的方法 */
     save: (config) => {
         logger.info("保存的配置:", config);
         writeJsonSync(`${dirConfig}/config.json`, config);
-        // 在这里处理保存逻辑
         return {
             success: true,
             message: "保存成功",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-teamspeak",
-  "version": "1.5.7",
+  "version": "1.5.9",
   "description": "karin 的 teamspeak 插件",
   "homepage": "https://github.com/jacksixth/karin-plugin-teamspeak3",
   "bugs": {