@bytecodealliance/preview2-shim 0.16.0 → 0.16.1

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 = [];
@@ -303,7 +293,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.1",
   "description": "WASI Preview2 shim for JS environments",
   "author": "Guy Bedford, Eduardo Rodrigues<16357187+eduardomourar@users.noreply.github.com>",
   "type": "module",

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 };

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

@@ -260,13 +260,13 @@ export namespace WasiFilesystemTypes {
    */
   export function filesystemErrorCode(err: Error): ErrorCode | undefined;
 }
-import type { InputStream } from '../interfaces/wasi-io-streams.js';
+import type { InputStream } from './wasi-io-streams.js';
 export { InputStream };
-import type { OutputStream } from '../interfaces/wasi-io-streams.js';
+import type { OutputStream } from './wasi-io-streams.js';
 export { OutputStream };
-import type { Error } from '../interfaces/wasi-io-streams.js';
+import type { Error } from './wasi-io-streams.js';
 export { Error };
-import type { Datetime } from '../interfaces/wasi-clocks-wall-clock.js';
+import type { Datetime } from './wasi-clocks-wall-clock.js';
 export { Datetime };
 /**
  * File size or length of a region within a file.
@@ -639,6 +639,10 @@ export interface MetadataHashValue {
   upper: bigint,
 }
 
+export class DirectoryEntryStream {
+  readDirectoryEntry(): DirectoryEntry | undefined;
+}
+
 export class Descriptor {
   readViaStream(offset: Filesize): InputStream;
   writeViaStream(offset: Filesize): OutputStream;
@@ -668,7 +672,3 @@ export class Descriptor {
   metadataHash(): MetadataHashValue;
   metadataHashAt(pathFlags: PathFlags, path: string): MetadataHashValue;
 }
-
-export class DirectoryEntryStream {
-  readDirectoryEntry(): DirectoryEntry | undefined;
-}

package/types/interfaces/wasi-http-incoming-handler.d.ts

@@ -13,7 +13,7 @@ export namespace WasiHttpIncomingHandler {
    */
   export function handle(request: IncomingRequest, responseOut: ResponseOutparam): void;
 }
-import type { IncomingRequest } from '../interfaces/wasi-http-types.js';
+import type { IncomingRequest } from './wasi-http-types.js';
 export { IncomingRequest };
-import type { ResponseOutparam } from '../interfaces/wasi-http-types.js';
+import type { ResponseOutparam } from './wasi-http-types.js';
 export { ResponseOutparam };

package/types/interfaces/wasi-http-outgoing-handler.d.ts

@@ -13,11 +13,11 @@ export namespace WasiHttpOutgoingHandler {
    */
   export function handle(request: OutgoingRequest, options: RequestOptions | undefined): FutureIncomingResponse;
 }
-import type { OutgoingRequest } from '../interfaces/wasi-http-types.js';
+import type { OutgoingRequest } from './wasi-http-types.js';
 export { OutgoingRequest };
-import type { RequestOptions } from '../interfaces/wasi-http-types.js';
+import type { RequestOptions } from './wasi-http-types.js';
 export { RequestOptions };
-import type { FutureIncomingResponse } from '../interfaces/wasi-http-types.js';
+import type { FutureIncomingResponse } from './wasi-http-types.js';
 export { FutureIncomingResponse };
-import type { ErrorCode } from '../interfaces/wasi-http-types.js';
+import type { ErrorCode } from './wasi-http-types.js';
 export { ErrorCode };

package/types/interfaces/wasi-http-types.d.ts

@@ -354,15 +354,15 @@ export namespace WasiHttpTypes {
    * `output-stream` child.
    */
 }
-import type { Duration } from '../interfaces/wasi-clocks-monotonic-clock.js';
+import type { Duration } from './wasi-clocks-monotonic-clock.js';
 export { Duration };
-import type { InputStream } from '../interfaces/wasi-io-streams.js';
+import type { InputStream } from './wasi-io-streams.js';
 export { InputStream };
-import type { OutputStream } from '../interfaces/wasi-io-streams.js';
+import type { OutputStream } from './wasi-io-streams.js';
 export { OutputStream };
-import type { Error as IoError } from '../interfaces/wasi-io-error.js';
+import type { Error as IoError } from './wasi-io-error.js';
 export { IoError };
-import type { Pollable } from '../interfaces/wasi-io-poll.js';
+import type { Pollable } from './wasi-io-poll.js';
 export { Pollable };
 /**
  * This type corresponds to HTTP standard Methods.
@@ -629,10 +629,6 @@ export type Trailers = Fields;
 export type StatusCode = number;
 export type Result<T, E> = { tag: 'ok', val: T } | { tag: 'err', val: E };
 
-export class ResponseOutparam {
-  static set(param: ResponseOutparam, response: Result<OutgoingResponse, ErrorCode>): void;
-}
-
 export class OutgoingResponse {
   constructor(headers: Headers)
   statusCode(): StatusCode;
@@ -646,42 +642,22 @@ export class OutgoingBody {
   static finish(this_: OutgoingBody, trailers: Trailers | undefined): void;
 }
 
-export class Fields {
-  constructor()
-  static fromList(entries: [FieldKey, FieldValue][]): Fields;
-  get(name: FieldKey): FieldValue[];
-  has(name: FieldKey): boolean;
-  set(name: FieldKey, value: FieldValue[]): void;
-  'delete'(name: FieldKey): void;
-  append(name: FieldKey, value: FieldValue): void;
-  entries(): [FieldKey, FieldValue][];
-  clone(): Fields;
-}
-
-export class IncomingBody {
-  stream(): InputStream;
-  static finish(this_: IncomingBody): FutureTrailers;
-}
-
-export class FutureIncomingResponse {
-  subscribe(): Pollable;
-  get(): Result<Result<IncomingResponse, ErrorCode>, void> | undefined;
-}
-
-export class FutureTrailers {
-  subscribe(): Pollable;
-  get(): Result<Result<Trailers | undefined, ErrorCode>, void> | undefined;
-}
-
-export class IncomingRequest {
-  method(): Method;
-  pathWithQuery(): string | undefined;
-  scheme(): Scheme | undefined;
-  authority(): string | undefined;
+export class IncomingResponse {
+  status(): StatusCode;
   headers(): Headers;
   consume(): IncomingBody;
 }
 
+export class RequestOptions {
+  constructor()
+  connectTimeout(): Duration | undefined;
+  setConnectTimeout(duration: Duration | undefined): void;
+  firstByteTimeout(): Duration | undefined;
+  setFirstByteTimeout(duration: Duration | undefined): void;
+  betweenBytesTimeout(): Duration | undefined;
+  setBetweenBytesTimeout(duration: Duration | undefined): void;
+}
+
 export class OutgoingRequest {
   constructor(headers: Headers)
   body(): OutgoingBody;
@@ -696,18 +672,42 @@ export class OutgoingRequest {
   headers(): Headers;
 }
 
-export class IncomingResponse {
-  status(): StatusCode;
+export class IncomingRequest {
+  method(): Method;
+  pathWithQuery(): string | undefined;
+  scheme(): Scheme | undefined;
+  authority(): string | undefined;
   headers(): Headers;
   consume(): IncomingBody;
 }
 
-export class RequestOptions {
+export class Fields {
   constructor()
-  connectTimeout(): Duration | undefined;
-  setConnectTimeout(duration: Duration | undefined): void;
-  firstByteTimeout(): Duration | undefined;
-  setFirstByteTimeout(duration: Duration | undefined): void;
-  betweenBytesTimeout(): Duration | undefined;
-  setBetweenBytesTimeout(duration: Duration | undefined): void;
+  static fromList(entries: [FieldKey, FieldValue][]): Fields;
+  get(name: FieldKey): FieldValue[];
+  has(name: FieldKey): boolean;
+  set(name: FieldKey, value: FieldValue[]): void;
+  'delete'(name: FieldKey): void;
+  append(name: FieldKey, value: FieldValue): void;
+  entries(): [FieldKey, FieldValue][];
+  clone(): Fields;
+}
+
+export class FutureTrailers {
+  subscribe(): Pollable;
+  get(): Result<Result<Trailers | undefined, ErrorCode>, void> | undefined;
+}
+
+export class FutureIncomingResponse {
+  subscribe(): Pollable;
+  get(): Result<Result<IncomingResponse, ErrorCode>, void> | undefined;
+}
+
+export class IncomingBody {
+  stream(): InputStream;
+  static finish(this_: IncomingBody): FutureTrailers;
+}
+
+export class ResponseOutparam {
+  static set(param: ResponseOutparam, response: Result<OutgoingResponse, ErrorCode>): void;
 }

package/types/interfaces/wasi-io-streams.d.ts

@@ -188,9 +188,9 @@ export namespace WasiIoStreams {
        * is ready for reading, before performing the `splice`.
        */
     }
-    import type { Error } from '../interfaces/wasi-io-error.js';
+    import type { Error } from './wasi-io-error.js';
     export { Error };
-    import type { Pollable } from '../interfaces/wasi-io-poll.js';
+    import type { Pollable } from './wasi-io-poll.js';
     export { Pollable };
     /**
      * An error for input-stream and output-stream operations.

package/types/interfaces/wasi-sockets-instance-network.d.ts

@@ -4,5 +4,5 @@ export namespace WasiSocketsInstanceNetwork {
    */
   export function instanceNetwork(): Network;
 }
-import type { Network } from '../interfaces/wasi-sockets-network.js';
+import type { Network } from './wasi-sockets-network.js';
 export { Network };

package/types/interfaces/wasi-sockets-ip-name-lookup.d.ts

@@ -45,13 +45,13 @@ export namespace WasiSocketsIpNameLookup {
    * It's planned to be removed when `future` is natively supported in Preview3.
    */
 }
-import type { Pollable } from '../interfaces/wasi-io-poll.js';
+import type { Pollable } from './wasi-io-poll.js';
 export { Pollable };
-import type { Network } from '../interfaces/wasi-sockets-network.js';
+import type { Network } from './wasi-sockets-network.js';
 export { Network };
-import type { ErrorCode } from '../interfaces/wasi-sockets-network.js';
+import type { ErrorCode } from './wasi-sockets-network.js';
 export { ErrorCode };
-import type { IpAddress } from '../interfaces/wasi-sockets-network.js';
+import type { IpAddress } from './wasi-sockets-network.js';
 export { IpAddress };
 
 export class ResolveAddressStream {

package/types/interfaces/wasi-sockets-tcp-create-socket.d.ts

@@ -23,11 +23,11 @@ export namespace WasiSocketsTcpCreateSocket {
    */
   export function createTcpSocket(addressFamily: IpAddressFamily): TcpSocket;
 }
-import type { Network } from '../interfaces/wasi-sockets-network.js';
+import type { Network } from './wasi-sockets-network.js';
 export { Network };
-import type { ErrorCode } from '../interfaces/wasi-sockets-network.js';
+import type { ErrorCode } from './wasi-sockets-network.js';
 export { ErrorCode };
-import type { IpAddressFamily } from '../interfaces/wasi-sockets-network.js';
+import type { IpAddressFamily } from './wasi-sockets-network.js';
 export { IpAddressFamily };
-import type { TcpSocket } from '../interfaces/wasi-sockets-tcp.js';
+import type { TcpSocket } from './wasi-sockets-tcp.js';
 export { TcpSocket };

package/types/interfaces/wasi-sockets-tcp.d.ts

@@ -302,21 +302,21 @@ export namespace WasiSocketsTcp {
    * - <https://man.freebsd.org/cgi/man.cgi?query=shutdown&sektion=2>
    */
 }
-import type { InputStream } from '../interfaces/wasi-io-streams.js';
+import type { InputStream } from './wasi-io-streams.js';
 export { InputStream };
-import type { OutputStream } from '../interfaces/wasi-io-streams.js';
+import type { OutputStream } from './wasi-io-streams.js';
 export { OutputStream };
-import type { Pollable } from '../interfaces/wasi-io-poll.js';
+import type { Pollable } from './wasi-io-poll.js';
 export { Pollable };
-import type { Duration } from '../interfaces/wasi-clocks-monotonic-clock.js';
+import type { Duration } from './wasi-clocks-monotonic-clock.js';
 export { Duration };
-import type { Network } from '../interfaces/wasi-sockets-network.js';
+import type { Network } from './wasi-sockets-network.js';
 export { Network };
-import type { ErrorCode } from '../interfaces/wasi-sockets-network.js';
+import type { ErrorCode } from './wasi-sockets-network.js';
 export { ErrorCode };
-import type { IpSocketAddress } from '../interfaces/wasi-sockets-network.js';
+import type { IpSocketAddress } from './wasi-sockets-network.js';
 export { IpSocketAddress };
-import type { IpAddressFamily } from '../interfaces/wasi-sockets-network.js';
+import type { IpAddressFamily } from './wasi-sockets-network.js';
 export { IpAddressFamily };
 /**
  * # Variants

package/types/interfaces/wasi-sockets-udp-create-socket.d.ts

@@ -23,11 +23,11 @@ export namespace WasiSocketsUdpCreateSocket {
    */
   export function createUdpSocket(addressFamily: IpAddressFamily): UdpSocket;
 }
-import type { Network } from '../interfaces/wasi-sockets-network.js';
+import type { Network } from './wasi-sockets-network.js';
 export { Network };
-import type { ErrorCode } from '../interfaces/wasi-sockets-network.js';
+import type { ErrorCode } from './wasi-sockets-network.js';
 export { ErrorCode };
-import type { IpAddressFamily } from '../interfaces/wasi-sockets-network.js';
+import type { IpAddressFamily } from './wasi-sockets-network.js';
 export { IpAddressFamily };
-import type { UdpSocket } from '../interfaces/wasi-sockets-udp.js';
+import type { UdpSocket } from './wasi-sockets-udp.js';
 export { UdpSocket };

package/types/interfaces/wasi-sockets-udp.d.ts

@@ -220,15 +220,15 @@ export namespace WasiSocketsUdp {
        * It's planned to be removed when `future` is natively supported in Preview3.
        */
     }
-    import type { Pollable } from '../interfaces/wasi-io-poll.js';
+    import type { Pollable } from './wasi-io-poll.js';
     export { Pollable };
-    import type { Network } from '../interfaces/wasi-sockets-network.js';
+    import type { Network } from './wasi-sockets-network.js';
     export { Network };
-    import type { ErrorCode } from '../interfaces/wasi-sockets-network.js';
+    import type { ErrorCode } from './wasi-sockets-network.js';
     export { ErrorCode };
-    import type { IpSocketAddress } from '../interfaces/wasi-sockets-network.js';
+    import type { IpSocketAddress } from './wasi-sockets-network.js';
     export { IpSocketAddress };
-    import type { IpAddressFamily } from '../interfaces/wasi-sockets-network.js';
+    import type { IpAddressFamily } from './wasi-sockets-network.js';
     export { IpAddressFamily };
     /**
      * A received datagram.