@remix_labs/hub-client 2.3346.0-dev → 2.3348.0-dev

package/miniwasi.js

@@ -2,37 +2,45 @@
 // Minimal WASI implementation to run mixrt.wasm and mixcore_mini.wasm
 class MiniWASI {
     constructor() {
-        this.inst = null; // same field as in bjorn's WASI shim that's used for mixcore
         this.memory = null;
         this.stdout = new Array();
         this.stderr = new Array();
-        this.imp_wasi_snapshot_preview1 = {
-            "fd_write": this.fd_write.bind(this),
-            "fd_close": this.fd_close.bind(this),
-            "fd_seek": this.fd_seek.bind(this),
-            "fd_fdstat_get": this.fd_fdstat_get.bind(this),
-            "environ_sizes_get": this.environ_sizes_get.bind(this),
-            "environ_get": this.environ_get.bind(this),
-            "random_get": this.random_get.bind(this),
-            "proc_exit": this.proc_exit.bind(this),
-            "clock_time_get": this.clock_time_get.bind(this),
-            "poll_oneoff": this.poll_oneoff.bind(this),
+        this.imports = {
+            wasi_snapshot_preview1: {
+                "fd_write": this.fd_write.bind(this),
+                "fd_close": this.fd_close.bind(this),
+                "fd_seek": this.fd_seek.bind(this),
+                "fd_fdstat_get": this.fd_fdstat_get.bind(this),
+                "environ_sizes_get": this.environ_sizes_get.bind(this),
+                "environ_get": this.environ_get.bind(this),
+                "random_get": this.random_get.bind(this),
+                "proc_exit": this.proc_exit.bind(this),
+                "clock_time_get": this.clock_time_get.bind(this),
+                "poll_oneoff": this.poll_oneoff.bind(this),
+                "args_sizes_get": this.args_sizes_get.bind(this),
+                "args_get": this.args_get.bind(this),
+                "fd_prestat_get": this.fd_prestat_get.bind(this),
+                "fd_prestat_dir_name": this.fd_prestat_dir_name.bind(this),
+                "fd_read": this.fd_read.bind(this),
+            }
         };
-        this.wasiImport = this.imp_wasi_snapshot_preview1;
+    }
+
+    setMemory(memory) {
+        this.memory = memory;
     }
 
     update() {
-        this.memory = this.inst.exports.memory;
         this.mem8 = new Uint8Array(this.memory.buffer);
         this.mem32 = new Uint32Array(this.memory.buffer);
     }
 
     fd_seek(fd, offset_low, offset_high, whence, newOffset) {
-        this.update();
         this.abort("unexpected fd_seek call");
     }
 
     clock_time_get(id, precision, time) {
+        this.update();
         const buffer = new DataView(this.memory.buffer);
         if (id === 0 /* CLOCKID_REALTIME */) {
             buffer.setBigUint64(
@@ -64,19 +72,18 @@ class MiniWASI {
 
     fd_write(fd, iov, iovcnt, pnum) {
         this.update();
-        let buffer;
-        let logger;
+        let buffer, output;
         switch (fd) {
         case 1:
             buffer = this.stdout;
-            logger = console.debug;
+            output = console.log;
             break;
         case 2: // redirect to stdout...
             buffer = this.stdout;
-            logger = console.debug;
+            output = console.error;
             break;
         default:
-            return 0;
+            return 8; // EBADF
         }
         let num = 0;
         for (let i = 0; i < iovcnt; i++) {
@@ -88,7 +95,7 @@ class MiniWASI {
                     buffer.push(byte)
                 else if (byte == 10) {
                     let uint8 = new Uint8Array(buffer);
-                    console.log("WASM: %s", this.utf8array_to_string(uint8, 0, buffer.length));
+                    output("WASM: %s", this.utf8array_to_string(uint8, 0, buffer.length));
                     buffer.length = 0;
                 }
             }
@@ -99,10 +106,7 @@ class MiniWASI {
     }
 
     utf8array_to_string(bytes, idx, count) {
-        let limit = idx + count;
-        let ptr = idx;
-        while (bytes[ptr] && ptr < limit) ptr++;
-        return new TextDecoder().decode(bytes.subarray(idx, ptr));
+        return new TextDecoder().decode(bytes.subarray(idx, idx + count));
     }
 
     fd_close(fd) {
@@ -115,14 +119,39 @@ class MiniWASI {
         this.abort("unexpected fd_fdstat_get call");
     }
 
+    args_sizes_get(ptr_count, ptr_sizes) {
+        this.update();
+        this.mem32[ptr_count >> 2] = 0;
+        this.mem32[ptr_sizes >> 2] = 0;
+        return 0;
+    }
+
+    args_get(ptr_argv, ptr_argv_buf) {
+        return 0;
+    }
+
+    fd_prestat_get(fd, buf) {
+        return 8; // EBADF
+    }
+
+    fd_prestat_dir_name(fd, path, path_len) {
+        return 8; // EBADF
+    }
+
+    fd_read(fd, iov, iovcnt, pnum) {
+        this.update();
+        this.mem32[pnum >> 2] = 0;
+        return 0;
+    }
+
     environ_sizes_get(ptr_count, ptr_sizes) {
         this.update();
         this.mem32[ptr_count >> 2] = 0;
+        this.mem32[ptr_sizes >> 2] = 0;
         return 0;
     }
 
     environ_get(ptr_environ, ptr_environ_buf) {
-        this.update();
         return 0;
     }
 
@@ -140,8 +169,7 @@ class MiniWASI {
     }
 
     proc_exit(code) {
-        this.update();
-        console.log("exit(" + code + ")")
+        throw new ProcExit(code);
     }
 
     abort(msg) {
@@ -152,4 +180,11 @@ class MiniWASI {
     }
 }
 
-export { MiniWASI }
+class ProcExit extends Error {
+    constructor(code) {
+        super("proc_exit(" + code + ")");
+        this.code = code;
+    }
+}
+
+export { MiniWASI, ProcExit }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix_labs/hub-client",
-  "version": "2.3346.0-dev",
+  "version": "2.3348.0-dev",
   "description": "talk to the Hub web worker",
   "main": "node.js",
   "browser": "index.js",