karin-plugin-teamspeak 1.5.3 → 1.5.5

package/lib/apps/ts3.d.ts

@@ -2,13 +2,16 @@ import { TeamSpeak } from "ts3-nodejs-library";
 declare class ts3 {
     teamspeak: undefined | TeamSpeak;
     connectTimer: number;
+    private isReConnecting;
     init: () => Promise<void>;
     getAllChannelList: () => Promise<string | undefined>;
     quitTs: () => Promise<void>;
     reconnectTs: () => Promise<void>;
+    private handelReconnect;
 }
 declare const teamspeak3: ts3;
 export declare const getAllUserList: () => Promise<{
+    name: string;
     res: {
         [name: string]: {
             nickName: string;

package/lib/apps/ts3.js

@@ -9,10 +9,11 @@ let disNotifyNameList = [];
 class ts3 {
     teamspeak;
     connectTimer = 0;
+    isReConnecting = false;
     //初始化 如果已经有连接了就关闭连接重新连接
     init = async () => {
         const TS = config();
-        //fix ReferenceError: Cannot access 'config' before initialization
+        this.isReConnecting = false;
         disNotifyNameList = [TS.NICKNAME, ...TS.DIS_NOTIFY_NAME_LIST];
         logger.info(loggerHex(" ===== ts3 ===== ") + "开始连接ts3服务器...");
         if (this.teamspeak) {
@@ -34,31 +35,11 @@ class ts3 {
         });
         _teamspeak.on("close", (e) => {
             logger.error(loggerHex(" ===== ts3 ===== ") + "ts3连接断开", e);
-            if (this.teamspeak) {
-                logger.info(loggerHex(" ===== ts3 ===== ") + "重连中...");
-                this.teamspeak
-                    .reconnect(TS.RECONNECT_TIMER, 1000)
-                    .catch((e) => {
-                    logger.error(loggerHex(" ===== ts3 ===== ") + "连接TS3失败", e);
-                })
-                    .then(() => {
-                    logger.info(loggerHex(" ===== ts3 ===== ") + "重连成功");
-                });
-            }
+            this.handelReconnect();
         });
         _teamspeak.on("error", (err) => {
             logger.error(loggerHex(" ===== ts3 ===== ") + "ts3连接出错", err);
-            if (this.teamspeak) {
-                logger.info(loggerHex(" ===== ts3 ===== ") + "重连中...");
-                this.teamspeak
-                    .reconnect(TS.RECONNECT_TIMER, 1000)
-                    .catch((e) => {
-                    logger.error(loggerHex(" ===== ts3 ===== ") + "连接TS3失败", e);
-                })
-                    .then(() => {
-                    logger.info(loggerHex(" ===== ts3 ===== ") + "重连成功");
-                });
-            }
+            this.handelReconnect();
         });
         _teamspeak.on("clientconnect", (e) => {
             if (!disNotifyNameList.includes(e.client.nickname)) {
@@ -152,6 +133,24 @@ class ts3 {
             this.teamspeak.reconnect(config().RECONNECT_TIMER, 1000);
         }
     };
+    //重连逻辑
+    async handelReconnect() {
+        const TS = config();
+        if (!this.teamspeak || this.isReConnecting)
+            return;
+        this.isReConnecting = true;
+        logger.info(loggerHex(" ===== ts3 ===== ") + "重连中...");
+        try {
+            await this.teamspeak.reconnect(TS.RECONNECT_TIMER, 1000);
+            logger.info(loggerHex(" ===== ts3 ===== ") + "重连成功");
+        }
+        catch (e) {
+            logger.error(loggerHex(" ===== ts3 ===== ") + "连接TS3失败", e);
+        }
+        finally {
+            this.isReConnecting = false;
+        }
+    }
 }
 const teamspeak3 = new ts3();
 setTimeout(() => {
@@ -163,7 +162,9 @@ export const getAllUserList = async () => {
     if (teamspeak3.teamspeak) {
         let count = 0;
         const res = {};
-        const channelList = await teamspeak3.teamspeak.channelList(); //所有频道
+        const channelList = await teamspeak3.teamspeak.channelList().catch(() => {
+            return [];
+        }); //所有频道
         for (let index = 0; index < channelList.length; index++) {
             const channel = channelList[index]; //频道
             const allClient = await channel.getClients(); //在当前频道的人
@@ -183,6 +184,7 @@ export const getAllUserList = async () => {
             });
         }
         return {
+            name: config().SERVER_NAME || config().HOST,
             res,
             count,
         };

package/package.json

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