koishi-plugin-gl-bot 0.0.9 → 0.0.11

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");
@@ -17,7 +17,7 @@ class MCSManagerPanel {
         this.remotes = [];
         // 远程连接Map表
         this.remoteConnectionsMap = new Map();
-        this.api = new api_1.MCSManagerAPI(ctx.http, config.mcManagerHost);
+        this.api = new api_1.MCSManagerAPI(ctx.http, config.mcManagerHost, config.mcManagerWs);
         this.initialize();
     }
     async initialize() {
@@ -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/schedules/index.d.ts

@@ -0,0 +1,8 @@
+import { Context } from 'koishi';
+import * as McSchedule from './mc.schedule';
+declare module 'koishi' {
+    interface Tables {
+        mcUser: McSchedule.McUser;
+    }
+}
+export declare const registerMcSchedule: (ctx: Context) => void;

package/lib/mcsManager/schedules/index.js

@@ -0,0 +1,41 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerMcSchedule = void 0;
+const McSchedule = __importStar(require("./mc.schedule"));
+const registerMcSchedule = (ctx) => {
+    McSchedule.default(ctx);
+};
+exports.registerMcSchedule = registerMcSchedule;

package/lib/mcsManager/schedules/mc.schedule.d.ts

@@ -0,0 +1,11 @@
+import { Context } from 'koishi';
+export interface McUser {
+    id: number;
+    nickname: string;
+    uuid: string;
+    lastTime: Date;
+    level: number;
+    onlineTimeJSON: string;
+}
+declare const _default: (ctx: Context) => void;
+export default _default;

package/lib/mcsManager/schedules/mc.schedule.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (ctx) => {
+    ctx.model.extend('mcUser', {
+        id: { type: 'unsigned', length: 8 },
+        nickname: 'string',
+        uuid: 'string',
+        lastTime: 'timestamp',
+        level: 'integer',
+        onlineTimeJSON: 'text',
+    }, {
+        primary: 'id',
+        autoInc: true,
+    });
+};

package/lib/mcsManager/type.d.ts

@@ -113,3 +113,105 @@ export interface ServiceInstanceConnectAuth {
     addr: string;
     prefix: string;
 }
+export interface CreateInstanceData {
+    nickname?: string;
+    startCommand?: string;
+    stopCommand?: string;
+    cwd?: string;
+    ie?: string;
+    oe?: string;
+    processType?: string;
+    createDatetime?: string;
+    lastDatetime?: string;
+    type?: string;
+    tag?: string[];
+    maxSpace?: null;
+    endTime?: string;
+    docker?: {
+        containerName?: string;
+        image?: string;
+        ports?: string[];
+        extraVolumes?: string[];
+        networkMode?: 'bridge';
+        networkAliases?: string[];
+        cpusetCpus?: string;
+        workingDir?: '/data';
+        changeWorkdir?: false;
+        env?: [];
+    };
+}
+export type TerminalOption = {
+    haveColor: boolean;
+    pty: boolean;
+    ptyWindowCol: number;
+    ptyWindowRow: number;
+};
+export type EventTaskConfig = {
+    autoStart: boolean;
+    autoRestart: boolean;
+    autoRestartMaxTimes: number;
+    ignore: boolean;
+};
+export type DockerConfig = {
+    containerName: string;
+    image: string;
+    ports: unknown[];
+    extraVolumes: unknown[];
+    networkMode: string;
+    networkAliases: string[];
+    cpusetCpus: string;
+    workingDir: string;
+    env: unknown[];
+    changeWorkdir: boolean;
+};
+export type PingConfig = {
+    ip: string;
+    type: number;
+};
+export type ExtraServiceConfig = {
+    openFrpTunnelId: string;
+    openFrpToken: string;
+};
+export type CreateInstanceConfig = {
+    nickname: string;
+    startCommand: string;
+    stopCommand: string;
+    cwd: string;
+    ie: string;
+    oe: string;
+    createDatetime: number;
+    lastDatetime: number;
+    type: string;
+    tag: string[];
+    endTime: number;
+    fileCode: string;
+    processType: string;
+    updateCommand: string;
+    runAs: string;
+    actionCommandList: unknown[];
+    crlf: number;
+    category: number;
+    enableRcon: boolean;
+    rconPassword: string;
+    rconIp: string;
+    terminalOption: TerminalOption;
+    eventTask: EventTaskConfig;
+    docker: DockerConfig;
+    pingConfig: PingConfig;
+    extraServiceConfig: ExtraServiceConfig;
+};
+export interface McUser {
+    nickname: string;
+    uuid: string;
+    address: string;
+    health: number;
+    max_health: number;
+    experience_level: number;
+    experience_progress: number;
+    total_experience: number;
+    is_op: boolean;
+    walk_speed: number;
+    x: number;
+    y: number;
+    z: number;
+}

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) {
@@ -62,7 +62,7 @@ class MCSManagerWebSocketIO {
             reconnectionAttempts: 2000,
         });
         this.bindEvents();
-        logger.info(`正在连接到 MCSManager 实例服务器 [${this.remote.remarks}] - ${this.instance.config.nickname} ...`);
+        logger.debug(`正在连接到 MCSManager 实例服务器 [${this.remote.remarks}] - ${this.instance.config.nickname} ...`);
     }
     // 发送MC指令到远程实例
     sendCommand(command) {
@@ -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/napCat/api.d.ts

@@ -0,0 +1,21 @@
+import { HTTP } from 'koishi';
+export declare class NapCatApi {
+    private http;
+    private baseUrl;
+    private token;
+    get requestHeaders(): {
+        authorization: string;
+    };
+    constructor(http: HTTP, baseUrl: string, token: string);
+    /**
+     * 获取文件信息
+     * @param fileId 文件ID
+     * @returns 文件信息或false
+     */
+    getFile(fileId: string): Promise<false | {
+        file: string;
+        url: string;
+        file_size: string;
+        file_name: string;
+    }>;
+}

package/lib/napCat/api.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NapCatApi = void 0;
+class NapCatApi {
+    get requestHeaders() {
+        return {
+            authorization: this.token,
+        };
+    }
+    constructor(http, baseUrl, token) {
+        this.http = http;
+        this.baseUrl = baseUrl;
+        this.token = token;
+    }
+    /**
+     * 获取文件信息
+     * @param fileId 文件ID
+     * @returns 文件信息或false
+     */
+    async getFile(fileId) {
+        console.log(`${this.baseUrl}/get_file`, {
+            file_id: fileId,
+        });
+        try {
+            const result = await this.http(`${this.baseUrl}/get_file`, {
+                method: 'POST',
+                headers: this.requestHeaders,
+                data: {
+                    file_id: fileId,
+                },
+            });
+            console.log(result?.data);
+            if (result.status === 200 && result.data) {
+                return result.data.data;
+            }
+        }
+        catch (error) {
+            console.error('Error fetching file:', error);
+        }
+        return false;
+    }
+}
+exports.NapCatApi = NapCatApi;

package/lib/napCat/config.d.ts

@@ -0,0 +1,10 @@
+import { Schema } from 'koishi';
+export declare class NapCatConfig {
+    static Base: Schema<Schemastery.ObjectS<{
+        napCatBaseUrl: Schema<string, string>;
+        napCatToken: Schema<string, string>;
+    }>, Schemastery.ObjectT<{
+        napCatBaseUrl: Schema<string, string>;
+        napCatToken: Schema<string, string>;
+    }>>;
+}

package/lib/napCat/config.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NapCatConfig = void 0;
+const koishi_1 = require("koishi");
+class NapCatConfig {
+}
+exports.NapCatConfig = NapCatConfig;
+NapCatConfig.Base = koishi_1.Schema.object({
+    napCatBaseUrl: koishi_1.Schema.string()
+        .default('http://localhost:3000')
+        .description('地址'),
+    napCatToken: koishi_1.Schema.string()
+        .role('secret')
+        .default('admin')
+        .description('密码'),
+}).description('NapCat 基础配置');

package/lib/napCat/index.d.ts

@@ -0,0 +1,16 @@
+import { Context, Schema } from 'koishi';
+import { GLBotConfigType } from '../gl';
+import { NapCatApi } from './api';
+export declare class NapCat {
+    private readonly ctx;
+    private readonly config;
+    static Config: Schema<Schemastery.ObjectS<{
+        napCatBaseUrl: Schema<string, string>;
+        napCatToken: Schema<string, string>;
+    }>, {
+        napCatBaseUrl: string;
+        napCatToken: string;
+    } & import("cosmokit").Dict>;
+    readonly api: NapCatApi;
+    constructor(ctx: Context, config: GLBotConfigType);
+}

package/lib/napCat/index.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NapCat = void 0;
+const koishi_1 = require("koishi");
+const api_1 = require("./api");
+const config_1 = require("./config");
+class NapCat {
+    constructor(ctx, config) {
+        this.ctx = ctx;
+        this.config = config;
+        this.api = new api_1.NapCatApi(ctx.http, config.napCatBaseUrl, config.napCatToken);
+    }
+}
+exports.NapCat = NapCat;
+NapCat.Config = koishi_1.Schema.intersect([config_1.NapCatConfig.Base]);

package/lib/queQiao/index.d.ts

@@ -32,6 +32,7 @@ declare class MinecraftSyncMsg {
     private bindWebSocketEvents;
     private handleWsOpen;
     private handleWsMessage;
+    private updatePlayerOnlineTime;
     private handleWsClose;
     private handleWsError;
     private setupWatchChannel;

package/lib/queQiao/index.js

@@ -5,10 +5,11 @@ 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");
+const online_1 = require("../mcsManager/commands/mc/online");
 const utils_1 = require("../utils");
 const mcwss_1 = __importDefault(require("./mcwss"));
 const values_1 = require("./values");
@@ -120,8 +121,11 @@ class MinecraftSyncMsg {
             logger.error('Failed to parse WebSocket message:', err);
             return;
         }
+        // 在线时间逻辑
+        this.updatePlayerOnlineTime(data);
         const eventName = data.event_name ? (0, values_1.getListeningEvent)(data.event_name) : '';
-        if (eventName === 'PlayerCommandPreprocessEvent') {
+        if (!eventName ||
+            ['PlayerCommandPreprocessEvent', 'PlayerDeathEvent'].includes(eventName)) {
             return;
         }
         // console.log(data);
@@ -149,6 +153,69 @@ class MinecraftSyncMsg {
             this.broadcastToChannels(sendMsg);
         }
     }
+    async updatePlayerOnlineTime(data) {
+        if (data.player) {
+            online_1.MCBotGameOnline.list[data.player?.uuid] = data.player;
+        }
+        console.log(data);
+        if (!['PlayerJoinEvent', 'PlayerQuitEvent'].includes(data.event_name)) {
+            return;
+        }
+        const user = await this.ctx.database.get('mcUser', {
+            uuid: data.player?.uuid,
+        });
+        online_1.MCBotGameOnline.list[data.player?.uuid] = data.player;
+        if (user.length === 0) {
+            await this.ctx.database.create('mcUser', {
+                nickname: data.player?.nickname,
+                uuid: data.player?.uuid,
+                lastTime: new Date(),
+                level: data.player?.level || 0,
+                onlineTimeJSON: JSON.stringify({
+                    mc: {
+                        [data.player?.uuid]: 0,
+                    },
+                }),
+            });
+            return;
+        }
+        if (data.event_name === 'PlayerJoinEvent') {
+            await this.ctx.database.set('mcUser', { uuid: data.player?.uuid }, {
+                nickname: data.player?.nickname,
+                level: data.player?.experience_level || 0,
+                lastTime: new Date(),
+            });
+            return;
+        }
+        // 更新在线时间 （加入游戏时会更新lastTime，退出游戏时通过lastTime算出本次在线时间，加到onlineTimeJSON中）
+        if (data.event_name === 'PlayerQuitEvent') {
+            const lastTime = new Date(user[0].lastTime).getTime();
+            const nowTime = Date.now();
+            const onlineDuration = Math.floor((nowTime - lastTime) / 1000); // 在线时长，单位秒
+            delete online_1.MCBotGameOnline.list[user[0].uuid];
+            let onlineTimeJSON = {};
+            try {
+                onlineTimeJSON = JSON.parse(user[0].onlineTimeJSON);
+            }
+            catch (err) {
+                onlineTimeJSON = {};
+            }
+            if (!onlineTimeJSON.mc) {
+                onlineTimeJSON.mc = {};
+            }
+            if (!onlineTimeJSON.mc[data.player?.uuid]) {
+                onlineTimeJSON.mc[data.player?.uuid] = 0;
+            }
+            onlineTimeJSON.mc[data.player?.uuid] += onlineDuration;
+            await this.ctx.database.set('mcUser', { uuid: data.player?.uuid }, {
+                nickname: data.player?.nickname,
+                lastTime: new Date(),
+                level: data.player?.experience_level || 0,
+                onlineTimeJSON: JSON.stringify(onlineTimeJSON),
+            });
+        }
+        console.log({ user });
+    }
     handleWsClose() {
         if (this.isDisposing) {
             return;
@@ -364,7 +431,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.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} 加入了服务器！","PlayerCommandPreprocessEvent":"[指令]{0} 执行了指令","PlayerDeathEvent":"{0} 与山长眠！","AsyncPlayerChatEvent":"[MC] {0}: {1}","PlayerQuitEvent":"{0} 离开了服务器！"},"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: "[MC] {0}: {1}"
+    PlayerQuitEvent: "{0} 离开了服务器！"
+  message:
+    MCReceivePrefix: "({0})[{1}]"

package/lib/utils/file.download.d.ts

@@ -0,0 +1,47 @@
+import { Context } from 'koishi';
+/**
+ * 文件下载工具
+ */
+export declare class FileDownloader {
+    private ctx;
+    constructor(ctx: Context);
+    /**
+     * 从消息内容中提取文件元素
+     * @param content 消息内容
+     * @returns 文件元素数组
+     */
+    extractFileElements(content: string): {
+        src: string;
+        fileId: string;
+        fileSize?: number;
+        fileName?: string;
+    }[];
+    /**
+     * 下载文件到本地
+     * @param fileId 文件ID
+     * @param fileName 文件名
+     * @param downloadDir 下载目录
+     * @param bot 机器人实例（可选，如果平台支持直接获取文件URL）
+     * @returns 下载的文件路径
+     */
+    downloadFile(fileId: string, fileName: string, downloadDir?: string, bot?: any): Promise<string | null>;
+    /**
+     * 从URL下载文件
+     * @param url 文件URL
+     * @param filePath 保存路径
+     * @returns 文件路径或null
+     */
+    private downloadFromUrl;
+    /**
+     * 根据文件ID构造可能的文件URL
+     * @param fileId 文件ID
+     * @returns 可能的URL数组
+     */
+    private constructPossibleFileUrls;
+    /**
+     * 格式化文件大小
+     * @param bytes 字节数
+     * @returns 格式化的文件大小
+     */
+    formatFileSize(bytes: number): string;
+}