@yowasp/openfpgaloader 0.3.1-892.8 → 0.3.1-894.10

package/gen/bundle.js

@@ -4807,6 +4807,28 @@ var instantiate = (() => {
 })();
 var openFPGALoader_default = instantiate;
 
+// node_modules/@yowasp/runtime/lib/util.js
+function lineBuffered(processLine) {
+  let buffer = new Uint8Array();
+  return (bytes) => {
+    if (bytes === null)
+      return;
+    let newBuffer = new Uint8Array(buffer.length + bytes.length);
+    newBuffer.set(buffer);
+    newBuffer.set(bytes, buffer.length);
+    buffer = newBuffer;
+    let newlineAt = -1;
+    while (true) {
+      const nextNewlineAt = buffer.indexOf(10, newlineAt + 1);
+      if (nextNewlineAt === -1)
+        break;
+      processLine(new TextDecoder().decode(buffer.subarray(newlineAt + 1, nextNewlineAt)));
+      newlineAt = nextNewlineAt;
+    }
+    buffer = buffer.subarray(newlineAt + 1);
+  };
+}
+
 // lib/api.js
 var Exit = class extends Error {
   constructor(code, files) {
@@ -4815,36 +4837,59 @@ var Exit = class extends Error {
     this.files = files;
   }
 };
-function makeTerminalWrite({ print = null, printLine = null }) {
-  let terminalBuffer = [];
-  return function(charCode) {
-    if (print !== null) {
-      if (charCode !== null)
-        terminalBuffer.push(charCode);
-      if (charCode === null || charCode === 10 || charCode == 13)
-        print(String.fromCharCode(...terminalBuffer.splice(0)));
-    } else if (printLine !== null) {
-      if (charCode === null) {
-      } else if (charCode === 10) {
-        printLine(String.fromCharCode(...terminalBuffer.splice(0)));
-      } else {
-        terminalBuffer.push(charCode);
-      }
+function createStreamDevice(FS, path, index, ops) {
+  const dev = FS.makedev(2, index);
+  FS.registerDevice(dev, {
+    open(stream) {
+      stream.seekable = false;
+    },
+    read(stream, buffer, offset, length, pos) {
+      throw new FS.ErrnoError(29);
+    },
+    write(stream, buffer, offset, length, pos) {
+      if (ops.write !== void 0) {
+        ops.write(new Uint8Array(buffer.slice(offset, offset + length)));
+        return length;
+      }
+      throw new FS.ErrnoError(29);
+    },
+    fsync(stream) {
+      if (ops.write !== void 0)
+        ops.write(null);
     }
-  };
+  });
+  FS.mkdev(path, dev);
+  return path;
+}
+function createStandardStreams(FS, { stdout, stderr }) {
+  const lineBufferedConsole = lineBuffered(console.log);
+  function makeStream(streamOption) {
+    if (streamOption === void 0)
+      return lineBufferedConsole;
+    if (streamOption === null)
+      return (_bytes) => {
+      };
+    return streamOption;
+  }
+  createStreamDevice(FS, "/dev/stdin", 0, {});
+  createStreamDevice(FS, "/dev/stdout", 1, { write: makeStream(stdout) });
+  createStreamDevice(FS, "/dev/stderr", 2, { write: makeStream(stderr) });
+  FS.open("/dev/stdin", 0);
+  FS.open("/dev/stdout", 1);
+  FS.open("/dev/stderr", 1);
 }
-function writeTreeToMEMFS(FS, tree, path = "/") {
+function writeTree(FS, tree, path = "/") {
   for (const [filename, data] of Object.entries(tree)) {
     const filepath = `${path}${filename}`;
     if (typeof data === "string" || data instanceof Uint8Array) {
       FS.writeFile(filepath, data);
     } else {
       FS.mkdir(filepath);
-      writeTreeToMEMFS(FS, data, `${filepath}/`);
+      writeTree(FS, data, `${filepath}/`);
     }
   }
 }
-function readTreeFromMEMFS(FS, path = "/") {
+function readTree(FS, path = "/") {
   const tree = {};
   for (const filename of FS.readdir(path)) {
     const filepath = `${path}${filename}`;
@@ -4856,23 +4901,17 @@ function readTreeFromMEMFS(FS, path = "/") {
     if (FS.isFile(stat.mode)) {
       tree[filename] = FS.readFile(filepath, { encoding: "binary" });
     } else if (FS.isDir(stat.mode)) {
-      tree[filename] = readTreeFromMEMFS(FS, `${filepath}/`);
+      tree[filename] = readTree(FS, `${filepath}/`);
     }
   }
   return tree;
 }
-async function runOpenFPGALoader(args = null, filesIn = {}, options = { printLine: console.log }) {
+async function runOpenFPGALoader(args = null, filesIn = {}, options = {}) {
   if (args === null)
     return;
-  const terminalWrite = makeTerminalWrite(options);
-  const inst = await openFPGALoader_default({
-    stdin: () => null,
-    stdout: terminalWrite,
-    stderr: terminalWrite
-  });
-  inst.FS.rmdir("/home/web_user");
-  inst.FS.rmdir("/home");
-  writeTreeToMEMFS(inst.FS, filesIn);
+  const inst = await openFPGALoader_default({ noFSInit: true });
+  createStandardStreams(inst.FS, options);
+  writeTree(inst.FS, filesIn);
   const argv = ["openFPGALoader", ...args, null];
   const argvPtr = inst.stackAlloc(argv.length * 4);
   argv.forEach((arg, off) => inst.HEAPU32[(argvPtr >> 2) + off] = arg === null ? 0 : inst.stringToUTF8OnStack(arg));
@@ -4884,7 +4923,7 @@ async function runOpenFPGALoader(args = null, filesIn = {}, options = { printLin
     { async: true }
   );
   inst._fflush(0);
-  const filesOut = readTreeFromMEMFS(inst.FS);
+  const filesOut = readTree(inst.FS);
   if (exitCode == 0) {
     return filesOut;
   } else {

package/lib/api.d.ts

@@ -2,6 +2,9 @@ export type Tree = {
     [name: string]: Tree | string | Uint8Array
 };
 
+export type OutputStream =
+    (bytes: Uint8Array | null) => void;
+
 export class Exit extends Error {
     code: number;
     files: Tree;
@@ -9,8 +12,8 @@ export class Exit extends Error {
 
 export type Command = {
     (args?: string[], files?: Tree, options?: {
-        print?: (chars: string) => void,
-        printLine?: (line: string) => void
+        stdout?: OutputStream | null,
+        stderr?: OutputStream | null,
     }): Promise<Tree>;
 
     requiresUSBDevice: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@yowasp/openfpgaloader",
-    "version": "0.3.1-892.8",
+    "version": "0.3.1-894.10",
     "description": "WebUSB port of openFPGALoader, universal utility for programming FPGA",
     "author": "Catherine <whitequark@whitequark.org>",
     "license": "ISC",
@@ -25,6 +25,7 @@
     },
     "types": "./lib/api.d.ts",
     "devDependencies": {
+        "@yowasp/runtime": "^6.0",
         "esbuild": "^0.19.8"
     },
     "scripts": {