Support own exe files

page/emulator.js

@@ -1,17 +1,18 @@
 onmessage = async (event) => {
     const data = event.data;
     if (data.message == "run") {
-        runEmulation(data.data);
+        const payload = data.data;
+        runEmulation(payload.filesystem, payload.file);
     }
 };
 
 function logLine(text) {
-    postMessage(text);
+    postMessage({ message: "log", data: text });
 }
 
-function runEmulation(filesystem) {
+function runEmulation(filesystem, file) {
     globalThis.Module = {
-        arguments: ["-b", "-c", "-e", "./root", "c:/test-sample.exe",],
+        arguments: ["-b", /*"-c",*/ "-e", "./root", file],
         onRuntimeInitialized: function () {
             filesystem.forEach(e => {
                 if (e.name.endsWith("/")) {
@@ -20,6 +21,9 @@ function runEmulation(filesystem) {
                     const dirs = e.name.split("/")
                     const file = dirs.pop();
                     const buffer = new Uint8Array(e.data);
+                    if (FS.analyzePath(e.name).exists) {
+                        FS.unlink(e.name);
+                    }
                     FS.createDataFile("/" + dirs.join('/'), file, buffer, true, true);
                 }
             })
@@ -27,6 +31,7 @@ function runEmulation(filesystem) {
         print: logLine,
         printErr: logLine,
         postRun: () => {
+            postMessage({ message: "end", data: null });
             self.close();
         },
     };

page/index.html

@@ -343,6 +343,40 @@
             return cacheAndUseData("emulator-filesystem-2", fetchFilesystem);
         }
 
+        function selectAndReadFile() {
+            return new Promise((resolve, reject) => {
+                const fileInput = document.createElement('input');
+                fileInput.type = 'file';
+                fileInput.accept = '.exe';
+
+                fileInput.addEventListener('change', function (event) {
+                    const file = event.target.files[0];
+                    if (file) {
+                        const reader = new FileReader();
+
+                        reader.onload = function (e) {
+                            const arrayBuffer = e.target.result;
+                            resolve({
+                                name: file.name,
+                                data: arrayBuffer
+                            });
+                        };
+
+                        reader.onerror = function (e) {
+                            reject(new Error('Error reading file: ' + e.target.error));
+                        };
+
+                        reader.readAsArrayBuffer(file);
+                    } else {
+                        reject(new Error('No file selected'));
+                    }
+                });
+
+                // Programmatically click the file input element to open the file picker
+                fileInput.click();
+            });
+        }
+
         function printText(lines) {
             if (lines.length == 0) {
                 return;
@@ -362,6 +396,13 @@
             outputDiv.scrollTop = outputDiv.scrollHeight;
         }
 
+        function clearLog() {
+            var outputDiv = document.getElementById('output');
+            if (outputDiv) {
+                outputDiv.innerHTML = "";
+            }
+        }
+
         function flushLines() {
             const lines = globalThis.logLines;
             globalThis.logLines = [];
@@ -373,24 +414,59 @@
             globalThis.logLines.push(text);
         }
 
-        async function startEmulation() {
-            if (window.emulationStarted) {
+        function stopEmulation() {
+            if (window.emulator) {
+                window.emulator.terminate();
+                window.emulator = undefined;
+            }
+        }
+
+        async function selectAndStartEmulation() {
+            const file = await selectAndReadFile();
+            return await startEmulation(file);
+        }
+
+        async function startEmulation(fileData) {
+            if (window.emulator) {
                 return;
             }
 
-            window.emulationStarted = true;
+            clearLog();
+
+            const worker = new Worker("./emulator.js");
+            window.emulator = worker;
 
             const filesystem = await getFilesystem();
 
             logLine("Starting emulation...");
 
-            const worker = new Worker("./emulator.js?4");
+            var file = "c:/test-sample.exe";
+            if (fileData) {
+                const filename = fileData.name.split("/").pop().split("\\").pop();
+                const canonicalName = filename.toLowerCase()
+                file = "c:/" + canonicalName;
+                filesystem.push({
+                    name: "root/filesys/c/" + canonicalName,
+                    data: fileData.data,
+                });
+            }
+
             worker.onmessage = (event) => {
-                logLine(event.data);
+                if (event.data.message == "log") {
+                    logLine(event.data.data);
+                }
+
+                if (event.data.message == "end") {
+                    window.emulator = undefined;
+                }
             };
+
             worker.postMessage({
                 message: "run",
-                data: filesystem,
+                data: {
+                    filesystem,
+                    file,
+                }
             });
         }
 
@@ -423,8 +499,9 @@
     </div>
 
     <div class="buttons">
-        <a class="button" href="#" onclick="startEmulation()">Start Emulation</a>
-        <!--<a class="button" href="#" onclick="startEmulation()">Select .exe</a>-->
+        <a class="button" href="#" onclick="startEmulation()">Run Sample</a>
+        <a class="button" href="#" onclick="selectAndStartEmulation()">Run your .exe</a>
+        <a class="button" href="#" onclick="stopEmulation()">Stop Emulation</a>
         <a class="button" href="https://github.com/momo5502/emulator" target="_blank">GitHub</a>
     </div>
 </body>