sidekick-docker 0.2.3 → 0.2.5

package/dist/sidekick-docker.mjs

@@ -55711,7 +55711,7 @@ var require_DockerClient = __commonJS({
         const validated = schemas_1.ContainerInspectEnvSchema.parse(info);
         return validated.Config.Env ?? [];
       }
-      async *streamLogs(id, opts = {}) {
+      async *streamLogs(id, opts = {}, signal) {
         const container = this.docker.getContainer(id);
         const logOpts = {
           follow: true,
@@ -55732,32 +55732,42 @@ var require_DockerClient = __commonJS({
           return;
         }
         const readable = stream;
+        const destroy = () => readable.destroy?.();
+        if (signal) {
+          signal.addEventListener("abort", destroy, { once: true });
+        }
         const buffer = [];
-        for await (const chunk of readable) {
-          const data = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-          buffer.push(data);
-          const combined = Buffer.concat(buffer);
-          buffer.length = 0;
-          let offset = 0;
-          while (offset + 8 <= combined.length) {
-            const streamType = combined[offset];
-            const size = combined.readUInt32BE(offset + 4);
-            if (offset + 8 + size > combined.length) {
-              buffer.push(combined.subarray(offset));
+        try {
+          for await (const chunk of readable) {
+            if (signal?.aborted)
               break;
-            }
-            const payload = combined.subarray(offset + 8, offset + 8 + size).toString("utf8");
-            const streamName = streamType === 2 ? "stderr" : "stdout";
-            for (const line of payload.split("\n")) {
-              if (line.trim()) {
-                yield parseLogLine(line, streamName);
+            const data = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+            buffer.push(data);
+            const combined = Buffer.concat(buffer);
+            buffer.length = 0;
+            let offset = 0;
+            while (offset + 8 <= combined.length) {
+              const streamType = combined[offset];
+              const size = combined.readUInt32BE(offset + 4);
+              if (offset + 8 + size > combined.length) {
+                buffer.push(combined.subarray(offset));
+                break;
               }
+              const payload = combined.subarray(offset + 8, offset + 8 + size).toString("utf8");
+              const streamName = streamType === 2 ? "stderr" : "stdout";
+              for (const line of payload.split("\n")) {
+                if (line.trim()) {
+                  yield parseLogLine(line, streamName);
+                }
+              }
+              offset += 8 + size;
+            }
+            if (offset < combined.length && buffer.length === 0) {
+              buffer.push(combined.subarray(offset));
             }
-            offset += 8 + size;
-          }
-          if (offset < combined.length && buffer.length === 0) {
-            buffer.push(combined.subarray(offset));
           }
+        } finally {
+          destroy();
         }
       }
       parseStats(validated, prevCpu, prevSystem) {
@@ -55813,7 +55823,7 @@ var require_DockerClient = __commonJS({
           systemTotal: systemUsage
         };
       }
-      async *streamStats(id) {
+      async *streamStats(id, signal) {
         const container = this.docker.getContainer(id);
         let prevCpu = 0;
         let prevSystem = 0;
@@ -55826,21 +55836,33 @@ var require_DockerClient = __commonJS({
           yield first;
         } catch {
         }
+        if (signal?.aborted)
+          return;
         const stream = await container.stats({ stream: true });
-        for await (const chunk of stream) {
-          const lines = chunk.toString("utf8").split("\n").filter(Boolean);
-          for (const line of lines) {
-            try {
-              const raw = JSON.parse(line);
-              const validated = schemas_1.DockerStatsRawSchema.parse(raw);
-              const { stats, cpuTotal, systemTotal } = this.parseStats(validated, prevCpu, prevSystem);
-              prevCpu = cpuTotal;
-              prevSystem = systemTotal;
-              yield stats;
-            } catch {
-              continue;
+        const destroy = () => stream.destroy?.();
+        if (signal) {
+          signal.addEventListener("abort", destroy, { once: true });
+        }
+        try {
+          for await (const chunk of stream) {
+            if (signal?.aborted)
+              break;
+            const lines = chunk.toString("utf8").split("\n").filter(Boolean);
+            for (const line of lines) {
+              try {
+                const raw = JSON.parse(line);
+                const validated = schemas_1.DockerStatsRawSchema.parse(raw);
+                const { stats, cpuTotal, systemTotal } = this.parseStats(validated, prevCpu, prevSystem);
+                prevCpu = cpuTotal;
+                prevSystem = systemTotal;
+                yield stats;
+              } catch {
+                continue;
+              }
             }
           }
+        } finally {
+          destroy();
         }
       }
       async listImages(all = false) {
@@ -56140,7 +56162,7 @@ var require_ComposeClient = __commonJS({
       async ps(project) {
         return this.exec(["-p", project, "ps", "--format", "json"]);
       }
-      async *streamLogs(project, service, tail = 100) {
+      async *streamLogs(project, service, tail = 100, signal) {
         const args = ["-p", project, "logs", "--follow", "--tail", String(tail), "--timestamps"];
         if (service)
           args.push(service);
@@ -56179,6 +56201,14 @@ var require_ComposeClient = __commonJS({
           entries.push(entry);
           resolve?.();
         };
+        const kill = () => {
+          done = true;
+          resolve?.();
+          proc.kill();
+        };
+        if (signal) {
+          signal.addEventListener("abort", kill, { once: true });
+        }
         proc.stdout.on("data", (data) => {
           stdoutBuffer += data.toString();
           const lines = stdoutBuffer.split("\n");
@@ -56220,6 +56250,9 @@ var require_ComposeClient = __commonJS({
             }
           }
         } finally {
+          proc.stdout.removeAllListeners();
+          proc.stderr.removeAllListeners();
+          proc.removeAllListeners();
           proc.kill();
         }
       }
@@ -56399,6 +56432,14 @@ var require_StatsCollector = __commonJS({
       remove(containerId) {
         this.histories.delete(containerId);
       }
+      /** Remove history entries for containers not in the active set. */
+      prune(activeContainerIds) {
+        for (const id of this.histories.keys()) {
+          if (!activeContainerIds.has(id)) {
+            this.histories.delete(id);
+          }
+        }
+      }
       clear() {
         this.histories.clear();
       }
@@ -56801,10 +56842,17 @@ var require_LogTemplateEngine = __commonJS({
     function isVariable(token) {
       return VARIABLE_PATTERNS.some((p) => p.test(token));
     }
+    var DEFAULT_MAX_GROUPS = 500;
     var LogTemplateEngine2 = class {
       // Group templates by token count for efficient lookup
       groups = /* @__PURE__ */ new Map();
       totalLines = 0;
+      groupCount = 0;
+      droppedGroups = 0;
+      maxGroups;
+      constructor(maxGroups = DEFAULT_MAX_GROUPS) {
+        this.maxGroups = maxGroups;
+      }
       /**
        * Process a log line and update templates.
        */
@@ -56815,7 +56863,12 @@ var require_LogTemplateEngine = __commonJS({
           return;
         const groups = this.groups.get(tokens.length);
         if (!groups) {
+          if (this.groupCount >= this.maxGroups) {
+            this.droppedGroups++;
+            return;
+          }
           this.groups.set(tokens.length, [{ tokens: tokens.map((t) => isVariable(t) ? "<*>" : t), count: 1 }]);
+          this.groupCount++;
           return;
         }
         let bestMatch = null;
@@ -56840,8 +56893,11 @@ var require_LogTemplateEngine = __commonJS({
               bestMatch.tokens[i] = "<*>";
             }
           }
-        } else {
+        } else if (this.groupCount < this.maxGroups) {
           groups.push({ tokens: tokens.map((t) => isVariable(t) ? "<*>" : t), count: 1 });
+          this.groupCount++;
+        } else {
+          this.droppedGroups++;
         }
       }
       /**
@@ -56864,9 +56920,18 @@ var require_LogTemplateEngine = __commonJS({
       getTotalLines() {
         return this.totalLines;
       }
+      getDiagnostics() {
+        return {
+          groupCount: this.groupCount,
+          droppedGroups: this.droppedGroups,
+          totalLines: this.totalLines
+        };
+      }
       reset() {
         this.groups.clear();
         this.totalLines = 0;
+        this.groupCount = 0;
+        this.droppedGroups = 0;
       }
     };
     exports2.LogTemplateEngine = LogTemplateEngine2;
@@ -94320,6 +94385,19 @@ var DockerState = class {
       this.composeProjects = this.composeDetector.detect(containers, fileConfig);
       this.lastRefresh = /* @__PURE__ */ new Date();
       this.daemonConnected = true;
+      const currentContainerIds = new Set(containers.map((c) => c.id));
+      for (const id of this.inspectedEnv.keys()) {
+        if (!currentContainerIds.has(id)) this.inspectedEnv.delete(id);
+      }
+      for (const id of this.containerChanges.keys()) {
+        if (!currentContainerIds.has(id)) this.containerChanges.delete(id);
+      }
+      const currentImageIds = new Set(images.map((i) => i.id));
+      for (const id of this.imageLayers.keys()) {
+        if (!currentImageIds.has(id)) this.imageLayers.delete(id);
+      }
+      const runningIds = new Set(containers.filter((c) => c.state === "running").map((c) => c.id));
+      this.statsCollector.prune(runningIds);
     } catch {
       this.daemonConnected = false;
     }
@@ -94369,6 +94447,8 @@ var DockerState = class {
       case "destroy":
         this.containers = this.containers.filter((c) => c.id !== resourceId);
         this.statsCollector.remove(resourceId);
+        this.inspectedEnv.delete(resourceId);
+        this.containerChanges.delete(resourceId);
         break;
       case "create":
         this.refresh().catch((e) => console.debug("refresh failed:", e));
@@ -94437,19 +94517,19 @@ var DockerState = class {
   }
   getMetrics() {
     return {
-      containers: [...this.containers],
-      images: [...this.images],
-      volumes: [...this.volumes],
-      networks: [...this.networks],
-      composeProjects: [...this.composeProjects],
+      containers: this.containers,
+      images: this.images,
+      volumes: this.volumes,
+      networks: this.networks,
+      composeProjects: this.composeProjects,
       statsCollector: this.statsCollector,
       inspectedEnv: this.inspectedEnv,
       containerChanges: this.containerChanges,
       imageLayers: this.imageLayers,
-      selectedContainerLogs: [...this.selectedLogs],
-      selectedComposeLogs: [...this.selectedComposeLogs],
-      secondaryContainerLogs: [...this.secondaryLogs],
-      secondaryComposeLogs: [...this.secondaryComposeLogs],
+      selectedContainerLogs: this.selectedLogs,
+      selectedComposeLogs: this.selectedComposeLogs,
+      secondaryContainerLogs: this.secondaryLogs,
+      secondaryComposeLogs: this.secondaryComposeLogs,
       lastRefresh: this.lastRefresh,
       daemonConnected: this.daemonConnected,
       logFilterString: "",
@@ -94593,17 +94673,27 @@ function colorizeTokens(message) {
     return colorFn ? colorFn(t.text) : t.text;
   }).join("");
 }
+var colorizedCache = /* @__PURE__ */ new WeakMap();
 function colorizeLogEntry(entry, filterMatches) {
+  if (!filterMatches) {
+    const cached = colorizedCache.get(entry);
+    if (cached !== void 0) return cached;
+  }
   const ts = entry.timestamp ? (0, import_sidekick_docker_shared2.formatTimestampTime)(entry.timestamp) : "";
   const tsColored = ts ? ansi.dim(ansi.gray(ts)) + " " : "";
+  let result;
   if (entry.stream === "stderr") {
     const msg = filterMatches ? highlightMatches(entry.message, filterMatches, ansi.red) : ansi.red(entry.message);
-    return tsColored + msg;
+    result = tsColored + msg;
+  } else if (filterMatches && filterMatches.length > 0) {
+    result = tsColored + highlightMatches(entry.message, filterMatches);
+  } else {
+    result = tsColored + colorizeTokens(entry.message);
   }
-  if (filterMatches && filterMatches.length > 0) {
-    return tsColored + highlightMatches(entry.message, filterMatches);
+  if (!filterMatches) {
+    colorizedCache.set(entry, result);
   }
-  return tsColored + colorizeTokens(entry.message);
+  return result;
 }
 function highlightMatches(text, matches, baseFn) {
   if (matches.length === 0) return baseFn ? baseFn(text) : colorizeTokens(text);
@@ -94765,8 +94855,8 @@ var ContainersPanel = class {
       label: "Logs",
       render: (_item, metrics) => {
         const logs = metrics.selectedContainerLogs;
-        if (logs.length === 0) return "No logs available. Select a container to view logs.";
-        return renderLogLines(logs, metrics.logFilterString, metrics.logFilterMode, metrics.logSeverityCounts).join("\n");
+        if (logs.length === 0) return ["No logs available. Select a container to view logs."];
+        return renderLogLines(logs, metrics.logFilterString, metrics.logFilterMode, metrics.logSeverityCounts);
       },
       autoScrollBottom: true
     },
@@ -95065,8 +95155,8 @@ var ServicesPanel = class {
       label: "Logs",
       render: (_item, metrics) => {
         const logs = metrics.selectedComposeLogs;
-        if (logs.length === 0) return "No compose logs. Logs will appear when a service produces output.";
-        return renderLogLines(logs, metrics.logFilterString, metrics.logFilterMode).join("\n");
+        if (logs.length === 0) return ["No compose logs. Logs will appear when a service produces output."];
+        return renderLogLines(logs, metrics.logFilterString, metrics.logFilterMode);
       },
       autoScrollBottom: true
     }
@@ -95479,6 +95569,8 @@ var BaseStreamManager = class {
   streamPromise = null;
   reconnect = new import_sidekick_docker_shared6.ReconnectScheduler();
   onChange;
+  streamController = null;
+  streamGeneration = 0;
   constructor(onChange) {
     this.onChange = onChange;
     this.currentId = this.emptyId();
@@ -95492,25 +95584,29 @@ var BaseStreamManager = class {
     if (!this.isValidId(id)) return;
     this.aborted = false;
     this.reconnect.reset();
+    this.streamController = new AbortController();
+    this.streamGeneration++;
     this.onBeforeStream();
-    this.streamPromise = this.runStream(id);
+    this.streamPromise = this.runStream(id, this.streamController.signal, this.streamGeneration);
   }
-  async runStream(id) {
+  async runStream(id, signal, generation) {
     try {
-      for await (const item of this.createStream(id)) {
-        if (this.aborted || !this.isSameId(id, this.currentId)) break;
+      for await (const item of this.createStream(id, signal)) {
+        if (signal.aborted || this.aborted || !this.isSameId(id, this.currentId)) break;
         this.processItem(id, item);
         this.onChange();
       }
       this.reconnect.reset();
     } catch (err) {
+      if (signal.aborted) return;
       console.debug(`${this.streamLabel} stream error:`, (0, import_sidekick_docker_shared6.errorMessage)(err));
     }
-    if (!this.aborted && this.isSameId(id, this.currentId)) {
+    if (!signal.aborted && !this.aborted && this.isSameId(id, this.currentId) && generation === this.streamGeneration) {
       const scheduled = this.reconnect.schedule(() => {
-        if (!this.aborted && this.isSameId(id, this.currentId)) {
+        if (!this.aborted && this.isSameId(id, this.currentId) && generation === this.streamGeneration) {
+          this.streamController = new AbortController();
           this.onBeforeStream();
-          this.streamPromise = this.runStream(id);
+          this.streamPromise = this.runStream(id, this.streamController.signal, generation);
         }
       });
       if (!scheduled) {
@@ -95521,6 +95617,8 @@ var BaseStreamManager = class {
   stop() {
     this.aborted = true;
     this.currentId = this.emptyId();
+    this.streamController?.abort();
+    this.streamController = null;
     this.streamPromise = null;
     this.reconnect.clear();
     this.onStop();
@@ -95561,8 +95659,8 @@ var LogStreamManager = class extends BaseStreamManager {
   idLabel(id) {
     return id ?? "(none)";
   }
-  createStream(id) {
-    return this.client.streamLogs(id, { follow: true, tail: 100 });
+  createStream(id, signal) {
+    return this.client.streamLogs(id, { follow: true, tail: 100 }, signal);
   }
   processItem(_id, entry) {
     this.logs.push(entry);
@@ -95594,6 +95692,9 @@ var LogStreamManager = class extends BaseStreamManager {
   getCurrentContainerId() {
     return this.currentId;
   }
+  getTemplateDiagnostics() {
+    return this.templateEngine.getDiagnostics();
+  }
 };
 
 // src/dashboard/StatsStreamManager.ts
@@ -95618,8 +95719,8 @@ var StatsStreamManager = class extends BaseStreamManager {
   idLabel(id) {
     return id ?? "(none)";
   }
-  createStream(id) {
-    return this.client.streamStats(id);
+  createStream(id, signal) {
+    return this.client.streamStats(id, signal);
   }
   processItem(id, stats) {
     this.collector.push(id, stats);
@@ -95659,8 +95760,8 @@ var ComposeLogStreamManager = class extends BaseStreamManager {
   idLabel(id) {
     return id.project ?? "(none)";
   }
-  createStream(id) {
-    return this.composeClient.streamLogs(id.project, id.service ?? void 0);
+  createStream(id, signal) {
+    return this.composeClient.streamLogs(id.project, id.service ?? void 0, 100, signal);
   }
   processItem(_id, entry) {
     this.logs.push(entry);
@@ -97222,13 +97323,13 @@ function Dashboard({ panels, metrics, onViewStateChange, execTriggerRef, onExecF
     logFilterString: state.logFilterString,
     logFilterMode: state.logFilterMode
   };
-  let detailContent = "";
+  let detailLines = [];
   if (selectedItem && detailTabs.length > 0 && tabIdx >= 0) {
-    detailContent = detailTabs[tabIdx].render(selectedItem, enrichedMetrics);
+    const result = detailTabs[tabIdx].render(selectedItem, enrichedMetrics);
+    detailLines = Array.isArray(result) ? result : result.split("\n");
   } else if (!selectedItem) {
-    detailContent = "(no item selected)";
+    detailLines = ["(no item selected)"];
   }
-  const detailLines = detailContent.split("\n");
   const detailViewportHeight = Math.max(1, rows - RESERVED_UI_ROWS);
   const activeTab = detailTabs[tabIdx];
   const shouldAutoScroll = activeTab?.autoScrollBottom ?? false;
@@ -97380,8 +97481,8 @@ function Dashboard({ panels, metrics, onViewStateChange, execTriggerRef, onExecF
         )
       ] })
     ] }),
-    state.overlay === "help" && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(HelpOverlay, { panels, activePanelIndex: state.activePanelIndex, version: "0.2.3" }),
-    state.overlay === "version" && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(VersionOverlay, { version: "0.2.3" }),
+    state.overlay === "help" && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(HelpOverlay, { panels, activePanelIndex: state.activePanelIndex, version: "0.2.5" }),
+    state.overlay === "version" && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(VersionOverlay, { version: "0.2.5" }),
     state.overlay === "exec" && /* @__PURE__ */ (0, import_jsx_runtime18.jsx)(
       ExecOverlay,
       {
@@ -97398,7 +97499,7 @@ function Dashboard({ panels, metrics, onViewStateChange, execTriggerRef, onExecF
         filterString: state.filterString,
         containerCount: metrics.containers.length,
         runningCount,
-        version: "0.2.3",
+        version: "0.2.5",
         matchCount: state.filterString ? currentItems.length : void 0,
         totalCount: state.filterString ? totalItemCount : void 0,
         lastRefresh: metrics.lastRefresh,
@@ -97463,6 +97564,22 @@ async function dashboardAction(_opts, cmd) {
   let composeLogFlushTimer = null;
   let secondaryLogFlushTimer = null;
   let secondaryComposeLogFlushTimer = null;
+  let renderTimer = null;
+  function scheduleRender() {
+    if (renderTimer) return;
+    renderTimer = setTimeout(() => {
+      renderTimer = null;
+      instance.rerender(
+        import_react37.default.createElement(Dashboard, {
+          panels,
+          metrics: getEnrichedMetrics(),
+          onViewStateChange,
+          execTriggerRef,
+          onExecFallback
+        })
+      );
+    }, 200);
+  }
   const logManager = new LogStreamManager(client, () => {
     if (logFlushTimer) return;
     logFlushTimer = setTimeout(() => {
@@ -97644,6 +97761,17 @@ async function dashboardAction(_opts, cmd) {
   const refreshInterval = setInterval(() => {
     state.refresh().then(() => scheduleRender()).catch((e) => console.debug("periodic refresh failed:", e));
   }, 3e4);
+  let debugInterval = null;
+  if (process.env.SIDEKICK_DEBUG_STREAMS === "1") {
+    debugInterval = setInterval(() => {
+      const mem = process.memoryUsage();
+      const heapMB = (mem.heapUsed / 1024 / 1024).toFixed(1);
+      const rssMB = (mem.rss / 1024 / 1024).toFixed(1);
+      const templateDiag = logManager.getTemplateDiagnostics();
+      const secondaryDiag = secondaryLogManager.getTemplateDiagnostics();
+      console.debug(`[sidekick-debug] heap=${heapMB}MB rss=${rssMB}MB templates=${JSON.stringify(templateDiag)} secondary=${JSON.stringify(secondaryDiag)}`);
+    }, 6e4);
+  }
   const execTriggerRef = { current: null };
   const onExecFallback = (containerId) => {
     instance.clear();
@@ -97690,7 +97818,6 @@ async function dashboardAction(_opts, cmd) {
   servicesPanel.setOnCopyLogs((text) => {
     copyToClipboard(text);
   });
-  let renderTimer = null;
   function getEnrichedMetrics() {
     const m = state.getMetrics();
     m.logSeverityCounts = logSeverityCounts;
@@ -97700,21 +97827,6 @@ async function dashboardAction(_opts, cmd) {
     m.secondaryLogSeverityTimeSeries = secondaryLogManager.getSeverityTimeSeries();
     return m;
   }
-  function scheduleRender() {
-    if (renderTimer) return;
-    renderTimer = setTimeout(() => {
-      renderTimer = null;
-      instance.rerender(
-        import_react37.default.createElement(Dashboard, {
-          panels,
-          metrics: getEnrichedMetrics(),
-          onViewStateChange,
-          execTriggerRef,
-          onExecFallback
-        })
-      );
-    }, 100);
-  }
   let stopped = false;
   function cleanup() {
     if (stopped) return;
@@ -97759,6 +97871,10 @@ async function dashboardAction(_opts, cmd) {
       clearInterval(refreshInterval);
     } catch {
     }
+    try {
+      if (debugInterval) clearInterval(debugInterval);
+    } catch {
+    }
     try {
       watcher.stop();
     } catch {
@@ -97839,7 +97955,7 @@ async function logsAction(container, opts) {
 
 // src/cli.ts
 var program2 = new Command();
-program2.name("sidekick-docker").description("Docker management TUI dashboard").version("0.2.3").option("--socket <path>", "Docker socket path").action(async (_opts, cmd) => {
+program2.name("sidekick-docker").description("Docker management TUI dashboard").version("0.2.5").option("--socket <path>", "Docker socket path").action(async (_opts, cmd) => {
   await dashboardAction(_opts, cmd);
 });
 program2.command("ps").description("List containers").option("-a, --all", "Show all containers (default: running only)", false).action(async (opts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-docker",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Docker management TUI dashboard",
   "author": "Cesar Andres Lopez <cesarandreslopez@gmail.com>",
   "repository": {