npm - karin-plugin-teamspeak - Versions diffs - 1.10.2 → 1.11.0 - Mend

karin-plugin-teamspeak 1.10.2 → 1.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/apps/ts3.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { Query } from "teamspeak.js";
+import { TeamSpeak } from "ts3-nodejs-library";
 declare class ts3 {
-    teamspeak: undefined | Query;
+    teamspeak: undefined | TeamSpeak;
     connectTimer: number;
     private isReConnecting;
     init: () => Promise<void>;

package/lib/apps/ts3.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Query } from "teamspeak.js";
+import { QueryProtocol, TeamSpeak } from "ts3-nodejs-library";
 import { config } from "../utils/index.js";
 import karin, { logger, segment, app } from "node-karin";
 import moment from "node-karin/moment";
@@ -19,47 +19,47 @@ class ts3 {
         if (this.teamspeak) {
             await this.quitTs();
         }
-        const _teamspeak = new Query({
-            host: "jacksixth.top",
-            port: 10011,
-            protocol: TS.PROTOCOL == "SSH" ? "ssh" : "tcp",
+        const _teamspeak = new TeamSpeak({
+            host: TS.HOST,
+            protocol: QueryProtocol[TS.PROTOCOL],
+            queryport: TS.QUERY_PORT,
+            serverport: TS.SERVER_PORT,
+            username: TS.USERNAME,
+            password: TS.PASSWORD,
+            nickname: TS.NICKNAME,
         });
-        _teamspeak.on("Ready", async () => {
+        _teamspeak.on("ready", async () => {
             if (this.isReConnecting) {
-                logger.info(loggerPluginName + "ts3重连成功");
+                logger.info(loggerPluginName + "重连成功");
             }
             else {
                 logger.info(loggerPluginName + "ts3连接成功");
             }
             this.isReConnecting = false;
-            await _teamspeak.login(TS.USERNAME, TS.PASSWORD);
-            await _teamspeak.virtualServers.use(1);
-            await _teamspeak.notifications.subscribeAll();
-            await _teamspeak.client.setNickname(TS.NICKNAME);
             this.teamspeak = _teamspeak;
         });
-        _teamspeak.on("Close", () => {
-            logger.error(loggerPluginName + "ts3连接断开");
+        _teamspeak.on("close", (e) => {
+            logger.error(loggerPluginName + "ts3连接断开", e);
             this.handelReconnect();
         });
-        _teamspeak.on("Error", (err) => {
+        _teamspeak.on("error", (err) => {
             logger.error(loggerPluginName + "ts3连接出错", err);
         });
-        _teamspeak.on("ClientEnterView", (e) => {
-            if (e.nickname && !disNotifyNameList.includes(e.nickname)) {
-                logger.info(loggerPluginName + e.nickname + "进入ts");
-                const msg = segment.text(e.nickname + "进入ts");
+        _teamspeak.on("clientconnect", (e) => {
+            if (!disNotifyNameList.includes(e.client.nickname)) {
+                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 + "");
                     karin.sendMsg(karin.getBotAll()[1].account.selfId, contact, msg);
                 });
             }
         });
-        _teamspeak.on("ClientLeaveView", (e) => {
-            if (e.nickname) {
-                if (!disNotifyNameList.includes(e.nickname)) {
-                    logger.info(loggerPluginName + e.nickname + "离开ts");
-                    const msg = segment.text(e.nickname + "离开ts");
+        _teamspeak.on("clientdisconnect", (e) => {
+            if (e.client) {
+                if (!disNotifyNameList.includes(e.client.nickname)) {
+                    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 + "");
                         karin.sendMsg(karin.getBotAll()[1].account.selfId, contact, msg);
@@ -68,83 +68,95 @@ class ts3 {
             }
         });
         // 监听用户移动频道事件
-        _teamspeak.on("ClientMove", (e) => {
+        _teamspeak.on("clientmoved", (e) => {
             if (TS.ENABLE_CHANNEL_MOVE_NOTIFY === "true" &&
-                e.nickname &&
-                e.channel &&
-                !disNotifyNameList.includes(e.nickname)) {
-                logger.info(loggerPluginName + e.nickname + "移动到频道: " + e.channel.name);
-                const msg = segment.text(e.nickname + "移动到频道: " + e.channel.name);
+                e.client &&
+                !disNotifyNameList.includes(e.client.nickname)) {
+                logger.info(loggerPluginName +
+                    e.client.nickname +
+                    "移动到频道: " +
+                    e.channel.name);
+                const msg = segment.text(e.client.nickname + "移动到频道: " + e.channel.name);
                 TS.NOTICE_GROUP_NO.forEach((groupNo) => {
                     const contact = karin.contact("group", groupNo + "");
                     karin.sendMsg(karin.getBotAll()[1].account.selfId, contact, msg);
                 });
             }
         });
-        _teamspeak.connect();
     };
     //获取ts3服务器的所有对应频道的人 -- 并组装成文字可直接发
     getAllChannelList = async () => {
         if (!this.teamspeak) {
             return;
         }
+        //默认尝试使用渲染器，调用失败则表示未连接渲染器
+        let usePuppeteer = false;
+        // try {
+        //   render.App()
+        // } catch (error) {
+        //   usePuppeteer = false
+        // }
         const TS = config();
         const renderList = [];
-        renderList.push(`====${TS.SERVER_NAME || TS.HOST}====`);
-        renderList.push(`仅展示有人的频道 `);
-        renderList.push(`======`);
-        const channels = await this.teamspeak.channels.fetch(); //所有频道
-        const channelList = channels.map((i) => i);
+        renderList.push(usePuppeteer
+            ? `<h1>${TS.SERVER_NAME || TS.HOST}</h1>`
+            : `====${TS.SERVER_NAME || TS.HOST}====`);
+        renderList.push(usePuppeteer
+            ? `<div class="tips">仅展示有人的频道</div>`
+            : `仅展示有人的频道 `);
+        if (!usePuppeteer) {
+            //不渲染成图片就使用=====分割频道
+            renderList.push(`======`);
+        }
+        const channelList = await this.teamspeak.channelList(); //所有频道
         let count = 0;
-        const allClients = await this.teamspeak.clients.fetch(); //所有在线用户
-        const allClient = allClients
-            .filter((c) => !disNotifyNameList.includes(c.nickname))
-            .map((i) => i); //过滤掉不提醒的用户
         for (let index = 0; index < channelList.length; index++) {
             const channel = channelList[index]; //频道
-            const clients = allClient.filter((c) => c.channelId == channel.id); //频道内所有用户
+            const allClient = await channel.getClients(); //在当前频道的人
+            //排除不显示的人
+            const clients = allClient.filter((c) => !disNotifyNameList.includes(c.nickname));
             count += clients.length;
             if (clients.length == 0)
                 continue;
-            renderList.push(` ${channel.name} `);
+            renderList.push(usePuppeteer ? `<ul>${channel.name}` : ` ${channel.name} `);
             for (let index = 0; index < clients.length; index++) {
                 const client = clients[index];
-                if (client.databaseId) {
-                    const cdb = await this.teamspeak.getRawClientDatabaseProperties(client.databaseId);
-                    const connectTimeSec = moment().diff(moment.unix(Number(cdb.client_lastconnected)), "second");
-                    let connectTime = `(${Math.floor(connectTimeSec / 60)}:${Math.floor(connectTimeSec % 60)}) `;
-                    renderList.push(`- ${client.nickname} ${connectTime}`);
-                }
+                const connectTimeSec = moment().diff(moment.unix(client.lastconnected), "second");
+                let connectTime = `(${Math.floor(connectTimeSec / 60)}:${Math.floor(connectTimeSec % 60)}) `;
+                renderList.push(usePuppeteer
+                    ? `<li>${client.nickname} ${connectTime}</li>`
+                    : `- ${client.nickname} ${connectTime}`);
+            }
+            if (!usePuppeteer) {
+                //不渲染成图片就使用=====分割频道
+                renderList.push(`======`);
+            }
+            else {
+                renderList.push("</ul>");
             }
-            renderList.push(`======`);
         }
-        renderList.splice(2, 0, `当前频道内共有${count}人`);
-        return renderList.join("\n");
+        renderList.splice(2, 0, usePuppeteer
+            ? `<div class="count">当前频道内共有${count}人</div>`
+            : `当前频道内共有${count}人`);
+        return usePuppeteer ? renderList.join("") : renderList.join("\n");
     };
     //关闭连接
     quitTs = async () => {
         if (this.teamspeak) {
-            try {
-                this.teamspeak.removeAllListeners();
-                this.teamspeak.destroy();
-                this.teamspeak = undefined;
-            }
-            catch (error) {
-                logger.info(loggerPluginName + "关闭连接失败", error);
-                this.teamspeak = undefined;
-            }
+            this.teamspeak.removeAllListeners();
+            this.teamspeak.quit();
+            this.teamspeak = undefined;
         }
     };
     //重连逻辑
     async handelReconnect() {
-        //没走过重连
+        const TS = config();
         if (!this.teamspeak || this.isReConnecting)
             return;
         this.isReConnecting = true;
         logger.info(loggerPluginName + "重连中...");
         try {
-            this.quitTs();
-            await teamspeak3.init();
+            await this.teamspeak.reconnect(TS.RECONNECT_TIMER, 1000);
         }
         catch (e) {
             logger.error(loggerPluginName + "连接TS3失败", e);
@@ -161,32 +173,26 @@ export const getAllUserList = async () => {
     if (teamspeak3.teamspeak) {
         let count = 0;
         const res = {};
-        const channels = await teamspeak3.teamspeak.channels.fetch(); //所有频道
-        const channelList = channels.map((i) => i);
-        const allClients = await teamspeak3.teamspeak.clients.fetch();
-        const allClient = allClients
-            .filter((c) => !disNotifyNameList.includes(c.nickname))
-            .map((i) => i);
+        const channelList = await teamspeak3.teamspeak.channelList().catch(() => {
+            return [];
+        }); //所有频道
         for (let index = 0; index < channelList.length; index++) {
             const channel = channelList[index]; //频道
-            const clients = allClient.filter((c) => c.channelId == channel.id);
+            const allClient = await channel.getClients(); //在当前频道的人
+            //排除不显示的人
+            const clients = allClient.filter((c) => !disNotifyNameList.includes(c.nickname));
             count += clients.length;
-            if (channel.name) {
-                res[channel.name] = [];
-                for (let index = 0; index < clients.length; index++) {
-                    const client = clients[index];
-                    const cdb = await teamspeak3.teamspeak.getRawClientDatabaseProperties(client.databaseId);
-                    const connectTimeSec = moment().diff(moment.unix(Number(cdb.client_lastconnected)), "second");
-                    let connectTime = `(${Math.floor(connectTimeSec / 60)}:${Math.floor(connectTimeSec % 60)}) `;
-                    res[channel.name].push({
-                        nickName: client.nickname,
-                        connectTime,
-                        lastconnected: moment
-                            .unix(Number(cdb.client_lastconnected))
-                            .format("YYYY-MM-DD HH:mm:ss"), //上次连接进来的时间
-                    });
-                }
-            }
+            res[channel.name] = clients.map((c) => {
+                const connectTimeSec = moment().diff(moment.unix(c.lastconnected), "second");
+                let connectTime = `${Math.floor(connectTimeSec / 60)}:${Math.floor(connectTimeSec % 60)}`;
+                return {
+                    nickName: c.nickname, //昵称
+                    lastconnected: moment
+                        .unix(c.lastconnected)
+                        .format("YYYY-MM-DD HH:mm:ss"), //上次连接进来的时间
+                    connectTime, //已经连接的时间 - 单位分:秒
+                };
+            });
         }
         return {
             name: config().SERVER_NAME || config().HOST,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-teamspeak",
-  "version": "1.10.2",
+  "version": "1.11.0",
   "description": "karin 的 teamspeak 插件",
   "homepage": "https://github.com/jacksixth/karin-plugin-teamspeak3",
   "bugs": {
@@ -26,7 +26,7 @@
     "pr": "node lib/cli/pr.js"
   },
   "dependencies": {
-    "teamspeak.js": "^1.11.2"
+    "ts3-nodejs-library": "^3.5.3"
   },
   "karin": {
     "apps": [