ready...

Author: christianalfoni

src/SandboxClient.ts

@@ -45,7 +45,7 @@ export class SandboxClient {
       id: this.defaultTemplateId,
     });
 
-    const client = await sandbox.connect(
+    const session = await sandbox.connect(
       // We do not want users to pass gitAccessToken on global user, because it
       // can be read by other users
       opts.gitAccessToken
@@ -56,7 +56,7 @@ export class SandboxClient {
         : undefined
     );
 
-    await client.shells.run(
+    await session.shells.run(
       [
         "rm -rf .git",
         "git init",
@@ -67,7 +67,9 @@ export class SandboxClient {
       ].join("&&")
     );
 
-    client.disconnect();
+    await opts.setup?.(session);
+
+    session.disconnect();
 
     return sandbox;
   }
@@ -206,9 +208,6 @@ export class SandboxClient {
       case "git": {
         return this.createGitSandbox(opts);
       }
-      case "files": {
-        throw new Error("Not implemented");
-      }
       case "template": {
         return this.createTemplateSandbox(opts);
       }

src/bin/commands/build.ts

@@ -143,7 +143,7 @@ export const buildCommand: yargs.CommandModule<
           const spinner = createSpinner();
 
           function createSpinnerMessage(message: string, sandboxId?: string) {
-            return `[cluster: ${slug}, sandbox: ${
+            return `[cluster: ${slug}, sandboxId: ${
               sandboxId || "-"
             }]: ${message}`;
           }

src/previews/index.ts

@@ -1,8 +1,16 @@
 import { Preview } from "./Preview";
-import { InjectFunction } from "./types";
+import {
+  BaseMessageFromPreview,
+  BaseMessageToPreview,
+  InjectFunction,
+  Message,
+} from "./types";
 
 export { Preview, InjectFunction };
 
-export function createPreview(src: string) {
-  return new Preview(src);
+export function createPreview<
+  MessageToPreview extends Message = BaseMessageToPreview,
+  MessageFromPreview extends Message = BaseMessageFromPreview
+>(src: string) {
+  return new Preview<MessageToPreview, MessageFromPreview>(src);
 }

src/sessions/WebSocketSession/tasks.ts

@@ -1,5 +1,6 @@
 import {
   Emitter,
+  IDisposable,
   type IPitcherClient,
   type protocol,
 } from "@codesandbox/pitcher-client";
@@ -151,6 +152,34 @@ export class Task {
 
     return this.openedShell.output.join("\n");
   }
+  async waitForPort(timeout: number = 30_000) {
+    if (this.ports.length) {
+      return this.ports[0];
+    }
+
+    let disposer: IDisposable | undefined;
+
+    return Promise.all([
+      new Promise<protocol.port.Port>((resolve) => {
+        disposer = this.pitcherClient.clients.task.onTaskUpdate((task) => {
+          if (task.id !== this.id) {
+            return;
+          }
+
+          if (task.ports.length) {
+            disposer?.dispose();
+            resolve(task.ports[0]);
+          }
+        });
+      }),
+      new Promise<protocol.port.Port>((resolve, reject) => {
+        setTimeout(() => {
+          disposer?.dispose();
+          reject(new Error("Timeout waiting for port"));
+        }, timeout);
+      }),
+    ]);
+  }
   async run() {
     await this.pitcherClient.clients.task.runTask(this.id);
   }

src/sessions/WebSocketSession/terminals.ts

@@ -33,17 +33,15 @@ export class Terminals {
     return new Terminal(shell, this.pitcherClient);
   }
 
-  /**
-   * Opens an existing terminal.
-   */
-  async open(
-    shellId: string,
-    dimensions = DEFAULT_SHELL_SIZE
-  ): Promise<Terminal> {
-    const shell = await this.pitcherClient.clients.shell.open(
-      shellId as Id,
-      dimensions
-    );
+  get(shellId: string) {
+    const shell = this.pitcherClient.clients.shell
+      .getShells()
+      .find((shell) => shell.shellId === shellId);
+
+    if (!shell) {
+      return;
+    }
+
     return new Terminal(shell, this.pitcherClient);
   }
 
@@ -101,7 +99,14 @@ export class Terminal {
     );
   }
 
-  getOutput(): string {
+  async open(dimensions = DEFAULT_SHELL_SIZE): Promise<string> {
+    const shell = await this.pitcherClient.clients.shell.open(
+      this.shell.shellId,
+      dimensions
+    );
+
+    this.output = shell.buffer;
+
     return this.output.join("\n");
   }
 

src/types.ts

@@ -1,5 +1,6 @@
 import { PitcherManagerResponse } from "@codesandbox/pitcher-client";
 import { VMTier } from "./VMTier";
+import type { WebSocketSession } from "./sessions/WebSocketSession";
 
 export interface SystemMetricsStatus {
   cpu: {
@@ -206,17 +207,12 @@ export type CreateSandboxGitSourceOpts = CreateSandboxBaseOpts & {
   url: string;
   branch: string;
   gitAccessToken?: string;
-};
-
-export type CreateSandboxFilesSourceOpts = CreateSandboxBaseOpts & {
-  source: "files";
-  files: Record<string, string>;
+  setup?: (session: WebSocketSession) => Promise<void>;
 };
 
 export type CreateSandboxOpts =
   | CreateSandboxTemplateSourceOpts
-  | CreateSandboxGitSourceOpts
-  | CreateSandboxFilesSourceOpts;
+  | CreateSandboxGitSourceOpts;
 
 export type SandboxOpts = {
   id: string;