@php-wasm/node 3.1.41 → 3.1.42

package/index.cjs

@@ -482,13 +482,18 @@ function bindUserSpace({ fileLockManager }, {
   }
   const locking = {
     /*
-     * This is a set of possibly locked file descriptors.
+     * Possibly locked file descriptors and their last known native paths.
+     * The path must be captured when the lock succeeds because close-time
+     * cleanup may run after the file is unlinked.
      *
-     * When a file descriptor is closed, we need to release any associated held by this process.
-     * Instead of trying remember and forget file descriptors as they are locked and unlocked,
-     * we just track file descriptors we have locked before and try an unlock when they are closed.
+     * WARNING: This fixes cleanup when a known path disappears before
+     * close, but it does not make path-keyed lock bookkeeping rename-safe.
+     * If a locked file is renamed, later lock operations may address the
+     * same underlying file through a different path than the one stored
+     * here. Correctly handling that requires stable file identity tracking,
+     * such as device/inode keys or rename-aware lock manager updates.
      */
-    maybeLockedFds: /* @__PURE__ */ new Set(),
+    maybeLockedFdPaths: /* @__PURE__ */ new Map(),
     lockStateToFcntl: {
       shared: F_RDLCK,
       exclusive: F_WRLCK,
@@ -905,7 +910,10 @@ function bindUserSpace({ fileLockManager }, {
             waitForLock
           );
           if (succeeded) {
-            locking.maybeLockedFds.add(nativeFd);
+            locking.maybeLockedFdPaths.set(
+              nativeFd,
+              nativeFilePath
+            );
           }
           js_wasm_trace(
             "fcntl(%d, F_SETLK) %s lockFileByteRange returned %d for range lock %s",
@@ -1024,7 +1032,7 @@ function bindUserSpace({ fileLockManager }, {
         succeeded
       );
       if (succeeded) {
-        locking.maybeLockedFds.add(nativeFd);
+        locking.maybeLockedFdPaths.set(nativeFd, nativeFilePath);
       }
       return succeeded ? 0 : -EWOULDBLOCK;
     } catch (e) {
@@ -1042,6 +1050,7 @@ function bindUserSpace({ fileLockManager }, {
     }
     const [vfsPath, vfsPathResolutionErrno] = locking.get_vfs_path_from_fd(fd);
     const [nativeFd, nativeFdErrno] = locking.get_native_fd_from_emscripten_fd(fd);
+    const nativeFilePath = nativeFdErrno === 0 ? locking.maybeLockedFdPaths.get(nativeFd) : void 0;
     const fdCloseResult = builtin_fd_close(fd);
     if (fdCloseResult !== 0) {
       js_wasm_trace(
@@ -1052,38 +1061,33 @@ function bindUserSpace({ fileLockManager }, {
       );
       return fdCloseResult;
     }
-    if (!locking.maybeLockedFds.has(nativeFd)) {
+    if (nativeFdErrno !== 0) {
       js_wasm_trace(
-        "fd_close(%d) not in maybe-locked-list %s result %d",
+        "fd_close(%d) %s get_native_fd_from_emscripten_fd error %d",
         fd,
         vfsPath,
-        fdCloseResult
+        nativeFdErrno
       );
       return fdCloseResult;
     }
-    if (vfsPathResolutionErrno !== 0) {
+    if (nativeFilePath === void 0) {
       js_wasm_trace(
-        "fd_close(%d) get_vfs_path_from_fd error %d",
+        "fd_close(%d) not in maybe-locked-list %s result %d",
         fd,
-        vfsPathResolutionErrno
+        vfsPath,
+        fdCloseResult
       );
       return fdCloseResult;
     }
-    if (nativeFdErrno !== 0) {
+    if (vfsPathResolutionErrno !== 0) {
       js_wasm_trace(
-        "fd_close(%d) %s get_native_fd_from_emscripten_fd error %d",
+        "fd_close(%d) get_vfs_path_from_fd error %d",
         fd,
-        vfsPath,
-        nativeFdErrno
+        vfsPathResolutionErrno
       );
-      return fdCloseResult;
-    }
-    if (!locking.is_path_to_shared_fs(vfsPath)) {
-      return fdCloseResult;
     }
     try {
       js_wasm_trace("fd_close(%d) %s release locks", fd, vfsPath);
-      const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
       fileLockManager.releaseLocksOnFdClose(
         pid,
         nativeFd,
@@ -1092,6 +1096,8 @@ function bindUserSpace({ fileLockManager }, {
       js_wasm_trace("fd_close(%d) %s release locks success", fd, vfsPath);
     } catch (e) {
       js_wasm_trace("fd_close(%d) %s error '%s'", fd, vfsPath, e);
+    } finally {
+      locking.maybeLockedFdPaths.delete(nativeFd);
     }
     return fdCloseResult;
   }
@@ -1109,6 +1115,7 @@ function bindUserSpace({ fileLockManager }, {
     }
     try {
       fileLockManager.releaseLocksForProcess(pid);
+      locking.maybeLockedFdPaths.clear();
       js_wasm_trace("js_release_file_locks succeeded");
     } catch (e) {
       js_wasm_trace("js_release_file_locks error %s", e);

package/index.js

@@ -457,13 +457,18 @@ function bindUserSpace({ fileLockManager }, {
   }
   const locking = {
     /*
-     * This is a set of possibly locked file descriptors.
+     * Possibly locked file descriptors and their last known native paths.
+     * The path must be captured when the lock succeeds because close-time
+     * cleanup may run after the file is unlinked.
      *
-     * When a file descriptor is closed, we need to release any associated held by this process.
-     * Instead of trying remember and forget file descriptors as they are locked and unlocked,
-     * we just track file descriptors we have locked before and try an unlock when they are closed.
+     * WARNING: This fixes cleanup when a known path disappears before
+     * close, but it does not make path-keyed lock bookkeeping rename-safe.
+     * If a locked file is renamed, later lock operations may address the
+     * same underlying file through a different path than the one stored
+     * here. Correctly handling that requires stable file identity tracking,
+     * such as device/inode keys or rename-aware lock manager updates.
      */
-    maybeLockedFds: /* @__PURE__ */ new Set(),
+    maybeLockedFdPaths: /* @__PURE__ */ new Map(),
     lockStateToFcntl: {
       shared: F_RDLCK,
       exclusive: F_WRLCK,
@@ -880,7 +885,10 @@ function bindUserSpace({ fileLockManager }, {
             waitForLock
           );
           if (succeeded) {
-            locking.maybeLockedFds.add(nativeFd);
+            locking.maybeLockedFdPaths.set(
+              nativeFd,
+              nativeFilePath
+            );
           }
           js_wasm_trace(
             "fcntl(%d, F_SETLK) %s lockFileByteRange returned %d for range lock %s",
@@ -999,7 +1007,7 @@ function bindUserSpace({ fileLockManager }, {
         succeeded
       );
       if (succeeded) {
-        locking.maybeLockedFds.add(nativeFd);
+        locking.maybeLockedFdPaths.set(nativeFd, nativeFilePath);
       }
       return succeeded ? 0 : -EWOULDBLOCK;
     } catch (e) {
@@ -1017,6 +1025,7 @@ function bindUserSpace({ fileLockManager }, {
     }
     const [vfsPath, vfsPathResolutionErrno] = locking.get_vfs_path_from_fd(fd);
     const [nativeFd, nativeFdErrno] = locking.get_native_fd_from_emscripten_fd(fd);
+    const nativeFilePath = nativeFdErrno === 0 ? locking.maybeLockedFdPaths.get(nativeFd) : void 0;
     const fdCloseResult = builtin_fd_close(fd);
     if (fdCloseResult !== 0) {
       js_wasm_trace(
@@ -1027,38 +1036,33 @@ function bindUserSpace({ fileLockManager }, {
       );
       return fdCloseResult;
     }
-    if (!locking.maybeLockedFds.has(nativeFd)) {
+    if (nativeFdErrno !== 0) {
       js_wasm_trace(
-        "fd_close(%d) not in maybe-locked-list %s result %d",
+        "fd_close(%d) %s get_native_fd_from_emscripten_fd error %d",
         fd,
         vfsPath,
-        fdCloseResult
+        nativeFdErrno
       );
       return fdCloseResult;
     }
-    if (vfsPathResolutionErrno !== 0) {
+    if (nativeFilePath === void 0) {
       js_wasm_trace(
-        "fd_close(%d) get_vfs_path_from_fd error %d",
+        "fd_close(%d) not in maybe-locked-list %s result %d",
         fd,
-        vfsPathResolutionErrno
+        vfsPath,
+        fdCloseResult
       );
       return fdCloseResult;
     }
-    if (nativeFdErrno !== 0) {
+    if (vfsPathResolutionErrno !== 0) {
       js_wasm_trace(
-        "fd_close(%d) %s get_native_fd_from_emscripten_fd error %d",
+        "fd_close(%d) get_vfs_path_from_fd error %d",
         fd,
-        vfsPath,
-        nativeFdErrno
+        vfsPathResolutionErrno
       );
-      return fdCloseResult;
-    }
-    if (!locking.is_path_to_shared_fs(vfsPath)) {
-      return fdCloseResult;
     }
     try {
       js_wasm_trace("fd_close(%d) %s release locks", fd, vfsPath);
-      const nativeFilePath = locking.get_native_path_from_vfs_path(vfsPath);
       fileLockManager.releaseLocksOnFdClose(
         pid,
         nativeFd,
@@ -1067,6 +1071,8 @@ function bindUserSpace({ fileLockManager }, {
       js_wasm_trace("fd_close(%d) %s release locks success", fd, vfsPath);
     } catch (e) {
       js_wasm_trace("fd_close(%d) %s error '%s'", fd, vfsPath, e);
+    } finally {
+      locking.maybeLockedFdPaths.delete(nativeFd);
     }
     return fdCloseResult;
   }
@@ -1084,6 +1090,7 @@ function bindUserSpace({ fileLockManager }, {
     }
     try {
       fileLockManager.releaseLocksForProcess(pid);
+      locking.maybeLockedFdPaths.clear();
       js_wasm_trace("js_release_file_locks succeeded");
     } catch (e) {
       js_wasm_trace("js_release_file_locks error %s", e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "3.1.41",
+  "version": "3.1.42",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -42,20 +42,20 @@
     "fs-ext-extra-prebuilt": "2.2.7",
     "wasm-feature-detect": "1.8.0",
     "ws": "8.21.0",
-    "@php-wasm/universal": "3.1.41",
-    "@php-wasm/node-8-5": "3.1.41",
-    "@php-wasm/node-8-4": "3.1.41",
-    "@php-wasm/node-8-3": "3.1.41",
-    "@php-wasm/node-8-2": "3.1.41",
-    "@php-wasm/node-8-1": "3.1.41",
-    "@php-wasm/node-8-0": "3.1.41",
-    "@php-wasm/node-7-4": "3.1.41",
-    "@php-wasm/cli-util": "3.1.41",
-    "@php-wasm/logger": "3.1.41",
-    "@php-wasm/node-5-2": "3.1.41",
-    "@php-wasm/util": "3.1.41"
+    "@php-wasm/universal": "3.1.42",
+    "@php-wasm/node-8-5": "3.1.42",
+    "@php-wasm/node-8-4": "3.1.42",
+    "@php-wasm/node-8-3": "3.1.42",
+    "@php-wasm/node-8-2": "3.1.42",
+    "@php-wasm/node-8-1": "3.1.42",
+    "@php-wasm/node-8-0": "3.1.42",
+    "@php-wasm/node-7-4": "3.1.42",
+    "@php-wasm/cli-util": "3.1.42",
+    "@php-wasm/logger": "3.1.42",
+    "@php-wasm/node-5-2": "3.1.42",
+    "@php-wasm/util": "3.1.42"
   },
-  "gitHead": "d32ef94fc8b765bd0c6ed7d5ba32e2ebd34b8a75",
+  "gitHead": "827bc91f5d6022e5c3cae3b79edaa14101a4fced",
   "engines": {
     "node": ">=20.10.0",
     "npm": ">=10.2.3"