impl a simple and buggy teminal

Author: xsro

masm-tasm/src/dosbox-api/jsdos/Jsdos.ts

@@ -7,6 +7,7 @@ import * as Jszip from "jszip";
 import { runInWebview } from "./runInWebview";
 import { logger } from "../logger";
 import { isNode } from "browser-or-node";
+import { createTerminal } from "./utils/terminal";
 
 const fs = vscode.workspace.fs;
 
@@ -19,10 +20,11 @@ export class Jsdos implements api.Jsdos {
   public jszip: Jszip = new Jszip();
 
   constructor(private context: vscode.ExtensionContext) {
-    const dist = vscode.Uri.joinPath(context.extensionUri, "node_modules/emulators/build/wasm");
+    const dist = vscode.Uri.joinPath(context.extensionUri, "node_modules/emulators/build/wasm/");
     this.pathPrefix = isNode ? dist.fsPath : dist.toString();
     this.emulators=adapted.getEmulators(this.pathPrefix)
   }
+  createTerminal=createTerminal;
 
   async setBundle(
     bundle: vscode.Uri | Uint8Array,

masm-tasm/src/dosbox-api/jsdos/main.ts

@@ -1,5 +1,7 @@
 import * as vscode from "vscode";
-import { createBundle } from "../jsdos-bundle/bundle";
+import { createBundle } from "./utils/bundle";
+export{ createBundle } from "./utils/bundle";
+export { createTerminal } from "./utils/terminal";
 import { Jsdos } from "../jsdos/Jsdos";
 
 const input = "Input your url";
@@ -74,5 +76,5 @@ export function activateJSdos(context: vscode.ExtensionContext) {
 
   context.subscriptions.push(disposable, disposable2);
 
-  return { jsdos, createBundle };
+  return jsdos;
 }

masm-tasm/src/dosbox-api/jsdos/runInHost.ts

@@ -0,0 +1,40 @@
+import { CommandInterface, utils } from "emulators";
+import * as vscode from "vscode";
+
+export function createTerminal(ci: CommandInterface) {
+  const writeEmitter = new vscode.EventEmitter<string>();
+  const pty: vscode.Pseudoterminal = {
+    onDidWrite: writeEmitter.event,
+    open: () => {
+      writeEmitter.fire(
+        "Jsdos Terminal all changes after launch \x1b[31mwill not\x1b[0m be applied to this shell\r\n"
+      );
+      ci.events().onStdout((val) => {
+        writeEmitter.fire(val);
+      });
+    },
+    close: () => { },
+    handleInput: (datas) => {
+      console.log(datas)
+      for (const data of datas.split("")) {
+        if (data.charCodeAt(0) === 127) {
+          writeEmitter.fire("<backspace>");
+        } else {
+          // writeEmitter.fire(data);
+        }
+        if (data.charCodeAt(0) === 13) {
+          const key = utils.Keys.KBD_enter;
+          console.log(key)
+          ci.simulateKeyPress(257)
+        }
+        else {
+          const keys = utils.string2jsdosKey(data);
+          keys.forEach(k => ci.simulateKeyPress(...k));
+        }
+      }
+
+    },
+  };
+
+  return vscode.window.createTerminal({ name: "Jsdos Terminal", pty });
+}

…sm/src/dosbox-api/jsdos-bundle/bundle.ts …asm/src/dosbox-api/jsdos/utils/bundle.tsmasm-tasm/src/dosbox-api/jsdos-bundle/bundle.ts renamed to masm-tasm/src/dosbox-api/jsdos/utils/bundle.ts masm-tasm/src/dosbox-api/jsdos-bundle/bundle.ts renamed to masm-tasm/src/dosbox-api/jsdos/utils/bundle.ts

@@ -2,8 +2,8 @@ import { CommandInterface, Emulators,getEmulators } from "emulators";
 import { ExtensionContext, Terminal, Uri, Webview } from "vscode";
 import { API, Dosbox, Jsdos } from "./vscode-dosbox-api";
 import * as Jszip from 'jszip';
-import {activateJSdos} from "./jsdos/main"
-import { CreateBundleOptions } from "./jsdos-bundle/bundle";
+import {activateJSdos,createBundle,createTerminal} from "./jsdos/main"
+import { CreateBundleOptions } from "./jsdos/utils/bundle";
 
 export class vscodeDosboxAPI implements API {
     emulators: Emulators;
@@ -12,14 +12,16 @@ export class vscodeDosboxAPI implements API {
     dosboxX: Dosbox;
     msdosPath: string="";
     commandPath: string="";
-    createBundle:({ sample, boxConf, mount, }: CreateBundleOptions) => Promise<Jszip>
+    createBundle=createBundle;
+    createTerminal=createTerminal;
+    
 
     constructor(context:ExtensionContext) {
-        const { jsdos, createBundle }=activateJSdos(context);
+        const jsdos=activateJSdos(context);
+        this.jsdos=jsdos;
         this.emulators = jsdos.emulators;
 
         // prefer real emulator instances when available, otherwise keep lightweight placeholders
-        this.jsdos = jsdos;
         this.createBundle=createBundle;
         this.dosbox = (this.emulators as any).dosbox || ({} as Dosbox);
         this.dosboxX = (this.emulators as any).dosboxX || ({} as Dosbox);

masm-tasm/src/dosbox-api/jsdos/utils/terminal.ts

@@ -70,6 +70,8 @@ export interface Jsdos {
      * @returns the vscode webview running JSDos
      */
     runInWebview(): Promise<vscode.Webview>,
+
+    createTerminal(ci: CommandInterface): vscode.Terminal
 }
 
 export interface API {

masm-tasm/src/dosbox-api/vscode-dosbox-api.impl.ts

@@ -1 +1,64 @@
-//TODO
+import { ExtensionContext, workspace } from "vscode";
+import { DosEmulatorType } from "../utils/configuration";
+import { ActionContext, AsmResult, ExecAction, API } from "../ASM/manager";
+import { getFiles, uriUtils } from "../utils/util";
+
+import * as conf from "../utils/configuration";
+import * as path from "path";
+import { messageCollector } from "../diagnose/messageCollector";
+
+export class JsdosHost implements ExecAction {
+    name: DosEmulatorType | DosEmulatorType[] = DosEmulatorType.jsdos;
+    async run(context: ExtensionContext, ctx: ActionContext, api: API): Promise<AsmResult> {
+        await api.jsdos.jszip.loadAsync(ctx.bundleData);
+
+        let fileInJsdos = "";
+        if (ctx.mountMode === conf.MountMode.workspace) {
+            for await (const f of getFiles(ctx.workspaceFolderUri)) {
+                const rel = path.relative(ctx.workspaceFolderUri.fsPath, f.fsPath);
+                const dst = path.posix.join('code/', rel);
+                const _data = await workspace.fs.readFile(f);
+                api.jsdos.jszip.file(dst, _data);
+            }
+            const rel = path.relative(
+                ctx.workspaceFolderUri.fsPath,
+                ctx.fileUri.fsPath,
+            );
+            fileInJsdos = "D:\\"+ rel.replace(/\//g,"\\");
+        } else if (ctx.mountMode === conf.MountMode.single) {
+            api.jsdos.jszip.file('code/test' + uriUtils.extname(ctx.fileUri), ctx.doc.getText());
+            fileInJsdos = "D:\\test" + uriUtils.extname(ctx.fileUri);
+        }
+
+        const fileinfo = path.parse(fileInJsdos);
+        const autoexec = [
+            `mount c .`,
+            `mount d ./code`,
+            'd:'
+        ];
+        const before = conf.extConf.action.before;
+        if (before) {
+            autoexec.push(...before);
+        }
+        function cb(val: string) {
+            const r = val
+                .replace("${file}", fileInJsdos)
+                .replace("${filename}", fileInJsdos.replace(fileinfo.ext, ""));
+            if (val.startsWith('>')) {
+                return r.replace(">", "");
+            }
+            return r;
+        }
+        if (ctx.actionType === conf.ActionType.run) {
+            autoexec.push(...conf.extConf.action.run.map(cb));
+        }
+        if (ctx.actionType === conf.ActionType.debug) {
+            autoexec.push(...conf.extConf.action.debug.map(cb));
+        }
+        api.jsdos.updateAutoexec(autoexec);
+        const ci = await api.jsdos.runInHost();
+        const terminal=api.jsdos.createTerminal(ci);
+        terminal.show()
+        throw new Error("can't get message from" + this.name);
+    }
+}

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

@@ -1,5 +1,5 @@
-import { JsdosWeb } from "./jsdosWeb";
+import { JsdosHost } from "./jsdosHost";
 
 export const emulist = [
-    new JsdosWeb(),
+    new JsdosHost(),
 ];