uplink-cli 0.1.35 → 0.1.36

package/README.md

@@ -40,6 +40,12 @@ uplink        # open menu
 - My Tunnels → see status and permanent URL if set
 - Create Permanent URL → pick tunnel → enter alias (if premium enabled)
 
+### Hosting (interactive)
+- Hosting → Setup Wizard → analyze + create + deploy
+- Hosting → Deploy to Existing App → select app with arrow keys
+- Hosting → List Hosted Apps → select app to view ID + URL
+- Hosting → Delete Hosted App → select app, confirm options (type `DELETE` to proceed)
+
 ## Quick start (non-interactive)
 ```bash
 # Create tunnel (any port: 3000, 8080, 5173, etc.)

package/cli/bin/uplink.js

@@ -12,6 +12,8 @@ const fs = require("fs");
 const binDir = __dirname;
 const projectRoot = path.join(binDir, "../..");
 const cliPath = path.join(projectRoot, "cli/src/index.ts");
+const invokeCwd = process.cwd();
+const invokeBin = __filename;
 
 // Get arguments
 const args = process.argv.slice(2);
@@ -39,7 +41,7 @@ try {
 const child = spawn(tsxPath, [cliPath, ...args], {
   stdio: "inherit",
   cwd: projectRoot,
-  env: process.env,
+  env: { ...process.env, UPLINK_CWD: invokeCwd, UPLINK_BIN: invokeBin },
   shell: false,
 });
 

package/cli/src/http.ts

@@ -1,37 +1,12 @@
 import fetch, { AbortError } from "node-fetch";
+import { getResolvedApiBase, getResolvedApiToken } from "./utils/api-base";
 
 // Configuration
 const REQUEST_TIMEOUT = 30000; // 30 seconds
 const MAX_RETRIES = 3;
+const MAX_RETRIES_RATE_LIMIT = 5; // More retries for rate limits
 const INITIAL_RETRY_DELAY = 1000; // 1 second
-
-function getApiBase(): string {
-  return process.env.AGENTCLOUD_API_BASE ?? "https://api.uplink.spot";
-}
-
-function isLocalApiBase(apiBase: string): boolean {
-  return (
-    apiBase.includes("://localhost") ||
-    apiBase.includes("://127.0.0.1") ||
-    apiBase.includes("://0.0.0.0")
-  );
-}
-
-function getApiToken(apiBase: string): string | undefined {
-  // Production (non-local) always requires an explicit token.
-  if (!isLocalApiBase(apiBase)) {
-    return process.env.AGENTCLOUD_TOKEN || undefined;
-  }
-
-  // Local dev:
-  // - Prefer AGENTCLOUD_TOKEN if set
-  // - Otherwise allow AGENTCLOUD_TOKEN_DEV (no hardcoded default for security)
-  return (
-    process.env.AGENTCLOUD_TOKEN ||
-    process.env.AGENTCLOUD_TOKEN_DEV ||
-    undefined
-  );
-}
+const INITIAL_RATE_LIMIT_DELAY = 5000; // 5 seconds for rate limit errors
 
 // Check if error is retryable (network issues, 5xx errors)
 function isRetryable(error: unknown, statusCode?: number): boolean {
@@ -62,8 +37,8 @@ export async function apiRequest(
   path: string,
   body?: unknown
 ): Promise<any> {
-  const apiBase = getApiBase();
-  const apiToken = getApiToken(apiBase);
+  const apiBase = getResolvedApiBase();
+  const apiToken = getResolvedApiToken(apiBase);
   if (!apiToken) {
     throw new Error("Missing AGENTCLOUD_TOKEN");
   }
@@ -91,6 +66,25 @@ export async function apiRequest(
       const json = await response.json().catch(() => ({}));
       
       if (!response.ok) {
+        // Special handling for rate limit errors (429)
+        if (response.status === 429) {
+          const maxRetries = MAX_RETRIES_RATE_LIMIT;
+          if (attempt < maxRetries - 1) {
+            // Check for Retry-After header
+            const retryAfter = response.headers.get('Retry-After');
+            let delay: number;
+            if (retryAfter) {
+              const retryAfterSeconds = parseInt(retryAfter, 10);
+              delay = isNaN(retryAfterSeconds) ? INITIAL_RATE_LIMIT_DELAY * Math.pow(2, attempt) : retryAfterSeconds * 1000;
+            } else {
+              // Exponential backoff starting at 5 seconds for rate limits
+              delay = INITIAL_RATE_LIMIT_DELAY * Math.pow(2, attempt);
+            }
+            await sleep(delay);
+            continue;
+          }
+        }
+        
         // Check if this error is retryable
         if (isRetryable(null, response.status) && attempt < MAX_RETRIES - 1) {
           const delay = INITIAL_RETRY_DELAY * Math.pow(2, attempt);
@@ -104,7 +98,6 @@ export async function apiRequest(
     } catch (error) {
       clearTimeout(timeoutId);
       lastError = error instanceof Error ? error : new Error(String(error));
-      
       // Check if we should retry
       if (isRetryable(error) && attempt < MAX_RETRIES - 1) {
         const delay = INITIAL_RETRY_DELAY * Math.pow(2, attempt);

package/cli/src/index.ts

@@ -10,6 +10,7 @@ import { systemCommand } from "./subcommands/system";
 import { hostCommand } from "./subcommands/host";
 import { readFileSync } from "fs";
 import { join } from "path";
+import { ensureApiBase, parseTokenEnv } from "./utils/api-base";
 
 // Get version from package.json (CommonJS build: __dirname available)
 const pkgPath = join(__dirname, "../../package.json");
@@ -60,6 +61,17 @@ program.hook("preAction", async (thisCommand) => {
       process.env.AGENTCLOUD_TOKEN = cachedTokenStdin;
     }
   }
+
+  const parsed = parseTokenEnv(process.env.AGENTCLOUD_TOKEN);
+  if (parsed.token) {
+    process.env.AGENTCLOUD_TOKEN = parsed.token;
+    if (!process.env.AGENTCLOUD_API_BASE && parsed.apiBase) {
+      process.env.AGENTCLOUD_API_BASE = parsed.apiBase;
+    }
+  }
+
+  const isInteractive = Boolean(process.stdin.isTTY && process.stdout.isTTY && !opts.json);
+  await ensureApiBase({ interactive: isInteractive });
 });
 
 // If no command provided and not a flag, default to menu

package/cli/src/subcommands/admin.ts

@@ -1,5 +1,6 @@
 import { Command } from "commander";
 import { apiRequest } from "../http";
+import { getResolvedApiBase } from "../utils/api-base";
 
 export const adminCommand = new Command("admin")
   .description("Admin commands for system management");
@@ -28,7 +29,7 @@ adminCommand
   .action(async (opts) => {
     try {
       // Check health
-      const apiBase = process.env.AGENTCLOUD_API_BASE || "https://api.uplink.spot";
+      const apiBase = getResolvedApiBase();
       let health = { status: "unknown" };
       try {
         const fetch = (await import("node-fetch")).default;