karin-plugin-teamspeak 1.5.6 → 1.5.8

package/README.md

@@ -36,20 +36,19 @@ karin 下的 [teamspeak](https://www.teamspeak.com/zh-CN/) 插件，使用 ts
    ```
 3. 可以通过调用接口 `/api/teamspeak/getAllUserList` 来获取当前服务器内所有频道内人数和进入时长包括没人在的频道，返回的数据格式为：
 
-```json
+```
 {
-  "name": "配置内的服务器名或host",
-  "res": "
-   {
+  name: "配置内的服务器名或host",
+  res: {
    频道1:[{
-      nickName:'xxx', //昵称
-      lastconnected: 'YYYY-MM-DD HH:mm:ss', //上次连接进来的时间
-      connectTime:'', //已经连接的时间 - 单位分:秒
+      nickName:"xxx", //昵称
+      lastconnected: "YYYY-MM-DD HH:mm:ss", //上次连接进来的时间
+      connectTime:"", //已经连接的时间 - 单位分:秒
    },{},...],
    频道2:[{}],
    频道3:[{}],
    ...
-   }",
-  "count": "频道内总人数"
+   },
+  count: "频道内总人数"
 }
 ```

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,10 +15,9 @@ 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.teamspeak.quit();
-            this.teamspeak = undefined;
+            await this.quitTs();
         }
         const _teamspeak = new TeamSpeak({
             host: TS.HOST,
@@ -30,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);
@@ -55,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 + "");
@@ -124,7 +122,9 @@ class ts3 {
     //关闭连接
     quitTs = async () => {
         if (this.teamspeak) {
+            this.teamspeak.removeAllListeners();
             this.teamspeak.quit();
+            this.teamspeak = undefined;
         }
     };
     //重新连接
@@ -132,6 +132,9 @@ class ts3 {
         if (this.teamspeak) {
             this.teamspeak.reconnect(config().RECONNECT_TIMER, 1000);
         }
+        else {
+            this.init();
+        }
     };
     //重连逻辑
     async handelReconnect() {
@@ -139,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/package.json

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