@php-wasm/node 0.1.45 → 0.1.46

package/index.cjs

@@ -67117,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),
@@ -67126,7 +67136,7 @@ var PHPRequestHandler = class {
         method: request.method || preferredMethod,
         body,
         fileInfos,
-        scriptPath: this.#resolvePHPFilePath(requestedUrl.pathname),
+        scriptPath,
         headers
       });
     } finally {
@@ -67139,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) {
@@ -67157,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`;
   }
 };
@@ -67691,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;
@@ -67702,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "0.1.45",
+  "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": "ca75514c17b912dc8b5dc529f6d123295671320a",
+  "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.45",
-    "@php-wasm/util": "0.1.45"
+    "@php-wasm/universal": "0.1.46",
+    "@php-wasm/util": "0.1.46"
   }
 }