@bytecodealliance/preview2-shim 0.16.4 → 0.16.5

package/lib/io/worker-socket-tcp.js

@@ -31,6 +31,8 @@ import {
 } from "./worker-sockets.js";
 import { Socket, Server } from "node:net";
 
+const winOrMac = process.platform === 'win32' || process.platform === 'darwin';
+
 /**
  * @typedef {import("../../types/interfaces/wasi-sockets-network.js").IpSocketAddress} IpSocketAddress
  * @typedef {import("../../../types/interfaces/wasi-sockets-tcp.js").IpAddressFamily} IpAddressFamily
@@ -45,7 +47,7 @@ import { Socket, Server } from "node:net";
  * @typedef {{
  *   state: number,
  *   future: number | null,
- *   socket: TcpSocket | null,
+ *   tcpSocket: TcpSocket | null,
  *   listenBacklogSize: number,
  *   handle: TCP,
  *   pendingAccepts: PendingAccept[],
@@ -68,6 +70,7 @@ export function createTcpSocket() {
   tcpSockets.set(++tcpSocketCnt, {
     state: SOCKET_STATE_INIT,
     future: null,
+    tcpSocket: null,
     listenBacklogSize: 128,
     handle,
     pendingAccepts: [],
@@ -217,6 +220,7 @@ export function socketTcpAccept(id) {
   tcpSockets.set(++tcpSocketCnt, {
     state: SOCKET_STATE_CONNECTION,
     future: null,
+    tcpSocket: accept.tcpSocket,
     listenBacklogSize: 128,
     handle: accept.tcpSocket._handle,
     pendingAccepts: [],
@@ -265,8 +269,12 @@ export function socketTcpShutdown(id, shutdownType) {
   const socket = tcpSockets.get(id);
   if (socket.state !== SOCKET_STATE_CONNECTION) throw "invalid-state";
   // Node.js only supports a write shutdown, which is triggered on end
-  if (shutdownType === "send" || shutdownType === "both")
-    socket.tcpSocket.end();
+  if (shutdownType === "send" || shutdownType === "both") {
+    if (winOrMac && socket.tcpSocket.destroySoon)
+      socket.tcpSocket.destroySoon();
+    else
+      socket.tcpSocket.destroy();
+  }
 }
 
 export function socketTcpSetKeepAlive(id, { keepAlive, keepAliveIdleTime }) {

package/lib/io/worker-thread.js

@@ -583,7 +583,7 @@ function handle(call, id, payload) {
         Math.min(stream.stream.readableLength, Number(payload))
       );
       if (res) return res;
-      if (stream.stream.readableEnded) return { tag: "closed" };
+      if (stream.stream.readableEnded) throw { tag: "closed" };
       return new Uint8Array();
     }
     case INPUT_STREAM_BLOCKING_READ: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.16.4",
+  "version": "0.16.5",
   "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-environment.d.ts

@@ -9,11 +9,11 @@ export namespace WasiCliEnvironment {
    * in the component model, this import function should return the same
    * values each time it is called.
    */
-  export function getEnvironment(): [string, string][];
+  export function getEnvironment(): Array<[string, string]>;
   /**
    * Get the POSIX-style arguments to the program.
    */
-  export function getArguments(): string[];
+  export function getArguments(): Array<string>;
   /**
    * Return a path that programs should use as their initial current working
    * directory, interpreting `.` as shorthand for this.

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

@@ -2,7 +2,7 @@ export namespace WasiFilesystemPreopens {
   /**
    * Return the set of preopened directories, and their path.
    */
-  export function getDirectories(): [Descriptor, string][];
+  export function getDirectories(): Array<[Descriptor, string]>;
 }
 import type { Descriptor } from './wasi-filesystem-types.js';
 export { Descriptor };

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

@@ -324,14 +324,14 @@ export class Fields {
   * An error result will be returned if any header or value was
   * syntactically invalid, or if a header was forbidden.
   */
-  static fromList(entries: [FieldKey, FieldValue][]): Fields;
+  static fromList(entries: Array<[FieldKey, FieldValue]>): Fields;
   /**
   * Get all of the values corresponding to a key. If the key is not present
   * in this `fields`, an empty list is returned. However, if the key is
   * present but empty, this is represented by a list with one or more
   * empty field-values present.
   */
-  get(name: FieldKey): FieldValue[];
+  get(name: FieldKey): Array<FieldValue>;
   /**
   * Returns `true` when the key is present in this `fields`. If the key is
   * syntactically invalid, `false` is returned.
@@ -343,7 +343,7 @@ export class Fields {
   * 
   * Fails with `header-error.immutable` if the `fields` are immutable.
   */
-  set(name: FieldKey, value: FieldValue[]): void;
+  set(name: FieldKey, value: Array<FieldValue>): void;
   /**
   * Delete all values for a key. Does nothing if no values for the key
   * exist.
@@ -366,7 +366,7 @@ export class Fields {
   * which have multiple values are represented by multiple entries in this
   * list with the same key.
   */
-  entries(): [FieldKey, FieldValue][];
+  entries(): Array<[FieldKey, FieldValue]>;
   /**
   * Make a deep copy of the Fields. Equivelant in behavior to calling the
   * `fields` constructor on the return value of `entries`. The resulting

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

@@ -20,7 +20,7 @@ export namespace WasiIoPoll {
    * the pollables has an error, it is indicated by marking the source as
    * being reaedy for I/O.
    */
-  export function poll(in_: Pollable[]): Uint32Array;
+  export function poll(in_: Array<Pollable>): Uint32Array;
 }
 
 export class Pollable {

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

@@ -78,7 +78,7 @@ export class IncomingDatagramStream {
   * - <https://learn.microsoft.com/en-us/previous-versions/windows/desktop/legacy/ms741687(v=vs.85)>
   * - <https://man.freebsd.org/cgi/man.cgi?query=recv&sektion=2>
   */
-  receive(maxResults: bigint): IncomingDatagram[];
+  receive(maxResults: bigint): Array<IncomingDatagram>;
   /**
   * Create a `pollable` which will resolve once the stream is ready to receive again.
   * 
@@ -139,7 +139,7 @@ export class OutgoingDatagramStream {
   * - <https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-wsasendmsg>
   * - <https://man.freebsd.org/cgi/man.cgi?query=send&sektion=2>
   */
-  send(datagrams: OutgoingDatagram[]): bigint;
+  send(datagrams: Array<OutgoingDatagram>): bigint;
   /**
   * Create a `pollable` which will resolve once the stream is ready to send again.
   *