From 121a5170f2982c399f93c2b2ce636a3ebed0fa99 Mon Sep 17 00:00:00 2001
From: Fabian <copy@copy.sh>
Date: Thu, 10 Apr 2025 18:36:12 +0700
Subject: [PATCH] minor refactoring (remove readfile, use direct import for
 libv86.js)

---
 examples/nodejs.js                 | 21 +++++++++------------
 examples/nodejs_state.js           | 16 ++++------------
 tests/kvm-unit-tests/run.mjs       | 25 +++----------------------
 tools/docker/alpine/build-state.js |  2 +-
 4 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/examples/nodejs.js b/examples/nodejs.js
index 2a7d0fb3..2d0ee4c9 100755
--- a/examples/nodejs.js
+++ b/examples/nodejs.js
@@ -1,20 +1,12 @@
 #!/usr/bin/env node
 
-
+import path from "node:path";
 import fs from "node:fs";
 import url from "node:url";
-import { V86 } from "../build/libv86.js";
+import { V86 } from "../build/libv86.mjs";
 
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
-function readfile(path)
-{
-    return new Uint8Array(fs.readFileSync(path)).buffer;
-}
-
-var bios = readfile(__dirname + "/../bios/seabios.bin");
-var linux = readfile(__dirname + "/../images/linux4.iso");
-
 process.stdin.setRawMode(true);
 process.stdin.resume();
 process.stdin.setEncoding("utf8");
@@ -22,9 +14,14 @@ process.stdin.setEncoding("utf8");
 console.log("Now booting, please stand by ...");
 
 var emulator = new V86({
-    bios: { buffer: bios },
-    cdrom: { buffer: linux },
+    bios: { url: __dirname + "/../bios/seabios.bin" },
+    vga_bios: { url: __dirname + "/../bios/vgabios.bin" },
+    cdrom: { url: __dirname + "/../images/linux4.iso" },
     autostart: true,
+    net_device: {
+        type: "virtio",
+        relay_url: "fetch",
+    },
 });
 
 emulator.add_listener("serial0-output-byte", function(byte)
diff --git a/examples/nodejs_state.js b/examples/nodejs_state.js
index 834f3b5b..a11ca4fe 100755
--- a/examples/nodejs_state.js
+++ b/examples/nodejs_state.js
@@ -1,21 +1,13 @@
 #!/usr/bin/env node
 
-
 import fs from "node:fs";
 import url from "node:url";
-var V86 = await import("../build/libv86.js").V86;
+import { V86 } from "../build/libv86.mjs";
+
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
-function readfile(path)
-{
-    return new Uint8Array(fs.readFileSync(path)).buffer;
-}
-
 console.log("Use F2 to save the state and F3 to restore.");
 
-var bios = readfile(__dirname + "/../bios/seabios.bin");
-var linux = readfile(__dirname + "/../images/linux4.iso");
-
 process.stdin.setRawMode(true);
 process.stdin.resume();
 process.stdin.setEncoding("utf8");
@@ -23,8 +15,8 @@ process.stdin.setEncoding("utf8");
 console.log("Now booting, please stand by ...");
 
 var emulator = new V86({
-    bios: { buffer: bios },
-    cdrom: { buffer: linux },
+    bios: { url: __dirname + "/../bios/seabios.bin" },
+    cdrom: { url: __dirname + "/../images/linux4.iso" },
     autostart: true,
 });
 
diff --git a/tests/kvm-unit-tests/run.mjs b/tests/kvm-unit-tests/run.mjs
index 76ec8970..10bbbe4b 100755
--- a/tests/kvm-unit-tests/run.mjs
+++ b/tests/kvm-unit-tests/run.mjs
@@ -11,29 +11,10 @@ process.on("unhandledRejection", exn => { throw exn; });
 const TEST_RELEASE_BUILD = +process.env.TEST_RELEASE_BUILD;
 const { V86 } = await import(TEST_RELEASE_BUILD ? "../../build/libv86.mjs" : "../../src/main.js");
 
-function readfile(path)
-{
-    return new Uint8Array(fs.readFileSync(path)).buffer;
-}
-
-function Loader(path)
-{
-    this.buffer = readfile(path);
-    this.byteLength = this.buffer.byteLength;
-}
-
-Loader.prototype.load = function()
-{
-    this.onload && this.onload({});
-};
-
-var bios = readfile(__dirname + "/../../bios/seabios.bin");
-var vga_bios = readfile(__dirname + "/../../bios/vgabios.bin");
-
 var emulator = new V86({
-    bios: { buffer: bios },
-    vga_bios: { buffer: vga_bios },
-    multiboot: new Loader(process.argv[2]),
+    bios: { url: __dirname + "/../../bios/seabios.bin" },
+    vga_bios: { url: __dirname + "/../../bios/vgabios.bin" },
+    multiboot: { url: process.argv[2] },
     autostart: true,
     memory_size: 64 * 1024 * 1024,
     disable_jit: +process.env.DISABLE_JIT,
diff --git a/tools/docker/alpine/build-state.js b/tools/docker/alpine/build-state.js
index 63409fbe..0991552b 100755
--- a/tools/docker/alpine/build-state.js
+++ b/tools/docker/alpine/build-state.js
@@ -3,10 +3,10 @@
 import path from "node:path";
 import fs from "node:fs";
 import url from "node:url";
+import { V86 } from "../../../build/libv86.mjs";
 
 console.log("Don't forget to run `make all` before running this script");
 
-const { V86 } = await import("./../../../build/libv86.js");
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
 const V86_ROOT = path.join(__dirname, "../../..");