fix run commands

Author: christianalfoni

src/SandboxClient.ts

@@ -1,5 +1,4 @@
 import type { Client } from "@hey-api/client-fetch";
-import { createClient, createConfig } from "@hey-api/client-fetch";
 
 import {
   sandboxFork,
@@ -51,7 +50,13 @@ export class SandboxClient {
       {
         id: "clone-admin",
         permission: "write",
-        gitAccessToken: opts.gitAccessToken,
+        ...(opts.config
+          ? {
+              gitAccessToken: opts.config.accessToken,
+              email: opts.config.email,
+              name: opts.config.name,
+            }
+          : {}),
       }
     );
 
@@ -63,7 +68,7 @@ export class SandboxClient {
         "git fetch origin",
         `git checkout -b ${opts.branch}`,
         `git reset --hard origin/${opts.branch}`,
-      ].join("&&")
+      ].join(" && ")
     );
 
     await opts.setup?.(session);
@@ -102,8 +107,8 @@ export class SandboxClient {
 
     return new Sandbox(
       sandbox.id,
-      getStartResponse(sandbox.start_response),
-      this.apiClient
+      this.apiClient,
+      getStartResponse(sandbox.start_response)
     );
   }
 
@@ -139,7 +144,7 @@ export class SandboxClient {
    */
   async resume(sandboxId: string) {
     const startResponse = await this.start(sandboxId);
-    return new Sandbox(sandboxId, startResponse, this.apiClient);
+    return new Sandbox(sandboxId, this.apiClient, startResponse);
   }
 
   /**
@@ -168,7 +173,7 @@ export class SandboxClient {
     await this.shutdown(sandboxId);
     const startResponse = await this.start(sandboxId, opts);
 
-    return new Sandbox(sandboxId, startResponse, this.apiClient);
+    return new Sandbox(sandboxId, this.apiClient, startResponse);
   }
 
   /**

src/sandbox.ts

@@ -32,19 +32,20 @@ export class Sandbox {
       this.pitcherManagerResponse.pitcherVersion
     );
   }
-  private get globalSession() {
-    return {
+  private defaultSession: SandboxSession;
+  constructor(
+    public id: string,
+    private apiClient: Client,
+    private pitcherManagerResponse: PitcherManagerResponse,
+    customSession?: SandboxSession
+  ) {
+    this.defaultSession = customSession || {
       sandboxId: this.id,
       pitcherToken: this.pitcherManagerResponse.pitcherToken,
       pitcherUrl: this.pitcherManagerResponse.pitcherURL,
       userWorkspacePath: this.pitcherManagerResponse.userWorkspacePath,
     };
   }
-  constructor(
-    public id: string,
-    private pitcherManagerResponse: PitcherManagerResponse,
-    private apiClient: Client
-  ) {}
 
   /**
    * Updates the specs that this sandbox runs on. It will dynamically scale the sandbox to the
@@ -116,15 +117,15 @@ export class Sandbox {
   ): Promise<WebSocketSession> {
     const session = customSession
       ? await this.createSession(customSession)
-      : this.globalSession;
+      : this.defaultSession;
 
     return WebSocketSession.init(session, this.apiClient);
   }
 
   async createRestSession(customSession?: SessionCreateOptions) {
     const session = customSession
       ? await this.createSession(customSession)
-      : this.globalSession;
+      : this.defaultSession;
 
     return new RestSession(session);
   }
@@ -134,7 +135,7 @@ export class Sandbox {
   ): Promise<SandboxBrowserSession> {
     const session = customSession
       ? await this.createSession(customSession)
-      : this.globalSession;
+      : this.defaultSession;
 
     return {
       id: this.id,

src/sessions/WebSocketSession/commands.ts

@@ -58,7 +58,7 @@ export class Commands {
       this.pitcherClient.workspacePath,
       opts?.dimensions ?? DEFAULT_SHELL_SIZE,
       commandWithEnv,
-      "COMMAND",
+      "TERMINAL",
       true
     );
 
@@ -128,7 +128,6 @@ export class Command {
         if (shellId === this.id) {
           this.status = exitCode === 0 ? "FINISHED" : "ERROR";
           this.barrier.open();
-          this.kill();
         }
       })
     );
@@ -138,7 +137,6 @@ export class Command {
         if (shellId === this.id) {
           this.status = "KILLED";
           this.barrier.open();
-          this.kill();
         }
       })
     );

src/types.ts

@@ -206,7 +206,11 @@ export type CreateSandboxGitSourceOpts = CreateSandboxBaseOpts & {
   source: "git";
   url: string;
   branch: string;
-  gitAccessToken?: string;
+  config?: {
+    accessToken: string;
+    email: string;
+    name?: string;
+  };
   setup?: (session: WebSocketSession) => Promise<void>;
 };