koishi-plugin-docker-control 0.0.3 → 0.0.5

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

@@ -1,4 +1,4 @@
-import type { NodeConfig, ContainerInfo, DockerEvent, NodeStatusType, CredentialConfig } from '../types';
+import type { NodeConfig, ContainerInfo, DockerEvent, NodeStatusType, CredentialConfig, ComposeFileInfo, ContainerComposeInfo } from '../types';
 export declare class DockerNode {
     /** 节点配置 */
     readonly config: NodeConfig;
@@ -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,39 @@ 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 Compose 信息
+     * 通过标签 com.docker.compose.project.config_files 获取 compose 文件路径
+     */
+    getContainerComposeInfo(containerId: string): Promise<ContainerComposeInfo | null>;
+    /**
+     * 获取容器的 Docker Compose 文件信息
+     * 读取并解析 compose 文件
+     */
+    getComposeFileInfo(containerId: string): Promise<ComposeFileInfo | null>;
+    /**
+     * 统计 compose 文件中的服务数量
+     */
+    private countServices;
     /**
      * 获取容器详细信息 (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,141 @@ class DockerNode {
             KernelVersion: info.KernelVersion || 'unknown',
         };
     }
+    /**
+     * 获取系统信息 (CPU、内存)
+     */
+    async getSystemInfo() {
+        if (!this.connector)
+            return null;
+        try {
+            // 使用 execWithExitCode 避免非零退出码抛出异常
+            const result = await this.connector.execWithExitCode('docker info --format "{{.NCPU}} {{.MemTotal}} {{.MemAvailable}}"');
+            logger_1.nodeLogger.debug(`[${this.name}] docker info 输出: "${result.output}", 退出码: ${result.exitCode}`);
+            // docker info 可能返回退出码 1 但仍有输出（权限问题），只要有输出就解析
+            if (!result.output.trim()) {
+                logger_1.nodeLogger.warn(`[${this.name}] docker info 输出为空`);
+                return null;
+            }
+            const parts = result.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) {
+            logger_1.nodeLogger.warn(`[${this.name}] 获取系统信息异常: ${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 Compose 信息
+     * 通过标签 com.docker.compose.project.config_files 获取 compose 文件路径
+     */
+    async getContainerComposeInfo(containerId) {
+        if (!this.connector)
+            throw new Error('未连接');
+        try {
+            // 使用 docker inspect 获取容器标签
+            const output = await this.connector.exec(`docker inspect ${containerId} --format "{{json .Config.Labels}}"`);
+            if (!output.trim()) {
+                return null;
+            }
+            const labels = JSON.parse(output);
+            // 获取 compose 项目名称和配置文件路径
+            const projectName = labels['com.docker.compose.project'] || '';
+            const configFiles = labels['com.docker.compose.project.config_files'] || '';
+            if (!projectName || !configFiles) {
+                return null;
+            }
+            return {
+                containerId,
+                containerName: labels['com.docker.compose.container-number'] || '',
+                projectName,
+                composeFilePath: configFiles,
+            };
+        }
+        catch (e) {
+            logger_1.nodeLogger.warn(`[${this.name}] 获取容器 ${containerId} 的 compose 信息失败: ${e}`);
+            return null;
+        }
+    }
+    /**
+     * 获取容器的 Docker Compose 文件信息
+     * 读取并解析 compose 文件
+     */
+    async getComposeFileInfo(containerId) {
+        if (!this.connector)
+            throw new Error('未连接');
+        try {
+            const composeInfo = await this.getContainerComposeInfo(containerId);
+            if (!composeInfo) {
+                return null;
+            }
+            const filePath = composeInfo.composeFilePath;
+            const originalPath = filePath;
+            // 尝试读取文件 (支持 Windows 路径自动转换)
+            const content = await this.connector.readFile(filePath);
+            // 统计服务数量 (简单的 yaml 解析)
+            const serviceCount = this.countServices(content);
+            return {
+                originalPath,
+                effectivePath: filePath,
+                usedWslPath: false, // 实际是否使用了 WSL 路径在内部处理
+                content,
+                projectName: composeInfo.projectName,
+                serviceCount,
+            };
+        }
+        catch (e) {
+            logger_1.nodeLogger.warn(`[${this.name}] 获取 compose 文件信息失败: ${e.message}`);
+            return null;
+        }
+    }
+    /**
+     * 统计 compose 文件中的服务数量
+     */
+    countServices(content) {
+        // 简单的正则匹配 services: 下面的服务名
+        const servicePattern = /^[a-zA-Z0-9_-]+:\s*$/gm;
+        const matches = content.match(servicePattern);
+        return matches ? matches.length : 0;
+    }
     /**
      * 获取容器详细信息 (docker inspect)
      */

package/lib/types.d.ts

@@ -98,3 +98,27 @@ export interface SubscriptionConfig {
     /** 创建时间 */
     createdAt?: number;
 }
+export interface ComposeFileInfo {
+    /** 原始路径 (Windows 路径或 WSL 路径) */
+    originalPath: string;
+    /** 实际使用的路径 (尝试转换后的路径) */
+    effectivePath: string;
+    /** 是否使用了 WSL 路径转换 */
+    usedWslPath: boolean;
+    /** Compose 文件内容 */
+    content: string;
+    /** 所属项目名称 */
+    projectName: string;
+    /** 容器数量 */
+    serviceCount: number;
+}
+export interface ContainerComposeInfo {
+    /** 容器 ID */
+    containerId: string;
+    /** 容器名称 */
+    containerName: string;
+    /** 所属 Docker Compose 项目 */
+    projectName: string;
+    /** Compose 文件路径 */
+    composeFilePath: string;
+}

package/lib/utils/render.d.ts

@@ -36,5 +36,17 @@ 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;
+/**
+ * 生成 Docker Compose 配置 HTML
+ */
+export declare function generateComposeHtml(nodeName: string, containerName: string, projectName: string, filePath: string, serviceCount: number, composeContent: string): string;
 export {};