@php-wasm/node 0.1.51 → 0.1.58

package/index.cjs

@@ -3551,6 +3551,14 @@ __export(php_8_2_exports, {
   init: () => init
 });
 function init(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -10623,7 +10631,7 @@ function init(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -10634,12 +10642,12 @@ function init(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize, dependencyFilename;
+var dependencyFilename, dependenciesTotalSize;
 var init_php_8_2 = __esm({
   "packages/php-wasm/node/public/php_8_2.js"() {
     "use strict";
-    dependenciesTotalSize = 10302665;
     dependencyFilename = __dirname + "/php_8_2.wasm";
+    dependenciesTotalSize = 10303112;
   }
 });
 
@@ -10651,6 +10659,14 @@ __export(php_8_1_exports, {
   init: () => init2
 });
 function init2(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -17718,7 +17734,7 @@ function init2(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -17729,12 +17745,12 @@ function init2(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize2, dependencyFilename2;
+var dependencyFilename2, dependenciesTotalSize2;
 var init_php_8_1 = __esm({
   "packages/php-wasm/node/public/php_8_1.js"() {
     "use strict";
-    dependenciesTotalSize2 = 10044311;
     dependencyFilename2 = __dirname + "/php_8_1.wasm";
+    dependenciesTotalSize2 = 10044712;
   }
 });
 
@@ -17746,6 +17762,14 @@ __export(php_8_0_exports, {
   init: () => init3
 });
 function init3(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -24786,7 +24810,7 @@ function init3(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -24797,12 +24821,12 @@ function init3(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize3, dependencyFilename3;
+var dependencyFilename3, dependenciesTotalSize3;
 var init_php_8_0 = __esm({
   "packages/php-wasm/node/public/php_8_0.js"() {
     "use strict";
-    dependenciesTotalSize3 = 10172313;
     dependencyFilename3 = __dirname + "/php_8_0.wasm";
+    dependenciesTotalSize3 = 10172733;
   }
 });
 
@@ -24814,6 +24838,14 @@ __export(php_7_4_exports, {
   init: () => init4
 });
 function init4(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -31839,7 +31871,7 @@ function init4(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -31850,12 +31882,12 @@ function init4(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize4, dependencyFilename4;
+var dependencyFilename4, dependenciesTotalSize4;
 var init_php_7_4 = __esm({
   "packages/php-wasm/node/public/php_7_4.js"() {
     "use strict";
-    dependenciesTotalSize4 = 11015985;
     dependencyFilename4 = __dirname + "/php_7_4.wasm";
+    dependenciesTotalSize4 = 11016595;
   }
 });
 
@@ -31867,6 +31899,14 @@ __export(php_7_3_exports, {
   init: () => init5
 });
 function init5(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -38885,7 +38925,7 @@ function init5(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -38896,12 +38936,12 @@ function init5(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize5, dependencyFilename5;
+var dependencyFilename5, dependenciesTotalSize5;
 var init_php_7_3 = __esm({
   "packages/php-wasm/node/public/php_7_3.js"() {
     "use strict";
-    dependenciesTotalSize5 = 10916038;
     dependencyFilename5 = __dirname + "/php_7_3.wasm";
+    dependenciesTotalSize5 = 10916623;
   }
 });
 
@@ -38913,6 +38953,14 @@ __export(php_7_2_exports, {
   init: () => init6
 });
 function init6(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -45796,7 +45844,7 @@ function init6(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -45807,12 +45855,12 @@ function init6(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize6, dependencyFilename6;
+var dependencyFilename6, dependenciesTotalSize6;
 var init_php_7_2 = __esm({
   "packages/php-wasm/node/public/php_7_2.js"() {
     "use strict";
-    dependenciesTotalSize6 = 10992646;
     dependencyFilename6 = __dirname + "/php_7_2.wasm";
+    dependenciesTotalSize6 = 10993354;
   }
 });
 
@@ -45824,6 +45872,14 @@ __export(php_7_1_exports, {
   init: () => init7
 });
 function init7(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -52692,7 +52748,7 @@ function init7(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -52703,12 +52759,12 @@ function init7(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize7, dependencyFilename7;
+var dependencyFilename7, dependenciesTotalSize7;
 var init_php_7_1 = __esm({
   "packages/php-wasm/node/public/php_7_1.js"() {
     "use strict";
-    dependenciesTotalSize7 = 10583119;
     dependencyFilename7 = __dirname + "/php_7_1.wasm";
+    dependenciesTotalSize7 = 10583885;
   }
 });
 
@@ -52720,6 +52776,14 @@ __export(php_7_0_exports, {
   init: () => init8
 });
 function init8(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -59602,7 +59666,7 @@ function init8(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -59613,12 +59677,12 @@ function init8(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize8, dependencyFilename8;
+var dependencyFilename8, dependenciesTotalSize8;
 var init_php_7_0 = __esm({
   "packages/php-wasm/node/public/php_7_0.js"() {
     "use strict";
-    dependenciesTotalSize8 = 10389492;
     dependencyFilename8 = __dirname + "/php_7_0.wasm";
+    dependenciesTotalSize8 = 10390259;
   }
 });
 
@@ -59630,6 +59694,14 @@ __export(php_5_6_exports, {
   init: () => init9
 });
 function init9(RuntimeName, PHPLoader) {
+  ExitStatus = class PHPExitStatus extends Error {
+    constructor(status) {
+      super(status);
+      this.name = "ExitStatus";
+      this.message = "Program terminated with exit(" + status + ")";
+      this.status = status;
+    }
+  };
   var Module = typeof PHPLoader != "undefined" ? PHPLoader : {};
   var moduleOverrides = Object.assign({}, Module);
   var arguments_ = [];
@@ -66531,7 +66603,7 @@ function init9(RuntimeName, PHPLoader) {
   run();
   DNS.address_map.addrs.localhost = "127.0.0.1";
   PHPLoader.debug = "debug" in PHPLoader ? PHPLoader.debug : true;
-  if (PHPLoader.debug) {
+  if (PHPLoader.debug && typeof Asyncify !== "undefined") {
     const originalHandleSleep = Asyncify.handleSleep;
     Asyncify.handleSleep = function(startAsync) {
       if (!ABORT) {
@@ -66542,12 +66614,12 @@ function init9(RuntimeName, PHPLoader) {
   }
   return PHPLoader;
 }
-var dependenciesTotalSize9, dependencyFilename9;
+var dependencyFilename9, dependenciesTotalSize9;
 var init_php_5_6 = __esm({
   "packages/php-wasm/node/public/php_5_6.js"() {
     "use strict";
-    dependenciesTotalSize9 = 10176192;
     dependencyFilename9 = __dirname + "/php_5_6.wasm";
+    dependenciesTotalSize9 = 10176855;
   }
 });
 
@@ -67631,8 +67703,12 @@ var BasePHP2 = class {
       );
     }
     for (const name in headers) {
+      let HTTP_prefix = "HTTP_";
+      if (["content-type", "content-length"].includes(name.toLowerCase())) {
+        HTTP_prefix = "";
+      }
       this.addServerGlobalEntry(
-        `HTTP_${name.toUpperCase().replace(/-/g, "_")}`,
+        `${HTTP_prefix}${name.toUpperCase().replace(/-/g, "_")}`,
         headers[name]
       );
     }
@@ -67775,7 +67851,7 @@ var BasePHP2 = class {
     this[__private__dont__use].FS.unlink(path);
   }
   mv(fromPath, toPath) {
-    this[__private__dont__use].FS.mv(fromPath, toPath);
+    this[__private__dont__use].FS.rename(fromPath, toPath);
   }
   rmdir(path, options = { recursive: true }) {
     if (options?.recursive) {
@@ -67790,14 +67866,19 @@ var BasePHP2 = class {
     }
     this[__private__dont__use].FS.rmdir(path);
   }
-  listFiles(path) {
+  listFiles(path, options = { prependPath: false }) {
     if (!this.fileExists(path)) {
       return [];
     }
     try {
-      return this[__private__dont__use].FS.readdir(path).filter(
+      const files = this[__private__dont__use].FS.readdir(path).filter(
         (name) => name !== "." && name !== ".."
       );
+      if (options.prependPath) {
+        const prepend = path.replace(/\/$/, "");
+        return files.map((name) => `${prepend}/${name}`);
+      }
+      return files;
     } catch (e) {
       console.error(e, { path });
       return [];

package/index.d.ts

@@ -253,9 +253,10 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 * Lists the files and directories in the given directory.
 	 *
 	 * @param  path - The directory path to list.
+	 * @param  options - Options for the listing.
 	 * @returns The list of files and directories in the given directory.
 	 */
-	listFiles(path: string): string[];
+	listFiles(path: string, options?: ListFilesOptions): string[];
 	/**
 	 * Checks if a directory exists in the PHP filesystem.
 	 *
@@ -426,6 +427,13 @@ export interface RmDirOptions {
 	 */
 	recursive?: boolean;
 }
+export interface ListFilesOptions {
+	/**
+	 * If true, prepend given folder path to all file names.
+	 * Default: false.
+	 */
+	prependPath: boolean;
+}
 declare const SupportedPHPVersions: readonly [
 	"8.2",
 	"8.1",
@@ -593,7 +601,7 @@ declare abstract class BasePHP implements IsomorphicLocalPHP {
 	/** @inheritDoc */
 	rmdir(path: string, options?: RmDirOptions): void;
 	/** @inheritDoc */
-	listFiles(path: string): string[];
+	listFiles(path: string, options?: ListFilesOptions): string[];
 	/** @inheritDoc */
 	isDir(path: string): boolean;
 	/** @inheritDoc */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "0.1.51",
+  "version": "0.1.58",
   "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": "756f9e316b51bc1496982fa4ed9310a16701afa5",
+  "gitHead": "dbc77ed4c0b0a2625cfbe08722fade036c69a425",
   "dependencies": {
     "comlink": "^4.4.1",
     "express": "4.18.2",
     "ws": "8.13.0",
     "yargs": "17.7.2",
-    "@php-wasm/universal": "0.1.51",
-    "@php-wasm/util": "0.1.51"
+    "@php-wasm/universal": "0.1.58",
+    "@php-wasm/util": "0.1.58"
   }
 }