@php-wasm/node 0.1.42 → 0.1.46

package/index.cjs

@@ -10638,7 +10638,7 @@ var dependenciesTotalSize, dependencyFilename;
 var init_php_8_2 = __esm({
   "packages/php-wasm/node/public/php_8_2.js"() {
     "use strict";
-    dependenciesTotalSize = 10302568;
+    dependenciesTotalSize = 10302665;
     dependencyFilename = __dirname + "/php_8_2.wasm";
   }
 });
@@ -17733,7 +17733,7 @@ var dependenciesTotalSize2, dependencyFilename2;
 var init_php_8_1 = __esm({
   "packages/php-wasm/node/public/php_8_1.js"() {
     "use strict";
-    dependenciesTotalSize2 = 10044212;
+    dependenciesTotalSize2 = 10044311;
     dependencyFilename2 = __dirname + "/php_8_1.wasm";
   }
 });
@@ -24801,7 +24801,7 @@ var dependenciesTotalSize3, dependencyFilename3;
 var init_php_8_0 = __esm({
   "packages/php-wasm/node/public/php_8_0.js"() {
     "use strict";
-    dependenciesTotalSize3 = 10172214;
+    dependenciesTotalSize3 = 10172313;
     dependencyFilename3 = __dirname + "/php_8_0.wasm";
   }
 });
@@ -31854,7 +31854,7 @@ var dependenciesTotalSize4, dependencyFilename4;
 var init_php_7_4 = __esm({
   "packages/php-wasm/node/public/php_7_4.js"() {
     "use strict";
-    dependenciesTotalSize4 = 11015874;
+    dependenciesTotalSize4 = 11015985;
     dependencyFilename4 = __dirname + "/php_7_4.wasm";
   }
 });
@@ -38900,7 +38900,7 @@ var dependenciesTotalSize5, dependencyFilename5;
 var init_php_7_3 = __esm({
   "packages/php-wasm/node/public/php_7_3.js"() {
     "use strict";
-    dependenciesTotalSize5 = 10915930;
+    dependenciesTotalSize5 = 10916038;
     dependencyFilename5 = __dirname + "/php_7_3.wasm";
   }
 });
@@ -45811,7 +45811,7 @@ var dependenciesTotalSize6, dependencyFilename6;
 var init_php_7_2 = __esm({
   "packages/php-wasm/node/public/php_7_2.js"() {
     "use strict";
-    dependenciesTotalSize6 = 10993263;
+    dependenciesTotalSize6 = 10992646;
     dependencyFilename6 = __dirname + "/php_7_2.wasm";
   }
 });
@@ -52707,7 +52707,7 @@ var dependenciesTotalSize7, dependencyFilename7;
 var init_php_7_1 = __esm({
   "packages/php-wasm/node/public/php_7_1.js"() {
     "use strict";
-    dependenciesTotalSize7 = 10583644;
+    dependenciesTotalSize7 = 10583119;
     dependencyFilename7 = __dirname + "/php_7_1.wasm";
   }
 });
@@ -59617,7 +59617,7 @@ var dependenciesTotalSize8, dependencyFilename8;
 var init_php_7_0 = __esm({
   "packages/php-wasm/node/public/php_7_0.js"() {
     "use strict";
-    dependenciesTotalSize8 = 10389382;
+    dependenciesTotalSize8 = 10389492;
     dependencyFilename8 = __dirname + "/php_7_0.wasm";
   }
 });
@@ -66546,7 +66546,7 @@ var dependenciesTotalSize9, dependencyFilename9;
 var init_php_5_6 = __esm({
   "packages/php-wasm/node/public/php_5_6.js"() {
     "use strict";
-    dependenciesTotalSize9 = 10176138;
+    dependenciesTotalSize9 = 10176192;
     dependencyFilename9 = __dirname + "/php_5_6.wasm";
   }
 });
@@ -66560,6 +66560,177 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// packages/php-wasm/universal/src/lib/error-event-polyfill.ts
+var kError = Symbol("error");
+var kMessage = Symbol("message");
+var ErrorEvent2 = class extends Event {
+  [kError];
+  [kMessage];
+  /**
+   * Create a new `ErrorEvent`.
+   *
+   * @param type The name of the event
+   * @param options A dictionary object that allows for setting
+   *                  attributes via object members of the same name.
+   */
+  constructor(type, options = {}) {
+    super(type);
+    this[kError] = options.error === void 0 ? null : options.error;
+    this[kMessage] = options.message === void 0 ? "" : options.message;
+  }
+  get error() {
+    return this[kError];
+  }
+  get message() {
+    return this[kMessage];
+  }
+};
+Object.defineProperty(ErrorEvent2.prototype, "error", { enumerable: true });
+Object.defineProperty(ErrorEvent2.prototype, "message", { enumerable: true });
+var ErrorEvent = typeof globalThis.ErrorEvent === "function" ? globalThis.ErrorEvent : ErrorEvent2;
+
+// packages/php-wasm/universal/src/lib/wasm-error-reporting.ts
+var UnhandledRejectionsTarget = class extends EventTarget {
+  listenersCount = 0;
+  addEventListener(type, callback) {
+    ++this.listenersCount;
+    super.addEventListener(type, callback);
+  }
+  removeEventListener(type, callback) {
+    --this.listenersCount;
+    super.removeEventListener(type, callback);
+  }
+  hasListeners() {
+    return this.listenersCount > 0;
+  }
+};
+function improveWASMErrorReporting(runtime) {
+  runtime.asm = {
+    ...runtime.asm
+  };
+  const target = new UnhandledRejectionsTarget();
+  for (const key in runtime.asm) {
+    if (typeof runtime.asm[key] == "function") {
+      const original = runtime.asm[key];
+      runtime.asm[key] = function(...args) {
+        try {
+          return original(...args);
+        } catch (e) {
+          if (!(e instanceof Error)) {
+            throw e;
+          }
+          if ("exitCode" in e && e?.exitCode === 0) {
+            return;
+          }
+          const clearMessage = clarifyErrorMessage(
+            e,
+            runtime.lastAsyncifyStackSource?.stack
+          );
+          if (runtime.lastAsyncifyStackSource) {
+            e.cause = runtime.lastAsyncifyStackSource;
+          }
+          if (!target.hasListeners()) {
+            showCriticalErrorBox(clearMessage);
+            throw e;
+          }
+          target.dispatchEvent(
+            new ErrorEvent("error", {
+              error: e,
+              message: clearMessage
+            })
+          );
+        }
+      };
+    }
+  }
+  return target;
+}
+var functionsMaybeMissingFromAsyncify = [];
+function getFunctionsMaybeMissingFromAsyncify() {
+  return functionsMaybeMissingFromAsyncify;
+}
+function clarifyErrorMessage(crypticError, asyncifyStack) {
+  if (crypticError.message === "unreachable") {
+    let betterMessage = UNREACHABLE_ERROR;
+    if (!asyncifyStack) {
+      betterMessage += `
+
+This stack trace is lacking. For a better one initialize 
+the PHP runtime with { debug: true }, e.g. PHPNode.load('8.1', { debug: true }).
+
+`;
+    }
+    functionsMaybeMissingFromAsyncify = extractPHPFunctionsFromStack(
+      asyncifyStack || crypticError.stack || ""
+    );
+    for (const fn of functionsMaybeMissingFromAsyncify) {
+      betterMessage += `    * ${fn}
+`;
+    }
+    return betterMessage;
+  }
+  return crypticError.message;
+}
+var UNREACHABLE_ERROR = `
+"unreachable" WASM instruction executed.
+
+The typical reason is a PHP function missing from the ASYNCIFY_ONLY
+list when building PHP.wasm.
+
+You will need to file a new issue in the WordPress Playground repository
+and paste this error message there:
+
+https://github.com/WordPress/wordpress-playground/issues/new
+
+If you're a core developer, the typical fix is to:
+
+* Isolate a minimal reproduction of the error
+* Add a reproduction of the error to php-asyncify.spec.ts in the WordPress Playground repository
+* Run 'npm run fix-asyncify'
+* Commit the changes, push to the repo, release updated NPM packages
+
+Below is a list of all the PHP functions found in the stack trace to
+help with the minimal reproduction. If they're all already listed in
+the Dockerfile, you'll need to trigger this error again with long stack
+traces enabled. In node.js, you can do it using the --stack-trace-limit=100
+CLI option: 
+
+`;
+var redBg = "\x1B[41m";
+var bold = "\x1B[1m";
+var reset = "\x1B[0m";
+var eol = "\x1B[K";
+var logged = false;
+function showCriticalErrorBox(message) {
+  if (logged) {
+    return;
+  }
+  logged = true;
+  console.log(`${redBg}
+${eol}
+${bold}  WASM ERROR${reset}${redBg}`);
+  for (const line of message.split("\n")) {
+    console.log(`${eol}  ${line} `);
+  }
+  console.log(`${reset}`);
+}
+function extractPHPFunctionsFromStack(stack) {
+  try {
+    const names = stack.split("\n").slice(1).map((line) => {
+      const parts = line.trim().substring("at ".length).split(" ");
+      return {
+        fn: parts.length >= 2 ? parts[0] : "<unknown>",
+        isWasm: line.includes("wasm://")
+      };
+    }).filter(
+      ({ fn, isWasm }) => isWasm && !fn.startsWith("dynCall_") && !fn.startsWith("invoke_")
+    ).map(({ fn }) => fn);
+    return Array.from(new Set(names));
+  } catch (err) {
+    return [];
+  }
+}
+
 // packages/php-wasm/universal/src/lib/php-response.ts
 var PHPResponse = class {
   /** @inheritDoc */
@@ -66946,6 +67117,16 @@ var PHPRequestHandler = class {
       } else {
         body = request.body;
       }
+      let scriptPath;
+      try {
+        scriptPath = this.#resolvePHPFilePath(requestedUrl.pathname);
+      } catch (error) {
+        return new PHPResponse(
+          404,
+          {},
+          new TextEncoder().encode("404 File not found")
+        );
+      }
       return await this.php.run({
         relativeUri: ensurePathPrefix(
           toRelativeUrl(requestedUrl),
@@ -66955,7 +67136,7 @@ var PHPRequestHandler = class {
         method: request.method || preferredMethod,
         body,
         fileInfos,
-        scriptPath: this.#resolvePHPFilePath(requestedUrl.pathname),
+        scriptPath,
         headers
       });
     } finally {
@@ -66968,6 +67149,7 @@ var PHPRequestHandler = class {
    * Fall back to index.php as if there was a url rewriting rule in place.
    *
    * @param  requestedPath - The requested pathname.
+   * @throws {Error} If the requested path doesn't exist.
    * @returns The resolved filesystem path.
    */
   #resolvePHPFilePath(requestedPath) {
@@ -66986,6 +67168,9 @@ var PHPRequestHandler = class {
     if (this.php.fileExists(resolvedFsPath)) {
       return resolvedFsPath;
     }
+    if (!this.php.fileExists(`${this.#DOCROOT}/index.php`)) {
+      throw new Error(`File not found: ${resolvedFsPath}`);
+    }
     return `${this.#DOCROOT}/index.php`;
   }
 };
@@ -67216,177 +67401,6 @@ var currentJsRuntime = function() {
   }
 }();
 
-// packages/php-wasm/universal/src/lib/error-event-polyfill.ts
-var kError = Symbol("error");
-var kMessage = Symbol("message");
-var ErrorEvent2 = class extends Event {
-  [kError];
-  [kMessage];
-  /**
-   * Create a new `ErrorEvent`.
-   *
-   * @param type The name of the event
-   * @param options A dictionary object that allows for setting
-   *                  attributes via object members of the same name.
-   */
-  constructor(type, options = {}) {
-    super(type);
-    this[kError] = options.error === void 0 ? null : options.error;
-    this[kMessage] = options.message === void 0 ? "" : options.message;
-  }
-  get error() {
-    return this[kError];
-  }
-  get message() {
-    return this[kMessage];
-  }
-};
-Object.defineProperty(ErrorEvent2.prototype, "error", { enumerable: true });
-Object.defineProperty(ErrorEvent2.prototype, "message", { enumerable: true });
-var ErrorEvent = typeof globalThis.ErrorEvent === "function" ? globalThis.ErrorEvent : ErrorEvent2;
-
-// packages/php-wasm/universal/src/lib/wasm-error-reporting.ts
-var UnhandledRejectionsTarget = class extends EventTarget {
-  listenersCount = 0;
-  addEventListener(type, callback) {
-    ++this.listenersCount;
-    super.addEventListener(type, callback);
-  }
-  removeEventListener(type, callback) {
-    --this.listenersCount;
-    super.removeEventListener(type, callback);
-  }
-  hasListeners() {
-    return this.listenersCount > 0;
-  }
-};
-function improveWASMErrorReporting(runtime) {
-  runtime.asm = {
-    ...runtime.asm
-  };
-  const target = new UnhandledRejectionsTarget();
-  for (const key in runtime.asm) {
-    if (typeof runtime.asm[key] == "function") {
-      const original = runtime.asm[key];
-      runtime.asm[key] = function(...args) {
-        try {
-          return original(...args);
-        } catch (e) {
-          if (!(e instanceof Error)) {
-            throw e;
-          }
-          if ("exitCode" in e && e?.exitCode === 0) {
-            return;
-          }
-          const clearMessage = clarifyErrorMessage(
-            e,
-            runtime.lastAsyncifyStackSource?.stack
-          );
-          if (runtime.lastAsyncifyStackSource) {
-            e.cause = runtime.lastAsyncifyStackSource;
-          }
-          if (!target.hasListeners()) {
-            showCriticalErrorBox(clearMessage);
-            throw e;
-          }
-          target.dispatchEvent(
-            new ErrorEvent("error", {
-              error: e,
-              message: clearMessage
-            })
-          );
-        }
-      };
-    }
-  }
-  return target;
-}
-var functionsMaybeMissingFromAsyncify = [];
-function getFunctionsMaybeMissingFromAsyncify() {
-  return functionsMaybeMissingFromAsyncify;
-}
-function clarifyErrorMessage(crypticError, asyncifyStack) {
-  if (crypticError.message === "unreachable") {
-    let betterMessage = UNREACHABLE_ERROR;
-    if (!asyncifyStack) {
-      betterMessage += `
-
-This stack trace is lacking. For a better one initialize 
-the PHP runtime with { debug: true }, e.g. PHPNode.load('8.1', { debug: true }).
-
-`;
-    }
-    functionsMaybeMissingFromAsyncify = extractPHPFunctionsFromStack(
-      asyncifyStack || crypticError.stack || ""
-    );
-    for (const fn of functionsMaybeMissingFromAsyncify) {
-      betterMessage += `    * ${fn}
-`;
-    }
-    return betterMessage;
-  }
-  return crypticError.message;
-}
-var UNREACHABLE_ERROR = `
-"unreachable" WASM instruction executed.
-
-The typical reason is a PHP function missing from the ASYNCIFY_ONLY
-list when building PHP.wasm.
-
-You will need to file a new issue in the WordPress Playground repository
-and paste this error message there:
-
-https://github.com/WordPress/wordpress-playground/issues/new
-
-If you're a core developer, the typical fix is to:
-
-* Isolate a minimal reproduction of the error
-* Add a reproduction of the error to php-asyncify.spec.ts in the WordPress Playground repository
-* Run 'npm run fix-asyncify'
-* Commit the changes, push to the repo, release updated NPM packages
-
-Below is a list of all the PHP functions found in the stack trace to
-help with the minimal reproduction. If they're all already listed in
-the Dockerfile, you'll need to trigger this error again with long stack
-traces enabled. In node.js, you can do it using the --stack-trace-limit=100
-CLI option: 
-
-`;
-var redBg = "\x1B[41m";
-var bold = "\x1B[1m";
-var reset = "\x1B[0m";
-var eol = "\x1B[K";
-var logged = false;
-function showCriticalErrorBox(message) {
-  if (logged) {
-    return;
-  }
-  logged = true;
-  console.log(`${redBg}
-${eol}
-${bold}  WASM ERROR${reset}${redBg}`);
-  for (const line of message.split("\n")) {
-    console.log(`${eol}  ${line} `);
-  }
-  console.log(`${reset}`);
-}
-function extractPHPFunctionsFromStack(stack) {
-  try {
-    const names = stack.split("\n").slice(1).map((line) => {
-      const parts = line.trim().substring("at ".length).split(" ");
-      return {
-        fn: parts.length >= 2 ? parts[0] : "<unknown>",
-        isWasm: line.includes("wasm://")
-      };
-    }).filter(
-      ({ fn, isWasm }) => isWasm && !fn.startsWith("dynCall_") && !fn.startsWith("invoke_")
-    ).map(({ fn }) => fn);
-    return Array.from(new Set(names));
-  } catch (err) {
-    return [];
-  }
-}
-
 // packages/php-wasm/universal/src/lib/base-php.ts
 var STRING = "string";
 var NUMBER = "number";
@@ -67396,6 +67410,7 @@ var BasePHP2 = class {
   #phpIniOverrides = [];
   #webSapiInitialized = false;
   #wasmErrorsTarget = null;
+  #serverEntries = {};
   requestHandler;
   /**
    * Initializes a PHP runtime.
@@ -67499,6 +67514,7 @@ var BasePHP2 = class {
     if (request.code) {
       this.#setPHPCode(" ?>" + request.code);
     }
+    this.#addServerGlobalEntriesInWasm();
     return await this.#handleRequest();
   }
   #initWebRuntime() {
@@ -67644,12 +67660,17 @@ var BasePHP2 = class {
     );
   }
   addServerGlobalEntry(key, value) {
-    this[__private__dont__use].ccall(
-      "wasm_add_SERVER_entry",
-      null,
-      [STRING, STRING],
-      [key, value]
-    );
+    this.#serverEntries[key] = value;
+  }
+  #addServerGlobalEntriesInWasm() {
+    for (const key in this.#serverEntries) {
+      this[__private__dont__use].ccall(
+        "wasm_add_SERVER_entry",
+        null,
+        [STRING, STRING],
+        [key, this.#serverEntries[key]]
+      );
+    }
   }
   /**
    * Adds file information to $_FILES superglobal in PHP.
@@ -67684,7 +67705,7 @@ var BasePHP2 = class {
     let exitCode;
     let errorListener;
     try {
-      exitCode = await new Promise(async (resolve, reject) => {
+      exitCode = await new Promise((resolve, reject) => {
         errorListener = (e) => {
           const rethrown = new Error("Rethrown");
           rethrown.cause = e.error;
@@ -67695,24 +67716,16 @@ var BasePHP2 = class {
           "error",
           errorListener
         );
-        try {
-          resolve(
-            /**
-             * This is awkward, but Asyncify makes wasm_sapi_handle_request return
-             * Promise<Promise<number>>.
-             *
-             * @TODO: Determine whether this is a bug in emscripten or in our code.
-             */
-            await await this[__private__dont__use].ccall(
-              "wasm_sapi_handle_request",
-              NUMBER,
-              [],
-              []
-            )
-          );
-        } catch (e) {
-          reject(e);
+        const response = this[__private__dont__use].ccall(
+          "wasm_sapi_handle_request",
+          NUMBER,
+          [],
+          []
+        );
+        if (response instanceof Promise) {
+          return response.then(resolve, reject);
         }
+        return resolve(response);
       });
     } catch (e) {
       for (const name in this) {
@@ -67732,6 +67745,7 @@ var BasePHP2 = class {
       throw rethrown;
     } finally {
       this.#wasmErrorsTarget?.removeEventListener("error", errorListener);
+      this.#serverEntries = {};
     }
     const { headers, httpStatusCode } = this.#getResponseHeaders();
     return new PHPResponse(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "0.1.42",
+  "version": "0.1.46",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -28,13 +28,13 @@
   "license": "GPL-2.0-or-later",
   "main": "index.cjs",
   "types": "index.d.ts",
-  "gitHead": "14707001dbf7738ca8f173f3040559c6c165110e",
+  "gitHead": "b1e1b4b57b00fb52429f0490af4ccb943f496f74",
   "dependencies": {
-    "comlink": "4.4.1",
+    "comlink": "^4.4.1",
     "express": "4.18.2",
     "ws": "8.13.0",
     "yargs": "17.7.2",
-    "@php-wasm/universal": "0.1.42",
-    "@php-wasm/util": "0.1.42"
+    "@php-wasm/universal": "0.1.46",
+    "@php-wasm/util": "0.1.46"
   }
 }