@php-wasm/node-8-2 3.1.3 → 3.1.4

package/asyncify/php_8_2.js

@@ -15,7 +15,7 @@ const currentDirPath =
 		: path.dirname(fileURLToPath(import.meta.url));
 const dependencyFilename = path.join(currentDirPath, '8_2_30', 'php_8_2.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 27535233;
+export const dependenciesTotalSize = 27535196;
 const phpVersionString = '8.2.30';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
@@ -6541,6 +6541,9 @@ export function init(RuntimeName, PHPLoader) {
 
 	var allocateUTF8OnStack = (...args) => stringToUTF8OnStack(...args);
 
+	var onInits = [];
+	var addOnInit = (cb) => onInits.push(cb);
+
 	function _js_getpid() {
 		return PHPLoader.processId ?? 42;
 	}
@@ -6611,19 +6614,107 @@ export function init(RuntimeName, PHPLoader) {
 							LOCK_UN: 8, // Unlock
 						},
 						errnoCodes: ERRNO_CODES,
+						// Use get/set closures instead of exposing
+						// typed arrays directly. After memory.grow(),
+						// Emscripten's updateMemoryViews() reassigns
+						// the module-scoped HEAP* variables. Closures
+						// always reference the current value, so
+						// accesses are never stale. The get/set
+						// interface also prevents callers from
+						// capturing a typed array reference that
+						// could become stale.
 						memory: {
-							HEAP8,
-							HEAPU8,
-							HEAP16,
-							HEAPU16,
-							HEAP32,
-							HEAPU32,
-							HEAPF32,
-							HEAP64,
-							HEAPU64,
-							HEAPF64,
+							HEAP8: {
+								get(offset) {
+									return HEAP8[offset];
+								},
+								set(offset, value) {
+									HEAP8[offset] = value;
+								},
+							},
+							HEAPU8: {
+								get(offset) {
+									return HEAPU8[offset];
+								},
+								set(offset, value) {
+									HEAPU8[offset] = value;
+								},
+							},
+							HEAP16: {
+								get(offset) {
+									return HEAP16[offset];
+								},
+								set(offset, value) {
+									HEAP16[offset] = value;
+								},
+							},
+							HEAPU16: {
+								get(offset) {
+									return HEAPU16[offset];
+								},
+								set(offset, value) {
+									HEAPU16[offset] = value;
+								},
+							},
+							HEAP32: {
+								get(offset) {
+									return HEAP32[offset];
+								},
+								set(offset, value) {
+									HEAP32[offset] = value;
+								},
+							},
+							HEAPU32: {
+								get(offset) {
+									return HEAPU32[offset];
+								},
+								set(offset, value) {
+									HEAPU32[offset] = value;
+								},
+							},
+							HEAPF32: {
+								get(offset) {
+									return HEAPF32[offset];
+								},
+								set(offset, value) {
+									HEAPF32[offset] = value;
+								},
+							},
+							HEAP64: {
+								get(offset) {
+									return HEAP64[offset];
+								},
+								set(offset, value) {
+									HEAP64[offset] = value;
+								},
+							},
+							HEAPU64: {
+								get(offset) {
+									return HEAPU64[offset];
+								},
+								set(offset, value) {
+									HEAPU64[offset] = value;
+								},
+							},
+							HEAPF64: {
+								get(offset) {
+									return HEAPF64[offset];
+								},
+								set(offset, value) {
+									HEAPF64[offset] = value;
+								},
+							},
 						},
-						wasmImports,
+						wasmImports: Object.assign(
+							{},
+							wasmImports,
+							typeof _builtin_fd_close === 'function'
+								? { builtin_fd_close: _builtin_fd_close }
+								: {},
+							typeof _builtin_fcntl64 === 'function'
+								? { builtin_fcntl64: _builtin_fcntl64 }
+								: {}
+						),
 						wasmExports,
 						syscalls: SYSCALLS,
 						FS,
@@ -17048,9 +17139,9 @@ export function init(RuntimeName, PHPLoader) {
 					if (!cp.stdin.closed) {
 						cp.stdin.end();
 					}
-					_free(buffer);
-					_free(iov);
-					_free(pnum);
+					_wasm_free(buffer);
+					_wasm_free(iov);
+					_wasm_free(pnum);
 				}
 
 				// pump() can never alter the result of this function.
@@ -17777,7 +17868,17 @@ export function init(RuntimeName, PHPLoader) {
 					// A true async operation was begun; start a sleep.
 					Asyncify.state = Asyncify.State.Unwinding;
 					// TODO: reuse, don't alloc/free every sleep
-					Asyncify.currData = Asyncify.allocateData();
+					if (!Asyncify._cachedData) {
+						Asyncify._cachedData = Asyncify.allocateData();
+					} else {
+						Asyncify.setDataHeader(
+							Asyncify._cachedData,
+							Asyncify._cachedData + 12,
+							Asyncify.StackSize
+						);
+						Asyncify.setDataRewindFunc(Asyncify._cachedData);
+					}
+					Asyncify.currData = Asyncify._cachedData;
 					if (typeof MainLoop != 'undefined' && MainLoop.func) {
 						MainLoop.pause();
 					}
@@ -17789,7 +17890,6 @@ export function init(RuntimeName, PHPLoader) {
 				// Stop a resume.
 				Asyncify.state = Asyncify.State.Normal;
 				runAndAbortIfError(_asyncify_stop_rewind);
-				_free(Asyncify.currData);
 				Asyncify.currData = null;
 				// Call all sleep callbacks now that the sleep-resume is all done.
 				Asyncify.sleepCallbacks.forEach(callUserCallback);
@@ -18226,10 +18326,6 @@ export function init(RuntimeName, PHPLoader) {
 	};
 	__emscripten_fs_load_embedded_files.sig = 'vp';
 
-	var onInits = [];
-
-	var addOnInit = (cb) => onInits.push(cb);
-
 	var onMains = [];
 
 	var addOnPreMain = (cb) => onMains.push(cb);
@@ -30745,26 +30841,6 @@ export function init(RuntimeName, PHPLoader) {
 		});
 	};
 
-	function _recv(sockfd, buffer, size, flags) {
-		return _wasm_recv(sockfd, buffer, size, flags);
-	}
-
-	function _setsockopt(
-		socketd,
-		level,
-		optionName,
-		optionValuePtr,
-		optionLen
-	) {
-		return _wasm_setsockopt(
-			socketd,
-			level,
-			optionName,
-			optionValuePtr,
-			optionLen
-		);
-	}
-
 	function ___emscripten_lookup_name(namePtr) {
 		if (!ENVIRONMENT_IS_NODE) {
 			return original__emscripten_lookup_name(namePtr);
@@ -31271,8 +31347,6 @@ export function init(RuntimeName, PHPLoader) {
 	Module['___cxa_rethrow_primary_exception'] =
 		___cxa_rethrow_primary_exception;
 	Module['___syscall_shutdown'] = ___syscall_shutdown;
-	Module['_recv'] = _recv;
-	Module['_setsockopt'] = _setsockopt;
 	// End JS library exports
 
 	// end include: postlibrary.js
@@ -31659,7 +31733,7 @@ export function init(RuntimeName, PHPLoader) {
 		wasmMemory;
 
 	function assignWasmExports(wasmExports) {
-		_free = PHPLoader['free'] = wasmExports['free'];
+		_free = wasmExports['free'];
 		_memcmp = wasmExports['memcmp'];
 		_malloc =
 			PHPLoader['malloc'] =
@@ -31727,7 +31801,10 @@ export function init(RuntimeName, PHPLoader) {
 			wasmExports['wasm_sapi_handle_request'];
 		_php_wasm_init = Module['_php_wasm_init'] =
 			wasmExports['php_wasm_init'];
-		_wasm_free = Module['_wasm_free'] = wasmExports['wasm_free'];
+		_wasm_free =
+			PHPLoader['free'] =
+			Module['_wasm_free'] =
+				wasmExports['wasm_free'];
 		_wasm_get_end_offset = Module['_wasm_get_end_offset'] =
 			wasmExports['wasm_get_end_offset'];
 		___wrap_getpid = Module['___wrap_getpid'] =
@@ -34373,12 +34450,8 @@ export function init(RuntimeName, PHPLoader) {
 		wasm_poll_socket,
 		/** @export */
 		wasm_recv: _wasm_recv,
-		/**  */
-		recv: _recv,
 		/** @export */
 		wasm_setsockopt: _wasm_setsockopt,
-		/**  */
-		setsockopt: _setsockopt,
 		/** @export */
 		wasm_shutdown: _wasm_shutdown,
 		/** @export */

package/index.cjs

@@ -53,21 +53,21 @@ async function getPHPLoaderModule() {
 }
 async function getIntlExtensionPath() {
   if (await (0, import_wasm_feature_detect.jspi)()) {
-    return (0, import_node_path.join)(packageDir, "jspi/extensions/intl/8_2/intl.so");
+    return (0, import_node_path.join)(packageDir, "jspi/extensions/intl/intl.so");
   } else {
-    return (0, import_node_path.join)(packageDir, "asyncify/extensions/intl/8_2/intl.so");
+    return (0, import_node_path.join)(packageDir, "asyncify/extensions/intl/intl.so");
   }
 }
 async function getXdebugExtensionPath() {
   if (await (0, import_wasm_feature_detect.jspi)()) {
-    return (0, import_node_path.join)(packageDir, "jspi/extensions/xdebug/8_2/xdebug.so");
+    return (0, import_node_path.join)(packageDir, "jspi/extensions/xdebug/xdebug.so");
   } else {
-    return (0, import_node_path.join)(packageDir, "asyncify/extensions/xdebug/8_2/xdebug.so");
+    return (0, import_node_path.join)(packageDir, "asyncify/extensions/xdebug/xdebug.so");
   }
 }
 async function getRedisExtensionPath() {
   if (await (0, import_wasm_feature_detect.jspi)()) {
-    return (0, import_node_path.join)(packageDir, "jspi/extensions/redis/8_2/redis.so");
+    return (0, import_node_path.join)(packageDir, "jspi/extensions/redis/redis.so");
   }
   throw new Error(
     "The Redis extension requires JSPI (JavaScript Promise Integration) support. Your current environment is using asyncify, which cannot properly handle exceptions during Redis network operations. Please use Node.js 23+ or a browser with JSPI support to use the Redis extension."
@@ -75,7 +75,7 @@ async function getRedisExtensionPath() {
 }
 async function getMemcachedExtensionPath() {
   if (await (0, import_wasm_feature_detect.jspi)()) {
-    return (0, import_node_path.join)(packageDir, "jspi/extensions/memcached/8_2/memcached.so");
+    return (0, import_node_path.join)(packageDir, "jspi/extensions/memcached/memcached.so");
   }
   throw new Error(
     "The Memcached extension requires JSPI (JavaScript Promise Integration) support. Your current environment is using asyncify, which cannot properly handle exceptions during Memcached network operations. Please use Node.js 23+ or a browser with JSPI support to use the Memcached extension."

package/index.js

@@ -14,21 +14,21 @@ async function getPHPLoaderModule() {
 }
 async function getIntlExtensionPath() {
   if (await jspi()) {
-    return join(packageDir, "jspi/extensions/intl/8_2/intl.so");
+    return join(packageDir, "jspi/extensions/intl/intl.so");
   } else {
-    return join(packageDir, "asyncify/extensions/intl/8_2/intl.so");
+    return join(packageDir, "asyncify/extensions/intl/intl.so");
   }
 }
 async function getXdebugExtensionPath() {
   if (await jspi()) {
-    return join(packageDir, "jspi/extensions/xdebug/8_2/xdebug.so");
+    return join(packageDir, "jspi/extensions/xdebug/xdebug.so");
   } else {
-    return join(packageDir, "asyncify/extensions/xdebug/8_2/xdebug.so");
+    return join(packageDir, "asyncify/extensions/xdebug/xdebug.so");
   }
 }
 async function getRedisExtensionPath() {
   if (await jspi()) {
-    return join(packageDir, "jspi/extensions/redis/8_2/redis.so");
+    return join(packageDir, "jspi/extensions/redis/redis.so");
   }
   throw new Error(
     "The Redis extension requires JSPI (JavaScript Promise Integration) support. Your current environment is using asyncify, which cannot properly handle exceptions during Redis network operations. Please use Node.js 23+ or a browser with JSPI support to use the Redis extension."
@@ -36,7 +36,7 @@ async function getRedisExtensionPath() {
 }
 async function getMemcachedExtensionPath() {
   if (await jspi()) {
-    return join(packageDir, "jspi/extensions/memcached/8_2/memcached.so");
+    return join(packageDir, "jspi/extensions/memcached/memcached.so");
   }
   throw new Error(
     "The Memcached extension requires JSPI (JavaScript Promise Integration) support. Your current environment is using asyncify, which cannot properly handle exceptions during Memcached network operations. Please use Node.js 23+ or a browser with JSPI support to use the Memcached extension."