@bytecodealliance/preview2-shim 0.0.4 → 0.0.6

package/README.md

@@ -6,26 +6,16 @@ Currently supports Node.js and browser versions, but alternative implementations
 
 ## Implementation Status
 
-| Interface       | Node.js               |Browser               |
-| --------------- | ---------------------:|---------------------:|
-| Command         | :x:                   | :x:                  |
-| Default Clocks  | :heavy_check_mark:    | :heavy_check_mark:   |
-| DNS             | :x:                   | :x:                  |
-| Environment     | :x:                   | :x:                  |
-| Exit            | :heavy_check_mark:    | :heavy_check_mark:   |
-| Filesystem      | :x:                   | :x:                  |
-| Http            | Experimental          | Experimental         |
-| IO              | Partial               | Partial              |
-| IP              | :x:                   | :x:                  |
-| Logging         | :heavy_check_mark:    | :heavy_check_mark:   |
-| Monotonic Clock | Missing `resolution`  | Missing `resolution` |
-| Net             | :x:                   | :x:                  |
-| Poll            | :x:                   | :x:                  |
-| Random          | :heavy_check_mark:    | :heavy_check_mark:   |
-| Stderr          | :heavy_check_mark:    | :heavy_check_mark:   |
-| TCP             | :x:                   | :x:                  |
-| Timezone        | :x:                   | :x:                  |
-| Wall Clock      | Missing `resolution`  | Missing `resolution` |
+| Interface       | Node.js                      | Browser                      |
+| --------------- | ----------------------------:|-----------------------------:|
+| Clocks          | Pending timezone, resolution | Pending timezone, resolution |
+| Filesystem      | :x:                          | :x:                          |
+| HTTP            | :x:                          | :x:                          |
+| IO              | :x:                          | :x:                          |
+| Logging         | :heavy_check_mark:           | :heavy_check_mark:           |
+| Poll            | :x:                          | :x:                          |
+| Random          | :heavy_check_mark:           | :heavy_check_mark:           |
+| Sockets         | :x:                          | :x:                          |
 
 # License
 

package/lib/browser/environment-preopens.js

@@ -0,0 +1,4 @@
+// TODO: remove
+export function preopens () {
+  return [];
+}

package/lib/browser/filesystem.js

@@ -1,51 +1,150 @@
-export function flags(fd) {
+// export interface DescriptorStat {
+//   dev: Device,
+//   ino: Inode,
+//   type: DescriptorType,
+//   nlink: Linkcount,
+//   size: Filesize,
+//   atim: Timestamp,
+//   mtim: Timestamp,
+//   ctim: Timestamp,
+// }
+
+export function readViaStream(fd, offset) {
+  console.log(`[filesystem] READ STREAM ${fd} ${offset}`);
+}
+
+export function writeViaStream(fd, offset) {
+  console.log(`[filesystem] WRITE STREAM ${fd} ${offset}`);
+}
+
+export function appendViaStream(fd) {
+  console.log(`[filesystem] APPEND STREAM ${fd}`);
+}
+
+export function advise(fd, offset, length, advice) {
+  console.log(`[filesystem] ADVISE`, fd, offset, length, advice);
+}
+
+export function syncData(fd) {
+  console.log(`[filesystem] SYNC DATA ${fd}`);
+}
+
+export function getFlags(fd) {
   console.log(`[filesystem] FLAGS FOR ${fd}`);
 }
 
+export function getType(fd) {
+  console.log(`[filesystem] GET TYPE ${fd}`);
+}
+
 export function setFlags(fd, flags) {
   console.log(`[filesystem] SET FLAGS ${fd} ${JSON.stringify(flags)}`);
 }
 
-export function dropDescriptor(fd) {
-  console.log(`[filesystem] CLOSE: ${fd}`);
+export function setSize(fd, size) {
+  console.log(`[filesystem] SET SIZE`, fd, size);
 }
 
-export function removeDirectoryAt(fd, path) {
-  console.log(`[filesystem] RM DIR: ${fd} ${path}`);
+export function setTimes(fd, dataAccessTimestamp, dataModificationTimestamp) {
+  console.log(`[filesystem] SET TIMES`, fd, dataAccessTimestamp, dataModificationTimestamp);
 }
 
-export function unlinkFileAt(fd, path) {
-  console.log(`[filesystem] UNLINK: ${fd} ${path}`);
+export function read(fd, length, offset) {
+  console.log(`[filesystem] READ`, fd, length, offset);
 }
 
-export function writeViaStream(fd, offset) {
-  console.log(`[filesystem] WRITE STREAM ${fd} ${offset}`);
+export function write(fd, buffer, offset) {
+  console.log(`[filesystem] WRITE`, fd, buffer, offset);
 }
 
-export function appendViaStream(fd, offset) {
-  console.log(`[filesystem] APPEND STREAM ${fd} ${offset}`);
+export function readDirectory(fd) {
+  console.log(`[filesystem] READ DIR`, fd);
 }
 
-export function readViaStream(fd, offset) {
-  console.log(`[filesystem] READ STREAM ${fd} ${offset}`);
+export function sync(fd) {
+  console.log(`[filesystem] SYNC`, fd);
 }
 
-export function openAt(fd, atFlags, path, offset) {
-  console.log(`[filesystem] OPEN AT ${fd}`, atFlags, path, offset);
+export function createDirectoryAt(fd, path) {
+  console.log(`[filesystem] CREATE DIRECTORY`, fd, path);
 }
 
 export function stat(fd) {
-  console.log(`[filesystem] STAT: ${fd}`);
+  console.log(`[filesystem] STAT`, fd);
+}
+
+export function statAt(fd, pathFlags, path) {
+  console.log(`[filesystem] STAT`, fd, pathFlags, path);
+}
+
+export function setTimesAt(fd) {
+  console.log(`[filesystem] SET TIMES AT`, fd);
+}
+
+export function linkAt(fd) {
+  console.log(`[filesystem] LINK AT`, fd);
 }
 
-export function todoType(fd) {
-  console.log(`[filesystem] TODO TYPE: ${fd}`);
+export function openAt(fd) {
+  console.log(`[filesystem] OPEN AT`, fd);
+}
+
+export function readlinkAt(fd) {
+  console.log(`[filesystem] READLINK AT`, fd);
+}
+
+export function removeDirectoryAt(fd) {
+  console.log(`[filesystem] REMOVE DIR AT`, fd);
+}
+
+export function renameAt(fd) {
+  console.log(`[filesystem] RENAME AT`, fd);
+}
+
+export function symlinkAt(fd) {
+  console.log(`[filesystem] SYMLINK AT`, fd);
+}
+
+export function unlinkFileAt(fd) {
+  console.log(`[filesystem] UNLINK FILE AT`, fd);
+}
+
+export function changeFilePermissionsAt(fd) {
+  console.log(`[filesystem] CHANGE FILE PERMISSIONS AT`, fd);
+}
+
+export function changeDirectoryPermissionsAt(fd) {
+  console.log(`[filesystem] CHANGE DIR PERMISSIONS AT`, fd);
+}
+
+export function lockShared(fd) {
+  console.log(`[filesystem] LOCK SHARED`, fd);
+}
+
+export function lockExclusive(fd) {
+  console.log(`[filesystem] LOCK EXCLUSIVE`, fd);
+}
+
+export function tryLockShared(fd) {
+  console.log(`[filesystem] TRY LOCK SHARED`, fd);
+}
+
+export function tryLockExclusive(fd) {
+  console.log(`[filesystem] TRY LOCK EXCLUSIVE`, fd);
+}
+
+export function unlock(fd) {
+  console.log(`[filesystem] UNLOCK`, fd);
+}
+
+export function dropDescriptor(fd) {
+  console.log(`[filesystem] DROP DESCRIPTOR`, fd);
 }
 
-export function dropDirEntryStream(s) {
-  console.log(`[filesystem] CLOSE DIR ENTRY STREAM: ${s}`);
+export function readDirectoryEntry(stream) {
+  console.log(`[filesystem] READ DIRECTRY ENTRY`, stream);
 }
 
-export function getPreopens () {
-  console.log(`[filesystem] GET PREOPENS`);
+export function dropDirectoryEntryStream(stream) {
+  console.log(`[filesystem] DROP DIRECTORY ENTRY`, stream);
 }

package/lib/browser/http.js

@@ -9,19 +9,24 @@ export function send(req) {
   try {
     const xhr = new XMLHttpRequest();
     xhr.open(req.method.toString(), req.uri, false);
-    for (let [name, value] of req.headers) {
-      if (name !== "user-agent") {
+    const requestHeaders = new Headers(req.headers);
+    for (let [name, value] of requestHeaders.entries()) {
+      if (name !== "user-agent" && name !== "host") {
         xhr.setRequestHeader(name, value);
       }
     }
-    xhr.send(req.body.length > 0 ? req.body : null);
+    xhr.send(req.body && req.body.length > 0 ? req.body : null);
     const body = xhr.response ? new TextEncoder().encode(xhr.response) : undefined;
+    const headers = [];
+    xhr.getAllResponseHeaders().trim().split(/[\r\n]+/).forEach((line) => {
+      var parts = line.split(': ');
+      var key = parts.shift();
+      var value = parts.join(': ');
+      headers.push([key, value]);
+    });
     return {
       status: xhr.status,
-      headers: xhr
-        .getAllResponseHeaders()
-        .trim()
-        .split(/[\r\n]+/),
+      headers,
       body,
     };
   } catch (err) {

package/lib/browser/index.js

@@ -1,35 +1,33 @@
-import * as defaultClocks from "./default-clocks.js";
+import * as logging from "./logging.js";
 import * as defaultOutgoingHttp from "./default-outgoing-HTTP.js";
 import * as environment from "./environment.js";
 import * as exit from "./exit.js";
 import * as filesystem from "./filesystem.js";
 import * as http from "./http.js";
-import * as io from "./io.js";
-import * as logging from "./console.js";
 import * as monotonicClock from "./monotonic-clock.js";
 import * as poll from "./poll.js";
+import * as preopens from "./preopens.js";
 import * as random from "./random.js";
-import * as stderr from "./stderr.js";
 import * as streams from "./streams.js";
 import * as types from "./types.js";
 import * as wallClock from "./wall-clock.js";
 
 export const importObject = {
-    "default-clocks": defaultClocks,
     "default-outgoing-HTTP": defaultOutgoingHttp,
     "environment": environment,
     "exit": exit,
     "filesystem": filesystem,
     "http": http,
-    "io": io,
     "logging": logging,
     "monotonic-clock": monotonicClock,
     "poll": poll,
+    "preopens": preopens,
     "random": random,
-    "stderr": stderr,
     "streams": streams,
     "types": types,
     "wall-clock": wallClock,
 };
 
+export { WasiHttp } from "../http/wasi-http.js";
+
 export default importObject;

package/lib/browser/instance-monotonic-clock.js

@@ -0,0 +1,4 @@
+// TODO: remove
+export function instanceMonotonicClock() {
+  return 0;
+}

package/lib/browser/instance-wall-clock.js

@@ -0,0 +1,4 @@
+// TODO: remove
+export function instanceWallClock() {
+  return 1;
+}

package/lib/browser/io.js

@@ -1,17 +1,9 @@
-export function dropInputStream(f) {
-  console.log(`[io] Drop input stream ${f}`);
+export function read(s, len) {
+  console.log(`[io] Read ${s} ${len}`);
 }
 
-export function dropOutputStream(f) {
-  console.log(`[io] Drop output stream ${f}`);
-}
-
-export function read(src, len) {
-  console.log(`[io] Read ${src} ${len}`);
-}
-
-export function write(dst, buf) {
-  switch (dst) {
+export function write(s, buf) {
+  switch (s) {
     case 0:
       throw new Error(`TODO: write stdin`);
     case 1: {
@@ -19,17 +11,12 @@ export function write(dst, buf) {
       console.log(decoder.decode(buf));
       return BigInt(buf.byteLength);
     }
-    case 2:
-      throw new Error(`TODO: write stdout`);
+    case 2: {
+      const decoder = new TextDecoder();
+      console.error(decoder.decode(buf));
+      return BigInt(buf.byteLength);
+    }
     default:
-      throw new Error(`TODO: write ${dst}`);
+      throw new Error(`TODO: write ${s}`);
   }
 }
-
-export function skip(src, len) {
-  console.log(`[io] Skip ${src}`, len);
-}
-
-export function write_repeated(dst, byte, len) {
-  console.log(`[io] Write repeated ${dst}`, byte, len);
-}

package/lib/browser/monotonic-clock.js

@@ -1,6 +1,6 @@
 
 export function resolution(clock) {
-  console.log(`[clocks] Monotonic clock resolution ${clock}`);
+  console.log(`[monotonic-clock] Monotonic clock resolution ${clock}`);
 }
 
 let hrStart = hrtimeBigint();
@@ -9,7 +9,7 @@ export function now(clock) {
   if (clock === 0) {
     return hrtimeBigint() - hrStart;
   }
-  console.log("UNKNOWN CLOCK");
+  console.log(`[monotonic clock] Unknown clock ${clock}`);
 }
 
 function hrtime(previousTimestamp) {

package/lib/browser/preopens.js

@@ -0,0 +1,11 @@
+export function getStdio () {
+  return {
+    stdin: 0,
+    stdout: 1,
+    stderr: 2,
+  };
+}
+
+export function getDirectories () {
+  return [];
+}

package/lib/browser/random.js

@@ -1,7 +1,7 @@
 const MAX_BYTES = 65536;
 
 export function getRandomBytes(len) {
-  const bytes = new Uint8Array(len);
+  const bytes = new Uint8Array(Number(len));
 
   if (len > MAX_BYTES) {
     // this is the max bytes crypto.getRandomValues
@@ -17,3 +17,16 @@ export function getRandomBytes(len) {
 
   return bytes;
 }
+
+export function getRandomU64 () {
+  return crypto.getRandomValues(new BigUint64Array(1))[0];
+}
+
+let insecureRandomValue1, insecureRandomValue2;
+export function insecureRandom () {
+  if (insecureRandomValue1 === undefined) {
+    insecureRandomValue1 = getRandomU64();
+    insecureRandomValue2 = getRandomU64();
+  }
+  return [insecureRandomValue1, insecureRandomValue2];
+}

package/lib/browser/stderr.js

@@ -1,3 +1,4 @@
+// TODO: remove
 export function print(message) {
   console.error(message);
 }

package/lib/browser/streams.js

@@ -16,8 +16,23 @@ export function subscribeToInputStream(s) {
 export function dropInputStream(s) {
   console.log(`[streams] Drop input stream ${s}`);
 }
-export function write(s, _buf) {
-  console.log(`[streams] Write ${s}`);
+export function write(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);
+    }
+    case 2: {
+      const decoder = new TextDecoder();
+      console.error(decoder.decode(buf));
+      return BigInt(buf.byteLength);
+    }
+    default:
+      throw new Error(`TODO: write ${s}`);
+  }
 }
 export function blockingWrite(s, _buf) {
   console.log(`[streams] Blocking write ${s}`);

package/lib/browser/timezone.js

@@ -0,0 +1,12 @@
+export function display (timezone, when) {
+  console.log(`[timezone] DISPLAY ${timezone} ${when}`);
+}
+
+export function utcOffset (timezone, when) {
+  console.log(`[timezone] UTC OFFSET ${timezone} ${when}`);
+  return 0;
+}
+
+export function dropTimezone (timezone) {
+  console.log(`[timezone] DROP ${timezone}`);
+}

package/lib/browser/wall-clock.js

@@ -4,9 +4,9 @@ export function now(clock) {
     const nanoseconds = (Date.now() % 1000) * 1000 * 1000;
     return { seconds, nanoseconds };
   }
-  console.log("[clocks] UNKNOWN CLOCK");
+  console.log(`[wall-clock] Unknown clock ${clock}`);
 }
 
 export function resolution(clock) {
-  console.log(`[clocks] Wall clock resolution ${clock}`);
+  console.log(`[wall-clock] Wall clock resolution ${clock}`);
 }

package/lib/http/make-request.js

@@ -10,12 +10,12 @@ async function makeRequest(req) {
     const resp = await fetch(req.uri, {
       method: req.method.toString(),
       headers,
-      body: req.body.length > 0 ? req.body : undefined,
+      body: req.body && req.body.length > 0 ? req.body : undefined,
     });
     let arrayBuffer = await resp.arrayBuffer();
     return JSON.stringify({
       status: resp.status,
-      headers: resp.headers,
+      headers: Array.from(resp.headers.entries()),
       body:
         arrayBuffer.byteLength > 0
           ? Buffer.from(arrayBuffer).toString("base64")