infracensus-collector 1.6.0 → 1.6.2

package/dist/index.js

@@ -1198,6 +1198,22 @@ function cleanCommandOutput(raw, command, prompt) {
   }
   return lines2.join("\n");
 }
+var ENABLE_DETAIL = {
+  /** The session never settled — there was no prompt to elevate FROM. */
+  noPrompt: "the session never returned a usable prompt",
+  /**
+   * It asked, we answered, it stayed in user mode: the secret is wrong.
+   * `enablePassword` falls back to the LOGIN password when a credential
+   * carries no enable field, so "nothing was supplied" and "the wrong thing
+   * was" reach the device identically — and the fix differs, which is the
+   * whole reason these are two sentences.
+   */
+  borrowedLoginPasswordRejected: "this credential carries no enable secret, so the login password was offered instead and the device refused it",
+  /** It asked, we answered with this credential's own secret, it refused. */
+  secretRejected: "the device rejected this credential's enable secret",
+  /** It never asked at all — the account is not permitted to elevate. */
+  neverAsked: "the device never asked to be unlocked and stayed in user mode \u2014 the account is probably not permitted to enable"
+};
 async function gatherViaShell(conn, commands, perCommandTimeoutMs, signal, enablePassword, onDebug, usedLoginPasswordAsSecret = false) {
   const stream = await openShell(conn);
   let buf = "";
@@ -1231,7 +1247,7 @@ async function gatherViaShell(conn, commands, perCommandTimeoutMs, signal, enabl
     stream.write("\r");
     let prompt = await readUntilPrompt(8e3);
     let elevated = prompt != null && prompt.endsWith("#");
-    if (prompt === null) enableDetail = "the session never returned a usable prompt";
+    if (prompt === null) enableDetail = ENABLE_DETAIL.noPrompt;
     if (prompt && prompt.endsWith(">")) {
       buf = "";
       stream.write("enable\r");
@@ -1251,14 +1267,7 @@ async function gatherViaShell(conn, commands, perCommandTimeoutMs, signal, enabl
       }
       elevated = prompt != null && prompt.endsWith("#");
       if (!elevated) {
-        enableDetail = askedForSecret ? (
-          // It asked and we answered, and it stayed in user mode: the secret is
-          // wrong. `enablePassword` falls back to the LOGIN password when the
-          // credential carries no enable field, so "no enable secret was
-          // supplied" and "the wrong one was" reach the device identically —
-          // and the fix differs.
-          usedLoginPasswordAsSecret ? "the device asked for an enable secret and rejected the login password \u2014 this credential carries no enable secret of its own" : "the device rejected the enable secret on this credential"
-        ) : "the device never asked for an enable secret and stayed in user mode \u2014 the account is probably not permitted to enable";
+        enableDetail = askedForSecret ? usedLoginPasswordAsSecret ? ENABLE_DETAIL.borrowedLoginPasswordRejected : ENABLE_DETAIL.secretRejected : ENABLE_DETAIL.neverAsked;
         onDebug?.(`enable did not elevate (${enableDetail})`);
       }
     }
@@ -14895,6 +14904,7 @@ ${tokenCss()}
   .runrow .when { font-variant-numeric: tabular-nums; }
   .outcome-finished { color: var(--ok); } .outcome-failed { color: var(--bad); }
   .outcome-incomplete { color: var(--warn); }
+  .outcome-running { color: var(--accent); }
   /* THE RUN DETAIL. An operator opening a finished run wants four things \u2014 how
      far each stage got, when it ran, what it was pointed at, and what it found
      \u2014 and wants each in the same place every time. Labelled blocks, not the
@@ -15963,11 +15973,18 @@ ${tokenCss()}
       $("runTargets").value = (s.scanDefaults.targets || []).join(", ");
     }
     renderLive(s.scanProgress || null);
-    // A run that has just ENDED is the moment the history gained a row, and
-    // the moment somebody wants to read it. Refreshed once on that edge
-    // rather than on every poll.
+    // A run that has just ENDED is the moment the history gained a row, and the
+    // moment somebody wants to read it.
+    //
+    // It is also re-read WHILE one runs, which it deliberately was not before:
+    // the detail used to be a fold of a finished run, so nothing in it changed
+    // between two polls of a scan in flight. It now carries that run's stages
+    // and the addresses it has found so far, both of which land as the scan
+    // goes \u2014 a panel somebody opened to watch their own scan cannot be a
+    // snapshot of the moment they opened it. Bounded twice over: only while the
+    // panel is open, and only while something is actually running.
     const running = !!s.scanProgress;
-    if (wasRunning && !running && $("histWrap").open) loadRuns();
+    if ($("histWrap").open && (running || (wasRunning && !running))) loadRuns();
     wasRunning = running;
     $("lastPollAt").textContent = fmt(s.daemon && s.daemon.lastPollAt);
     $("lastPushAt").textContent = fmt(s.daemon && s.daemon.lastPushAt);
@@ -16658,9 +16675,16 @@ ${tokenCss()}
       const sum = el("summary");
       sum.appendChild(el("span", { class: "when", text: fmt(run.startedAt) }));
       sum.appendChild(el("span", { text: run.mode }));
-      sum.appendChild(el("span", { class: "outcome-" + run.outcome, text:
-        run.outcome === "finished" ? "finished"
-        : run.outcome === "failed" ? "failed"
+      // A run the LEDGER calls running is only reported as running if a scan is
+      // actually in flight. The ledger cannot tell a live daemon from one killed
+      // between two polls; the status poll can, and it is the half of the answer
+      // this side of the page holds.
+      const live = run.outcome === "running" && wasRunning;
+      const state = run.outcome === "running" && !live ? "stopped" : run.outcome;
+      sum.appendChild(el("span", { class: "outcome-" + (live ? "running" : state), text:
+        state === "finished" ? "finished"
+        : state === "failed" ? "failed"
+        : live ? "running now"
         : "no end recorded" }));
       if (run.durationMs) {
         sum.appendChild(el("span", { class: "dim", text: Math.round(run.durationMs / 1000) + "s" }));
@@ -16683,13 +16707,22 @@ ${tokenCss()}
       // \u2500\u2500 CURRENT STAGE \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
       // Where the run got to, in one sentence, at the top. A run that died has
       // its reason HERE rather than as a note somewhere further down.
+      // The last stage the run reported is what it is DOING, which is the
+      // sentence somebody watching their own scan is looking for. A finished run
+      // has no use for it; a live one has nothing else.
+      const latest = run.phases && run.phases.length ? run.phases[run.phases.length - 1] : null;
       block("Current stage", [
         el("div", {
-          class: run.outcome === "failed" ? "bad" : run.outcome === "incomplete" ? "warntext" : "",
+          class: state === "failed" ? "bad" : state === "incomplete" || state === "stopped" ? "warntext" : "",
           text:
-            run.outcome === "finished" ? "Scan complete."
-            : run.outcome === "failed" ? (run.reason || "The run failed.")
-            : "No end was recorded \u2014 the collector stopped before this run finished.",
+            state === "finished" ? "Scan complete."
+            : state === "failed" ? (run.reason || "The run failed.")
+            : live ? (latest && latest.note ? latest.note
+                      : latest ? "Running: " + latest.phase
+                      : "Running.")
+            : state === "stopped"
+              ? "This run has no end recorded and no scan is in flight, so the collector stopped before it finished."
+              : "A later run started before this one recorded an end, so it was interrupted.",
         }),
       ]);
 
@@ -18229,7 +18262,10 @@ function runHistoryFromEvents(events, limit = HISTORY_LIMIT) {
       targets: Array.isArray(start.targets) ? start.targets : [],
       collectorId: start.collectorId ?? null,
       lastEventAt: start.ts ?? null,
-      outcome: "incomplete",
+      // Nothing has contradicted it yet. The scan below downgrades this to
+      // `incomplete` the moment a NEWER run-started proves it was abandoned,
+      // and to a verdict when one arrives.
+      outcome: "running",
       reason: null,
       devices: null,
       durationMs: null,
@@ -18243,7 +18279,10 @@ function runHistoryFromEvents(events, limit = HISTORY_LIMIT) {
     for (let j = i + 1; j < events.length; j += 1) {
       const e = events[j];
       if (!e) continue;
-      if (e.event === "run-started") break;
+      if (e.event === "run-started") {
+        run2.outcome = "incomplete";
+        break;
+      }
       if (e.ts) run2.lastEventAt = e.ts;
       if (e.event === "run-finished") {
         run2.outcome = "finished";