create-op-node 0.10.8 → 0.10.9

package/dist/cli.js

@@ -3428,36 +3428,47 @@ async function runVerify(input, deps = DEFAULT_DEPS2) {
     phases.push(ph);
     deps.onPhase?.(ph);
   };
+  await verifyTlsPhase(input, deps, push);
+  await verifyHealthPhase(input, deps, push);
+  await verifyGraphqlPhase(input, deps, push);
+  await verifyCloudflarePhase(input, deps, push);
+  await verifyCosignPhase(input, deps, push);
+  return { phases };
+}
+async function verifyTlsPhase(input, deps, push) {
   const tls2 = await deps.tls({ host: input.apiHost });
   if (!tls2.ok) {
     push({ name: "TLS handshake", status: "fail", detail: tls2.reason });
-  } else {
-    const line = `subject=${tls2.subject}, issuer=${tls2.issuer}, ${formatExpiry(tls2.daysToExpiry)}`;
-    const warn = tls2.daysToExpiry < input.certWarnDays;
-    if (warn) {
-      push({
-        name: "TLS handshake",
-        status: "warn",
-        detail: tls2.daysToExpiry < 0 ? line : `${line} (< warn threshold ${input.certWarnDays}d)`
-      });
-    } else {
-      push({ name: "TLS handshake", status: "ok", detail: line });
-    }
+    return;
+  }
+  const line = `subject=${tls2.subject}, issuer=${tls2.issuer}, ${formatExpiry(tls2.daysToExpiry)}`;
+  if (tls2.daysToExpiry < input.certWarnDays) {
+    push({
+      name: "TLS handshake",
+      status: "warn",
+      detail: tls2.daysToExpiry < 0 ? line : `${line} (< warn threshold ${input.certWarnDays}d)`
+    });
+    return;
   }
-  const healthUrl = `https://${input.apiHost}/health`;
-  const health = await deps.http({ url: healthUrl });
+  push({ name: "TLS handshake", status: "ok", detail: line });
+}
+async function verifyHealthPhase(input, deps, push) {
+  const health = await deps.http({ url: `https://${input.apiHost}/health` });
   if (health.ok) {
     push({ name: "GET /health", status: "ok", detail: `HTTP ${health.status}` });
   } else {
     push({ name: "GET /health", status: "fail", detail: health.reason });
   }
-  const gqlUrl = `https://${input.apiHost}/api`;
-  const gql = await deps.graphql({ url: gqlUrl });
+}
+async function verifyGraphqlPhase(input, deps, push) {
+  const gql = await deps.graphql({ url: `https://${input.apiHost}/api` });
   if (gql.ok) {
     push({ name: "GraphQL { __typename }", status: "ok", detail: `typename=${gql.typename}` });
   } else {
     push({ name: "GraphQL { __typename }", status: "fail", detail: gql.reason });
   }
+}
+async function verifyCloudflarePhase(input, deps, push) {
   const cfFields = [
     ["--cf-token", input.cf?.token],
     ["--cf-account-id", input.cf?.accountId],
@@ -3470,54 +3481,57 @@ async function runVerify(input, deps = DEFAULT_DEPS2) {
       status: "skipped",
       detail: "pass --cf-token + --cf-account-id + --tunnel-id to enable"
     });
-  } else if (cfSet.length < cfFields.length) {
+    return;
+  }
+  if (cfSet.length < cfFields.length) {
     const missing = cfFields.filter(([, v]) => v === void 0 || v === "").map(([name]) => name).join(", ");
     push({
       name: "Cloudflare Tunnel",
       status: "warn",
       detail: `partial CF config \u2014 missing ${missing}; check skipped`
     });
+    return;
+  }
+  const tun = await deps.tunnel({
+    token: input.cf.token,
+    accountId: input.cf.accountId,
+    tunnelId: input.cf.tunnelId
+  });
+  if (!tun.ok) {
+    push({ name: "Cloudflare Tunnel", status: "fail", detail: tun.reason });
+  } else if (tun.connections === 0) {
+    push({
+      name: "Cloudflare Tunnel",
+      status: "warn",
+      detail: `status=${tun.status}, 0 connections \u2014 cloudflared on the Studio appears offline`
+    });
   } else {
-    const tun = await deps.tunnel({
-      token: input.cf.token,
-      accountId: input.cf.accountId,
-      tunnelId: input.cf.tunnelId
+    push({
+      name: "Cloudflare Tunnel",
+      status: "ok",
+      detail: `${tun.connections} connections, status=${tun.status}`
     });
-    if (!tun.ok) {
-      push({ name: "Cloudflare Tunnel", status: "fail", detail: tun.reason });
-    } else if (tun.connections === 0) {
-      push({
-        name: "Cloudflare Tunnel",
-        status: "warn",
-        detail: `status=${tun.status}, 0 connections \u2014 cloudflared on the Studio appears offline`
-      });
-    } else {
-      push({
-        name: "Cloudflare Tunnel",
-        status: "ok",
-        detail: `${tun.connections} connections, status=${tun.status}`
-      });
-    }
   }
+}
+async function verifyCosignPhase(input, deps, push) {
   if (input.images.length === 0) {
     push({
       name: "cosign verify",
       status: "skipped",
       detail: "pass --image <ref> (repeatable) to enable"
     });
-  } else {
-    for (const image of input.images) {
-      const cos = await deps.cosign({ image });
-      if (cos.ok) {
-        push({ name: `cosign verify ${image}`, status: "ok", detail: "signature valid" });
-      } else if (cos.skipped) {
-        push({ name: `cosign verify ${image}`, status: "skipped", detail: cos.reason });
-      } else {
-        push({ name: `cosign verify ${image}`, status: "fail", detail: cos.reason });
-      }
+    return;
+  }
+  for (const image of input.images) {
+    const cos = await deps.cosign({ image });
+    if (cos.ok) {
+      push({ name: `cosign verify ${image}`, status: "ok", detail: "signature valid" });
+    } else if (cos.skipped) {
+      push({ name: `cosign verify ${image}`, status: "skipped", detail: cos.reason });
+    } else {
+      push({ name: `cosign verify ${image}`, status: "fail", detail: cos.reason });
     }
   }
-  return { phases };
 }
 function readTokenFile(path) {
   const raw = readFileSync(path, "utf8").trim();
@@ -3542,6 +3556,53 @@ var verifyCommand = new Command("verify").description(
   new Option("--show-skipped", "Include skipped phases in the summary").default(false)
 ).action(async (opts) => {
   p3.intro(pc2.bgCyan(pc2.black(" create-op-node verify ")));
+  const domain = await resolveDomain(opts);
+  const certWarnDays = resolveCertWarnDays(opts);
+  const cfToken = resolveCfToken(opts);
+  const apiHost = opts.apiHost ?? `api.${domain}`;
+  const images = opts.image ?? [];
+  const totalPhases = 4 + (images.length === 0 ? 1 : images.length);
+  const report = await runVerifyWithSpinner({
+    apiHost,
+    certWarnDays,
+    cfToken,
+    opts,
+    images,
+    totalPhases
+  });
+  renderVerifySummary(report, { opts, totalPhases });
+  reportVerifyOutcome(report);
+});
+function phaseIcon2(ph) {
+  switch (ph.status) {
+    case "ok":
+      return pc2.green("\u2713");
+    case "warn":
+      return pc2.yellow("\u26A0");
+    case "skipped":
+      return pc2.dim("\xB7");
+    case "fail":
+      return pc2.red("\u2717");
+  }
+}
+function phaseColor(status) {
+  switch (status) {
+    case "ok":
+      return pc2.green;
+    case "warn":
+      return pc2.yellow;
+    case "skipped":
+      return pc2.dim;
+    case "fail":
+      return pc2.red;
+  }
+}
+function formatPhaseLine(prefix, ph) {
+  const icon = phaseIcon2(ph);
+  const colorize = phaseColor(ph.status);
+  return colorize(`${icon} ${prefix}: ${ph.detail}`);
+}
+async function resolveDomain(opts) {
   const domain = opts.domain ? opts.domain : unwrap(
     await p3.text({
       message: "Public domain of the node?",
@@ -3553,28 +3614,33 @@ var verifyCommand = new Command("verify").description(
     p3.cancel(`--domain ${JSON.stringify(domain)} doesn't look like a domain.`);
     process.exit(2);
   }
+  return domain;
+}
+function resolveCertWarnDays(opts) {
   const rawDays = opts.certWarnDays ?? "14";
   const certWarnDays = Number.parseInt(rawDays, 10);
   if (!Number.isFinite(certWarnDays) || certWarnDays < 0 || !/^\d+$/.test(rawDays)) {
     p3.cancel(`--cert-warn-days must be a non-negative integer (got ${JSON.stringify(rawDays)}).`);
     process.exit(2);
   }
+  return certWarnDays;
+}
+function resolveCfToken(opts) {
   if (opts.cfToken && opts.cfTokenFile) {
     p3.cancel("Pass either --cf-token or --cf-token-file, not both.");
     process.exit(2);
   }
-  let cfToken = opts.cfToken;
-  if (!cfToken && opts.cfTokenFile) {
-    try {
-      cfToken = readTokenFile(opts.cfTokenFile);
-    } catch (err) {
-      p3.cancel(err.message);
-      process.exit(2);
-    }
+  if (opts.cfToken) return opts.cfToken;
+  if (!opts.cfTokenFile) return void 0;
+  try {
+    return readTokenFile(opts.cfTokenFile);
+  } catch (err) {
+    p3.cancel(err.message);
+    process.exit(2);
   }
-  const apiHost = opts.apiHost ?? `api.${domain}`;
-  const images = opts.image ?? [];
-  const totalPhases = 4 + (images.length === 0 ? 1 : images.length);
+}
+async function runVerifyWithSpinner(args) {
+  const { apiHost, certWarnDays, cfToken, opts, images, totalPhases } = args;
   let phaseIndex = 0;
   let activeSpin = null;
   const renderPhase = (ph) => {
@@ -3583,10 +3649,7 @@ var verifyCommand = new Command("verify").description(
     activeSpin?.stop(formatPhaseLine(prefix, ph));
     activeSpin = null;
   };
-  const deps = {
-    ...DEFAULT_DEPS2,
-    onPhase: renderPhase
-  };
+  const deps = { ...DEFAULT_DEPS2, onPhase: renderPhase };
   activeSpin = p3.spinner();
   activeSpin.start("Running checks\u2026");
   const report = await runVerify(
@@ -3603,6 +3666,10 @@ var verifyCommand = new Command("verify").description(
     deps
   );
   activeSpin?.stop("Done.");
+  return report;
+}
+function renderVerifySummary(report, args) {
+  const { opts, totalPhases } = args;
   const visible = opts.showSkipped ?? false ? report.phases : report.phases.filter((ph) => ph.status !== "skipped");
   const lines = visible.map((ph) => {
     const idx = report.phases.indexOf(ph) + 1;
@@ -3613,47 +3680,19 @@ var verifyCommand = new Command("verify").description(
     lines.push(pc2.dim(`\xB7 ${skippedCount} phase${skippedCount === 1 ? "" : "s"} skipped (run with --show-skipped to see them)`));
   }
   p3.note(lines.join("\n"), "Summary");
+}
+function reportVerifyOutcome(report) {
   const summary = summarize(report);
-  if (summary.ok) {
-    if (summary.warned === 0) {
-      p3.outro(pc2.green("All checks passed."));
-    } else {
-      p3.outro(pc2.yellow(`Passed with ${summary.warned} warning${summary.warned === 1 ? "" : "s"}.`));
-    }
-  } else {
+  if (!summary.ok) {
     p3.outro(pc2.red(`${summary.failed} check${summary.failed === 1 ? "" : "s"} failed.`));
     process.exit(1);
   }
-});
-function phaseIcon2(ph) {
-  switch (ph.status) {
-    case "ok":
-      return pc2.green("\u2713");
-    case "warn":
-      return pc2.yellow("\u26A0");
-    case "skipped":
-      return pc2.dim("\xB7");
-    case "fail":
-      return pc2.red("\u2717");
-  }
-}
-function phaseColor(status) {
-  switch (status) {
-    case "ok":
-      return pc2.green;
-    case "warn":
-      return pc2.yellow;
-    case "skipped":
-      return pc2.dim;
-    case "fail":
-      return pc2.red;
+  if (summary.warned === 0) {
+    p3.outro(pc2.green("All checks passed."));
+  } else {
+    p3.outro(pc2.yellow(`Passed with ${summary.warned} warning${summary.warned === 1 ? "" : "s"}.`));
   }
 }
-function formatPhaseLine(prefix, ph) {
-  const icon = phaseIcon2(ph);
-  const colorize = phaseColor(ph.status);
-  return colorize(`${icon} ${prefix}: ${ph.detail}`);
-}
 
 // src/lib/region-schema.json
 var region_schema_default = {
@@ -4674,7 +4713,7 @@ async function looksLikeRegionsRepo(dir) {
 }
 
 // src/cli.ts
-var VERSION = "0.10.8";
+var VERSION = "0.10.9";
 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."