From 7b90932e0365c13ee1e3fe673c91be532b734793 Mon Sep 17 00:00:00 2001
From: Yan Chen <48968912+chenyan-dfinity@users.noreply.github.com>
Date: Sat, 14 Sep 2024 14:55:07 -0700
Subject: [PATCH] enable jsh

---
 src/App.tsx         |  1 +
 src/webcontainer.ts | 39 +++++++++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 6e766143..98462902 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -263,6 +263,7 @@ export function App() {
       await container.run_cmd("npm", ["install"], {
         cwd: "utils",
       });
+      container.start_shell();
       // fetch code after loading base library
       if (hasUrlParams) {
         const files = await fetchFromUrlParams(workplaceDispatch);
diff --git a/src/webcontainer.ts b/src/webcontainer.ts
index de188ebb..68079a85 100644
--- a/src/webcontainer.ts
+++ b/src/webcontainer.ts
@@ -11,7 +11,10 @@ export class Container {
 
   async init() {
     if (!this.container) {
-      this.container = await WebContainer.boot({ coep: "credentialless" });
+      this.container = await WebContainer.boot({
+        coep: "credentialless",
+        workdirName: "playground",
+      });
     }
     return this.container;
   }
@@ -54,21 +57,37 @@ export class Container {
     };
     await this.container!.mount(files);
   }
-
-  async run_cmd(cmd: string, args: string[], options?: SpawnOptions) {
-    await this.init();
-    if (options?.output ?? true) {
-      this.terminal.writeln(`/${options?.cwd ?? ""}$ ${cmd} ${args.join(" ")}`);
-    }
-    const installProcess = await this.container!.spawn(cmd, args, options);
-    installProcess.output.pipeTo(
+  private async run_cmd_inner(
+    cmd: string,
+    args: string[],
+    options?: SpawnOptions,
+  ) {
+    const process = await this.container!.spawn(cmd, args, options);
+    process.output.pipeTo(
       new WritableStream({
         write: (data) => {
           this.terminal.write(data);
         },
       }),
     );
-    const exitCode = await installProcess.exit;
+    return process;
+  }
+  async start_shell() {
+    await this.init();
+    const process = await this.run_cmd_inner("jsh", []);
+    const input = process.input.getWriter();
+    this.terminal.onData((data) => {
+      input.write(data);
+    });
+    return process;
+  }
+  async run_cmd(cmd: string, args: string[], options?: SpawnOptions) {
+    await this.init();
+    if (options?.output ?? true) {
+      this.terminal.writeln(`/${options?.cwd ?? ""}$ ${cmd} ${args.join(" ")}`);
+    }
+    const process = await this.run_cmd_inner(cmd, args, options);
+    const exitCode = await process.exit;
     if (exitCode !== 0) {
       this.terminal.writeln(`\r\nexited with code ${exitCode}`);
       throw new Error(`Command failed with code ${exitCode}`);