@php-wasm/node 0.1.61 → 0.2.0

package/index.cjs

@@ -66724,6 +66724,14 @@ 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/is-exit-code-zero.ts
+function isExitCodeZero(e) {
+  if (!(e instanceof Error)) {
+    return false;
+  }
+  return "exitCode" in e && e?.exitCode === 0 || e?.name === "ExitStatus" && "status" in e && e.status === 0;
+}
+
 // packages/php-wasm/universal/src/lib/wasm-error-reporting.ts
 var UnhandledRejectionsTarget = class extends EventTarget {
   listenersCount = 0;
@@ -66754,9 +66762,6 @@ function improveWASMErrorReporting(runtime) {
           if (!(e instanceof Error)) {
             throw e;
           }
-          if ("exitCode" in e && e?.exitCode === 0) {
-            return;
-          }
           const clearMessage = clarifyErrorMessage(
             e,
             runtime.lastAsyncifyStackSource?.stack
@@ -66764,16 +66769,19 @@ function improveWASMErrorReporting(runtime) {
           if (runtime.lastAsyncifyStackSource) {
             e.cause = runtime.lastAsyncifyStackSource;
           }
-          if (!target.hasListeners()) {
+          if (target.hasListeners()) {
+            target.dispatchEvent(
+              new ErrorEvent("error", {
+                error: e,
+                message: clearMessage
+              })
+            );
+            return;
+          }
+          if (!isExitCodeZero(e)) {
             showCriticalErrorBox(clearMessage);
-            throw e;
           }
-          target.dispatchEvent(
-            new ErrorEvent("error", {
-              error: e,
-              message: clearMessage
-            })
-          );
+          throw e;
         }
       };
     }
@@ -67482,16 +67490,12 @@ function rethrowFileSystemError(messagePrefix = "") {
 
 // packages/php-wasm/universal/src/lib/load-php-runtime.ts
 async function loadPHPRuntime(phpLoaderModule, phpModuleArgs = {}, dataDependenciesModules = []) {
-  let resolvePhpReady, resolveDepsReady;
-  const depsReady = new Promise((resolve) => {
-    resolveDepsReady = resolve;
-  });
-  const phpReady = new Promise((resolve) => {
-    resolvePhpReady = resolve;
-  });
+  const [phpReady, resolvePHP, rejectPHP] = makePromise();
+  const [depsReady, resolveDeps] = makePromise();
   const PHPRuntime = phpLoaderModule.init(currentJsRuntime, {
     onAbort(reason) {
-      console.error("WASM aborted: ");
+      rejectPHP(reason);
+      resolveDeps();
       console.error(reason);
     },
     ENV: {},
@@ -67505,20 +67509,22 @@ async function loadPHPRuntime(phpLoaderModule, phpModuleArgs = {}, dataDependenc
       if (phpModuleArgs.onRuntimeInitialized) {
         phpModuleArgs.onRuntimeInitialized();
       }
-      resolvePhpReady();
+      resolvePHP();
     },
     monitorRunDependencies(nbLeft) {
       if (nbLeft === 0) {
         delete PHPRuntime.monitorRunDependencies;
-        resolveDepsReady();
+        resolveDeps();
       }
     }
   });
-  for (const { default: loadDataModule } of dataDependenciesModules) {
-    loadDataModule(PHPRuntime);
-  }
+  await Promise.all(
+    dataDependenciesModules.map(
+      ({ default: dataModule }) => dataModule(PHPRuntime)
+    )
+  );
   if (!dataDependenciesModules.length) {
-    resolveDepsReady();
+    resolveDeps();
   }
   await depsReady;
   await phpReady;
@@ -67540,6 +67546,14 @@ var currentJsRuntime = function() {
     return "NODE";
   }
 }();
+var makePromise = () => {
+  const methods = [];
+  const promise = new Promise((resolve, reject) => {
+    methods.push(resolve, reject);
+  });
+  methods.unshift(promise);
+  return methods;
+};
 
 // packages/php-wasm/universal/src/lib/base-php.ts
 var STRING = "string";
@@ -68442,7 +68456,7 @@ var _NodePHP = class extends BasePHP2 {
    * @param  argv - The arguments to pass to the CLI.
    * @returns The exit code of the CLI session.
    */
-  cli(argv) {
+  async cli(argv) {
     for (const arg of argv) {
       this[__private__dont__use].ccall(
         "wasm_add_cli_arg",
@@ -68451,9 +68465,22 @@ var _NodePHP = class extends BasePHP2 {
         [arg]
       );
     }
-    return this[__private__dont__use].ccall("run_cli", null, [], [], {
-      async: true
-    });
+    try {
+      return await this[__private__dont__use].ccall(
+        "run_cli",
+        null,
+        [],
+        [],
+        {
+          async: true
+        }
+      );
+    } catch (error) {
+      if (isExitCodeZero(error)) {
+        return 0;
+      }
+      throw error;
+    }
   }
   setSkipShebang(shouldSkip) {
     this[__private__dont__use].ccall(

package/index.d.ts

@@ -120,7 +120,7 @@ export interface RequestHandler {
 	 * 	}
 	 * })
 	 * php.writeFile("/www/index.php", `<?php echo file_get_contents("php://input");`);
-	 * const result = await php.run({
+	 * const result = await php.request({
 	 * 	method: "GET",
 	 * 	headers: {
 	 * 		"Content-Type": "text/plain"
@@ -358,7 +358,7 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 *     post_message_to_js(string $data)
 	 *
 	 *     Arguments:
-	 *         $data – any extra information as a string
+	 *         $data (string) – Data to pass to JavaScript.
 	 *
 	 * @example
 	 *

package/package.json

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