Memory leak: add rotatedPHP to kill and recreate PHP instances after a certain number of requests

packages/php-wasm/fs-journal/src/lib/fs-journal.ts

@@ -116,61 +116,77 @@ export function journalFSEvents(
 	fsRoot: string,
 	onEntry: (entry: FilesystemOperation) => void = () => {}
 ) {
-	fsRoot = normalizePath(fsRoot);
-	const FS = php[__private__dont__use].FS;
-	const FSHooks = createFSHooks(FS, (entry: FilesystemOperation) => {
-		// Only journal entries inside the specified root directory.
-		if (entry.path.startsWith(fsRoot)) {
-			onEntry(entry);
-		} else if (
-			entry.operation === 'RENAME' &&
-			entry.toPath.startsWith(fsRoot)
-		) {
-			for (const op of recordExistingPath(
-				php,
-				entry.path,
-				entry.toPath
-			)) {
-				onEntry(op);
+	function bindToCurrentRuntime() {
+		fsRoot = normalizePath(fsRoot);
+		const FS = php[__private__dont__use].FS;
+		const FSHooks = createFSHooks(FS, (entry: FilesystemOperation) => {
+			// Only journal entries inside the specified root directory.
+			if (entry.path.startsWith(fsRoot)) {
+				onEntry(entry);
+			} else if (
+				entry.operation === 'RENAME' &&
+				entry.toPath.startsWith(fsRoot)
+			) {
+				for (const op of recordExistingPath(
+					php,
+					entry.path,
+					entry.toPath
+				)) {
+					onEntry(op);
+				}
 			}
-		}
-	});
+		});
 
-	/**
-	 * Override the original FS functions with ones running the hooks.
-	 * We could use a Proxy object here if the Emscripten JavaScript module
-	 * did not use hard-coded references to the FS object.
-	 */
-	const originalFunctions: Record<string, Function> = {};
-	for (const [name] of Object.entries(FSHooks)) {
-		originalFunctions[name] = FS[name];
-	}
+		/**
+		 * Override the original FS functions with ones running the hooks.
+		 * We could use a Proxy object here if the Emscripten JavaScript module
+		 * did not use hard-coded references to the FS object.
+		 */
+		const originalFunctions: Record<string, Function> = {};
+		for (const [name] of Object.entries(FSHooks)) {
+			originalFunctions[name] = FS[name];
+		}
 
-	// eslint-disable-next-line no-inner-declarations
-	function bind() {
-		for (const [name, hook] of Object.entries(FSHooks)) {
-			FS[name] = function (...args: any[]) {
-				// @ts-ignore
-				hook(...args);
-				return originalFunctions[name].apply(this, args);
-			};
+		// eslint-disable-next-line no-inner-declarations
+		function bind() {
+			for (const [name, hook] of Object.entries(FSHooks)) {
+				FS[name] = function (...args: any[]) {
+					// @ts-ignore
+					hook(...args);
+					return originalFunctions[name].apply(this, args);
+				};
+			}
 		}
-	}
-	// eslint-disable-next-line no-inner-declarations
-	function unbind() {
-		// Restore the original FS functions.
-		for (const [name, fn] of Object.entries(originalFunctions)) {
-			php[__private__dont__use].FS[name] = fn;
+		// eslint-disable-next-line no-inner-declarations
+		function unbind() {
+			// Restore the original FS functions.
+			for (const [name, fn] of Object.entries(originalFunctions)) {
+				php[__private__dont__use].FS[name] = fn;
+			}
 		}
+
+		php[__private__dont__use].journal = {
+			bind,
+			unbind,
+		};
+		bind();
+	}
+	php.addEventListener('runtime.initialized', bindToCurrentRuntime);
+	if (php[__private__dont__use]) {
+		bindToCurrentRuntime();
 	}
 
-	php[__private__dont__use].journal = {
-		bind,
-		unbind,
-	};
+	function unbindFromOldRuntime() {
+		php[__private__dont__use].journal.unbind();
+		delete php[__private__dont__use].journal;
+	}
+	php.addEventListener('runtime.beforedestroy', unbindFromOldRuntime);
 
-	bind();
-	return unbind;
+	return function unbind() {
+		php.removeEventListener('runtime.initialized', bindToCurrentRuntime);
+		php.removeEventListener('runtime.beforedestroy', unbindFromOldRuntime);
+		return php[__private__dont__use].journal.unbind();
+	};
 }
 
 const createFSHooks = (
@@ -261,7 +277,7 @@ const createFSHooks = (
  */
 export function replayFSJournal(php: BasePHP, entries: FilesystemOperation[]) {
 	// We need to restore the original functions to the FS object
-	// before proceeding, or each replayer FS operation will be journaled.
+	// before proceeding, or each replayed FS operation will be journaled.
 	//
 	// Unfortunately we can't just call the non-journaling versions directly,
 	// because they call other low-level FS functions like `FS.mkdir()`

packages/php-wasm/node/src/lib/node-php.ts

@@ -7,7 +7,6 @@ import {
 	rethrowFileSystemError,
 	__private__dont__use,
 	isExitCodeZero,
-	DataModule,
 } from '@php-wasm/universal';
 
 import { lstatSync, readdirSync } from 'node:fs';
@@ -17,7 +16,6 @@ import { withNetworking } from './networking/with-networking.js';
 export interface PHPLoaderOptions {
 	emscriptenOptions?: EmscriptenOptions;
 	requestHandler?: PHPRequestHandlerConfiguration;
-	dataModules?: Array<DataModule | Promise<DataModule>>;
 }
 
 export type MountSettings = {
@@ -44,20 +42,10 @@ export class NodePHP extends BasePHP {
 		phpVersion: SupportedPHPVersion,
 		options: PHPLoaderOptions = {}
 	) {
-		return await NodePHP.loadSync(phpVersion, {
-			...options,
-			emscriptenOptions: {
-				/**
-				 * Emscripten default behavior is to kill the process when
-				 * the WASM program calls `exit()`. We want to throw an
-				 * exception instead.
-				 */
-				quit: function (code, error) {
-					throw error;
-				},
-				...(options.emscriptenOptions || {}),
-			},
-		}).phpReady;
+		return new NodePHP(
+			await NodePHP.loadRuntime(phpVersion, options),
+			options.requestHandler
+		);
 	}
 
 	/**
@@ -67,29 +55,25 @@ export class NodePHP extends BasePHP {
 	 *
 	 * @see load
 	 */
-	static loadSync(
+	static async loadRuntime(
 		phpVersion: SupportedPHPVersion,
 		options: PHPLoaderOptions = {}
 	) {
-		/**
-		 * Keep any changes to the signature of this method in sync with the
-		 * `PHP.load` method in the @php-wasm/node package.
-		 */
-		const php = new NodePHP(undefined, options.requestHandler);
-
-		const doLoad = async () => {
-			const runtimeId = await loadPHPRuntime(
-				await getPHPLoaderModule(phpVersion),
-				await withNetworking(options.emscriptenOptions || {})
-			);
-			php.initializeRuntime(runtimeId);
-		};
-		const asyncData = doLoad();
-
-		return {
-			php,
-			phpReady: asyncData.then(() => php),
+		const emscriptenOptions: EmscriptenOptions = {
+			/**
+			 * Emscripten default behavior is to kill the process when
+			 * the WASM program calls `exit()`. We want to throw an
+			 * exception instead.
+			 */
+			quit: function (code, error) {
+				throw error;
+			},
+			...(options.emscriptenOptions || {}),
 		};
+		return await loadPHPRuntime(
+			await getPHPLoaderModule(phpVersion),
+			await withNetworking(emscriptenOptions)
+		);
 	}
 
 	/**