@base44-preview/cli 0.1.32-pr.662.1bdb1fe → 0.1.32-pr.662.e04bb64

package/dist/cli/index.js

@@ -253287,14 +253287,15 @@ var MAX_EDGE_ERRORS = 5;
 var MAX_INSPECTED_BODY_BYTES = 8192;
 var BODY_READ_TIMEOUT_MS = 500;
 var PLAIN_TEXT_EDGE_ERROR = /^error code: (\\d{3,4})\\s*$/;
+var UNBRANDED_5XX_PAGE = /<center>cloudflare<\\/center>/i;
 var SAFE_VALUE = /^[\\x20-\\x7e]{1,253}$/;
 function safe(value) {
   return typeof value === "string" && SAFE_VALUE.test(value) ? value : void 0;
 }
-function parseEdgeErrorBody(body) {
+function parseEdgeErrorBody(body, status) {
   const plain = PLAIN_TEXT_EDGE_ERROR.exec(body);
   if (plain) return { code: Number(plain[1]) };
-  if (!body.trimStart().startsWith("{")) return null;
+  if (status >= 500 && UNBRANDED_5XX_PAGE.test(body)) return { code: status };
   try {
     const json = JSON.parse(body);
     if (json === null || typeof json !== "object") return null;
@@ -253310,24 +253311,39 @@ function parseEdgeErrorBody(body) {
     return null;
   }
 }
-async function readEdgeError(response) {
-  if (response.status < 400) return null;
-  const length = Number(response.headers.get("content-length"));
-  if (!response.headers.get("cf-ray") || !(length > 0 && length <= MAX_INSPECTED_BODY_BYTES)) {
-    return null;
-  }
-  let timer;
+async function readBodyPrefix(response) {
+  if (Number(response.headers.get("content-length")) > MAX_INSPECTED_BODY_BYTES) return null;
+  const reader = response.clone().body?.getReader();
+  if (!reader) return "";
+  const timer = setTimeout(() => reader.cancel().catch(() => {
+  }), BODY_READ_TIMEOUT_MS);
+  const decoder = new TextDecoder();
+  let text = "";
+  let size = 0;
   try {
-    const body = await Promise.race([
-      response.clone().text(),
-      new Promise((resolve2) => {
-        timer = setTimeout(() => resolve2(null), BODY_READ_TIMEOUT_MS);
-      })
-    ]);
-    return body === null ? null : parseEdgeErrorBody(body);
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      size += value.byteLength;
+      if (size > MAX_INSPECTED_BODY_BYTES) return null;
+      text += decoder.decode(value, { stream: true });
+    }
+  } catch {
+    return null;
   } finally {
     clearTimeout(timer);
+    reader.cancel().catch(() => {
+    });
+  }
+  return text + decoder.decode();
+}
+async function readEdgeError(response) {
+  if (response.status < 400 || !response.headers.get("cf-ray")) return null;
+  if (response.headers.get("cf-mitigated") === "challenge") {
+    return { code: response.status, name: "challenge" };
   }
+  const body = await readBodyPrefix(response);
+  return body === null ? null : parseEdgeErrorBody(body, response.status);
 }
 function targetOrigin(input) {
   try {
@@ -256435,10 +256451,10 @@ var INVOCATION_LOGS_PATCH = [
   "};",
   "const _b44CrashResponse = (e) => {",
   "  const c = _b44Context();",
-  "  if (!c || !(c.invocationLogs || c.edgeErrors)) return null;",
+  "  if (!c || !c.invocationLogs) return null;",
   "  const m = String(e instanceof Error ? e.message : e).toLowerCase();",
   "  if (m.includes('cpu time limit') || m.includes('too many subrequests')) return null;",
-  "  return _b44AttachInvocationLogs(_b44AttachEdgeErrors(new Response(JSON.stringify({ error: 'user-exception', detail: 'user worker threw an exception' }), { status: 500, headers: { 'Content-Type': 'application/json' } })));",
+  "  return _b44AttachInvocationLogs(new Response(JSON.stringify({ error: 'user-exception', detail: 'user worker threw an exception' }), { status: 500, headers: { 'Content-Type': 'application/json' } }));",
   "};"
 ].join(`
 `);
@@ -271519,4 +271535,4 @@ export {
   runCLI
 };
 
-//# debugId=07CB780E430930C364756E2164756E21
+//# debugId=45318CD4F94D8EF364756E2164756E21