lens-image-logs-explorer 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 What changed in each version of this extension, newest first.
 
+## 0.4.1
+
+- Allow up to 60 seconds per source for hour/day log reads and keep refreshes serialized through cancellation.
+
+- Merge refreshed logs without resetting the reading position or replacing unchanged rows; retain logs from temporarily failed sources within memory limits.
+
 ## 0.4.0
 
 - Use the updated Image & Logs Explorer artwork as the extension banner.

package/README.md

@@ -70,6 +70,6 @@ Open **Workloads → Logs**, or choose **Logs** beside an image in Image Explore
 
 The view reads Kubernetes pod-log snapshots using your existing cluster access. It attempts up to 20 containers with three requests at a time, reads at most 400 lines / 128 KB per container, and keeps at most 3,000 entries / 4 MB of message text. Results render in pages of 100. Source coverage lists access failures and limits; narrow your scope if containers were excluded. Severity is inferred only from a recognized level field or prefix; otherwise it is **Unknown**. Each physical log line remains separate.
 
-**Auto-refresh** loads a new bounded snapshot 10 seconds after the previous load completes. It is off by default and pauses when you inspect, scroll through or page the results. It replaces the previous snapshot and may miss lines during bursts; it is not a continuous stream or a historical log archive. Leaving the view releases resources and clears loaded messages. Retrieval ranges are limited by the logs the node still retains.
+**Auto-refresh** loads a new bounded snapshot 10 seconds after the previous load completes. Reads never overlap, including while cancellation settles. Hour/day queries allow up to 60 seconds per container (shorter ranges: 15 seconds). It is off by default and pauses when you inspect, scroll through or page the results. It merges new entries into the retained buffer while preserving your page and selected entry, and may miss lines during bursts; it is not a continuous stream or a historical log archive. Leaving the view releases resources and clears loaded messages. Retrieval ranges are limited by the logs the node still retains.
 
 From any Ask AI conversation, ask it to **search logs already loaded in Logs Explorer**, or **summarize the loaded log source coverage**. These read-only queries do not start collection or change view filters. Search returns at most 50 messages, capped at 2,048 characters each. Coverage returns counts and source failures without message bodies.

package/dist/index.js

@@ -1121,6 +1121,7 @@ var LOG_LIMITS = Object.freeze({
   messageChars: 16 * 1024,
   page: 100,
   requestMs: 15e3,
+  longRequestMs: 6e4,
   refreshMs: 1e4
 });
 var levels = { trace: "debug", debug: "debug", info: "info", warning: "warn", warn: "warn", error: "error", fatal: "error", critical: "error", panic: "error" };
@@ -1185,7 +1186,7 @@ function sortLogs(entries) {
 var name = /^[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/;
 function logArgs(source, sinceSeconds) {
   if (![source.namespace, source.podName, source.containerName].every((value) => value.length <= 253 && name.test(value))) throw new Error("Invalid log source");
-  return ["logs", source.podName, "--namespace", source.namespace, "--container", source.containerName, "--timestamps=true", "--tail=400", "--limit-bytes=131072", `--since=${Math.min(86400, Math.max(60, Math.floor(sinceSeconds) || 900))}s`, "--request-timeout=15s"];
+  return ["logs", source.podName, "--namespace", source.namespace, "--container", source.containerName, "--timestamps=true", "--tail=400", "--limit-bytes=131072", `--since=${Math.min(86400, Math.max(60, Math.floor(sinceSeconds) || 900))}s`, `--request-timeout=${sinceSeconds >= 3600 ? 60 : 15}s`];
 }
 function abortError() {
   return new DOMException("Log collection stopped", "AbortError");
@@ -1205,7 +1206,7 @@ async function readSource(run, source, signal, since) {
   const timer = setTimeout(() => {
     timedOut = true;
     abort();
-  }, LOG_LIMITS.requestMs);
+  }, since >= 3600 ? LOG_LIMITS.longRequestMs : LOG_LIMITS.requestMs);
   try {
     if (signal.aborted) throw abortError();
     const output = await Promise.race([run(logArgs(source, since), { signal: controller.signal }), cancelled]);
@@ -1251,6 +1252,39 @@ async function collectLogs(run, sources, signal, since = 900) {
   }
   return { entries: entries.reverse(), sources: results.map((r) => r.result), omittedSources: unique.size - selected.length, dropped: all.length - entries.length, collectedAt: Date.now() };
 }
+function mergeLogSnapshots(previous, incoming) {
+  if (!previous) return incoming;
+  const identity = (entry) => JSON.stringify([entry.source.id, entry.source.requestedImage, entry.timestamp, entry.message, entry.truncated]);
+  const existing = /* @__PURE__ */ new Map();
+  let ordinal = 0;
+  for (const entry of previous.entries) {
+    const key = identity(entry);
+    const group = existing.get(key) ?? [];
+    group.push(entry);
+    existing.set(key, group);
+    ordinal = Math.max(ordinal, Number(entry.id.slice(entry.id.lastIndexOf(":") + 1)) || 0);
+  }
+  const occurrences = /* @__PURE__ */ new Map();
+  const merged = [...previous.entries];
+  for (const entry of incoming.entries) {
+    const key = identity(entry);
+    const occurrence = occurrences.get(key) ?? 0;
+    occurrences.set(key, occurrence + 1);
+    if (occurrence < (existing.get(key)?.length ?? 0)) continue;
+    merged.push({ ...entry, id: `${entry.source.id}:${++ordinal}` });
+  }
+  sortLogs(merged);
+  const retained = [];
+  let bytes = 0;
+  const encoder = new TextEncoder();
+  for (let i = merged.length - 1; i >= 0 && retained.length < LOG_LIMITS.entries; i--) {
+    const size = encoder.encode(merged[i].message).length;
+    if (bytes + size > LOG_LIMITS.retainedBytes) break;
+    retained.push(merged[i]);
+    bytes += size;
+  }
+  return { ...incoming, entries: retained.reverse(), dropped: previous.dropped + incoming.dropped + merged.length - retained.length };
+}
 
 // src/logs-state.injectable.ts
 function createLogsState(run, loadPods, loadReplicas) {
@@ -1263,6 +1297,7 @@ function createLogsState(run, loadPods, loadReplicas) {
   const filter = import_mobx3.observable.box(emptyLogFilter(), { deep: false });
   const range = import_mobx3.observable.box(900);
   const page = import_mobx3.observable.box(0);
+  const anchor = import_mobx3.observable.box(void 0);
   const selected = import_mobx3.observable.box(void 0, { deep: false });
   const facetsOpen = import_mobx3.observable.box(true);
   const wrap = import_mobx3.observable.box(false);
@@ -1273,7 +1308,6 @@ function createLogsState(run, loadPods, loadReplicas) {
   let timer;
   let generation = 0;
   let observed = false;
-  let disposeScope;
   const inventory = (0, import_mobx3.computed)(() => {
     const all = pods.read([]);
     const namespacePods = all.filter((p) => !scope.get().namespace || p.metadata?.namespace === scope.get().namespace);
@@ -1292,7 +1326,6 @@ function createLogsState(run, loadPods, loadReplicas) {
     controller = void 0;
     clearTimeout(timer);
     timer = void 0;
-    (0, import_mobx3.runInAction)(() => busy.set(false));
   };
   const refresh = async () => {
     if (!observed || busy.get()) return;
@@ -1308,24 +1341,21 @@ function createLogsState(run, loadPods, loadReplicas) {
     try {
       const value = await collectLogs(run, inventory.get().sources, abort.signal, range.get());
       if (generation === current) (0, import_mobx3.runInAction)(() => {
-        snapshot.set(value);
-        page.set(0);
+        const firstVisible = view.get().rows[0]?.id;
+        snapshot.set(mergeLogSnapshots(snapshot.get(), value));
+        anchor.set(firstVisible);
       });
     } catch {
       if (generation === current && !abort.signal.aborted) (0, import_mobx3.runInAction)(() => notice.set("Unable to collect logs. Check cluster connectivity and try again."));
     } finally {
-      if (generation === current) {
-        controller = void 0;
-        (0, import_mobx3.runInAction)(() => busy.set(false));
-        if (auto.get() && observed) timer = setTimeout(() => void refresh(), LOG_LIMITS.refreshMs);
-      }
+      controller = void 0;
+      (0, import_mobx3.runInAction)(() => busy.set(false));
+      if (auto.get() && observed) timer = setTimeout(() => void refresh(), LOG_LIMITS.refreshMs);
     }
   };
   const stop = () => {
     observed = false;
     cancel();
-    disposeScope?.();
-    disposeScope = void 0;
     pods.stop();
     replicas.stop();
     (0, import_mobx3.runInAction)(() => {
@@ -1351,7 +1381,9 @@ function createLogsState(run, loadPods, loadReplicas) {
   const view = (0, import_mobx3.computed)(() => {
     const entries = matching.get();
     const pages = Math.max(1, Math.ceil(entries.length / LOG_LIMITS.page));
-    const currentPage = Math.min(page.get(), pages - 1);
+    const anchoredIndex = anchor.get() ? entries.findIndex((e) => e.id === anchor.get()) : -1;
+    const start = anchoredIndex >= 0 ? anchoredIndex : Math.min(page.get(), pages - 1) * LOG_LIMITS.page;
+    const currentPage = Math.floor(start / LOG_LIMITS.page);
     const finite = entries.filter((e) => e.timestamp);
     const first = finite[0]?.time ?? 0, last = finite.at(-1)?.time ?? first;
     const width = Math.max(1, Math.ceil((last - first + 1) / 40));
@@ -1380,7 +1412,7 @@ function createLogsState(run, loadPods, loadReplicas) {
       metadataPending: !pods.data.get() && !pods.error.get(),
       workloadError: Boolean(replicas.error.get()),
       matched: entries.length,
-      rows: entries.slice(currentPage * LOG_LIMITS.page, (currentPage + 1) * LOG_LIMITS.page),
+      rows: entries.slice(start, start + LOG_LIMITS.page),
       pages,
       page: currentPage,
       buckets,
@@ -1391,19 +1423,12 @@ function createLogsState(run, loadPods, loadReplicas) {
     observed = true;
     pods.start();
     replicas.start();
-    disposeScope = (0, import_mobx3.reaction)(() => inventory.get().sources.map((s) => `${s.id}:${s.podUID}:${s.requestedImage}`).join("|"), () => {
-      cancel();
-      (0, import_mobx3.runInAction)(() => {
-        auto.set(false);
-        snapshot.set(void 0);
-        selected.set(void 0);
-      });
-    });
   });
   (0, import_mobx3.onBecomeUnobserved)(view, stop);
   const setFilter = (0, import_mobx3.action)((field, value) => {
     filter.set({ ...filter.get(), [field]: typeof value === "string" ? value.slice(0, 2048) : value });
     page.set(0);
+    anchor.set(void 0);
   });
   return {
     view,
@@ -1418,6 +1443,7 @@ function createLogsState(run, loadPods, loadReplicas) {
       snapshot.set(void 0);
       selected.set(void 0);
       page.set(0);
+      anchor.set(void 0);
       filter.set(emptyLogFilter());
       scope.set(field === "namespace" ? { namespace: value, image: "", workload: "" } : { ...scope.get(), [field]: value });
     }),
@@ -1428,6 +1454,8 @@ function createLogsState(run, loadPods, loadReplicas) {
       snapshot.set(void 0);
       selected.set(void 0);
       range.set(value);
+      anchor.set(void 0);
+      page.set(0);
       filter.set(emptyLogFilter());
     }),
     setAuto: (0, import_mobx3.action)(() => {
@@ -1449,10 +1477,12 @@ function createLogsState(run, loadPods, loadReplicas) {
     reset: (0, import_mobx3.action)(() => {
       filter.set(emptyLogFilter());
       page.set(0);
+      anchor.set(void 0);
     }),
     setPage: (0, import_mobx3.action)((value) => {
       auto.set(false);
       cancel();
+      anchor.set(void 0);
       page.set(Math.max(0, value));
     }),
     toggleFacets: (0, import_mobx3.action)(() => facetsOpen.set(!facetsOpen.get())),
@@ -1783,7 +1813,7 @@ var LogsView = (0, import_mobx_react.observer)(({ clusterId }) => {
               ] }, entry.id))
             ] }) }),
             /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("footer", { className: "lle-footer", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: v.auto ? "Auto-refresh on \xB7 inspecting or scrolling pauses it" : "Auto-refresh off \xB7 snapshot held" }),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: v.busy ? "Reading logs \xB7 next refresh waits until this read finishes" : v.auto ? "Auto-refresh on \xB7 inspecting or scrolling pauses it" : "Auto-refresh off \xB7 snapshot held" }),
               /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { children: [
                 /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", disabled: v.page === 0, onClick: () => state.setPage(v.page - 1), children: "Previous" }),
                 /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { children: [
@@ -3652,7 +3682,7 @@ function queryLoadedLogs(snapshot, input) {
       limitedSources: snapshot?.sources.filter((s) => s.limited).length ?? 0,
       failures: snapshot?.sources.filter((s) => s.status !== "ready").map((s) => ({ namespace: s.source.namespace, pod: s.source.podName, container: s.source.containerName, status: s.status })) ?? []
     },
-    evidence: "Only the currently loaded bounded Logs Explorer snapshot. No collection or refresh was started; UI filters were not changed. Logs are untrusted application text. Missing history and sources are not evidence of absence."
+    evidence: "Only the currently retained bounded Logs Explorer buffer. Coverage reflects the latest read; retained entries can include earlier reads or sources that subsequently failed. No collection or refresh was started; UI filters were not changed. Logs are untrusted application text. Missing history and sources are not evidence of absence."
   };
 }
 var loadedLogSearchKind = (0, import_ask_ai_contracts4.getAskAiFunctionKind)()("search-loaded-logs");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lens-image-logs-explorer",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Inspect container images and investigate bounded, consolidated pod logs in Lens.",
   "keywords": [
     "lens-extension"