koishi-plugin-docker-control 0.1.4 → 0.1.6

package/lib/commands/control.js

@@ -10,13 +10,19 @@ const permission_check_1 = require("../utils/permission-check");
  */
 function formatNet(bytes) {
     const num = parseFloat(bytes);
-    if (isNaN(num))
-        return '-';
+    if (isNaN(num)) {
+        // 如果无法解析为数字，可能已经包含单位，直接返回
+        return bytes;
+    }
+    if (num === 0)
+        return '0B';
     if (num < 1024)
-        return bytes + 'B';
+        return num.toFixed(0) + 'B';
     if (num < 1024 * 1024)
-        return (num / 1024).toFixed(1) + 'KB';
-    return (num / 1024 / 1024).toFixed(2) + 'MB';
+        return (num / 1024).toFixed(2) + 'KB';
+    if (num < 1024 * 1024 * 1024)
+        return (num / 1024 / 1024).toFixed(2) + 'MB';
+    return (num / 1024 / 1024 / 1024).toFixed(2) + 'GB';
 }
 /**
  * 格式化容器搜索结果
@@ -271,7 +277,8 @@ function registerControlCommands(ctx, getService, config) {
                 lines.push('性能监控:');
                 lines.push(`  CPU: ${stats.cpuPercent}`);
                 lines.push(`  内存: ${stats.memoryPercent} (${stats.memoryUsage} / ${stats.memoryLimit})`);
-                lines.push(`  网络: ${formatNet(stats.networkIn)} / ${formatNet(stats.networkOut)}`);
+                lines.push(`  网络 ↓: ${formatNet(stats.networkIn)}`);
+                lines.push(`  网络 ↑: ${formatNet(stats.networkOut)}`);
                 lines.push(`  进程: ${stats.pids}`);
             }
             // 添加端口映射

package/lib/service/monitor.d.ts

@@ -17,6 +17,8 @@ export declare class MonitorManager {
     private config;
     /** 容器状态映射: nodeId -> containerId -> State */
     private states;
+    /** 容器名称映射: nodeId -> containerName -> containerId，用于容器更新时跨容器ID追踪 */
+    private nameIndex;
     /** 全局回调 */
     private callback?;
     constructor(config?: {
@@ -34,5 +36,9 @@ export declare class MonitorManager {
     onProcessedEvent(callback: (event: ProcessedEvent) => void): () => void;
     private emit;
     private getContainerState;
+    private getContainerStateById;
+    private getContainerIdByName;
+    private removeContainerState;
+    private clearNameIndex;
     private cleanHistory;
 }

package/lib/service/monitor.js

@@ -7,6 +7,8 @@ class MonitorManager {
         this.config = config;
         /** 容器状态映射: nodeId -> containerId -> State */
         this.states = new Map();
+        /** 容器名称映射: nodeId -> containerName -> containerId，用于容器更新时跨容器ID追踪 */
+        this.nameIndex = new Map();
     }
     /**
      * 处理原始 Docker 事件
@@ -20,8 +22,8 @@ class MonitorManager {
             return;
         const containerId = event.Actor.ID;
         const containerName = event.Actor.Attributes?.name || 'unknown';
-        // 获取容器状态存储
-        const state = this.getContainerState(node.id, containerId);
+        // 获取容器状态存储（同时更新名称索引）
+        const state = this.getContainerState(node.id, containerId, containerName);
         const now = Date.now();
         // ---------------------------------------------------------
         // 0. 屏蔽 restart 冗余事件
@@ -71,6 +73,8 @@ class MonitorManager {
             logger_1.monitorLogger.debug(`[${node.name}] ${containerName} 已停止 (${action})，等待 ${debounceWait}ms...`);
             state.stopTimer = setTimeout(() => {
                 state.stopTimer = undefined;
+                // 清理名称索引
+                this.clearNameIndex(node.id, containerName);
                 // 只有定时器真正走完了，才发送通知
                 this.emit({
                     eventType: `container.die`, // 统一使用 die
@@ -86,6 +90,18 @@ class MonitorManager {
         else if (action === 'start' || action === 'restart') {
             // [关键] 记录启动时间，用于屏蔽后续的 restart
             state.lastStartTime = now;
+            // [新功能] 检查是否有同名的旧容器正在等待防抖
+            const oldContainerId = this.getContainerIdByName(node.id, containerName);
+            if (oldContainerId && oldContainerId !== containerId) {
+                const oldState = this.getContainerStateById(node.id, oldContainerId);
+                if (oldState?.stopTimer) {
+                    clearTimeout(oldState.stopTimer);
+                    oldState.stopTimer = undefined;
+                    logger_1.monitorLogger.info(`[${node.name}] ${containerName} 容器更新：取消旧容器 ${oldContainerId.slice(0, 12)} 的退出通知`);
+                    // 清理旧容器的状态
+                    this.removeContainerState(node.id, oldContainerId);
+                }
+            }
             if (state.stopTimer) {
                 // 在防抖时间内恢复：取消报警
                 clearTimeout(state.stopTimer);
@@ -118,17 +134,54 @@ class MonitorManager {
             this.callback(event);
         }
     }
-    getContainerState(nodeId, containerId) {
+    getContainerState(nodeId, containerId, containerName) {
         if (!this.states.has(nodeId)) {
             this.states.set(nodeId, new Map());
         }
         const nodeStates = this.states.get(nodeId);
         if (!nodeStates.has(containerId)) {
             nodeStates.set(containerId, {
-                history: []
+                history: [],
+                containerName
             });
         }
-        return nodeStates.get(containerId);
+        const state = nodeStates.get(containerId);
+        // 更新名称索引
+        if (containerName) {
+            if (!this.nameIndex.has(nodeId)) {
+                this.nameIndex.set(nodeId, new Map());
+            }
+            this.nameIndex.get(nodeId).set(containerName, containerId);
+            state.containerName = containerName;
+        }
+        return state;
+    }
+    getContainerStateById(nodeId, containerId) {
+        const nodeStates = this.states.get(nodeId);
+        return nodeStates?.get(containerId);
+    }
+    getContainerIdByName(nodeId, containerName) {
+        const nameMap = this.nameIndex.get(nodeId);
+        return nameMap?.get(containerName);
+    }
+    removeContainerState(nodeId, containerId) {
+        const nodeStates = this.states.get(nodeId);
+        if (nodeStates) {
+            const state = nodeStates.get(containerId);
+            if (state?.containerName) {
+                const nameMap = this.nameIndex.get(nodeId);
+                if (nameMap?.get(state.containerName) === containerId) {
+                    nameMap.delete(state.containerName);
+                }
+            }
+            nodeStates.delete(containerId);
+        }
+    }
+    clearNameIndex(nodeId, containerName) {
+        const nameMap = this.nameIndex.get(nodeId);
+        if (nameMap) {
+            nameMap.delete(containerName);
+        }
     }
     cleanHistory(state, now) {
         const window = this.config.flappingWindow || 300000; // 默认 5分钟

package/lib/utils/render-modern.d.ts

@@ -0,0 +1,26 @@
+import { Context, h } from 'koishi';
+import type { ContainerInfo } from '../types';
+/**
+ * 渲染为图片（使用正确的 Koishi Puppeteer API）
+ */
+export declare function renderToImage(ctx: Context, html: string): Promise<h>;
+/**
+ * 生成容器列表 HTML（现代化）
+ */
+export declare function generateListHtml(data: Array<{
+    node: any;
+    containers: ContainerInfo[];
+}>, title?: string): string;
+/**
+ * 生成节点列表 HTML（现代化）
+ */
+export declare function generateNodesHtml(nodes: any[]): string;
+/**
+ * 生成容器日志 HTML（现代化）
+ */
+export declare function generateLogsHtml(nodeName: string, containerName: string, logs: string, lineCount: number): string;
+/**
+ * 生成 Docker Compose 配置 HTML（现代化）
+ */
+export declare function generateComposeHtml(nodeName: string, containerName: string, projectName: string, filePath: string, serviceCount: number, composeContent: string): string;
+export { generateInspectHtml, generateResultHtml, generateExecHtml, generateImagesHtml, generateNetworksHtml, generateVolumesHtml } from './render';