@php-wasm/node 3.0.44 → 3.0.45

package/index.cjs

@@ -97,7 +97,6 @@ async function getPHPLoaderModule(version = import_universal.LatestSupportedPHPV
 var dns = __toESM(require("dns"), 1);
 var http = __toESM(require("http"), 1);
 var net2 = __toESM(require("net"), 1);
-var util = __toESM(require("node:util"), 1);
 var import_ws = require("ws");
 
 // packages/php-wasm/node/src/lib/networking/utils.ts
@@ -135,7 +134,17 @@ function listenOnRandomPort() {
 function log(...args) {
   debugLog("[WS Server]", ...args);
 }
-var lookup2 = util.promisify(dns.lookup);
+function lookupIPv4(hostname) {
+  return new Promise((resolve, reject) => {
+    dns.lookup(hostname, { family: 4 }, (err, address) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(address);
+      }
+    });
+  });
+}
 function prependByte(chunk, byte) {
   if (typeof chunk === "string") {
     chunk = String.fromCharCode(byte) + chunk;
@@ -263,8 +272,7 @@ async function onWsConnect(client, request) {
   if (net2.isIP(reqTargetHost) === 0) {
     clientLog("resolving " + reqTargetHost + "... ");
     try {
-      const resolution = await lookup2(reqTargetHost);
-      reqTargetIp = resolution.address;
+      reqTargetIp = await lookupIPv4(reqTargetHost);
       clientLog("resolved " + reqTargetHost + " -> " + reqTargetIp);
     } catch (e) {
       clientLog("can't resolve " + reqTargetHost + " due to:", e);
@@ -415,8 +423,8 @@ async function withNetworking(phpModuleArgs = {}) {
 }
 
 // packages/php-wasm/node/src/lib/load-runtime.ts
-var import_universal6 = require("@php-wasm/universal");
-var import_fs3 = __toESM(require("fs"), 1);
+var import_universal10 = require("@php-wasm/universal");
+var import_fs5 = __toESM(require("fs"), 1);
 
 // packages/php-wasm/node/src/lib/extensions/xdebug/with-xdebug.ts
 var import_universal3 = require("@php-wasm/universal");
@@ -588,6 +596,148 @@ async function withIntl(version = import_universal5.LatestSupportedPHPVersion, o
   };
 }
 
+// packages/php-wasm/node/src/lib/extensions/redis/with-redis.ts
+var import_universal7 = require("@php-wasm/universal");
+var import_fs3 = __toESM(require("fs"), 1);
+
+// packages/php-wasm/node/src/lib/extensions/redis/get-redis-extension-module.ts
+var import_universal6 = require("@php-wasm/universal");
+async function getRedisExtensionModule(version = import_universal6.LatestSupportedPHPVersion) {
+  switch (version) {
+    case "8.5":
+      return (await import("@php-wasm/node-8-5")).getRedisExtensionPath();
+    case "8.4":
+      return (await import("@php-wasm/node-8-4")).getRedisExtensionPath();
+    case "8.3":
+      return (await import("@php-wasm/node-8-3")).getRedisExtensionPath();
+    case "8.2":
+      return (await import("@php-wasm/node-8-2")).getRedisExtensionPath();
+    case "8.1":
+      return (await import("@php-wasm/node-8-1")).getRedisExtensionPath();
+    case "8.0":
+      return (await import("@php-wasm/node-8-0")).getRedisExtensionPath();
+    case "7.4":
+      return (await import("@php-wasm/node-7-4")).getRedisExtensionPath();
+  }
+  throw new Error(`Unsupported PHP version ${version}`);
+}
+
+// packages/php-wasm/node/src/lib/extensions/redis/with-redis.ts
+async function withRedis(version = import_universal7.LatestSupportedPHPVersion, options) {
+  const extensionName = "redis.so";
+  const extensionPath = await getRedisExtensionModule(version);
+  const extension = import_fs3.default.readFileSync(extensionPath);
+  return {
+    ...options,
+    ENV: {
+      ...options.ENV,
+      PHP_INI_SCAN_DIR: "/internal/shared/extensions"
+    },
+    onRuntimeInitialized: (phpRuntime) => {
+      if (options.onRuntimeInitialized) {
+        options.onRuntimeInitialized(phpRuntime);
+      }
+      if (!import_universal7.FSHelpers.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions"
+      )) {
+        phpRuntime.FS.mkdirTree("/internal/shared/extensions");
+      }
+      if (!import_universal7.FSHelpers.fileExists(
+        phpRuntime.FS,
+        `/internal/shared/extensions/${extensionName}`
+      )) {
+        phpRuntime.FS.writeFile(
+          `/internal/shared/extensions/${extensionName}`,
+          new Uint8Array(extension)
+        );
+      }
+      if (!import_universal7.FSHelpers.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions/redis.ini"
+      )) {
+        phpRuntime.FS.writeFile(
+          "/internal/shared/extensions/redis.ini",
+          [
+            `extension=/internal/shared/extensions/${extensionName}`
+          ].join("\n")
+        );
+      }
+    }
+  };
+}
+
+// packages/php-wasm/node/src/lib/extensions/memcached/with-memcached.ts
+var import_universal9 = require("@php-wasm/universal");
+var import_fs4 = __toESM(require("fs"), 1);
+
+// packages/php-wasm/node/src/lib/extensions/memcached/get-memcached-extension-module.ts
+var import_universal8 = require("@php-wasm/universal");
+async function getMemcachedExtensionModule(version = import_universal8.LatestSupportedPHPVersion) {
+  switch (version) {
+    case "8.5":
+      return (await import("@php-wasm/node-8-5")).getMemcachedExtensionPath();
+    case "8.4":
+      return (await import("@php-wasm/node-8-4")).getMemcachedExtensionPath();
+    case "8.3":
+      return (await import("@php-wasm/node-8-3")).getMemcachedExtensionPath();
+    case "8.2":
+      return (await import("@php-wasm/node-8-2")).getMemcachedExtensionPath();
+    case "8.1":
+      return (await import("@php-wasm/node-8-1")).getMemcachedExtensionPath();
+    case "8.0":
+      return (await import("@php-wasm/node-8-0")).getMemcachedExtensionPath();
+    case "7.4":
+      return (await import("@php-wasm/node-7-4")).getMemcachedExtensionPath();
+  }
+  throw new Error(`Unsupported PHP version ${version}`);
+}
+
+// packages/php-wasm/node/src/lib/extensions/memcached/with-memcached.ts
+async function withMemcached(version = import_universal9.LatestSupportedPHPVersion, options) {
+  const extensionName = "memcached.so";
+  const extensionPath = await getMemcachedExtensionModule(version);
+  const extension = import_fs4.default.readFileSync(extensionPath);
+  return {
+    ...options,
+    ENV: {
+      ...options.ENV,
+      PHP_INI_SCAN_DIR: "/internal/shared/extensions"
+    },
+    onRuntimeInitialized: (phpRuntime) => {
+      if (options.onRuntimeInitialized) {
+        options.onRuntimeInitialized(phpRuntime);
+      }
+      if (!import_universal9.FSHelpers.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions"
+      )) {
+        phpRuntime.FS.mkdirTree("/internal/shared/extensions");
+      }
+      if (!import_universal9.FSHelpers.fileExists(
+        phpRuntime.FS,
+        `/internal/shared/extensions/${extensionName}`
+      )) {
+        phpRuntime.FS.writeFile(
+          `/internal/shared/extensions/${extensionName}`,
+          new Uint8Array(extension)
+        );
+      }
+      if (!import_universal9.FSHelpers.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions/memcached.ini"
+      )) {
+        phpRuntime.FS.writeFile(
+          "/internal/shared/extensions/memcached.ini",
+          [
+            `extension=/internal/shared/extensions/${extensionName}`
+          ].join("\n")
+        );
+      }
+    }
+  };
+}
+
 // packages/php-wasm/node/src/lib/load-runtime.ts
 var import_util = require("@php-wasm/util");
 var import_path2 = require("path");
@@ -606,7 +756,7 @@ async function loadNodeRuntime(phpVersion, options = {}) {
       if (options?.followSymlinks === true) {
         phpRuntime.FS.filesystems.NODEFS.node_ops.readlink = (node) => {
           const absoluteSourcePath = phpRuntime.FS.filesystems.NODEFS.tryFSOperation(
-            () => import_fs3.default.realpathSync(
+            () => import_fs5.default.realpathSync(
               phpRuntime.FS.filesystems.NODEFS.realPath(node)
             )
           );
@@ -614,12 +764,12 @@ async function loadNodeRuntime(phpVersion, options = {}) {
             `/internal/symlinks`,
             absoluteSourcePath
           );
-          if (import_fs3.default.existsSync(absoluteSourcePath)) {
-            if (!import_universal6.FSHelpers.fileExists(
+          if (import_fs5.default.existsSync(absoluteSourcePath)) {
+            if (!import_universal10.FSHelpers.fileExists(
               phpRuntime.FS,
               symlinkMountPath
             )) {
-              const sourceStat = import_fs3.default.statSync(absoluteSourcePath);
+              const sourceStat = import_fs5.default.statSync(absoluteSourcePath);
               if (sourceStat.isDirectory()) {
                 phpRuntime.FS.mkdirTree(symlinkMountPath);
               } else if (sourceStat.isFile()) {
@@ -663,8 +813,14 @@ async function loadNodeRuntime(phpVersion, options = {}) {
   if (options?.withIntl === true) {
     emscriptenOptions = await withIntl(phpVersion, emscriptenOptions);
   }
+  if (options?.withRedis === true) {
+    emscriptenOptions = await withRedis(phpVersion, emscriptenOptions);
+  }
+  if (options?.withMemcached === true) {
+    emscriptenOptions = await withMemcached(phpVersion, emscriptenOptions);
+  }
   emscriptenOptions = await withNetworking(emscriptenOptions);
-  return await (0, import_universal6.loadPHPRuntime)(
+  return await (0, import_universal10.loadPHPRuntime)(
     await getPHPLoaderModule(phpVersion),
     emscriptenOptions
   );
@@ -674,15 +830,15 @@ async function loadNodeRuntime(phpVersion, options = {}) {
 var import_node_fs = require("node:fs");
 
 // packages/php-wasm/node/src/lib/node-fs-mount.ts
-var import_universal7 = require("@php-wasm/universal");
+var import_universal11 = require("@php-wasm/universal");
 var import_util2 = require("@php-wasm/util");
-var import_fs4 = require("fs");
+var import_fs6 = require("fs");
 var import_path3 = require("path");
 function createNodeFsMountHandler(localPath) {
   return function(php, FS, vfsMountPoint) {
     let removeVfsNode = false;
-    if (!import_universal7.FSHelpers.fileExists(FS, vfsMountPoint)) {
-      const lstat = (0, import_fs4.lstatSync)(localPath);
+    if (!import_universal11.FSHelpers.fileExists(FS, vfsMountPoint)) {
+      const lstat = (0, import_fs6.lstatSync)(localPath);
       if (lstat.isFile() || lstat.isSymbolicLink()) {
         FS.mkdirTree((0, import_path3.dirname)(vfsMountPoint));
         FS.writeFile(vfsMountPoint, "");
@@ -695,9 +851,9 @@ function createNodeFsMountHandler(localPath) {
       }
       removeVfsNode = true;
     }
-    let lookup3;
+    let lookup2;
     try {
-      lookup3 = FS.lookupPath(vfsMountPoint);
+      lookup2 = FS.lookupPath(vfsMountPoint);
     } catch (e) {
       const error = e;
       if (error.errno === 44) {
@@ -711,7 +867,7 @@ function createNodeFsMountHandler(localPath) {
     return () => {
       FS.unmount(vfsMountPoint);
       if (removeVfsNode) {
-        if (FS.isDir(lookup3.node.mode)) {
+        if (FS.isDir(lookup2.node.mode)) {
           if ((0, import_util2.isParentOf)(vfsMountPoint, FS.cwd())) {
             throw new Error(
               `Cannot remove the VFS directory "${vfsMountPoint}" on umount cleanup \u2013 it is a parent of the CWD "${FS.cwd()}". Change CWD before unmounting or explicitly disable post-unmount node cleanup with createNodeFsMountHandler(path, {cleanupNodesOnUnmount: false}).`
@@ -746,7 +902,7 @@ function useHostFilesystem(php) {
 function statPathFollowSymlinks(path2) {
   let stat = (0, import_node_fs.lstatSync)(path2);
   if (stat.isSymbolicLink()) {
-    const fs4 = require("fs");
+    const fs6 = require("fs");
     let target = path2;
     const seen = /* @__PURE__ */ new Set();
     while (true) {
@@ -756,7 +912,7 @@ function statPathFollowSymlinks(path2) {
       seen.add(target);
       const linkStat = (0, import_node_fs.lstatSync)(target);
       if (linkStat.isSymbolicLink()) {
-        target = fs4.realpathSync(target);
+        target = fs6.realpathSync(target);
         continue;
       }
       stat = linkStat;
@@ -768,7 +924,7 @@ function statPathFollowSymlinks(path2) {
 
 // packages/php-wasm/node/src/lib/file-lock-manager-for-node.ts
 var import_logger2 = require("@php-wasm/logger");
-var import_fs5 = require("fs");
+var import_fs7 = require("fs");
 var MAX_64BIT_OFFSET = BigInt(2n ** 64n - 1n);
 var FileLockManagerForNode = class {
   /**
@@ -903,7 +1059,7 @@ var FileLock = class _FileLock {
   static maybeCreate(path2, mode, nativeFlockSync) {
     let fd;
     try {
-      fd = (0, import_fs5.openSync)(path2, "a+");
+      fd = (0, import_fs7.openSync)(path2, "a+");
       const flockFlags = mode === "exclusive" ? "exnb" : "shnb";
       nativeFlockSync(fd, flockFlags);
       const nativeLock = { fd, mode, nativeFlockSync };
@@ -911,7 +1067,7 @@ var FileLock = class _FileLock {
     } catch {
       if (fd !== void 0) {
         try {
-          (0, import_fs5.closeSync)(fd);
+          (0, import_fs7.closeSync)(fd);
         } catch (error) {
           import_logger2.logger.error(
             "Error closing locking file descriptor",
@@ -934,7 +1090,7 @@ var FileLock = class _FileLock {
    */
   dispose() {
     try {
-      (0, import_fs5.closeSync)(this.nativeLock.fd);
+      (0, import_fs7.closeSync)(this.nativeLock.fd);
     } catch (error) {
       import_logger2.logger.error("Error closing locking file descriptor", error);
     }

package/index.js

@@ -64,7 +64,6 @@ async function getPHPLoaderModule(version = LatestSupportedPHPVersion) {
 import * as dns from "dns";
 import * as http from "http";
 import * as net2 from "net";
-import * as util from "node:util";
 import { WebSocketServer } from "ws";
 
 // packages/php-wasm/node/src/lib/networking/utils.ts
@@ -102,7 +101,17 @@ function listenOnRandomPort() {
 function log(...args) {
   debugLog("[WS Server]", ...args);
 }
-var lookup2 = util.promisify(dns.lookup);
+function lookupIPv4(hostname) {
+  return new Promise((resolve, reject) => {
+    dns.lookup(hostname, { family: 4 }, (err, address) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(address);
+      }
+    });
+  });
+}
 function prependByte(chunk, byte) {
   if (typeof chunk === "string") {
     chunk = String.fromCharCode(byte) + chunk;
@@ -230,8 +239,7 @@ async function onWsConnect(client, request) {
   if (net2.isIP(reqTargetHost) === 0) {
     clientLog("resolving " + reqTargetHost + "... ");
     try {
-      const resolution = await lookup2(reqTargetHost);
-      reqTargetIp = resolution.address;
+      reqTargetIp = await lookupIPv4(reqTargetHost);
       clientLog("resolved " + reqTargetHost + " -> " + reqTargetIp);
     } catch (e) {
       clientLog("can't resolve " + reqTargetHost + " due to:", e);
@@ -382,8 +390,8 @@ async function withNetworking(phpModuleArgs = {}) {
 }
 
 // packages/php-wasm/node/src/lib/load-runtime.ts
-import { loadPHPRuntime, FSHelpers as FSHelpers3 } from "@php-wasm/universal";
-import fs3 from "fs";
+import { loadPHPRuntime, FSHelpers as FSHelpers5 } from "@php-wasm/universal";
+import fs5 from "fs";
 
 // packages/php-wasm/node/src/lib/extensions/xdebug/with-xdebug.ts
 import { LatestSupportedPHPVersion as LatestSupportedPHPVersion3, FSHelpers } from "@php-wasm/universal";
@@ -554,6 +562,148 @@ async function withIntl(version = LatestSupportedPHPVersion5, options) {
   };
 }
 
+// packages/php-wasm/node/src/lib/extensions/redis/with-redis.ts
+import { LatestSupportedPHPVersion as LatestSupportedPHPVersion7, FSHelpers as FSHelpers3 } from "@php-wasm/universal";
+import fs3 from "fs";
+
+// packages/php-wasm/node/src/lib/extensions/redis/get-redis-extension-module.ts
+import { LatestSupportedPHPVersion as LatestSupportedPHPVersion6 } from "@php-wasm/universal";
+async function getRedisExtensionModule(version = LatestSupportedPHPVersion6) {
+  switch (version) {
+    case "8.5":
+      return (await import("@php-wasm/node-8-5")).getRedisExtensionPath();
+    case "8.4":
+      return (await import("@php-wasm/node-8-4")).getRedisExtensionPath();
+    case "8.3":
+      return (await import("@php-wasm/node-8-3")).getRedisExtensionPath();
+    case "8.2":
+      return (await import("@php-wasm/node-8-2")).getRedisExtensionPath();
+    case "8.1":
+      return (await import("@php-wasm/node-8-1")).getRedisExtensionPath();
+    case "8.0":
+      return (await import("@php-wasm/node-8-0")).getRedisExtensionPath();
+    case "7.4":
+      return (await import("@php-wasm/node-7-4")).getRedisExtensionPath();
+  }
+  throw new Error(`Unsupported PHP version ${version}`);
+}
+
+// packages/php-wasm/node/src/lib/extensions/redis/with-redis.ts
+async function withRedis(version = LatestSupportedPHPVersion7, options) {
+  const extensionName = "redis.so";
+  const extensionPath = await getRedisExtensionModule(version);
+  const extension = fs3.readFileSync(extensionPath);
+  return {
+    ...options,
+    ENV: {
+      ...options.ENV,
+      PHP_INI_SCAN_DIR: "/internal/shared/extensions"
+    },
+    onRuntimeInitialized: (phpRuntime) => {
+      if (options.onRuntimeInitialized) {
+        options.onRuntimeInitialized(phpRuntime);
+      }
+      if (!FSHelpers3.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions"
+      )) {
+        phpRuntime.FS.mkdirTree("/internal/shared/extensions");
+      }
+      if (!FSHelpers3.fileExists(
+        phpRuntime.FS,
+        `/internal/shared/extensions/${extensionName}`
+      )) {
+        phpRuntime.FS.writeFile(
+          `/internal/shared/extensions/${extensionName}`,
+          new Uint8Array(extension)
+        );
+      }
+      if (!FSHelpers3.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions/redis.ini"
+      )) {
+        phpRuntime.FS.writeFile(
+          "/internal/shared/extensions/redis.ini",
+          [
+            `extension=/internal/shared/extensions/${extensionName}`
+          ].join("\n")
+        );
+      }
+    }
+  };
+}
+
+// packages/php-wasm/node/src/lib/extensions/memcached/with-memcached.ts
+import { LatestSupportedPHPVersion as LatestSupportedPHPVersion9, FSHelpers as FSHelpers4 } from "@php-wasm/universal";
+import fs4 from "fs";
+
+// packages/php-wasm/node/src/lib/extensions/memcached/get-memcached-extension-module.ts
+import { LatestSupportedPHPVersion as LatestSupportedPHPVersion8 } from "@php-wasm/universal";
+async function getMemcachedExtensionModule(version = LatestSupportedPHPVersion8) {
+  switch (version) {
+    case "8.5":
+      return (await import("@php-wasm/node-8-5")).getMemcachedExtensionPath();
+    case "8.4":
+      return (await import("@php-wasm/node-8-4")).getMemcachedExtensionPath();
+    case "8.3":
+      return (await import("@php-wasm/node-8-3")).getMemcachedExtensionPath();
+    case "8.2":
+      return (await import("@php-wasm/node-8-2")).getMemcachedExtensionPath();
+    case "8.1":
+      return (await import("@php-wasm/node-8-1")).getMemcachedExtensionPath();
+    case "8.0":
+      return (await import("@php-wasm/node-8-0")).getMemcachedExtensionPath();
+    case "7.4":
+      return (await import("@php-wasm/node-7-4")).getMemcachedExtensionPath();
+  }
+  throw new Error(`Unsupported PHP version ${version}`);
+}
+
+// packages/php-wasm/node/src/lib/extensions/memcached/with-memcached.ts
+async function withMemcached(version = LatestSupportedPHPVersion9, options) {
+  const extensionName = "memcached.so";
+  const extensionPath = await getMemcachedExtensionModule(version);
+  const extension = fs4.readFileSync(extensionPath);
+  return {
+    ...options,
+    ENV: {
+      ...options.ENV,
+      PHP_INI_SCAN_DIR: "/internal/shared/extensions"
+    },
+    onRuntimeInitialized: (phpRuntime) => {
+      if (options.onRuntimeInitialized) {
+        options.onRuntimeInitialized(phpRuntime);
+      }
+      if (!FSHelpers4.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions"
+      )) {
+        phpRuntime.FS.mkdirTree("/internal/shared/extensions");
+      }
+      if (!FSHelpers4.fileExists(
+        phpRuntime.FS,
+        `/internal/shared/extensions/${extensionName}`
+      )) {
+        phpRuntime.FS.writeFile(
+          `/internal/shared/extensions/${extensionName}`,
+          new Uint8Array(extension)
+        );
+      }
+      if (!FSHelpers4.fileExists(
+        phpRuntime.FS,
+        "/internal/shared/extensions/memcached.ini"
+      )) {
+        phpRuntime.FS.writeFile(
+          "/internal/shared/extensions/memcached.ini",
+          [
+            `extension=/internal/shared/extensions/${extensionName}`
+          ].join("\n")
+        );
+      }
+    }
+  };
+}
+
 // packages/php-wasm/node/src/lib/load-runtime.ts
 import { joinPaths } from "@php-wasm/util";
 import { dirname } from "path";
@@ -572,7 +722,7 @@ async function loadNodeRuntime(phpVersion, options = {}) {
       if (options?.followSymlinks === true) {
         phpRuntime.FS.filesystems.NODEFS.node_ops.readlink = (node) => {
           const absoluteSourcePath = phpRuntime.FS.filesystems.NODEFS.tryFSOperation(
-            () => fs3.realpathSync(
+            () => fs5.realpathSync(
               phpRuntime.FS.filesystems.NODEFS.realPath(node)
             )
           );
@@ -580,12 +730,12 @@ async function loadNodeRuntime(phpVersion, options = {}) {
             `/internal/symlinks`,
             absoluteSourcePath
           );
-          if (fs3.existsSync(absoluteSourcePath)) {
-            if (!FSHelpers3.fileExists(
+          if (fs5.existsSync(absoluteSourcePath)) {
+            if (!FSHelpers5.fileExists(
               phpRuntime.FS,
               symlinkMountPath
             )) {
-              const sourceStat = fs3.statSync(absoluteSourcePath);
+              const sourceStat = fs5.statSync(absoluteSourcePath);
               if (sourceStat.isDirectory()) {
                 phpRuntime.FS.mkdirTree(symlinkMountPath);
               } else if (sourceStat.isFile()) {
@@ -629,6 +779,12 @@ async function loadNodeRuntime(phpVersion, options = {}) {
   if (options?.withIntl === true) {
     emscriptenOptions = await withIntl(phpVersion, emscriptenOptions);
   }
+  if (options?.withRedis === true) {
+    emscriptenOptions = await withRedis(phpVersion, emscriptenOptions);
+  }
+  if (options?.withMemcached === true) {
+    emscriptenOptions = await withMemcached(phpVersion, emscriptenOptions);
+  }
   emscriptenOptions = await withNetworking(emscriptenOptions);
   return await loadPHPRuntime(
     await getPHPLoaderModule(phpVersion),
@@ -641,7 +797,7 @@ import { lstatSync as lstatSync2, readdirSync } from "node:fs";
 
 // packages/php-wasm/node/src/lib/node-fs-mount.ts
 import {
-  FSHelpers as FSHelpers4
+  FSHelpers as FSHelpers6
 } from "@php-wasm/universal";
 import { isParentOf } from "@php-wasm/util";
 import { lstatSync } from "fs";
@@ -649,7 +805,7 @@ import { dirname as dirname2 } from "path";
 function createNodeFsMountHandler(localPath) {
   return function(php, FS, vfsMountPoint) {
     let removeVfsNode = false;
-    if (!FSHelpers4.fileExists(FS, vfsMountPoint)) {
+    if (!FSHelpers6.fileExists(FS, vfsMountPoint)) {
       const lstat = lstatSync(localPath);
       if (lstat.isFile() || lstat.isSymbolicLink()) {
         FS.mkdirTree(dirname2(vfsMountPoint));
@@ -663,9 +819,9 @@ function createNodeFsMountHandler(localPath) {
       }
       removeVfsNode = true;
     }
-    let lookup3;
+    let lookup2;
     try {
-      lookup3 = FS.lookupPath(vfsMountPoint);
+      lookup2 = FS.lookupPath(vfsMountPoint);
     } catch (e) {
       const error = e;
       if (error.errno === 44) {
@@ -679,7 +835,7 @@ function createNodeFsMountHandler(localPath) {
     return () => {
       FS.unmount(vfsMountPoint);
       if (removeVfsNode) {
-        if (FS.isDir(lookup3.node.mode)) {
+        if (FS.isDir(lookup2.node.mode)) {
           if (isParentOf(vfsMountPoint, FS.cwd())) {
             throw new Error(
               `Cannot remove the VFS directory "${vfsMountPoint}" on umount cleanup \u2013 it is a parent of the CWD "${FS.cwd()}". Change CWD before unmounting or explicitly disable post-unmount node cleanup with createNodeFsMountHandler(path, {cleanupNodesOnUnmount: false}).`
@@ -714,7 +870,7 @@ function useHostFilesystem(php) {
 function statPathFollowSymlinks(path2) {
   let stat = lstatSync2(path2);
   if (stat.isSymbolicLink()) {
-    const fs4 = __require("fs");
+    const fs6 = __require("fs");
     let target = path2;
     const seen = /* @__PURE__ */ new Set();
     while (true) {
@@ -724,7 +880,7 @@ function statPathFollowSymlinks(path2) {
       seen.add(target);
       const linkStat = lstatSync2(target);
       if (linkStat.isSymbolicLink()) {
-        target = fs4.realpathSync(target);
+        target = fs6.realpathSync(target);
         continue;
       }
       stat = linkStat;

package/lib/extensions/memcached/get-memcached-extension-module.d.ts

@@ -0,0 +1,11 @@
+import type { SupportedPHPVersion } from '@php-wasm/universal';
+/**
+ * Returns the path to the memcached extension for the specified PHP version.
+ *
+ * Each PHP version's memcached extension is packaged separately. Install the
+ * version-specific package you need:
+ * - @php-wasm/node-8-5
+ * - @php-wasm/node-8-4
+ * - etc.
+ */
+export declare function getMemcachedExtensionModule(version?: SupportedPHPVersion): Promise<any>;

package/lib/extensions/memcached/with-memcached.d.ts

@@ -0,0 +1,2 @@
+import type { EmscriptenOptions } from '@php-wasm/universal';
+export declare function withMemcached(version: "8.5" | "8.4" | "8.3" | "8.2" | "8.1" | "8.0" | "7.4" | undefined, options: EmscriptenOptions): Promise<EmscriptenOptions>;

package/lib/extensions/redis/get-redis-extension-module.d.ts

@@ -0,0 +1,11 @@
+import type { SupportedPHPVersion } from '@php-wasm/universal';
+/**
+ * Returns the path to the redis extension for the specified PHP version.
+ *
+ * Each PHP version's redis extension is packaged separately. Install the
+ * version-specific package you need:
+ * - @php-wasm/node-8-5
+ * - @php-wasm/node-8-4
+ * - etc.
+ */
+export declare function getRedisExtensionModule(version?: SupportedPHPVersion): Promise<any>;

package/lib/extensions/redis/with-redis.d.ts

@@ -0,0 +1,2 @@
+import type { EmscriptenOptions } from '@php-wasm/universal';
+export declare function withRedis(version: "8.5" | "8.4" | "8.3" | "8.2" | "8.1" | "8.0" | "7.4" | undefined, options: EmscriptenOptions): Promise<EmscriptenOptions>;

package/lib/load-runtime.d.ts

@@ -8,6 +8,8 @@ export interface PHPLoaderOptions {
     withXdebug?: boolean;
     xdebug?: XdebugOptions;
     withIntl?: boolean;
+    withRedis?: boolean;
+    withMemcached?: boolean;
 }
 export type PHPLoaderOptionsForNode = PHPLoaderOptions & {
     emscriptenOptions?: EmscriptenOptions & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "3.0.44",
+  "version": "3.0.45",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
   },
   "license": "GPL-2.0-or-later",
   "types": "index.d.ts",
-  "gitHead": "16881b9b024e961a5254be5b366fad096585c310",
+  "gitHead": "90da64a5068b13069ea9faf8ff9f5b1e36fd6099",
   "engines": {
     "node": ">=20.18.3",
     "npm": ">=10.1.0"
@@ -49,18 +49,18 @@
     "wasm-feature-detect": "1.8.0",
     "ws": "8.18.3",
     "yargs": "17.7.2",
-    "@php-wasm/node-polyfills": "3.0.44",
-    "@php-wasm/universal": "3.0.44",
-    "@php-wasm/node-8-5": "3.0.44",
-    "@php-wasm/node-8-4": "3.0.44",
-    "@php-wasm/node-8-3": "3.0.44",
-    "@php-wasm/node-8-2": "3.0.44",
-    "@php-wasm/node-8-1": "3.0.44",
-    "@php-wasm/node-8-0": "3.0.44",
-    "@php-wasm/node-7-4": "3.0.44",
-    "@php-wasm/logger": "3.0.44",
-    "@php-wasm/util": "3.0.44",
-    "@wp-playground/common": "3.0.44"
+    "@php-wasm/node-polyfills": "3.0.45",
+    "@php-wasm/universal": "3.0.45",
+    "@php-wasm/node-8-5": "3.0.45",
+    "@php-wasm/node-8-4": "3.0.45",
+    "@php-wasm/node-8-3": "3.0.45",
+    "@php-wasm/node-8-2": "3.0.45",
+    "@php-wasm/node-8-1": "3.0.45",
+    "@php-wasm/node-8-0": "3.0.45",
+    "@php-wasm/node-7-4": "3.0.45",
+    "@php-wasm/logger": "3.0.45",
+    "@php-wasm/util": "3.0.45",
+    "@wp-playground/common": "3.0.45"
   },
   "packageManager": "npm@10.9.2",
   "overrides": {