@bytecodealliance/preview2-shim 0.16.0 → 0.16.2

package/lib/io/worker-http.js

@@ -1,7 +1,4 @@
-import {
-  createReadableStream,
-  getStreamOrThrow,
-} from "./worker-thread.js";
+import { createReadableStream, getStreamOrThrow } from "./worker-thread.js";
 import {
   createServer,
   request as httpRequest,
@@ -117,7 +114,7 @@ export async function createHttpRequest(
           host: authority.split(":")[0],
           port: authority.split(":")[1],
           path: pathWithQuery,
-          timeout: connectTimeout && Number(connectTimeout),
+          timeout: connectTimeout && Number(connectTimeout / 1_000_000n),
         });
         break;
       case "https:":
@@ -127,7 +124,7 @@ export async function createHttpRequest(
           host: authority.split(":")[0],
           port: authority.split(":")[1],
           path: pathWithQuery,
-          timeout: connectTimeout && Number(connectTimeout),
+          timeout: connectTimeout && Number(connectTimeout / 1_000_000n),
         });
         break;
       default:
@@ -143,20 +140,26 @@ export async function createHttpRequest(
       req.end();
     }
     const res = await new Promise((resolve, reject) => {
+      req.once('timeout', () => {
+        reject({
+          tag: "connection-timeout"
+        });
+        req.destroy();
+      });
       req.once("response", resolve);
       req.once("close", () => reject);
       req.once("error", reject);
     });
-    if (firstByteTimeout) res.setTimeout(Number(firstByteTimeout));
+    if (firstByteTimeout) res.setTimeout(Number(firstByteTimeout / 1_000_000n));
     if (betweenBytesTimeout)
       res.once("readable", () => {
-        res.setTimeout(Number(betweenBytesTimeout));
+        res.setTimeout(Number(betweenBytesTimeout / 1_000_000n));
       });
     const bodyStreamId = createReadableStream(res);
     return {
       status: res.statusCode,
       headers: Array.from(Object.entries(res.headers)),
-      bodyStreamId
+      bodyStreamId,
     };
   } catch (e) {
     if (e?.tag) throw e;

package/lib/nodejs/clocks.js

@@ -38,7 +38,7 @@ export const wallClock = {
 
 monotonicClock.resolution[symbolCabiLower] = () => resolution;
 monotonicClock.now[symbolCabiLower] = () => hrtime.bigint;
-wallClock.resolution[symbolCabiLower] = (memory) => {
+wallClock.resolution[symbolCabiLower] = ({ memory }) => {
   let buf32 = new Int32Array(memory.buffer);
   return function now(retptr) {
     if (memory.buffer !== buf32.buffer) buf32 = new Int32Array(memory.buffer);
@@ -49,7 +49,7 @@ wallClock.resolution[symbolCabiLower] = (memory) => {
   };
 };
 
-wallClock.now[symbolCabiLower] = (memory) => {
+wallClock.now[symbolCabiLower] = ({ memory }) => {
   let buf32 = new Int32Array(memory.buffer);
   let buf64 = new BigInt64Array(memory.buffer);
   return function now(retptr) {

package/lib/nodejs/http.js

@@ -175,37 +175,27 @@ class ResponseOutparam {
 const responseOutparamCreate = ResponseOutparam._create;
 delete ResponseOutparam._create;
 
+const defaultHttpTimeout = 600_000_000_000n;
+
 class RequestOptions {
-  #connectTimeout;
-  #firstByteTimeout;
-  #betweenBytesTimeout;
-  //The WASI Duration is nanoseconds, js timers are set with Ms.
-  //We store the data as nanos, but provide TimeoutMs methods for
-  //convenience in setting timers elsewhere
+  #connectTimeout = defaultHttpTimeout;
+  #firstByteTimeout = defaultHttpTimeout;
+  #betweenBytesTimeout = defaultHttpTimeout;
   connectTimeout() {
     return this.#connectTimeout;
   }
-  connectTimeoutMs() {
-    return this.#connectTimeout / 1_000_000;
-  }
   setConnectTimeout(duration) {
     this.#connectTimeout = duration;
   }
   firstByteTimeout() {
     return this.#firstByteTimeout;
   }
-  firstByteTimeoutMs() {
-    return this.#firstByteTimeout / 1_000_000;
-  }
   setFirstByteTimeout(duration) {
     this.#firstByteTimeout = duration;
   }
   betweenBytesTimeout() {
     return this.#betweenBytesTimeout;
   }
-  betweenBytesTimeoutMs() {
-    return this.#betweenBytesTimeout / 1_000_000;
-  }
   setBetweenBytesTimeout(duration) {
     this.#betweenBytesTimeout = duration;
   }
@@ -284,9 +274,9 @@ class OutgoingRequest {
   }
   [symbolDispose]() {}
   static _handle(request, options) {
-    const connectTimeout = options?.connectTimeoutMs();
-    const betweenBytesTimeout = options?.betweenBytesTimeoutMs();
-    const firstByteTimeout = options?.firstByteTimeoutMs();
+    const connectTimeout = options?.connectTimeout();
+    const betweenBytesTimeout = options?.betweenBytesTimeout();
+    const firstByteTimeout = options?.firstByteTimeout();
     const scheme = schemeString(request.#scheme);
     // note: host header is automatically added by Node.js
     const headers = [];
@@ -294,6 +284,8 @@ class OutgoingRequest {
     for (const [key, value] of request.#headers.entries()) {
       headers.push([key, decoder.decode(value)]);
     }
+    if (!request.#pathWithQuery)
+      throw { tag: 'HTTP-request-URI-invalid' };
     return futureIncomingResponseCreate(
       request.#method.val || request.#method.tag,
       scheme,
@@ -303,7 +295,7 @@ class OutgoingRequest {
       outgoingBodyOutputStreamId(request.#body),
       connectTimeout,
       betweenBytesTimeout,
-      firstByteTimeout
+      firstByteTimeout,
     );
   }
 }

package/lib/nodejs/random.js

@@ -31,7 +31,7 @@ function getRandomBytes(len) {
   return randomBytes(Number(len));
 }
 
-randomBytes[Symbol.for("cabiLower")] = ({ memory, realloc }) => {
+getRandomBytes[Symbol.for("cabiLower")] = ({ memory, realloc }) => {
   let buf32 = new Uint32Array(memory.buffer);
   return function randomBytes(len, retptr) {
     len = Number(len);

package/package.json

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

package/types/clocks.d.ts

@@ -1,5 +1,5 @@
 import type { WasiClocksMonotonicClock } from './interfaces/wasi-clocks-monotonic-clock.d.ts';
 import type { WasiClocksWallClock } from './interfaces/wasi-clocks-wall-clock.d.ts';
 
-export const wallClock: typeof WasiClocksMonotonicClock;
-export const monotonicClock: typeof WasiClocksWallClock;
+export const wallClock: typeof WasiClocksWallClock;
+export const monotonicClock: typeof WasiClocksMonotonicClock;

package/types/interfaces/wasi-cli-stderr.d.ts

@@ -1,5 +1,5 @@
 export namespace WasiCliStderr {
   export function getStderr(): OutputStream;
 }
-import type { OutputStream } from '../interfaces/wasi-io-streams.js';
+import type { OutputStream } from './wasi-io-streams.js';
 export { OutputStream };

package/types/interfaces/wasi-cli-stdin.d.ts

@@ -1,5 +1,5 @@
 export namespace WasiCliStdin {
   export function getStdin(): InputStream;
 }
-import type { InputStream } from '../interfaces/wasi-io-streams.js';
+import type { InputStream } from './wasi-io-streams.js';
 export { InputStream };

package/types/interfaces/wasi-cli-stdout.d.ts

@@ -1,5 +1,5 @@
 export namespace WasiCliStdout {
   export function getStdout(): OutputStream;
 }
-import type { OutputStream } from '../interfaces/wasi-io-streams.js';
+import type { OutputStream } from './wasi-io-streams.js';
 export { OutputStream };

package/types/interfaces/wasi-cli-terminal-stderr.d.ts

@@ -5,5 +5,5 @@ export namespace WasiCliTerminalStderr {
    */
   export function getTerminalStderr(): TerminalOutput | undefined;
 }
-import type { TerminalOutput } from '../interfaces/wasi-cli-terminal-output.js';
+import type { TerminalOutput } from './wasi-cli-terminal-output.js';
 export { TerminalOutput };

package/types/interfaces/wasi-cli-terminal-stdin.d.ts

@@ -5,5 +5,5 @@ export namespace WasiCliTerminalStdin {
    */
   export function getTerminalStdin(): TerminalInput | undefined;
 }
-import type { TerminalInput } from '../interfaces/wasi-cli-terminal-input.js';
+import type { TerminalInput } from './wasi-cli-terminal-input.js';
 export { TerminalInput };

package/types/interfaces/wasi-cli-terminal-stdout.d.ts

@@ -5,5 +5,5 @@ export namespace WasiCliTerminalStdout {
    */
   export function getTerminalStdout(): TerminalOutput | undefined;
 }
-import type { TerminalOutput } from '../interfaces/wasi-cli-terminal-output.js';
+import type { TerminalOutput } from './wasi-cli-terminal-output.js';
 export { TerminalOutput };

package/types/interfaces/wasi-clocks-monotonic-clock.d.ts

@@ -23,7 +23,7 @@ export namespace WasiClocksMonotonicClock {
    */
   export function subscribeDuration(when: Duration): Pollable;
 }
-import type { Pollable } from '../interfaces/wasi-io-poll.js';
+import type { Pollable } from './wasi-io-poll.js';
 export { Pollable };
 /**
  * An instant in time, in nanoseconds. An instant is relative to an

package/types/interfaces/wasi-filesystem-preopens.d.ts

@@ -4,5 +4,5 @@ export namespace WasiFilesystemPreopens {
    */
   export function getDirectories(): [Descriptor, string][];
 }
-import type { Descriptor } from '../interfaces/wasi-filesystem-types.js';
+import type { Descriptor } from './wasi-filesystem-types.js';
 export { Descriptor };