@viraatdas/rudder 0.7.28 → 0.7.30

package/dist/cloud.js

@@ -4,7 +4,7 @@ import os from "node:os";
 import path from "node:path";
 import { currentBranch, currentCommit, findRepoRoot } from "./git.js";
 import { cloudAuthPath } from "./state.js";
-import { ensureDir, expandHome, newRunId, nowIso, pathExists, promptSecret, readJson, runCommand, shortenHome, writeJson, } from "./util.js";
+import { ensureDir, commandExists, expandHome, newRunId, nowIso, pathExists, promptText, promptSelect, promptSecret, readJson, runCommand, shortenHome, shellQuote, writeJson, } from "./util.js";
 const DEFAULT_LOGIN_INTERVAL_MS = 2000;
 const DEFAULT_LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
 const DEFAULT_CLOUD_URL = "https://mpd2pmnpep.us-east-1.awsapprunner.com";
@@ -81,11 +81,16 @@ export async function runCloudCommand(command, args, options = {}) {
         case "login":
             await login(options);
             return;
+        case "launch":
+            await launch(rest, options, "task");
+            return;
         case "sail":
             await launch(rest, options);
             return;
-        case "launch":
-            await launch(rest, options, "task");
+        case "vm":
+        case "byoc":
+        case "byo-vm":
+            await launch(rest, options, "task", "byo-vm");
             return;
         case "list":
         case "ls":
@@ -94,6 +99,9 @@ export async function runCloudCommand(command, args, options = {}) {
         case "onload":
             await onload(rest, options);
             return;
+        case "bootstrap":
+            await bootstrap(rest, options);
+            return;
         case "pause":
             await mutateSail("pause", rest, options);
             return;
@@ -106,6 +114,28 @@ export async function runCloudCommand(command, args, options = {}) {
         case "setup-google":
             await setupOAuthProvider("google", rest, options);
             return;
+        case "setup-byoc":
+            await setupByoc(rest, options);
+            return;
+        case "setup-vm":
+            await setupByoc(rest, options);
+            return;
+        case "setup-fly":
+            await configureDefaultRuntime("fly", options);
+            return;
+        case "setup":
+            if (rest[0] === "byoc" || rest[0] === "vm" || rest[0] === "byo-vm") {
+                await setupByoc(rest.slice(1), options);
+                return;
+            }
+            if (rest[0] === "fly") {
+                await configureDefaultRuntime("fly", options);
+                return;
+            }
+            throw new Error("Usage: rudder cloud setup byoc | rudder cloud setup fly");
+        case "runtime":
+            await runtime(rest, options);
+            return;
         default:
             await launch(command === "sail" ? args : [subcommand, ...rest], options);
             return;
@@ -248,10 +278,15 @@ async function githubOAuthRequest(url, body) {
     return parsed;
 }
 async function saveCloudLogin(client, login, token, options, source) {
+    const previous = await loadCloudAuth();
+    const previousRuntime = previous?.cloudUrl === client.baseUrl ? parseCloudRuntime(previous.defaultRuntime) : undefined;
+    const previousByocHost = previous?.cloudUrl === client.baseUrl ? previous.byocSshHost : undefined;
     await saveCloudAuth({
         version: 1,
         token,
         cloudUrl: client.baseUrl,
+        defaultRuntime: previousRuntime,
+        byocSshHost: previousByocHost,
         accountId: login.accountId,
         email: login.email,
         expiresAt: login.expiresAt ?? (login.expiresIn ? new Date(Date.now() + login.expiresIn * 1000).toISOString() : undefined),
@@ -271,16 +306,15 @@ async function saveCloudLogin(client, login, token, options, source) {
         console.log(`Logged in to ${client.baseUrl}${login.email ? ` as ${login.email}` : ""} via ${source}.`);
     }
 }
-async function launch(args, options, mode = "name") {
+async function launch(args, options, mode = "name", explicitRuntime) {
     const raw = args.join(" ").trim();
-    const name = mode === "task"
-        ? cloudNameFromTask(raw)
-        : raw || randomCloudName();
-    const task = mode === "task" ? raw : "";
     const repoRoot = findRepoRoot();
     const snapshot = await createSnapshot(repoRoot, options.homePaths ?? []);
     try {
         const client = await cloudClient({ requireToken: true });
+        const runtime = await selectedCloudRuntime(explicitRuntime);
+        const task = mode === "task" || runtime === "byo-vm" ? raw : "";
+        const name = task ? cloudNameFromTask(task) : raw || randomCloudName();
         const body = {
             repoName: path.basename(repoRoot),
             name,
@@ -291,6 +325,9 @@ async function launch(args, options, mode = "name") {
                 manifest: snapshot.manifest,
             },
         };
+        if (runtime !== "fly") {
+            body.runtime = runtime;
+        }
         if (task) {
             body.task = task;
         }
@@ -298,7 +335,7 @@ async function launch(args, options, mode = "name") {
             method: "POST",
             body,
         });
-        printResult(result, options);
+        await printResult(result, options);
     }
     finally {
         await fsp.rm(snapshot.tempDir, { recursive: true, force: true });
@@ -321,12 +358,14 @@ async function onload(args, options) {
     const snapshot = await createSnapshot(snapshotRoot, options.homePaths ?? []);
     try {
         const client = await cloudClient({ requireToken: true });
+        const runtime = await selectedCloudRuntime();
         const result = await client.request("/api/rudder/sail/onload", {
             method: "POST",
             body: {
                 runId,
                 repoName: path.basename(repoRoot),
                 run: runRecord ?? null,
+                ...(runtime !== "fly" ? { runtime } : {}),
                 snapshot: {
                     name: path.basename(snapshot.archivePath),
                     contentType: "application/gzip",
@@ -335,7 +374,7 @@ async function onload(args, options) {
                 },
             },
         });
-        printResult(result, options);
+        await printResult(result, options);
     }
     finally {
         await fsp.rm(snapshot.tempDir, { recursive: true, force: true });
@@ -344,7 +383,19 @@ async function onload(args, options) {
 async function listSails(options) {
     const client = await cloudClient({ requireToken: true });
     const result = await client.request("/api/rudder/sail", { method: "GET" });
-    printResult(result, options);
+    await printResult(result, options);
+}
+async function bootstrap(args, options) {
+    const sailId = args[0];
+    if (!sailId) {
+        throw new Error("Missing sail id. Usage: rudder cloud bootstrap <id>");
+    }
+    const client = await cloudClient({ requireToken: true });
+    const result = await client.request(`/api/rudder/sail/${encodeURIComponent(sailId)}/bootstrap`, {
+        method: "POST",
+        body: {},
+    });
+    await printResult(result, options);
 }
 async function mutateSail(action, args, options) {
     const sailId = args[0];
@@ -356,7 +407,7 @@ async function mutateSail(action, args, options) {
         method: "POST",
         body: args.length > 1 ? { args: args.slice(1) } : {},
     });
-    printResult(result, options);
+    await printResult(result, options);
 }
 async function setupOAuthProvider(provider, args, options) {
     const envPrefix = provider === "github" ? "RUDDER_GITHUB" : "RUDDER_GOOGLE";
@@ -379,7 +430,236 @@ async function setupOAuthProvider(provider, args, options) {
             clientSecret,
         },
     });
-    printResult(result, options);
+    await printResult(result, options);
+}
+async function setupByoc(args, options) {
+    const sshConfigPath = path.join(os.homedir(), ".ssh", "config");
+    const configuredHosts = await listSshConfigHosts(sshConfigPath);
+    const host = (options.sshHost ?? args.join(" ").trim()) || await chooseByocHost(configuredHosts);
+    if (!host) {
+        throw new Error([
+            "Missing BYOC SSH host.",
+            "Add your workstation/server to ~/.ssh/config, then run:",
+            "",
+            "  rudder cloud setup-byoc <ssh-host>",
+            "",
+            "Example ~/.ssh/config:",
+            "  Host rudder-workstation",
+            "    HostName 203.0.113.10",
+            "    User ubuntu",
+            "    IdentityFile ~/.ssh/id_ed25519",
+            "",
+            configuredHosts.length
+                ? `Detected SSH hosts: ${configuredHosts.slice(0, 12).join(", ")}`
+                : `No usable hosts found in ${shortenHome(sshConfigPath)}.`,
+        ].join("\n"));
+    }
+    const configMentionsHost = configuredHosts.includes(host) || await sshConfigMentions(sshConfigPath, host);
+    const diagnostics = await checkByocHost(host);
+    await configureDefaultRuntime("byo-vm", options, host);
+    if (options.json) {
+        return;
+    }
+    if (!configMentionsHost) {
+        console.log(`\nNote: ${shortenHome(sshConfigPath)} does not appear to define Host ${host}.`);
+        console.log("Rudder can still use it if SSH resolves it, but a ~/.ssh/config entry is recommended:");
+        console.log(`  Host ${host}`);
+        console.log("    HostName <server-ip-or-dns>");
+        console.log("    User <user>");
+        console.log("    IdentityFile ~/.ssh/<private-key>");
+    }
+    if (diagnostics.ok) {
+        console.log(`SSH check passed for ${host}. Docker is available on the BYOC host.`);
+    }
+    else {
+        console.log(`\nSSH check did not fully pass for ${host}: ${diagnostics.message}`);
+        console.log("Fix SSH/Docker before launching, or run the printed Docker command manually on that host.");
+    }
+}
+async function chooseByocHost(hosts) {
+    if (hosts.length === 0) {
+        return await promptText("SSH host from ~/.ssh/config");
+    }
+    return await promptSelect("Choose a BYOC SSH host from ~/.ssh/config", hosts.slice(0, 24).map((host) => ({ value: host, label: host })), hosts[0]);
+}
+async function configureDefaultRuntime(runtime, options, byocSshHost) {
+    const client = await cloudClient({ requireToken: true });
+    const state = await loadCloudAuth();
+    if (!state || state.cloudUrl !== client.baseUrl) {
+        throw new Error("Not logged in to this Rudder Cloud control plane. Run `rudder login` first.");
+    }
+    await saveCloudAuth({
+        ...state,
+        defaultRuntime: runtime,
+        byocSshHost: runtime === "byo-vm" ? byocSshHost ?? state.byocSshHost : undefined,
+        updatedAt: nowIso(),
+    });
+    const result = {
+        ok: true,
+        cloudUrl: client.baseUrl,
+        defaultRuntime: runtime,
+    };
+    const savedByocHost = byocSshHost ?? state.byocSshHost;
+    if (runtime === "byo-vm" && savedByocHost) {
+        result.byocSshHost = savedByocHost;
+    }
+    const envRuntime = envCloudRuntime();
+    if (envRuntime) {
+        result.envOverride = envRuntime;
+    }
+    if (options.json) {
+        printJson(result);
+        return;
+    }
+    console.log(`Rudder Cloud runtime set to ${runtime}.`);
+    if (runtime === "byo-vm") {
+        const host = byocSshHost ?? state.byocSshHost;
+        console.log("Future `rudder cloud <task>` and `/sail <task>` launches will prepare a BYOC worker instead of creating a Fly Machine.");
+        console.log(host
+            ? `Rudder will try to start the worker over SSH on ${host}.`
+            : "Run `rudder cloud setup-byoc <ssh-host>` to let Rudder start workers over SSH.");
+    }
+    else {
+        console.log("Future `rudder cloud <task>` and `/sail <task>` launches will create Fly Machines.");
+    }
+    if (envRuntime) {
+        console.log(`RUDDER_CLOUD_RUNTIME=${envRuntime} is set and will override this saved default.`);
+    }
+}
+async function runtime(args, options) {
+    const next = args[0] ? parseCloudRuntime(args[0]) : undefined;
+    if (args[0] && !next) {
+        throw new Error("Runtime must be `fly`, `byoc`, or `byo-vm`.");
+    }
+    if (next) {
+        await configureDefaultRuntime(next, options);
+        return;
+    }
+    const client = await cloudClient({ requireToken: true });
+    const current = await selectedCloudRuntime();
+    const state = await loadCloudAuth();
+    const savedRuntime = parseCloudRuntime(state?.defaultRuntime);
+    const result = {
+        cloudUrl: client.baseUrl,
+        runtime: current,
+    };
+    const envRuntime = envCloudRuntime();
+    if (state?.cloudUrl === client.baseUrl && savedRuntime) {
+        result.savedDefaultRuntime = savedRuntime;
+    }
+    if (state?.cloudUrl === client.baseUrl && state.byocSshHost) {
+        result.byocSshHost = state.byocSshHost;
+    }
+    if (envRuntime) {
+        result.envOverride = envRuntime;
+    }
+    if (options.json) {
+        printJson(result);
+    }
+    else {
+        console.log(`Rudder Cloud runtime: ${current}`);
+        if (envRuntime) {
+            console.log(`Set by RUDDER_CLOUD_RUNTIME=${envRuntime}.`);
+        }
+        else if (state?.cloudUrl === client.baseUrl && savedRuntime) {
+            console.log("Set in local Rudder Cloud config.");
+        }
+        else {
+            console.log("Using default Fly Machines runtime.");
+        }
+        if (state?.cloudUrl === client.baseUrl && state.byocSshHost) {
+            console.log(`BYOC SSH host: ${state.byocSshHost}`);
+        }
+    }
+}
+async function sshConfigMentions(configPath, host) {
+    const text = await fsp.readFile(configPath, "utf8").catch(() => "");
+    if (!text.trim()) {
+        return false;
+    }
+    const target = host.toLowerCase();
+    for (const line of text.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith("#")) {
+            continue;
+        }
+        const match = /^Host\s+(.+)$/i.exec(trimmed);
+        if (!match) {
+            continue;
+        }
+        const patterns = match[1].split(/\s+/).map((part) => part.toLowerCase());
+        if (patterns.includes(target)) {
+            return true;
+        }
+    }
+    return false;
+}
+async function listSshConfigHosts(configPath) {
+    const text = await fsp.readFile(configPath, "utf8").catch(() => "");
+    const hosts = [];
+    const seen = new Set();
+    for (const line of text.split(/\r?\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith("#")) {
+            continue;
+        }
+        const match = /^Host\s+(.+)$/i.exec(trimmed);
+        if (!match) {
+            continue;
+        }
+        for (const host of match[1].split(/\s+/)) {
+            if (!host || host.includes("*") || host.includes("?") || host.startsWith("!")) {
+                continue;
+            }
+            if (seen.has(host)) {
+                continue;
+            }
+            seen.add(host);
+            hosts.push(host);
+        }
+    }
+    return hosts;
+}
+async function checkByocHost(host) {
+    if (!commandExists("ssh")) {
+        return { ok: false, message: "ssh is not installed or not on PATH" };
+    }
+    const result = await runCommand("ssh", [
+        "-o",
+        "BatchMode=yes",
+        "-o",
+        "ConnectTimeout=8",
+        host,
+        "command -v docker >/dev/null && docker info >/dev/null 2>&1",
+    ], { allowFailure: true });
+    if (result.code === 0) {
+        return { ok: true, message: "ok" };
+    }
+    const detail = (result.stderr || result.stdout || `ssh exited ${result.code}`).trim();
+    return { ok: false, message: detail };
+}
+async function startByocWorkerOverSsh(host, bootstrapCommand) {
+    if (!commandExists("ssh")) {
+        throw new Error("ssh is not installed or not on PATH");
+    }
+    const remoteCommand = [
+        "mkdir -p ~/.rudder/byoc",
+        `nohup sh -lc ${shellQuote(nonInteractiveDockerCommand(bootstrapCommand))} > ~/.rudder/byoc/worker.log 2>&1 < /dev/null &`,
+    ].join(" && ");
+    await runCommand("ssh", [
+        "-o",
+        "BatchMode=yes",
+        "-o",
+        "ConnectTimeout=10",
+        host,
+        remoteCommand,
+    ]);
+}
+function nonInteractiveDockerCommand(command) {
+    return command
+        .replace(/\bdocker run --rm -it\b/g, "docker run --rm")
+        .replace(/\bdocker run --rm -i -t\b/g, "docker run --rm")
+        .replace(/\bdocker run --rm -t -i\b/g, "docker run --rm");
 }
 async function cloudClient(options) {
     const baseUrl = normalizeCloudUrl(process.env.RUDDER_CLOUD_URL);
@@ -439,6 +719,39 @@ function normalizeCloudUrl(raw) {
         throw new Error("RUDDER_CLOUD_URL must be a valid http(s) URL.");
     }
 }
+async function selectedCloudRuntime(explicit) {
+    if (explicit) {
+        return explicit;
+    }
+    const envRuntime = envCloudRuntime();
+    if (envRuntime) {
+        return envRuntime;
+    }
+    const baseUrl = normalizeCloudUrl(process.env.RUDDER_CLOUD_URL);
+    const state = await loadCloudAuth();
+    const savedRuntime = parseCloudRuntime(state?.defaultRuntime);
+    return state?.cloudUrl === baseUrl && savedRuntime ? savedRuntime : "fly";
+}
+function parseCloudRuntime(raw) {
+    const value = raw?.trim().toLowerCase();
+    if (!value) {
+        return undefined;
+    }
+    if (value === "fly" || value === "fly-machine" || value === "fly-machines") {
+        return "fly";
+    }
+    if (value === "byo" || value === "byoc" || value === "byo-vm" || value === "manual" || value === "self-hosted" || value === "vm") {
+        return "byo-vm";
+    }
+    return undefined;
+}
+function envCloudRuntime() {
+    const runtime = parseCloudRuntime(process.env.RUDDER_CLOUD_RUNTIME);
+    if (process.env.RUDDER_CLOUD_RUNTIME?.trim() && !runtime) {
+        throw new Error("RUDDER_CLOUD_RUNTIME must be `fly`, `byoc`, or `byo-vm`.");
+    }
+    return runtime;
+}
 async function pollLogin(client, pollPath, deviceCode) {
     if (pollPath.startsWith("http://") || pollPath.startsWith("https://") || !deviceCode) {
         return await client.request(pollPath, { method: "GET" });
@@ -636,7 +949,7 @@ function responseErrorMessage(value) {
             ? record.message
             : undefined;
 }
-function printResult(result, options) {
+async function printResult(result, options) {
     if (options.json) {
         printJson(result);
         return;
@@ -647,21 +960,41 @@ function printResult(result, options) {
     }
     if (result && typeof result === "object" && !Array.isArray(result)) {
         const record = result;
+        if (typeof record.bootstrapCommand === "string") {
+            const id = typeof record.id === "string" ? record.id : "BYOC sail";
+            const status = typeof record.status === "string" ? record.status : undefined;
+            const state = await loadCloudAuth();
+            const host = options.sshHost ?? state?.byocSshHost;
+            console.log(`${id}${status ? ` (${status})` : ""} is ready for BYOC.`);
+            if (host && process.env.RUDDER_BYOC_AUTOSTART !== "0") {
+                try {
+                    await startByocWorkerOverSsh(host, record.bootstrapCommand);
+                    console.log(`Started BYOC worker over SSH on ${host}.`);
+                    console.log(`Remote log: ssh ${host} 'tail -f ~/.rudder/byoc/worker.log'`);
+                }
+                catch (error) {
+                    console.log(`Could not start BYOC worker over SSH on ${host}: ${error instanceof Error ? error.message : String(error)}`);
+                    console.log("Run this manually on your workstation/server:");
+                    console.log(record.bootstrapCommand);
+                }
+            }
+            else {
+                console.log("Run this on your workstation/server:");
+                console.log(record.bootstrapCommand);
+                if (!host) {
+                    console.log("\nTip: run `rudder cloud setup-byoc <ssh-host>` to have Rudder start this over SSH next time.");
+                }
+            }
+            if (typeof record.updatedAt === "string") {
+                console.log(`\nIf the command expires, run: rudder cloud bootstrap ${id}`);
+            }
+            return;
+        }
         const sails = record.sails ?? record.items;
         if (Array.isArray(sails)) {
             printSailList(sails);
             return;
         }
-        if (typeof record.id === "string" && typeof record.status === "string") {
-            const parts = [
-                "cloud",
-                record.id,
-                record.status,
-                typeof record.task === "string" && record.task ? record.task : undefined,
-            ].filter(Boolean);
-            console.log(parts.join("  "));
-            return;
-        }
     }
     console.log(JSON.stringify(result, null, 2));
 }
@@ -679,6 +1012,7 @@ function printSailList(items) {
         console.log([
             sail.id,
             sail.status,
+            sail.runtime,
             typeof sail.task === "string" && sail.task ? sail.task : undefined,
             typeof sail.repoName === "string" && sail.repoName ? sail.repoName : undefined,
             sail.branch,
@@ -699,11 +1033,16 @@ function printCloudHelp() {
 Usage:
   rudder cloud login
   rudder cloud help
-  rudder cloud [name]
-  rudder cloud list
+  rudder cloud [name or task]
   rudder cloud launch [--home-path <path>] ["task"]
+  rudder cloud byoc ["task"]
+  rudder cloud list
   rudder cloud onload <runId>
-  rudder sail [name]
+  rudder cloud bootstrap <id>
+  rudder cloud runtime [fly|byoc]
+  rudder cloud setup-byoc <ssh-host>
+  rudder cloud setup-fly
+  rudder sail [name or task]
   rudder sail list
   rudder sail pause <id>
   rudder sail resume <id>
@@ -712,6 +1051,7 @@ Usage:
 
 Environment:
   RUDDER_CLOUD_URL              Cloud control plane URL (defaults to ${DEFAULT_CLOUD_URL})
+  RUDDER_CLOUD_RUNTIME          fly, byoc, or byo-vm (overrides saved local default)
   RUDDER_CLOUD_HOME_PATHS       Extra comma-separated HOME paths to include in snapshots
   RUDDER_GITHUB_CLIENT_ID       GitHub App OAuth client ID for setup-github
   RUDDER_GITHUB_CLIENT_SECRET   GitHub App OAuth client secret for setup-github