koishi-plugin-gl-bot 0.0.11 → 0.0.12

package/lib/gl/index.d.ts

@@ -1,85 +1,66 @@
 import { Context, Schema } from 'koishi';
+import { MCManager } from '../mcsManager';
 import { NapCat } from '../napCat';
+import { GLQueQiaoAdapter } from './queqiao.adapter';
 export declare class GLBot {
     private ctx;
     private config;
     static inject: string[];
     static Config: Schema<Schemastery.ObjectS<{
-        wsServer: Schema<"客户端" | "服务端", "客户端" | "服务端">;
-        wsHost: Schema<string, string>;
-        wsPort: Schema<number, number>;
-        Token: Schema<string, string>;
-        serverName: Schema<string, string>;
-        joinMsg: Schema<string, string>;
-        event: Schema<number | readonly ("AsyncPlayerChatEvent" | "PlayerCommandPreprocessEvent" | "PlayerDeathEvent" | "PlayerJoinEvent" | "PlayerQuitEvent")[], number>;
-        maxReconnectCount: Schema<number, number>;
-        maxReconnectInterval: Schema<number, number>;
-    }> | Schemastery.ObjectS<{
-        rconEnable: Schema<boolean, boolean>;
-        rconServerHost: Schema<string, string>;
-        rconServerPort: Schema<number, number>;
-        rconPassword: Schema<string, string>;
-        alluser: Schema<boolean, boolean>;
-        superuser: Schema<string[], string[]>;
-        commonCmd: Schema<string[], string[]>;
-        cannotCmd: Schema<string[], string[]>;
-    }> | Schemastery.ObjectS<{
-        sendToChannel: Schema<string[], string[]>;
-        watchChannel: Schema<string[], string[]>;
-        sendprefix: Schema<string, string>;
-        cmdprefix: Schema<string, string>;
-        hideConnect: Schema<boolean, boolean>;
-        locale: Schema<"zh-CN" | "en-US", "zh-CN" | "en-US">;
-    }> | Schemastery.ObjectS<{
         mcManagerUsername: Schema<string, string>;
         mcManagerPassword: Schema<string, string>;
         mcManagerKey: Schema<string, string>;
         mcManagerHost: Schema<string, string>;
         mcManagerWs: Schema<string, string>;
         mcManagerMaxConnectWs: Schema<number, number>;
+    }> | Schemastery.ObjectS<{
+        queQiaoEnable: Schema<boolean, boolean>;
+        queQiaoSendToChannel: Schema<string[], string[]>;
+        queQiaoWatchChannel: Schema<string[], string[]>;
+        queQiaoServers: Schema<Schemastery.ObjectS<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[], Schemastery.ObjectT<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[]>;
     }> | Schemastery.ObjectS<{
         napCatBaseUrl: Schema<string, string>;
         napCatToken: Schema<string, string>;
     }>, {
-        wsServer: "客户端" | "服务端";
-        wsHost: string;
-        wsPort: number;
-        Token: string;
-        serverName: string;
-        joinMsg: string;
-        event: number;
-        maxReconnectCount: number;
-        maxReconnectInterval: number;
-    } & import("cosmokit").Dict & {
-        rconEnable: boolean;
-        rconServerHost: string;
-        rconServerPort: number;
-        rconPassword: string;
-        alluser: boolean;
-        superuser: string[];
-        commonCmd: string[];
-        cannotCmd: string[];
-    } & {
-        sendToChannel: string[];
-        watchChannel: string[];
-        sendprefix: string;
-        cmdprefix: string;
-        hideConnect: boolean;
-        locale: "zh-CN" | "en-US";
-    } & {
         mcManagerUsername: string;
         mcManagerPassword: string;
         mcManagerKey: string;
         mcManagerHost: string;
         mcManagerWs: string;
         mcManagerMaxConnectWs: number;
+    } & import("cosmokit").Dict & {
+        queQiaoEnable: boolean;
+        queQiaoSendToChannel: string[];
+        queQiaoWatchChannel: string[];
+        queQiaoServers: Schemastery.ObjectT<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[];
     } & {
         napCatBaseUrl: string;
         napCatToken: string;
     }>;
-    private mcSyncMsg;
-    private mcsManager;
-    napCat: NapCat;
+    readonly mcsManager: MCManager;
+    readonly queQiaoAdapter: GLQueQiaoAdapter;
+    readonly napCat: NapCat;
     constructor(ctx: Context, config: GLBotConfigType);
     private initialize;
     private globalCommand;

package/lib/gl/index.js

@@ -1,21 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLBotBase = exports.GLBot = void 0;
 const koishi_1 = require("koishi");
 const constants_1 = require("../constants");
 const mcsManager_1 = require("../mcsManager");
 const napCat_1 = require("../napCat");
-const queQiao_1 = __importDefault(require("../queQiao"));
+const queqiao_adapter_1 = require("./queqiao.adapter");
 const logger = new koishi_1.Logger('gl-bot');
 class GLBot {
     constructor(ctx, config) {
         this.ctx = ctx;
         this.config = config;
-        this.mcSyncMsg = new queQiao_1.default(ctx, config);
+        // this.mcSyncMsg = new MinecraftSyncMsg(ctx, config);
         this.mcsManager = new mcsManager_1.MCManager(this, ctx, config);
+        this.queQiaoAdapter = new queqiao_adapter_1.GLQueQiaoAdapter(this, ctx, config);
         this.napCat = new napCat_1.NapCat(ctx, config);
         this.initialize();
     }
@@ -45,7 +43,7 @@ class GLBot {
 exports.GLBot = GLBot;
 GLBot.inject = ['database'];
 GLBot.Config = koishi_1.Schema.intersect([
-    queQiao_1.default.Config,
+    // MinecraftSyncMsg.Config,
     mcsManager_1.MCManager.Config,
     napCat_1.NapCat.Config,
 ]);

package/lib/gl/queqiao.adapter.d.ts

@@ -0,0 +1,11 @@
+import { Context } from 'koishi';
+import { GLBot, GLBotConfigType } from '.';
+import MinecraftSyncMsg from '../queQiao';
+export declare class GLQueQiaoAdapter {
+    readonly gl: GLBot;
+    readonly ctx: Context;
+    private readonly config;
+    servers: Record<string, MinecraftSyncMsg>;
+    constructor(gl: GLBot, ctx: Context, config: GLBotConfigType);
+    private initialize;
+}

package/lib/gl/queqiao.adapter.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLQueQiaoAdapter = void 0;
+const queQiao_1 = __importDefault(require("../queQiao"));
+class GLQueQiaoAdapter {
+    constructor(gl, ctx, config) {
+        this.gl = gl;
+        this.ctx = ctx;
+        this.config = config;
+        this.servers = {};
+        if (this.config.queQiaoEnable) {
+            this.initialize();
+        }
+    }
+    initialize() {
+        this.config.queQiaoServers?.forEach(serverConfig => {
+            if (serverConfig.enable) {
+                const [wsHost, wsProt] = serverConfig.wsHost.split(':') ?? serverConfig.wsProt;
+                const [rconHost, rconProt] = serverConfig.rconServerHost.split(':') ?? serverConfig.rconServerHost;
+                this.servers[serverConfig.serverName] = new queQiao_1.default(this.ctx, this, {
+                    rconEnable: serverConfig.rconEnable,
+                    rconServerHost: rconHost ?? serverConfig.rconServerHost,
+                    rconServerPort: rconProt ?? serverConfig.rconServerPort,
+                    rconPassword: serverConfig.rconPassword,
+                    wsServer: '客户端',
+                    wsHost: wsHost ?? serverConfig.wsHost,
+                    wsPort: wsProt ?? serverConfig.wsPort,
+                    Token: serverConfig.Token,
+                    serverName: serverConfig.serverName,
+                    // event: [],
+                    sendToChannel: this.config.queQiaoSendToChannel,
+                    watchChannel: this.config.queQiaoWatchChannel,
+                });
+            }
+        });
+    }
+}
+exports.GLQueQiaoAdapter = GLQueQiaoAdapter;

package/lib/mcsManager/api.d.ts

@@ -37,4 +37,5 @@ export declare class MCSManagerAPI {
         remoteMappings: string[];
     }>;
     uploadFileToRemoteInstance(daemonId: string, filePath: string): Promise<boolean>;
+    readServerProperties(daemonId: string, instanceId: string): Promise<Record<string, never>>;
 }

package/lib/mcsManager/api.js

@@ -33,7 +33,7 @@ class MCSManagerAPI {
         return false;
     }
     async getUserInfo() {
-        const result = await this.http(`${this.baseUrl}/auth/`, {
+        const result = await this.http(`${this.baseUrl}/auth`, {
             headers: this.requestHeaders,
         });
         if (result.status === 200) {
@@ -236,6 +236,18 @@ class MCSManagerAPI {
         });
         return result.status === 200;
     }
+    async readServerProperties(daemonId, instanceId) {
+        return (await this.http(`${this.baseUrl}/protected_instance/process_config/file`, {
+            headers: this.requestHeaders,
+            params: {
+                daemonId,
+                uuid: instanceId,
+                fileName: 'server.properties',
+                type: 'properties',
+                token: this.userInfo.token,
+            },
+        })).data.data;
+    }
 }
 exports.MCSManagerAPI = MCSManagerAPI;
 function extractCookiesWithRegex(cookieStr) {

package/lib/mcsManager/bot.d.ts

@@ -1,7 +1,7 @@
 import { Context } from 'koishi';
 import { MCManager } from '.';
 import { GLBotConfigType } from '../gl';
-import { MCBotListCommand } from './commands';
+import { ARKBotListCommand, MCBotHealthCommand, MCBotListCommand, MCBotOnlineTimeCommand } from './commands';
 import { MCSManagerPanel } from './panel';
 export declare class MCSManagerBot {
     readonly manager: MCManager;
@@ -10,7 +10,7 @@ export declare class MCSManagerBot {
     readonly panel: MCSManagerPanel;
     constructor(manager: MCManager, ctx: Context, config: GLBotConfigType, panel: MCSManagerPanel);
     help(): string[];
-    commands(): (typeof MCBotListCommand)[];
+    commands(): (typeof MCBotOnlineTimeCommand | typeof MCBotHealthCommand | typeof MCBotListCommand | typeof ARKBotListCommand)[];
     initialize(): Promise<void>;
     private registerCommands;
 }

package/lib/mcsManager/bot.js

@@ -30,6 +30,7 @@ class MCSManagerBot {
             create_1.MCBotCreateCommand,
             commands_1.MCBotOnlineTimeCommand,
             commands_1.MCBotGameOnline,
+            commands_1.MCBotHealthCommand,
             commands_1.ARKBotListCommand,
             commands_1.ARKBotRestartCommand,
             commands_1.ARKBotStartCommand,

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

@@ -1,4 +1,5 @@
 export { BotCommandBase } from './base';
+export { MCBotHealthCommand } from './mc/health';
 export { MCBotListCommand } from './mc/list';
 export { MCBotGameOnline, MCBotOnlineTimeCommand } from './mc/online';
 export { MCBotRestartCommand } from './mc/restart';

package/lib/mcsManager/commands/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ARKBotStopCommand = exports.ARKBotStartCommand = exports.ARKBotRestartCommand = exports.ARKBotListCommand = exports.MCBotStopCommand = exports.MCBotStartCommand = exports.MCBotRestartCommand = exports.MCBotOnlineTimeCommand = exports.MCBotGameOnline = exports.MCBotListCommand = exports.BotCommandBase = void 0;
+exports.ARKBotStopCommand = exports.ARKBotStartCommand = exports.ARKBotRestartCommand = exports.ARKBotListCommand = exports.MCBotStopCommand = exports.MCBotStartCommand = exports.MCBotRestartCommand = exports.MCBotOnlineTimeCommand = exports.MCBotGameOnline = exports.MCBotListCommand = exports.MCBotHealthCommand = exports.BotCommandBase = void 0;
 var base_1 = require("./base");
 Object.defineProperty(exports, "BotCommandBase", { enumerable: true, get: function () { return base_1.BotCommandBase; } });
+var health_1 = require("./mc/health");
+Object.defineProperty(exports, "MCBotHealthCommand", { enumerable: true, get: function () { return health_1.MCBotHealthCommand; } });
 var list_1 = require("./mc/list");
 Object.defineProperty(exports, "MCBotListCommand", { enumerable: true, get: function () { return list_1.MCBotListCommand; } });
 var online_1 = require("./mc/online");

package/lib/mcsManager/commands/mc/health.d.ts

@@ -0,0 +1,16 @@
+import MinecraftSyncMsg from '../../../queQiao';
+import { MCSManagerBot } from '../../bot';
+import { BotCommandBase } from '../base';
+/**
+ * 服务器 健康 指令
+ *
+ * @example 服务器 健康
+ */
+export declare class MCBotHealthCommand extends BotCommandBase {
+    readonly bot: MCSManagerBot;
+    command: string[];
+    roles: any[];
+    constructor(bot: MCSManagerBot);
+    getHealthStatus(connect: MinecraftSyncMsg): Promise<any[]>;
+    handle(_: any, status?: string[]): Promise<string>;
+}

package/lib/mcsManager/commands/mc/health.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MCBotHealthCommand = void 0;
+const lodash_1 = require("lodash");
+const base_1 = require("../base");
+/**
+ * 服务器 健康 指令
+ *
+ * @example 服务器 健康
+ */
+class MCBotHealthCommand extends base_1.BotCommandBase {
+    constructor(bot) {
+        super(bot);
+        this.bot = bot;
+        this.command = ['服务器.健康 <status>', 'MC.健康 <status>'];
+        this.roles = [];
+        this.initialize();
+    }
+    async getHealthStatus(connect) {
+        const healths = [];
+        if (!connect.rcon || !connect.rcon.authenticated) {
+            return healths;
+        }
+        // FIXME: 此处需适配
+        const result = await connect.sendRconCommand('forge tps');
+        // Overall: Mean tick time: 3.314 ms. Mean TPS: 20.000
+        const [, tickTimeMatch, tpsMatch] = result.match(/Mean tick time: ([\d.]+) ms\. Mean TPS: ([\d.]+)/) || [];
+        if (tickTimeMatch && (0, lodash_1.isNumber)(Number(tickTimeMatch))) {
+            healths.push(`Tick：${Number(tickTimeMatch).toFixed(2)} ms [${Number(tickTimeMatch) <= 50 ? '优秀' : '过高'}]`);
+        }
+        if (tpsMatch && (0, lodash_1.isNumber)(Number(tpsMatch))) {
+            healths.push(`TPS：${Number(tpsMatch).toFixed(2)} [${Number(tpsMatch) >= 15 ? '优秀' : '过低'}]`);
+        }
+        return healths;
+    }
+    async handle(_, status) {
+        const result = ['服务器 健康 状态：'];
+        for (const [name, server] of Object.entries(this.bot.manager.gl.queQiaoAdapter.servers)) {
+            const headers = await this.getHealthStatus(server);
+            const queQIaoConnected = server.ws?.readyState === 1;
+            result.push(`- [${name}] 互通：${queQIaoConnected ? 'OK' : 'NO'} | 后端：${server.rcon.authenticated ? 'OK' : 'NO'} | ${headers.join(' | ')}`);
+        }
+        return result.join('\n');
+    }
+}
+exports.MCBotHealthCommand = MCBotHealthCommand;

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

@@ -10,5 +10,6 @@ export declare class MCBotListCommand extends BotCommandBase {
     command: string[];
     roles: any[];
     constructor(bot: MCSManagerBot);
+    readServerProperties(daemonId: string, instanceId: string): Promise<Record<string, never>>;
     handle(_: any, status?: string[]): Promise<string>;
 }

package/lib/mcsManager/commands/mc/list.js

@@ -18,22 +18,37 @@ class MCBotListCommand extends base_1.BotCommandBase {
         this.roles = [];
         this.initialize();
     }
+    async readServerProperties(daemonId, instanceId) {
+        return this.bot.panel.api.readServerProperties(daemonId, instanceId);
+    }
     async handle(_, status) {
         await this.bot.panel.handleRemoteServices();
-        const filteredStatus = status?.at(0);
+        let filteredStatus = status?.at(0) ?? '运行中';
+        if (filteredStatus === '全部') {
+            filteredStatus = '';
+        }
         const nameInstances = (await this.bot.panel.searchInstanceByName('')).filter(item => !filteredStatus ||
             ~item.instance.cfg.config.nickname.indexOf(filteredStatus) ||
             constants_1.RemoteInstanceStatusName[item.instance.cfg.status] === filteredStatus);
-        return `${'='.repeat(10)}服务器列表${'='.repeat(10)}\n${nameInstances
-            .map(item => {
+        const list = [];
+        for (const item of nameInstances) {
+            let properties = {};
             const { cfg } = item.instance;
             const lastDatetime = (0, lodash_1.isEqual)(cfg.status, constants_1.RemoteInstanceStatusEnum.RUNNING)
                 ? Date.now()
                 : cfg.config.lastDatetime;
             const duration = (0, utils_1.formatDuration)(lastDatetime - new Date(cfg.config.createDatetime).getTime());
-            return `- [${constants_1.RemoteInstanceStatusName[cfg.status]}] ${cfg.config.nickname} 「${duration}」`;
-        })
-            .join('\n')}\n ${'='.repeat(28)} `;
+            try {
+                properties = await this.readServerProperties(item.remote.uuid, item.instance.cfg.instanceUuid);
+            }
+            catch (err) {
+                properties = {};
+            }
+            list.push(`- ${constants_1.RemoteInstanceStatusName[cfg.status]} ${cfg.config.nickname} 「${duration}」[端口 ${properties?.['server-port'] || '--'}]`
+                .replace('运行中', '✅')
+                .replace('已停止', '❌'));
+        }
+        return `${'='.repeat(10)}服务器列表${'='.repeat(10)}\n${list.join('\n')}\n ${'='.repeat(28)} `;
     }
 }
 exports.MCBotListCommand = MCBotListCommand;

package/lib/mcsManager/commands/mc/online.d.ts

@@ -1,12 +1,17 @@
+import MinecraftSyncMsg from '../../../queQiao';
 import { MCSManagerBot } from '../../bot';
 import { McUser } from '../../type';
 import { BotCommandBase } from '../base';
 export declare class MCBotGameOnline extends BotCommandBase {
     readonly bot: MCSManagerBot;
-    static list: Record<string, McUser>;
+    static list: Record<string, {
+        config: Schemastery.TypeS<typeof MinecraftSyncMsg.Config>;
+        list: Record<string, McUser>;
+    }>;
     command: string[];
     roles: any[];
     constructor(bot: MCSManagerBot);
+    getOnlinePlayers(connect: MinecraftSyncMsg): Promise<string[]>;
     handle(): Promise<string>;
 }
 /**

package/lib/mcsManager/commands/mc/online.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MCBotOnlineTimeCommand = exports.MCBotGameOnline = void 0;
+const lodash_1 = require("lodash");
 const utils_1 = require("../../../utils");
 const base_1 = require("../base");
 class MCBotGameOnline extends base_1.BotCommandBase {
@@ -11,14 +12,50 @@ class MCBotGameOnline extends base_1.BotCommandBase {
         this.roles = [];
         this.initialize();
     }
+    async getOnlinePlayers(connect) {
+        // There are 2 of a max of 2026 players online: xxx, xxxx
+        return ((await connect.sendRconCommand('list'))
+            ?.match(/There are \d+ of a max of \d+ players online: (.*)/)?.[1]
+            ?.split(',')
+            ?.map(name => name.trim())
+            ?.filter(name => name.length > 0) ?? []);
+    }
     async handle() {
+        // 先获取在线人数
+        const rconPlayersResults = {};
+        for (const [name, server] of Object.entries(this.bot.manager.gl.queQiaoAdapter.servers)) {
+            const online = await this.getOnlinePlayers(server);
+            const serverConfig = server.config;
+            rconPlayersResults[server.config.serverName || ''] = {
+                config: serverConfig,
+                list: online.reduce((acc, nickname) => {
+                    acc[nickname] = {
+                        nickname,
+                        uuid: '', // UUID 需要通过其他方式获取
+                        server: serverConfig,
+                    };
+                    return acc;
+                }, {}),
+            };
+        }
+        // 内存中的在线玩家
         try {
             const users = await this.bot.ctx.database.get('mcUser', {});
-            const userRankings = Object.values(MCBotGameOnline.list)
+            const allOnlineUsers = Object.values((0, lodash_1.merge)({}, rconPlayersResults, MCBotGameOnline.list)).flatMap(server => {
+                return Object.values(server.list).map(user => {
+                    user.server = server.config;
+                    return user;
+                });
+            });
+            const userRankings = allOnlineUsers
                 .map(user => {
-                const dbUser = users.find(u => u.uuid === user.uuid);
-                const totalOnlineTime = +((Date.now() - (dbUser?.lastTime?.getTime() || 0)) /
+                const dbUser = users.find(u => u.uuid === user.uuid || u.nickname === user.nickname);
+                let totalOnlineTime = +((Date.now() - (dbUser?.lastTime?.getTime() || 0)) /
                     1000).toFixed(0);
+                // rcon 未获取到 UUID 情况
+                if ((0, lodash_1.isEmpty)(user.uuid)) {
+                    totalOnlineTime = -1;
+                }
                 return {
                     ...user,
                     totalOnlineTime,
@@ -26,18 +63,18 @@ class MCBotGameOnline extends base_1.BotCommandBase {
             })
                 .sort((a, b) => b.totalOnlineTime - a.totalOnlineTime)
                 .slice(0, 10);
-            let result = '==== 服务器在线玩家 ====\n';
-            const tag = [, '🥇', '🥈', '🥉'];
+            let result = `==== 在线 玩家 ====\n`;
             userRankings.forEach((user, index) => {
                 const rank = index + 1;
-                const medal = tag[rank] || `${rank}.`;
-                const onlineTimeStr = (0, utils_1.formatOnlineTime)(user.totalOnlineTime);
-                result += `${medal} ${user.nickname} [HP: ${user.health.toFixed(1)} | LV: ${user.experience_level}] 「${onlineTimeStr}」\n`;
-                if (index < userRankings.length - 1) {
-                    result += '\n';
-                }
+                const onlineTimeStr = (0, lodash_1.isEqual)(user.totalOnlineTime, -1)
+                    ? ''
+                    : `「${(0, utils_1.formatOnlineTime)(user.totalOnlineTime)}」`;
+                result += `[${user.server.serverName ?? '-'}] ${rank}. ${user.nickname} ${onlineTimeStr}\n`;
             });
-            result += '====================';
+            result += '=================';
+            if (userRankings.length === 0) {
+                return '当前没有在线玩家';
+            }
             return result;
         }
         catch (error) {

package/lib/mcsManager/config.d.ts

@@ -15,4 +15,43 @@ export declare class MCManagerConfig {
         mcManagerWs: Schema<string, string>;
         mcManagerMaxConnectWs: Schema<number, number>;
     }>>;
+    static QueQiao: Schema<Schemastery.ObjectS<{
+        queQiaoEnable: Schema<boolean, boolean>;
+        queQiaoSendToChannel: Schema<string[], string[]>;
+        queQiaoWatchChannel: Schema<string[], string[]>;
+        queQiaoServers: Schema<Schemastery.ObjectS<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[], Schemastery.ObjectT<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[]>;
+    }>, Schemastery.ObjectT<{
+        queQiaoEnable: Schema<boolean, boolean>;
+        queQiaoSendToChannel: Schema<string[], string[]>;
+        queQiaoWatchChannel: Schema<string[], string[]>;
+        queQiaoServers: Schema<Schemastery.ObjectS<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[], Schemastery.ObjectT<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[]>;
+    }>>;
 }

package/lib/mcsManager/config.js

@@ -22,3 +22,24 @@ MCManagerConfig.Base = koishi_1.Schema.object({
         .default(20)
         .description('最大连接实例数'),
 }).description('MCSMANAGER 基础配置');
+MCManagerConfig.QueQiao = koishi_1.Schema.object({
+    queQiaoEnable: koishi_1.Schema.boolean().default(false).description('是否启用鹊桥'),
+    queQiaoSendToChannel: koishi_1.Schema.array(String).description('消息发送到目标群组格式{platform}:{groupId}'),
+    queQiaoWatchChannel: koishi_1.Schema.array(String).description('消息观察频道目标群组格式{platform}:{groupId}'),
+    queQiaoServers: koishi_1.Schema.array(koishi_1.Schema.object({
+        enable: koishi_1.Schema.boolean().default(false).description('-- 是否启用'),
+        rconServerHost: koishi_1.Schema.string()
+            .default('127.0.0.1:25575')
+            .description('-- rcon地址'),
+        rconPassword: koishi_1.Schema.string()
+            .role('secret')
+            .description('-- rcon服务器的密码(推荐设置)'),
+        wsHost: koishi_1.Schema.string()
+            .default('127.0.0.1:8080')
+            .description('-- websocket服务器的地址(服务器监听地址)'),
+        Token: koishi_1.Schema.string().description('-- websocket服务器的验证Token'),
+        serverName: koishi_1.Schema.string().description('-- 鹊桥配置文件中对应的server_name'),
+    }))
+        .default([])
+        .description('启用鹊桥的服务器列表，留空表示全部启用'),
+}).description('MCSMANAGER 鹊桥配置');

package/lib/mcsManager/index.d.ts

@@ -11,6 +11,25 @@ export declare class MCManager {
         mcManagerHost: Schema<string, string>;
         mcManagerWs: Schema<string, string>;
         mcManagerMaxConnectWs: Schema<number, number>;
+    }> | Schemastery.ObjectS<{
+        queQiaoEnable: Schema<boolean, boolean>;
+        queQiaoSendToChannel: Schema<string[], string[]>;
+        queQiaoWatchChannel: Schema<string[], string[]>;
+        queQiaoServers: Schema<Schemastery.ObjectS<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[], Schemastery.ObjectT<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[]>;
     }>, {
         mcManagerUsername: string;
         mcManagerPassword: string;
@@ -18,7 +37,19 @@ export declare class MCManager {
         mcManagerHost: string;
         mcManagerWs: string;
         mcManagerMaxConnectWs: number;
-    } & import("cosmokit").Dict>;
+    } & import("cosmokit").Dict & {
+        queQiaoEnable: boolean;
+        queQiaoSendToChannel: string[];
+        queQiaoWatchChannel: string[];
+        queQiaoServers: Schemastery.ObjectT<{
+            enable: Schema<boolean, boolean>;
+            rconServerHost: Schema<string, string>;
+            rconPassword: Schema<string, string>;
+            wsHost: Schema<string, string>;
+            Token: Schema<string, string>;
+            serverName: Schema<string, string>;
+        }>[];
+    }>;
     private panel;
     private bot;
     constructor(gl: GLBot, ctx: Context, config: GLBotConfigType);

package/lib/mcsManager/index.js

@@ -21,4 +21,7 @@ class MCManager {
     }
 }
 exports.MCManager = MCManager;
-MCManager.Config = koishi_1.Schema.intersect([config_1.MCManagerConfig.Base]);
+MCManager.Config = koishi_1.Schema.intersect([
+    config_1.MCManagerConfig.Base,
+    config_1.MCManagerConfig.QueQiao,
+]);