@instafy/cli 0.1.8-staging.351 → 0.1.8-staging.354

package/dist/auth.js

@@ -1,10 +1,22 @@
 import kleur from "kleur";
 import { randomBytes } from "node:crypto";
 import * as http from "node:http";
+import { createRequire } from "node:module";
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
-import { clearInstafyCliConfig, getInstafyConfigPath, resolveConfiguredStudioUrl, resolveControllerUrl, resolveUserAccessToken, writeInstafyCliConfig, } from "./config.js";
+import { clearInstafyCliConfig, getInstafyConfigPath, resolveConfiguredControllerUrl, resolveConfiguredStudioUrl, resolveUserAccessToken, writeInstafyCliConfig, } from "./config.js";
 import { installGitCredentialHelper, uninstallGitCredentialHelper } from "./git-setup.js";
+const require = createRequire(import.meta.url);
+const cliVersion = (() => {
+    try {
+        const pkg = require("../package.json");
+        return typeof pkg.version === "string" ? pkg.version : "";
+    }
+    catch {
+        return "";
+    }
+})();
+const isStagingCli = cliVersion.includes("-staging.");
 function normalizeUrl(raw) {
     const trimmed = typeof raw === "string" ? raw.trim() : "";
     if (!trimmed) {
@@ -39,6 +51,22 @@ function deriveDefaultStudioUrl(controllerUrl) {
     }
     return "https://staging.instafy.dev";
 }
+async function isControllerHealthy(controllerUrl, timeoutMs) {
+    const target = `${controllerUrl.replace(/\/$/, "")}/healthz`;
+    const abort = new AbortController();
+    const timeout = setTimeout(() => abort.abort(), timeoutMs);
+    timeout.unref?.();
+    try {
+        const response = await fetch(target, { signal: abort.signal });
+        return response.ok;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
 function readRequestBody(request, maxBytes = 1000000) {
     return new Promise((resolve, reject) => {
         let buffer = "";
@@ -184,7 +212,18 @@ async function startCliLoginCallbackServer() {
     };
 }
 export async function login(options) {
-    const controllerUrl = resolveControllerUrl({ controllerUrl: options.controllerUrl ?? null });
+    const explicitControllerUrl = normalizeUrl(options.controllerUrl ?? null) ??
+        normalizeUrl(process.env["INSTAFY_SERVER_URL"] ?? null) ??
+        normalizeUrl(process.env["CONTROLLER_BASE_URL"] ?? null) ??
+        resolveConfiguredControllerUrl();
+    const defaultLocalControllerUrl = "http://127.0.0.1:8788";
+    const defaultHostedControllerUrl = "https://controller.instafy.dev";
+    const controllerUrl = explicitControllerUrl ??
+        (isStagingCli
+            ? defaultHostedControllerUrl
+            : (await isControllerHealthy(defaultLocalControllerUrl, 250))
+                ? defaultLocalControllerUrl
+                : defaultHostedControllerUrl);
     const studioUrl = normalizeUrl(options.studioUrl ?? null) ??
         normalizeUrl(process.env["INSTAFY_STUDIO_URL"] ?? null) ??
         resolveConfiguredStudioUrl() ??

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instafy/cli",
-  "version": "0.1.8-staging.351",
+  "version": "0.1.8-staging.354",
   "description": "Run Instafy projects locally, link folders to Studio, and share previews/webhooks via tunnels.",
   "private": false,
   "publishConfig": {