koishi-plugin-docker-control 0.0.3 → 0.0.4

package/lib/commands/control.js

@@ -219,12 +219,13 @@ function registerControlCommands(ctx, getService, config) {
         logger_1.commandLogger.info(`[${selector}] 执行命令: "${cmd}"`);
         try {
             const { node, container: found } = await service.findContainer(selector, container);
-            const result = await node.execContainer(found.Id, [
-                '/bin/sh',
-                '-c',
-                cmd,
-            ]);
+            const result = await node.execContainer(found.Id, cmd);
             const name = found.Names[0]?.replace('/', '') || found.Id.slice(0, 8);
+            // 图片渲染模式
+            if (useImageOutput && ctx.puppeteer) {
+                const html = (0, render_1.generateExecHtml)(node.name, name, cmd, result.output, result.exitCode);
+                return await (0, render_1.renderToImage)(ctx, html);
+            }
             if (result.output.trim()) {
                 return `=== ${node.name}: ${name} ===\n${result.output}`;
             }

package/lib/commands/index.js

@@ -68,16 +68,36 @@ function registerHelperCommands(ctx, getService, config) {
         }
         const node = nodes[0];
         try {
-            const version = await node.getVersion();
+            const [version, systemInfo, containerCount, imageCount] = await Promise.all([
+                node.getVersion(),
+                node.getSystemInfo(),
+                node.getContainerCount(),
+                node.getImageCount(),
+            ]);
+            // 将容器和镜像数量添加到节点对象
+            const nodeData = {
+                ...node,
+                containerCount: containerCount.total,
+                imageCount: imageCount,
+            };
             if (useImageOutput && ctx.puppeteer) {
-                const html = (0, render_1.generateNodeDetailHtml)(node, version);
+                const html = (0, render_1.generateNodeDetailHtml)(nodeData, version, systemInfo);
                 return await (0, render_1.renderToImage)(ctx, html);
             }
+            const memoryUsed = systemInfo?.MemTotal && systemInfo?.MemAvailable !== undefined
+                ? `${Math.round((1 - systemInfo.MemAvailable / systemInfo.MemTotal) * 100)}%`
+                : '-';
+            const nodeName = node.config?.name || node.name || node.Name || 'Unknown';
+            const nodeId = node.id || node.ID || node.Id || node.config?.id || '-';
             const lines = [
-                `=== ${node.name} ===`,
-                `ID: ${node.id}`,
-                `状态: ${node.status}`,
-                `标签: ${node.tags.join(', ') || '无'}`,
+                `=== ${nodeName} ===`,
+                `ID: ${nodeId}`,
+                `状态: ${node.status || node.Status || 'unknown'}`,
+                `标签: ${node.tags?.join(', ') || node.config?.tags?.join(', ') || '无'}`,
+                `CPU: ${systemInfo?.NCPU || '-'} 核心`,
+                `内存: ${memoryUsed} (可用: ${systemInfo?.MemAvailable ? Math.round(systemInfo.MemAvailable / 1024 / 1024) + ' MB' : '-'})`,
+                `容器: ${containerCount.running}/${containerCount.total} 运行中`,
+                `镜像: ${imageCount} 个`,
                 `Docker 版本: ${version.Version}`,
                 `API 版本: ${version.ApiVersion}`,
                 `操作系统: ${version.Os} (${version.Arch})`,
@@ -146,7 +166,7 @@ function registerHelperCommands(ctx, getService, config) {
             if (c.State !== 'running') {
                 return `容器 ${container} 未运行`;
             }
-            const result = await node.execContainer(c.Id, cmd.split(' '));
+            const result = await node.execContainer(c.Id, cmd);
             return [
                 `=== 执行结果 ===`,
                 `退出码: ${result.exitCode}`,
@@ -158,47 +178,6 @@ function registerHelperCommands(ctx, getService, config) {
             return `执行失败: ${e.message}`;
         }
     });
-    /**
-     * 交互式执行 (返回结果，不支持实时交互)
-     */
-    ctx
-        .command('docker.shell <container> <cmd>', '在容器中执行命令(交互式)')
-        .alias('dockershell', '容器shell')
-        .option('node', '-n <node> 指定节点', { fallback: '' })
-        .option('timeout', '-t <seconds> 超时时间', { fallback: 30 })
-        .action(async ({ options }, container, cmd) => {
-        const service = getService();
-        if (!service) {
-            return 'Docker 服务未初始化';
-        }
-        const nodeSelector = options.node || 'all';
-        try {
-            const nodes = service.getNodesBySelector(nodeSelector);
-            if (nodes.length === 0) {
-                return `未找到节点: ${nodeSelector}`;
-            }
-            const results = await service.findContainerGlobal(container);
-            if (results.length === 0) {
-                return `未找到容器: ${container}`;
-            }
-            const { node, container: c } = results[0];
-            if (c.State !== 'running') {
-                return `容器 ${container} 未运行`;
-            }
-            const result = await node.execContainer(c.Id, cmd.split(' '));
-            return [
-                `=== ${node.name}/${c.Names[0]?.replace('/', '') || c.Id.slice(0, 8)} ===`,
-                `> ${cmd}`,
-                ``,
-                result.output || '(无输出)',
-                ``,
-                `[退出码: ${result.exitCode}]`,
-            ].join('\n');
-        }
-        catch (e) {
-            return `执行失败: ${e.message}`;
-        }
-    });
     /**
      * 查看帮助
      */
@@ -210,15 +189,14 @@ function registerHelperCommands(ctx, getService, config) {
             '  docker.nodes               - 查看节点列表',
             '  docker.node <节点>         - 查看节点详情',
             '',
-            '【容器操作】',
-            '  docker.ls [节点]           - 列出容器',
-            '  docker.start <容器>        - 启动容器',
-            '  docker.stop <容器>         - 停止容器',
-            '  docker.restart <容器>      - 重启容器',
-            '  docker.logs <容器> [-t 行数] - 查看日志',
-            '  docker.find <容器>         - 搜索容器',
-            '  docker.exec <容器> <命令>  - 执行命令',
-            '  docker.shell <容器> <命令> - 交互式执行',
+            '【容器操作】(参数顺序: 节点 容器)',
+            '  docker.ls <节点>           - 列出容器',
+            '  docker.start <节点> <容器> - 启动容器',
+            '  docker.stop <节点> <容器>  - 停止容器',
+            '  docker.restart <节点> <容器> - 重启容器',
+            '  docker.logs <节点> <容器> [-n 行数] - 查看日志',
+            '  docker.inspect <节点> <容器> - 查看容器详情',
+            '  docker.exec <节点> <容器> <命令> - 在容器内执行命令',
             '',
             '【节点选择器】',
             '  all        - 所有节点',

package/lib/commands/list.js

@@ -30,6 +30,10 @@ function registerListCommand(ctx, getService, config) {
             if (!ctx.puppeteer) {
                 return '错误: 未安装 koishi-plugin-puppeteer 插件，无法使用图片渲染';
             }
+            // 如果未指定节点，提示用户
+            if (!selector) {
+                return '请指定节点名称、ID 或标签，或使用 "all" 列出全部容器\n例如: docker.ls @web -f image 或 docker.ls all -f image';
+            }
             try {
                 // 获取容器数据
                 logger_1.commandLogger.debug('获取容器数据...');
@@ -39,7 +43,7 @@ function registerListCommand(ctx, getService, config) {
                     return '未发现任何容器';
                 }
                 // 生成并渲染
-                const html = (0, render_1.generateListHtml)(results, selector ? `容器列表 (${selector})` : '容器列表');
+                const html = (0, render_1.generateListHtml)(results, `容器列表 (${selector})`);
                 return await (0, render_1.renderToImage)(ctx, html);
             }
             catch (e) {
@@ -49,9 +53,13 @@ function registerListCommand(ctx, getService, config) {
         }
         // 文字模式
         try {
+            // 如果未指定节点，提示用户
+            if (!selector) {
+                return '请指定节点名称、ID 或标签，或使用 "all" 列出全部容器\n例如: docker.ls @web 或 docker.ls all';
+            }
             const results = await getContainerResults(service, selector, all);
             if (results.length === 0) {
-                return selector ? '所有指定节点均未连接' : '未发现任何容器';
+                return '所有指定节点均未连接';
             }
             const lines = [];
             for (const { node, containers } of results) {

package/lib/commands/logs.d.ts

@@ -1,6 +1,6 @@
 /**
  * 日志指令
- * docker.logs <container> [node]
+ * docker.logs <node> <container>
  */
 import { Context } from 'koishi';
 import type { DockerControlConfig } from '../types';

package/lib/commands/logs.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerLogsCommand = registerLogsCommand;
 const logger_1 = require("../utils/logger");
+const render_1 = require("../utils/render");
 /**
  * 获取容器名称
  */
@@ -12,74 +13,63 @@ function getContainerName(c) {
  * 注册日志指令
  */
 function registerLogsCommand(ctx, getService, config) {
+    const useImageOutput = config?.imageOutput === true;
     ctx
-        .command('docker.logs <container> [node]', '查看容器日志')
+        .command('docker.logs <node> <container>', '查看容器日志')
         .alias('docker日志', '容器日志', 'docker查看日志', '容器查看日志', 'dockerlogs')
         .option('lines', '-n <lines:number> 显示最后 N 行')
         .option('timestamp', '-t 显示时间戳')
-        .action(async ({ options }, container, node) => {
-        logger_1.commandLogger.debug(`docker.logs 被调用: container=${container}, node=${node}, lines=${options.lines}, timestamp=${options.timestamp}`);
+        .option('all', '-a 显示全部（不截断）')
+        .action(async ({ options }, node, container) => {
+        logger_1.commandLogger.debug(`docker.logs 被调用: node=${node}, container=${container}, lines=${options.lines}, timestamp=${options.timestamp}`);
         const service = getService();
         if (!service) {
             logger_1.commandLogger.debug('服务未初始化');
             return 'Docker 服务未初始化';
         }
         // 参数校验
-        if (!container) {
-            return '请指定容器名或ID\n用法示例:\n  docker.logs my-app\n  docker.logs my-app node-1 -n 50';
+        if (!node || !container) {
+            return '请指定节点和容器\n用法示例:\n  docker.logs @web my-app -n 50\n  docker.logs all my-app';
         }
         // 确定日志行数 (优先级: 命令行参数 > 全局配置 > 默认值)
         const tail = options.lines || config?.defaultLogLines || 100;
         const showTimestamp = options.timestamp || false;
-        logger_1.commandLogger.debug(`日志参数: tail=${tail}, showTimestamp=${showTimestamp}`);
+        const showAll = options.all || false;
+        logger_1.commandLogger.debug(`日志参数: tail=${tail}, showTimestamp=${showTimestamp}, showAll=${showAll}`);
         try {
-            let targetNode = null;
-            let containerInfo = null;
-            // 查找容器逻辑
-            if (node) {
-                // 指定节点查找
-                const nodes = service.getNodesBySelector(node);
-                if (nodes.length === 0) {
-                    logger_1.commandLogger.debug(`找不到节点: ${node}`);
-                    return `❌ 找不到节点: ${node}`;
-                }
-                targetNode = nodes[0];
-                logger_1.commandLogger.debug(`在节点 ${targetNode.name} 中查找容器...`);
-                const result = await service.findContainer(targetNode.id, container);
-                containerInfo = result.container;
-            }
-            else {
-                // 全局模糊查找
-                logger_1.commandLogger.debug(`全局搜索容器: ${container}`);
-                const results = await service.findContainerGlobal(container);
-                if (results.length === 0) {
-                    logger_1.commandLogger.debug(`找不到容器: ${container}`);
-                    return `❌ 找不到容器: ${container}`;
-                }
-                // 优先返回 Running 的，如果没有则返回第一个
-                const running = results.find(r => r.container.State === 'running');
-                const target = running || results[0];
-                targetNode = target.node;
-                containerInfo = target.container;
+            // 查找节点
+            const nodes = service.getNodesBySelector(node);
+            if (nodes.length === 0) {
+                logger_1.commandLogger.debug(`找不到节点: ${node}`);
+                return `找不到节点: ${node}`;
             }
+            // 在节点上查找容器
+            const { node: targetNode, container: containerInfo } = await service.findContainer(nodes[0].id, container);
             if (!targetNode || !containerInfo) {
-                return '❌ 未能获取容器信息';
+                return '未能获取容器信息';
             }
             // 获取日志
-            const logs = await targetNode.getContainerLogs(containerInfo.Id, tail);
+            const logs = await targetNode.getContainerLogs(containerInfo.Id, showAll ? 10000 : tail);
             if (!logs || !logs.trim()) {
                 return `${targetNode.name}: ${getContainerName(containerInfo)} - 无日志`;
             }
             // 格式化输出
             const lines = logs.split('\n').filter(l => l.length > 0);
-            const displayLines = lines.length > tail ? lines.slice(-tail) : lines;
+            const displayLines = !showAll && lines.length > tail ? lines.slice(-tail) : lines;
             // 移除 ANSI 颜色代码
             const cleanLogs = displayLines.map(line => line.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '')).join('\n');
-            return `=== ${targetNode.name}: ${getContainerName(containerInfo)} (最后 ${displayLines.length} 行) ===\n${cleanLogs}`;
+            // 图片渲染模式
+            if (useImageOutput && ctx.puppeteer && !showAll) {
+                const html = (0, render_1.generateLogsHtml)(targetNode.name, getContainerName(containerInfo), cleanLogs, displayLines.length);
+                // 根据行数动态计算高度：header 80px + header 80px + 每行 25px + padding
+                const estimatedHeight = 200 + displayLines.length * 25;
+                return await (0, render_1.renderToImage)(ctx, html, { height: Math.max(estimatedHeight, 800) });
+            }
+            return `=== ${targetNode.name}: ${getContainerName(containerInfo)} (${showAll ? '全部' : `最后 ${displayLines.length} 行`}) ===\n${cleanLogs}`;
         }
         catch (e) {
             logger_1.commandLogger.error(e);
-            return `❌ 获取日志失败: ${e.message}`;
+            return `获取日志失败: ${e.message}`;
         }
     });
 }

package/lib/service/connector.d.ts

@@ -9,6 +9,13 @@ export declare class DockerConnector {
      */
     exec(command: string): Promise<string>;
     private execInternal;
+    /**
+     * 执行命令并返回输出和退出码
+     */
+    execWithExitCode(command: string): Promise<{
+        output: string;
+        exitCode: number;
+    }>;
     /**
      * 执行 docker ps 获取容器列表
      */
@@ -32,7 +39,10 @@ export declare class DockerConnector {
     /**
      * 执行容器内命令
      */
-    execContainer(containerId: string, cmd: string): Promise<string>;
+    execContainer(containerId: string, cmd: string): Promise<{
+        output: string;
+        exitCode: number;
+    }>;
     /**
      * 监听 Docker 事件流
      * @param callback 每行事件数据的回调

package/lib/service/connector.js

@@ -77,6 +77,43 @@ class DockerConnector {
             });
         });
     }
+    /**
+     * 执行命令并返回输出和退出码
+     */
+    async execWithExitCode(command) {
+        const client = await this.getConnection();
+        logger_1.connectorLogger.debug(`[${this.config.name}] 执行命令: ${command}`);
+        return new Promise((resolve, reject) => {
+            client.exec(command, (err, stream) => {
+                if (err) {
+                    logger_1.connectorLogger.debug(`[${this.config.name}] 命令执行错误: ${err.message}`);
+                    reject(err);
+                    return;
+                }
+                let stdout = '';
+                let stderr = '';
+                let exitCode = null;
+                stream.on('close', (code, signal) => {
+                    logger_1.connectorLogger.debug(`[${this.config.name}] 命令完成: code=${code}, signal=${signal}`);
+                    exitCode = code ?? 0;
+                    // 显式结束 stream 防止 channel 泄露
+                    try {
+                        stream.end();
+                    }
+                    catch (e) {
+                        // 可能已经关闭，忽略错误
+                    }
+                    resolve({ output: stdout.trim(), exitCode });
+                });
+                stream.on('data', (data) => {
+                    stdout += data.toString();
+                });
+                stream.on('err', (data) => {
+                    stderr += data.toString();
+                });
+            });
+        });
+    }
     /**
      * 执行 docker ps 获取容器列表
      */
@@ -115,7 +152,7 @@ class DockerConnector {
     async execContainer(containerId, cmd) {
         // 使用 docker exec 需要处理引号
         const escapedCmd = cmd.replace(/'/g, "'\\''");
-        return this.exec(`docker exec ${containerId} sh -c '${escapedCmd}'`);
+        return this.execWithExitCode(`docker exec ${containerId} sh -c '${escapedCmd}'`);
     }
     /**
      * 监听 Docker 事件流

package/lib/service/index.d.ts

@@ -62,4 +62,11 @@ export declare class DockerService {
      */
     onNodeEvent(callback: (event: DockerEvent, nodeId: string) => void): () => void;
     stopAll(): Promise<void>;
+    /**
+     * 获取所有在线节点的容器聚合
+     */
+    getAggregatedContainers(all?: boolean): Promise<Array<{
+        node: DockerNode;
+        containers: ContainerInfo[];
+    }>>;
 }

package/lib/service/index.js

@@ -198,5 +198,22 @@ class DockerService {
         this.eventCallbacks.clear();
         logger_1.logger.info('Docker 服务已停止');
     }
+    /**
+     * 获取所有在线节点的容器聚合
+     */
+    async getAggregatedContainers(all = true) {
+        const results = [];
+        for (const node of this.getOnlineNodes()) {
+            try {
+                const containers = await node.listContainers(all);
+                results.push({ node, containers });
+            }
+            catch (e) {
+                logger_1.logger.warn(`[${node.name}] 获取容器列表失败: ${e}`);
+                results.push({ node, containers: [] });
+            }
+        }
+        return results;
+    }
 }
 exports.DockerService = DockerService;

package/lib/service/node.d.ts

@@ -27,6 +27,7 @@ export declare class DockerNode {
     constructor(config: NodeConfig, credential: CredentialConfig, debug?: boolean);
     /**
      * 连接到 Docker (带重试)
+     * 前 3 次失败后每 1 分钟重试一次，直到成功
      */
     connect(): Promise<void>;
     /**
@@ -60,7 +61,10 @@ export declare class DockerNode {
     /**
      * 执行容器内命令
      */
-    execContainer(containerId: string, cmd: string): Promise<string>;
+    execContainer(containerId: string, cmd: string): Promise<{
+        output: string;
+        exitCode: number;
+    }>;
     /**
      * 获取 Docker 版本信息
      */
@@ -71,6 +75,25 @@ export declare class DockerNode {
         Arch: string;
         KernelVersion: string;
     }>;
+    /**
+     * 获取系统信息 (CPU、内存)
+     */
+    getSystemInfo(): Promise<{
+        NCPU: number;
+        MemTotal: number;
+        MemAvailable?: number;
+    } | null>;
+    /**
+     * 获取容器数量
+     */
+    getContainerCount(): Promise<{
+        running: number;
+        total: number;
+    }>;
+    /**
+     * 获取镜像数量
+     */
+    getImageCount(): Promise<number>;
     /**
      * 获取容器详细信息 (docker inspect)
      */

package/lib/service/node.js

@@ -38,6 +38,7 @@ class DockerNode {
     }
     /**
      * 连接到 Docker (带重试)
+     * 前 3 次失败后每 1 分钟重试一次，直到成功
      */
     async connect() {
         if (this.status === constants_1.NodeStatus.CONNECTING) {
@@ -46,10 +47,18 @@ class DockerNode {
         }
         this.status = constants_1.NodeStatus.CONNECTING;
         let attempt = 0;
-        let lastError = null;
-        while (attempt < constants_1.MAX_RETRY_COUNT) {
+        const MAX_INITIAL_ATTEMPTS = 3; // 前 3 次快速重试
+        const LONG_RETRY_INTERVAL = 60000; // 1 分钟
+        while (true) {
             attempt++;
-            logger_1.nodeLogger.info(`[${this.name}] 连接尝试 ${attempt}/${constants_1.MAX_RETRY_COUNT}...`);
+            const isInitialAttempts = attempt <= MAX_INITIAL_ATTEMPTS;
+            const currentInterval = isInitialAttempts ? constants_1.RETRY_INTERVAL : LONG_RETRY_INTERVAL;
+            if (isInitialAttempts) {
+                logger_1.nodeLogger.info(`[${this.name}] 连接尝试 ${attempt}/${MAX_INITIAL_ATTEMPTS}...`);
+            }
+            else {
+                logger_1.nodeLogger.info(`[${this.name}] 连接尝试 ${attempt} (每 ${LONG_RETRY_INTERVAL / 1000} 秒重试)...`);
+            }
             try {
                 // 创建 connector
                 const connector = new connector_1.DockerConnector(this.config, { credentials: [this.credential], nodes: [this.config] });
@@ -74,20 +83,16 @@ class DockerNode {
                 return;
             }
             catch (error) {
-                lastError = error instanceof Error ? error : new Error(String(error));
+                const lastError = error instanceof Error ? error : new Error(String(error));
                 logger_1.nodeLogger.warn(`[${this.name}] 连接失败: ${lastError.message}`);
                 // 清理连接
                 this.connector?.dispose();
                 this.connector = null;
-                // 如果还有重试次数，等待后重试
-                if (attempt < constants_1.MAX_RETRY_COUNT) {
-                    await new Promise(resolve => setTimeout(resolve, constants_1.RETRY_INTERVAL));
-                }
+                // 等待后重试
+                logger_1.nodeLogger.info(`[${this.name}] ${currentInterval / 1000} 秒后重试...`);
+                await new Promise(resolve => setTimeout(resolve, currentInterval));
             }
         }
-        // 所有重试都失败
-        this.status = constants_1.NodeStatus.ERROR;
-        logger_1.nodeLogger.error(`[${this.name}] 连接失败，已重试 ${constants_1.MAX_RETRY_COUNT} 次`);
     }
     /**
      * 断开连接
@@ -173,6 +178,61 @@ class DockerNode {
             KernelVersion: info.KernelVersion || 'unknown',
         };
     }
+    /**
+     * 获取系统信息 (CPU、内存)
+     */
+    async getSystemInfo() {
+        if (!this.connector)
+            return null;
+        try {
+            // 使用更可靠的格式
+            const output = await this.connector.exec('docker info --format "{{.NCPU}} {{.MemTotal}} {{.MemAvailable}}"');
+            const parts = output.trim().split(/\s+/);
+            if (parts.length >= 2) {
+                return {
+                    NCPU: parseInt(parts[0]) || 0,
+                    MemTotal: parseInt(parts[1]) || 0,
+                    MemAvailable: parts[2] ? parseInt(parts[2]) : undefined,
+                };
+            }
+            return null;
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    /**
+     * 获取容器数量
+     */
+    async getContainerCount() {
+        if (!this.connector)
+            throw new Error('未连接');
+        try {
+            const running = await this.connector.exec('docker ps -q | wc -l');
+            const total = await this.connector.exec('docker ps -aq | wc -l');
+            return {
+                running: parseInt(running.trim()) || 0,
+                total: parseInt(total.trim()) || 0,
+            };
+        }
+        catch {
+            return { running: 0, total: 0 };
+        }
+    }
+    /**
+     * 获取镜像数量
+     */
+    async getImageCount() {
+        if (!this.connector)
+            throw new Error('未连接');
+        try {
+            const output = await this.connector.exec('docker images -q | wc -l');
+            return parseInt(output.trim()) || 0;
+        }
+        catch {
+            return 0;
+        }
+    }
     /**
      * 获取容器详细信息 (docker inspect)
      */

package/lib/utils/render.d.ts

@@ -36,5 +36,13 @@ export declare function generateNodesHtml(nodes: any[]): string;
 /**
  * 生成节点详情 HTML
  */
-export declare function generateNodeDetailHtml(node: any, version: any): string;
+export declare function generateNodeDetailHtml(node: any, version: any, systemInfo?: any): string;
+/**
+ * 生成日志 HTML
+ */
+export declare function generateLogsHtml(nodeName: string, containerName: string, logs: string, lineCount: number): string;
+/**
+ * 生成执行结果 HTML
+ */
+export declare function generateExecHtml(nodeName: string, containerName: string, command: string, output: string, exitCode: number): string;
 export {};

package/lib/utils/render.js

@@ -6,6 +6,8 @@ exports.generateResultHtml = generateResultHtml;
 exports.generateInspectHtml = generateInspectHtml;
 exports.generateNodesHtml = generateNodesHtml;
 exports.generateNodeDetailHtml = generateNodeDetailHtml;
+exports.generateLogsHtml = generateLogsHtml;
+exports.generateExecHtml = generateExecHtml;
 const koishi_1 = require("koishi");
 // 基础样式
 const STYLE = `
@@ -121,6 +123,14 @@ const STYLE = `
   .detail-value.highlight {
     color: #60a5fa;
   }
+  .detail-span {
+    grid-column: 1 / -1;
+  }
+  .detail-span .detail-value {
+    white-space: pre-wrap;
+    font-size: 13px;
+    line-height: 1.6;
+  }
 
   /* 操作结果样式 */
   .result-card {
@@ -167,26 +177,30 @@ async function renderToImage(ctx, html, options = {}) {
         throw new Error('未安装 koishi-plugin-puppeteer 插件');
     }
     return ctx.puppeteer.render(html, async (page, next) => {
-        // 设置适当的视口，高度设大一点以便 content 自适应，然后截图 clip
+        // 1. 设置初始视口
         await page.setViewport({
-            width: options.width || 700,
-            height: options.height || 1000,
-            deviceScaleFactor: 2 // 高清渲染
+            width: options.width || 800,
+            height: options.height || 100,
+            deviceScaleFactor: 2
         });
-        // 等待内容渲染
+        // 2. 等待内容渲染
         const body = await page.$('body');
         const wrapper = await page.$('.wrapper');
-        // 获取 wrapper 的实际大小
-        const clip = await wrapper?.boundingBox() || await body?.boundingBox();
-        if (clip) {
-            // 增加一点 padding 截图
-            // clip.x -= 10
-            // clip.y -= 10
-            // clip.width += 20
-            // clip.height += 20
-            // 直接截取 content
-            const buffer = await page.screenshot({ clip });
-            return koishi_1.h.image(buffer, 'image/png').toString();
+        // 3. 获取实际内容的高度
+        const boundingBox = await wrapper?.boundingBox() || await body?.boundingBox();
+        if (boundingBox) {
+            // 调整视口高度以匹配内容
+            await page.setViewport({
+                width: options.width || 800,
+                height: Math.ceil(boundingBox.height) + 100,
+                deviceScaleFactor: 2
+            });
+            // 重新获取 clip (因为视口变化可能导致重绘)
+            const finalClip = await wrapper?.boundingBox() || await body?.boundingBox();
+            if (finalClip) {
+                const buffer = await page.screenshot({ clip: finalClip });
+                return koishi_1.h.image(buffer, 'image/png').toString();
+            }
         }
         // Fallback
         const buffer = await page.screenshot({ fullPage: true });
@@ -289,25 +303,57 @@ function generateInspectHtml(nodeName, info) {
     const name = info.Name.replace('/', '');
     const shortId = info.Id.slice(0, 12);
     const isRunning = info.State.Running;
+    // 网络信息
+    const networks = info.NetworkSettings?.Networks;
+    const networkInfo = networks && Object.keys(networks).length > 0
+        ? Object.entries(networks).map(([name, net]) => {
+            const n = net;
+            const ip = n.IPAddress || '-';
+            const gateway = n.Gateway || '-';
+            return `  ${name}: ${ip} (GW: ${gateway})`;
+        }).join('\n')
+        : '-';
+    // 环境变量
+    const envVars = info.Config?.Env || [];
+    const envDisplay = envVars.length > 0
+        ? envVars.slice(0, 10).map(e => {
+            const [key, ...val] = e.split('=');
+            return `  ${key}=${val.join('=').slice(0, 50)}${val.join('=').length > 50 ? '...' : ''}`;
+        }).join('\n') + (envVars.length > 10 ? `\n  ... (共 ${envVars.length} 个)` : '')
+        : '-';
+    // 重启策略
+    const restartPolicy = info.HostConfig?.RestartPolicy;
+    const restartDisplay = restartPolicy
+        ? `${restartPolicy.Name}${restartPolicy.Name !== 'no' ? ` (最大 ${restartPolicy.MaximumRetryCount} 次重试)` : ''}`
+        : 'no';
+    // 挂载目录
+    const mounts = info.Mounts || [];
+    const mountsDisplay = mounts.length > 0
+        ? mounts.map((m) => {
+            const mount = m;
+            return `  ${mount.Source} → ${mount.Destination} (${mount.Type})`;
+        }).join('\n')
+        : '-';
     const items = [
-        { label: '容器名称', value: name },
-        { label: '容器 ID', value: info.Id },
-        { label: '镜像', value: info.Config.Image },
-        { label: '状态', value: info.State.Status, highlight: true },
-        { label: '创建时间', value: new Date(info.Created).toLocaleString() },
-        { label: '启动时间', value: new Date(info.State.StartedAt).toLocaleString() },
-        { label: '重启次数', value: info.RestartCount },
-        { label: 'IP 地址', value: info.NetworkSettings?.IPAddress || '-' },
-        { label: '平台', value: info.Platform || 'linux' },
-        { label: '驱动', value: info.Driver },
+        { label: '容器名称', value: name, span: false },
+        { label: '容器 ID', value: info.Id, span: false },
+        { label: '镜像', value: info.Config.Image, span: false },
+        { label: '状态', value: info.State.Status, highlight: true, span: false },
+        { label: '创建时间', value: new Date(info.Created).toLocaleString(), span: false },
+        { label: '启动时间', value: new Date(info.State.StartedAt).toLocaleString(), span: false },
+        { label: '重启策略', value: restartDisplay, span: false },
+        { label: '重启次数', value: String(info.RestartCount), span: false },
+        { label: '网络', value: networkInfo, span: true },
+        { label: '环境变量', value: envDisplay, span: true },
+        { label: '挂载目录', value: mountsDisplay, span: true },
     ];
     if (info.State.Health) {
-        items.push({ label: '健康状态', value: info.State.Health.Status, highlight: true });
+        items.push({ label: '健康状态', value: info.State.Health.Status, highlight: true, span: false });
     }
     const gridItems = items.map(item => `
-    <div class="detail-item">
+    <div class="detail-item ${item.span ? 'detail-span' : ''}">
       <div class="detail-label">${item.label}</div>
-      <div class="detail-value ${item.highlight ? 'highlight' : ''}">${item.value}</div>
+      <div class="detail-value ${item.highlight ? 'highlight' : ''}">${item.value.replace(/\n/g, '<br>')}</div>
     </div>
   `).join('');
     const header = `
@@ -330,7 +376,6 @@ function generateInspectHtml(nodeName, info) {
           ${gridItems}
         </div>
       </div>
-      <!--Mounts/Ports could be added here-->
     </div>
   `;
     return wrapHtml(header + body);
@@ -339,22 +384,27 @@ function generateInspectHtml(nodeName, info) {
  * 生成节点列表 HTML
  */
 function generateNodesHtml(nodes) {
-    const onlineCount = nodes.filter(n => n.status === 'connected').length;
+    // 兼容字段名称
+    const getStatus = (n) => n.status || n.Status || 'unknown';
+    const getName = (n) => n.name || n.Name || 'Unknown';
+    const getId = (n) => n.id || n.ID || n.Id || '-';
+    const onlineCount = nodes.filter(n => getStatus(n) === 'connected').length;
     const totalCount = nodes.length;
     const listItems = nodes.map(n => {
-        const isOnline = n.status === 'connected';
-        const isConnecting = n.status === 'connecting';
+        const status = getStatus(n);
+        const isOnline = status === 'connected' || status === 'running';
+        const isConnecting = status === 'connecting';
         const icon = isOnline ? '🟢' : (isConnecting ? '🟡' : '🔴');
-        const tags = n.tags.map((t) => `<span class="tag">@${t}</span>`).join(' ');
+        const tags = (n.tags || []).map((t) => `<span class="tag">@${t}</span>`).join(' ');
         return `
       <div class="list-item">
         <div class="status-icon">${icon}</div>
         <div class="name-col">
-          <div>${n.name}</div>
-          <div style="font-size:12px; opacity:0.6; margin-top:2px;">${n.id}</div>
+          <div>${getName(n)}</div>
+          <div style="font-size:12px; opacity:0.6; margin-top:2px;">${getId(n)}</div>
         </div>
         <div class="meta-col">
-          <div style="color: ${isOnline ? '#4ade80' : (isConnecting ? '#facc15' : '#f87171')}">${n.status}</div>
+          <div style="color: ${isOnline ? '#4ade80' : (isConnecting ? '#facc15' : '#f87171')}">${status}</div>
         </div>
         <div>${tags}</div>
       </div>
@@ -371,18 +421,37 @@ function generateNodesHtml(nodes) {
 /**
  * 生成节点详情 HTML
  */
-function generateNodeDetailHtml(node, version) {
-    const isOnline = node.status === 'connected';
+function generateNodeDetailHtml(node, version, systemInfo) {
+    // 兼容字段名称 (处理大小写不一致的问题)
+    // 优先从 config 获取名称，因为 node 对象可能是 DockerNode 实例
+    const nodeName = node.config?.name || node.name || node.Name || 'Unknown';
+    const nodeId = node.id || node.ID || node.Id || node.config?.id || '-';
+    const nodeStatus = node.status || node.Status || 'unknown';
+    const nodeTags = node.tags || node.config?.tags || [];
+    const isOnline = nodeStatus === 'connected' || nodeStatus === 'running';
+    // 解析系统信息 (兼容不同字段格式)
+    const cpuCores = systemInfo?.NCPU || systemInfo?.Ncpu || systemInfo?.ncpu || '-';
+    const memoryTotal = systemInfo?.MemTotal ? formatBytes(systemInfo.MemTotal) : '-';
+    // 如果没有 MemAvailable，则只显示总内存
+    const memoryDisplay = systemInfo?.MemAvailable !== undefined
+        ? `${formatBytes(systemInfo.MemAvailable)} / ${memoryTotal}`
+        : memoryTotal !== '-' ? memoryTotal : '-';
     // 基础信息
     const items = [
-        { label: '节点名称', value: node.name },
-        { label: '节点 ID', value: node.id },
-        { label: '状态', value: node.status, highlight: isOnline },
-        { label: '标签', value: node.tags.join(', ') || '(无)' },
+        { label: '节点名称', value: nodeName },
+        { label: '节点 ID', value: nodeId },
+        { label: '状态', value: nodeStatus, highlight: isOnline },
+        { label: '标签', value: (nodeTags || []).join(', ') || '(无)' },
     ];
+    // 系统资源信息
+    items.push({ label: 'CPU', value: `${cpuCores} 核心` }, { label: '内存', value: memoryDisplay }, { label: '容器数量', value: String(node.containerCount ?? node.Containers ?? node.containers ?? '-') }, { label: '镜像数量', value: String(node.imageCount ?? node.Images ?? node.images ?? '-') });
+    // 集群信息
+    if (node.cluster || node.Swarm?.NodeID) {
+        items.push({ label: '集群', value: node.cluster || 'Swarm Mode' });
+    }
     // 版本信息
     if (version) {
-        items.push({ label: 'Docker 版本', value: version.Version }, { label: 'API 版本', value: version.ApiVersion }, { label: '操作系统', value: `${version.Os} (${version.Arch})` }, { label: '内核版本', value: version.KernelVersion }, { label: 'Go 版本', value: version.GoVersion }, { label: 'Git Commit', value: version.GitCommit }, { label: '构建时间', value: version.BuildTime });
+        items.push({ label: 'Docker 版本', value: version.Version || version.version || '-' }, { label: 'API 版本', value: version.ApiVersion || version.ApiVersion || '-' }, { label: '操作系统', value: `${version.Os || version.Os || 'unknown'} (${version.Arch || version.Arch || 'unknown'})` }, { label: '内核版本', value: version.KernelVersion || version.KernelVersion || '-' });
     }
     const gridItems = items.map(item => `
     <div class="detail-item">
@@ -393,7 +462,7 @@ function generateNodeDetailHtml(node, version) {
     const header = `
     <div class="header">
       <div class="header-title">节点详情</div>
-      <div class="header-badge">${node.name}</div>
+      <div class="header-badge">${nodeName}</div>
     </div>
   `;
     const body = `
@@ -402,8 +471,8 @@ function generateNodeDetailHtml(node, version) {
         <div style="display: flex; align-items: center; margin-bottom: 20px; padding-bottom: 20px; border-bottom: 1px solid rgba(255,255,255,0.1);">
           <div style="font-size: 32px; margin-right: 16px;">${isOnline ? '🟢' : '🔴'}</div>
           <div>
-            <div style="font-size: 20px; font-weight: 600;">${node.name}</div>
-            <div style="font-size: 13px; color: #94a3b8; font-family: monospace;">${node.id}</div>
+            <div style="font-size: 20px; font-weight: 600;">${nodeName}</div>
+            <div style="font-size: 13px; color: #94a3b8; font-family: monospace;">${nodeId}</div>
           </div>
         </div>
         <div class="detail-grid">
@@ -414,3 +483,200 @@ function generateNodeDetailHtml(node, version) {
   `;
     return wrapHtml(header + body);
 }
+/**
+ * 生成日志 HTML
+ */
+function generateLogsHtml(nodeName, containerName, logs, lineCount) {
+    // 限制日志行数，避免过长
+    const maxLines = 150;
+    const allLines = logs.split('\n');
+    const totalLines = allLines.length;
+    const displayLines = allLines.slice(-maxLines);
+    const displayLogs = displayLines.join('\n');
+    const displayLineCount = displayLines.length;
+    // 逐行渲染，带行号和高亮
+    const logLines = displayLines.map((line, idx) => {
+        const lineNum = totalLines - displayLineCount + idx + 1;
+        return `<span class="line-num">${lineNum.toString().padStart(5, ' ')}</span><span class="line-content">${highlightLogContent(line)}</span>`;
+    }).join('\n');
+    const header = `
+    <div class="header">
+      <div class="header-title">📋 容器日志</div>
+      <div class="header-badge">${nodeName}/${containerName}</div>
+    </div>
+  `;
+    const body = `
+    <div class="content">
+      <div style="margin-bottom: 12px; font-size: 13px; color: #94a3b8; display: flex; justify-content: space-between;">
+        <span>显示第 ${totalLines - displayLineCount + 1} - ${totalLines} 行</span>
+        <span>共 ${totalLines} 行</span>
+      </div>
+      <div class="log-container">
+        <div class="log-lines">${logLines}</div>
+      </div>
+    </div>
+  `;
+    // 添加日志专用样式
+    const logStyle = `
+    .log-container {
+      background: rgba(0, 0, 0, 0.3);
+      border-radius: 8px;
+      padding: 16px;
+      overflow: visible;
+    }
+    .log-lines {
+      font-family: 'SF Mono', Monaco, 'Courier New', monospace;
+      font-size: 12px;
+      line-height: 1.6;
+      white-space: pre-wrap;
+      word-break: break-all;
+      color: #e2e8f0;
+    }
+    .line-num {
+      color: #475569;
+      margin-right: 12px;
+      user-select: none;
+      display: inline-block;
+      min-width: 35px;
+      text-align: right;
+      border-right: 1px solid #334155;
+      padding-right: 8px;
+    }
+    .line-content {
+      color: #e2e8f0;
+    }
+
+    /* 高亮样式 */
+    .hl-date { color: #64748b; }
+    .hl-ip { color: #22d3ee; }
+    .hl-string { color: #a5f3fc; opacity: 0.9; }
+    .hl-error { color: #ef4444; font-weight: bold; background: rgba(239, 68, 68, 0.1); padding: 0 4px; border-radius: 2px; }
+    .hl-warn { color: #f59e0b; font-weight: bold; }
+    .hl-info { color: #3b82f6; font-weight: bold; }
+    .hl-debug { color: #94a3b8; }
+  `;
+    return wrapHtml(header + body, STYLE + logStyle);
+}
+/**
+ * 格式化字节为可读格式
+ */
+function formatBytes(bytes) {
+    if (!bytes || bytes < 0)
+        return '-';
+    const k = 1024;
+    const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
+}
+/**
+ * HTML 转义
+ */
+function escapeHtml(text) {
+    return text
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;');
+}
+/**
+ * 处理日志高亮
+ */
+function highlightLogContent(text) {
+    // 1. 先进行基础的 HTML 转义
+    let html = escapeHtml(text);
+    // 2. 定义高亮规则 (注意顺序：先匹配复杂的，再匹配简单的)
+    // [时间戳] YYYY-MM-DD HH:mm:ss 或 ISO8601
+    html = html.replace(/(\d{4}-\d{2}-\d{2}[T\s]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?)/g, '\x1f$1\x1f');
+    // [IP地址] 简单的 IPv4 匹配
+    html = html.replace(/\b(?:\d{1,3}\.){3}\d{1,3}\b/g, '\x1f$&\x1f');
+    // [日志等级 - Error/Fail] 红色
+    html = html.replace(/(\b(ERROR|ERR|FATAL|CRITICAL|FAIL|FAILED|EXCEPTION)\b|\[(ERROR|ERR)\])/gi, '\x1f$1\x1f');
+    // [日志等级 - Warn] 黄色
+    html = html.replace(/(\b(WARN|WARNING)\b|\[(WARN|WARNING)\])/gi, '\x1f$1\x1f');
+    // [日志等级 - Info] 蓝色
+    html = html.replace(/(\b(INFO|INFORMATION)\b|\[(INFO)\])/gi, '\x1f$1\x1f');
+    // [日志等级 - Debug/Trace] 灰色
+    html = html.replace(/(\b(DEBUG|TRACE)\b|\[(DEBUG|TRACE)\])/gi, '\x1f$1\x1f');
+    // [引用/字符串] "xxx" 或 'xxx'
+    html = html.replace(/(".*?"|'.*?')/g, '\x1f$1\x1f');
+    // 3. 将占位符替换回 HTML 标签
+    html = html
+        .replace(/\x1f(\d{4}-\d{2}-\d{2}[T\s]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?)\x1f/g, '<span class="hl-date">$1</span>')
+        .replace(/\x1f((?:\d{1,3}\.){3}\d{1,3})\x1f/g, '<span class="hl-ip">$1</span>')
+        .replace(/\x1f((?:\[[^\]]*\]|\w+))\x1f/g, (match, p1) => {
+        const lower = p1.toLowerCase();
+        if (lower.includes('error') || lower.includes('fatal') || lower.includes('fail') || lower.includes('exception')) {
+            return `<span class="hl-error">${p1}</span>`;
+        }
+        if (lower.includes('warn')) {
+            return `<span class="hl-warn">${p1}</span>`;
+        }
+        if (lower.includes('info')) {
+            return `<span class="hl-info">${p1}</span>`;
+        }
+        if (lower.includes('debug') || lower.includes('trace')) {
+            return `<span class="hl-debug">${p1}</span>`;
+        }
+        if (p1.startsWith('"') || p1.startsWith("'")) {
+            return `<span class="hl-string">${p1}</span>`;
+        }
+        return p1;
+    });
+    return html;
+}
+/**
+ * 生成执行结果 HTML
+ */
+function generateExecHtml(nodeName, containerName, command, output, exitCode) {
+    const isSuccess = exitCode === 0;
+    const statusIcon = isSuccess ? '✅' : '❌';
+    const header = `
+    <div class="header">
+      <div class="header-title">🔧 命令执行</div>
+      <div class="header-badge">${nodeName}/${containerName}</div>
+    </div>
+  `;
+    const body = `
+    <div class="content">
+      <div style="
+        background: rgba(0, 0, 0, 0.2);
+        border-radius: 8px;
+        padding: 16px;
+        margin-bottom: 16px;
+      ">
+        <div style="font-size: 13px; color: #94a3b8; margin-bottom: 8px;">执行命令</div>
+        <div style="
+          font-family: 'SF Mono', Monaco, monospace;
+          font-size: 13px;
+          color: #60a5fa;
+          background: rgba(96, 165, 250, 0.1);
+          padding: 8px 12px;
+          border-radius: 4px;
+        ">${command}</div>
+      </div>
+
+      <div style="
+        background: rgba(0, 0, 0, 0.3);
+        border-radius: 8px;
+        padding: 16px;
+        font-family: 'SF Mono', Monaco, 'Courier New', monospace;
+        font-size: 12px;
+        line-height: 1.6;
+        max-height: 300px;
+        overflow-y: auto;
+        white-space: pre-wrap;
+        word-break: break-all;
+        color: #e2e8f0;
+      ">${output || '(无输出)'}</div>
+
+      <div style="margin-top: 16px; display: flex; align-items: center; gap: 8px;">
+        <span style="font-size: 20px;">${statusIcon}</span>
+        <span style="color: ${isSuccess ? '#4ade80' : '#f87171'}">
+          退出码: ${exitCode}
+        </span>
+      </div>
+    </div>
+  `;
+    return wrapHtml(header + body);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-docker-control",
   "description": "Koishi 插件 - 通过 SSH 控制 Docker 容器",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [