@php-wasm/node 0.6.14 → 0.6.16

package/index.cjs

@@ -11169,7 +11169,7 @@ var init_php_8_3 = __esm({
   "packages/php-wasm/node/public/php_8_3.js"() {
     "use strict";
     dependencyFilename = __dirname + "/8_3_0/php_8_3.wasm";
-    dependenciesTotalSize = 14212810;
+    dependenciesTotalSize = 14212793;
   }
 });
 
@@ -26424,7 +26424,7 @@ var init_php_8_1 = __esm({
   "packages/php-wasm/node/public/php_8_1.js"() {
     "use strict";
     dependencyFilename3 = __dirname + "/8_1_23/php_8_1.wasm";
-    dependenciesTotalSize3 = 13575986;
+    dependenciesTotalSize3 = 13575971;
   }
 });
 
@@ -34022,7 +34022,7 @@ var init_php_8_0 = __esm({
   "packages/php-wasm/node/public/php_8_0.js"() {
     "use strict";
     dependencyFilename4 = __dirname + "/8_0_30/php_8_0.wasm";
-    dependenciesTotalSize4 = 13597816;
+    dependenciesTotalSize4 = 13597709;
   }
 });
 
@@ -41605,7 +41605,7 @@ var init_php_7_4 = __esm({
   "packages/php-wasm/node/public/php_7_4.js"() {
     "use strict";
     dependencyFilename5 = __dirname + "/7_4_33/php_7_4.wasm";
-    dependenciesTotalSize5 = 14331012;
+    dependenciesTotalSize5 = 14331074;
   }
 });
 
@@ -49183,7 +49183,7 @@ var init_php_7_3 = __esm({
   "packages/php-wasm/node/public/php_7_3.js"() {
     "use strict";
     dependencyFilename6 = __dirname + "/7_3_33/php_7_3.wasm";
-    dependenciesTotalSize6 = 14098611;
+    dependenciesTotalSize6 = 14098607;
   }
 });
 
@@ -56629,7 +56629,7 @@ var init_php_7_2 = __esm({
   "packages/php-wasm/node/public/php_7_2.js"() {
     "use strict";
     dependencyFilename7 = __dirname + "/7_2_34/php_7_2.wasm";
-    dependenciesTotalSize7 = 13992133;
+    dependenciesTotalSize7 = 13992092;
   }
 });
 
@@ -64060,7 +64060,7 @@ var init_php_7_1 = __esm({
   "packages/php-wasm/node/public/php_7_1.js"() {
     "use strict";
     dependencyFilename8 = __dirname + "/7_1_30/php_7_1.wasm";
-    dependenciesTotalSize8 = 13301175;
+    dependenciesTotalSize8 = 13300912;
   }
 });
 
@@ -71505,7 +71505,7 @@ var init_php_7_0 = __esm({
   "packages/php-wasm/node/public/php_7_0.js"() {
     "use strict";
     dependencyFilename9 = __dirname + "/7_0_33/php_7_0.wasm";
-    dependenciesTotalSize9 = 12778840;
+    dependenciesTotalSize9 = 12778913;
   }
 });
 
@@ -72377,10 +72377,13 @@ var PHPRequestHandler = class {
       isAbsolute ? void 0 : DEFAULT_BASE_URL
     );
     const normalizedRequestedPath = applyRewriteRules(
-      removePathPrefix(requestedUrl.pathname, this.#PATHNAME),
+      removePathPrefix(
+        decodeURIComponent(requestedUrl.pathname),
+        this.#PATHNAME
+      ),
       this.rewriteRules
     );
-    const fsPath = `${this.#DOCROOT}${normalizedRequestedPath}`;
+    const fsPath = joinPaths(this.#DOCROOT, normalizedRequestedPath);
     if (seemsLikeAPHPRequestHandlerPath(fsPath)) {
       return await this.#dispatchToPHP(request, requestedUrl);
     }
@@ -72459,7 +72462,9 @@ var PHPRequestHandler = class {
       }
       let scriptPath;
       try {
-        scriptPath = this.#resolvePHPFilePath(requestedUrl.pathname);
+        scriptPath = this.#resolvePHPFilePath(
+          decodeURIComponent(requestedUrl.pathname)
+        );
       } catch (error) {
         return new PHPResponse(
           404,
@@ -72467,17 +72472,25 @@ var PHPRequestHandler = class {
           new TextEncoder().encode("404 File not found")
         );
       }
-      return await this.php.run({
-        relativeUri: ensurePathPrefix(
-          toRelativeUrl(requestedUrl),
-          this.#PATHNAME
-        ),
-        protocol: this.#PROTOCOL,
-        method: request.method || preferredMethod,
-        body,
-        scriptPath,
-        headers
-      });
+      try {
+        return await this.php.run({
+          relativeUri: ensurePathPrefix(
+            toRelativeUrl(requestedUrl),
+            this.#PATHNAME
+          ),
+          protocol: this.#PROTOCOL,
+          method: request.method || preferredMethod,
+          body,
+          scriptPath,
+          headers
+        });
+      } catch (error) {
+        const executionError = error;
+        if (executionError?.response) {
+          return executionError.response;
+        }
+        throw error;
+      }
     } finally {
       release();
     }
@@ -72743,6 +72756,13 @@ var makePromise = () => {
 var STRING = "string";
 var NUMBER = "number";
 var __private__dont__use = Symbol("__private__dont__use");
+var PHPExecutionFailureError2 = class extends Error {
+  constructor(message, response, source) {
+    super(message);
+    this.response = response;
+    this.source = source;
+  }
+};
 var BasePHP2 = class {
   /**
    * Initializes a PHP runtime.
@@ -72929,16 +72949,12 @@ var BasePHP2 = class {
       }
       const response = await this.#handleRequest();
       if (response.exitCode !== 0) {
-        const output = {
-          stdout: response.text,
-          stderr: response.errors
-        };
-        console.warn(`PHP.run() output was:`, output);
-        const error = new Error(
-          `PHP.run() failed with exit code ${response.exitCode} and the following output: ` + response.errors
+        console.warn(`PHP.run() output was:`, response.text);
+        const error = new PHPExecutionFailureError2(
+          `PHP.run() failed with exit code ${response.exitCode} and the following output: ` + response.errors,
+          response,
+          "request"
         );
-        error.output = output;
-        error.source = "request";
         console.error(error);
         throw error;
       }
@@ -73247,7 +73263,7 @@ var BasePHP2 = class {
     }
     const { headers, httpStatusCode } = this.#getResponseHeaders();
     return new PHPResponse(
-      httpStatusCode,
+      exitCode === 0 ? httpStatusCode : 500,
       headers,
       this.readFileAsBuffer("/internal/stdout"),
       this.readFileAsText("/internal/stderr"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -28,18 +28,17 @@
   "license": "GPL-2.0-or-later",
   "main": "index.cjs",
   "types": "index.d.ts",
-  "gitHead": "83b6f8542937a9bea9ee6562887a511c20ac9442",
+  "gitHead": "1981567e7eacecbc4a18c870267c20bf489afd8f",
   "engines": {
-    "node": ">=18.18.2",
+    "node": ">=18.18.0",
     "npm": ">=8.11.0"
   },
   "dependencies": {
     "comlink": "^4.4.1",
-    "express": "4.18.2",
     "ws": "8.13.0",
     "yargs": "17.7.2",
-    "@php-wasm/node-polyfills": "0.6.14",
-    "@php-wasm/universal": "0.6.14",
-    "@php-wasm/util": "0.6.14"
+    "@php-wasm/node-polyfills": "0.6.16",
+    "@php-wasm/universal": "0.6.16",
+    "@php-wasm/util": "0.6.16"
   }
 }

package/php_7_0.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_0_33/php_7_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 12778840; 
+export const dependenciesTotalSize = 12778913; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/php_7_1.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_1_30/php_7_1.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 13301175; 
+export const dependenciesTotalSize = 13300912; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/php_7_2.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_2_34/php_7_2.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 13992133; 
+export const dependenciesTotalSize = 13992092; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/php_7_3.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_3_33/php_7_3.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 14098611; 
+export const dependenciesTotalSize = 14098607; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/php_7_4.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_4_33/php_7_4.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 14331012; 
+export const dependenciesTotalSize = 14331074; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/php_8_0.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/8_0_30/php_8_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 13597816; 
+export const dependenciesTotalSize = 13597709; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/php_8_1.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/8_1_23/php_8_1.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 13575986; 
+export const dependenciesTotalSize = 13575971; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/php_8_3.js

@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/8_3_0/php_8_3.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 14212810; 
+export const dependenciesTotalSize = 14212793; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets