karin-plugin-teamspeak 1.5.4 → 1.5.6

package/README.md

@@ -13,3 +13,43 @@ karin 下的 [teamspeak](https://www.teamspeak.com/zh-CN/) 插件，使用 ts
 2. 运行 `npx karin .`
 3. 在 karin web 界面的插件页签中配置该插件
 4. 保存配置后查看命令行是否成功连接服务器
+
+# 功能
+
+1. 监听 ts 服务器用户进入离开事件，在配置的群聊里发送用户进出提示 如:`xxx进入ts`、`xxx离开ts`
+2. 在群聊或私聊发送`人数`时，发送当前服务器内有人在的频道的人数和进入时长 如：
+   ```
+   ====服务器名====
+   仅展示有人的频道
+   当前频道内共有4人
+   ======
+    聊天听歌等待区
+   - BOT (29005287:9)
+   - xxx (0:4)
+   ======
+    fps2
+   - xxx (0:31)
+   ======
+    fps3
+   - xxx (96:31)
+   ======
+   ```
+3. 可以通过调用接口 `/api/teamspeak/getAllUserList` 来获取当前服务器内所有频道内人数和进入时长包括没人在的频道，返回的数据格式为：
+
+```json
+{
+  "name": "配置内的服务器名或host",
+  "res": "
+   {
+   频道1:[{
+      nickName:'xxx', //昵称
+      lastconnected: 'YYYY-MM-DD HH:mm:ss', //上次连接进来的时间
+      connectTime:'', //已经连接的时间 - 单位分:秒
+   },{},...],
+   频道2:[{}],
+   频道3:[{}],
+   ...
+   }",
+  "count": "频道内总人数"
+}
+```

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

@@ -1,5 +1,5 @@
 import { QueryProtocol, TeamSpeak } from "ts3-nodejs-library";
-import { config, dirPath } from "../utils/index.js";
+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";
@@ -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,
         };
@@ -203,10 +200,4 @@ router.get("/getAllUserList", async (req, res) => {
 });
 //将路由挂载到express实例中
 app.use("/api/teamspeak", router);
-//将静态资源挂载到express实例中 - 供外部单页应用网页部署时使用
-app.use("/teamspeak", express.static(dirPath + "/resources/static"));
-//供外部单页应用网页部署时使用 可用 ip:port/ts3 访问部署的网页
-app.get("/teamspeak", (req, res) => {
-    res.sendFile(dirPath + "/resources/static/index.html");
-});
 export default teamspeak3;

package/package.json

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