@php-wasm/node-7-4 3.1.34 → 3.1.36

package/asyncify/php_7_4.js

@@ -6243,6 +6243,7 @@ export function init(RuntimeName, PHPLoader) {
 		O_NONBLOCK: 2048,
 		POLLHUP: 16,
 		SETFL_MASK: 3072,
+		socketTimeouts: new Map,
 		init: function () {
 			// TODO: Move this to a library function that is made an onInit callback by the `__postset` suffix.
 			if (PHPLoader.bindUserSpace) {
@@ -6672,6 +6673,29 @@ export function init(RuntimeName, PHPLoader) {
 			return [promise, cancel];
 		},
 		noop: function () {},
+		parseSocketTimeout: function (optionValuePtr, optionLen) {
+			if (!optionValuePtr || optionLen < 8) {
+				return null;
+			}
+			let seconds;
+			let microseconds;
+			if (optionLen >= 16) {
+				seconds = Number(HEAP64[optionValuePtr >> 3]);
+				microseconds = Number(HEAP64[(optionValuePtr + 8) >> 3]);
+			} else {
+				seconds = HEAP32[optionValuePtr >> 2];
+				microseconds = HEAP32[(optionValuePtr + 4) >> 2];
+			}
+			if (
+				!Number.isFinite(seconds) ||
+				!Number.isFinite(microseconds) ||
+				seconds < 0 ||
+				microseconds < 0
+			) {
+				return null;
+			}
+			return seconds * 1e3 + Math.ceil(microseconds / 1e3);
+		},
 		spawnProcess: function (command, args, options) {
 			if (Module['spawnProcess']) {
 				const spawned = Module['spawnProcess'](
@@ -6720,6 +6744,7 @@ export function init(RuntimeName, PHPLoader) {
 			throw e;
 		},
 		shutdownSocket: function (socketd, how) {
+			PHPWASM.socketTimeouts.delete(socketd);
 			// This implementation only supports websockets at the moment
 			const sock = getSocketFromFD(socketd);
 			const peer = Object.values(sock.peers)[0];
@@ -6804,43 +6829,74 @@ export function init(RuntimeName, PHPLoader) {
 				wakeUp(-ERRNO_CODES.ECONNREFUSED);
 				return;
 			}
-			// Wait for the connection to be established
-			const timeout = 3e4;
-			// 30 second timeout
+			// Wait for the connection to be established. A zero timeval
+			// disables the timeout, matching SO_SNDTIMEO semantics.
+			const sendTimeout = PHPWASM.socketTimeouts.get(sockfd)?.send;
+			const timeout = sendTimeout ?? 3e4;
 			let resolved = false;
-			const timeoutId = setTimeout(() => {
-				if (!resolved) {
-					resolved = true;
-					wakeUp(-ERRNO_CODES.ETIMEDOUT);
-				}
-			}, timeout);
-			const handleOpen = () => {
-				if (!resolved) {
-					resolved = true;
+			let timeoutId;
+			let handleOpen;
+			let handleError;
+			let handleClose;
+			const peer = PHPWASM.getAllPeers(sock).find(
+				(candidate) => candidate.socket === ws
+			);
+
+			const cleanupConnectListeners = () => {
+				if (typeof timeoutId !== 'undefined') {
 					clearTimeout(timeoutId);
-					ws.removeEventListener('error', handleError);
-					ws.removeEventListener('close', handleClose);
-					wakeUp(0);
 				}
+				ws.removeEventListener('open', handleOpen);
+				ws.removeEventListener('error', handleError);
+				ws.removeEventListener('close', handleClose);
 			};
-			const handleError = () => {
-				if (!resolved) {
-					resolved = true;
-					clearTimeout(timeoutId);
-					ws.removeEventListener('open', handleOpen);
-					ws.removeEventListener('close', handleClose);
-					wakeUp(-ERRNO_CODES.ECONNREFUSED);
+
+			const cleanupFailedConnect = (errno) => {
+				try {
+					if (
+						ws.readyState !== ws.CLOSING &&
+						ws.readyState !== ws.CLOSED
+					) {
+						ws.close();
+					}
+				} catch (e) {
+					// Ignore close errors on an already-failed connect.
+				}
+				if (peer) {
+					SOCKFS.websocket_sock_ops.removePeer(sock, peer);
 				}
+				sock.connecting = false;
+				sock.error = errno;
 			};
-			const handleClose = () => {
+
+			const finishConnect = (result) => {
 				if (!resolved) {
 					resolved = true;
-					clearTimeout(timeoutId);
-					ws.removeEventListener('open', handleOpen);
-					ws.removeEventListener('error', handleError);
-					wakeUp(-ERRNO_CODES.ECONNREFUSED);
+					cleanupConnectListeners();
+					if (result < 0) {
+						cleanupFailedConnect(-result);
+					}
+					wakeUp(result);
 				}
 			};
+
+			if (timeout > 0) {
+				timeoutId = setTimeout(() => {
+					finishConnect(-ERRNO_CODES.ETIMEDOUT);
+				}, timeout);
+			}
+
+			handleOpen = () => {
+				finishConnect(0);
+			};
+
+			handleError = () => {
+				finishConnect(-ERRNO_CODES.ECONNREFUSED);
+			};
+
+			handleClose = () => {
+				finishConnect(-ERRNO_CODES.ECONNREFUSED);
+			};
 			ws.addEventListener('open', handleOpen);
 			ws.addEventListener('error', handleError);
 			ws.addEventListener('close', handleClose);
@@ -9800,25 +9856,35 @@ export function init(RuntimeName, PHPLoader) {
 		const SO_SNDTIMEO = 67;
 		const IPPROTO_TCP = 6;
 		const TCP_NODELAY = 1;
-		// Options that we can forward to the WebSocket proxy
+		if (
+			level === SOL_SOCKET &&
+			(optionName === SO_RCVTIMEO || optionName === SO_SNDTIMEO)
+		) {
+			const timeoutMs = PHPWASM.parseSocketTimeout(
+				optionValuePtr,
+				optionLen
+			);
+			if (timeoutMs === null) {
+				return -1;
+			}
+			const timeouts = PHPWASM.socketTimeouts.get(socketd) || {};
+			if (optionName === SO_RCVTIMEO) {
+				timeouts.receive = timeoutMs;
+			} else {
+				timeouts.send = timeoutMs;
+			}
+			PHPWASM.socketTimeouts.set(socketd, timeouts);
+			return 0;
+		}
 		const isForwardable =
 			(level === SOL_SOCKET && optionName === SO_KEEPALIVE) ||
 			(level === IPPROTO_TCP && optionName === TCP_NODELAY);
-		// Options that we acknowledge but don't actually implement
-		// (WebSocket connections handle timeouts differently)
-		const isIgnorable =
-			level === SOL_SOCKET &&
-			(optionName === SO_RCVTIMEO || optionName === SO_SNDTIMEO);
-		if (!isForwardable && !isIgnorable) {
+		if (!isForwardable) {
 			console.warn(
 				`Unsupported socket option: ${level}, ${optionName}, ${optionValue}`
 			);
 			return -1;
 		}
-		// For ignorable options, just return success
-		if (isIgnorable) {
-			return 0;
-		}
 		const ws = PHPWASM.getAllWebSockets(socketd)[0];
 		if (!ws) {
 			return -1;
@@ -10181,7 +10247,15 @@ export function init(RuntimeName, PHPLoader) {
 
 	var _wasm_recv = function (sockfd, buffer, size, flags) {
 		return Asyncify.handleSleep((wakeUp) => {
+			const receiveTimeout =
+				PHPWASM.socketTimeouts.get(sockfd)?.receive;
+			const startedAt = Date.now();
+			let resolved = false;
+
 			const poll = function () {
+				if (resolved) {
+					return;
+				}
 				let newl = ___syscall_recvfrom(
 					sockfd,
 					buffer,
@@ -10191,10 +10265,20 @@ export function init(RuntimeName, PHPLoader) {
 					null
 				);
 				if (newl > 0) {
+					resolved = true;
 					wakeUp(newl);
-				} else if (newl === -6) {
+				} else if (newl === -ERRNO_CODES.EAGAIN) {
+					if (
+						receiveTimeout > 0 &&
+						Date.now() - startedAt >= receiveTimeout
+					) {
+						resolved = true;
+						wakeUp(-ERRNO_CODES.EAGAIN);
+						return;
+					}
 					setTimeout(poll, 20);
 				} else {
+					resolved = true;
 					wakeUp(0);
 				}
 			};

package/jspi/php_7_4.js

@@ -5411,6 +5411,7 @@ var PHPWASM = {
   O_NONBLOCK: 2048,
   POLLHUP: 16,
   SETFL_MASK: 3072,
+  socketTimeouts: new Map,
   init: function() {
     // TODO: Move this to a library function that is made an onInit callback by the `__postset` suffix.
     if (PHPLoader.bindUserSpace) {
@@ -5807,6 +5808,24 @@ var PHPWASM = {
     return [ promise, cancel ];
   },
   noop: function() {},
+  parseSocketTimeout: function(optionValuePtr, optionLen) {
+    if (!optionValuePtr || optionLen < 8) {
+      return null;
+    }
+    let seconds;
+    let microseconds;
+    if (optionLen >= 16) {
+      seconds = Number(HEAP64[optionValuePtr >> 3]);
+      microseconds = Number(HEAP64[(optionValuePtr + 8) >> 3]);
+    } else {
+      seconds = HEAP32[optionValuePtr >> 2];
+      microseconds = HEAP32[(optionValuePtr + 4) >> 2];
+    }
+    if (!Number.isFinite(seconds) || !Number.isFinite(microseconds) || seconds < 0 || microseconds < 0) {
+      return null;
+    }
+    return seconds * 1e3 + Math.ceil(microseconds / 1e3);
+  },
   spawnProcess: function(command, args, options) {
     if (Module["spawnProcess"]) {
       const spawned = Module["spawnProcess"](command, args, /**
@@ -5845,6 +5864,7 @@ var PHPWASM = {
     throw e;
   },
   shutdownSocket: function(socketd, how) {
+    PHPWASM.socketTimeouts.delete(socketd);
     // This implementation only supports websockets at the moment
     const sock = getSocketFromFD(socketd);
     const peer = Object.values(sock.peers)[0];
@@ -5929,43 +5949,74 @@ function _wasm_connect(sockfd, addr, addrlen) {
       wakeUp(-ERRNO_CODES.ECONNREFUSED);
       return;
     }
-    // Wait for the connection to be established
-    const timeout = 3e4;
-    // 30 second timeout
+    // Wait for the connection to be established. A zero timeval
+    // disables the timeout, matching SO_SNDTIMEO semantics.
+    const sendTimeout = PHPWASM.socketTimeouts.get(sockfd)?.send;
+    const timeout = sendTimeout ?? 3e4;
     let resolved = false;
-    const timeoutId = setTimeout(() => {
-      if (!resolved) {
-        resolved = true;
-        wakeUp(-ERRNO_CODES.ETIMEDOUT);
-      }
-    }, timeout);
-    const handleOpen = () => {
-      if (!resolved) {
-        resolved = true;
+    let timeoutId;
+    let handleOpen;
+    let handleError;
+    let handleClose;
+    const peer = PHPWASM.getAllPeers(sock).find(
+      (candidate) => candidate.socket === ws
+    );
+
+    const cleanupConnectListeners = () => {
+      if (typeof timeoutId !== "undefined") {
         clearTimeout(timeoutId);
-        ws.removeEventListener("error", handleError);
-        ws.removeEventListener("close", handleClose);
-        wakeUp(0);
       }
+      ws.removeEventListener("open", handleOpen);
+      ws.removeEventListener("error", handleError);
+      ws.removeEventListener("close", handleClose);
     };
-    const handleError = () => {
-      if (!resolved) {
-        resolved = true;
-        clearTimeout(timeoutId);
-        ws.removeEventListener("open", handleOpen);
-        ws.removeEventListener("close", handleClose);
-        wakeUp(-ERRNO_CODES.ECONNREFUSED);
+
+    const cleanupFailedConnect = (errno) => {
+      try {
+        if (
+          ws.readyState !== ws.CLOSING &&
+          ws.readyState !== ws.CLOSED
+        ) {
+          ws.close();
+        }
+      } catch (e) {
+        // Ignore close errors on an already-failed connect.
+      }
+      if (peer) {
+        SOCKFS.websocket_sock_ops.removePeer(sock, peer);
       }
+      sock.connecting = false;
+      sock.error = errno;
     };
-    const handleClose = () => {
+
+    const finishConnect = (result) => {
       if (!resolved) {
         resolved = true;
-        clearTimeout(timeoutId);
-        ws.removeEventListener("open", handleOpen);
-        ws.removeEventListener("error", handleError);
-        wakeUp(-ERRNO_CODES.ECONNREFUSED);
+        cleanupConnectListeners();
+        if (result < 0) {
+          cleanupFailedConnect(-result);
+        }
+        wakeUp(result);
       }
     };
+
+    if (timeout > 0) {
+      timeoutId = setTimeout(() => {
+        finishConnect(-ERRNO_CODES.ETIMEDOUT);
+      }, timeout);
+    }
+
+    handleOpen = () => {
+      finishConnect(0);
+    };
+
+    handleError = () => {
+      finishConnect(-ERRNO_CODES.ECONNREFUSED);
+    };
+
+    handleClose = () => {
+      finishConnect(-ERRNO_CODES.ECONNREFUSED);
+    };
     ws.addEventListener("open", handleOpen);
     ws.addEventListener("error", handleError);
     ws.addEventListener("close", handleClose);
@@ -8702,19 +8753,26 @@ function _wasm_setsockopt(socketd, level, optionName, optionValuePtr, optionLen)
   const SO_SNDTIMEO = 67;
   const IPPROTO_TCP = 6;
   const TCP_NODELAY = 1;
+  if (level === SOL_SOCKET && (optionName === SO_RCVTIMEO || optionName === SO_SNDTIMEO)) {
+    const timeoutMs = PHPWASM.parseSocketTimeout(optionValuePtr, optionLen);
+    if (timeoutMs === null) {
+      return -1;
+    }
+    const timeouts = PHPWASM.socketTimeouts.get(socketd) || {};
+    if (optionName === SO_RCVTIMEO) {
+      timeouts.receive = timeoutMs;
+    } else {
+      timeouts.send = timeoutMs;
+    }
+    PHPWASM.socketTimeouts.set(socketd, timeouts);
+    return 0;
+  }
   // Options that we can forward to the WebSocket proxy
   const isForwardable = (level === SOL_SOCKET && optionName === SO_KEEPALIVE) || (level === IPPROTO_TCP && optionName === TCP_NODELAY);
-  // Options that we acknowledge but don't actually implement
-  // (WebSocket connections handle timeouts differently)
-  const isIgnorable = level === SOL_SOCKET && (optionName === SO_RCVTIMEO || optionName === SO_SNDTIMEO);
-  if (!isForwardable && !isIgnorable) {
+  if (!isForwardable) {
     console.warn(`Unsupported socket option: ${level}, ${optionName}, ${optionValue}`);
     return -1;
   }
-  // For ignorable options, just return success
-  if (isIgnorable) {
-    return 0;
-  }
   const ws = PHPWASM.getAllWebSockets(socketd)[0];
   if (!ws) {
     return -1;
@@ -8857,13 +8915,26 @@ var FS_createDevice = (...args) => FS.createDevice(...args);
 
 var _wasm_recv = function(sockfd, buffer, size, flags) {
   return Asyncify.handleSleep(wakeUp => {
+    const receiveTimeout = PHPWASM.socketTimeouts.get(sockfd)?.receive;
+    const startedAt = Date.now();
+    let resolved = false;
     const poll = function() {
+      if (resolved) {
+        return;
+      }
       let newl = ___syscall_recvfrom(sockfd, buffer, size, flags, null, null);
       if (newl > 0) {
+        resolved = true;
         wakeUp(newl);
-      } else if (newl === -6) {
+      } else if (newl === -ERRNO_CODES.EAGAIN) {
+        if (receiveTimeout > 0 && Date.now() - startedAt >= receiveTimeout) {
+          resolved = true;
+          wakeUp(-ERRNO_CODES.EAGAIN);
+          return;
+        }
         setTimeout(poll, 20);
       } else {
+        resolved = true;
         wakeUp(0);
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node-7-4",
-  "version": "3.1.34",
+  "version": "3.1.36",
   "description": "PHP 7.4 WebAssembly binaries for node",
   "repository": {
     "type": "git",
@@ -35,10 +35,10 @@
     "node": ">=20.10.0",
     "npm": ">=10.2.3"
   },
-  "gitHead": "86daccc84fe31900eb57c4c8e1c3ba21a7ae8d13",
+  "gitHead": "371f4fd6f9d56af6fb35b6c2cf0267edaea83755",
   "dependencies": {
     "wasm-feature-detect": "1.8.0",
-    "@php-wasm/universal": "3.1.34"
+    "@php-wasm/universal": "3.1.36"
   },
   "packageManager": "npm@10.9.2",
   "overrides": {