@bytecodealliance/preview2-shim 0.0.5 → 0.0.7

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/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/index.js

@@ -1,40 +1,28 @@
-import * as console from "./console.js";
+import * as logging from "./logging.js";
 import * as defaultOutgoingHttp from "./default-outgoing-HTTP.js";
 import * as environment from "./environment.js";
-import * as environmentPreopens from "./environment-preopens.js";
 import * as exit from "./exit.js";
 import * as filesystem from "./filesystem.js";
 import * as http from "./http.js";
-import * as instanceMonotonicClock from "./instance-monotonic-clock.js";
-import * as instanceWallClock from "./instance-wall-clock.js";
-import * as io from "./io.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 = {
-    "console": console,
     "default-outgoing-HTTP": defaultOutgoingHttp,
     "environment": environment,
-    "environment-preopens": environmentPreopens,
     "exit": exit,
     "filesystem": filesystem,
     "http": http,
-    "instance-monotonic-clock": instanceMonotonicClock,
-    "instance-wall-clock": instanceWallClock,
-    "io": io,
+    "logging": logging,
     "monotonic-clock": monotonicClock,
     "poll": poll,
     "preopens": preopens,
     "random": random,
-    "stderr": stderr,
     "streams": streams,
-    "types": types,
     "wall-clock": wallClock,
 };
 

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/random.js

@@ -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/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/wasi-http.js

@@ -10,22 +10,26 @@
  * @typedef {import("../../types/imports/types").Method} Method
  * @typedef {import("../../types/imports/types").OutgoingRequest} OutgoingRequest
  * @typedef {import("../../types/imports/types").RequestOptions} RequestOptions
+ * @typedef {import("../../types/imports/types").Result} Result
  * @typedef {import("../../types/imports/types").Scheme} Scheme
  * @typedef {import("../../types/imports/types").StatusCode} StatusCode
- */
+*/
 
 import * as io from '@bytecodealliance/preview2-shim/io';
 import * as http from '@bytecodealliance/preview2-shim/http';
+import { UnexpectedError } from './error.js';
 
 export class WasiHttp {
   requestIdBase = 1;
   responseIdBase = 1;
   fieldsIdBase = 1;
-  streamsIdBase = 3;
+  streamIdBase = 3;
+  futureIdBase = 1;
   /** @type {Map<number,ActiveRequest>} */ requests = new Map();
   /** @type {Map<number,ActiveResponse>} */ responses = new Map();
   /** @type {Map<number,Map<string,string[]>>} */ fields = new Map();
   /** @type {Map<number,Uint8Array>} */ streams = new Map();
+  /** @type {Map<number,ActiveFuture>} */ futures = new Map();
 
   constructor() {}
 
@@ -34,11 +38,7 @@ export class WasiHttp {
    * @param {RequestOptions | null} options
    * @returns {FutureIncomingResponse}
    */
-  handle = (requestId, {
-    connectTimeoutMs: _connectTimeoutMs = 600_000,
-    firstByteTimeoutMs: _firstByteTimeoutMs = 600_000,
-    betweenBytesTimeoutMs: _betweenBytesTimeoutMs = 600_000
-  } = {}) => {
+  handle = (requestId, _options) => {
     const request = this.requests.get(requestId);
     if (!request) throw Error("not found!");
 
@@ -70,11 +70,16 @@ export class WasiHttp {
       response.responseHeaders.set(key, [value]);
     }
     const buf = res.body;
-    response.body = this.streamsIdBase;
-    this.streamsIdBase = this.streamsIdBase + 1;
+    response.body = this.streamIdBase;
+    this.streamIdBase += 1;
     this.streams.set(response.body, buf);
     this.responses.set(responseId, response);
-    return responseId;
+
+    const futureId = this.futureIdBase;
+    this.futureIdBase += 1;
+    const future = new ActiveFuture(futureId, responseId);
+    this.futures.set(futureId, future);
+    return futureId;
   }
 
   /**
@@ -146,6 +151,13 @@ export class WasiHttp {
     s.set([]);
   }
 
+  /**
+   * @param {Fields} fields
+   */
+  dropFields = (fields) => {
+    this.fields.delete(fields);
+  }
+
   /**
    * @param {[string, string][]} entries
    * @returns {Fields}
@@ -154,7 +166,7 @@ export class WasiHttp {
     const map = new Map(entries);
 
     const id = this.fieldsIdBase;
-    this.fieldsIdBase = id + 1;
+    this.fieldsIdBase += 1;
     this.fields.set(id, map);
 
     return id;
@@ -198,6 +210,17 @@ export class WasiHttp {
     this.requests.set(id, req);
     return id;
   }
+
+  /**
+   * @param {OutgoingRequest} request
+   * @returns {OutgoingStream}
+   */
+  outgoingRequestWrite = (request) => {
+    const req = this.requests.get(request);
+    req.body = this.streamIdBase;
+    this.streamIdBase += 1;
+    return req.body;
+  }
   
   /**
    * @param {IncomingResponse} response
@@ -222,7 +245,7 @@ export class WasiHttp {
   incomingResponseHeaders = (response) => {
     const r = this.responses.get(response);
     const id = this.fieldsIdBase;
-    this.fieldsIdBase = this.fieldsIdBase + 1;
+    this.fieldsIdBase += 1;
 
     this.fields.set(id, r.responseHeaders);
     return id;
@@ -236,6 +259,41 @@ export class WasiHttp {
     const r = this.responses.get(response);
     return r.body;
   }
+
+  /**
+   * @param {FutureIncomingResponse} future
+   */
+  dropFutureIncomingResponse = (future) => {
+    return this.futures.delete(future);
+  }
+
+  /**
+   * @param {FutureIncomingResponse} future
+   * @returns {Result<IncomingResponse, Error> | null}
+   */
+  futureIncomingResponseGet = (future) => {
+    const f = this.futures.get(future);
+    if (!f) {
+      return {
+        tag: "err",
+        val: UnexpectedError(`no such future ${f}`),
+      };
+    }
+    // For now this will assume the future will return
+    // the response immediately
+    const response = f.responseId;
+    const r = this.responses.get(response);
+    if (!r) {
+      return {
+        tag: "err",
+        val: UnexpectedError(`no such response ${response}`),
+      };
+    }
+    return {
+      tag: "ok",
+      val: response,
+    };
+  }
 }
 
 class ActiveRequest {
@@ -265,3 +323,13 @@ class ActiveResponse {
     this.id = id;
   }
 }
+
+class ActiveFuture {
+  /** @type {number} */ id;
+  /** @type {number} */ responseId;
+
+  constructor(id, responseId) {
+    this.id = id;
+    this.responseId = responseId;
+  }
+}

package/lib/nodejs/filesystem.js

@@ -9,56 +9,142 @@
 //   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 getType(fd) {
-  console.log(`[filesystem] TODO TYPE: ${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 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 dropDirectoryEntryStream(s) {
-  console.log(`[filesystem] CLOSE DIR ENTRY STREAM ${s}`);
+export function readDirectoryEntry(stream) {
+  console.log(`[filesystem] READ DIRECTRY ENTRY`, stream);
 }
 
-// backwards compat
-export function getPreopens() {
-  return [];
+export function dropDirectoryEntryStream(stream) {
+  console.log(`[filesystem] DROP DIRECTORY ENTRY`, stream);
 }
-export { getFlags as flags, getType as todoType, dropDirectoryEntryStream as dropDirEntryStream }

package/lib/nodejs/index.js

@@ -1,40 +1,28 @@
-import * as console from "./console.js";
+import * as logging from "./logging.js";
 import * as defaultOutgoingHttp from "./default-outgoing-HTTP.js";
 import * as environment from "./environment.js";
-import * as environmentPreopens from "./environment-preopens.js";
 import * as exit from "./exit.js";
 import * as filesystem from "./filesystem.js";
 import * as http from "./http.js";
-import * as instanceMonotonicClock from "./instance-monotonic-clock.js";
-import * as instanceWallClock from "./instance-wall-clock.js";
-import * as io from "./io.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 = {
-    "console": console,
     "default-outgoing-HTTP": defaultOutgoingHttp,
     "environment": environment,
-    "environment-preopens": environmentPreopens,
     "exit": exit,
     "filesystem": filesystem,
     "http": http,
-    "instance-monotonic-clock": instanceMonotonicClock,
-    "instance-wall-clock": instanceWallClock,
-    "io": io,
+    "logging": logging,
     "monotonic-clock": monotonicClock,
     "poll": poll,
     "preopens": preopens,
     "random": random,
-    "stderr": stderr,
     "streams": streams,
-    "types": types,
     "wall-clock": wallClock,
 };
 

package/lib/nodejs/monotonic-clock.js

@@ -1,18 +1,14 @@
 import { hrtime } from "node:process";
 
-export function resolution(clock) {
-  console.log(`[clocks] Monotonic clock resolution ${clock}`);
+export function resolution() {
+  console.log(`[monotonic-clock] Monotonic clock resolution`);
 }
 
 let hrStart = hrtime.bigint();
-
-export function now(clock) {
-  if (clock === 0) {
-    return hrtime.bigint() - hrStart;
-  }
-  console.log("[clocks] UNKNOWN CLOCK");
+export function now() {
+  return hrtime.bigint() - hrStart;
 }
 
-export function instanceMonotonicClock () {
-  return 0;
+export function subscribe (_when, _absolute) {
+  console.log(`[monotonic-clock] Subscribe`);
 }

package/lib/nodejs/random.js

@@ -3,3 +3,16 @@ import { randomBytes } from "node:crypto";
 export function getRandomBytes(len) {
   return randomBytes(Number(len));
 }
+
+export function getRandomU64 () {
+  return new BigUint64Array(randomBytes(8).buffer)[0];
+}
+
+let insecureRandomValue1, insecureRandomValue2;
+export function insecureRandom () {
+  if (insecureRandomValue1 === undefined) {
+    insecureRandomValue1 = getRandomU64();
+    insecureRandomValue2 = getRandomU64();
+  }
+  return [insecureRandomValue1, insecureRandomValue2];
+}

package/lib/nodejs/stderr.js

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

package/lib/nodejs/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/nodejs/wall-clock.js

@@ -4,13 +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] now() UNKNOWN CLOCK ${clock}`);
 }
 
 export function resolution(clock) {
-  console.log(`[clocks] Wall clock resolution ${clock}`);
-}
-
-export function instanceWallClock () {
-  return 1;
+  console.log(`[wall-clock] Wall clock resolution ${clock}`);
 }

package/package.json

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

package/types/imports/environment.d.ts

@@ -1,3 +1,4 @@
 export namespace Environment {
   export function getEnvironment(): [string, string][];
+  export function getArguments(): string[];
 }

package/types/imports/monotonic-clock.d.ts

@@ -1,10 +1,8 @@
 export namespace MonotonicClock {
-  export function now(this: MonotonicClock): Instant;
-  export function resolution(this: MonotonicClock): Instant;
-  export function subscribe(this: MonotonicClock, when: Instant, absolute: boolean): Pollable;
-  export function dropMonotonicClock(this: MonotonicClock): void;
+  export function now(): Instant;
+  export function resolution(): Instant;
+  export function subscribe(when: Instant, absolute: boolean): Pollable;
 }
-export type MonotonicClock = number;
 export type Instant = bigint;
 import type { Pollable } from '../imports/poll';
 export { Pollable };

package/types/imports/wall-clock.d.ts

@@ -1,9 +1,7 @@
 export namespace WallClock {
-  export function now(this: WallClock): Datetime;
-  export function resolution(this: WallClock): Datetime;
-  export function dropWallClock(this: WallClock): void;
+  export function now(): Datetime;
+  export function resolution(): Datetime;
 }
-export type WallClock = number;
 export interface Datetime {
   seconds: bigint,
   nanoseconds: number,

package/types/wasi-reactor.d.ts

@@ -1,8 +1,6 @@
 import { WallClock as WallClockImports } from './imports/wall-clock';
 import { Poll as PollImports } from './imports/poll';
 import { MonotonicClock as MonotonicClockImports } from './imports/monotonic-clock';
-import { InstanceWallClock as InstanceWallClockImports } from './imports/instance-wall-clock';
-import { InstanceMonotonicClock as InstanceMonotonicClockImports } from './imports/instance-monotonic-clock';
 import { Timezone as TimezoneImports } from './imports/timezone';
 import { Streams as StreamsImports } from './imports/streams';
 import { Filesystem as FilesystemImports } from './imports/filesystem';
@@ -14,17 +12,16 @@ import { TcpCreateSocket as TcpCreateSocketImports } from './imports/tcp-create-
 import { Udp as UdpImports } from './imports/udp';
 import { UdpCreateSocket as UdpCreateSocketImports } from './imports/udp-create-socket';
 import { Random as RandomImports } from './imports/random';
+import { Console as ConsoleImports } from './imports/console';
+import { Types as TypesImports } from './imports/types';
+import { DefaultOutgoingHttp as DefaultOutgoingHttpImports } from './imports/default-outgoing-HTTP';
 import { Environment as EnvironmentImports } from './imports/environment';
-import { EnvironmentPreopens as EnvironmentPreopensImports } from './imports/environment-preopens';
 import { Preopens as PreopensImports } from './imports/preopens';
 import { Exit as ExitImports } from './imports/exit';
-import { Stderr as StderrImports } from './imports/stderr';
 export interface ImportObject {
   'wall-clock': typeof WallClockImports,
   'poll': typeof PollImports,
   'monotonic-clock': typeof MonotonicClockImports,
-  'instance-wall-clock': typeof InstanceWallClockImports,
-  'instance-monotonic-clock': typeof InstanceMonotonicClockImports,
   'timezone': typeof TimezoneImports,
   'streams': typeof StreamsImports,
   'filesystem': typeof FilesystemImports,
@@ -36,11 +33,12 @@ export interface ImportObject {
   'udp': typeof UdpImports,
   'udp-create-socket': typeof UdpCreateSocketImports,
   'random': typeof RandomImports,
+  'console': typeof ConsoleImports,
+  'types': typeof TypesImports,
+  'default-outgoing-HTTP': typeof DefaultOutgoingHttpImports,
   'environment': typeof EnvironmentImports,
-  'environment-preopens': typeof EnvironmentPreopensImports,
   'preopens': typeof PreopensImports,
   'exit': typeof ExitImports,
-  'stderr': typeof StderrImports,
 }
 export interface WasiReactor {
 }

package/lib/browser/environment-preopens.js

@@ -1,3 +0,0 @@
-export function preopens () {
-  return [];
-}

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

@@ -1,3 +0,0 @@
-export function instanceMonotonicClock() {
-  return 0;
-}

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

@@ -1,3 +0,0 @@
-export function instanceWallClock() {
-  return 1;
-}

package/lib/nodejs/environment-preopens.js

@@ -1,3 +0,0 @@
-export function preopens () {
-  return [];
-}

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

@@ -1,3 +0,0 @@
-export function instanceMonotonicClock() {
-  return 0;
-}

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

@@ -1,3 +0,0 @@
-export function instanceWallClock() {
-  return 1;
-}

package/types/imports/environment-preopens.d.ts

@@ -1,5 +0,0 @@
-export namespace EnvironmentPreopens {
-  export function preopens(): [Descriptor, string][];
-}
-import type { Descriptor } from '../imports/filesystem';
-export { Descriptor };

package/types/imports/instance-monotonic-clock.d.ts

@@ -1,5 +0,0 @@
-export namespace InstanceMonotonicClock {
-  export function instanceMonotonicClock(): MonotonicClock;
-}
-import type { MonotonicClock } from '../imports/monotonic-clock';
-export { MonotonicClock };

package/types/imports/instance-wall-clock.d.ts

@@ -1,5 +0,0 @@
-export namespace InstanceWallClock {
-  export function instanceWallClock(): WallClock;
-}
-import type { WallClock } from '../imports/wall-clock';
-export { WallClock };

package/types/imports/stderr.d.ts

@@ -1,3 +0,0 @@
-export namespace Stderr {
-  export function print(message: string): void;
-}