web worker still not work

Author: xsro

masm-tasm/package.json

@@ -483,7 +483,7 @@
     "assert": "^2.0.0",
     "del": "^7.0.0",
     "download": "^8.0.0",
-    "emulators": "./dev/emulators-v8.3.3-dosasm2.0.tgz",
+    "emulators": "./dev/emulators-v8.3.3-dosasm2.1.tgz",
     "eslint": "^8.20.0",
     "glob": "^8.0.3",
     "http-proxy-agent": "^7.0.2",

masm-tasm/pnpm-lock.yaml

@@ -3,7 +3,7 @@
  * originally from https://github.com/dosasm/vscode-dosbox/blob/main/src/api.ts
  */
 
-import { CommandInterface, Emulators } from 'emulators';
+import { CommandInterface, Emulators } from 'emulators/dist/out/emulators';
 import * as Jszip from 'jszip';
 import * as vscode from 'vscode';
 

masm-tasm/src/ASM/vscode-dosbox.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import * as conf from '../utils/configuration';
-import { CommandInterface, utils } from 'emulators';
+import { CommandInterface, utils } from 'emulators/dist/out/emulators';
 
 class JsdosTerminal implements vscode.Pseudoterminal {
     onDidWrite: vscode.Event<string>;

masm-tasm/src/emulators/jsdos-ci.ts

@@ -2,18 +2,12 @@ import { ExtensionContext, ExtensionMode, Uri } from "vscode";
 import * as vscode from "vscode"
 import { ActionContext, AsmResult, ExecAction } from "../ASM/manager";
 import { DosEmulatorType } from "../utils/configuration";
-import { CommandInterface, getEmulators,platform } from "emulators";
+import { CommandInterface, getEmulators,platform } from 'emulators/dist/out/emulators';
 import { manager } from "./jsdos-ci";
 import { createBundle } from "./bundle";
-import { XhrOptions } from "emulators/dist/out/impl/http";
 
-platform.current.node_require=function(url:string){
-    return __non_webpack_require__(url);
-};
-const request=platform.current.httpRequest
-platform.current.httpRequest=function(url:string,options:XhrOptions){
-    return request(url,options)
-}
+
+
 
 class JsdosRuntime{
     emulators;
@@ -22,7 +16,10 @@ class JsdosRuntime{
         this.emulators=getEmulators(pathprefix);
     }
     async run(FS:Uint8Array){
-        this.ci=await this.emulators.dosboxDirect(FS,);
+        this.ci=await this.emulators.dosboxWorker(FS,);
+        this.ci.events().onMessage((msg,...args)=>{
+            console.log(msg,args)
+        })
     }
 }
 

masm-tasm/src/emulators/jsdos.ts

@@ -4,6 +4,18 @@ import { localize, loadI18n } from './utils/i18n';
 import * as lan from './language/main';
 import * as asm from './ASM/main';
 
+import { XhrOptions } from "emulators/dist/out/impl/http";
+import { platform } from 'emulators/dist/out/emulators';
+
+const request=platform.current.httpRequest
+platform.current.httpRequest=function(url:string,options:XhrOptions){
+	return request(url,options)
+}
+
+platform.current.node_require=function(url:string){
+	return __non_webpack_require__(url);
+};
+
 export function activate(context: vscode.ExtensionContext): void {
 
 	loadI18n(context);

masm-tasm/src/extension.ts

@@ -4,8 +4,52 @@ import { localize, loadI18n } from '../utils/i18n';
 import * as lan from '../language/main';
 import * as asm from './ASM';
 
+import { XhrOptions } from "emulators/dist/out/impl/http";
+import { platform } from 'emulators/dist/out/emulators';
+
+self.window=self
+
 export function activate(context: vscode.ExtensionContext): void {
 
+    let jsdos=""
+    if(context.extensionMode==vscode.ExtensionMode.Development){
+        jsdos="node_modules/emulators/dist/"
+    }
+
+    const request=platform.current.httpRequest
+    platform.current.httpRequest=async function(url:string,options:XhrOptions){
+        if(url.endsWith("wasm")){
+            const uri=vscode.Uri.file(url)
+            const filename=uri.path.substring(uri.path.lastIndexOf('/'));
+            const uri2=vscode.Uri.joinPath(context.extensionUri,jsdos,filename)
+            return await vscode.workspace.fs.readFile(uri2)
+        }
+        if(url.endsWith("js")){
+            const uri=vscode.Uri.file(url)
+            const filename=uri.path.substring(uri.path.lastIndexOf('/'));
+            const uri2=vscode.Uri.joinPath(context.extensionUri,jsdos,filename)
+            const data=await vscode.workspace.fs.readFile(uri2)
+            const text=new TextDecoder("utf-8").decode(data)
+            return text
+        }
+        return request(url,options)
+    }
+
+    platform.current.createWorker=async function(url: string,onerror:(e:ErrorEvent)=>void,onmessage:(e:MessageEvent)=>void): Promise<Worker>{
+        const uri=vscode.Uri.file(url)
+        const filename=uri.path.substring(uri.path.lastIndexOf('/'));
+        const uri2=vscode.Uri.joinPath(context.extensionUri,jsdos,filename)
+        const data=await vscode.workspace.fs.readFile(uri2)
+   
+        const b = new Blob([data])
+
+        const localUrl = URL.createObjectURL(b);
+        const worker = new Worker(localUrl);
+        worker.onerror=onerror;
+        worker.onmessage=onmessage
+        return worker
+    } as any;
+
     loadI18n(context);
 
     //provide programmaic language features like hover,references,outline(symbol)