@instafy/cli 0.1.10 → 0.1.11

package/dist/runtime.js

@@ -270,6 +270,7 @@ export async function mintRuntimeAccessToken(params) {
             },
             body: JSON.stringify({
                 runtimeId: params.runtimeId,
+                leaseId: params.leaseId,
                 scopes: params.scopes,
             }),
         },
@@ -295,6 +296,55 @@ export async function mintRuntimeAccessToken(params) {
     }
     return token;
 }
+async function requestRuntimeLease(params) {
+    const url = params.controllerUrl.replace(/\/$/, "");
+    const target = `${url}/projects/${encodeURIComponent(params.projectId)}/runtime/request`;
+    const { response, accessToken } = await fetchWithControllerAuth({
+        url: target,
+        init: {
+            method: "POST",
+            headers: {
+                "content-type": "application/json",
+            },
+            body: JSON.stringify({
+                provider: params.provider,
+                displayName: params.displayName,
+                idleTtlSeconds: params.idleTtlSeconds,
+                requestTunnel: params.requestTunnel,
+                runtimeId: params.runtimeId,
+            }),
+        },
+        accessToken: params.accessToken,
+        tokenSource: params.tokenSource,
+        profile: params.profile,
+        cwd: params.cwd,
+    });
+    if (!response.ok) {
+        const text = await response.text().catch(() => "");
+        if (response.status === 401 || response.status === 403) {
+            throw formatAuthRejectedError({
+                status: response.status,
+                responseBody: text,
+            });
+        }
+        throw new Error(`Instafy server rejected runtime request (${response.status} ${response.statusText}): ${text}`);
+    }
+    const payload = (await response.json());
+    const runtime = (payload["runtime"] ?? payload);
+    const runtimeId = (typeof runtime?.["runtimeId"] === "string" ? runtime["runtimeId"] : null) ??
+        (typeof runtime?.["runtime_id"] === "string" ? runtime["runtime_id"] : null) ??
+        null;
+    const leaseId = (typeof runtime?.["leaseId"] === "string" ? runtime["leaseId"] : null) ??
+        (typeof runtime?.["lease_id"] === "string" ? runtime["lease_id"] : null) ??
+        null;
+    if (!runtimeId || !runtimeId.trim()) {
+        throw new Error("Instafy server response missing runtimeId while requesting runtime lease.");
+    }
+    if (!leaseId || !leaseId.trim()) {
+        throw new Error("Instafy server response missing leaseId while requesting runtime lease.");
+    }
+    return { runtimeId: runtimeId.trim(), leaseId: leaseId.trim(), accessToken };
+}
 function isProcessAlive(pid) {
     try {
         process.kill(pid, 0);
@@ -350,19 +400,6 @@ export async function runtimeStart(options) {
             env["CONTROLLER_BASE_URL"] ??
             manifestInfo.manifest?.controllerUrl ??
             "http://127.0.0.1:8788";
-    if (!runtimeAccessToken && controllerAccessToken) {
-        runtimeAccessToken = await mintRuntimeAccessToken({
-            controllerUrl: env["CONTROLLER_BASE_URL"],
-            controllerAccessToken,
-            projectId,
-            tokenSource: controllerAccessTokenSource,
-            profile,
-            cwd,
-        });
-    }
-    if (runtimeAccessToken) {
-        env["RUNTIME_ACCESS_TOKEN"] = runtimeAccessToken;
-    }
     if (options.codexBin)
         env["CODEX_BIN"] = options.codexBin;
     if (options.proxyBaseUrl)
@@ -381,25 +418,6 @@ export async function runtimeStart(options) {
     if (options.originEndpoint && options.originEndpoint.trim()) {
         env["ORIGIN_ENDPOINT"] = options.originEndpoint.trim();
     }
-    let originToken = normalizeToken(options.originToken) ?? normalizeToken(env["ORIGIN_INTERNAL_TOKEN"]);
-    if (!originToken && runtimeAccessToken) {
-        originToken = runtimeAccessToken;
-    }
-    if (!originToken && controllerAccessToken) {
-        originToken = await mintRuntimeAccessToken({
-            controllerUrl: env["CONTROLLER_BASE_URL"],
-            controllerAccessToken,
-            projectId,
-            runtimeId: env["RUNTIME_ID"],
-            tokenSource: controllerAccessTokenSource,
-            profile,
-            cwd,
-        });
-    }
-    if (!originToken) {
-        throw new Error("Runtime/origin token is required (--origin-token or ORIGIN_INTERNAL_TOKEN), or provide --runtime-token/--controller-access-token to mint/use one");
-    }
-    env["ORIGIN_INTERNAL_TOKEN"] = originToken;
     const skipAuthRaw = env["ORIGIN_SKIP_AUTH"]?.trim().toLowerCase();
     const skipAuth = skipAuthRaw === "1" || skipAuthRaw === "true" || skipAuthRaw === "yes";
     const usesTunnel = !env["ORIGIN_ENDPOINT"];
@@ -410,12 +428,10 @@ export async function runtimeStart(options) {
     }
     env["RUNTIME_DISPLAY_NAME"] =
         options.displayName ?? env["RUNTIME_DISPLAY_NAME"] ?? "Instafy CLI Runtime";
-    const manifestProvider = manifestInfo.manifest?.orgName?.trim() ||
-        manifestInfo.manifest?.orgId?.toString().trim();
     env["RUNTIME_PROVIDER"] =
-        options.provider ?? env["RUNTIME_PROVIDER"] ?? manifestProvider ?? "self-hosted";
+        options.provider ?? env["RUNTIME_PROVIDER"] ?? "self-hosted";
     env["RUNTIME_VERSION"] = env["RUNTIME_VERSION"] ?? "0.1.0";
-    env["RUNTIME_REQUIRE_CODEX_BIN"] = env["RUNTIME_REQUIRE_CODEX_BIN"] || "1";
+    env["RUNTIME_REQUIRE_CODEX_BIN"] = env["RUNTIME_REQUIRE_CODEX_BIN"] || "0";
     env["RUNTIME_CAPABILITIES"] =
         env["RUNTIME_CAPABILITIES"] ||
             JSON.stringify({ fs: true, github: true, supabase: true, runs: true, agent: true, origin: true });
@@ -429,6 +445,90 @@ export async function runtimeStart(options) {
     const runtimeBin = runtimeMode === "docker" ? null : tryResolveRuntimeBinary();
     const useDocker = runtimeMode === "docker" ||
         (runtimeMode === "auto" && !runtimeBin);
+    if (useDocker && !isDockerAvailable()) {
+        throw new Error("runtime-agent is not available (no local binary and docker is not installed). Install Docker Desktop, or build runtime-agent from source.");
+    }
+    const originEnabledRaw = env["ORIGIN_ENABLED"]?.trim().toLowerCase();
+    const originEnabled = !originEnabledRaw ||
+        originEnabledRaw === "1" ||
+        originEnabledRaw === "true" ||
+        originEnabledRaw === "yes" ||
+        originEnabledRaw === "on";
+    if (originEnabled && usesTunnel && !useDocker) {
+        const ratholeResolved = await resolveRatholeBinaryForCli({
+            env,
+            version: process.env["RATHOLE_VERSION"] ?? null,
+            cacheDir: process.env["RATHOLE_CACHE_DIR"] ?? null,
+            logger: (message) => console.log(kleur.cyan(`[rathole] ${message}`)),
+            warn: (message) => console.warn(kleur.yellow(message)),
+        });
+        if (!ratholeResolved) {
+            throw new Error("Tunnel is required but rathole is unavailable. Set RATHOLE_BIN (recommended) or pass --origin-endpoint to use a reachable URL.");
+        }
+    }
+    if (originEnabled && usesTunnel && !env["RUNTIME_LEASE_ID"]) {
+        const bearer = controllerAccessToken ?? runtimeAccessToken;
+        const tokenSource = controllerAccessToken ? controllerAccessTokenSource : "env";
+        if (!bearer) {
+            throw new Error("Login required to request a tunnel-enabled runtime lease. Run `instafy login` or pass --controller-access-token/--runtime-token.");
+        }
+        const ttl = typeof env["RUNTIME_LEASE_SECONDS"] === "string" ? Number(env["RUNTIME_LEASE_SECONDS"]) : NaN;
+        const idleTtlSeconds = Number.isFinite(ttl) && ttl > 0 ? ttl : undefined;
+        const lease = await requestRuntimeLease({
+            controllerUrl: env["CONTROLLER_BASE_URL"],
+            accessToken: bearer,
+            tokenSource,
+            profile,
+            cwd,
+            projectId,
+            provider: env["RUNTIME_PROVIDER"],
+            displayName: env["RUNTIME_DISPLAY_NAME"],
+            idleTtlSeconds,
+            requestTunnel: false,
+            runtimeId: env["RUNTIME_ID"],
+        });
+        env["RUNTIME_ID"] = lease.runtimeId;
+        env["RUNTIME_LEASE_ID"] = lease.leaseId;
+        if (controllerAccessToken && bearer === controllerAccessToken) {
+            controllerAccessToken = lease.accessToken;
+            env["CONTROLLER_ACCESS_TOKEN"] = controllerAccessToken;
+        }
+    }
+    if (!runtimeAccessToken && controllerAccessToken) {
+        runtimeAccessToken = await mintRuntimeAccessToken({
+            controllerUrl: env["CONTROLLER_BASE_URL"],
+            controllerAccessToken,
+            projectId,
+            runtimeId: env["RUNTIME_ID"],
+            leaseId: env["RUNTIME_LEASE_ID"],
+            tokenSource: controllerAccessTokenSource,
+            profile,
+            cwd,
+        });
+    }
+    if (runtimeAccessToken) {
+        env["RUNTIME_ACCESS_TOKEN"] = runtimeAccessToken;
+    }
+    let originToken = normalizeToken(options.originToken) ?? normalizeToken(env["ORIGIN_INTERNAL_TOKEN"]);
+    if (!originToken && runtimeAccessToken) {
+        originToken = runtimeAccessToken;
+    }
+    if (!originToken && controllerAccessToken) {
+        originToken = await mintRuntimeAccessToken({
+            controllerUrl: env["CONTROLLER_BASE_URL"],
+            controllerAccessToken,
+            projectId,
+            runtimeId: env["RUNTIME_ID"],
+            leaseId: env["RUNTIME_LEASE_ID"],
+            tokenSource: controllerAccessTokenSource,
+            profile,
+            cwd,
+        });
+    }
+    if (!originToken) {
+        throw new Error("Runtime/origin token is required (--origin-token or ORIGIN_INTERNAL_TOKEN), or provide --runtime-token/--controller-access-token to mint/use one");
+    }
+    env["ORIGIN_INTERNAL_TOKEN"] = originToken;
     if (!useDocker) {
         if (!env["ORIGIN_ENDPOINT"]) {
             const ratholeResolved = await resolveRatholeBinaryForCli({
@@ -493,9 +593,6 @@ export async function runtimeStart(options) {
         });
         return;
     }
-    if (!isDockerAvailable()) {
-        throw new Error("runtime-agent is not available (no local binary and docker is not installed). Install Docker Desktop, or build runtime-agent from source.");
-    }
     const image = resolveRuntimeAgentImage();
     const containerName = `instafy-runtime-${originId}`;
     const hostPort = String(options.bindPort ?? env["ORIGIN_BIND_PORT"] ?? 54332);
@@ -503,6 +600,9 @@ export async function runtimeStart(options) {
     const dockerEnv = { ...env };
     dockerEnv["WORKSPACE_DIR"] = "/workspace";
     dockerEnv["CODEX_HOME"] = "/workspace/.codex";
+    dockerEnv["TMPDIR"] = "/tmp";
+    dockerEnv["TMP"] = "/tmp";
+    dockerEnv["TEMP"] = "/tmp";
     dockerEnv["ORIGIN_BIND_HOST"] = "0.0.0.0";
     dockerEnv["CONTROLLER_BASE_URL"] = normalizeControllerUrlForDocker(env["CONTROLLER_BASE_URL"] ?? "");
     const envArgs = [];

package/package.json

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