From 8d12600e0a64d7c759baec762050c998f0bbf486 Mon Sep 17 00:00:00 2001
From: Arianrhod Sandlot <theguidanceofawhitetower@gmail.com>
Date: Thu, 23 Jan 2025 10:37:15 +0800
Subject: [PATCH] fix: fix the exit method not working

---
 playground/activate.ts              |  4 ++++
 playground/index.html               |  1 +
 src/classes/emulator-file-system.ts |  4 ----
 src/classes/emulator.ts             |  2 --
 tests/e2e/instance-ra-common.ts     | 26 ++++++++++++++++++++++++++
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/playground/activate.ts b/playground/activate.ts
index 45c2ab7..22eddb7 100644
--- a/playground/activate.ts
+++ b/playground/activate.ts
@@ -106,6 +106,10 @@ const handlers = {
   exit() {
     nostalgist.exit()
   },
+
+  exitWithoutRemovingCanvas() {
+    nostalgist.exit({ removeCanvas: false })
+  },
 }
 
 export function activate(mod: typeof Nostalgist_) {
diff --git a/playground/index.html b/playground/index.html
index 66eb588..040e9fc 100644
--- a/playground/index.html
+++ b/playground/index.html
@@ -64,6 +64,7 @@ <h3>Instance Methods</h3>
       <button type="button">pressStart</button>
       <button type="button">screenshot</button>
       <button type="button">exit</button>
+      <button type="button">exitWithoutRemovingCanvas</button>
     </div>
 
     <script type="module">
diff --git a/src/classes/emulator-file-system.ts b/src/classes/emulator-file-system.ts
index 5fca200..58311f8 100644
--- a/src/classes/emulator-file-system.ts
+++ b/src/classes/emulator-file-system.ts
@@ -62,10 +62,6 @@ export class EmulatorFileSystem {
     return emulatorFileSystem
   }
 
-  dispose() {
-    this.FS.unmount('/home')
-  }
-
   mkdirTree(directory: string) {
     const { FS } = this
     FS.mkdirTree(directory)
diff --git a/src/classes/emulator.ts b/src/classes/emulator.ts
index 274deab..87b3559 100644
--- a/src/classes/emulator.ts
+++ b/src/classes/emulator.ts
@@ -83,8 +83,6 @@ export class Emulator {
       exit(statusCode)
       JSEvents.removeAllEventListeners()
     } catch {}
-
-    this.fs.dispose()
   }
 
   getEmscripten() {
diff --git a/tests/e2e/instance-ra-common.ts b/tests/e2e/instance-ra-common.ts
index f909e98..147a4a3 100644
--- a/tests/e2e/instance-ra-common.ts
+++ b/tests/e2e/instance-ra-common.ts
@@ -116,4 +116,30 @@ export function tests() {
     await page.getByText('screenshot', { exact: true }).click()
     await expect(screenshot).toHaveScreenshot('screenshot.png')
   })
+
+  test('exit', async ({ page }) => {
+    const canvas = page.locator('#canvas')
+    await expect(canvas).not.toBeAttached()
+
+    await page.getByText('nes', { exact: true }).click()
+    await page.waitForLoadState('networkidle')
+    await page.waitForTimeout(500)
+    await expect(canvas).toBeAttached()
+
+    await page.getByText('exit', { exact: true }).click()
+    await expect(canvas).not.toBeAttached()
+  })
+
+  test('exit without removing the canvas', async ({ page }) => {
+    const canvas = page.locator('#canvas')
+    await expect(canvas).not.toBeAttached()
+
+    await page.getByText('nes', { exact: true }).click()
+    await page.waitForLoadState('networkidle')
+    await page.waitForTimeout(500)
+    await expect(canvas).toBeAttached()
+
+    await page.getByText('exitWithoutRemovingCanvas', { exact: true }).click()
+    await expect(canvas).toBeAttached()
+  })
 }