@base44-preview/cli 0.1.32-pr.660.402dccb → 0.1.32-pr.662.1bdb1fe

package/dist/cli/index.js

@@ -253161,6 +253161,10 @@ var STATIC_EGRESS_ENABLED_ENV = "BASE44_STATIC_EGRESS_ENABLED";
 var STATIC_EGRESS_DIAGNOSTIC_LIMIT = 5;
 var staticEgressFetchInstalled = false;
 var staticEgressDiagnosticCount = 0;
+var dedicatedEgressResponses = /* @__PURE__ */ new WeakSet();
+function isDedicatedEgressResponse(response) {
+  return dedicatedEgressResponses.has(response);
+}
 function inputKind(input) {
   if (typeof input === "string") return "string";
   return input instanceof URL ? "url" : "request";
@@ -253262,7 +253266,10 @@ function createRequestScopedStaticEgressFetch(originalFetch, readEnvironment) {
       return originalFetch(input, init);
     }
     logStaticEgressDecision("dedicated", input, binding, enableSecret);
-    return binding.fetch(input, init);
+    return binding.fetch(input, init).then((response) => {
+      dedicatedEgressResponses.add(response);
+      return response;
+    });
   };
 }
 function installStaticEgressFetch() {
@@ -253274,6 +253281,112 @@ function installStaticEgressFetch() {
   staticEgressFetchInstalled = true;
 }
 
+// src/edge-errors.ts
+var EDGE_ERRORS_HEADER = "X-B44-Edge-Errors";
+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 SAFE_VALUE = /^[\\x20-\\x7e]{1,253}$/;
+function safe(value) {
+  return typeof value === "string" && SAFE_VALUE.test(value) ? value : void 0;
+}
+function parseEdgeErrorBody(body) {
+  const plain = PLAIN_TEXT_EDGE_ERROR.exec(body);
+  if (plain) return { code: Number(plain[1]) };
+  if (!body.trimStart().startsWith("{")) return null;
+  try {
+    const json = JSON.parse(body);
+    if (json === null || typeof json !== "object") return null;
+    const fields = json;
+    if (fields.cloudflare_error !== true || !Number.isInteger(fields.error_code)) return null;
+    return {
+      code: fields.error_code,
+      name: safe(fields.error_name),
+      category: safe(fields.error_category),
+      zone: safe(fields.zone)
+    };
+  } catch {
+    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;
+  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);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function targetOrigin(input) {
+  try {
+    const raw = input instanceof URL ? input.href : typeof input === "string" ? input : input.url;
+    return new URL(raw).origin;
+  } catch {
+    return null;
+  }
+}
+async function recordEdgeError(input, response, startedAt) {
+  const store = currentWorkerRuntimeContext();
+  if (!store) return;
+  const body = await readEdgeError(response);
+  const target = targetOrigin(input);
+  if (!body || !target) return;
+  const record = store.edgeErrors ??= { errors: [], dropped: 0 };
+  if (record.errors.length >= MAX_EDGE_ERRORS) {
+    record.dropped += 1;
+    return;
+  }
+  record.errors.push({
+    ...body,
+    target,
+    status: response.status,
+    ray: safe(response.headers.get("cf-ray")) ?? "",
+    egress: isDedicatedEgressResponse(response) ? "dedicated" : "shared",
+    elapsed_ms: Date.now() - startedAt
+  });
+}
+function createEdgeErrorFetch(innerFetch) {
+  return async (input, init) => {
+    const startedAt = Date.now();
+    const response = await innerFetch(input, init);
+    try {
+      await recordEdgeError(input, response, startedAt);
+    } catch {
+    }
+    return response;
+  };
+}
+var edgeErrorFetchInstalled = false;
+function installEdgeErrorFetch() {
+  if (edgeErrorFetchInstalled) return;
+  globalThis.fetch = createEdgeErrorFetch(globalThis.fetch.bind(globalThis));
+  edgeErrorFetchInstalled = true;
+}
+function attachEdgeErrors(response) {
+  const record = currentWorkerRuntimeContext()?.edgeErrors;
+  if (!record || !(response instanceof Response)) return response;
+  if (response.status === 101 || response.webSocket) return response;
+  try {
+    const wrapped = new Response(response.body, response);
+    wrapped.headers.set(EDGE_ERRORS_HEADER, JSON.stringify(record));
+    return wrapped;
+  } catch {
+    return response;
+  }
+}
+
 // src/static-egress-tcp-core.mjs
 function normalizeHost(host) {
   return host.toLowerCase().replace(/^\\[(.*)\\]$/, "$1").replace(/\\.$/, "");
@@ -253427,7 +253540,9 @@ function resolveHandler(functionName) {
   return handler;
 }
 export {
+  attachEdgeErrors,
   getRegisteredHandler,
+  installEdgeErrorFetch,
   installStaticEgressFetch,
   registerLazy,
   resolveHandler
@@ -256320,10 +256435,10 @@ var INVOCATION_LOGS_PATCH = [
   "};",
   "const _b44CrashResponse = (e) => {",
   "  const c = _b44Context();",
-  "  if (!c || !c.invocationLogs) return null;",
+  "  if (!c || !(c.invocationLogs || c.edgeErrors)) 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(new Response(JSON.stringify({ error: 'user-exception', detail: 'user worker threw an exception' }), { status: 500, headers: { 'Content-Type': 'application/json' } }));",
+  "  return _b44AttachInvocationLogs(_b44AttachEdgeErrors(new Response(JSON.stringify({ error: 'user-exception', detail: 'user worker threw an exception' }), { status: 500, headers: { 'Content-Type': 'application/json' } })));",
   "};"
 ].join(`
 `);
@@ -256367,7 +256482,7 @@ var TELEMETRY_PATCH = [
 var TELEMETRY_STORE_FIELDS = "reqId: crypto.randomUUID(), respondedAt: null, inflight: new Map(), inflightTotal: 0, hadRejection: false, hadNonOk: false, logBudget: 5";
 
 // ../functions-compiler/src/version.ts
-var COMPILER_VERSION = "0.1.6";
+var COMPILER_VERSION = "0.1.7";
 
 // ../functions-compiler/src/worker-entry.ts
 function denoShimSource() {
@@ -256472,20 +256587,22 @@ registerLazy(${JSON.stringify(functionName)}, () => import(${JSON.stringify(user
 function buildAppEntrySource(functionModules, telemetry, runtimeSecrets = false) {
   const moduleImports = functionModules.map((file) => `import "./${file}";`).join(`
 `);
-  const handlerExpr = `_b44AttachInvocationLogs(${telemetry ? "_b44AttachTelemetry(await handler(request, info))" : "await handler(request, info)"})`;
+  const handlerExpr = `_b44AttachInvocationLogs(_b44AttachEdgeErrors(${telemetry ? "_b44AttachTelemetry(await handler(request, info))" : "await handler(request, info)"}))`;
   const guard = activationGuard(runtimeSecrets);
   const returnExpr = guard(handlerExpr);
   return `// Auto-generated by the base44 bundler. Do not edit.
 
 import { currentWorkerRuntimeContext as _b44Context, runWithWorkerEnvironment as _b44Run } from ${JSON.stringify(RUNTIME_CONTEXT_SPECIFIER)};
-import { installStaticEgressFetch, resolveHandler } from "./${SHIM_FILENAME}";${activationImport(runtimeSecrets)}
+import { attachEdgeErrors as _b44AttachEdgeErrors, installEdgeErrorFetch, installStaticEgressFetch, resolveHandler } from "./${SHIM_FILENAME}";${activationImport(runtimeSecrets)}
 ${moduleImports}
 
 ${consolePatch(runtimeSecrets)}
 ${INVOCATION_LOGS_PATCH}
-// Static egress reads workerEnv from the active request store. Install it
-// before telemetry so telemetry remains the outermost fetch wrapper.
+// Static egress reads workerEnv from the active request store. Install it and
+// the edge-error recorder before telemetry so telemetry remains the outermost
+// fetch wrapper.
 installStaticEgressFetch();
+installEdgeErrorFetch();
 ${telemetry ? TELEMETRY_PATCH : ""}
 
 export default {
@@ -271402,4 +271519,4 @@ export {
   runCLI
 };
 
-//# debugId=5ADBB560F1D5EE5164756E2164756E21
+//# debugId=07CB780E430930C364756E2164756E21