@tdk-landscape/tdk-cli-core 1.3.105 → 1.3.106

package/cli/dist/utils/up-readiness.js

@@ -1,11 +1,82 @@
 import { execFile } from "node:child_process";
 import { getDeferredResourceNames, parseTiltResourceFailures } from "./doctor-runtime.js";
 import { findOnPath } from "./which.js";
-function tiltGetUiResources(port) {
+export function tiltGetUiResources(port) {
     return new Promise((resolve) => {
         execFile(findOnPath("tilt") ?? "tilt", ["get", "uiresources", "-o", "json", "--port", String(port)], { timeout: 15_000, maxBuffer: 16 * 1024 * 1024 }, (error, stdout) => resolve(error ? null : stdout));
     });
 }
+/**
+ * Tilt lists resources outside the current focus (the other release phases, or everything but a `--only` selection) with
+ * `disableStatus.state: Disabled` and both statuses `none`, which would read as pending forever. A resource whose update
+ * status is `not_applicable` (a serve-only local resource) has nothing to build, so it counts as built.
+ */
+export function onlyEnabledResources(jsonText) {
+    const parsed = JSON.parse(jsonText);
+    const items = (parsed.items ?? [])
+        .filter((item) => item.status?.disableStatus?.state !== "Disabled")
+        .map((item) => item.status?.updateStatus === "not_applicable"
+        ? { ...item, status: { ...item.status, updateStatus: "ok" } }
+        : item);
+    return JSON.stringify({ items });
+}
+function enabledNames(jsonText) {
+    return (JSON.parse(jsonText).items ?? [])
+        .filter((item) => item.status?.disableStatus?.state !== "Disabled")
+        .flatMap((item) => (item.metadata?.name ? [item.metadata.name] : []));
+}
+/**
+ * Services the caller asked for must not vanish into the disabled filter: one that Tilt lists as disabled (it can be
+ * disabled while running) is a failure, and one Tilt does not list yet is still pending.
+ */
+export function checkExpectedResources(jsonText, expected) {
+    const items = JSON.parse(jsonText).items ?? [];
+    const byName = new Map(items.map((item) => [item.metadata?.name, item]));
+    return {
+        missing: expected.filter((name) => !byName.has(name)),
+        disabled: expected.filter((name) => byName.get(name)?.status?.disableStatus?.state === "Disabled"),
+    };
+}
+/**
+ * One look at `tilt get uiresources -o json`. `settled` means polling can stop: everything is ready, or the rest has
+ * finished with a failure (an errored resource, or an expected service Tilt has disabled).
+ */
+export function evaluateTiltReadiness(jsonText, deferred, expected) {
+    const parsed = parseTiltResourceFailures(onlyEnabledResources(jsonText), deferred);
+    let result = {
+        ready: parsed.failures.length === 0 && parsed.pendingCount === 0 && parsed.okCount > 0,
+        failures: parsed.failures.map((failure) => ({
+            name: failure.name,
+            message: failure.error || `${failure.updateStatus}/${failure.runtimeStatus}`,
+        })),
+        pending: parsed.pendingCount,
+        timedOut: false,
+        enabled: enabledNames(jsonText),
+    };
+    if (expected && expected.length > 0) {
+        const { missing, disabled } = checkExpectedResources(jsonText, expected);
+        if (missing.length > 0) {
+            result = { ...result, ready: false, pending: result.pending + missing.length };
+        }
+        if (disabled.length > 0) {
+            return {
+                settled: true,
+                result: {
+                    ...result,
+                    ready: false,
+                    failures: [
+                        ...result.failures,
+                        ...disabled.map((name) => ({ name, message: "disabled in Tilt" })),
+                    ],
+                },
+            };
+        }
+    }
+    return {
+        result,
+        settled: result.ready || (result.failures.length > 0 && result.pending === 0),
+    };
+}
 /**
  * Waits until every non-deferred Tilt resource is built and running. Resolves not-ready as soon as the rest has settled
  * with an errored resource, or at the deadline. Sablier-deferred resources are excluded: they stay idle by design.
@@ -16,24 +87,20 @@ export async function waitForTiltResourcesReady(port, options = {}) {
     const fetchJson = options.fetchJson ?? tiltGetUiResources;
     const deferred = options.deferred ?? getDeferredResourceNames();
     const deadline = Date.now() + timeoutMs;
-    let last = { ready: false, failures: [], pending: 0, timedOut: false };
+    let last = {
+        ready: false,
+        failures: [],
+        pending: 0,
+        timedOut: false,
+        enabled: [],
+    };
     for (;;) {
         const text = await fetchJson(port);
         if (text) {
             try {
-                const parsed = parseTiltResourceFailures(text, deferred);
-                last = {
-                    ready: parsed.failures.length === 0 && parsed.pendingCount === 0 && parsed.okCount > 0,
-                    failures: parsed.failures.map((failure) => ({
-                        name: failure.name,
-                        message: failure.error || `${failure.updateStatus}/${failure.runtimeStatus}`,
-                    })),
-                    pending: parsed.pendingCount,
-                    timedOut: false,
-                };
-                if (last.ready)
-                    return last;
-                if (last.failures.length > 0 && last.pending === 0)
+                const evaluation = evaluateTiltReadiness(text, deferred, options.expected);
+                last = evaluation.result;
+                if (evaluation.settled)
                     return last;
             }
             catch {

package/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tdk-cli-internal",
   "private": true,
-  "version": "1.3.105",
+  "version": "1.3.106",
   "description": "TDK CLI — start services on your laptop.",
   "keywords": [
     "tdk",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tdk-landscape/tdk-cli-core",
-  "version": "1.3.105",
+  "version": "1.3.106",
   "description": "TDK CLI — start services on your laptop.",
   "homepage": "https://tdk-landscape.github.io/tdk-website",
   "repository": {