@bytecodealliance/preview2-shim 0.0.10 → 0.0.11

package/lib/browser/clocks.js

@@ -1,5 +1,6 @@
 function _hrtimeBigint () {
-  return BigInt(Math.floor(performance.now() * 1e9));
+  // performance.now() is in milliseconds, but we want nanoseconds
+  return BigInt(Math.floor(performance.now() * 1e6));
 }
 
 let _hrStart = _hrtimeBigint();
@@ -33,8 +34,9 @@ export const timezone = {
 
 export const wallClock = {
   now() {
-    const seconds = BigInt(Math.floor(Date.now() / 1e3));
-    const nanoseconds = (Date.now() % 1e3) * 1e6;
+    let now = Date.now(); // in milliseconds
+    const seconds = BigInt(Math.floor(now / 1e3));
+    const nanoseconds = (now % 1e3) * 1e6;
     return { seconds, nanoseconds };
   },
 

package/lib/browser/io.js

@@ -18,26 +18,24 @@ export const streams = {
     console.log(`[streams] Drop input stream ${s}`);
   },
   write(s, buf) {
+    streams.blockingWrite(s, buf);
+  },
+  blockingWrite(s, buf) {
     switch (s) {
       case 0:
         throw new Error(`TODO: write stdin`);
       case 1: {
-        const decoder = new TextDecoder();
-        console.log(decoder.decode(buf));
-        return BigInt(buf.byteLength);
+        process.stdout.write(buf);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       case 2: {
-        const decoder = new TextDecoder();
-        console.error(decoder.decode(buf));
-        return BigInt(buf.byteLength);
+        process.stderr.write(buf);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       default:
         throw new Error(`TODO: write ${s}`);
     }
   },
-  blockingWrite(s, _buf) {
-    console.log(`[streams] Blocking write ${s}`);
-  },
   writeZeroes(s, _len) {
     console.log(`[streams] Write zeroes ${s}`);
   },

package/lib/nodejs/io.js

@@ -71,33 +71,28 @@ export function _dropFsStream(stream) {
 
 export const streams = {
   read(s, len) {
-    switch (s) {
-      case 0:
-        return [process.stdin.read(len), true];
-      default:
-        throw new Error(`TODO: write ${s}`);
-    }
+    return streams.blockingRead(s, len);
   },
   blockingRead(s, len) {
     len = Number(len);
     const stream = _streams[s];
-    if (!stream) throw null;
-    switch (stream.type) {
+    switch (stream?.type) {
       case 'file': {
         const buf = Buffer.alloc(Number(len));
         try {
           const readBytes = fsReadSync(stream.fd, buf, 0, Number(len));
-          if (readBytes < Number(len))
-            return [new Uint8Array(), true];
-          return [new Uint8Array(buf.buffer, 0, readBytes), false];
+          if (readBytes < Number(len)) {
+            return [new Uint8Array(buf.buffer, 0, readBytes), 'ended'];
+          }
+          return [new Uint8Array(buf.buffer, 0, readBytes), 'open'];
         }
         catch (e) {
           _convertFsError(e);
         }
         break;
       }
-      default: throw null;
     }
+    throw null;
   },
   skip(s, _len) {
     console.log(`[streams] Skip ${s}`);
@@ -112,24 +107,24 @@ export const streams = {
     delete _streams[s];
   },
   write(s, buf) {
+    return streams.blockingWrite(s, buf);
+  },
+  blockingWrite(s, buf) {
     switch (s) {
       case 0:
         throw new Error(`TODO: write stdin`);
       case 1: {
         process.stdout.write(buf);
-        return BigInt(buf.byteLength);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       case 2: {
         process.stderr.write(buf);
-        return BigInt(buf.byteLength);
+        return [BigInt(buf.byteLength), 'ended'];
       }
       default:
         throw new Error(`TODO: write ${s}`);
     }
   },
-  blockingWrite(s, _buf) {
-    console.log(`[streams] Blocking write ${s}`);
-  },
   writeZeroes(s, _len) {
     console.log(`[streams] Write zeroes ${s}`);
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "WASI Preview2 shim for JS environments",
   "author": "Guy Bedford, Eduardo Rodrigues<16357187+eduardomourar@users.noreply.github.com>",
   "type": "module",