setsuna-microvm 0.5.2 → 0.5.3

package/dist/cli.js

@@ -10,6 +10,9 @@ var __export = (target, all) => {
 };
 
 // ../setsuna/src/tui/customer/prompt.ts
+function readText(text, now) {
+  return typeof text === "function" ? text(now) : text;
+}
 var TUI_CANCEL;
 var init_prompt = __esm({
   "../setsuna/src/tui/customer/prompt.ts"() {
@@ -76,14 +79,13 @@ function adaptPrompts(clack, guide) {
   const { confirm, isCancel, select, text } = clack;
   return {
     async select(options, io) {
-      const result = await select({
-        ...options,
-        options: [...options.options],
-        ...guide(options),
-        input: io.input,
-        output: io.output
-      });
-      return isCancel(result) ? TUI_CANCEL : result;
+      const redraw = hasTimedText(options) ? setInterval(() => io.output.emit("resize"), 1e3) : void 0;
+      try {
+        const result = await select(selectOptions(options, guide(options), io));
+        return isCancel(result) ? TUI_CANCEL : result;
+      } finally {
+        if (redraw !== void 0) clearInterval(redraw);
+      }
     },
     async text(options, io) {
       const result = await text({
@@ -106,6 +108,28 @@ function adaptPrompts(clack, guide) {
     }
   };
 }
+function selectOptions(options, guide, io) {
+  return {
+    get message() {
+      return readText(options.message, Date.now());
+    },
+    options: options.options.map((option) => ({
+      value: option.value,
+      label: option.label,
+      get hint() {
+        return option.hint === void 0 ? void 0 : readText(option.hint, Date.now());
+      }
+    })),
+    initialValue: options.initialValue,
+    signal: options.signal,
+    ...guide,
+    input: io.input,
+    output: io.output
+  };
+}
+function hasTimedText(options) {
+  return typeof options.message === "function" || options.options.some(({ hint }) => typeof hint === "function");
+}
 function adaptSpinner(clack, io, options, guide) {
   const completion = trackInterruption(clack, io, options.onCancel, guide);
   const spinner = clack.spinner({
@@ -1248,6 +1272,36 @@ function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// ../setsuna/src/client-affinity.ts
+var FrontDoorAffinity = class {
+  #origin;
+  #cookies = /* @__PURE__ */ new Map();
+  constructor(serviceUrl) {
+    this.#origin = serviceUrl.origin;
+  }
+  headersFor(url, headers) {
+    if (url.origin !== this.#origin || this.#cookies.size === 0) return headers;
+    const result = new Headers(headers);
+    result.set("cookie", [...this.#cookies].map(([name, value]) => `${name}=${value}`).join("; "));
+    return result;
+  }
+  capture(url, response) {
+    if (url.origin !== this.#origin) return;
+    if (response.url !== "" && new URL(response.url).origin !== this.#origin) return;
+    for (const header of response.headers.getSetCookie()) {
+      const pair = header.split(";", 1)[0]?.trim() ?? "";
+      const match = /^(ASLBSA|ASLBSACORS)=([\x21\x23-\x2B\x2D-\x3A\x3C-\x5B\x5D-\x7E]*)$/u.exec(
+        pair
+      );
+      if (match === null) continue;
+      const [, name, value] = match;
+      if (name === void 0 || value === void 0) continue;
+      if (value === "") this.#cookies.delete(name);
+      else this.#cookies.set(name, value);
+    }
+  }
+};
+
 // ../setsuna/src/client-options.ts
 var PREVIEW_SERVICE_URL = "https://api.setsuna.semswitch.com/";
 function normalizeServiceUrl(value) {
@@ -1359,7 +1413,7 @@ function isLoopbackHostname(hostname) {
 }
 
 // ../setsuna/src/client-request.ts
-async function requestJson(serviceUrl, defaultTimeoutMs, getAccessToken, path3, options) {
+async function requestJson(serviceUrl, defaultTimeoutMs, getAccessToken, path3, options, affinity) {
   const requestTimeoutMs = options.requestTimeoutMs === void 0 ? defaultTimeoutMs : positiveMilliseconds(options.requestTimeoutMs, "requestTimeoutMs");
   const timeoutSignal = AbortSignal.timeout(requestTimeoutMs);
   const signal = options.signal === void 0 ? timeoutSignal : AbortSignal.any([options.signal, timeoutSignal]);
@@ -1376,7 +1430,8 @@ async function requestJson(serviceUrl, defaultTimeoutMs, getAccessToken, path3,
     requestTimeoutMs,
     timeoutSignal,
     signal,
-    accessToken
+    accessToken,
+    affinity
   );
   const responseBody = response.status === 204 ? void 0 : await parseResponseJson(response);
   if (!response.ok) throw brokerResponseError(response, responseBody);
@@ -1417,14 +1472,17 @@ function settleBeforeAbort(pending, signal) {
     if (signal.aborted) onAbort();
   });
 }
-async function fetchService(url, options, requestTimeoutMs, timeoutSignal, signal, accessToken) {
+async function fetchService(url, options, requestTimeoutMs, timeoutSignal, signal, accessToken, affinity) {
   try {
-    return await fetch(url, {
+    const headers = requestHeaders(options.body, accessToken);
+    const response = await fetch(url, {
       method: options.method,
-      headers: requestHeaders(options.body, accessToken),
+      headers: affinity?.headersFor(url, headers) ?? headers,
       body: options.body === void 0 ? void 0 : JSON.stringify(options.body),
       signal
     });
+    affinity?.capture(url, response);
+    return response;
   } catch (error) {
     throwCancellationFailure(error, requestTimeoutMs, timeoutSignal, options.signal);
     throw new SetsunaError("The local Setsuna service could not be reached.", {
@@ -1559,13 +1617,14 @@ function parseProcessList(value) {
   if (!Array.isArray(value)) throw invalidResponse2("process list");
   return value.map(parseProcessInfo);
 }
-function attachProcessStream(serviceUrl, path3, options, getAccessToken) {
+function attachProcessStream(serviceUrl, path3, options, getAccessToken, affinity) {
   return {
     async *[Symbol.asyncIterator]() {
       const response = await fetchProcessStream(
         new URL(path3, serviceUrl),
         options.signal,
-        getAccessToken
+        getAccessToken,
+        affinity
       );
       if (response.body === null) throw invalidResponse2("process stream");
       yield* decodeFrames(response.body, options.signal);
@@ -1586,15 +1645,17 @@ function processFrameToJson(frame) {
   }
   return frame;
 }
-async function fetchProcessStream(url, signal, getAccessToken) {
+async function fetchProcessStream(url, signal, getAccessToken, affinity) {
   const accessToken = await processAccessToken(getAccessToken, signal);
   let response;
   try {
+    const headers = accessToken === void 0 ? void 0 : { authorization: `Bearer ${accessToken}` };
     response = await fetch(url, {
       method: "GET",
       signal,
-      ...accessToken === void 0 ? {} : { headers: { authorization: `Bearer ${accessToken}` } }
+      ...headers === void 0 ? {} : { headers: affinity?.headersFor(url, headers) ?? headers }
     });
+    affinity?.capture(url, response);
   } catch (error) {
     throw requestError(error, signal);
   }
@@ -1773,6 +1834,7 @@ var SetsunaClient = class {
   #serviceUrl;
   #requestTimeoutMs;
   #getAccessToken;
+  #affinity;
   constructor(options = {}) {
     if (options.serviceUrl !== void 0 && options.remote !== void 0) {
       throw new TypeError("serviceUrl and remote are mutually exclusive.");
@@ -1786,6 +1848,7 @@ var SetsunaClient = class {
       }
       this.#serviceUrl = new URL(PREVIEW_SERVICE_URL);
       this.#getAccessToken = options.remote.getAccessToken;
+      this.#affinity = new FrontDoorAffinity(this.#serviceUrl);
     }
     this.#requestTimeoutMs = positiveMilliseconds(
       options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS,
@@ -1876,7 +1939,8 @@ var SetsunaClient = class {
       this.#serviceUrl,
       `${processPath(sandboxId)}/${encodeURIComponent(nonEmptyString(processId, "processId"))}/attach${query}`,
       options,
-      this.#getAccessToken
+      this.#getAccessToken,
+      this.#affinity
     );
   }
   async writeProcessStdin(sandboxId, processId, data) {
@@ -1958,7 +2022,8 @@ var SetsunaClient = class {
       this.#requestTimeoutMs,
       this.#getAccessToken,
       path3,
-      options
+      options,
+      this.#affinity
     );
   }
 };
@@ -2081,14 +2146,19 @@ function enterRawMode(input) {
   const wasPaused = input.isPaused();
   input.setRawMode(true);
   input.resume();
-  let restored = false;
+  let restored;
   return () => {
-    if (restored) return;
-    restored = true;
-    input.setRawMode?.(wasRaw);
-    if (wasPaused) input.pause();
+    restored ??= restoreInput(input, wasRaw, wasPaused);
+    return restored;
   };
 }
+async function restoreInput(input, wasRaw, wasPaused) {
+  if (wasPaused) {
+    input.pause();
+    await new Promise((resolve) => process.nextTick(resolve));
+  }
+  input.setRawMode?.(wasRaw);
+}
 
 // ../setsuna/src/lease-keeper.ts
 var MAX_TIMER_DELAY_MS = 2147483647;
@@ -2287,6 +2357,7 @@ function createAttachedSession(client, sandboxId, processId, io, terminal, contr
   let cleaned = false;
   let inputQueue = Promise.resolve();
   let resizeQueue = Promise.resolve();
+  let restored;
   const restoreRawMode = terminal.enterRawMode();
   const cleanup = () => {
     if (cleaned) return;
@@ -2294,7 +2365,7 @@ function createAttachedSession(client, sandboxId, processId, io, terminal, contr
     io.input.off("data", onInput);
     terminal.offResize(onResize);
     stopLeaseKeeper();
-    restoreRawMode();
+    restored = restoreRawMode();
   };
   const fail = (error) => {
     if (failure === void 0) failure = error;
@@ -2339,8 +2410,10 @@ function createAttachedSession(client, sandboxId, processId, io, terminal, contr
     get failure() {
       return failure;
     },
+    // Everything the session started has finished, including handing the terminal back.
     async settle() {
       await Promise.allSettled([inputQueue, resizeQueue]);
+      await restored;
     }
   };
 }
@@ -2468,6 +2541,7 @@ var DEFAULT_SIGNAL_RUNTIME = {
 
 // ../setsuna/src/tui/customer/format.ts
 var STANDALONE_BOX = { withGuide: false, width: "auto" };
+var EXIT_MESSAGE = "Sayonara!";
 function formatRunPhase(phase) {
   switch (phase) {
     case "starting-microvm":
@@ -2634,7 +2708,7 @@ async function ensureSignedIn(io, auth, promptUi, session = {}) {
       return false;
     }
     if (choice === "exit") {
-      promptUi.outro("Ready when you are.", io);
+      promptUi.outro(EXIT_MESSAGE, io);
       return false;
     }
     status = await signIn(io, auth, promptUi);
@@ -2779,7 +2853,7 @@ async function promptRunAgain(io, promptUi) {
   );
   if (next === TUI_CANCEL || next === "back") return "back-to-main";
   if (next === "exit") {
-    promptUi.outro("Ready when you are.", io);
+    promptUi.outro(EXIT_MESSAGE, io);
     return "exit-tui";
   }
   return "prompt-new-command";
@@ -2876,7 +2950,6 @@ async function activeMicrovmsMenu(io, actions, promptUi) {
   }
 }
 async function selectSandbox(io, promptUi, sandboxes) {
-  const now = Date.now();
   const selected = await promptUi.select(
     {
       message: "Active microVMs",
@@ -2884,7 +2957,7 @@ async function selectSandbox(io, promptUi, sandboxes) {
         ...sandboxes.map((sandbox, index) => ({
           value: `sandbox:${index}`,
           label: sandbox.sandboxId,
-          hint: formatExpiry(sandbox.expiresAt, now)
+          hint: (now) => formatExpiry(sandbox.expiresAt, now)
         })),
         { value: "back", label: "Back" }
       ]
@@ -2897,10 +2970,10 @@ async function selectSandbox(io, promptUi, sandboxes) {
 async function manageSandbox(io, actions, promptUi, initial) {
   let microvm = initial;
   while (true) {
-    const expiry = formatExpiry(microvm.expiresAt, Date.now());
+    const { sandboxId, expiresAt } = microvm;
     const choice = await promptUi.select(
       {
-        message: `Manage microVM ${microvm.sandboxId} \xB7 ${expiry}`,
+        message: (now) => `Manage microVM ${sandboxId} \xB7 ${formatExpiry(expiresAt, now)}`,
         options: [
           { value: "open-terminal", label: "Open terminal" },
           { value: "reattach-terminal", label: "Reattach terminal" },
@@ -3049,10 +3122,10 @@ async function mainMenu(io, actions, promptUi, session) {
       {
         message: "What would you like to do?",
         options: [
-          { value: "start", label: "Start a microVM", hint: "Create a persistent microVM" },
-          { value: "active", label: "Active microVMs", hint: "Manage persistent microVMs" },
-          { value: "run", label: "Run a command", hint: "Launch a fresh microVM" },
-          { value: "account", label: "Account", hint: "Sign-in status and log out" },
+          { value: "start", label: "New microVM", hint: "For interactive or ongoing work" },
+          { value: "active", label: "Active microVMs", hint: "Resume or manage your microVMs" },
+          { value: "run", label: "One-off run", hint: "Isolated single-run workload" },
+          { value: "account", label: "Account" },
           { value: "exit", label: "Exit" }
         ],
         initialValue: "start",
@@ -3065,7 +3138,7 @@ async function mainMenu(io, actions, promptUi, session) {
       return "exit";
     }
     if (choice === "exit") {
-      promptUi.outro("Ready when you are.", io);
+      promptUi.outro(EXIT_MESSAGE, io);
       return "exit";
     }
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setsuna-microvm",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "Command-line interface for the Setsuna Research Preview.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://semswitch.com/setsuna",