still not work in worker

xsro · xsro · commit 91cf1a16027b · 2025-03-18T02:46:53.000+08:00
diff --git a/masm-tasm/.gitignore b/masm-tasm/.gitignore
@@ -8,3 +8,5 @@ node_modules
 **/.DS_store
 dev/*.tgz
 resources/*.zip
+
+src/jsdos
diff --git a/masm-tasm/dev/copy-jsdos.js b/masm-tasm/dev/copy-jsdos.js
@@ -0,0 +1,23 @@
+// copy files to resources
+const fs=require("fs");
+const path=require("path")
+
+const Files=[
+    {from:"node_modules/emulators/dist/*.js",to:"resources/jsdos"},
+    {from:"node_modules/emulators/dist/*.js",to:"resources/jsdos"},
+]
+
+const folder="node_modules/emulators/dist/"
+const files=fs.readdirSync(folder);
+for(const file of files){
+    const source=path.resolve(folder,file)
+    if(file.endsWith("x.js")){
+        const header=fs.readFileSync("dev/header.js","utf-8")
+        const body=fs.readFileSync(source,"utf-8");
+        fs.writeFileSync("resources/jsdos/"+file,(header+body).replace(/\r\n/g,"\n"))
+    }
+    if(file.endsWith(".wasm")){
+        fs.copyFileSync(source,"resources/jsdos/"+file)
+    }
+}
+
diff --git a/masm-tasm/dev/header.js b/masm-tasm/dev/header.js
@@ -0,0 +1,50 @@
+const isNode = typeof process !== 'undefined' && process.versions != null && process.versions.node != null;
+
+if (isNode) {
+    const { isMainThread } = require('node:worker_threads');
+    if (isMainThread) {
+        console.log("main")
+    }
+    else {
+        const { parentPort } = require('node:worker_threads');
+        var self = parentPort;
+        var worker = parentPort;
+        function importScripts(...args) {
+            console.log(args)
+        }
+        var onmessage = function (e) {
+
+        }
+        parentPort.on('message', (message) => {
+            onmessage({ data: message })
+        });
+        function postMessage(msg) {
+            parentPort.postMessage(msg);
+        }
+    }
+} else {
+    class Self {
+        calls = []
+        location=location
+        constructor() {
+            onmessage = (e) => {
+                this.calls.forEach(a => a && a(e))
+            }
+        }
+        addEventListener(msg, call) {
+            if (msg === "message")
+                this.calls.push(call)
+        }
+        removeEventListener(msg, call) {
+            this.calls.forEach((value, index) => {
+                if (value === call) {
+                    this.calls[idx] = undefined
+                }
+            })
+        }
+    }
+    var self = new Self();
+}
+
+
+
diff --git a/masm-tasm/package.json b/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.1.tgz",
+    "emulators": "./dev/emulators-v8.3.3-dosasm2.3.tgz",
     "eslint": "^8.20.0",
     "glob": "^8.0.3",
     "http-proxy-agent": "^7.0.2",
diff --git a/masm-tasm/pnpm-lock.yaml b/masm-tasm/pnpm-lock.yaml
diff --git a/masm-tasm/resources/jsdos/.gitignore b/masm-tasm/resources/jsdos/.gitignore
@@ -0,0 +1,2 @@
+*.js
+*.wasm
diff --git a/masm-tasm/src/emulators/jsdos-ci.ts b/masm-tasm/src/emulators/jsdos-ci.ts
@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import * as conf from '../utils/configuration';
-import { CommandInterface, utils } from 'emulators/dist/out/emulators';
+import { CommandInterface, utils } from 'emulators';
 
 class JsdosTerminal implements vscode.Pseudoterminal {
     onDidWrite: vscode.Event<string>;
@@ -66,32 +66,49 @@ function getWebviewContent(webview: vscode.Webview, extensionUri: vscode.Uri) {
 
 
 class Manager {
-    hasCi: {ci: CommandInterface|undefined}={ci:undefined};
-    terminal:vscode.Terminal|undefined=undefined;
-    shell:utils.Shell|undefined=undefined;
+    hasCi: { ci: CommandInterface | undefined } = { ci: undefined };
+    terminal: vscode.Terminal | undefined = undefined;
+    shell: utils.Shell | undefined = undefined;
     bar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
-    updateci(hasCi:{ci: CommandInterface}) {
+    updateci(hasCi: { ci: CommandInterface }) {
         this.bar.command = 'masmtasm.emulatorStatus';
         this.bar.text = `jsdos`;
         this.bar.show();
-        this.bar.color=new vscode.ThemeColor("activityBar.activeBackground")
+        this.bar.color = new vscode.ThemeColor("activityBar.activeBackground")
 
         this.hasCi = hasCi;
         const pty = new JsdosTerminal(hasCi.ci);
-        this.terminal=vscode.window.createTerminal({ name: "jsdos", pty, });
-        this.shell=pty.shell
+        this.terminal = vscode.window.createTerminal({ name: "jsdos", pty, });
+        this.shell = pty.shell
+
+        this.hasCi.ci?.events().onFrame((rgb, rgba) => {
+            if(this.panel)
+            this.panel.webview.postMessage({
+                command: 'rgb',
+                time: new Date().getTime(),
+                data: rgb
+            });
+        });
     }
-    webview(context:vscode.ExtensionContext) {
-        let ci=this.hasCi.ci;
+    panel: vscode.WebviewPanel | undefined = undefined
+    webview(context: vscode.ExtensionContext) {
+        const ci = this.hasCi.ci;
         if (ci) {
-            const panel = vscode.window.createWebviewPanel(
-                "jsdos",
-                "jsdos panel",
-                { viewColumn: vscode.ViewColumn.Beside },
-                {
-                    enableScripts: true
-                }
-            )
+            if (!this.panel?.active) {
+                this.panel?.reveal()
+            }
+            if (this.panel === undefined) {
+                this.panel=vscode.window.createWebviewPanel(
+                    "jsdos",
+                    "jsdos panel",
+                    { viewColumn: vscode.ViewColumn.Beside },
+                    {
+                        enableScripts: true
+                    }
+                )
+            }
+            const panel =this.panel as vscode.WebviewPanel
+
             const currentTime = new Date().getTime();
 
             panel.webview.html = getWebviewContent(panel.webview, context.extensionUri);
@@ -102,13 +119,6 @@ class Manager {
                 width: ci?.width(),
                 height: ci?.height()
             });
-           ci?.events().onFrame((rgb, rgba) => {
-                panel.webview.postMessage({
-                    command: 'rgb',
-                    time: new Date().getTime(),
-                    data: rgb
-                });
-            });
             panel.webview.onDidReceiveMessage(
                 message => {
                     console.log(message);
@@ -135,25 +145,25 @@ class Manager {
     }
 }
 
-export const manager=new Manager();
+export const manager = new Manager();
 
 
 
 export function activate(context: vscode.ExtensionContext): void {
     async function statusBarCommand() {
-        const items = ["show jsdos view", "show terminal","exit"];
-    
+        const items = ["show jsdos view", "show terminal", "exit"];
+
         const placeHolder = 'manipulate emulator';
         const seleted = await vscode.window.showQuickPick(items, { placeHolder });
-        if (seleted===items[0]) {
+        if (seleted === items[0]) {
             manager.webview(context);
         }
-        if(seleted===items[1]){
+        if (seleted === items[1]) {
             manager.terminal?.show();
         }
-        if(seleted===items[2]){
+        if (seleted === items[2]) {
             manager.hasCi.ci?.exit()
-            manager.hasCi.ci=undefined
+            manager.hasCi.ci = undefined
             manager.bar.hide()
             manager.terminal?.hide()
         }
diff --git a/masm-tasm/src/emulators/jsdos.ts b/masm-tasm/src/emulators/jsdos.ts
@@ -2,7 +2,7 @@ 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/dist/out/emulators';
+import { CommandInterface, getEmulators} from 'emulators';
 import { manager } from "./jsdos-ci";
 import { createBundle } from "./bundle";
 
@@ -31,7 +31,7 @@ export class JSDosHost implements ExecAction{
 
         if(runtime===undefined||runtime.ci===undefined){
             if(context.extensionMode==ExtensionMode.Development){
-                runtime=new JsdosRuntime(Uri.joinPath(context.extensionUri,"node_modules/emulators/dist/").fsPath);
+                runtime=new JsdosRuntime(Uri.joinPath(context.extensionUri,"resources/jsdos/").fsPath);
             }else{
                 throw new Error("not implemented");
             }
@@ -48,12 +48,12 @@ c:
             await runtime.run(data);
             if(runtime && runtime.ci){
                 manager.updateci(runtime as {ci:CommandInterface});
+                runtime.ci.resume()
             }
-            vscode.workspace.fs.writeFile(Uri.joinPath(context.extensionUri,"resources","test.zip"),data)
         }
 
         if(manager.hasCi.ci&&manager.terminal){
-            manager.shell?.exec("echo hello")
+            manager.shell?.exec("echo hello",1000,1000,100000000)
         }
         
         return {
diff --git a/masm-tasm/src/extension.ts b/masm-tasm/src/extension.ts
@@ -4,19 +4,54 @@ 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';
+import { Platform, platform, XhrOptions } from '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);
-};
+class Nodejs implements Platform{
+	name="vscode nodejs host"
+	jsdos = ""
+	constructor(private context: vscode.ExtensionContext) {
+		if (context.extensionMode == vscode.ExtensionMode.Development) {
+			this.jsdos = "resources/jsdos/"
+		}
+	}
+	async createWorker(workerUrl: string, onerror: (e: ErrorEvent) => void, onmessage: (e: MessageEvent) => void): Promise<Worker> {
+		const node_workder_threads=__non_webpack_require__("node:worker_threads")
+        const w=new node_workder_threads.Worker(workerUrl)
+        w.on('message', (message:any) => {
+            onmessage({data:message} as any)
+        });
+        w.on('error',(error:any)=>{
+            onerror({type:"node worker thread",filename:error.stack,message:error.message} as any)
+        })
+        return w
+	}
+	node_require(path: string) {
+		return __non_webpack_require__(path);
+	}
+	async httpRequest(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(this.context.extensionUri, this.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(this.context.extensionUri, this.jsdos, filename)
+			const data = await vscode.workspace.fs.readFile(uri2)
+			const text = new TextDecoder("utf-8").decode(data)
+			return text
+		}
+		throw new Error("  ")
+	}
+	
+}
 
 export function activate(context: vscode.ExtensionContext): void {
+	platform.set(new Nodejs(context));
 
 	loadI18n(context);
 
diff --git a/masm-tasm/src/web/extension.ts b/masm-tasm/src/web/extension.ts
