@bytecodealliance/preview2-shim 0.0.16 → 0.0.17

package/lib/browser/filesystem.js

@@ -1,6 +1,8 @@
-import { createStream, getStream, dropStream } from './io.js';
+import { _io } from './io.js';
 import { environment } from './cli.js';
 
+const { createStream, getStream, dropStream } = _io;
+
 let _preopens = [[3, '/']], _rootPreopen = _preopens[0];
 
 export function _setPreopens (preopens) {
@@ -338,4 +340,4 @@ export const types = {
   }
 };
 
-export { types as filesystemTypes }
+export { types as filesystemTypes }

package/lib/browser/index.js

@@ -8,7 +8,7 @@ import * as random from "./random.js";
 import * as sockets from "./sockets.js";
 import * as cli from "./cli.js";
 
-export const importObject = {
+export {
   clocks,
   filesystem,
   http,
@@ -18,8 +18,6 @@ export const importObject = {
   random,
   sockets,
   cli,
-};
+}
 
 export { WasiHttp } from "../http/wasi-http.js";
-
-export default importObject;

package/lib/browser/io.js

@@ -1,5 +1,7 @@
+import { Io } from '../common/io.js';
+
 // buffer until the next newline
-class NewlineBufferStream {
+export class NewlineBufferStream {
   constructor (handler) {
     this.bufferLen = 0;
     this.bufferCapacity = 1024;
@@ -29,102 +31,9 @@ class NewlineBufferStream {
   }
 }
 
-class IgnoreStream {
-  read () {
-    return [new Uint8Array([]), 'ended'];
-  }
-  write () {}
-}
-
-export function createStream (stream) {
-  streamEntries[streamCnt] = stream;
-  return streamCnt++;
-}
-
-export function getStream (sid) {
-  const stream = streamEntries[sid];
-  if (!stream) throw new Error();
-  return stream;
-}
-
-export function dropStream (sid) {
-  delete streamEntries[sid];
-}
+export const _io = new Io(
+  new NewlineBufferStream(console.log.bind(console)),
+  new NewlineBufferStream(console.error.bind(console))
+);
 
-let streamCnt = 3;
-const streamEntries = {
-  0: new IgnoreStream(),
-  1: new NewlineBufferStream(console.log.bind(console)),
-  2: new NewlineBufferStream(console.error.bind(console)),
-};
-
-export function _setStdout (stdout) {
-  streamEntries[1] = stdout;
-}
-
-export function _setStderr (stderr) {
-  streamEntries[2] = stderr;
-}
-
-export function _setStdin (stdin) {
-  streamEntries[0] = stdin;
-}
-
-export const streams = {
-  read(s, len) {
-    return getStream(s).read(len);
-  },
-  blockingRead(s, len) {
-    return getStream(s).read(len);
-  },
-  skip(s, _len) {
-    console.log(`[streams] Skip ${s}`);
-  },
-  blockingSkip(s, _len) {
-    console.log(`[streams] Blocking skip ${s}`);
-  },
-  subscribeToInputStream(s) {
-    console.log(`[streams] Subscribe to input stream ${s}`);
-  },
-  dropInputStream(s) {
-    console.log(`[streams] Drop input stream ${s}`);
-  },
-  checkWrite(_s) {
-    // TODO: implement
-    return 1000000n;
-  },
-  write(s, buf) {
-    getStream(s).write(buf);
-  },
-  blockingWriteAndFlush(s, buf) {
-    // TODO: implement
-    return streams.write(s, buf);
-  },
-  flush(s) {
-    return streams.blockingFlush(s);
-  },
-  blockingFlush(_s) {
-    // TODO: implement
-  },
-  writeZeroes(s, _len) {
-    console.log(`[streams] Write zeroes ${s}`);
-  },
-  blockingWriteZeroes(s, _len) {
-    console.log(`[streams] Blocking write zeroes ${s}`);
-  },
-  splice(s, _src, _len) {
-    console.log(`[streams] Splice ${s}`);
-  },
-  blockingSplice(s, _src, _len) {
-    console.log(`[streams] Blocking splice ${s}`);
-  },
-  forward(s, _src) {
-    console.log(`[streams] Forward ${s}`);
-  },
-  subscribeToOutputStream(s) {
-    console.log(`[streams] Subscribe to output stream ${s}`);
-  },
-  dropOutputStream(s) {
-    console.log(`[streams] Drop output stream ${s}`);
-  }
-};
+export const streams = _io.streams;

package/lib/common/io.js

@@ -0,0 +1,119 @@
+export class IgnoreStream {
+  read (_len) {
+    return [new Uint8Array([]), 'ended'];
+  }
+  write (_bytes) {
+  }
+}
+
+/**
+ * @typedef {{ read: (len: number) => [Uint8Array, 'open' | 'ended'], drop?: () => {} }} ReadableStream
+ * @typedef {{ write: (buf: Uint8Array) {}, drop?: () => {}, flush?: () => {}, check?: () => BigInt }} WriteableStream
+ */
+
+// NOTE: pending asyncify work, all stream methods are synchronous and blocking
+export class Io {
+  constructor (
+    stdout = new IgnoreStream(),
+    stderr = new IgnoreStream(),
+    stdin = new IgnoreStream()
+  ) {
+    this.streamCnt = 3;
+    this.streamEntries = {
+      0: stdin,
+      1: stdout,
+      2: stderr
+    }
+
+    const io = this;
+    this.streams = {
+      read(s, len) {
+        return io.getStream(s).read(len);
+      },
+      blockingRead(s, len) {
+        return io.getStream(s).read(len);
+      },
+      skip(s, _len) {
+        console.log(`[streams] Skip ${s}`);
+      },
+      blockingSkip(s, _len) {
+        console.log(`[streams] Blocking skip ${s}`);
+      },
+      subscribeToInputStream(s) {
+        console.log(`[streams] Subscribe to input stream ${s}`);
+      },
+      dropInputStream(s) {
+        io.dropStream(s);
+      },
+      checkWrite(s) {
+        return io.getStream(s).check() || 1000_000n;
+      },
+      write(s, buf) {
+        io.getStream(s).write(buf);
+      },
+      blockingWriteAndFlush(s, buf) {
+        const stream = io.getStream(s);
+        stream.write(buf);
+        if (stream.flush)
+          stream.flush();
+      },
+      flush(s) {
+        const stream = io.getStream(s);
+        if (stream.flush)
+          stream.flush();
+      },
+      blockingFlush(s) {
+        const stream = io.getStream(s);
+        if (stream.flush)
+          stream.flush();
+      },
+      writeZeroes(s, _len) {
+        console.log(`[streams] Write zeroes ${s}`);
+      },
+      blockingWriteZeroes(s, _len) {
+        console.log(`[streams] Blocking write zeroes ${s}`);
+      },
+      splice(s, _src, _len) {
+        console.log(`[streams] Splice ${s}`);
+      },
+      blockingSplice(s, _src, _len) {
+        console.log(`[streams] Blocking splice ${s}`);
+      },
+      forward(s, _src) {
+        console.log(`[streams] Forward ${s}`);
+      },
+      subscribeToOutputStream(s) {
+        console.log(`[streams] Subscribe to output stream ${s}`);
+      },
+      dropOutputStream(s) {
+        io.dropStream(s);
+      }
+    };
+  }
+
+  /**
+   * 
+   * @param {ReadableStream | WriteableStream} stream 
+   * @returns {number}
+   */
+  createStream (stream) {
+    this.streamEntries[this.streamCnt] = stream;
+    return this.streamCnt++;
+  }
+  
+  /**
+   * @param {number} sid 
+   * @returns {ReadableStream | WriteableStream}
+   */
+  getStream (sid) {
+    const stream = this.streamEntries[sid];
+    if (!stream) throw new Error();
+    return stream;
+  }
+
+  dropStream (sid) {
+    const stream = this.streamEntries[sid];
+    if (stream.drop) stream.drop();
+    delete this.streamEntries[sid];
+  }
+}