koishi-plugin-gl-bot 0.0.10 → 0.0.12

package/lib/queQiao/locale/zh-CN.json

@@ -1 +1 @@
-{"minecraft-sync-msg":{"action":{"PlayerJoinEvent":"[加入]{0} 加入了服务器！","PlayerCommandPreprocessEvent":"[指令]{0} 执行了指令","PlayerDeathEvent":"[死亡]{0} 与山长眠！","AsyncPlayerChatEvent":"[聊天]{0} 说：{1}","PlayerQuitEvent":"[离开]{0} 离开了服务器！"},"message":{"MCReceivePrefix":"({0})[{1}]"}}}
+{"minecraft-sync-msg":{"action":{"PlayerJoinEvent":"[{0}] {1} 加入了服务器！","PlayerCommandPreprocessEvent":"[指令]{0} 执行了指令","PlayerDeathEvent":"[{0}] {1} 与山长眠！","AsyncPlayerChatEvent":"[{0}] {1}: {2}","PlayerQuitEvent":"[{0}] {1} 离开了服务器！"},"message":{"MCReceivePrefix":"({0})[{1}]"}}}

package/lib/queQiao/locale/zh-CN.yml

@@ -1,9 +1,9 @@
 minecraft-sync-msg:
   action:
-    PlayerJoinEvent: '[加入]{0} 加入了服务器！'
-    PlayerCommandPreprocessEvent: '[指令]{0} 执行了指令'
-    PlayerDeathEvent: '[死亡]{0} 与山长眠！'
-    AsyncPlayerChatEvent: '[聊天]{0} 说：{1}'
-    PlayerQuitEvent: '[离开]{0} 离开了服务器！'
+    PlayerJoinEvent: "[{0}] {1} 加入了服务器！"
+    PlayerCommandPreprocessEvent: "[指令]{0} 执行了指令"
+    PlayerDeathEvent: "[{0}] {1} 与山长眠！"
+    AsyncPlayerChatEvent: "[{0}] {1}: {2}"
+    PlayerQuitEvent: "[{0}] {1} 离开了服务器！"
   message:
-    MCReceivePrefix: '({0})[{1}]'
+    MCReceivePrefix: "({0})[{1}]"

package/lib/queQiao/mcwss.d.ts

@@ -1,15 +1,18 @@
 import { IncomingMessage } from 'http';
-import { Context, Schema } from 'koishi';
+import { Context, Logger, Schema } from 'koishi';
+import { WebSocket, WebSocketServer } from 'ws';
+import { GLQueQiaoAdapter } from '../gl/queqiao.adapter';
 import { WsConf } from './values';
 declare class McWss {
-    private conf;
-    private logger;
-    private wss;
-    private ctx;
-    private connectedClients;
-    constructor(ctx: Context, cfg: McWss.Config);
-    private setupWebSocketHandlers;
-    private setupMessageHandler;
+    adapter: GLQueQiaoAdapter;
+    conf: McWss.Config;
+    logger: Logger;
+    wss: WebSocketServer;
+    ctx: Context;
+    connectedClients: Set<WebSocket>;
+    constructor(ctx: Context, adapter: GLQueQiaoAdapter, cfg: McWss.Config);
+    setupWebSocketHandlers(): void;
+    setupMessageHandler(): void;
     verifyHeaders(headers: IncomingMessage['headers']): {
         valid: boolean;
         clientOrigin?: string;

package/lib/queQiao/mcwss.js

@@ -9,7 +9,8 @@ const values_1 = require("./values");
 const zhCN = require('./locale/zh-CN.json');
 const enUS = require('./locale/en-US.json');
 class McWss {
-    constructor(ctx, cfg) {
+    constructor(ctx, adapter, cfg) {
+        this.adapter = adapter;
         this.logger = new koishi_1.Logger('Minecraft-sync-msg-Wss');
         this.connectedClients = new Set();
         this.conf = cfg;
@@ -139,7 +140,9 @@ class McWss {
     setupMessageHandler() {
         let imgurl = '<unknown image url>';
         this.ctx.on('message', async (session) => {
-            // this.ctx.logger.info(`收到聊天消息: ${session.content} 来自 ${session.platform}:${session.channelId}`);
+            // this.ctx.logger.info(
+            //   `收到聊天消息: ${session.content} 来自 ${session.platform}:${session.channelId}`,
+            // );
             if (session.content.includes('<img') &&
                 koishi_1.h.select(session.content, 'img')[0]?.type === 'img' &&
                 koishi_1.h.select(session.content, 'img')[0]?.attrs?.src) {
@@ -160,6 +163,35 @@ class McWss {
                         .replaceAll(/<at.*\/>/gi, `@[${koishi_1.h.select(session.content, 'at')[0]?.attrs?.name
                         ? koishi_1.h.select(session.content, 'at')[0]?.attrs?.name
                         : koishi_1.h.select(session.content, 'at')[0]?.attrs?.id}]`);
+                    // console.log(this.adapter.servers);
+                    // Object.entries(this.adapter.servers).forEach(
+                    //   async ([name, server]) => {
+                    //     console.log(
+                    //       name,
+                    //       this.conf.serverName,
+                    //       !isEqual(name, this.conf.serverName),
+                    //     );
+                    //     if (!isEqual(name, this.conf.serverName)) {
+                    //       console.log(
+                    //         `[${this.conf.serverName}] <${session.username}> ${clearSessionContentToMcMessage(session.content)}`,
+                    //       );
+                    //       const msgData: WsMessageData = {
+                    //         api: 'broadcast',
+                    //         data: {
+                    //           message: [
+                    //             {
+                    //               text: `[${this.conf.serverName}] <${session.username}> ${clearSessionContentToMcMessage(session.content)}`,
+                    //               color:
+                    //                 server.extractAndRemoveColor(server.config.joinMsg)
+                    //                   .color || 'white',
+                    //             },
+                    //           ],
+                    //         },
+                    //       };
+                    //       server.ws?.send(JSON.stringify(msgData));
+                    //     }
+                    //   },
+                    // );
                     if (this.connectedClients.size > 0) {
                         const msgData = {
                             api: 'broadcast',

package/lib/queQiao/values.js

@@ -94,8 +94,8 @@ exports.eventList = [
 // 事件映射
 function getSubscribedEvents(binaryInput) {
     const subscribedEvents = [];
-    const eventValues = Object.values(mcEvent).filter(value => typeof value === 'number');
-    const eventNames = Object.keys(mcEvent).filter(key => isNaN(Number(key)));
+    const eventValues = Object.values(mcEvent)?.filter(value => typeof value === 'number');
+    const eventNames = Object.keys(mcEvent)?.filter(key => isNaN(Number(key)));
     for (let i = 0; i < eventValues.length; i++) {
         if ((binaryInput & eventValues[i]) !== 0) {
             subscribedEvents.push(eventNames[i]);

package/lib/utils/game.mc.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearSessionContentToMcMessage = void 0;
-const koishi_1 = require("koishi");
 /**
  * 清洗数据防止QQ脏数据发送到游戏内
  */
@@ -22,8 +21,10 @@ const clearSessionContentToMcMessage = (content) => {
         .replaceAll(/<video.*\/>/gi, '<视频消息>')
         .replaceAll(/<audio.*\/>/gi, '<音频消息>')
         // .replaceAll(/<img.*\/>/gi, `[[CICode,url=${imgurl}]]`)
-        .replaceAll(/<at.*\/>/gi, `@[${koishi_1.h.select(content, 'at')[0]?.attrs?.name
-        ? koishi_1.h.select(content, 'at')[0]?.attrs?.name
-        : koishi_1.h.select(content, 'at')[0]?.attrs?.id}]`));
+        .replaceAll(/<at.*\/>/gi, `@[${
+    // h.select(content, 'at')[0]?.attrs?.name
+    //   ? h.select(content, 'at')[0]?.attrs?.name
+    //   : h.select(content, 'at')[0]?.attrs?.id
+    '神秘人'}]`));
 };
 exports.clearSessionContentToMcMessage = clearSessionContentToMcMessage;

package/lib/utils/index.d.ts

@@ -1 +1,8 @@
 export * from './game.mc';
+/**
+ * 格式化时间差为易读格式
+ * @param milliseconds 时间差（毫秒）
+ * @returns 格式化后的时间字符串
+ */
+export declare function formatDuration(milliseconds: number): string;
+export declare function formatOnlineTime(seconds: number): string;

package/lib/utils/index.js

@@ -14,4 +14,62 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatDuration = formatDuration;
+exports.formatOnlineTime = formatOnlineTime;
 __exportStar(require("./game.mc"), exports);
+/**
+ * 格式化时间差为易读格式
+ * @param milliseconds 时间差（毫秒）
+ * @returns 格式化后的时间字符串
+ */
+function formatDuration(milliseconds) {
+    if (milliseconds <= 0) {
+        return '0分钟';
+    }
+    const seconds = Math.floor(milliseconds / 1000);
+    const minutes = Math.floor(seconds / 60);
+    const hours = Math.floor(minutes / 60);
+    const days = Math.floor(hours / 24);
+    const months = Math.floor(days / 30);
+    const years = Math.floor(days / 365);
+    if (years > 0) {
+        const remainingMonths = Math.floor((days % 365) / 30);
+        return remainingMonths > 0
+            ? `${years}年${remainingMonths}个月`
+            : `${years}年`;
+    }
+    if (months > 0) {
+        const remainingDays = days % 30;
+        return remainingDays > 0
+            ? `${months}个月${remainingDays}天`
+            : `${months}月`;
+    }
+    if (days > 0) {
+        const remainingHours = hours % 24;
+        return remainingHours > 0 ? `${days}天${remainingHours}小时` : `${days}天`;
+    }
+    if (hours > 0) {
+        const remainingMinutes = minutes % 60;
+        return remainingMinutes > 0
+            ? `${hours}小时${remainingMinutes}分钟`
+            : `${hours}小时`;
+    }
+    if (minutes > 0) {
+        return `${minutes}分钟`;
+    }
+    return `${seconds}秒`;
+}
+function formatOnlineTime(seconds) {
+    const hours = Math.floor(seconds / 3600);
+    const minutes = Math.floor((seconds % 3600) / 60);
+    const remainingSeconds = seconds % 60;
+    if (hours > 0) {
+        return `${hours}小时${minutes}分钟${remainingSeconds}秒`;
+    }
+    else if (minutes > 0) {
+        return `${minutes}分钟${remainingSeconds}秒`;
+    }
+    else {
+        return `${remainingSeconds}秒`;
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-gl-bot",
   "description": "GleamSlime Koishi Rebot Plugins",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -41,6 +41,7 @@
     }
   },
   "dependencies": {
+    "@types/ms": "^2.1.0",
     "lodash": "^4.17.21",
     "rcon-client": "^4.2.5",
     "socket.io-client": "^4.8.2",

package/lib/mcsManager/commands/list.d.ts

@@ -1,11 +0,0 @@
-import { MCSManagerBot } from '../bot';
-/**
- * 服务器列表指令
- *
- * @example 服务器 列表
- */
-export declare class MCBotListCommand {
-    private readonly bot;
-    constructor(bot: MCSManagerBot);
-    handle(status?: string): Promise<string>;
-}

package/lib/mcsManager/commands/list.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MCBotListCommand = void 0;
-const constants_1 = require("../constants");
-/**
- * 服务器列表指令
- *
- * @example 服务器 列表
- */
-class MCBotListCommand {
-    constructor(bot) {
-        this.bot = bot;
-        bot.ctx.command('服务器.列表 <status>').action(async (_, status) => {
-            return await this.handle(status);
-        });
-    }
-    async handle(status) {
-        await this.bot.panel.handleRemoteServices();
-        const nameInstances = (await this.bot.panel.searchInstanceByName('')).filter(item => !status ||
-            constants_1.RemoteInstanceStatusName[item.instance.cfg.status] === status);
-        return `${'='.repeat(10)}服务器列表${'='.repeat(10)}\n${nameInstances
-            .map((item, index) => `${index + 1}. [${constants_1.RemoteInstanceStatusName[item.instance.cfg.status]}] ${item.instance.cfg.config.nickname}`)
-            .join('\n')}\n ${'='.repeat(20)} `;
-    }
-}
-exports.MCBotListCommand = MCBotListCommand;

package/lib/mcsManager/commands/restart.d.ts

@@ -1,12 +0,0 @@
-import { Context, Session } from 'koishi';
-import { MCSManagerBot } from '../bot';
-/**
- * 服务器重启指令
- *
- * @example 服务器 重启 神话
- */
-export declare class MCBotRestartCommand {
-    private readonly bot;
-    constructor(bot: MCSManagerBot);
-    handle(session: Session<never, never, Context>, name: string): Promise<string>;
-}

package/lib/mcsManager/commands/start.d.ts

@@ -1,12 +0,0 @@
-import { Context, Session } from 'koishi';
-import { MCSManagerBot } from '../bot';
-/**
- * 服务器启动指令
- *
- * @example 服务器 启动 神话
- */
-export declare class MCBotStartCommand {
-    private readonly bot;
-    constructor(bot: MCSManagerBot);
-    handle(session: Session<never, never, Context>, name: string): Promise<string>;
-}