move dosbox api here

Author: xsro

masm-tasm/package.json

@@ -464,7 +464,6 @@
     "yarn": false
   },
   "devDependencies": {
-    "@types/glob": "^9.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.10",
     "@types/node-fetch": "^2.6.13",
@@ -475,9 +474,10 @@
     "@vscode/test-electron": "^2.5.2",
     "@vscode/test-web": "^0.0.74",
     "assert": "^2.1.0",
+    "browser-or-node": "^3.0.0",
     "del": "^8.0.1",
     "download": "^8.0.0",
-    "emulators": "^8.3.9",
+    "emulators": "https://github.com/dosasm/emulators/releases/download/v8.3.9-dosasm4.0/emulators-v8.3.9-dosasm4.0.tgz",
     "eslint": "^9.39.1",
     "glob": "^11.0.3",
     "js-yaml": "^4.1.0",
@@ -491,7 +491,8 @@
     "typescript": "^5.9.3",
     "vscode-uri": "^3.1.0",
     "webpack": "^5.102.1",
-    "webpack-cli": "^6.0.1"
+    "webpack-cli": "^6.0.1",
+    "webpack-node-externals": "^3.0.0"
   },
   "repository": {
     "type": "git",

masm-tasm/pnpm-lock.yaml

@@ -1,12 +1,13 @@
 import * as vscode from 'vscode';
 
-import { API } from './vscode-dosbox';
+import { API } from '../dosbox-api/vscode-dosbox-api';
+import { api } from '../dosbox-api/vscode-dosbox-api.impl';
 import * as Diag from '../diagnose/main';
 import * as conf from '../utils/configuration';
 import { logger } from '../utils/logger';
 import { uriUtils } from '../utils/util';
 
-export * from './vscode-dosbox';
+export * from '../dosbox-api/vscode-dosbox-api';
 
 export interface AsmResult {
     message: string,
@@ -56,21 +57,6 @@ export function activateManager(context: vscode.ExtensionContext, actions: ExecA
         }
         logger.channel(actionMessage(actionType, _uri.fsPath));
 
-        const vscode_dosbox = vscode.extensions.getExtension<API>('xsro.vscode-dosbox');
-
-        if (vscode_dosbox === undefined) {
-            throw new Error("can't get extension xsro.vscode-dosbox");
-        }
-        let api: API | undefined = vscode_dosbox.exports;
-        if (!vscode_dosbox.isActive) {
-            api = await vscode_dosbox?.activate();
-        }
-        logger.log(vscode_dosbox);
-
-        if (api === undefined) {
-            throw new Error("can't get api from" + vscode_dosbox?.id);
-        }
-
         const doc = await vscode.workspace.openTextDocument(_uri);
         if (doc.isDirty && conf.extConf.get<boolean>('ASM.savefirst', true)) {
             await doc.save();

masm-tasm/src/ASM/manager.ts

@@ -0,0 +1,94 @@
+/**
+ * Manage DOSBox's configuration file
+ */
+export class Conf {
+  private _target: string[] = [];
+  private eol = "\n";
+  constructor(confStr: string = "") {
+    if (confStr.includes("\r\n")) {
+      this.eol = "\r\n";
+    }
+    this._target = confStr.split(this.eol);
+    if (!Array.isArray(this._target)) {
+      throw new Error("error target");
+    }
+  }
+
+  /**check whether the config file has the item or not
+   * @returns line number of the section or key
+   */
+  has(section: string, key?: string): number | undefined {
+    let sectionIdx = this._target.findIndex((val) => {
+      return val.trim().toLowerCase() === `[${section.trim().toLowerCase()}]`;
+    });
+    if (key === undefined && sectionIdx >= 0) {
+      return sectionIdx;
+    }
+    for (let i = sectionIdx + 1; i < this._target.length; i++) {
+      const line = this._target[i];
+      if (typeof line !== "string") {
+        continue;
+      }
+      if (line.trimLeft().startsWith("[")) {
+        break;
+      }
+      const kv = line.replace(/#.*/g, "");
+      const [_key, _value] = kv.split("=");
+      if (key && key.trim().toLowerCase() === _key.trim().toLowerCase()) {
+        return i;
+      }
+    }
+    return undefined;
+  }
+
+  get(section: string, key: string) {
+    const idx = this.has(section, key);
+    if (idx !== undefined) {
+      const [name, value] = this._target[idx]
+        .replace(/#.*/g, "")
+        .trim()
+        .split("=");
+      if (value) {
+        return value.trim();
+      }
+    }
+  }
+
+  update(section: string, key: string, value: boolean | number | string) {
+    let idx = this.has(section, key);
+    if (idx !== undefined) {
+      this._target[idx] = `${key} = ${value.toString()}`;
+      return;
+    }
+    idx = this.has(section);
+    if (idx !== undefined) {
+      this._target.splice(idx + 1, 0, `${key}=${value}`);
+      return;
+    } else {
+      this._target.push(`[${section}]`);
+      this._target.push(`${key}=${value}`);
+      return;
+    }
+  }
+
+  updateAutoexec(context: string[]) {
+    const section = "[autoexec]";
+    const idx = this._target.findIndex((val) => val === section);
+    if (idx >= 0) {
+      for (let i = idx + 1; i < this._target.length; i++) {
+        if (!this._target[i].trim().startsWith("#")) {
+          this._target[i] = "#" + this._target[i];
+        }
+        if (this._target[i].trim().startsWith("[")) {
+          break;
+        }
+      }
+      this._target.splice(idx + 1, 0, ...context);
+    } else {
+      this._target.push("[autoexec]", ...context);
+    }
+  }
+  toString() {
+    return this._target.join(this.eol);
+  }
+}

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

@@ -0,0 +1,74 @@
+import * as cp from "child_process";
+import * as vscode from "vscode";
+import { logger } from "../logger";
+import { Conf } from "./conf";
+import * as api from "../vscode-dosbox-api";
+import { DosboxResult } from "../vscode-dosbox-api";
+import { fromBundle } from "./fromBundle";
+
+const fs = vscode.workspace.fs;
+
+export class DOSBox implements api.Dosbox {
+  private _conf: Conf = new Conf("");
+  constructor(
+    public readonly command: string,
+    public dstConfPath: vscode.Uri,
+    public cwd?: string
+  ) {}
+
+  /** set the dosbox configuration file template
+   *
+   * @param template the path of the reference.conf file
+   */
+  async setConf(template: vscode.Uri) {
+    const text = await fs.readFile(template);
+    this._conf = new Conf(text.toString());
+  }
+
+  updateConf = (
+    section: string,
+    key: string,
+    value: string | number | boolean
+  ) => this._conf.update(section, key, value);
+  updateAutoexec = (context: string[]) => this._conf.updateAutoexec(context);
+
+  async run(params?: string[], cpHandler?: (p: cp.ChildProcess) => void) {
+    const text = new TextEncoder().encode(this._conf.toString());
+    await fs.writeFile(this.dstConfPath, text);
+    const cmd = this.command;
+    const parameter = Array.isArray(params)
+      ? params.join(" ")
+      : `-conf "${this.dstConfPath.fsPath}"`;
+    const command = cmd.includes("<params>")
+      ? cmd.replace("<params>", parameter)
+      : cmd + " " + parameter;
+    console.log(command);
+    return new Promise<DosboxResult>((resolve, reject) => {
+      const p = cp.exec(command, { cwd: this.cwd }, (error, stdout, stderr) => {
+        if (error) {
+          logger.error(JSON.stringify(error), p, this);
+          vscode.window.showErrorMessage(
+            "can't open dosbox with command: " + command + "cwd:" + this.cwd
+          );
+          reject(error);
+        } else {
+          resolve({ stdout, stderr, exitCode: p.exitCode });
+        }
+      });
+      if (cpHandler) {
+        cpHandler(p);
+      }
+    });
+  }
+
+  async fromBundle(
+    bundle: Uint8Array,
+    tempFolder: vscode.Uri,
+    useBundleConf: boolean = false
+  ): Promise<void> {
+    const confText = await fromBundle(bundle, tempFolder);
+    if (useBundleConf) {
+      this._conf = new Conf(confText);
+    }
+  }
+}

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

@@ -0,0 +1,32 @@
+import * as Jszip from "jszip";
+import * as vscode from "vscode";
+
+const fs = vscode.workspace.fs;
+
+/**
+ * open dosbox-like emulator from bundle
+ *
+ * @param bundle bundle data
+ * @param tempFolder the folder for exact all files to
+ * @returns the dosbox.conf file in the jsdos bundle
+ */
+export async function fromBundle(
+  bundle: Uint8Array,
+  tempFolder: vscode.Uri
+): Promise<string | undefined> {
+  const zip = new Jszip();
+  await zip.loadAsync(bundle);
+  Object.keys(zip.files).forEach(async function (filename) {
+    const e = zip.files[filename];
+    const data = await e.async("uint8array");
+    const dest = vscode.Uri.joinPath(tempFolder, filename);
+    if (e.dir === false) {
+      await fs.writeFile(dest, data);
+    }
+  });
+  const filename = ".jsdos/dosbox.conf";
+  if (zip.file(filename)) {
+    const data = await zip.files[filename].async("string");
+    return data.replace(/mount\s+c\s+\./g, `mount c "${tempFolder.fsPath}"`);
+  }
+}