sparkecoder 0.1.105 → 0.1.107

package/dist/cli.js

@@ -1329,11 +1329,18 @@ function getStoredAuthKeyInfo() {
   }
   return null;
 }
-async function registerWithRemoteServer(serverUrl, name) {
+async function registerWithRemoteServer(serverUrl, name, token) {
+  const registerToken = token || process.env.SPARKECODER_REGISTER_TOKEN || process.env.SPARKECODER_SETUP_SECRET;
   const response = await fetch(`${serverUrl}/auth/register`, {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ name: name || `CLI ${(/* @__PURE__ */ new Date()).toISOString()}` })
+    headers: {
+      "Content-Type": "application/json",
+      ...registerToken ? { "X-Register-Token": registerToken } : {}
+    },
+    body: JSON.stringify({
+      name: name || `CLI ${(/* @__PURE__ */ new Date()).toISOString()}`,
+      ...registerToken ? { token: registerToken } : {}
+    })
   });
   if (!response.ok) {
     const error = await response.json().catch(() => ({}));
@@ -1343,7 +1350,7 @@ async function registerWithRemoteServer(serverUrl, name) {
   saveAuthKey(data.authKey, data.userId);
   return data;
 }
-async function ensureRemoteAuthKey(serverUrl) {
+async function ensureRemoteAuthKey(serverUrl, token) {
   if (process.env.SPARKECODER_AUTH_KEY) {
     return process.env.SPARKECODER_AUTH_KEY;
   }
@@ -1351,7 +1358,7 @@ async function ensureRemoteAuthKey(serverUrl) {
   if (storedKey) {
     return storedKey;
   }
-  const { authKey: authKey3 } = await registerWithRemoteServer(serverUrl);
+  const { authKey: authKey3 } = await registerWithRemoteServer(serverUrl, void 0, token);
   return authKey3;
 }
 function getApiKeysPath() {
@@ -16909,7 +16916,7 @@ program.command("slack-setup").description("Interactively configure Slack integr
     process.exit(1);
   }
 });
-program.command("cloudflared-setup").description("Auto-detect cloudflared + set up a tunnel to this sparkecoder (interactive)").option("--port <port>", "Local sparkecoder web UI port", "6969").option("--api-port <port>", "Local sparkecoder API port", "3141").option("--hostname <host>", "Public hostname you want to assign (e.g. sf-mac-1.example.com)").option("--tunnel-name <name>", "Tunnel name to reuse or create", "sparkecoder").option("--team <team>", "Your Cloudflare Access team subdomain (e.g. studyfetch -> studyfetch.cloudflareaccess.com)").option("--allowed-emails <emails>", "Comma-separated allow-listed emails").option("-y, --yes", "Skip confirmations and do everything non-interactively", false).option("--print-only", "Skip auto-setup and just print the copy/paste recipe", false).option("--cf-api-token <token>", "Cloudflare API token (Account: Cloudflare Tunnel: Edit + Zone: DNS: Edit). Or set CF_API_TOKEN env").option("--cf-account-id <id>", "Cloudflare account ID. Or set CF_ACCOUNT_ID env").option("--cf-zone-id <id>", "Cloudflare zone ID for the hostname. Or set CF_ZONE_ID env").option("--remote", "Provision the tunnel via the remote sparkecoder server (server holds the Cloudflare credentials)", false).option("--setup-secret <secret>", "Tunnel setup secret (required when server has TUNNEL_SETUP_SECRET set). Or set SPARKECODER_TUNNEL_SECRET env").action(async (options) => {
+program.command("cloudflared-setup").description("Auto-detect cloudflared + set up a tunnel to this sparkecoder (interactive)").option("--port <port>", "Local sparkecoder web UI port", "6969").option("--api-port <port>", "Local sparkecoder API port", "3141").option("--hostname <host>", "Public hostname you want to assign (e.g. sf-mac-1.example.com)").option("--tunnel-name <name>", "Tunnel name to reuse or create", "sparkecoder").option("--team <team>", "Your Cloudflare Access team subdomain (e.g. studyfetch -> studyfetch.cloudflareaccess.com)").option("--allowed-emails <emails>", "Comma-separated allow-listed emails").option("-y, --yes", "Skip confirmations and do everything non-interactively", false).option("--print-only", "Skip auto-setup and just print the copy/paste recipe", false).option("--cf-api-token <token>", "Cloudflare API token (Account: Cloudflare Tunnel: Edit + Zone: DNS: Edit). Or set CF_API_TOKEN env").option("--cf-account-id <id>", "Cloudflare account ID. Or set CF_ACCOUNT_ID env").option("--cf-zone-id <id>", "Cloudflare zone ID for the hostname. Or set CF_ZONE_ID env").option("--remote", "Provision the tunnel via the remote sparkecoder server (server holds the Cloudflare credentials)", false).option("--setup-secret <secret>", "Setup secret (required when server has SETUP_SECRET / TUNNEL_SETUP_SECRET set). Falls back to env SPARKECODER_SETUP_SECRET, then SPARKECODER_TUNNEL_SECRET").option("--new-tunnel", "In --remote mode: force a new tunnel even if this user already has one (default: re-use existing)", false).action(async (options) => {
   const { execSync: execSync2, spawnSync } = await import("child_process");
   const { homedir: homedir2 } = await import("os");
   const { copyFileSync } = await import("fs");
@@ -16942,7 +16949,14 @@ program.command("cloudflared-setup").description("Auto-detect cloudflared + set
     }
     return cfPath;
   };
+  const uninstallService = () => {
+    spawnSync("cloudflared", ["service", "uninstall"], { stdio: "ignore" });
+    if (process.platform !== "win32") {
+      spawnSync("sudo", ["cloudflared", "service", "uninstall"], { stdio: "ignore" });
+    }
+  };
   const installAsService = (token) => {
+    uninstallService();
     let r = spawnSync("cloudflared", ["service", "install", token], { stdio: "inherit" });
     if (r.status !== 0 && process.platform !== "win32") {
       console.log(chalk.dim("Retrying with sudo..."));
@@ -16963,10 +16977,11 @@ program.command("cloudflared-setup").description("Auto-detect cloudflared + set
       if (!authKey3) {
         authKey3 = await ensureRemoteAuthKey(remoteUrl);
       }
-      const setupSecret = options.setupSecret || process.env.SPARKECODER_TUNNEL_SECRET;
+      const setupSecret = options.setupSecret || process.env.SPARKECODER_SETUP_SECRET || process.env.SPARKECODER_TUNNEL_SECRET;
       const hostname = options.hostname;
+      const path = options.newTunnel ? "/tunnels" : "/tunnels/ensure";
       console.log(chalk.bold(
-        hostname ? `Requesting tunnel for ${hostname} from remote server...` : "Requesting auto-generated tunnel from remote server..."
+        options.newTunnel ? hostname ? `Requesting NEW tunnel for ${hostname} from remote server...` : "Requesting NEW auto-generated tunnel from remote server..." : "Ensuring tunnel exists on remote server (re-using if present)..."
       ));
       const reqBody = {
         port: Number(apiPort),
@@ -16974,7 +16989,7 @@ program.command("cloudflared-setup").description("Auto-detect cloudflared + set
         name: tunnelName
       };
       if (hostname) reqBody.hostname = hostname;
-      const res = await fetch(`${remoteUrl.replace(/\/$/, "")}/tunnels`, {
+      const res = await fetch(`${remoteUrl.replace(/\/$/, "")}${path}`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -16989,7 +17004,10 @@ program.command("cloudflared-setup").description("Auto-detect cloudflared + set
         process.exitCode = 1;
         return;
       }
-      const { tunnelToken, hostname: provisionedHost, apiHostname } = await res.json();
+      const { tunnelToken, hostname: provisionedHost, apiHostname, reused } = await res.json();
+      if (reused) {
+        console.log(chalk.dim("\u2713 Re-using existing tunnel \u2014 no new tunnel created on Cloudflare."));
+      }
       const cfPath = await installCloudflaredIfNeeded();
       if (!cfPath) {
         console.log(chalk.yellow("cloudflared not installed; run this once installed:"));