@php-wasm/universal 2.0.4 → 2.0.7

package/index.js

@@ -558,12 +558,7 @@ class StreamedPHPResponse {
    * Resolves once HTTP status code is available.
    */
   get httpStatusCode() {
-    return Promise.race([
-      this.getParsedHeaders().then((e) => e.httpStatusCode),
-      this.exitCode.then(
-        (e) => e !== 0 ? 500 : void 0
-      )
-    ]).then((e) => e !== void 0 ? e : this.getParsedHeaders().then(
+    return this.getParsedHeaders().then((e) => e.httpStatusCode).then((e) => e !== void 0 ? e : this.getParsedHeaders().then(
       (r) => r.httpStatusCode,
       () => 200
     )).catch(() => 500);
@@ -644,6 +639,13 @@ class PHPResponse {
       await e.exitCode
     );
   }
+  /**
+   * True if the response is successful (HTTP status code 200-399),
+   * false otherwise.
+   */
+  ok() {
+    return this.httpStatusCode >= 200 && this.httpStatusCode < 400;
+  }
   toRawData() {
     return {
       headers: this.headers,
@@ -1297,8 +1299,8 @@ class PHP {
           `The script path "${t.scriptPath}" does not exist.`
         );
       m(this, h, $).call(this, t.relativeUri || ""), m(this, h, J).call(this, t.method || "GET");
-      const n = normalizeHeaders(t.headers || {}), i = n.host || "example.com:443", o = m(this, h, G).call(this, i, t.protocol || "http");
-      if (m(this, h, B).call(this, i), m(this, h, V).call(this, o), m(this, h, Y).call(this, n), t.body && (r = m(this, h, K).call(this, t.body)), typeof t.code == "string")
+      const i = normalizeHeaders(t.headers || {}), o = i.host || "example.com:443", a = m(this, h, G).call(this, o, t.protocol || "http");
+      if (m(this, h, B).call(this, o), m(this, h, V).call(this, a), m(this, h, Y).call(this, i), t.body && (r = m(this, h, K).call(this, t.body)), typeof t.code == "string")
         this.writeFile("/internal/eval.php", t.code), m(this, h, L).call(this, "/internal/eval.php");
       else if (typeof t.scriptPath == "string")
         m(this, h, L).call(this, t.scriptPath || "");
@@ -1306,12 +1308,12 @@ class PHP {
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
         );
-      const a = m(this, h, z).call(this, t.$_SERVER, n, o);
-      for (const l in a)
-        m(this, h, X).call(this, l, a[l]);
-      const c = t.env || {};
-      for (const l in c)
-        m(this, h, O).call(this, l, c[l]);
+      const c = m(this, h, z).call(this, t.$_SERVER, i, a);
+      for (const p in c)
+        m(this, h, X).call(this, p, c[p]);
+      const l = t.env || {};
+      for (const p in l)
+        m(this, h, O).call(this, p, l[p]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1319,14 +1321,23 @@ class PHP {
         [],
         { async: !0 }
       );
-    });
-    return await s.finally(() => {
-      r && this[__private__dont__use].free(r);
-    }).finally(() => {
+    }), n = () => {
+      if (r)
+        try {
+          this[__private__dont__use].free(r);
+        } catch (i) {
+          logger.error(i);
+        }
       e(), this.dispatchEvent({
         type: "request.end"
       });
-    }), s;
+    };
+    return s.then(
+      (i) => (i.finished.finally(n), i),
+      (i) => {
+        throw n(), i;
+      }
+    );
   }
   /**
    * Defines a constant in the PHP runtime.
@@ -2438,8 +2449,14 @@ class PHPRequestHandler {
           ...e,
           // Pass along URL with the #fragment filtered out
           url: s.toString()
-        };
-        return m(this, H, Z).call(this, a, o);
+        }, c = await m(this, H, Z).call(this, a, o);
+        return c.ok() && c.exitCode !== 0 ? new PHPResponse(
+          500,
+          c.headers,
+          c.bytes,
+          c.errors,
+          c.exitCode
+        ) : c;
       } else
         return m(this, H, Q).call(this, i, o);
     else