@bytecodealliance/preview2-shim 0.20.2 → 0.22.0

package/dist/io/calls.d.ts

@@ -31,6 +31,7 @@ export declare const OUTPUT_STREAM_DISPOSE: number;
 export declare const OUTPUT_STREAM_GET_TOTAL_BYTES: number;
 export declare const FILESYSTEM_DESCRIPTOR_OPEN: number;
 export declare const FILESYSTEM_DESCRIPTOR_CLOSE: number;
+export declare const FILESYSTEM_DESCRIPTOR_ADVISE: number;
 export declare const FILESYSTEM_DESCRIPTOR_SYNC_DATA: number;
 export declare const FILESYSTEM_DESCRIPTOR_GET_TYPE: number;
 export declare const FILESYSTEM_DESCRIPTOR_SET_SIZE: number;

package/dist/io/calls.js

@@ -38,6 +38,7 @@ export const OUTPUT_STREAM_GET_TOTAL_BYTES = ++call_id << CALL_SHIFT;
 // Filesystem descriptors
 export const FILESYSTEM_DESCRIPTOR_OPEN = ++call_id << CALL_SHIFT;
 export const FILESYSTEM_DESCRIPTOR_CLOSE = ++call_id << CALL_SHIFT;
+export const FILESYSTEM_DESCRIPTOR_ADVISE = ++call_id << CALL_SHIFT;
 export const FILESYSTEM_DESCRIPTOR_SYNC_DATA = ++call_id << CALL_SHIFT;
 export const FILESYSTEM_DESCRIPTOR_GET_TYPE = ++call_id << CALL_SHIFT;
 export const FILESYSTEM_DESCRIPTOR_SET_SIZE = ++call_id << CALL_SHIFT;

package/dist/io/worker-filesystem.d.ts

@@ -1,3 +1,4 @@
+import type { Advice } from "@bytecodealliance/jco-node-fs";
 export declare function openFileResource(path: string, flags: number): Promise<{
     id: number;
     type: any;
@@ -5,6 +6,7 @@ export declare function openFileResource(path: string, flags: number): Promise<{
 export declare function retainFileResource(id: number): number;
 export declare function releaseFileResource(id: number): Promise<void>;
 export declare function fileResourceFd(id: number): number;
+export declare function adviseFileResource(id: number, offset: bigint, length: bigint, advice: Advice): void;
 export declare function syncFileResourceData(id: number): Promise<void>;
 export declare function getFileResourceType(id: number): Promise<"block-device" | "character-device" | "directory" | "fifo" | "regular-file" | "socket" | "symbolic-link" | "unknown">;
 export declare function setFileResourceSize(id: number, size: number): Promise<void>;

package/dist/io/worker-filesystem.js

@@ -1,5 +1,8 @@
 import fs from "node:fs";
+import { createRequire } from "node:module";
 import { promisify } from "node:util";
+const require = createRequire(import.meta.url);
+let nativeFadvise;
 const closeAsync = promisify(fs.close);
 const fdatasyncAsync = promisify(fs.fdatasync);
 const fstatAsync = promisify(fs.fstat);
@@ -72,6 +75,10 @@ export async function releaseFileResource(id) {
 export function fileResourceFd(id) {
     return getFileResource(id).fd;
 }
+export function adviseFileResource(id, offset, length, advice) {
+    const fadvise = (nativeFadvise ??= require("@bytecodealliance/jco-node-fs").fadvise);
+    fadvise(fileResourceFd(id), offset, length, advice);
+}
 export async function syncFileResourceData(id) {
     await fdatasyncAsync(fileResourceFd(id));
 }

package/dist/io/worker-socket-tcp.d.ts

@@ -1,5 +1,5 @@
 import { PollState } from "./worker-thread.js";
-import { Socket as TcpSocket } from "node:net";
+import { Server, Socket as TcpSocket } from "node:net";
 import { IpSocketAddress } from "../../types/interfaces/wasi-sockets-network.js";
 interface PendingAccept {
     tcpSocket: TcpSocket | null;
@@ -10,8 +10,11 @@ interface TcpSocketRecord {
     state: number;
     future: number | null;
     tcpSocket: TcpSocket | null;
+    server: Server | null;
+    localAddress: IpSocketAddress | null;
     listenBacklogSize: number;
-    handle: TCP;
+    keepAlive: boolean;
+    keepAliveIdleTime: number;
     pendingAccepts: PendingAccept[];
     pollState: PollState | null;
 }

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

@@ -1,20 +1,20 @@
 import { createFuture, createReadableStream, createReadableStreamPollState, createWritableStream, futureDispose, futureTakeValue, pollStateReady, verifyPollsDroppedForDrop, } from "./worker-thread.js";
 import process from "node:process";
-// TODO: tcp_wrap is no longer exposed in newer versions of Node.js
-const { TCP, constants: TCPConstants } = process.binding("tcp_wrap");
-import { convertSocketError, convertSocketErrorCode, ipSocketAddress, isIPv4MappedAddress, isMulticastIpAddress, isUnicastIpAddress, isWildcardAddress, noLookup, serializeIpAddress, SOCKET_STATE_BIND, SOCKET_STATE_BOUND, SOCKET_STATE_CLOSED, SOCKET_STATE_CONNECT, SOCKET_STATE_CONNECTION, SOCKET_STATE_INIT, SOCKET_STATE_LISTEN, SOCKET_STATE_LISTENER, } from "./worker-sockets.js";
+import { convertSocketError, ipSocketAddress, isIPv4MappedAddress, isMulticastIpAddress, isUnicastIpAddress, isWildcardAddress, noLookup, serializeIpAddress, SOCKET_STATE_BIND, SOCKET_STATE_BOUND, SOCKET_STATE_CLOSED, SOCKET_STATE_CONNECT, SOCKET_STATE_CONNECTION, SOCKET_STATE_INIT, SOCKET_STATE_LISTEN, SOCKET_STATE_LISTENER, } from "./worker-sockets.js";
 import { Server, Socket as TcpSocket } from "node:net";
 const win = process.platform === "win32";
 export const tcpSockets = new Map();
 let tcpSocketCnt = 0;
 export function createTcpSocket() {
-    const handle = new TCP(TCPConstants.SOCKET);
     tcpSockets.set(++tcpSocketCnt, {
         state: SOCKET_STATE_INIT,
         future: null,
         tcpSocket: null,
+        server: null,
+        localAddress: null,
         listenBacklogSize: 128,
-        handle,
+        keepAlive: false,
+        keepAliveIdleTime: 0,
         pendingAccepts: [],
         pollState: {
             ready: true,
@@ -44,7 +44,7 @@ export function socketTcpFinish(id, fromState, toState) {
         socket.state = toState;
         // for the listener, we must immediately transition back to unresolved
         if (toState === SOCKET_STATE_LISTENER) {
-            socket.pollState.ready = false;
+            socket.pollState.ready = socket.pendingAccepts.length > 0;
         }
         return val;
     }
@@ -60,26 +60,77 @@ export function socketTcpBindStart(id, localAddress, family) {
         throw "invalid-argument";
     }
     socket.state = SOCKET_STATE_BIND;
-    const { handle } = socket;
-    socket.future = createFuture((async () => {
+    socket.future = createFuture(new Promise((resolve, reject) => {
         const address = serializeIpAddress(localAddress);
         const port = localAddress.val.port;
-        const code = localAddress.tag === "ipv6"
-            ? handle.bind6(address, port, TCPConstants.UV_TCP_IPV6ONLY)
-            : handle.bind(address, port);
-        if (code !== 0) {
-            throw convertSocketErrorCode(-code);
+        // node:net has no public standalone TCP bind API. Keep a server open
+        // to reserve the endpoint, then reuse it for listen or close it for connect.
+        const server = (socket.server = createTcpServer(socket));
+        function handleErr(err) {
+            server.off("listening", handleListen);
+            reject(convertSocketError(err));
         }
-        // This is a Node.js / libuv quirk to force the bind error to be thrown
-        // (specifically address-in-use).
-        {
-            const out = {};
-            const code = handle.getsockname(out);
-            if (code !== 0) {
-                throw convertSocketErrorCode(-code);
+        function handleListen() {
+            server.off("error", handleErr);
+            const boundAddress = server.address();
+            if (!boundAddress || typeof boundAddress === "string") {
+                reject("invalid-state");
+                return;
             }
+            socket.localAddress = ipSocketAddress(boundAddress.family.toLowerCase(), boundAddress.address, boundAddress.port);
+            resolve();
         }
-    })(), socket.pollState);
+        server.once("listening", handleListen);
+        server.once("error", handleErr);
+        server.listen({
+            host: address ?? undefined,
+            port,
+            backlog: socket.listenBacklogSize,
+            ipv6Only: family === "ipv6",
+        });
+    }), socket.pollState);
+}
+function createTcpServer(socket) {
+    const server = new Server({
+        pauseOnConnect: true,
+        allowHalfOpen: true,
+    });
+    server.on("connection", (tcpSocket) => {
+        // The reservation is already listening at the OS level, so reject any
+        // connections that arrive before the WASI socket enters its listen state.
+        if (socket.state !== SOCKET_STATE_LISTEN && socket.state !== SOCKET_STATE_LISTENER) {
+            tcpSocket.destroy();
+            return;
+        }
+        pollStateReady(socket.pollState);
+        const pollState = createReadableStreamPollState(tcpSocket);
+        socket.pendingAccepts.push({
+            tcpSocket,
+            err: null,
+            pollState,
+        });
+    });
+    server.on("error", (err) => {
+        if (socket.state === SOCKET_STATE_LISTEN || socket.state === SOCKET_STATE_LISTENER) {
+            pollStateReady(socket.pollState);
+            socket.pendingAccepts.push({
+                tcpSocket: null,
+                err,
+                pollState: null,
+            });
+        }
+    });
+    return server;
+}
+function closeTcpServer(socket) {
+    const server = socket.server;
+    socket.server = null;
+    if (!server) {
+        return Promise.resolve();
+    }
+    return new Promise((resolve, reject) => {
+        server.close((err) => (err ? reject(err) : resolve()));
+    });
 }
 export function socketTcpConnectStart(id, remoteAddress, family) {
     const socket = tcpSockets.get(id);
@@ -95,71 +146,44 @@ export function socketTcpConnectStart(id, remoteAddress, family) {
         throw "invalid-argument";
     }
     socket.state = SOCKET_STATE_CONNECT;
-    socket.future = createFuture(new Promise((resolve, reject) => {
+    socket.future = createFuture((async () => {
+        const localAddress = socket.localAddress;
+        await closeTcpServer(socket);
         const tcpSocket = (socket.tcpSocket = new TcpSocket({
-            // @ts-expect-error Not present in type definition
-            handle: socket.handle,
-            pauseOnCreate: true,
             allowHalfOpen: true,
         }));
-        function handleErr(err) {
-            tcpSocket.off("connect", handleConnect);
-            reject(convertSocketError(err));
-        }
-        function handleConnect() {
-            tcpSocket.off("error", handleErr);
-            resolve([createReadableStream(tcpSocket), createWritableStream(tcpSocket)]);
-        }
-        tcpSocket.once("connect", handleConnect);
-        tcpSocket.once("error", handleErr);
-        tcpSocket.connect({
-            port: remoteAddress.val.port,
-            host: serializeIpAddress(remoteAddress) ?? undefined,
-            lookup: noLookup,
+        tcpSocket.setKeepAlive(socket.keepAlive, socket.keepAliveIdleTime);
+        await new Promise((resolve, reject) => {
+            function handleErr(err) {
+                tcpSocket.off("connect", handleConnect);
+                reject(convertSocketError(err));
+            }
+            function handleConnect() {
+                tcpSocket.off("error", handleErr);
+                resolve();
+            }
+            tcpSocket.once("connect", handleConnect);
+            tcpSocket.once("error", handleErr);
+            tcpSocket.connect({
+                port: remoteAddress.val.port,
+                host: serializeIpAddress(remoteAddress) ?? undefined,
+                lookup: noLookup,
+                localAddress: localAddress
+                    ? (serializeIpAddress(localAddress) ?? undefined)
+                    : undefined,
+                localPort: localAddress?.val.port,
+            });
         });
-    }), socket.pollState);
+        return [createReadableStream(tcpSocket), createWritableStream(tcpSocket)];
+    })(), socket.pollState);
 }
 export function socketTcpListenStart(id) {
     const socket = tcpSockets.get(id);
     if (socket.state !== SOCKET_STATE_BOUND) {
         throw "invalid-state";
     }
-    const { handle } = socket;
     socket.state = SOCKET_STATE_LISTEN;
-    socket.future = createFuture(new Promise((resolve, reject) => {
-        const server = new Server({
-            pauseOnConnect: true,
-            allowHalfOpen: true,
-        });
-        function handleErr(err) {
-            server.off("listening", handleListen);
-            reject(convertSocketError(err));
-        }
-        function handleListen() {
-            server.off("error", handleErr);
-            server.on("connection", (tcpSocket) => {
-                pollStateReady(socket.pollState);
-                const pollState = createReadableStreamPollState(tcpSocket);
-                socket.pendingAccepts.push({
-                    tcpSocket,
-                    err: null,
-                    pollState,
-                });
-            });
-            server.on("error", (err) => {
-                pollStateReady(socket.pollState);
-                socket.pendingAccepts.push({
-                    tcpSocket: null,
-                    err,
-                    pollState: null,
-                });
-            });
-            resolve();
-        }
-        server.once("listening", handleListen);
-        server.once("error", handleErr);
-        server.listen(handle, socket.listenBacklogSize);
-    }), socket.pollState);
+    socket.future = createFuture(Promise.resolve(), socket.pollState);
 }
 export function socketTcpAccept(id) {
     const socket = tcpSockets.get(id);
@@ -181,9 +205,11 @@ export function socketTcpAccept(id) {
         state: SOCKET_STATE_CONNECTION,
         future: null,
         tcpSocket: accept.tcpSocket,
+        server: null,
+        localAddress: null,
         listenBacklogSize: 128,
-        // @ts-expect-error
-        handle: accept.tcpSocket?._handle,
+        keepAlive: false,
+        keepAliveIdleTime: 0,
         pendingAccepts: [],
         pollState: accept.pollState,
     });
@@ -207,22 +233,22 @@ export function socketTcpSetListenBacklogSize(id, backlogSize) {
     socket.listenBacklogSize = Number(backlogSize);
 }
 export function socketTcpGetLocalAddress(id) {
-    const { handle } = tcpSockets.get(id);
-    const out = {};
-    const code = handle.getsockname(out);
-    if (code !== 0) {
-        throw convertSocketErrorCode(-code);
+    const socket = tcpSockets.get(id);
+    const address = socket.tcpSocket?.address();
+    if (address && typeof address !== "string" && "family" in address) {
+        return ipSocketAddress(address.family.toLowerCase(), address.address, address.port);
+    }
+    if (socket.localAddress) {
+        return socket.localAddress;
     }
-    return ipSocketAddress(out.family.toLowerCase(), out.address, out.port);
+    throw "invalid-state";
 }
 export function socketTcpGetRemoteAddress(id) {
-    const { handle } = tcpSockets.get(id);
-    const out = {};
-    const code = handle.getpeername(out);
-    if (code !== 0) {
-        throw convertSocketErrorCode(-code);
+    const { tcpSocket } = tcpSockets.get(id);
+    if (!tcpSocket?.remoteFamily || !tcpSocket.remoteAddress || !tcpSocket.remotePort) {
+        throw "invalid-state";
     }
-    return ipSocketAddress(out.family.toLowerCase(), out.address, out.port);
+    return ipSocketAddress(tcpSocket.remoteFamily.toLowerCase(), tcpSocket.remoteAddress, tcpSocket.remotePort);
 }
 export function socketTcpShutdown(id, _shutdownType) {
     const socket = tcpSockets.get(id);
@@ -237,15 +263,15 @@ export function socketTcpShutdown(id, _shutdownType) {
     }
 }
 export function socketTcpSetKeepAlive(id, { keepAlive, keepAliveIdleTime }) {
-    const { handle } = tcpSockets.get(id);
-    const code = handle.setKeepAlive(keepAlive, Number(keepAliveIdleTime / 1000000000n));
-    if (code !== 0) {
-        throw convertSocketErrorCode(-code);
-    }
+    const socket = tcpSockets.get(id);
+    socket.keepAlive = keepAlive;
+    socket.keepAliveIdleTime = Number(keepAliveIdleTime / 1000000000n);
+    socket.tcpSocket?.setKeepAlive(socket.keepAlive, socket.keepAliveIdleTime);
 }
 export function socketTcpDispose(id) {
     const socket = tcpSockets.get(id);
     verifyPollsDroppedForDrop(socket.pollState, "tcp socket");
-    socket.handle.close();
+    socket.server?.close();
+    socket.tcpSocket?.destroy();
     tcpSockets.delete(id);
 }

package/dist/io/worker-thread.bundle.js

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import fs, { createReadStream, createWriteStream, read } from "node:fs";
 import process, { hrtime, nextTick, stderr, stdout } from "node:process";
 import { PassThrough, Readable } from "node:stream";
@@ -79,6 +80,7 @@ var calls_exports = /* @__PURE__ */ __exportAll({
 	CLOCKS_DURATION_SUBSCRIBE: () => CLOCKS_DURATION_SUBSCRIBE,
 	CLOCKS_INSTANT_SUBSCRIBE: () => CLOCKS_INSTANT_SUBSCRIBE,
 	FILE: () => FILE,
+	FILESYSTEM_DESCRIPTOR_ADVISE: () => FILESYSTEM_DESCRIPTOR_ADVISE,
 	FILESYSTEM_DESCRIPTOR_CLOSE: () => FILESYSTEM_DESCRIPTOR_CLOSE,
 	FILESYSTEM_DESCRIPTOR_GET_TYPE: () => FILESYSTEM_DESCRIPTOR_GET_TYPE,
 	FILESYSTEM_DESCRIPTOR_METADATA_HASH: () => FILESYSTEM_DESCRIPTOR_METADATA_HASH,
@@ -209,6 +211,7 @@ const OUTPUT_STREAM_DISPOSE = ++call_id << 24;
 const OUTPUT_STREAM_GET_TOTAL_BYTES = ++call_id << 24;
 const FILESYSTEM_DESCRIPTOR_OPEN = ++call_id << 24;
 const FILESYSTEM_DESCRIPTOR_CLOSE = ++call_id << 24;
+const FILESYSTEM_DESCRIPTOR_ADVISE = ++call_id << 24;
 const FILESYSTEM_DESCRIPTOR_SYNC_DATA = ++call_id << 24;
 const FILESYSTEM_DESCRIPTOR_GET_TYPE = ++call_id << 24;
 const FILESYSTEM_DESCRIPTOR_SET_SIZE = ++call_id << 24;
@@ -427,6 +430,8 @@ function getFirstError(e) {
 }
 //#endregion
 //#region dist/io/worker-filesystem.js
+const require = createRequire(import.meta.url);
+let nativeFadvise;
 const closeAsync = promisify(fs.close);
 const fdatasyncAsync = promisify(fs.fdatasync);
 const fstatAsync = promisify(fs.fstat);
@@ -490,6 +495,9 @@ async function releaseFileResource(id) {
 function fileResourceFd(id) {
 	return getFileResource(id).fd;
 }
+function adviseFileResource(id, offset, length, advice) {
+	(nativeFadvise ??= require("@bytecodealliance/jco-node-fs").fadvise)(fileResourceFd(id), offset, length, advice);
+}
 async function syncFileResourceData(id) {
 	await fdatasyncAsync(fileResourceFd(id));
 }
@@ -719,18 +727,19 @@ async function getDefaultReceiveBufferSize() {
 }
 //#endregion
 //#region dist/io/worker-socket-tcp.js
-const { TCP, constants: TCPConstants } = process.binding("tcp_wrap");
 const win = process.platform === "win32";
 const tcpSockets = /* @__PURE__ */ new Map();
 let tcpSocketCnt = 0;
 function createTcpSocket() {
-	const handle = new TCP(TCPConstants.SOCKET);
 	tcpSockets.set(++tcpSocketCnt, {
 		state: SOCKET_STATE_INIT,
 		future: null,
 		tcpSocket: null,
+		server: null,
+		localAddress: null,
 		listenBacklogSize: 128,
-		handle,
+		keepAlive: false,
+		keepAliveIdleTime: 0,
 		pendingAccepts: [],
 		pollState: {
 			ready: true,
@@ -753,7 +762,7 @@ function socketTcpFinish(id, fromState, toState) {
 		throw val;
 	} else {
 		socket.state = toState;
-		if (toState === SOCKET_STATE_LISTENER) socket.pollState.ready = false;
+		if (toState === SOCKET_STATE_LISTENER) socket.pollState.ready = socket.pendingAccepts.length > 0;
 		return val;
 	}
 }
@@ -762,85 +771,109 @@ function socketTcpBindStart(id, localAddress, family) {
 	if (socket.state !== SOCKET_STATE_INIT) throw "invalid-state";
 	if (family !== localAddress.tag || !isUnicastIpAddress(localAddress) || isIPv4MappedAddress(localAddress)) throw "invalid-argument";
 	socket.state = SOCKET_STATE_BIND;
-	const { handle } = socket;
-	socket.future = createFuture((async () => {
+	socket.future = createFuture(new Promise((resolve, reject) => {
 		const address = serializeIpAddress(localAddress);
 		const port = localAddress.val.port;
-		const code = localAddress.tag === "ipv6" ? handle.bind6(address, port, TCPConstants.UV_TCP_IPV6ONLY) : handle.bind(address, port);
-		if (code !== 0) throw convertSocketErrorCode(-code);
-		{
-			const code = handle.getsockname({});
-			if (code !== 0) throw convertSocketErrorCode(-code);
+		const server = socket.server = createTcpServer(socket);
+		function handleErr(err) {
+			server.off("listening", handleListen);
+			reject(convertSocketError(err));
 		}
-	})(), socket.pollState);
+		function handleListen() {
+			server.off("error", handleErr);
+			const boundAddress = server.address();
+			if (!boundAddress || typeof boundAddress === "string") {
+				reject("invalid-state");
+				return;
+			}
+			socket.localAddress = ipSocketAddress(boundAddress.family.toLowerCase(), boundAddress.address, boundAddress.port);
+			resolve();
+		}
+		server.once("listening", handleListen);
+		server.once("error", handleErr);
+		server.listen({
+			host: address ?? void 0,
+			port,
+			backlog: socket.listenBacklogSize,
+			ipv6Only: family === "ipv6"
+		});
+	}), socket.pollState);
+}
+function createTcpServer(socket) {
+	const server = new Server({
+		pauseOnConnect: true,
+		allowHalfOpen: true
+	});
+	server.on("connection", (tcpSocket) => {
+		if (socket.state !== SOCKET_STATE_LISTEN && socket.state !== SOCKET_STATE_LISTENER) {
+			tcpSocket.destroy();
+			return;
+		}
+		pollStateReady(socket.pollState);
+		const pollState = createReadableStreamPollState(tcpSocket);
+		socket.pendingAccepts.push({
+			tcpSocket,
+			err: null,
+			pollState
+		});
+	});
+	server.on("error", (err) => {
+		if (socket.state === SOCKET_STATE_LISTEN || socket.state === SOCKET_STATE_LISTENER) {
+			pollStateReady(socket.pollState);
+			socket.pendingAccepts.push({
+				tcpSocket: null,
+				err,
+				pollState: null
+			});
+		}
+	});
+	return server;
+}
+function closeTcpServer(socket) {
+	const server = socket.server;
+	socket.server = null;
+	if (!server) return Promise.resolve();
+	return new Promise((resolve, reject) => {
+		server.close((err) => err ? reject(err) : resolve());
+	});
 }
 function socketTcpConnectStart(id, remoteAddress, family) {
 	const socket = tcpSockets.get(id);
 	if (socket.state !== SOCKET_STATE_INIT && socket.state !== SOCKET_STATE_BOUND) throw "invalid-state";
 	if (isWildcardAddress(remoteAddress) || family !== remoteAddress.tag || !isUnicastIpAddress(remoteAddress) || isMulticastIpAddress(remoteAddress) || remoteAddress.val.port === 0 || isIPv4MappedAddress(remoteAddress)) throw "invalid-argument";
 	socket.state = SOCKET_STATE_CONNECT;
-	socket.future = createFuture(new Promise((resolve, reject) => {
-		const tcpSocket = socket.tcpSocket = new Socket({
-			handle: socket.handle,
-			pauseOnCreate: true,
-			allowHalfOpen: true
-		});
-		function handleErr(err) {
-			tcpSocket.off("connect", handleConnect);
-			reject(convertSocketError(err));
-		}
-		function handleConnect() {
-			tcpSocket.off("error", handleErr);
-			resolve([createReadableStream(tcpSocket), createWritableStream(tcpSocket)]);
-		}
-		tcpSocket.once("connect", handleConnect);
-		tcpSocket.once("error", handleErr);
-		tcpSocket.connect({
-			port: remoteAddress.val.port,
-			host: serializeIpAddress(remoteAddress) ?? void 0,
-			lookup: noLookup
+	socket.future = createFuture((async () => {
+		const localAddress = socket.localAddress;
+		await closeTcpServer(socket);
+		const tcpSocket = socket.tcpSocket = new Socket({ allowHalfOpen: true });
+		tcpSocket.setKeepAlive(socket.keepAlive, socket.keepAliveIdleTime);
+		await new Promise((resolve, reject) => {
+			function handleErr(err) {
+				tcpSocket.off("connect", handleConnect);
+				reject(convertSocketError(err));
+			}
+			function handleConnect() {
+				tcpSocket.off("error", handleErr);
+				resolve();
+			}
+			tcpSocket.once("connect", handleConnect);
+			tcpSocket.once("error", handleErr);
+			tcpSocket.connect({
+				port: remoteAddress.val.port,
+				host: serializeIpAddress(remoteAddress) ?? void 0,
+				lookup: noLookup,
+				localAddress: localAddress ? serializeIpAddress(localAddress) ?? void 0 : void 0,
+				localPort: localAddress?.val.port
+			});
 		});
-	}), socket.pollState);
+		return [createReadableStream(tcpSocket), createWritableStream(tcpSocket)];
+	})(), socket.pollState);
 }
 function socketTcpListenStart(id) {
 	const socket = tcpSockets.get(id);
 	if (socket.state !== SOCKET_STATE_BOUND) throw "invalid-state";
-	const { handle } = socket;
 	socket.state = SOCKET_STATE_LISTEN;
-	socket.future = createFuture(new Promise((resolve, reject) => {
-		const server = new Server({
-			pauseOnConnect: true,
-			allowHalfOpen: true
-		});
-		function handleErr(err) {
-			server.off("listening", handleListen);
-			reject(convertSocketError(err));
-		}
-		function handleListen() {
-			server.off("error", handleErr);
-			server.on("connection", (tcpSocket) => {
-				pollStateReady(socket.pollState);
-				const pollState = createReadableStreamPollState(tcpSocket);
-				socket.pendingAccepts.push({
-					tcpSocket,
-					err: null,
-					pollState
-				});
-			});
-			server.on("error", (err) => {
-				pollStateReady(socket.pollState);
-				socket.pendingAccepts.push({
-					tcpSocket: null,
-					err,
-					pollState: null
-				});
-			});
-			resolve();
-		}
-		server.once("listening", handleListen);
-		server.once("error", handleErr);
-		server.listen(handle, socket.listenBacklogSize);
-	}), socket.pollState);
+	socket.future = createFuture(Promise.resolve(), socket.pollState);
 }
 function socketTcpAccept(id) {
 	const socket = tcpSockets.get(id);
@@ -856,8 +889,11 @@ function socketTcpAccept(id) {
 		state: SOCKET_STATE_CONNECTION,
 		future: null,
 		tcpSocket: accept.tcpSocket,
+		server: null,
+		localAddress: null,
 		listenBacklogSize: 128,
-		handle: accept.tcpSocket?._handle,
+		keepAlive: false,
+		keepAliveIdleTime: 0,
 		pendingAccepts: [],
 		pollState: accept.pollState
 	});
@@ -874,18 +910,16 @@ function socketTcpSetListenBacklogSize(id, backlogSize) {
 	socket.listenBacklogSize = Number(backlogSize);
 }
 function socketTcpGetLocalAddress(id) {
-	const { handle } = tcpSockets.get(id);
-	const out = {};
-	const code = handle.getsockname(out);
-	if (code !== 0) throw convertSocketErrorCode(-code);
-	return ipSocketAddress(out.family.toLowerCase(), out.address, out.port);
+	const socket = tcpSockets.get(id);
+	const address = socket.tcpSocket?.address();
+	if (address && typeof address !== "string" && "family" in address) return ipSocketAddress(address.family.toLowerCase(), address.address, address.port);
+	if (socket.localAddress) return socket.localAddress;
+	throw "invalid-state";
 }
 function socketTcpGetRemoteAddress(id) {
-	const { handle } = tcpSockets.get(id);
-	const out = {};
-	const code = handle.getpeername(out);
-	if (code !== 0) throw convertSocketErrorCode(-code);
-	return ipSocketAddress(out.family.toLowerCase(), out.address, out.port);
+	const { tcpSocket } = tcpSockets.get(id);
+	if (!tcpSocket?.remoteFamily || !tcpSocket.remoteAddress || !tcpSocket.remotePort) throw "invalid-state";
+	return ipSocketAddress(tcpSocket.remoteFamily.toLowerCase(), tcpSocket.remoteAddress, tcpSocket.remotePort);
 }
 function socketTcpShutdown(id, _shutdownType) {
 	const socket = tcpSockets.get(id);
@@ -894,14 +928,16 @@ function socketTcpShutdown(id, _shutdownType) {
 	else socket.tcpSocket?.destroy();
 }
 function socketTcpSetKeepAlive(id, { keepAlive, keepAliveIdleTime }) {
-	const { handle } = tcpSockets.get(id);
-	const code = handle.setKeepAlive(keepAlive, Number(keepAliveIdleTime / 1000000000n));
-	if (code !== 0) throw convertSocketErrorCode(-code);
+	const socket = tcpSockets.get(id);
+	socket.keepAlive = keepAlive;
+	socket.keepAliveIdleTime = Number(keepAliveIdleTime / 1000000000n);
+	socket.tcpSocket?.setKeepAlive(socket.keepAlive, socket.keepAliveIdleTime);
 }
 function socketTcpDispose(id) {
 	const socket = tcpSockets.get(id);
 	verifyPollsDroppedForDrop(socket.pollState, "tcp socket");
-	socket.handle.close();
+	socket.server?.close();
+	socket.tcpSocket?.destroy();
 	tcpSockets.delete(id);
 }
 //#endregion
@@ -1556,6 +1592,7 @@ function handle(call, id, payload) {
 		}
 		case FILESYSTEM_DESCRIPTOR_OPEN: return openFileResource(payload.path, payload.flags);
 		case FILESYSTEM_DESCRIPTOR_CLOSE: return releaseFileResource(id);
+		case FILESYSTEM_DESCRIPTOR_ADVISE: return adviseFileResource(id, payload.offset, payload.length, payload.advice);
 		case FILESYSTEM_DESCRIPTOR_SYNC_DATA: return syncFileResourceData(id);
 		case FILESYSTEM_DESCRIPTOR_GET_TYPE: return getFileResourceType(id);
 		case FILESYSTEM_DESCRIPTOR_SET_SIZE: return setFileResourceSize(id, payload);

package/dist/io/worker-thread.js

@@ -6,8 +6,8 @@ import { clearOutgoingResponse, createHttpRequest, setOutgoingResponse, startHtt
 import { Readable } from "node:stream";
 import { read } from "node:fs";
 import { nextTick } from "node:process";
-import { CALL_MASK, CALL_TYPE_MASK, CLOCKS_DURATION_SUBSCRIBE, CLOCKS_INSTANT_SUBSCRIBE, FILE, FILESYSTEM_DESCRIPTOR_CLOSE, FILESYSTEM_DESCRIPTOR_GET_TYPE, FILESYSTEM_DESCRIPTOR_METADATA_HASH, FILESYSTEM_DESCRIPTOR_OPEN, FILESYSTEM_DESCRIPTOR_READ, FILESYSTEM_DESCRIPTOR_SET_SIZE, FILESYSTEM_DESCRIPTOR_SET_TIMES, FILESYSTEM_DESCRIPTOR_STAT, FILESYSTEM_DESCRIPTOR_SYNC, FILESYSTEM_DESCRIPTOR_SYNC_DATA, FILESYSTEM_DESCRIPTOR_WRITE, FUTURE_DISPOSE, FUTURE_SUBSCRIBE, FUTURE_TAKE_VALUE, HTTP, HTTP_CREATE_REQUEST, HTTP_OUTGOING_BODY_DISPOSE, HTTP_OUTPUT_STREAM_FINISH, HTTP_SERVER_CLEAR_OUTGOING_RESPONSE, HTTP_SERVER_SET_OUTGOING_RESPONSE, HTTP_SERVER_START, HTTP_SERVER_STOP, HTTP_SERVER_GET_ADDRESS, INPUT_STREAM_BLOCKING_READ, INPUT_STREAM_BLOCKING_SKIP, INPUT_STREAM_CREATE, INPUT_STREAM_DISPOSE, INPUT_STREAM_READ, INPUT_STREAM_SKIP, INPUT_STREAM_SUBSCRIBE, OUTPUT_STREAM_BLOCKING_FLUSH, OUTPUT_STREAM_BLOCKING_SPLICE, OUTPUT_STREAM_BLOCKING_WRITE_AND_FLUSH, OUTPUT_STREAM_BLOCKING_WRITE_ZEROES_AND_FLUSH, OUTPUT_STREAM_CHECK_WRITE, OUTPUT_STREAM_CREATE, OUTPUT_STREAM_DISPOSE, OUTPUT_STREAM_FLUSH, OUTPUT_STREAM_SPLICE, OUTPUT_STREAM_SUBSCRIBE, OUTPUT_STREAM_WRITE, OUTPUT_STREAM_WRITE_ZEROES, POLL_POLLABLE_BLOCK, POLL_POLLABLE_DISPOSE, POLL_POLLABLE_READY, POLL_POLL_LIST, SOCKET_RESOLVE_ADDRESS_CREATE_REQUEST, SOCKET_RESOLVE_ADDRESS_SUBSCRIBE_REQUEST, SOCKET_RESOLVE_ADDRESS_DISPOSE_REQUEST, SOCKET_RESOLVE_ADDRESS_TAKE_REQUEST, SOCKET_GET_DEFAULT_RECEIVE_BUFFER_SIZE, SOCKET_GET_DEFAULT_SEND_BUFFER_SIZE, SOCKET_TCP_ACCEPT, SOCKET_TCP_BIND_FINISH, SOCKET_TCP_BIND_START, SOCKET_TCP_CONNECT_FINISH, SOCKET_TCP_CONNECT_START, SOCKET_TCP_CREATE_HANDLE, SOCKET_TCP_DISPOSE, SOCKET_TCP_GET_LOCAL_ADDRESS, SOCKET_TCP_GET_REMOTE_ADDRESS, SOCKET_TCP_IS_LISTENING, SOCKET_TCP_LISTEN_FINISH, SOCKET_TCP_LISTEN_START, SOCKET_TCP_SET_KEEP_ALIVE, SOCKET_TCP_SET_LISTEN_BACKLOG_SIZE, SOCKET_TCP_SHUTDOWN, SOCKET_TCP_SUBSCRIBE, SOCKET_UDP_BIND_FINISH, SOCKET_UDP_BIND_START, SOCKET_UDP_CREATE_HANDLE, SOCKET_UDP_DISPOSE, SOCKET_UDP_GET_LOCAL_ADDRESS, SOCKET_UDP_GET_RECEIVE_BUFFER_SIZE, SOCKET_UDP_GET_REMOTE_ADDRESS, SOCKET_UDP_GET_SEND_BUFFER_SIZE, SOCKET_UDP_GET_UNICAST_HOP_LIMIT, SOCKET_UDP_SET_RECEIVE_BUFFER_SIZE, SOCKET_UDP_SET_SEND_BUFFER_SIZE, SOCKET_UDP_SET_UNICAST_HOP_LIMIT, SOCKET_UDP_STREAM, SOCKET_UDP_SUBSCRIBE, SOCKET_INCOMING_DATAGRAM_STREAM_RECEIVE, SOCKET_OUTGOING_DATAGRAM_STREAM_CHECK_SEND, SOCKET_OUTGOING_DATAGRAM_STREAM_SEND, SOCKET_DATAGRAM_STREAM_SUBSCRIBE, SOCKET_DATAGRAM_STREAM_DISPOSE, STDERR, STDIN, STDOUT, reverseMap, } from "./calls.js";
-import { fileResourceFd, getFileResourceType, metadataHashFileResource, openFileResource, readFileResource, releaseFileResource, retainFileResource, setFileResourceSize, setFileResourceTimes, statFileResource, syncFileResource, syncFileResourceData, writeFileResource, } from "./worker-filesystem.js";
+import { CALL_MASK, CALL_TYPE_MASK, CLOCKS_DURATION_SUBSCRIBE, CLOCKS_INSTANT_SUBSCRIBE, FILE, FILESYSTEM_DESCRIPTOR_ADVISE, FILESYSTEM_DESCRIPTOR_CLOSE, FILESYSTEM_DESCRIPTOR_GET_TYPE, FILESYSTEM_DESCRIPTOR_METADATA_HASH, FILESYSTEM_DESCRIPTOR_OPEN, FILESYSTEM_DESCRIPTOR_READ, FILESYSTEM_DESCRIPTOR_SET_SIZE, FILESYSTEM_DESCRIPTOR_SET_TIMES, FILESYSTEM_DESCRIPTOR_STAT, FILESYSTEM_DESCRIPTOR_SYNC, FILESYSTEM_DESCRIPTOR_SYNC_DATA, FILESYSTEM_DESCRIPTOR_WRITE, FUTURE_DISPOSE, FUTURE_SUBSCRIBE, FUTURE_TAKE_VALUE, HTTP, HTTP_CREATE_REQUEST, HTTP_OUTGOING_BODY_DISPOSE, HTTP_OUTPUT_STREAM_FINISH, HTTP_SERVER_CLEAR_OUTGOING_RESPONSE, HTTP_SERVER_SET_OUTGOING_RESPONSE, HTTP_SERVER_START, HTTP_SERVER_STOP, HTTP_SERVER_GET_ADDRESS, INPUT_STREAM_BLOCKING_READ, INPUT_STREAM_BLOCKING_SKIP, INPUT_STREAM_CREATE, INPUT_STREAM_DISPOSE, INPUT_STREAM_READ, INPUT_STREAM_SKIP, INPUT_STREAM_SUBSCRIBE, OUTPUT_STREAM_BLOCKING_FLUSH, OUTPUT_STREAM_BLOCKING_SPLICE, OUTPUT_STREAM_BLOCKING_WRITE_AND_FLUSH, OUTPUT_STREAM_BLOCKING_WRITE_ZEROES_AND_FLUSH, OUTPUT_STREAM_CHECK_WRITE, OUTPUT_STREAM_CREATE, OUTPUT_STREAM_DISPOSE, OUTPUT_STREAM_FLUSH, OUTPUT_STREAM_SPLICE, OUTPUT_STREAM_SUBSCRIBE, OUTPUT_STREAM_WRITE, OUTPUT_STREAM_WRITE_ZEROES, POLL_POLLABLE_BLOCK, POLL_POLLABLE_DISPOSE, POLL_POLLABLE_READY, POLL_POLL_LIST, SOCKET_RESOLVE_ADDRESS_CREATE_REQUEST, SOCKET_RESOLVE_ADDRESS_SUBSCRIBE_REQUEST, SOCKET_RESOLVE_ADDRESS_DISPOSE_REQUEST, SOCKET_RESOLVE_ADDRESS_TAKE_REQUEST, SOCKET_GET_DEFAULT_RECEIVE_BUFFER_SIZE, SOCKET_GET_DEFAULT_SEND_BUFFER_SIZE, SOCKET_TCP_ACCEPT, SOCKET_TCP_BIND_FINISH, SOCKET_TCP_BIND_START, SOCKET_TCP_CONNECT_FINISH, SOCKET_TCP_CONNECT_START, SOCKET_TCP_CREATE_HANDLE, SOCKET_TCP_DISPOSE, SOCKET_TCP_GET_LOCAL_ADDRESS, SOCKET_TCP_GET_REMOTE_ADDRESS, SOCKET_TCP_IS_LISTENING, SOCKET_TCP_LISTEN_FINISH, SOCKET_TCP_LISTEN_START, SOCKET_TCP_SET_KEEP_ALIVE, SOCKET_TCP_SET_LISTEN_BACKLOG_SIZE, SOCKET_TCP_SHUTDOWN, SOCKET_TCP_SUBSCRIBE, SOCKET_UDP_BIND_FINISH, SOCKET_UDP_BIND_START, SOCKET_UDP_CREATE_HANDLE, SOCKET_UDP_DISPOSE, SOCKET_UDP_GET_LOCAL_ADDRESS, SOCKET_UDP_GET_RECEIVE_BUFFER_SIZE, SOCKET_UDP_GET_REMOTE_ADDRESS, SOCKET_UDP_GET_SEND_BUFFER_SIZE, SOCKET_UDP_GET_UNICAST_HOP_LIMIT, SOCKET_UDP_SET_RECEIVE_BUFFER_SIZE, SOCKET_UDP_SET_SEND_BUFFER_SIZE, SOCKET_UDP_SET_UNICAST_HOP_LIMIT, SOCKET_UDP_STREAM, SOCKET_UDP_SUBSCRIBE, SOCKET_INCOMING_DATAGRAM_STREAM_RECEIVE, SOCKET_OUTGOING_DATAGRAM_STREAM_CHECK_SEND, SOCKET_OUTGOING_DATAGRAM_STREAM_SEND, SOCKET_DATAGRAM_STREAM_SUBSCRIBE, SOCKET_DATAGRAM_STREAM_DISPOSE, STDERR, STDIN, STDOUT, reverseMap, } from "./calls.js";
+import { adviseFileResource, fileResourceFd, getFileResourceType, metadataHashFileResource, openFileResource, readFileResource, releaseFileResource, retainFileResource, setFileResourceSize, setFileResourceTimes, statFileResource, syncFileResource, syncFileResourceData, writeFileResource, } from "./worker-filesystem.js";
 import { SOCKET_STATE_BIND, SOCKET_STATE_BOUND, SOCKET_STATE_CONNECT, SOCKET_STATE_CONNECTION, SOCKET_STATE_LISTEN, SOCKET_STATE_LISTENER, socketResolveAddress, getDefaultSendBufferSize, getDefaultReceiveBufferSize, } from "./worker-sockets.js";
 import { createTcpSocket, socketTcpAccept, socketTcpBindStart, socketTcpConnectStart, socketTcpDispose, socketTcpFinish, socketTcpGetLocalAddress, socketTcpGetRemoteAddress, socketTcpListenStart, socketTcpSetKeepAlive, socketTcpSetListenBacklogSize, socketTcpShutdown, tcpSockets, } from "./worker-socket-tcp.js";
 import { createUdpSocket, datagramStreams, socketDatagramStreamDispose, socketIncomingDatagramStreamReceive, socketOutgoingDatagramStreamCheckSend, socketOutgoingDatagramStreamSend, socketUdpBindFinish, socketUdpBindStart, socketUdpDispose, socketUdpGetLocalAddress, socketUdpGetReceiveBufferSize, socketUdpGetRemoteAddress, socketUdpGetSendBufferSize, socketUdpGetUnicastHopLimit, socketUdpSetReceiveBufferSize, socketUdpSetSendBufferSize, socketUdpSetUnicastHopLimit, socketUdpStream, udpSockets, } from "./worker-socket-udp.js";
@@ -370,6 +370,8 @@ function handle(call, id, payload) {
             return openFileResource(payload.path, payload.flags);
         case FILESYSTEM_DESCRIPTOR_CLOSE:
             return releaseFileResource(id);
+        case FILESYSTEM_DESCRIPTOR_ADVISE:
+            return adviseFileResource(id, payload.offset, payload.length, payload.advice);
         case FILESYSTEM_DESCRIPTOR_SYNC_DATA:
             return syncFileResourceData(id);
         case FILESYSTEM_DESCRIPTOR_GET_TYPE:

package/dist/nodejs/filesystem.d.ts

@@ -13,7 +13,7 @@ declare class Descriptor implements IDescriptor {
     readViaStream(offset: any): any;
     writeViaStream(offset: any): any;
     appendViaStream(): any;
-    advise(_offset: any, _length: any, _advice: any): void;
+    advise(offset: any, length: any, advice: any): void;
     syncData(): void;
     getFlags(): any;
     getType(): any;

package/dist/nodejs/filesystem.js

@@ -1,5 +1,5 @@
 import { earlyDispose, inputStreamCreate, ioCall, outputStreamCreate, registerDispose, } from "../io/worker-io.js";
-import { FILE, FILESYSTEM_DESCRIPTOR_CLOSE, FILESYSTEM_DESCRIPTOR_GET_TYPE, FILESYSTEM_DESCRIPTOR_METADATA_HASH, FILESYSTEM_DESCRIPTOR_OPEN, FILESYSTEM_DESCRIPTOR_READ, FILESYSTEM_DESCRIPTOR_SET_SIZE, FILESYSTEM_DESCRIPTOR_SET_TIMES, FILESYSTEM_DESCRIPTOR_STAT, FILESYSTEM_DESCRIPTOR_SYNC, FILESYSTEM_DESCRIPTOR_SYNC_DATA, FILESYSTEM_DESCRIPTOR_WRITE, INPUT_STREAM_CREATE, OUTPUT_STREAM_CREATE, } from "../io/calls.js";
+import { FILE, FILESYSTEM_DESCRIPTOR_ADVISE, FILESYSTEM_DESCRIPTOR_CLOSE, FILESYSTEM_DESCRIPTOR_GET_TYPE, FILESYSTEM_DESCRIPTOR_METADATA_HASH, FILESYSTEM_DESCRIPTOR_OPEN, FILESYSTEM_DESCRIPTOR_READ, FILESYSTEM_DESCRIPTOR_SET_SIZE, FILESYSTEM_DESCRIPTOR_SET_TIMES, FILESYSTEM_DESCRIPTOR_STAT, FILESYSTEM_DESCRIPTOR_SYNC, FILESYSTEM_DESCRIPTOR_SYNC_DATA, FILESYSTEM_DESCRIPTOR_WRITE, INPUT_STREAM_CREATE, OUTPUT_STREAM_CREATE, } from "../io/calls.js";
 import { constants, linkSync, lstatSync, lutimesSync, mkdirSync, opendirSync, readlinkSync, renameSync, rmdirSync, statSync, symlinkSync, unlinkSync, utimesSync, } from "node:fs";
 import { platform } from "node:process";
 const symbolDispose = Symbol.dispose || Symbol.for("dispose");
@@ -100,10 +100,20 @@ class Descriptor {
     appendViaStream() {
         return this.writeViaStream(this.stat().size);
     }
-    advise(_offset, _length, _advice) {
+    advise(offset, length, advice) {
         if (this.getType() === "directory") {
             throw "bad-descriptor";
         }
+        try {
+            ioCall(FILESYSTEM_DESCRIPTOR_ADVISE, this.#fileResourceId, {
+                offset,
+                length,
+                advice,
+            });
+        }
+        catch (e) {
+            throw convertFsError(e);
+        }
     }
     syncData() {
         if (this.#hostPreopen) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview2-shim",
-  "version": "0.20.2",
+  "version": "0.22.0",
   "description": "WASI Preview2 shim for JS environments",
   "homepage": "https://github.com/bytecodealliance/jco#readme",
   "bugs": {
@@ -56,6 +56,9 @@
       "types": "./types/interfaces/*.d.ts"
     }
   },
+  "dependencies": {
+    "@bytecodealliance/jco-node-fs": "0.2.0"
+  },
   "devDependencies": {
     "@bytecodealliance/componentize-js": "0.22.0",
     "@bytecodealliance/jco": "1.25.2",