karin-plugin-teamspeak 1.5.4 → 1.5.5

package/lib/apps/ts3.d.ts

@@ -3,7 +3,6 @@ declare class ts3 {
     teamspeak: undefined | TeamSpeak;
     connectTimer: number;
     private isReConnecting;
-    private reconnectAttempts;
     init: () => Promise<void>;
     getAllChannelList: () => Promise<string | undefined>;
     quitTs: () => Promise<void>;
@@ -12,6 +11,7 @@ declare class ts3 {
 }
 declare const teamspeak3: ts3;
 export declare const getAllUserList: () => Promise<{
+    name: string;
     res: {
         [name: string]: {
             nickName: string;

package/lib/apps/ts3.js

@@ -10,11 +10,9 @@ class ts3 {
     teamspeak;
     connectTimer = 0;
     isReConnecting = false;
-    reconnectAttempts = 0;
     //初始化 如果已经有连接了就关闭连接重新连接
     init = async () => {
         const TS = config();
-        this.reconnectAttempts = 0;
         this.isReConnecting = false;
         disNotifyNameList = [TS.NICKNAME, ...TS.DIS_NOTIFY_NAME_LIST];
         logger.info(loggerHex(" ===== ts3 ===== ") + "开始连接ts3服务器...");
@@ -141,14 +139,10 @@ class ts3 {
         if (!this.teamspeak || this.isReConnecting)
             return;
         this.isReConnecting = true;
-        logger.info(loggerHex(" ===== ts3 ===== ") +
-            "重连中... 尝试次数: " +
-            this.reconnectAttempts +
-            "次");
+        logger.info(loggerHex(" ===== ts3 ===== ") + "重连中...");
         try {
             await this.teamspeak.reconnect(TS.RECONNECT_TIMER, 1000);
             logger.info(loggerHex(" ===== ts3 ===== ") + "重连成功");
-            this.reconnectAttempts = 0; // 重连成功后重置重连次数
         }
         catch (e) {
             logger.error(loggerHex(" ===== ts3 ===== ") + "连接TS3失败", e);
@@ -168,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(); //在当前频道的人
@@ -188,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.4",
+  "version": "1.5.5",
   "description": "karin 的 teamspeak 插件",
   "homepage": "https://github.com/jacksixth/karin-plugin-teamspeak3",
   "bugs": {