@bytecodealliance/preview3-shim 0.6.0 → 0.6.1

package/dist/nodejs/workers/tcp-worker.bundle.js

@@ -1,4 +1,4 @@
-import { Server, Socket } from "node:net";
+import net, { Server, Socket } from "node:net";
 import { once } from "node:events";
 import { isMainThread, parentPort } from "worker_threads";
 //#region dist/nodejs/workers/resource-worker.js
@@ -252,6 +252,7 @@ var SocketError = class SocketError extends Error {
 };
 //#endregion
 //#region dist/nodejs/workers/tcp-worker.js
+const BoundSocket = net.BoundSocket;
 const sockets = /* @__PURE__ */ new Map();
 let NEXT_SOCKET_ID = 0n;
 Router().beforeAll((msg) => {
@@ -263,6 +264,7 @@ function handleTcpCreate({ family }) {
 		family,
 		tcp: null,
 		server: null,
+		bound: null,
 		acceptWriter: null,
 		backlog: 128,
 		localAddress: null,
@@ -283,6 +285,17 @@ async function handleTcpBind({ socketId, localAddress }) {
 		err.code = "EADDRINUSE";
 		throw err;
 	}
+	if (BoundSocket) {
+		const bound = new BoundSocket({
+			host: address,
+			port,
+			ipv6Only: family === "ipv6"
+		});
+		const boundAddress = bound.address();
+		socket.bound = bound;
+		socket.localAddress = makeIpAddress(boundAddress.family.toLowerCase(), boundAddress.address, boundAddress.port);
+		return;
+	}
 	const server = socket.server = createTcpServer(socket);
 	const onListening = once(server, "listening");
 	server.listen({
@@ -300,16 +313,20 @@ async function handleTcpConnect({ socketId, remoteAddress }) {
 	const socket = sockets.get(socketId);
 	const host = serializeIpAddress(remoteAddress);
 	const port = remoteAddress.val.port;
-	const localAddress = socket.localAddress;
+	const { bound, localAddress } = socket;
+	socket.bound = null;
 	await closeTcpServer(socket);
-	const tcp = socket.tcp = new Socket({ allowHalfOpen: true });
+	const tcp = socket.tcp = new Socket({
+		handle: bound ?? void 0,
+		allowHalfOpen: true
+	});
 	tcp.setKeepAlive(socket.keepAliveEnabled, socket.keepAliveIdleTime);
 	const onConnect = once(tcp, "connect");
 	tcp.connect({
 		port,
 		host,
-		localAddress: localAddress ? serializeIpAddress(localAddress) : void 0,
-		localPort: localAddress?.val.port
+		localAddress: !bound && localAddress ? serializeIpAddress(localAddress) : void 0,
+		localPort: !bound ? localAddress?.val.port : void 0
 	});
 	await onConnect;
 }
@@ -322,7 +339,13 @@ async function handleTcpListen({ socketId, stream }) {
 	if (!server) {
 		server = socket.server = createTcpServer(socket);
 		const onListening = once(server, "listening");
-		server.listen({
+		const bound = socket.bound;
+		socket.bound = null;
+		if (bound) server.listen({
+			handle: bound,
+			backlog
+		});
+		else server.listen({
 			host: family === "ipv6" ? "::" : "0.0.0.0",
 			port: 0,
 			backlog,
@@ -352,6 +375,7 @@ function createTcpServer(socket) {
 			backlog: socket.backlog,
 			tcp: conn,
 			server: null,
+			bound: null,
 			acceptWriter: null,
 			localAddress: makeIpAddress(socket.family, conn.localAddress, conn.localPort),
 			keepAliveEnabled: socket.keepAliveEnabled,
@@ -466,6 +490,10 @@ async function handleTcpReceive({ socketId, stream }) {
 }
 function cleanupDisposedSocket(socketId, socket) {
 	if (!socket.disposed || socket.activeStreams > 0) return;
+	if (socket.bound) {
+		socket.bound.close();
+		socket.bound = null;
+	}
 	if (socket.server) socket.server.close();
 	if (socket.tcp) socket.tcp.destroy();
 	sockets.delete(socketId);

package/dist/nodejs/workers/tcp-worker.js

@@ -1,8 +1,13 @@
-import { Socket, Server } from "node:net";
+import net, { Socket, Server } from "node:net";
 import { once } from "node:events";
 import { Router } from "../workers/resource-worker.js";
 import { serializeIpAddress, makeIpAddress, ipAddressConflict } from "../sockets/address.js";
 import { SocketError } from "../sockets/error.js";
+// node:net gained a standalone bind API in v26.4 (also on v24.x). It holds the
+// endpoint with a real bind(2) until a Socket or Server adopts it, so connect and
+// listen never have to release the port and reacquire it. Older releases fall
+// back to reserving the endpoint with a listening server.
+const BoundSocket = net.BoundSocket;
 // Socket instances stored by ID
 const sockets = new Map();
 // Unique IDs for sockets
@@ -34,6 +39,7 @@ function handleTcpCreate({ family }) {
         family,
         tcp: null,
         server: null,
+        bound: null,
         acceptWriter: null,
         backlog: 128,
         localAddress: null,
@@ -56,8 +62,15 @@ async function handleTcpBind({ socketId, localAddress }) {
         err.code = "EADDRINUSE";
         throw err;
     }
-    // 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.
+    if (BoundSocket) {
+        const bound = new BoundSocket({ host: address, port, ipv6Only: family === "ipv6" });
+        const boundAddress = bound.address();
+        socket.bound = bound;
+        socket.localAddress = makeIpAddress(boundAddress.family.toLowerCase(), boundAddress.address, boundAddress.port);
+        return;
+    }
+    // Without a standalone 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));
     const onListening = once(server, "listening");
     server.listen({
@@ -78,19 +91,24 @@ async function handleTcpConnect({ socketId, remoteAddress }) {
     const socket = sockets.get(socketId);
     const host = serializeIpAddress(remoteAddress);
     const port = remoteAddress.val.port;
-    const localAddress = socket.localAddress;
+    const { bound, localAddress } = socket;
+    socket.bound = null;
     await closeTcpServer(socket);
-    const tcp = (socket.tcp = new Socket({
-        allowHalfOpen: true,
-    }));
+    // An adopted bound handle already owns the local endpoint, so the connect
+    // must not name it again. Without one, the reservation server released the
+    // endpoint just above and the client re-binds it here.
+    // @types/node does not yet declare the `handle` option, so it is passed via a
+    // variable to skip the object literal excess property check.
+    const socketOptions = { handle: bound ?? undefined, allowHalfOpen: true };
+    const tcp = (socket.tcp = new Socket(socketOptions));
     tcp.setKeepAlive(socket.keepAliveEnabled, socket.keepAliveIdleTime);
     // TODO(tandr): Add lookup
     const onConnect = once(tcp, "connect");
     tcp.connect({
         port,
         host,
-        localAddress: localAddress ? serializeIpAddress(localAddress) : undefined,
-        localPort: localAddress?.val.port,
+        localAddress: !bound && localAddress ? serializeIpAddress(localAddress) : undefined,
+        localPort: !bound ? localAddress?.val.port : undefined,
     });
     // events.once rejects when the emitter produces an error while waiting and
     // removes its temporary listeners after settling. A separate error promise
@@ -107,12 +125,19 @@ async function handleTcpListen({ socketId, stream }) {
     if (!server) {
         server = socket.server = createTcpServer(socket);
         const onListening = once(server, "listening");
-        server.listen({
-            host: family === "ipv6" ? "::" : "0.0.0.0",
-            port: 0,
-            backlog,
-            ipv6Only: family === "ipv6",
-        });
+        const bound = socket.bound;
+        socket.bound = null;
+        if (bound) {
+            server.listen({ handle: bound, backlog });
+        }
+        else {
+            server.listen({
+                host: family === "ipv6" ? "::" : "0.0.0.0",
+                port: 0,
+                backlog,
+                ipv6Only: family === "ipv6",
+            });
+        }
         await onListening;
     }
     const addr = server.address();
@@ -141,6 +166,7 @@ function createTcpServer(socket) {
             backlog: socket.backlog,
             tcp: conn,
             server: null,
+            bound: null,
             acceptWriter: null,
             localAddress: makeIpAddress(socket.family, conn.localAddress, conn.localPort),
             keepAliveEnabled: socket.keepAliveEnabled,
@@ -286,6 +312,10 @@ function cleanupDisposedSocket(socketId, socket) {
     if (!socket.disposed || socket.activeStreams > 0) {
         return;
     }
+    if (socket.bound) {
+        socket.bound.close();
+        socket.bound = null;
+    }
     if (socket.server) {
         socket.server.close();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytecodealliance/preview3-shim",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "WASI Preview3 shim for JS environments",
   "homepage": "https://github.com/bytecodealliance/jco/blob/main/packages/preview3-shim/#readme",
   "bugs": {
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "@bytecodealliance/jco-node-fs": "0.3.2",
-    "@bytecodealliance/preview2-shim": "^0.24.1"
+    "@bytecodealliance/preview2-shim": "^0.25.0"
   },
   "devDependencies": {
     "@types/node": "^24.12.4",
@@ -57,7 +57,7 @@
     "rolldown": "^1.2.4",
     "typescript": "7.0.2",
     "vite": "^8.0.16",
-    "vitest": "^4.1.10"
+    "vitest": "^4.1.11"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json && node scripts/build-workers.mjs",
@@ -68,7 +68,7 @@
     "lint": "oxlint",
     "lint:fix": "oxlint --fix",
     "pretest": "pnpm run build",
-    "test": "vitest --run",
+    "test": "vitest --run -c test/vitest.ts",
     "prebench": "pnpm run build",
     "bench": "vitest bench --run"
   }