koishi-plugin-docker-control 0.0.2 → 0.0.4

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,43 @@ export declare class DockerNode {
     /**
      * 执行容器内命令
      */
-    execContainer(containerId: string, cmd: string): Promise<string>;
+    execContainer(containerId: string, cmd: string): Promise<{
+        output: string;
+        exitCode: number;
+    }>;
+    /**
+     * 获取 Docker 版本信息
+     */
+    getVersion(): Promise<{
+        Version: string;
+        ApiVersion: string;
+        Os: string;
+        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)
+     */
+    getContainer(containerId: string): Promise<any>;
     /**
      * 解析 docker ps 输出
      */

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} 次`);
     }
     /**
      * 断开连接
@@ -157,6 +162,87 @@ class DockerNode {
             throw new Error('未连接');
         return this.connector.execContainer(containerId, cmd);
     }
+    /**
+     * 获取 Docker 版本信息
+     */
+    async getVersion() {
+        if (!this.connector)
+            throw new Error('未连接');
+        const output = await this.connector.exec('docker version --format "{{json .Server}}"');
+        const info = JSON.parse(output);
+        return {
+            Version: info.Version || 'unknown',
+            ApiVersion: info.ApiVersion || 'unknown',
+            Os: info.Os || 'unknown',
+            Arch: info.Arch || 'unknown',
+            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)
+     */
+    async getContainer(containerId) {
+        if (!this.connector)
+            throw new Error('未连接');
+        const output = await this.connector.exec(`docker inspect ${containerId}`);
+        const info = JSON.parse(output);
+        return Array.isArray(info) ? info[0] : info;
+    }
     /**
      * 解析 docker ps 输出
      */

package/lib/utils/render.d.ts

@@ -0,0 +1,48 @@
+import { Context } from 'koishi';
+import type { ContainerInfo } from '../types';
+interface RenderOptions {
+    title?: string;
+    width?: number;
+    height?: number;
+}
+/**
+ * 通用渲染函数：将 HTML 转换为图片
+ */
+export declare function renderToImage(ctx: Context, html: string, options?: RenderOptions): Promise<string>;
+/**
+ * 生成容器列表 HTML
+ */
+export declare function generateListHtml(data: Array<{
+    node: any;
+    containers: ContainerInfo[];
+}>, title?: string): string;
+/**
+ * 生成操作结果 HTML (启动/停止/重启)
+ */
+export declare function generateResultHtml(results: Array<{
+    node: any;
+    container?: any;
+    success: boolean;
+    error?: string;
+}>, title: string): string;
+/**
+ * 生成详情 HTML
+ */
+export declare function generateInspectHtml(nodeName: string, info: any): string;
+/**
+ * 生成节点列表 HTML
+ */
+export declare function generateNodesHtml(nodes: any[]): string;
+/**
+ * 生成节点详情 HTML
+ */
+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 {};