create-op-node 0.10.11 → 0.10.13

package/dist/cli.js

@@ -12,18 +12,38 @@ import { readFileSync } from 'fs';
 import * as tls from 'tls';
 import { Validator } from '@cfworker/json-schema';
 
+// src/lib/constants.ts
+var PGSODIUM_KEY_RE = /^[a-f0-9]{64}$/;
+var TUNNEL_TOKEN_RE = /^[A-Za-z0-9_\-.=]+$/;
+var SAFE_PATH_RE = /^[A-Za-z0-9_\-./ ]+$/;
+var SAFE_LAUNCHCTL_VALUE_RE = /^[A-Za-z0-9+/=._-]+$/;
+var URL_SAFE_PASSWORD_RE = /^[A-Za-z0-9_-]+$/;
+var SAFE_URL_RE = /^[A-Za-z0-9:/_.-]+$/;
+var VERIFY_NETWORK_TIMEOUT_MS = 1e4;
+var API_REQUEST_TIMEOUT_MS = 15e3;
+var BODY_PREVIEW_MAX = 200;
+
 // src/lib/cloudflare.ts
 var CF_API = "https://api.cloudflare.com/client/v4";
 async function get(token, path, fetchImpl = fetch) {
-  const res = await fetchImpl(`${CF_API}${path}`, {
-    headers: { Authorization: `Bearer ${token}` }
-  });
-  let body = null;
+  const ctrl = new AbortController();
+  const timer = setTimeout(() => ctrl.abort(), API_REQUEST_TIMEOUT_MS);
   try {
-    body = await res.json();
+    const res = await fetchImpl(`${CF_API}${path}`, {
+      headers: { Authorization: `Bearer ${token}` },
+      signal: ctrl.signal
+    });
+    let body = null;
+    try {
+      body = await res.json();
+    } catch {
+    }
+    return { status: res.status, body };
   } catch {
+    return { status: 0, body: null };
+  } finally {
+    clearTimeout(timer);
   }
-  return { status: res.status, body };
 }
 function shortError(body) {
   if (typeof body === "object" && body !== null && "errors" in body && Array.isArray(body.errors)) {
@@ -38,6 +58,12 @@ function shortError(body) {
 async function probeCloudflareToken(input) {
   const issues = [];
   const verify = await get(input.token, `/accounts/${input.accountId}/tokens/verify`);
+  if (verify.status === 0) {
+    issues.push(
+      "Couldn't reach Cloudflare (network error or timeout). Check your connection and retry."
+    );
+    return { ok: false, issues };
+  }
   if (verify.status !== 200) {
     issues.push(
       `Token verify failed (HTTP ${verify.status}): ${shortError(verify.body)}`
@@ -55,7 +81,9 @@ async function probeCloudflareToken(input) {
     const res = await get(input.token, check.path);
     if (res.status === 200) continue;
     if (res.status === 404 && check.treat404AsPass) continue;
-    if (res.status === 401 || res.status === 403) {
+    if (res.status === 0) {
+      issues.push(`Couldn't reach Cloudflare while checking ${check.name} (network error or timeout).`);
+    } else if (res.status === 401 || res.status === 403) {
       issues.push(`Missing scope: ${check.name}`);
     } else if (res.status === 400 && typeof res.body === "object" && res.body !== null && "errors" in res.body && Array.isArray(res.body.errors) && res.body.errors.some((e) => e.code === 10042)) {
       issues.push(
@@ -75,6 +103,9 @@ async function tunnelStatus(input) {
       `/accounts/${input.accountId}/cfd_tunnel/${input.tunnelId}`,
       fetchImpl
     );
+    if (res.status === 0) {
+      return { ok: false, reason: "couldn't reach Cloudflare (network error or timeout)" };
+    }
     if (res.status !== 200) {
       return {
         ok: false,
@@ -103,13 +134,24 @@ function authHeaders(token) {
   };
 }
 async function getJson(token, path) {
-  const res = await fetch(`${TFC_API}${path}`, { headers: authHeaders(token) });
-  let body = null;
+  const ctrl = new AbortController();
+  const timer = setTimeout(() => ctrl.abort(), API_REQUEST_TIMEOUT_MS);
   try {
-    body = await res.json();
+    const res = await fetch(`${TFC_API}${path}`, {
+      headers: authHeaders(token),
+      signal: ctrl.signal
+    });
+    let body = null;
+    try {
+      body = await res.json();
+    } catch {
+    }
+    return { status: res.status, body };
   } catch {
+    return { status: 0, body: null };
+  } finally {
+    clearTimeout(timer);
   }
-  return { status: res.status, body };
 }
 async function probeTfcToken(input) {
   const issues = [];
@@ -120,6 +162,12 @@ async function probeTfcToken(input) {
     return { ok: false, issues };
   }
   const account = await getJson(input.token, "/account/details");
+  if (account.status === 0) {
+    issues.push(
+      "Couldn't reach Terraform Cloud (network error or timeout). Check your connection and retry."
+    );
+    return { ok: false, issues };
+  }
   if (account.status !== 200) {
     issues.push(
       `TFC token invalid (HTTP ${account.status}). Regenerate at https://app.terraform.io/app/settings/tokens.`
@@ -131,7 +179,11 @@ async function probeTfcToken(input) {
     input.token,
     `/organizations/${encodeURIComponent(input.organization)}`
   );
-  if (org.status === 404) {
+  if (org.status === 0) {
+    issues.push(
+      "Couldn't reach Terraform Cloud while checking the organization (network error or timeout)."
+    );
+  } else if (org.status === 404) {
     issues.push(
       `TFC organization "${input.organization}" not found, or this token lacks access. Check the org slug at https://app.terraform.io.`
     );
@@ -582,16 +634,27 @@ async function waitForApply(input, budgets = DEFAULT_BUDGETS, deps = realDeps) {
   }
   return waitForRunOutput(input, budgets, deps, runId);
 }
+async function safePoll(fn, onRetry) {
+  try {
+    return await fn();
+  } catch {
+    onRetry?.();
+    return null;
+  }
+}
 async function discoverRunId(input, budgets, deps) {
   deps.onProgress?.("discovery");
   const discoveryStart = deps.now();
   while (deps.now() - discoveryStart < budgets.discoveryMs) {
     await deps.sleep(budgets.pollMs);
-    const ws = await deps.findWorkspace({
-      token: input.token,
-      organization: input.organization,
-      tags: input.workspaceTags
-    });
+    const ws = await safePoll(
+      () => deps.findWorkspace({
+        token: input.token,
+        organization: input.organization,
+        tags: input.workspaceTags
+      }),
+      () => deps.onProgress?.("retry")
+    );
     if (ws?.currentRunId) return ws.currentRunId;
   }
   return null;
@@ -600,17 +663,20 @@ async function waitForRunOutput(input, budgets, deps, runId) {
   deps.onProgress?.("run");
   const runStart = deps.now();
   while (deps.now() - runStart < budgets.runMs) {
-    const r = await deps.getRunStatus(
-      { token: input.token, organization: input.organization },
-      runId
+    const r = await safePoll(
+      () => deps.getRunStatus({ token: input.token, organization: input.organization }, runId),
+      () => deps.onProgress?.("retry")
     );
     if (r?.finished) {
       if (!r.succeeded) return { kind: "run-failed", status: r.status };
       deps.onProgress?.("fetching");
-      const value = await deps.fetchOutput(
-        { token: input.token, organization: input.organization },
-        input.workspaceId,
-        input.outputName
+      const value = await safePoll(
+        () => deps.fetchOutput(
+          { token: input.token, organization: input.organization },
+          input.workspaceId,
+          input.outputName
+        ),
+        () => deps.onProgress?.("retry")
       );
       return value !== null ? { kind: "success", value } : { kind: "output-missing" };
     }
@@ -1165,14 +1231,25 @@ function isoStampUtc(d) {
 async function waitForApplyAndFetchTunnelToken(input) {
   const spin = p3.spinner();
   spin.start("Waiting for terraform apply to finish (polling every 10s)\u2026");
-  const outcome = await waitForApply({
-    token: input.token,
-    organization: input.organization,
-    workspaceId: input.workspaceId,
-    runId: input.runId,
-    workspaceTags: ["opuspopuli", "cloudflare"],
-    outputName: "tunnel_token"
-  });
+  const outcome = await waitForApply(
+    {
+      token: input.token,
+      organization: input.organization,
+      workspaceId: input.workspaceId,
+      runId: input.runId,
+      workspaceTags: ["opuspopuli", "cloudflare"],
+      outputName: "tunnel_token"
+    },
+    void 0,
+    {
+      ...realDeps,
+      // Surface a transient network hiccup instead of silently re-polling, so
+      // a slow wait doesn't look like a hang.
+      onProgress: (phase) => {
+        if (phase === "retry") spin.message("Transient network error \u2014 retrying next poll\u2026");
+      }
+    }
+  );
   switch (outcome.kind) {
     case "success":
       spin.stop(pc2.green("\u2713 Tunnel token retrieved."));
@@ -1192,16 +1269,6 @@ async function waitForApplyAndFetchTunnelToken(input) {
   }
 }
 
-// src/lib/constants.ts
-var PGSODIUM_KEY_RE = /^[a-f0-9]{64}$/;
-var TUNNEL_TOKEN_RE = /^[A-Za-z0-9_\-.=]+$/;
-var SAFE_PATH_RE = /^[A-Za-z0-9_\-./ ]+$/;
-var SAFE_LAUNCHCTL_VALUE_RE = /^[A-Za-z0-9+/=._-]+$/;
-var URL_SAFE_PASSWORD_RE = /^[A-Za-z0-9_-]+$/;
-var SAFE_URL_RE = /^[A-Za-z0-9:/_.-]+$/;
-var VERIFY_NETWORK_TIMEOUT_MS = 1e4;
-var BODY_PREVIEW_MAX = 200;
-
 // src/lib/homebrew.ts
 var STUDIO_PACKAGES = [
   { name: "git", kind: "formula" },
@@ -4784,7 +4851,7 @@ async function looksLikeRegionsRepo(dir) {
 }
 
 // src/cli.ts
-var VERSION = "0.10.11";
+var VERSION = "0.10.13";
 var program = new Command();
 program.name("create-op-node").description(
   "Interactive bootstrap for an Opus Populi federation node.\nCloudflare infrastructure \u2192 Mac Studio \u2192 live public API."