@php-wasm/web-8-0 3.1.34 → 3.1.36

package/asyncify/php_8_0.js

@@ -4796,6 +4796,7 @@ export function init(RuntimeName, PHPLoader) {
 		O_NONBLOCK: 2048,
 		POLLHUP: 16,
 		SETFL_MASK: 3072,
+		socketTimeouts: new Map,
 		init: function () {
 			if (PHPLoader.bindUserSpace) {
 				addOnInit(() => {
@@ -5159,6 +5160,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'](command, args, {
@@ -5187,6 +5211,7 @@ export function init(RuntimeName, PHPLoader) {
 			throw e;
 		},
 		shutdownSocket: function (socketd, how) {
+			PHPWASM.socketTimeouts.delete(socketd);
 			const sock = getSocketFromFD(socketd);
 			const peer = Object.values(sock.peers)[0];
 			if (!peer) {
@@ -5256,41 +5281,74 @@ export function init(RuntimeName, PHPLoader) {
 				wakeUp(-ERRNO_CODES.ECONNREFUSED);
 				return;
 			}
-			const timeout = 3e4;
+			// 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);
@@ -7650,21 +7708,35 @@ export function init(RuntimeName, PHPLoader) {
 		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;
+		}
 		const isForwardable =
 			(level === SOL_SOCKET && optionName === SO_KEEPALIVE) ||
 			(level === IPPROTO_TCP && optionName === TCP_NODELAY);
-		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;
 		}
-		if (isIgnorable) {
-			return 0;
-		}
 		const ws = PHPWASM.getAllWebSockets(socketd)[0];
 		if (!ws) {
 			return -1;

package/jspi/php_8_0.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_0_30/php_8_0.wasm';
 export { dependencyFilename };
-export const dependenciesTotalSize = 16724961;
+export const dependenciesTotalSize = 16725015;
 const phpVersionString = '8.0.30';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
@@ -4673,6 +4673,7 @@ export function init(RuntimeName, PHPLoader) {
 		O_NONBLOCK: 2048,
 		POLLHUP: 16,
 		SETFL_MASK: 3072,
+		socketTimeouts: new Map(),
 		init: function () {
 			if (PHPLoader.bindUserSpace) {
 				addOnInit(() => {
@@ -5036,6 +5037,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'](command, args, {
@@ -5064,6 +5088,7 @@ export function init(RuntimeName, PHPLoader) {
 			throw e;
 		},
 		shutdownSocket: function (socketd, how) {
+			PHPWASM.socketTimeouts.delete(socketd);
 			const sock = getSocketFromFD(socketd);
 			const peer = Object.values(sock.peers)[0];
 			if (!peer) {
@@ -5133,41 +5158,63 @@ export function init(RuntimeName, PHPLoader) {
 				wakeUp(-ERRNO_CODES.ECONNREFUSED);
 				return;
 			}
-			const timeout = 3e4;
+			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) {}
+				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);
@@ -7523,21 +7570,35 @@ export function init(RuntimeName, PHPLoader) {
 		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;
+		}
 		const isForwardable =
 			(level === SOL_SOCKET && optionName === SO_KEEPALIVE) ||
 			(level === IPPROTO_TCP && optionName === TCP_NODELAY);
-		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;
 		}
-		if (isIgnorable) {
-			return 0;
-		}
 		const ws = PHPWASM.getAllWebSockets(socketd)[0];
 		if (!ws) {
 			return -1;
@@ -8101,6 +8162,7 @@ export function init(RuntimeName, PHPLoader) {
 		_zend_try_assign_typed_ref_arr,
 		_zend_declare_property,
 		_zend_declare_property_null,
+		_zend_declare_class_constant_ex,
 		_zend_declare_class_constant_null,
 		_zend_declare_class_constant_long,
 		_zend_declare_class_constant_double,
@@ -8532,6 +8594,9 @@ export function init(RuntimeName, PHPLoader) {
 			wasmExports['zend_declare_property'];
 		_zend_declare_property_null = Module['_zend_declare_property_null'] =
 			wasmExports['zend_declare_property_null'];
+		_zend_declare_class_constant_ex = Module[
+			'_zend_declare_class_constant_ex'
+		] = wasmExports['zend_declare_class_constant_ex'];
 		_zend_declare_class_constant_null = Module[
 			'_zend_declare_class_constant_null'
 		] = wasmExports['zend_declare_class_constant_null'];
@@ -8905,60 +8970,60 @@ export function init(RuntimeName, PHPLoader) {
 			wasmExports['__indirect_function_table'];
 		___c_longjmp = Module['___c_longjmp'] = wasmExports['__c_longjmp'];
 	}
-	var _file_globals = (Module['_file_globals'] = 12085976);
-	var _sapi_module = (Module['_sapi_module'] = 12031788);
-	var _sapi_globals = (Module['_sapi_globals'] = 12031936);
-	var _compiler_globals = (Module['_compiler_globals'] = 12088224);
-	var _executor_globals = (Module['_executor_globals'] = 12088600);
-	var _zend_compile_string = (Module['_zend_compile_string'] = 12089764);
-	var _zend_ce_traversable = (Module['_zend_ce_traversable'] = 11943908);
-	var _zend_ce_aggregate = (Module['_zend_ce_aggregate'] = 11943912);
-	var _zend_ce_iterator = (Module['_zend_ce_iterator'] = 11943916);
-	var _zend_ce_serializable = (Module['_zend_ce_serializable'] = 11943920);
-	var _zend_ce_arrayaccess = (Module['_zend_ce_arrayaccess'] = 11943924);
-	var _zend_ce_countable = (Module['_zend_ce_countable'] = 11943928);
-	var _zend_ce_stringable = (Module['_zend_ce_stringable'] = 11943932);
-	var _zend_ce_exception = (Module['_zend_ce_exception'] = 12086520);
-	var _zend_ce_throwable = (Module['_zend_ce_throwable'] = 12086504);
+	var _file_globals = (Module['_file_globals'] = 12085992);
+	var _sapi_module = (Module['_sapi_module'] = 12031804);
+	var _sapi_globals = (Module['_sapi_globals'] = 12031952);
+	var _compiler_globals = (Module['_compiler_globals'] = 12088240);
+	var _executor_globals = (Module['_executor_globals'] = 12088616);
+	var _zend_compile_string = (Module['_zend_compile_string'] = 12089780);
+	var _zend_ce_traversable = (Module['_zend_ce_traversable'] = 11943924);
+	var _zend_ce_aggregate = (Module['_zend_ce_aggregate'] = 11943928);
+	var _zend_ce_iterator = (Module['_zend_ce_iterator'] = 11943932);
+	var _zend_ce_serializable = (Module['_zend_ce_serializable'] = 11943936);
+	var _zend_ce_arrayaccess = (Module['_zend_ce_arrayaccess'] = 11943940);
+	var _zend_ce_countable = (Module['_zend_ce_countable'] = 11943944);
+	var _zend_ce_stringable = (Module['_zend_ce_stringable'] = 11943948);
+	var _zend_ce_exception = (Module['_zend_ce_exception'] = 12086536);
+	var _zend_ce_throwable = (Module['_zend_ce_throwable'] = 12086520);
 	var _zend_ce_division_by_zero_error = (Module[
 		'_zend_ce_division_by_zero_error'
-	] = 12086648);
+	] = 12086664);
 	var _zend_ce_unhandled_match_error = (Module[
 		'_zend_ce_unhandled_match_error'
-	] = 12086992);
-	var _zend_empty_string = (Module['_zend_empty_string'] = 11942336);
+	] = 12087008);
+	var _zend_empty_string = (Module['_zend_empty_string'] = 11942352);
 	var _zend_string_init_interned = (Module['_zend_string_init_interned'] =
-		11942404);
-	var _zend_one_char_string = (Module['_zend_one_char_string'] = 11942416);
+		11942420);
+	var _zend_one_char_string = (Module['_zend_one_char_string'] = 11942432);
 	var _std_object_handlers = (Module['_std_object_handlers'] = 11601700);
 	var ___memory_base = (Module['___memory_base'] = 0);
 	var ___table_base = (Module['___table_base'] = 1);
-	var _stdout = (Module['_stdout'] = 11935520);
+	var _stdout = (Module['_stdout'] = 11935536);
 	var __playground_zend_side_module_data_exports = (Module[
 		'__playground_zend_side_module_data_exports'
 	] = 11602896);
 	var __playground_zend_side_module_function_exports = (Module[
 		'__playground_zend_side_module_function_exports'
 	] = 11602992);
-	var _timezone = (Module['_timezone'] = 12124624);
-	var _tzname = (Module['_tzname'] = 12124632);
-	var ___heap_base = 13186944;
+	var _timezone = (Module['_timezone'] = 12124640);
+	var _tzname = (Module['_tzname'] = 12124648);
+	var ___heap_base = 13186960;
 	var __ZNSt3__25ctypeIcE2idE = (Module['__ZNSt3__25ctypeIcE2idE'] =
-		12138348);
+		12138364);
 	var __ZTVN10__cxxabiv120__si_class_type_infoE = (Module[
 		'__ZTVN10__cxxabiv120__si_class_type_infoE'
-	] = 11935808);
+	] = 11935824);
 	var __ZTVN10__cxxabiv117__class_type_infoE = (Module[
 		'__ZTVN10__cxxabiv117__class_type_infoE'
-	] = 11935768);
+	] = 11935784);
 	var __ZTVN10__cxxabiv121__vmi_class_type_infoE = (Module[
 		'__ZTVN10__cxxabiv121__vmi_class_type_infoE'
-	] = 11935860);
+	] = 11935876);
 	var __ZTISt20bad_array_new_length = (Module[
 		'__ZTISt20bad_array_new_length'
-	] = 11935980);
-	var __ZTVSt12length_error = (Module['__ZTVSt12length_error'] = 11936056);
-	var __ZTISt12length_error = (Module['__ZTISt12length_error'] = 11936076);
+	] = 11935996);
+	var __ZTVSt12length_error = (Module['__ZTVSt12length_error'] = 11936072);
+	var __ZTISt12length_error = (Module['__ZTISt12length_error'] = 11936092);
 	var wasmImports = {
 		__assert_fail: ___assert_fail,
 		__asyncjs__js_module_onMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web-8-0",
-  "version": "3.1.34",
+  "version": "3.1.36",
   "description": "PHP 8.0 WebAssembly binaries for web",
   "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": {