@php-wasm/node 1.2.2 → 2.0.0

package/asyncify/php_7_2.js

@@ -8,7 +8,8 @@ import path from 'path';
 
 const dependencyFilename = path.join(__dirname, '7_2_34', 'php_7_2.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 29015588;
+export const dependenciesTotalSize = 29379158;
+const phpVersionString = '7.2.34';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
 	// include: shell.js
@@ -830,7 +831,7 @@ export function init(RuntimeName, PHPLoader) {
 		},
 	};
 
-	var ___heap_base = 11378752;
+	var ___heap_base = 12423744;
 
 	var alignMemory = (size, alignment) => {
 		return Math.ceil(size / alignment) * alignment;
@@ -994,7 +995,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	/** @type {WebAssembly.Table} */
 	var wasmTable = new WebAssembly.Table({
-		initial: 15750,
+		initial: 15851,
 		element: 'anyfunc',
 	});
 	var getWasmTableEntry = (funcPtr) => {
@@ -1853,13 +1854,13 @@ export function init(RuntimeName, PHPLoader) {
 		1024
 	);
 
-	var ___stack_high = 11378752;
+	var ___stack_high = 12423744;
 
-	var ___stack_low = 11313216;
+	var ___stack_low = 11375168;
 
 	var ___stack_pointer = new WebAssembly.Global(
 		{ value: 'i32', mutable: true },
-		11378752
+		12423744
 	);
 
 	var PATH = {
@@ -3913,10 +3914,6 @@ export function init(RuntimeName, PHPLoader) {
 				if (FS.isMountpoint(node)) {
 					throw new FS.ErrnoError(10);
 				}
-
-				if (!FS.isDir(node.mode)) {
-					throw new FS.ErrnoError(54);
-				}
 			}
 
 			var mount = {
@@ -17742,10 +17739,6 @@ export function init(RuntimeName, PHPLoader) {
 				HEAPU32[iov >> 2] = buffer; // iov_base
 				HEAPU32[(iov + 4) >> 2] = CHUNK_SIZE; // iov_len
 
-				if (typeof js_fd_read === 'undefined') {
-					globalThis.js_fd_read = __asyncjs__js_fd_read;
-				}
-
 				function pump() {
 					try {
 						while (true) {
@@ -19599,7 +19592,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	var addOnExit = (cb) => onExits.unshift(cb);
 
-	var STACK_SIZE = 65536;
+	var STACK_SIZE = 1048576;
 
 	var STACK_ALIGN = 16;
 
@@ -31815,13 +31808,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		10384966: ($0) => {
+		10409421: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		10385014: ($0) => {
+		10409469: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -31943,6 +31936,9 @@ export function init(RuntimeName, PHPLoader) {
 						while (true) {
 							var mask = POLLNVAL;
 							mask = SYSCALLS.DEFAULT_POLLMASK;
+							if (FS.isClosed(stream)) {
+								return ERRNO_CODES.EBADF;
+							}
 							if (stream.stream_ops?.poll) {
 								mask = stream.stream_ops.poll(stream, -1);
 							}
@@ -34816,6 +34812,11 @@ export function init(RuntimeName, PHPLoader) {
 			a0,
 			a1
 		));
+	var _initgroups = (Module['_initgroups'] = (a0, a1) =>
+		(_initgroups = Module['_initgroups'] = wasmExports['initgroups'])(
+			a0,
+			a1
+		));
 	var _memcpy = (a0, a1, a2) => (_memcpy = wasmExports['memcpy'])(a0, a1, a2);
 	var ___funcs_on_exit = () =>
 		(___funcs_on_exit = wasmExports['__funcs_on_exit'])();
@@ -35031,19 +35032,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_iiiiiiii(index, a1, a2, a3, a4, a5, a6, a7) {
+	function invoke_vji(index, a1, a2) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iiiiiiii'](
-				index,
-				a1,
-				a2,
-				a3,
-				a4,
-				a5,
-				a6,
-				a7
-			);
+			Module['dynCall_vji'](index, a1, a2);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35051,21 +35043,22 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_iiji(index, a1, a2, a3) {
+	function invoke_jii(index, a1, a2) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iiji'](index, a1, a2, a3);
+			return Module['dynCall_jii'](index, a1, a2);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
 			_setThrew(1, 0);
+			return 0n;
 		}
 	}
 
-	function invoke_iijii(index, a1, a2, a3, a4) {
+	function invoke_v(index) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iijii'](index, a1, a2, a3, a4);
+			Module['dynCall_v'](index);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35073,10 +35066,19 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_iijiji(index, a1, a2, a3, a4, a5) {
+	function invoke_iiiiiiii(index, a1, a2, a3, a4, a5, a6, a7) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iijiji'](index, a1, a2, a3, a4, a5);
+			return Module['dynCall_iiiiiiii'](
+				index,
+				a1,
+				a2,
+				a3,
+				a4,
+				a5,
+				a6,
+				a7
+			);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35084,10 +35086,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_v(index) {
+	function invoke_iiji(index, a1, a2, a3) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_v'](index);
+			return Module['dynCall_iiji'](index, a1, a2, a3);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35095,10 +35097,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_iiiiiii(index, a1, a2, a3, a4, a5, a6) {
+	function invoke_iijii(index, a1, a2, a3, a4) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iiiiiii'](index, a1, a2, a3, a4, a5, a6);
+			return Module['dynCall_iijii'](index, a1, a2, a3, a4);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35106,10 +35108,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_vji(index, a1, a2) {
+	function invoke_iijiji(index, a1, a2, a3, a4, a5) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_vji'](index, a1, a2);
+			return Module['dynCall_iijiji'](index, a1, a2, a3, a4, a5);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35117,10 +35119,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_viiiiii(index, a1, a2, a3, a4, a5, a6) {
+	function invoke_iiiiiii(index, a1, a2, a3, a4, a5, a6) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_viiiiii'](index, a1, a2, a3, a4, a5, a6);
+			return Module['dynCall_iiiiiii'](index, a1, a2, a3, a4, a5, a6);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35128,10 +35130,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_viijii(index, a1, a2, a3, a4, a5) {
+	function invoke_viiiiii(index, a1, a2, a3, a4, a5, a6) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_viijii'](index, a1, a2, a3, a4, a5);
+			Module['dynCall_viiiiii'](index, a1, a2, a3, a4, a5, a6);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35139,10 +35141,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_viidii(index, a1, a2, a3, a4, a5) {
+	function invoke_viijii(index, a1, a2, a3, a4, a5) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_viidii'](index, a1, a2, a3, a4, a5);
+			Module['dynCall_viijii'](index, a1, a2, a3, a4, a5);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35150,22 +35152,21 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_jiii(index, a1, a2, a3) {
+	function invoke_viidii(index, a1, a2, a3, a4, a5) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_jiii'](index, a1, a2, a3);
+			Module['dynCall_viidii'](index, a1, a2, a3, a4, a5);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
 			_setThrew(1, 0);
-			return 0n;
 		}
 	}
 
-	function invoke_jii(index, a1, a2) {
+	function invoke_jiii(index, a1, a2, a3) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_jii'](index, a1, a2);
+			return Module['dynCall_jiii'](index, a1, a2, a3);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35359,6 +35360,15 @@ export function init(RuntimeName, PHPLoader) {
 		};
 	}
 
+	/**
+	 * Expose the PHP version so the PHP class can make version-specific
+	 * adjustments to `php.ini`.
+	 */
+	PHPLoader['phpVersion'] = (() => {
+		const [major, minor, patch] = phpVersionString.split('.').map(Number);
+		return { major, minor, patch };
+	})();
+
 	return PHPLoader;
 
 	// Close the opening bracket from esm-prefix.js:

package/asyncify/php_7_3.js

@@ -8,7 +8,8 @@ import path from 'path';
 
 const dependencyFilename = path.join(__dirname, '7_3_33', 'php_7_3.wasm');
 export { dependencyFilename };
-export const dependenciesTotalSize = 29282202;
+export const dependenciesTotalSize = 29695998;
+const phpVersionString = '7.3.33';
 export function init(RuntimeName, PHPLoader) {
 	// The rest of the code comes from the built php.js file and esm-suffix.js
 	// include: shell.js
@@ -830,7 +831,7 @@ export function init(RuntimeName, PHPLoader) {
 		},
 	};
 
-	var ___heap_base = 11704000;
+	var ___heap_base = 12759296;
 
 	var alignMemory = (size, alignment) => {
 		return Math.ceil(size / alignment) * alignment;
@@ -994,7 +995,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	/** @type {WebAssembly.Table} */
 	var wasmTable = new WebAssembly.Table({
-		initial: 15715,
+		initial: 15819,
 		element: 'anyfunc',
 	});
 	var getWasmTableEntry = (funcPtr) => {
@@ -1853,13 +1854,13 @@ export function init(RuntimeName, PHPLoader) {
 		1024
 	);
 
-	var ___stack_high = 11704000;
+	var ___stack_high = 12759296;
 
-	var ___stack_low = 11638464;
+	var ___stack_low = 11710720;
 
 	var ___stack_pointer = new WebAssembly.Global(
 		{ value: 'i32', mutable: true },
-		11704000
+		12759296
 	);
 
 	var PATH = {
@@ -3913,10 +3914,6 @@ export function init(RuntimeName, PHPLoader) {
 				if (FS.isMountpoint(node)) {
 					throw new FS.ErrnoError(10);
 				}
-
-				if (!FS.isDir(node.mode)) {
-					throw new FS.ErrnoError(54);
-				}
 			}
 
 			var mount = {
@@ -17742,10 +17739,6 @@ export function init(RuntimeName, PHPLoader) {
 				HEAPU32[iov >> 2] = buffer; // iov_base
 				HEAPU32[(iov + 4) >> 2] = CHUNK_SIZE; // iov_len
 
-				if (typeof js_fd_read === 'undefined') {
-					globalThis.js_fd_read = __asyncjs__js_fd_read;
-				}
-
 				function pump() {
 					try {
 						while (true) {
@@ -19599,7 +19592,7 @@ export function init(RuntimeName, PHPLoader) {
 
 	var addOnExit = (cb) => onExits.unshift(cb);
 
-	var STACK_SIZE = 65536;
+	var STACK_SIZE = 1048576;
 
 	var STACK_ALIGN = 16;
 
@@ -31815,13 +31808,13 @@ export function init(RuntimeName, PHPLoader) {
 	// End JS library code
 
 	var ASM_CONSTS = {
-		10780086: ($0) => {
+		10814813: ($0) => {
 			if (!$0) {
 				AL.alcErr = 0xa004;
 				return 1;
 			}
 		},
-		10780134: ($0) => {
+		10814861: ($0) => {
 			if (!AL.currentCtx) {
 				err('alGetProcAddress() called without a valid context');
 				return 1;
@@ -31943,6 +31936,9 @@ export function init(RuntimeName, PHPLoader) {
 						while (true) {
 							var mask = POLLNVAL;
 							mask = SYSCALLS.DEFAULT_POLLMASK;
+							if (FS.isClosed(stream)) {
+								return ERRNO_CODES.EBADF;
+							}
 							if (stream.stream_ops?.poll) {
 								mask = stream.stream_ops.poll(stream, -1);
 							}
@@ -34579,6 +34575,8 @@ export function init(RuntimeName, PHPLoader) {
 		/** @export */
 		invoke_iijiji,
 		/** @export */
+		invoke_ji,
+		/** @export */
 		invoke_jii,
 		/** @export */
 		invoke_jiii,
@@ -34816,6 +34814,11 @@ export function init(RuntimeName, PHPLoader) {
 			a0,
 			a1
 		));
+	var _initgroups = (Module['_initgroups'] = (a0, a1) =>
+		(_initgroups = Module['_initgroups'] = wasmExports['initgroups'])(
+			a0,
+			a1
+		));
 	var _memcpy = (a0, a1, a2) => (_memcpy = wasmExports['memcpy'])(a0, a1, a2);
 	var ___funcs_on_exit = () =>
 		(___funcs_on_exit = wasmExports['__funcs_on_exit'])();
@@ -35031,19 +35034,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_iiiiiiii(index, a1, a2, a3, a4, a5, a6, a7) {
+	function invoke_vji(index, a1, a2) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iiiiiiii'](
-				index,
-				a1,
-				a2,
-				a3,
-				a4,
-				a5,
-				a6,
-				a7
-			);
+			Module['dynCall_vji'](index, a1, a2);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35051,32 +35045,34 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_iiji(index, a1, a2, a3) {
+	function invoke_jii(index, a1, a2) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iiji'](index, a1, a2, a3);
+			return Module['dynCall_jii'](index, a1, a2);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
 			_setThrew(1, 0);
+			return 0n;
 		}
 	}
 
-	function invoke_iijii(index, a1, a2, a3, a4) {
+	function invoke_ji(index, a1) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iijii'](index, a1, a2, a3, a4);
+			return Module['dynCall_ji'](index, a1);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
 			_setThrew(1, 0);
+			return 0n;
 		}
 	}
 
-	function invoke_iijiji(index, a1, a2, a3, a4, a5) {
+	function invoke_v(index) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iijiji'](index, a1, a2, a3, a4, a5);
+			Module['dynCall_v'](index);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35084,10 +35080,19 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_v(index) {
+	function invoke_iiiiiiii(index, a1, a2, a3, a4, a5, a6, a7) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_v'](index);
+			return Module['dynCall_iiiiiiii'](
+				index,
+				a1,
+				a2,
+				a3,
+				a4,
+				a5,
+				a6,
+				a7
+			);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35095,10 +35100,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_iiiiiii(index, a1, a2, a3, a4, a5, a6) {
+	function invoke_iiji(index, a1, a2, a3) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_iiiiiii'](index, a1, a2, a3, a4, a5, a6);
+			return Module['dynCall_iiji'](index, a1, a2, a3);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35106,10 +35111,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_vji(index, a1, a2) {
+	function invoke_iijii(index, a1, a2, a3, a4) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_vji'](index, a1, a2);
+			return Module['dynCall_iijii'](index, a1, a2, a3, a4);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35117,10 +35122,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_viiiiii(index, a1, a2, a3, a4, a5, a6) {
+	function invoke_iijiji(index, a1, a2, a3, a4, a5) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_viiiiii'](index, a1, a2, a3, a4, a5, a6);
+			return Module['dynCall_iijiji'](index, a1, a2, a3, a4, a5);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35128,10 +35133,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_viijii(index, a1, a2, a3, a4, a5) {
+	function invoke_iiiiiii(index, a1, a2, a3, a4, a5, a6) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_viijii'](index, a1, a2, a3, a4, a5);
+			return Module['dynCall_iiiiiii'](index, a1, a2, a3, a4, a5, a6);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35139,10 +35144,10 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_viidii(index, a1, a2, a3, a4, a5) {
+	function invoke_viiiiii(index, a1, a2, a3, a4, a5, a6) {
 		var sp = stackSave();
 		try {
-			Module['dynCall_viidii'](index, a1, a2, a3, a4, a5);
+			Module['dynCall_viiiiii'](index, a1, a2, a3, a4, a5, a6);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35150,22 +35155,32 @@ export function init(RuntimeName, PHPLoader) {
 		}
 	}
 
-	function invoke_jiii(index, a1, a2, a3) {
+	function invoke_viijii(index, a1, a2, a3, a4, a5) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_jiii'](index, a1, a2, a3);
+			Module['dynCall_viijii'](index, a1, a2, a3, a4, a5);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
 			_setThrew(1, 0);
-			return 0n;
 		}
 	}
 
-	function invoke_jii(index, a1, a2) {
+	function invoke_viidii(index, a1, a2, a3, a4, a5) {
 		var sp = stackSave();
 		try {
-			return Module['dynCall_jii'](index, a1, a2);
+			Module['dynCall_viidii'](index, a1, a2, a3, a4, a5);
+		} catch (e) {
+			stackRestore(sp);
+			if (e !== e + 0) throw e;
+			_setThrew(1, 0);
+		}
+	}
+
+	function invoke_jiii(index, a1, a2, a3) {
+		var sp = stackSave();
+		try {
+			return Module['dynCall_jiii'](index, a1, a2, a3);
 		} catch (e) {
 			stackRestore(sp);
 			if (e !== e + 0) throw e;
@@ -35359,6 +35374,15 @@ export function init(RuntimeName, PHPLoader) {
 		};
 	}
 
+	/**
+	 * Expose the PHP version so the PHP class can make version-specific
+	 * adjustments to `php.ini`.
+	 */
+	PHPLoader['phpVersion'] = (() => {
+		const [major, minor, patch] = phpVersionString.split('.').map(Number);
+		return { major, minor, patch };
+	})();
+
 	return PHPLoader;
 
 	// Close the opening bracket from esm-prefix.js: