fix naming of stuff

Author: christianalfoni

src/SandboxClient.ts

@@ -88,16 +88,14 @@ export class SandboxClient {
       }
     );
 
-    await session.shells.run(
-      [
-        "rm -rf .git",
-        "git init",
-        `git remote add origin ${opts.url}`,
-        "git fetch origin",
-        `git checkout -b ${opts.branch}`,
-        `git reset --hard origin/${opts.branch}`,
-      ].join(" && ")
-    );
+    await session.commands.run([
+      "rm -rf .git",
+      "git init",
+      `git remote add origin ${opts.url}`,
+      "git fetch origin",
+      `git checkout -b ${opts.branch}`,
+      `git reset --hard origin/${opts.branch}`,
+    ]);
 
     await opts.setup?.(session);
 

src/index.ts

@@ -24,6 +24,10 @@ function ensure<T>(value: T | undefined, message: string): T {
 }
 
 export class CodeSandbox {
+  public readonly sandboxes: SandboxClient;
+  /**
+   * @deprecated Use `sandboxes` instead
+   */
   public readonly sandbox: SandboxClient;
 
   /**
@@ -39,7 +43,7 @@ export class CodeSandbox {
    */
   public readonly previewTokens: PreviewTokens;
 
-  constructor(apiToken?: string, readonly opts: ClientOpts = {}) {
+  constructor(apiToken?: string, opts: ClientOpts = {}) {
     const evaluatedApiToken =
       apiToken ||
       ensure(
@@ -63,7 +67,8 @@ export class CodeSandbox {
       })
     );
 
-    this.sandbox = new SandboxClient(apiClient);
+    this.sandboxes = new SandboxClient(apiClient);
+    this.sandbox = this.sandboxes;
     this.previewTokens = new PreviewTokens(apiClient);
   }
 }

src/previews/Preview.ts

@@ -84,7 +84,7 @@ export class Preview<
     return iframe;
   }
 
-  private sendMessage(message: MessageToPreview | BaseMessageToPreview) {
+  sendMessage(message: MessageToPreview | BaseMessageToPreview) {
     if (this.status === "CONNECTED") {
       this.iframe.contentWindow?.postMessage(message, "*");
     }

src/sessions/WebSocketSession/index.ts

@@ -1,4 +1,3 @@
-import { initPitcherClient } from "@codesandbox/pitcher-client";
 import { Disposable } from "../../utils/disposable";
 import {
   protocol as _protocol,
@@ -8,10 +7,7 @@ import {
 import { FileSystem } from "./filesystem";
 import { Ports } from "./ports";
 import { Setup } from "./setup";
-import { Shells } from "./shells";
 import { Tasks } from "./tasks";
-import { DEFAULT_SUBSCRIPTIONS, SandboxSession } from "../../types";
-import { Client } from "@hey-api/client-fetch";
 import { Interpreters } from "./interpreters";
 import { Terminals } from "./terminals";
 import { Commands } from "./commands";
@@ -20,7 +16,6 @@ import { Git } from "./git";
 export * from "./filesystem";
 export * from "./ports";
 export * from "./setup";
-export * from "./shells";
 export * from "./tasks";
 export * from "./terminals";
 export * from "./commands";
@@ -35,11 +30,6 @@ export class WebSocketSession {
    */
   public readonly fs = new FileSystem(this.disposable, this.pitcherClient);
 
-  /**
-   * Namespace for running shell commands on this sandbox.
-   */
-  public readonly shells = new Shells(this.disposable, this.pitcherClient);
-
   public readonly terminals: Terminals;
   public readonly commands: Commands;
 

src/sessions/WebSocketSession/ports.ts

@@ -1,12 +1,17 @@
-import type { IPitcherClient, protocol } from "@codesandbox/pitcher-client";
+import type { IPitcherClient } from "@codesandbox/pitcher-client";
 
 import { Disposable } from "../../utils/disposable";
 import { Emitter } from "../../utils/event";
 
+export type Port = {
+  port: number;
+  host: string;
+};
+
 export class Ports {
   private disposable = new Disposable();
   private onDidPortOpenEmitter = this.disposable.addDisposable(
-    new Emitter<protocol.port.Port>()
+    new Emitter<Port>()
   );
   get onDidPortOpen() {
     return this.onDidPortOpenEmitter.event;
@@ -44,7 +49,7 @@ export class Ports {
 
         if (openedPorts.length) {
           for (const port of openedPorts) {
-            this.onDidPortOpenEmitter.fire(port);
+            this.onDidPortOpenEmitter.fire({ port: port.port, host: port.url });
           }
         }
 
@@ -63,8 +68,10 @@ export class Ports {
     return this.getOpenedPorts().find((p) => p.port === port);
   }
 
-  getOpenedPorts() {
-    return this.pitcherClient.clients.port.getPorts();
+  getOpenedPorts(): Port[] {
+    return this.pitcherClient.clients.port
+      .getPorts()
+      .map(({ port, url }) => ({ host: url, port }));
   }
 
   /**
@@ -79,7 +86,7 @@ export class Ports {
   async waitForPort(
     port: number,
     options?: { timeoutMs?: number }
-  ): Promise<protocol.port.Port> {
+  ): Promise<Port> {
     await this.pitcherClient.clients.port.readyPromise;
 
     return new Promise((resolve, reject) => {