@pocketenv/cli 0.2.4 → 0.2.5

package/dist/index.js

@@ -8,21 +8,21 @@ import os from 'os';
 import { env as env$2 } from 'process';
 import axios from 'axios';
 import { cleanEnv, str } from 'envalid';
+import WebSocket from 'ws';
+import { EventSource } from 'eventsource';
 import open from 'open';
 import express from 'express';
 import cors from 'cors';
 import fs$1 from 'node:fs/promises';
 import os$1 from 'node:os';
 import path$1 from 'node:path';
-import WebSocket from 'ws';
-import { EventSource } from 'eventsource';
 import Table from 'cli-table3';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime.js';
 import { password, editor, input } from '@inquirer/prompts';
 import sodium from 'libsodium-wrappers';
 
-var version = "0.2.4";
+var version = "0.2.5";
 
 async function getAccessToken() {
   const tokenPath = path.join(os.homedir(), ".pocketenv", "token.json");
@@ -65,72 +65,6 @@ const client = axios.create({
   baseURL: env$1.POCKETENV_API_URL
 });
 
-async function start(name) {
-  const token = await getAccessToken();
-  try {
-    await client.post("/xrpc/io.pocketenv.sandbox.startSandbox", void 0, {
-      params: {
-        id: name
-      },
-      headers: {
-        Authorization: `Bearer ${env$1.POCKETENV_TOKEN || token}`
-      }
-    });
-    consola.success(`Sandbox ${chalk.greenBright(name)} started`);
-    consola.log(
-      `Run ${chalk.greenBright(`pocketenv console ${name}`)} to access the sandbox`
-    );
-  } catch {
-    consola.error("Failed to start sandbox");
-  }
-}
-
-async function login(handle) {
-  const app = express();
-  app.use(cors());
-  app.use(express.json());
-  const server = app.listen(6997);
-  app.post("/token", async (req, res) => {
-    console.log(chalk.bold(chalk.greenBright("Login successful!\n")));
-    const tokenPath = path$1.join(os$1.homedir(), ".pocketenv", "token.json");
-    await fs$1.mkdir(path$1.dirname(tokenPath), { recursive: true });
-    await fs$1.writeFile(
-      tokenPath,
-      JSON.stringify({ token: req.body.token }, null, 2)
-    );
-    res.json({
-      ok: 1
-    });
-    server.close();
-  });
-  const response = await client.post(`/login`, { handle, cli: true });
-  const redirectUrl = response.data;
-  if (!redirectUrl.includes("authorize")) {
-    console.error("Failed to login, please check your handle and try again.");
-    server.close();
-    return;
-  }
-  console.log("Please visit this URL to authorize the app:");
-  console.log(chalk.cyan(redirectUrl));
-  await open(response.data);
-}
-
-async function whoami() {
-  const token = await getAccessToken();
-  const profile = await client.get(
-    "/xrpc/io.pocketenv.actor.getProfile",
-    {
-      headers: {
-        Authorization: `Bearer ${env$1.POCKETENV_TOKEN || token}`
-      }
-    }
-  );
-  const handle = `@${profile.data.handle}`;
-  consola.log(
-    `You are logged in as ${chalk.cyan(handle)} (${profile.data.displayName}).`
-  );
-}
-
 function sendInput$1(ws, data) {
   if (ws.readyState === WebSocket.OPEN) {
     ws.send(data);
@@ -334,6 +268,10 @@ async function ssh$1(sandbox) {
     }
     process.stdin.resume();
     process.stdin.on("data", (chunk) => {
+      if (chunk.includes(11)) {
+        teardown(0);
+        return;
+      }
       sendInput(ttyUrl, sandbox.id, chunk, authToken);
     });
     process.stdout.on("resize", () => {
@@ -380,13 +318,16 @@ ${chalk.dim("Process exited.")}\r
   });
   es.onerror = (err) => {
     if (es && es.readyState === EventSource.CLOSED) {
-      const detail = err.message ? ` (${err.message})` : "";
-      process.stderr.write(
-        `\r
-${chalk.red(`Terminal connection lost${detail}`)}\r
+      if (!err.message) {
+        teardown(0);
+      } else {
+        process.stderr.write(
+          `\r
+${chalk.red(`Terminal connection lost (${err.message})`)}\r
 `
-      );
-      teardown(1);
+        );
+        teardown(1);
+      }
     }
   };
   process.on("SIGINT", () => teardown(0));
@@ -469,6 +410,76 @@ async function ssh(sandboxName) {
   }
 }
 
+async function start(name, { ssh: ssh$1 }) {
+  const token = await getAccessToken();
+  try {
+    await client.post("/xrpc/io.pocketenv.sandbox.startSandbox", void 0, {
+      params: {
+        id: name
+      },
+      headers: {
+        Authorization: `Bearer ${env$1.POCKETENV_TOKEN || token}`
+      }
+    });
+    if (ssh$1) {
+      await ssh(name);
+      return;
+    }
+    consola.success(`Sandbox ${chalk.greenBright(name)} started`);
+    consola.log(
+      `Run ${chalk.greenBright(`pocketenv console ${name}`)} to access the sandbox`
+    );
+  } catch {
+    consola.error("Failed to start sandbox");
+  }
+}
+
+async function login(handle) {
+  const app = express();
+  app.use(cors());
+  app.use(express.json());
+  const server = app.listen(6997);
+  app.post("/token", async (req, res) => {
+    console.log(chalk.bold(chalk.greenBright("Login successful!\n")));
+    const tokenPath = path$1.join(os$1.homedir(), ".pocketenv", "token.json");
+    await fs$1.mkdir(path$1.dirname(tokenPath), { recursive: true });
+    await fs$1.writeFile(
+      tokenPath,
+      JSON.stringify({ token: req.body.token }, null, 2)
+    );
+    res.json({
+      ok: 1
+    });
+    server.close();
+  });
+  const response = await client.post(`/login`, { handle, cli: true });
+  const redirectUrl = response.data;
+  if (!redirectUrl.includes("authorize")) {
+    console.error("Failed to login, please check your handle and try again.");
+    server.close();
+    return;
+  }
+  console.log("Please visit this URL to authorize the app:");
+  console.log(chalk.cyan(redirectUrl));
+  await open(response.data);
+}
+
+async function whoami() {
+  const token = await getAccessToken();
+  const profile = await client.get(
+    "/xrpc/io.pocketenv.actor.getProfile",
+    {
+      headers: {
+        Authorization: `Bearer ${env$1.POCKETENV_TOKEN || token}`
+      }
+    }
+  );
+  const handle = `@${profile.data.handle}`;
+  consola.log(
+    `You are logged in as ${chalk.cyan(handle)} (${profile.data.displayName}).`
+  );
+}
+
 dayjs.extend(relativeTime);
 async function listSandboxes() {
   const token = await getAccessToken();
@@ -1184,7 +1195,7 @@ program.command("login").argument("<handle>", "your AT Proto handle (e.g., <user
 program.command("whoami").description("get the current logged-in user").action(whoami);
 program.command("console").aliases(["shell", "ssh", "s"]).argument("[sandbox]", "the sandbox to connect to").description("open an interactive shell for the given sandbox").action(ssh);
 program.command("ls").description("list sandboxes").action(listSandboxes);
-program.command("start").argument("<sandbox>", "the sandbox to start").description("start the given sandbox").action(start);
+program.command("start").argument("<sandbox>", "the sandbox to start").option("--ssh, -s", "connect to the Sandbox and automatically open a shell").description("start the given sandbox").action(start);
 program.command("stop").argument("<sandbox>", "the sandbox to stop").description("stop the given sandbox").action(stop);
 program.command("create").aliases(["new"]).option("--provider, -p <provider>", "the provider to use for the sandbox").option(
   "--base, -b <base>",

package/package.json

@@ -4,7 +4,7 @@
   "bin": {
     "pocketenv": "dist/index.js"
   },
-  "version": "0.2.4",
+  "version": "0.2.5",
   "type": "module",
   "keywords": [
     "sandbox",

package/src/cmd/ssh/tty.ts

@@ -129,7 +129,16 @@ async function ssh(sandbox: Sandbox): Promise<void> {
     process.stdin.resume();
 
     // stdin → POST /tty/:id/input
+    // In raw mode the OS never raises SIGINT — Ctrl+C arrives as a raw byte
+    // in the data stream and is forwarded to the remote shell as-is.
+    // We use Ctrl+K (\x0b) as a local-only escape hatch to avoid conflicting
+    // with Ctrl+C semantics inside the remote shell.
     process.stdin.on("data", (chunk: Buffer) => {
+      if (chunk.includes(0x0b)) {
+        // Ctrl+K pressed — tear down immediately without waiting for the server.
+        teardown(0);
+        return;
+      }
       sendInput(ttyUrl, sandbox.id, chunk, authToken);
     });
 
@@ -195,11 +204,18 @@ async function ssh(sandbox: Sandbox): Promise<void> {
   es.onerror = (err: ErrorEvent) => {
     // The eventsource package exposes readyState on the EventSource instance.
     if (es && es.readyState === EventSource.CLOSED) {
-      const detail = err.message ? ` (${err.message})` : "";
-      process.stderr.write(
-        `\r\n${chalk.red(`Terminal connection lost${detail}`)}\r\n`,
-      );
-      teardown(1);
+      // If the shell exited cleanly the server will close the SSE stream with
+      // no error message.  Treat a message-less close as a graceful exit (code
+      // 0) rather than a connection error, so the user isn't shown a red
+      // "connection lost" banner after a normal `exit`.
+      if (!err.message) {
+        teardown(0);
+      } else {
+        process.stderr.write(
+          `\r\n${chalk.red(`Terminal connection lost (${err.message})`)}\r\n`,
+        );
+        teardown(1);
+      }
     }
   };
 

package/src/cmd/start.ts

@@ -3,8 +3,9 @@ import chalk from "chalk";
 import getAccessToken from "../lib/getAccessToken";
 import { client } from "../client";
 import { env } from "../lib/env";
+import connectToSandbox from "./ssh";
 
-async function start(name: string) {
+async function start(name: string, { ssh }: { ssh?: boolean }) {
   const token = await getAccessToken();
 
   try {
@@ -17,6 +18,11 @@ async function start(name: string) {
       },
     });
 
+    if (ssh) {
+      await connectToSandbox(name);
+      return;
+    }
+
     consola.success(`Sandbox ${chalk.greenBright(name)} started`);
     consola.log(
       `Run ${chalk.greenBright(`pocketenv console ${name}`)} to access the sandbox`,

package/src/index.ts

@@ -77,6 +77,7 @@ program.command("ls").description("list sandboxes").action(listSandboxes);
 program
   .command("start")
   .argument("<sandbox>", "the sandbox to start")
+  .option("--ssh, -s", "connect to the Sandbox and automatically open a shell")
   .description("start the given sandbox")
   .action(start);