@pocketenv/cli 0.3.1 → 0.3.3

package/dist/index.js

@@ -22,7 +22,7 @@ import relativeTime from 'dayjs/plugin/relativeTime.js';
 import { password, editor, input } from '@inquirer/prompts';
 import sodium from 'libsodium-wrappers';
 
-var version = "0.3.1";
+var version = "0.3.3";
 
 async function getAccessToken() {
   const tokenPath = path.join(os.homedir(), ".pocketenv", "token.json");
@@ -410,9 +410,37 @@ async function ssh(sandboxName) {
   }
 }
 
+function expandRepo(repo) {
+  const githubMatch = repo.match(/^github:([^/]+\/[^/]+)$/);
+  if (githubMatch) return `https://github.com/${githubMatch[1]}`;
+  const tangledMatch = repo.match(/^tangled:([^/]+\/[^/]+)$/);
+  if (tangledMatch) return `https://tangled.org/${tangledMatch[1]}`;
+  return repo;
+}
+
+async function waitUntilRunning(name, authToken, timeoutMs = 6e4, intervalMs = 2e3) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const response = await client.get(
+      "/xrpc/io.pocketenv.sandbox.getSandbox",
+      {
+        params: { id: name },
+        headers: { Authorization: `Bearer ${authToken}` }
+      }
+    );
+    if (response.data.sandbox?.status === "RUNNING") return;
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+  }
+  throw new Error(
+    `Sandbox ${name} did not reach RUNNING state within ${timeoutMs / 1e3}s`
+  );
+}
+
 async function start(name, { ssh: ssh$1, repo }) {
   const token = await getAccessToken();
+  if (repo) repo = expandRepo(repo);
   try {
+    const authToken = env$1.POCKETENV_TOKEN || token;
     await client.post(
       "/xrpc/io.pocketenv.sandbox.startSandbox",
       {
@@ -423,11 +451,12 @@ async function start(name, { ssh: ssh$1, repo }) {
           id: name
         },
         headers: {
-          Authorization: `Bearer ${env$1.POCKETENV_TOKEN || token}`
+          Authorization: `Bearer ${authToken}`
         }
       }
     );
     if (ssh$1) {
+      await waitUntilRunning(name, authToken);
       await ssh(name);
       return;
     }
@@ -582,6 +611,7 @@ async function createSandbox(name, {
   repo
 }) {
   const token = await getAccessToken();
+  if (repo) repo = expandRepo(repo);
   if (["deno", "vercel", "daytona"].includes(provider || "")) {
     consola.error(
       `This Sandbox Runtime is temporarily disabled. ${c.primary(provider ?? "")}`
@@ -609,6 +639,7 @@ async function createSandbox(name, {
       );
       return;
     }
+    await waitUntilRunning(sandbox.data.name, token);
     await ssh(sandbox.data.name);
   } catch (error) {
     consola.error(`Failed to create sandbox: ${error}`);

package/package.json

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

package/src/cmd/create.ts

@@ -4,6 +4,8 @@ import getAccessToken from "../lib/getAccessToken";
 import type { Sandbox } from "../types/sandbox";
 import connectToSandbox from "./ssh";
 import { c } from "../theme";
+import { expandRepo } from "../lib/expandRepo";
+import waitUntilRunning from "../lib/waitUntilRunning";
 
 async function createSandbox(
   name: string,
@@ -20,6 +22,7 @@ async function createSandbox(
   },
 ) {
   const token = await getAccessToken();
+  if (repo) repo = expandRepo(repo);
 
   if (["deno", "vercel", "daytona"].includes(provider || "")) {
     consola.error(
@@ -50,6 +53,7 @@ async function createSandbox(
       );
       return;
     }
+    await waitUntilRunning(sandbox.data.name, token);
     await connectToSandbox(sandbox.data.name);
   } catch (error) {
     consola.error(`Failed to create sandbox: ${error}`);

package/src/cmd/start.ts

@@ -4,14 +4,19 @@ import getAccessToken from "../lib/getAccessToken";
 import { client } from "../client";
 import { env } from "../lib/env";
 import connectToSandbox from "./ssh";
+import { expandRepo } from "../lib/expandRepo";
+import waitUntilRunning from "../lib/waitUntilRunning";
 
 async function start(
   name: string,
   { ssh, repo }: { ssh?: boolean; repo?: string },
 ) {
   const token = await getAccessToken();
+  if (repo) repo = expandRepo(repo);
 
   try {
+    const authToken = env.POCKETENV_TOKEN || token;
+
     await client.post(
       "/xrpc/io.pocketenv.sandbox.startSandbox",
       {
@@ -22,12 +27,13 @@ async function start(
           id: name,
         },
         headers: {
-          Authorization: `Bearer ${env.POCKETENV_TOKEN || token}`,
+          Authorization: `Bearer ${authToken}`,
         },
       },
     );
 
     if (ssh) {
+      await waitUntilRunning(name, authToken);
       await connectToSandbox(name);
       return;
     }

package/src/lib/expandRepo.ts

@@ -0,0 +1,9 @@
+export function expandRepo(repo: string): string {
+  const githubMatch = repo.match(/^github:([^/]+\/[^/]+)$/);
+  if (githubMatch) return `https://github.com/${githubMatch[1]}`;
+
+  const tangledMatch = repo.match(/^tangled:([^/]+\/[^/]+)$/);
+  if (tangledMatch) return `https://tangled.org/${tangledMatch[1]}`;
+
+  return repo;
+}

package/src/lib/waitUntilRunning.ts

@@ -0,0 +1,27 @@
+import { client } from "../client";
+import type { Sandbox } from "../types/sandbox";
+
+async function waitUntilRunning(
+  name: string,
+  authToken: string,
+  timeoutMs = 60_000,
+  intervalMs = 2_000,
+): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const response = await client.get<{ sandbox: Sandbox | null }>(
+      "/xrpc/io.pocketenv.sandbox.getSandbox",
+      {
+        params: { id: name },
+        headers: { Authorization: `Bearer ${authToken}` },
+      },
+    );
+    if (response.data.sandbox?.status === "RUNNING") return;
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+  }
+  throw new Error(
+    `Sandbox ${name} did not reach RUNNING state within ${timeoutMs / 1000}s`,
+  );
+}
+
+export default waitUntilRunning;