create-op-node 0.10.12 → 0.10.14

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,
@@ -90,17 +121,6 @@ async function tunnelStatus(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 API_REQUEST_TIMEOUT_MS = 15e3;
-var BODY_PREVIEW_MAX = 200;
-
 // src/lib/tfc.ts
 var TFC_API = "https://app.terraform.io/api/v2";
 var ORG_SLUG_RE = /^[A-Za-z0-9_-]{1,40}$/;
@@ -1940,6 +1960,8 @@ function assessAllRunning(snapshots) {
 
 // src/lib/ollama.ts
 var OLLAMA_URL = "http://localhost:11434";
+var OLLAMA_HEALTH_TIMEOUT_MS = 5e3;
+var OLLAMA_WARM_TIMEOUT_MS = 12e4;
 var DEFAULT_LLM_MODEL = "qwen3.5:9b";
 var DEFAULT_EMBEDDING_MODEL = "nomic-embed-text";
 var PROBE_ALPINE_TAG = "3.20";
@@ -1955,14 +1977,18 @@ async function startOllamaService() {
   return { ok: true };
 }
 async function checkOllamaHealth(url = OLLAMA_URL) {
+  const ctrl = new AbortController();
+  const timer = setTimeout(() => ctrl.abort(), OLLAMA_HEALTH_TIMEOUT_MS);
   try {
-    const res = await fetch(`${url}/api/tags`);
+    const res = await fetch(`${url}/api/tags`, { signal: ctrl.signal });
     if (!res.ok) return { reachable: false, models: [] };
     const body = await res.json();
     const models = (body.models ?? []).map((m) => m.name ?? "").filter((n) => n.length > 0);
     return { reachable: true, models };
   } catch {
     return { reachable: false, models: [] };
+  } finally {
+    clearTimeout(timer);
   }
 }
 async function pullModel(name) {
@@ -1977,11 +2003,14 @@ async function pullModel(name) {
   return { ok: true };
 }
 async function warmModel(name, url = OLLAMA_URL) {
+  const ctrl = new AbortController();
+  const timer = setTimeout(() => ctrl.abort(), OLLAMA_WARM_TIMEOUT_MS);
   try {
     const res = await fetch(`${url}/api/generate`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ model: name, prompt: "hi", stream: false })
+      body: JSON.stringify({ model: name, prompt: "hi", stream: false }),
+      signal: ctrl.signal
     });
     if (!res.ok) {
       const text6 = await res.text().catch(() => "");
@@ -1993,10 +2022,10 @@ async function warmModel(name, url = OLLAMA_URL) {
     await res.text();
     return { ok: true };
   } catch (err) {
-    return {
-      ok: false,
-      reason: `warm ${name} failed: ${err.message}`
-    };
+    const reason = err.name === "AbortError" ? `warm ${name} timed out after ${OLLAMA_WARM_TIMEOUT_MS / 1e3}s` : `warm ${name} failed: ${err.message}`;
+    return { ok: false, reason };
+  } finally {
+    clearTimeout(timer);
   }
 }
 async function probeHostDockerInternal() {
@@ -4831,7 +4860,7 @@ async function looksLikeRegionsRepo(dir) {
 }
 
 // src/cli.ts
-var VERSION = "0.10.12";
+var VERSION = "0.10.14";
 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."