Merge pull request #99 from codesandbox/new-version-fixes

fix: fix typo and paths with dedicated sessions

Author: christianalfoni

src/Sandbox.ts

@@ -103,7 +103,7 @@ export class Sandbox {
     opts: SessionCreateOptions
   ): Promise<SandboxSession> {
     if (opts.id.length > 20) {
-      throw new Error("Session ID must be 32 characters or less");
+      throw new Error("Session ID must be 20 characters or less");
     }
 
     const response = await vmCreateSession({
@@ -208,6 +208,10 @@ export class Sandbox {
     );
 
     return new WebSocketSession(pitcherClient, {
+      username: customSession
+        ? // @ts-ignore
+          pitcherClient["joinResult"].client.username
+        : undefined,
       env: customSession?.env,
       hostToken: customSession?.hostToken,
     });
@@ -237,6 +241,7 @@ export class Sandbox {
     return {
       id: this.id,
       env: customSession?.env,
+      sessionId: customSession?.id,
       hostToken: customSession?.hostToken,
       bootupType: this.bootupType,
       cluster: this.cluster,

src/browser.ts

@@ -46,6 +46,10 @@ export async function connectToSandbox(options: {
   );
 
   return new WebSocketSession(pitcherClient, {
+    username: options.session.sessionId
+      ? // @ts-ignore
+        pitcherClient["joinResult"].client.username
+      : undefined,
     env: options.session.env,
     hostToken: options.session.hostToken,
   });

src/sessions/WebSocketSession/filesystem.ts

@@ -42,7 +42,8 @@ export class FileSystem {
   private disposable = new Disposable();
   constructor(
     sessionDisposable: Disposable,
-    private pitcherClient: IPitcherClient
+    private pitcherClient: IPitcherClient,
+    private username?: string
   ) {
     sessionDisposable.onWillDispose(() => {
       this.disposable.dispose();
@@ -212,7 +213,18 @@ export class FileSystem {
     const result = await this.pitcherClient.clients.fs.watch(
       path,
       options,
-      (event) => emitter.fire(event)
+      (event) => {
+        if (this.username) {
+          emitter.fire({
+            ...event,
+            paths: event.paths.map((path) =>
+              path.replace(`home/${this.username}/workspace/`, "sandbox/")
+            ),
+          });
+        } else {
+          emitter.fire(event);
+        }
+      }
     );
 
     if (result.type === "error") {

src/sessions/WebSocketSession/index.ts

@@ -31,7 +31,7 @@ export class WebSocketSession {
   /**
    * Namespace for all filesystem operations on this Sandbox
    */
-  public readonly fs = new FileSystem(this.disposable, this.pitcherClient);
+  public readonly fs: FileSystem;
 
   /**
    * Namespace for hosts
@@ -75,7 +75,15 @@ export class WebSocketSession {
 
   constructor(
     protected pitcherClient: IPitcherClient,
-    { env, hostToken }: { env?: Record<string, string>; hostToken?: HostToken }
+    {
+      env,
+      hostToken,
+      username,
+    }: {
+      env?: Record<string, string>;
+      hostToken?: HostToken;
+      username?: string;
+    }
   ) {
     // TODO: Bring this back once metrics polling does not reset inactivity
     // const metricsDisposable = {
@@ -84,6 +92,7 @@ export class WebSocketSession {
     // };
 
     // this.addDisposable(metricsDisposable);
+    this.fs = new FileSystem(this.disposable, this.pitcherClient, username);
     this.terminals = new Terminals(this.disposable, this.pitcherClient, env);
     this.commands = new Commands(this.disposable, this.pitcherClient, env);
 

src/types.ts

@@ -237,6 +237,7 @@ export type SandboxOpts = {
 
 export type SandboxBrowserSession = PitcherManagerResponse & {
   id: string;
+  sessionId?: string;
   env?: Record<string, string>;
   hostToken?: HostToken;
 };