@bytecodealliance/preview2-shim 0.0.14 → 0.0.16

package/lib/browser/http.js

@@ -1,7 +1,7 @@
 import { UnexpectedError } from "../http/error.js";
 
 /**
- * @param {import("../../types/imports/wasi-http-types").Request} req
+ * @param {import("../../types/interfaces/wasi-http-types").Request} req
  * @returns {string}
  */
 export function send(req) {

package/lib/browser/io.js

@@ -89,11 +89,22 @@ export const streams = {
   dropInputStream(s) {
     console.log(`[streams] Drop input stream ${s}`);
   },
+  checkWrite(_s) {
+    // TODO: implement
+    return 1000000n;
+  },
   write(s, buf) {
-    return [BigInt(getStream(s).write(buf)), 'ended'];
+    getStream(s).write(buf);
+  },
+  blockingWriteAndFlush(s, buf) {
+    // TODO: implement
+    return streams.write(s, buf);
+  },
+  flush(s) {
+    return streams.blockingFlush(s);
   },
-  blockingWrite(s, buf) {
-    return [BigInt(getStream(s).write(buf)), 'ended'];
+  blockingFlush(_s) {
+    // TODO: implement
   },
   writeZeroes(s, _len) {
     console.log(`[streams] Write zeroes ${s}`);

package/lib/http/error.js

@@ -1,5 +1,5 @@
 export class UnexpectedError extends Error {
-  /** @type { import("../../types/imports/wasi-http-types").ErrorUnexpectedError } */
+  /** @type { import("../../types/interfaces/wasi-http-types").ErrorUnexpectedError } */
   payload;
   constructor(message = "unexpected-error") {
     super(message);

package/lib/http/make-request.js

@@ -1,7 +1,7 @@
 import { runAsWorker } from "./synckit/index.js";
 
 /**
- * @param {import("../../types/imports/wasi-http-types").Request} req
+ * @param {import("../../types/interfaces/wasi-http-types").Request} req
  * @returns {Promise<string>}
  */
 async function makeRequest(req) {
@@ -16,7 +16,7 @@ async function makeRequest(req) {
     let arrayBuffer = await resp.arrayBuffer();
     return JSON.stringify({
       status: resp.status,
-      headers: Array.from(resp.headers.entries()),
+      headers: Array.from(resp.headers),
       body:
         arrayBuffer.byteLength > 0
           ? Buffer.from(arrayBuffer).toString("base64")

package/lib/http/wasi-http.js

@@ -2,18 +2,18 @@
 // https://github.com/bytecodealliance/wasmtime/blob/8efcb9851602287fd07a1a1e91501f51f2653d7e/crates/wasi-http/
 
 /**
- * @typedef {import("../../types/imports/wasi-http-types").Fields} Fields
- * @typedef {import("../../types/imports/wasi-http-types").FutureIncomingResponse} FutureIncomingResponse
- * @typedef {import("../../types/imports/wasi-http-types").Headers} Headers
- * @typedef {import("../../types/imports/wasi-http-types").IncomingResponse} IncomingResponse
- * @typedef {import("../../types/imports/wasi-http-types").IncomingStream} IncomingStream
- * @typedef {import("../../types/imports/wasi-http-types").Method} Method
- * @typedef {import("../../types/imports/wasi-http-types").OutgoingRequest} OutgoingRequest
- * @typedef {import("../../types/imports/wasi-http-types").RequestOptions} RequestOptions
- * @typedef {import("../../types/imports/wasi-http-types").Result} Result
- * @typedef {import("../../types/imports/wasi-http-types").Scheme} Scheme
- * @typedef {import("../../types/imports/wasi-http-types").StatusCode} StatusCode
- * @typedef {import("../../types/imports/wasi-io-streams").StreamStatus} StreamStatus
+ * @typedef {import("../../types/interfaces/wasi-http-types").Fields} Fields
+ * @typedef {import("../../types/interfaces/wasi-http-types").FutureIncomingResponse} FutureIncomingResponse
+ * @typedef {import("../../types/interfaces/wasi-http-types").Headers} Headers
+ * @typedef {import("../../types/interfaces/wasi-http-types").IncomingResponse} IncomingResponse
+ * @typedef {import("../../types/interfaces/wasi-http-types").IncomingStream} IncomingStream
+ * @typedef {import("../../types/interfaces/wasi-http-types").Method} Method
+ * @typedef {import("../../types/interfaces/wasi-http-types").OutgoingRequest} OutgoingRequest
+ * @typedef {import("../../types/interfaces/wasi-http-types").RequestOptions} RequestOptions
+ * @typedef {import("../../types/interfaces/wasi-http-types").Result} Result
+ * @typedef {import("../../types/interfaces/wasi-http-types").Scheme} Scheme
+ * @typedef {import("../../types/interfaces/wasi-http-types").StatusCode} StatusCode
+ * @typedef {import("../../types/interfaces/wasi-io-streams").StreamStatus} StreamStatus
 */
 
 import * as io from '@bytecodealliance/preview2-shim/io';
@@ -28,7 +28,7 @@ export class WasiHttp {
   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,ActiveFields>} */ fields = new Map();
   /** @type {Map<number,Uint8Array>} */ streams = new Map();
   /** @type {Map<number,ActiveFuture>} */ futures = new Map();
 
@@ -53,9 +53,11 @@ export class WasiHttp {
     const headers = {
       "host": request.authority,
     };
-    if (request.headers && request.headers.size > 0) {
-      for (const [key, value] of request.headers.entries()) {
-        headers[key] = Array.isArray(value) ? value.join(",") : value;
+    if (request.headers) {
+      const requestHeaders = this.fields.get(request.headers);
+      const decoder = new TextDecoder();
+      for (const [key, value] of requestHeaders.fields.entries()) {
+        headers[key] = decoder.decode(value);
       }
     }
     const body =  this.streams.get(request.body);
@@ -69,10 +71,8 @@ export class WasiHttp {
     });
 
     response.status = res.status;
-    if (res.headers && res.headers.size > 0) {
-      for (const [key, value] of res.headers) {
-        response.responseHeaders.set(key, [value]);
-      }
+    if (res.headers && res.headers.length > 0) {
+      response.headers = this.newFields(res.headers);
     }
     const buf = res.body;
     response.body = this.streamIdBase;
@@ -131,21 +131,38 @@ export class WasiHttp {
     s.set([]);
   }
 
-  write = (stream, buf) => {
-    return this.blockingWrite(stream, buf);
+  checkWrite = (stream) => {
+    // TODO: implement
+    return io.streams.checkWrite(stream);
   }
 
   /**
    * @param {OutputStream} stream 
    * @param {Uint8Array} buf 
-   * @returns {[bigint, StreamStatus]}
    */
-  blockingWrite = (stream, buf) => {
+  write = (stream, buf) => {
     if (stream < 3) {
-      return io.streams.blockingWrite(stream, buf);
+      return io.streams.write(stream, buf);
     }
     this.streams.set(stream, buf);
-    return [BigInt(buf.byteLength), 'ended'];
+  }
+
+  blockingWriteAndFlush = (stream, buf) => {
+    if (stream < 3) {
+      return io.streams.blockingWriteAndFlush(stream, buf);
+    }
+    // TODO: implement
+  }
+
+  flush = (stream) => {
+    return this.blockingFlush(stream);
+  }
+
+  blockingFlush = (stream) => {
+    if (stream < 3) {
+      return io.streams.blockingFlush(stream);
+    }
+    // TODO: implement
   }
 
   /**
@@ -178,21 +195,20 @@ export class WasiHttp {
    * @returns {Fields}
    */
   newFields = (entries) => {
-    const map = new Map(entries);
-
     const id = this.fieldsIdBase;
     this.fieldsIdBase += 1;
-    this.fields.set(id, map);
+    this.fields.set(id, new ActiveFields(id, entries));
 
     return id;
   }
 
   /**
    * @param {Fields} fields
-   * @returns {[string, string][]}
+   * @returns {[string, Uint8Array][]}
    */
   fieldsEntries = (fields) => {
-    return this.fields.get(fields) ?? [];
+    const activeFields = this.fields.get(fields);
+    return activeFields ? Array.from(activeFields.fields) : [];
   }
 
   /**
@@ -218,7 +234,7 @@ export class WasiHttp {
     req.pathWithQuery = pathWithQuery;
     req.authority = authority;
     req.method = method;
-    req.headers = this.fields.get(headers);
+    req.headers = headers;
     req.scheme = scheme;
     this.requests.set(id, req);
     return id;
@@ -257,11 +273,7 @@ export class WasiHttp {
    */
   incomingResponseHeaders = (response) => {
     const r = this.responses.get(response);
-    const id = this.fieldsIdBase;
-    this.fieldsIdBase += 1;
-
-    this.fields.set(id, r.responseHeaders);
-    return id;
+    return r.headers ?? 0;
   }
 
   /**
@@ -316,7 +328,7 @@ class ActiveRequest {
   /** @type {Scheme | null} */ scheme = { tag: 'HTTP' };
   pathWithQuery = null;
   authority = null;
-  /** @type {Map<string,string[]>} */ headers = new Map();
+  /** @type {number | null} */ headers = null;
   body = 3;
 
   constructor(id) {
@@ -329,7 +341,7 @@ class ActiveResponse {
   activeResponse = false;
   status = 0;
   body = 3;
-  /** @type {Map<string,string[]>} */ responseHeaders = new Map();
+  /** @type {number | null} */ headers = null;
 
   constructor(id) {
     this.id = id;
@@ -345,3 +357,14 @@ class ActiveFuture {
     this.responseId = responseId;
   }
 }
+
+class ActiveFields {
+  /** @type {number} */ id;
+  /** @type {Map<string, Uint8Array[]>} */ fields;
+
+  constructor(id, fields) {
+    this.id = id;
+    const encoder = new TextEncoder();
+    this.fields = new Map(fields.map(([k, v]) => [k, encoder.encode(v)]));
+  }
+}

package/lib/nodejs/io.js

@@ -106,25 +106,36 @@ export const streams = {
   dropInputStream(s) {
     delete _streams[s];
   },
-  write(s, buf) {
-    return streams.blockingWrite(s, buf);
+  checkWrite(_s) {
+    // TODO: implement
+    return 1000000n;
   },
-  blockingWrite(s, buf) {
+  write(s, buf) {
     switch (s) {
       case 0:
         throw new Error(`TODO: write stdin`);
       case 1: {
         process.stdout.write(buf);
-        return [BigInt(buf.byteLength), 'ended'];
+        break;
       }
       case 2: {
         process.stderr.write(buf);
-        return [BigInt(buf.byteLength), 'ended'];
+        break;
       }
       default:
         throw new Error(`TODO: write ${s}`);
     }
   },
+  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}`);
   },

package/package.json

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

package/types/{exports → interfaces}/wasi-cli-environment.d.ts

@@ -18,5 +18,5 @@ export namespace WasiCliEnvironment {
    * Return a path that programs should use as their initial current working
    * directory, interpreting `.` as shorthand for this.
    */
-  export function initialCwd(): string | null;
+  export function initialCwd(): string | undefined;
 }

package/types/{imports → interfaces}/wasi-cli-stderr.d.ts

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

package/types/{exports → interfaces}/wasi-cli-stdin.d.ts

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

package/types/{imports → interfaces}/wasi-cli-stdout.d.ts

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

package/types/{imports → interfaces}/wasi-cli-terminal-stderr.d.ts

@@ -3,7 +3,7 @@ export namespace WasiCliTerminalStderr {
    * If stderr is connected to a terminal, return a `terminal-output` handle
    * allowing further interaction with it.
    */
-  export function getTerminalStderr(): TerminalOutput | null;
+  export function getTerminalStderr(): TerminalOutput | undefined;
 }
-import type { TerminalOutput } from '../imports/wasi-cli-terminal-output';
+import type { TerminalOutput } from '../interfaces/wasi-cli-terminal-output';
 export { TerminalOutput };

package/types/{imports → interfaces}/wasi-cli-terminal-stdin.d.ts

@@ -3,7 +3,7 @@ export namespace WasiCliTerminalStdin {
    * If stdin is connected to a terminal, return a `terminal-input` handle
    * allowing further interaction with it.
    */
-  export function getTerminalStdin(): TerminalInput | null;
+  export function getTerminalStdin(): TerminalInput | undefined;
 }
-import type { TerminalInput } from '../imports/wasi-cli-terminal-input';
+import type { TerminalInput } from '../interfaces/wasi-cli-terminal-input';
 export { TerminalInput };

package/types/{imports → interfaces}/wasi-cli-terminal-stdout.d.ts

@@ -3,7 +3,7 @@ export namespace WasiCliTerminalStdout {
    * If stdout is connected to a terminal, return a `terminal-output` handle
    * allowing further interaction with it.
    */
-  export function getTerminalStdout(): TerminalOutput | null;
+  export function getTerminalStdout(): TerminalOutput | undefined;
 }
-import type { TerminalOutput } from '../imports/wasi-cli-terminal-output';
+import type { TerminalOutput } from '../interfaces/wasi-cli-terminal-output';
 export { TerminalOutput };

package/types/{imports → interfaces}/wasi-clocks-monotonic-clock.d.ts

@@ -16,7 +16,7 @@ export namespace WasiClocksMonotonicClock {
    */
   export function subscribe(when: Instant, absolute: boolean): Pollable;
 }
-import type { Pollable } from '../imports/wasi-poll-poll';
+import type { Pollable } from '../interfaces/wasi-poll-poll';
 export { Pollable };
 /**
  * A timestamp in nanoseconds.

package/types/{exports → interfaces}/wasi-clocks-timezone.d.ts

@@ -19,7 +19,7 @@ export namespace WasiClocksTimezone {
    */
   export function dropTimezone(this_: Timezone): void;
 }
-import type { Datetime } from '../exports/wasi-clocks-wall-clock';
+import type { Datetime } from '../interfaces/wasi-clocks-wall-clock';
 export { Datetime };
 /**
  * A timezone.

package/types/{exports → interfaces}/wasi-filesystem-preopens.d.ts

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

package/types/{imports → interfaces}/wasi-filesystem-types.d.ts

@@ -93,7 +93,7 @@ export namespace WasiFilesystemTypes {
    * 
    * Note: This is similar to `pread` in POSIX.
    */
-  export function read(this_: Descriptor, length: Filesize, offset: Filesize): [Uint8Array | ArrayBuffer, boolean];
+  export function read(this_: Descriptor, length: Filesize, offset: Filesize): [Uint8Array, boolean];
   /**
    * Write to a descriptor, without using and updating the descriptor's offset.
    * 
@@ -377,7 +377,7 @@ export namespace WasiFilesystemTypes {
   /**
    * Read a single directory entry from a `directory-entry-stream`.
    */
-  export function readDirectoryEntry(this_: DirectoryEntryStream): DirectoryEntry | null;
+  export function readDirectoryEntry(this_: DirectoryEntryStream): DirectoryEntry | undefined;
   /**
    * Dispose of the specified `directory-entry-stream`, after which it may no longer
    * be used.
@@ -422,11 +422,11 @@ export namespace WasiFilesystemTypes {
    */
   export function metadataHashAt(this_: Descriptor, pathFlags: PathFlags, path: string): MetadataHashValue;
 }
-import type { InputStream } from '../imports/wasi-io-streams';
+import type { InputStream } from '../interfaces/wasi-io-streams';
 export { InputStream };
-import type { OutputStream } from '../imports/wasi-io-streams';
+import type { OutputStream } from '../interfaces/wasi-io-streams';
 export { OutputStream };
-import type { Datetime } from '../imports/wasi-clocks-wall-clock';
+import type { Datetime } from '../interfaces/wasi-clocks-wall-clock';
 export { Datetime };
 /**
  * File size or length of a region within a file.