koishi-plugin-gl-bot 0.0.9 → 0.0.10

package/lib/mcsManager/api.d.ts

@@ -21,5 +21,7 @@ export declare class MCSManagerAPI {
         page_size?: number;
     }): Promise<ServiceRemoteInstanceItem[]>;
     getServiceInstanceConnectAuth(remoteUUID: string, instanceId: string): Promise<ServiceInstanceConnectAuth | null>;
-    restartRemoteInstance(daemonId: string, instanceId: string): Promise<HTTP.Response<any>>;
+    restartRemoteInstance(daemonId: string, instanceId: string): Promise<boolean>;
+    stopRemoteInstance(daemonId: string, instanceId: string): Promise<boolean>;
+    startRemoteInstance(daemonId: string, instanceId: string): Promise<boolean>;
 }

package/lib/mcsManager/api.js

@@ -72,19 +72,34 @@ class MCSManagerAPI {
         })).data.data ?? null);
     }
     async restartRemoteInstance(daemonId, instanceId) {
-        console.log({
-            daemonId,
-            uuid: instanceId,
-            token: this.userInfo.token,
-        });
-        return this.http(`${this.baseUrl}/protected_instance/restart`, {
+        return ((await this.http(`${this.baseUrl}/protected_instance/restart`, {
             headers: this.requestHeaders,
             params: {
                 daemonId,
                 uuid: instanceId,
                 token: this.userInfo.token,
             },
-        });
+        })).data.data?.instanceUuid === instanceId);
+    }
+    async stopRemoteInstance(daemonId, instanceId) {
+        return ((await this.http(`${this.baseUrl}/protected_instance/stop`, {
+            headers: this.requestHeaders,
+            params: {
+                daemonId,
+                uuid: instanceId,
+                token: this.userInfo.token,
+            },
+        })).data.data?.instanceUuid === instanceId);
+    }
+    async startRemoteInstance(daemonId, instanceId) {
+        return ((await this.http(`${this.baseUrl}/protected_instance/open`, {
+            headers: this.requestHeaders,
+            params: {
+                daemonId,
+                uuid: instanceId,
+                token: this.userInfo.token,
+            },
+        })).data.data?.instanceUuid === instanceId);
     }
 }
 exports.MCSManagerAPI = MCSManagerAPI;

package/lib/mcsManager/bot.d.ts

@@ -1,6 +1,6 @@
 import { Context } from 'koishi';
 import { GLBotConfigType } from '../gl';
-import { MCBotResetCommand } from './commands/reset';
+import { MCBotListCommand, MCBotRestartCommand, MCBotStartCommand } from './commands';
 import { MCSManagerPanel } from './panel';
 export declare class MCSManagerBot {
     readonly ctx: Context;
@@ -8,7 +8,7 @@ export declare class MCSManagerBot {
     readonly panel: MCSManagerPanel;
     constructor(ctx: Context, config: GLBotConfigType, panel: MCSManagerPanel);
     help(): string[];
-    commands(): (typeof MCBotResetCommand)[];
+    commands(): (typeof MCBotListCommand | typeof MCBotRestartCommand | typeof MCBotStartCommand)[];
     initialize(): Promise<void>;
     private registerCommands;
 }

package/lib/mcsManager/bot.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MCSManagerBot = void 0;
-const reset_1 = require("./commands/reset");
+const commands_1 = require("./commands");
 class MCSManagerBot {
     constructor(ctx, config, panel) {
         this.ctx = ctx;
@@ -20,7 +20,7 @@ class MCSManagerBot {
         ];
     }
     commands() {
-        return [reset_1.MCBotResetCommand];
+        return [commands_1.MCBotRestartCommand, commands_1.MCBotListCommand, commands_1.MCBotStartCommand];
     }
     async initialize() {
         this.ctx.on('ready', async () => {

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

@@ -1,5 +1,8 @@
 import { Context } from 'koishi';
 import { GLBotConfigType } from '../../gl';
+export { MCBotListCommand } from './list';
+export { MCBotRestartCommand } from './restart';
+export { MCBotStartCommand } from './start';
 export declare class MCBotCommandBase {
     readonly ctx: Context;
     readonly config: GLBotConfigType;

package/lib/mcsManager/commands/index.js

@@ -1,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MCBotCommandBase = void 0;
+exports.MCBotCommandBase = exports.MCBotStartCommand = exports.MCBotRestartCommand = exports.MCBotListCommand = void 0;
 const koishi_1 = require("koishi");
+var list_1 = require("./list");
+Object.defineProperty(exports, "MCBotListCommand", { enumerable: true, get: function () { return list_1.MCBotListCommand; } });
+var restart_1 = require("./restart");
+Object.defineProperty(exports, "MCBotRestartCommand", { enumerable: true, get: function () { return restart_1.MCBotRestartCommand; } });
+var start_1 = require("./start");
+Object.defineProperty(exports, "MCBotStartCommand", { enumerable: true, get: function () { return start_1.MCBotStartCommand; } });
 const logger = new koishi_1.Logger('mcsmanager-command');
 class MCBotCommandBase {
     constructor(ctx, config) {

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,26 @@
+"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/{reset.d.ts → restart.d.ts}

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

package/lib/mcsManager/commands/restart.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MCBotRestartCommand = void 0;
+const constants_1 = require("../constants");
+// const logger = new Logger('mcsmanager-reset');
+const tempSelections = new Map();
+/**
+ * 服务器重启指令
+ *
+ * @example 服务器 重启 神话
+ */
+class MCBotRestartCommand {
+    constructor(bot) {
+        this.bot = bot;
+        bot.ctx
+            .command('服务器.重启 <name...>')
+            .action(async ({ session }, ...name) => {
+            return await this.handle(session, name.join(' '));
+        });
+    }
+    async handle(session, name) {
+        let selectIndex = -1;
+        const userId = Number(session.event.user.id);
+        // 溯源前搜索项
+        if (tempSelections.has(userId) && !isNaN(Number(name))) {
+            selectIndex = Number(name) - 1;
+            name = tempSelections.get(userId);
+        }
+        tempSelections.delete(userId);
+        const nameInstances = await this.bot.panel.searchInstanceByName(name);
+        if (nameInstances.length === 0) {
+            return `未找到名称包含 "${name}" 的服务器实例`;
+        }
+        if (nameInstances.length > 1 && selectIndex === -1) {
+            tempSelections.set(userId, name);
+            return `请输入序号以选择:\n\n${nameInstances
+                .map((item, index) => `${index + 1}. [${constants_1.RemoteInstanceStatusName[item.instance.cfg.status]}] ${item.instance.cfg.config.nickname}`)
+                .join('\n')}\n ==== 例如发送： (服务器 重启 1) ====`;
+        }
+        const targetInstance = selectIndex !== -1 ? nameInstances[selectIndex] : nameInstances[0];
+        if (!targetInstance || !targetInstance.instance) {
+            return `未找到名称包含 "${name}" 的服务器实例`;
+        }
+        const { cfg } = targetInstance.instance;
+        switch (cfg.status) {
+            // 关闭状态：启动
+            case constants_1.RemoteInstanceStatusEnum.RUNNING:
+                await targetInstance.instance.restartInstance();
+                this.bot.panel.handleRemoteServices();
+                return `已向服务器实例 "${cfg.config.nickname}" 发送重启操作`;
+            // 启动状态：重启
+            case constants_1.RemoteInstanceStatusEnum.STOPPED:
+                await targetInstance.instance.startInstance();
+                this.bot.panel.handleRemoteServices();
+                return `已向服务器实例 "${cfg.config.nickname}" 发送启动操作`;
+            default:
+                return `服务器实例 "${cfg.config.nickname}" 当前状态为 ${cfg.status}，无法执行重启操作`;
+        }
+    }
+}
+exports.MCBotRestartCommand = MCBotRestartCommand;

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

@@ -0,0 +1,12 @@
+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>;
+}

package/lib/mcsManager/commands/{reset.js → start.js}

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MCBotResetCommand = void 0;
+exports.MCBotStartCommand = void 0;
+const lodash_1 = require("lodash");
 const constants_1 = require("../constants");
-// const logger = new Logger('mcsmanager-reset');
 const tempSelections = new Map();
 /**
- * 服务器重启指令
+ * 服务器启动指令
  *
- * @example 服务器 重启 神话
+ * @example 服务器 启动 神话
  */
-class MCBotResetCommand {
+class MCBotStartCommand {
     constructor(bot) {
         this.bot = bot;
         bot.ctx
-            .command('服务器 重启 <name...>')
-            .action(async ({ session }, _action, ...name) => {
+            .command('服务器.启动 <name...>')
+            .action(async ({ session }, ...name) => {
             return await this.handle(session, name.join(' '));
         });
     }
@@ -35,11 +35,19 @@ class MCBotResetCommand {
             tempSelections.set(userId, name);
             return `请输入序号以选择:\n\n${nameInstances
                 .map((item, index) => `${index + 1}. [${constants_1.RemoteInstanceStatusName[item.instance.cfg.status]}] ${item.instance.cfg.config.nickname}`)
-                .join('\n')}\n ==== 例如发送： (服务器 重启 1) ====`;
+                .join('\n')}\n ==== 例如发送： (服务器 启动 1) ====`;
         }
         const targetInstance = selectIndex !== -1 ? nameInstances[selectIndex] : nameInstances[0];
-        targetInstance.instance.restartInstance();
-        return `已向服务器实例 "${targetInstance.instance.cfg.config.nickname}" 发送重启操作`;
+        if (!targetInstance || !targetInstance.instance) {
+            return `未找到名称包含 "${name}" 的服务器实例`;
+        }
+        const { cfg } = targetInstance.instance;
+        if ((0, lodash_1.isEqual)(cfg.status, constants_1.RemoteInstanceStatusEnum.STOPPED)) {
+            await targetInstance.instance.startInstance();
+            this.bot.panel.handleRemoteServices();
+            return `已向服务器实例 "${cfg.config.nickname}" 发送启动操作`;
+        }
+        return `服务器实例 "${cfg.config.nickname}" 当前状态为 ${cfg.status}，无法执行启动操作`;
     }
 }
-exports.MCBotResetCommand = MCBotResetCommand;
+exports.MCBotStartCommand = MCBotStartCommand;

package/lib/mcsManager/constants.d.ts

@@ -1,8 +1,12 @@
 export declare enum RemoteInstanceStatusEnum {
     STOPPED = 0,
+    STARTING = 1,
+    STOPPING = 2,
     RUNNING = 3
 }
 export declare const RemoteInstanceStatusName: {
     0: string;
+    1: string;
+    2: string;
     3: string;
 };

package/lib/mcsManager/constants.js

@@ -4,9 +4,13 @@ exports.RemoteInstanceStatusName = exports.RemoteInstanceStatusEnum = void 0;
 var RemoteInstanceStatusEnum;
 (function (RemoteInstanceStatusEnum) {
     RemoteInstanceStatusEnum[RemoteInstanceStatusEnum["STOPPED"] = 0] = "STOPPED";
+    RemoteInstanceStatusEnum[RemoteInstanceStatusEnum["STARTING"] = 1] = "STARTING";
+    RemoteInstanceStatusEnum[RemoteInstanceStatusEnum["STOPPING"] = 2] = "STOPPING";
     RemoteInstanceStatusEnum[RemoteInstanceStatusEnum["RUNNING"] = 3] = "RUNNING";
 })(RemoteInstanceStatusEnum || (exports.RemoteInstanceStatusEnum = RemoteInstanceStatusEnum = {}));
 exports.RemoteInstanceStatusName = {
     [RemoteInstanceStatusEnum.STOPPED]: '已停止',
+    [RemoteInstanceStatusEnum.STARTING]: '启动中',
+    [RemoteInstanceStatusEnum.STOPPING]: '停止中',
     [RemoteInstanceStatusEnum.RUNNING]: '运行中',
 };

package/lib/mcsManager/instance.d.ts

@@ -12,5 +12,7 @@ export declare class MCSManagerInstance {
     cfg: ServiceRemoteInstanceItem;
     isAuthenticated: boolean;
     constructor(ctx: Context, config: GLBotConfigType, api: MCSManagerAPI, panel: MCSManagerPanel, remote: ServiceRemoteItem, cfg: ServiceRemoteInstanceItem);
-    restartInstance(): void;
+    restartInstance(): Promise<boolean>;
+    stopInstance(): Promise<boolean>;
+    startInstance(): Promise<boolean>;
 }

package/lib/mcsManager/instance.js

@@ -11,8 +11,14 @@ class MCSManagerInstance {
         this.cfg = cfg;
         this.isAuthenticated = false;
     }
-    restartInstance() {
-        this.api.restartRemoteInstance(this.remote.uuid, this.cfg.instanceUuid);
+    async restartInstance() {
+        return await this.api.restartRemoteInstance(this.remote.uuid, this.cfg.instanceUuid);
+    }
+    async stopInstance() {
+        return await this.api.stopRemoteInstance(this.remote.uuid, this.cfg.instanceUuid);
+    }
+    async startInstance() {
+        return await this.api.startRemoteInstance(this.remote.uuid, this.cfg.instanceUuid);
     }
 }
 exports.MCSManagerInstance = MCSManagerInstance;

package/lib/mcsManager/panel.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MCSManagerPanel = void 0;
 const koishi_1 = require("koishi");
-const lodash_es_1 = require("lodash-es");
+const lodash_1 = require("lodash");
 const api_1 = require("./api");
 const constants_1 = require("./constants");
 const instance_1 = require("./instance");
@@ -31,16 +31,18 @@ class MCSManagerPanel {
         await this.handleRemoteServices();
         await this.getAvailableRemoteInstance();
     }
-    // 获取远程服务及其实例列表
+    // 获取远程服务及其实例列表 [全量]
     async handleRemoteServices() {
         const remoteList = await this.api.getServiceRemoteList();
+        const insertList = [];
         for (const remote of remoteList) {
             const instanceList = await this.api.getServiceRemoteInstanceList(remote.uuid);
-            this.remotes.push({
+            insertList.push({
                 instances: instanceList.map(item => new instance_1.MCSManagerInstance(this.ctx, this.config, this.api, this, remote, item)),
                 ...remote,
             });
         }
+        this.remotes = insertList;
         logger.info(`已获取到 ${this.remotes.length} 个远程节点及其实例 ${this.remotes.reduce((acc, remote) => acc + remote.instances.length, 0)} 个`);
     }
     // 遍历所有远程节点 选择正在运行中的实力 建立远程连接
@@ -53,7 +55,7 @@ class MCSManagerPanel {
     }
     // 创建远程连接
     async createMCSManagerConnection(remote, instance) {
-        if ((0, lodash_es_1.isEqual)(instance.status, constants_1.RemoteInstanceStatusEnum.RUNNING)) {
+        if ((0, lodash_1.isEqual)(instance.status, constants_1.RemoteInstanceStatusEnum.RUNNING)) {
             const uuid = instance.instanceUuid;
             // 已存在的实例且连接中 直接返回
             if (this.remoteConnectionsMap.has(uuid) &&

package/lib/mcsManager/ws.js

@@ -36,7 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MCSManagerWebSocketIO = void 0;
 const io = __importStar(require("socket.io-client"));
 const koishi_1 = require("koishi");
-const lodash_es_1 = require("lodash-es");
+const lodash_1 = require("lodash");
 const logger = new koishi_1.Logger('mcsmanager-ws');
 class MCSManagerWebSocketIO {
     constructor(ctx, config, api, remote, instance, auth) {
@@ -92,10 +92,10 @@ class MCSManagerWebSocketIO {
     authenticate() {
         this.connect.once('auth', ({ event, status }) => {
             this.connect.once('stream/auth', pack => {
-                if ((0, lodash_es_1.isEqual)(event, 'auth') &&
-                    (0, lodash_es_1.isEqual)(status, 200) &&
-                    (0, lodash_es_1.isEqual)(pack.status, 200) &&
-                    (0, lodash_es_1.isEqual)(pack.data, true)) {
+                if ((0, lodash_1.isEqual)(event, 'auth') &&
+                    (0, lodash_1.isEqual)(status, 200) &&
+                    (0, lodash_1.isEqual)(pack.status, 200) &&
+                    (0, lodash_1.isEqual)(pack.data, true)) {
                     logger.info(`已成功连接到 MCSManager 实例服务器 [${this.remote.remarks}] - ${this.instance.config.nickname} `);
                     this.isAuthenticated = true;
                     return pack;

package/lib/queQiao/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.name = void 0;
 const koishi_1 = require("koishi");
-const lodash_es_1 = require("lodash-es");
+const lodash_1 = require("lodash");
 const rcon_client_1 = require("rcon-client");
 const ws_1 = require("ws");
 const constants_1 = require("../constants");
@@ -364,7 +364,7 @@ class MinecraftSyncMsg {
                 .map(str => str.replace(`${bot.platform}:`, ''));
             console.log(this.config.sendToChannel);
             if (process.env.NODE_ENV === 'development') {
-                logger.info((0, lodash_es_1.isString)(message)
+                logger.info((0, lodash_1.isString)(message)
                     ? message
                     : message.map(el => el.attrs.content).join(''));
             }

package/lib/queQiao/locale/en-US.yml

@@ -1,9 +1,9 @@
-minecraft-sync-msg:
-  action:
-    PlayerJoinEvent: "[join] Player {0} joined the game"
-    PlayerCommandPreprocessEvent: "[command] Player {0} executed command"
-    PlayerDeathEvent: "[death] Player {0} meet the god"
-    AsyncPlayerChatEvent: "[chat] Player {0} said: {1}"
-    PlayerQuitEvent: "[quit] Player {0} left the game"
-  message:
-    MCReceivePrefix: "({0})[{1}]"
+minecraft-sync-msg:
+  action:
+    PlayerJoinEvent: '[join] Player {0} joined the game'
+    PlayerCommandPreprocessEvent: '[command] Player {0} executed command'
+    PlayerDeathEvent: '[death] Player {0} meet the god'
+    AsyncPlayerChatEvent: '[chat] Player {0} said: {1}'
+    PlayerQuitEvent: '[quit] Player {0} left the game'
+  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} 离开了服务器！"
-  message:
-    MCReceivePrefix: "({0})[{1}]"
+minecraft-sync-msg:
+  action:
+    PlayerJoinEvent: '[加入]{0} 加入了服务器！'
+    PlayerCommandPreprocessEvent: '[指令]{0} 执行了指令'
+    PlayerDeathEvent: '[死亡]{0} 与山长眠！'
+    AsyncPlayerChatEvent: '[聊天]{0} 说：{1}'
+    PlayerQuitEvent: '[离开]{0} 离开了服务器！'
+  message:
+    MCReceivePrefix: '({0})[{1}]'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-gl-bot",
   "description": "GleamSlime Koishi Rebot Plugins",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -28,7 +28,7 @@
   ],
   "devDependencies": {
     "@koishijs/client": "^5.30.11",
-    "@types/lodash-es": "^4",
+    "@types/lodash": "^4.17.21",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
@@ -41,7 +41,7 @@
     }
   },
   "dependencies": {
-    "lodash-es": "^4.17.22",
+    "lodash": "^4.17.21",
     "rcon-client": "^4.2.5",
     "socket.io-client": "^4.8.2",
     "ws": "^8.18.3"

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

@@ -1,2 +0,0 @@
-export declare class MCBotCommandBase {
-}

package/lib/mcsManager/commands/base.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MCBotCommandBase = void 0;
-class MCBotCommandBase {
-}
-exports.MCBotCommandBase = MCBotCommandBase;