Make an injectable user-space interface for php-wasm instances

Author: brandonpayton

packages/php-wasm/node/src/lib/file-lock-manager-for-node.ts

@@ -13,7 +13,7 @@ import type {
 	WholeFileLockOp,
 	Pid,
 	Fd,
-} from './file-lock-manager';
+} from '@php-wasm/universal';
 
 type LockMode = 'exclusive' | 'shared' | 'unlock';
 

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

@@ -3,6 +3,5 @@ export * from './networking/with-networking';
 export * from './load-runtime';
 export * from './use-host-filesystem';
 export * from './node-fs-mount';
-export * from './file-lock-manager';
 export * from './file-lock-manager-for-node';
 export * from './xdebug/with-xdebug';

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

@@ -3,12 +3,12 @@ import type {
 	EmscriptenOptions,
 	PHPRuntime,
 	RemoteAPI,
+	FileLockManager,
 } from '@php-wasm/universal';
 import { loadPHPRuntime, FSHelpers } from '@php-wasm/universal';
 import fs from 'fs';
 import { getPHPLoaderModule } from '.';
 import { withNetworking } from './networking/with-networking';
-import type { FileLockManager } from './file-lock-manager';
 import { withXdebug, type XdebugOptions } from './xdebug/with-xdebug';
 import { withIntl } from './extensions/intl/with-intl';
 import { joinPaths } from '@php-wasm/util';

packages/php-wasm/universal/src/lib/emscripten-types.ts

@@ -149,7 +149,7 @@ export namespace Emscripten {
 
 		export interface Mount {
 			type: Emscripten.FileSystemType;
-			opts: object;
+			opts: Record<string, any>;
 			mountpoint: string;
 			mounts: Mount[];
 			root: FSNode;
@@ -185,6 +185,10 @@ export namespace Emscripten {
 			write: boolean;
 			readonly isFolder: boolean;
 			readonly isDevice: boolean;
+
+			// NOTE: As of 2025-11-11, this property is added by a php-wasm patch
+			// for NODEFS.createNode(). It is not part of the Emscripten FSNode interface.
+			readonly isSharedFS?: boolean;
 		}
 
 		export interface ErrnoError extends Error {
@@ -394,6 +398,7 @@ export namespace Emscripten {
 	export declare const MEMFS: Emscripten.FileSystemType;
 	export declare const NODEFS: Emscripten.FileSystemType;
 	export declare const IDBFS: Emscripten.FileSystemType;
+	export declare const PROXYFS: Emscripten.FileSystemType;
 
 	// https://emscripten.org/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.html
 	type StringToType<R> = R extends Emscripten.JSType

…p-wasm/node/src/lib/file-lock-manager.ts …m/universal/src/lib/file-lock-manager.tspackages/php-wasm/node/src/lib/file-lock-manager.ts renamed to packages/php-wasm/universal/src/lib/file-lock-manager.ts packages/php-wasm/node/src/lib/file-lock-manager.ts renamed to packages/php-wasm/universal/src/lib/file-lock-manager.ts

@@ -88,3 +88,5 @@ export { sandboxedSpawnHandlerFactory } from './sandboxed-spawn-handler-factory'
 
 export * from './api';
 export type { WithAPIState as WithIsReady } from './api';
+
+export type * from './file-lock-manager';

packages/php-wasm/universal/src/lib/index.ts

@@ -0,0 +1,11 @@
+// TODO: Consider merging FileLockManager file with os-kernel-space.
+import type { FileLockManager } from './file-lock-manager';
+
+// TODO: Consider merging FileLockManager into this type.
+export class OSKernelSpace {
+	readonly fileLockManager: FileLockManager;
+
+	constructor(fileLockManager: FileLockManager) {
+		this.fileLockManager = fileLockManager;
+	}
+}