@php-wasm/node 0.2.0 → 0.3.0

package/README.md

@@ -34,3 +34,7 @@ const response = await php.request({
 });
 console.log(response.text);
 ```
+
+## Attribution
+
+`@php-wasm/node` started as a fork of the original PHP to WebAssembly build published by Oraoto in https://github.com/oraoto/pib and modified by Sean Morris in https://github.com/seanmorris/php-wasm.

package/index.cjs

@@ -67115,7 +67115,6 @@ var PHPRequestHandler = class {
    * The PHP instance
    */
   php;
-  #isStaticFilePath;
   /**
    * @param  php    - The PHP instance.
    * @param  config - Request Handler configuration.
@@ -67124,12 +67123,10 @@ var PHPRequestHandler = class {
     this.#semaphore = new Semaphore({ concurrency: 1 });
     const {
       documentRoot = "/www/",
-      absoluteUrl = typeof location === "object" ? location?.href : "",
-      isStaticFilePath = () => false
+      absoluteUrl = typeof location === "object" ? location?.href : ""
     } = config;
     this.php = php;
     this.#DOCROOT = documentRoot;
-    this.#isStaticFilePath = isStaticFilePath;
     const url = new URL(absoluteUrl);
     this.#HOSTNAME = url.hostname;
     this.#PORT = url.port ? Number(url.port) : url.protocol === "https:" ? 443 : 80;
@@ -67176,27 +67173,31 @@ var PHPRequestHandler = class {
       request.url,
       isAbsolute ? void 0 : DEFAULT_BASE_URL
     );
-    const normalizedRelativeUrl = removePathPrefix(
+    const normalizedRequestedPath = removePathPrefix(
       requestedUrl.pathname,
       this.#PATHNAME
     );
-    if (this.#isStaticFilePath(normalizedRelativeUrl)) {
-      return this.#serveStaticFile(normalizedRelativeUrl);
+    const fsPath = `${this.#DOCROOT}${normalizedRequestedPath}`;
+    if (seemsLikeAPHPRequestHandlerPath(fsPath)) {
+      return await this.#dispatchToPHP(request, requestedUrl);
     }
-    return await this.#dispatchToPHP(request, requestedUrl);
+    return this.#serveStaticFile(fsPath);
   }
   /**
    * Serves a static file from the PHP filesystem.
    *
-   * @param  path - The requested static file path.
+   * @param  fsPath - Absolute path of the static file to serve.
    * @returns The response.
    */
-  #serveStaticFile(path) {
-    const fsPath = `${this.#DOCROOT}${path}`;
+  #serveStaticFile(fsPath) {
     if (!this.php.fileExists(fsPath)) {
       return new PHPResponse(
         404,
-        {},
+        // Let the service worker know that no static file was found
+        // and that it's okay to issue a real fetch() to the server.
+        {
+          "x-file-type": ["static"]
+        },
         new TextEncoder().encode("404 File not found")
       );
     }
@@ -67385,6 +67386,16 @@ function inferMimeType(path) {
       return "application-octet-stream";
   }
 }
+function seemsLikeAPHPRequestHandlerPath(path) {
+  return seemsLikeAPHPFile(path) || seemsLikeADirectoryRoot(path);
+}
+function seemsLikeAPHPFile(path) {
+  return path.endsWith(".php") || path.includes(".php/");
+}
+function seemsLikeADirectoryRoot(path) {
+  const lastSegment = path.split("/").pop();
+  return !lastSegment.includes(".");
+}
 
 // packages/php-wasm/universal/src/lib/rethrow-file-system-error.ts
 var FileErrorCodes = {

package/index.d.ts

@@ -497,11 +497,6 @@ export interface PHPRequestHandlerConfiguration {
 	 * Request Handler URL. Used to populate $_SERVER details like HTTP_HOST.
 	 */
 	absoluteUrl?: string;
-	/**
-	 * Callback used by the PHPRequestHandler to decide whether
-	 * the requested path refers to a PHP file or a static file.
-	 */
-	isStaticFilePath?: (path: string) => boolean;
 }
 declare class PHPRequestHandler implements RequestHandler {
 	#private;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
   "license": "GPL-2.0-or-later",
   "main": "index.cjs",
   "types": "index.d.ts",
-  "gitHead": "cd4062de74f7f18058d3f962e124d0fdff78b5a7",
+  "gitHead": "6890ff9243f9a10f0b86755fead101647a8c8535",
   "engines": {
     "node": ">=16.15.1",
     "npm": ">=8.11.0"
@@ -38,7 +38,7 @@
     "express": "4.18.2",
     "ws": "8.13.0",
     "yargs": "17.7.2",
-    "@php-wasm/universal": "0.2.0",
-    "@php-wasm/util": "0.2.0"
+    "@php-wasm/universal": "0.3.0",
+    "@php-wasm/util": "0.3.0"
   }
 }

package/packages/php-wasm/node/README.md

@@ -34,3 +34,7 @@ const response = await php.request({
 });
 console.log(response.text);
 ```
+
+## Attribution
+
+`@php-wasm/node` started as a fork of the original PHP to WebAssembly build published by Oraoto in https://github.com/oraoto/pib and modified by Sean Morris in https://github.com/seanmorris/php-wasm.