@beignet/next 0.0.34 → 0.0.35

package/src/index.ts

@@ -9,13 +9,13 @@ import type { PaymentsPort, PaymentWebhookEvent } from "@beignet/core/payments";
 import type { AnyPorts, StorageObject, StoragePort } from "@beignet/core/ports";
 import type {
   InferProviderPorts,
+  ProviderInstrumentationPort,
   ServiceProvider,
 } from "@beignet/core/providers";
 import { resolveProviderInstrumentationPort } from "@beignet/core/providers";
 import {
   createInlineScheduleRunner,
   type ScheduleDef,
-  type ScheduleInstrumentation,
   type StandardSchema,
 } from "@beignet/core/schedules";
 import type {
@@ -406,8 +406,8 @@ type ScheduleRouteLogger = {
 
 type ScheduleRoutePorts = {
   logger?: ScheduleRouteLogger;
-  devtools?: ScheduleInstrumentation;
-  instrumentation?: ScheduleInstrumentation;
+  devtools?: ProviderInstrumentationPort;
+  instrumentation?: ProviderInstrumentationPort;
 };
 
 type ScheduleRouteContext = {
@@ -1250,10 +1250,8 @@ export function createUploadRoute(
       if (!uploadName) {
         return Response.json(
           {
-            error: {
-              code: "UPLOAD_NOT_FOUND",
-              message: "Upload route is missing an upload name.",
-            },
+            code: "UPLOAD_NOT_FOUND",
+            message: "Upload route is missing an upload name.",
           },
           { status: 404 },
         );
@@ -1266,11 +1264,9 @@ export function createUploadRoute(
       ) {
         return Response.json(
           {
-            error: {
-              code: "INVALID_UPLOAD_ACTION",
-              message:
-                'Upload route action must be "prepare", "complete", or "upload".',
-            },
+            code: "INVALID_UPLOAD_ACTION",
+            message:
+              'Upload route action must be "prepare", "complete", or "upload".',
           },
           { status: 400 },
         );
@@ -1286,18 +1282,7 @@ export function createUploadRoute(
   };
 }
 
-function cronRouteJson(
-  body: unknown,
-  status: number,
-  headers: HeadersInit | undefined,
-): Response {
-  return Response.json(body, {
-    status,
-    headers,
-  });
-}
-
-function paymentWebhookJson(
+function routeJson(
   body: unknown,
   status: number,
   headers: HeadersInit | undefined,
@@ -1308,15 +1293,37 @@ function paymentWebhookJson(
   });
 }
 
-function webhookRouteJson(
-  body: unknown,
+type OperationalErrorCode =
+  | "CRON_SECRET_NOT_CONFIGURED"
+  | "OUTBOX_DRAIN_FAILED"
+  | "PAYMENT_WEBHOOK_BODY_READ_FAILED"
+  | "PAYMENT_WEBHOOK_CONTEXT_FAILED"
+  | "PAYMENT_WEBHOOK_HANDLER_FAILED"
+  | "PAYMENT_WEBHOOK_SIGNATURE_MISSING"
+  | "PAYMENT_WEBHOOK_VERIFICATION_FAILED"
+  | "SCHEDULE_FAILED"
+  | "UNAUTHORIZED"
+  | "WEBHOOK_BODY_READ_FAILED"
+  | "WEBHOOK_CONTEXT_FAILED"
+  | "WEBHOOK_HANDLER_FAILED"
+  | "WEBHOOK_VERIFICATION_FAILED";
+
+function operationalErrorJson(
+  code: OperationalErrorCode,
+  message: string,
   status: number,
   headers: HeadersInit | undefined,
+  details?: unknown,
 ): Response {
-  return Response.json(body, {
+  return routeJson(
+    {
+      code,
+      message,
+      ...(details !== undefined ? { details } : {}),
+    },
     status,
     headers,
-  });
+  );
 }
 
 function toHttpResponseHeaders(
@@ -1412,22 +1419,6 @@ export function createOutboxDrainRoute<Ctx extends OutboxDrainContext>(
   }): Promise<Response> => {
     const nativeReq = nativeRequestOf(req);
     const headers = resolveHeaders(options.headers, nativeReq);
-    const secret = options.secret;
-
-    if (!secret) {
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "CRON_SECRET is not configured.",
-        },
-        500,
-        headers,
-      );
-    }
-
-    if (!(await isAuthorizedCronRequest(nativeReq, secret))) {
-      return cronRouteJson({ ok: false, error: "Unauthorized" }, 401, headers);
-    }
 
     try {
       const drainCtx = ctx;
@@ -1475,7 +1466,7 @@ export function createOutboxDrainRoute<Ctx extends OutboxDrainContext>(
         );
       }
 
-      return cronRouteJson(
+      return routeJson(
         {
           ok: true,
           result,
@@ -1486,11 +1477,9 @@ export function createOutboxDrainRoute<Ctx extends OutboxDrainContext>(
     } catch (error) {
       ctx.ports.logger?.error("Outbox drain failed", { error });
 
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "Outbox drain failed.",
-        },
+      return operationalErrorJson(
+        "OUTBOX_DRAIN_FAILED",
+        "Outbox drain failed.",
         500,
         headers,
       );
@@ -1514,44 +1503,37 @@ export function createOutboxDrainRoute<Ctx extends OutboxDrainContext>(
   };
 
   const drainPendingOutbox = async (req: Request): Promise<Response> => {
-    const server = await resolveServerSource(options.server);
-
-    const runner =
-      pipelineRunners[req.method.toUpperCase() === "GET" ? "GET" : "POST"];
-    const pipelined = runner(server);
-    if (pipelined) return pipelined(req);
-
-    // Minimal servers without rawRoute(...) — usually test fakes — keep the
-    // original flow: authorize before touching context, then drain inline.
     const headers = resolveHeaders(options.headers, req);
     const secret = options.secret;
 
     if (!secret) {
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "CRON_SECRET is not configured.",
-        },
+      return operationalErrorJson(
+        "CRON_SECRET_NOT_CONFIGURED",
+        "CRON_SECRET is not configured.",
         500,
         headers,
       );
     }
 
     if (!(await isAuthorizedCronRequest(req, secret))) {
-      return cronRouteJson({ ok: false, error: "Unauthorized" }, 401, headers);
+      return operationalErrorJson("UNAUTHORIZED", "Unauthorized", 401, headers);
     }
 
+    const server = await resolveServerSource(options.server);
+    const runner =
+      pipelineRunners[req.method.toUpperCase() === "GET" ? "GET" : "POST"];
+    const pipelined = runner(server);
+    if (pipelined) return pipelined(req);
+
     let ctx: Ctx;
     try {
       ctx = await server.createRequestContext(toRequestLike(req));
     } catch (error) {
       console.error("Outbox drain context failed", { error });
 
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "Outbox drain failed.",
-        },
+      return operationalErrorJson(
+        "OUTBOX_DRAIN_FAILED",
+        "Outbox drain failed.",
         500,
         headers,
       );
@@ -1600,11 +1582,9 @@ export function createWebhookRoute<
     try {
       rawBody = await req.text();
     } catch {
-      return webhookRouteJson(
-        {
-          ok: false,
-          error: "Webhook body read failed.",
-        },
+      return operationalErrorJson(
+        "WEBHOOK_BODY_READ_FAILED",
+        "Webhook body read failed.",
         400,
         headers,
       );
@@ -1650,11 +1630,9 @@ export function createWebhookRoute<
         traceId: ctx.traceId,
       });
 
-      return webhookRouteJson(
-        {
-          ok: false,
-          error: "Webhook verification failed.",
-        },
+      return operationalErrorJson(
+        "WEBHOOK_VERIFICATION_FAILED",
+        "Webhook verification failed.",
         400,
         headers,
       );
@@ -1699,11 +1677,9 @@ export function createWebhookRoute<
         eventType: event.type,
       });
 
-      return webhookRouteJson(
-        {
-          ok: false,
-          error: "Webhook handler failed.",
-        },
+      return operationalErrorJson(
+        "WEBHOOK_HANDLER_FAILED",
+        "Webhook handler failed.",
         500,
         headers,
       );
@@ -1735,11 +1711,9 @@ export function createWebhookRoute<
       try {
         rawBody = await req.text();
       } catch {
-        return webhookRouteJson(
-          {
-            ok: false,
-            error: "Webhook body read failed.",
-          },
+        return operationalErrorJson(
+          "WEBHOOK_BODY_READ_FAILED",
+          "Webhook body read failed.",
           400,
           headers,
         );
@@ -1751,11 +1725,9 @@ export function createWebhookRoute<
       try {
         ctx = await server.createRequestContext(contextRequest);
       } catch {
-        return webhookRouteJson(
-          {
-            ok: false,
-            error: "Webhook context failed.",
-          },
+        return operationalErrorJson(
+          "WEBHOOK_CONTEXT_FAILED",
+          "Webhook context failed.",
           500,
           headers,
         );
@@ -1797,11 +1769,9 @@ export function createPaymentWebhookRoute<
     const signature = new Headers(req.headers).get(signatureHeader);
 
     if (!signature) {
-      return paymentWebhookJson(
-        {
-          ok: false,
-          error: `Missing ${signatureHeader} header.`,
-        },
+      return operationalErrorJson(
+        "PAYMENT_WEBHOOK_SIGNATURE_MISSING",
+        `Missing ${signatureHeader} header.`,
         400,
         headers,
       );
@@ -1812,11 +1782,9 @@ export function createPaymentWebhookRoute<
     try {
       rawBody = await req.text();
     } catch {
-      return paymentWebhookJson(
-        {
-          ok: false,
-          error: "Payment webhook body read failed.",
-        },
+      return operationalErrorJson(
+        "PAYMENT_WEBHOOK_BODY_READ_FAILED",
+        "Payment webhook body read failed.",
         400,
         headers,
       );
@@ -1836,11 +1804,9 @@ export function createPaymentWebhookRoute<
         traceId: ctx.traceId,
       });
 
-      return paymentWebhookJson(
-        {
-          ok: false,
-          error: "Payment webhook verification failed.",
-        },
+      return operationalErrorJson(
+        "PAYMENT_WEBHOOK_VERIFICATION_FAILED",
+        "Payment webhook verification failed.",
         400,
         headers,
       );
@@ -1883,11 +1849,9 @@ export function createPaymentWebhookRoute<
         eventType: event.type,
       });
 
-      return paymentWebhookJson(
-        {
-          ok: false,
-          error: "Payment webhook handler failed.",
-        },
+      return operationalErrorJson(
+        "PAYMENT_WEBHOOK_HANDLER_FAILED",
+        "Payment webhook handler failed.",
         500,
         headers,
       );
@@ -1917,11 +1881,9 @@ export function createPaymentWebhookRoute<
       const headers = resolveHeaders(options.headers, req);
 
       if (!req.headers.get(signatureHeader)) {
-        return paymentWebhookJson(
-          {
-            ok: false,
-            error: `Missing ${signatureHeader} header.`,
-          },
+        return operationalErrorJson(
+          "PAYMENT_WEBHOOK_SIGNATURE_MISSING",
+          `Missing ${signatureHeader} header.`,
           400,
           headers,
         );
@@ -1931,11 +1893,9 @@ export function createPaymentWebhookRoute<
       try {
         rawBody = await req.text();
       } catch {
-        return paymentWebhookJson(
-          {
-            ok: false,
-            error: "Payment webhook body read failed.",
-          },
+        return operationalErrorJson(
+          "PAYMENT_WEBHOOK_BODY_READ_FAILED",
+          "Payment webhook body read failed.",
           400,
           headers,
         );
@@ -1945,11 +1905,9 @@ export function createPaymentWebhookRoute<
       try {
         ctx = await server.createRequestContext(toContextRequest(req, rawBody));
       } catch {
-        return paymentWebhookJson(
-          {
-            ok: false,
-            error: "Payment webhook context failed.",
-          },
+        return operationalErrorJson(
+          "PAYMENT_WEBHOOK_CONTEXT_FAILED",
+          "Payment webhook context failed.",
           500,
           headers,
         );
@@ -2001,28 +1959,11 @@ export function createScheduleRoute<Ctx extends ScheduleRouteContext>(
   }): Promise<Response> => {
     const nativeReq = nativeRequestOf(req);
     const headers = resolveHeaders(options.headers, nativeReq);
-    const secret = options.secret;
-
-    if (!secret) {
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "CRON_SECRET is not configured.",
-          scheduleName: schedule.name,
-        },
-        500,
-        headers,
-      );
-    }
-
-    if (!(await isAuthorizedCronRequest(nativeReq, secret))) {
-      return cronRouteJson({ ok: false, error: "Unauthorized" }, 401, headers);
-    }
 
     try {
       const runner = createInlineScheduleRunner<Ctx>({
         ctx,
-        instrumentation: resolveProviderInstrumentationPort(ctx.ports),
+        instrumentation: ctx.ports,
         instrumentationContext: {
           requestId: ctx.requestId,
           traceId: ctx.traceId,
@@ -2039,7 +1980,7 @@ export function createScheduleRoute<Ctx extends ScheduleRouteContext>(
         source: options.source ?? "next-cron-route",
       });
 
-      return cronRouteJson(
+      return routeJson(
         {
           ok: true,
           scheduleName: schedule.name,
@@ -2048,14 +1989,12 @@ export function createScheduleRoute<Ctx extends ScheduleRouteContext>(
         headers,
       );
     } catch {
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "Schedule failed.",
-          scheduleName: schedule.name,
-        },
+      return operationalErrorJson(
+        "SCHEDULE_FAILED",
+        "Schedule failed.",
         500,
         headers,
+        { scheduleName: schedule.name },
       );
     }
   };
@@ -2077,46 +2016,39 @@ export function createScheduleRoute<Ctx extends ScheduleRouteContext>(
   };
 
   const runScheduleFromRequest = async (req: Request): Promise<Response> => {
-    const server = await resolveServerSource(options.server);
-
-    const runner =
-      pipelineRunners[req.method.toUpperCase() === "GET" ? "GET" : "POST"];
-    const pipelined = runner(server);
-    if (pipelined) return pipelined(req);
-
-    // Minimal servers without rawRoute(...) — usually test fakes — keep the
-    // original flow: authorize before touching context, then run inline.
     const headers = resolveHeaders(options.headers, req);
     const secret = options.secret;
 
     if (!secret) {
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "CRON_SECRET is not configured.",
-          scheduleName: schedule.name,
-        },
+      return operationalErrorJson(
+        "CRON_SECRET_NOT_CONFIGURED",
+        "CRON_SECRET is not configured.",
         500,
         headers,
+        { scheduleName: schedule.name },
       );
     }
 
     if (!(await isAuthorizedCronRequest(req, secret))) {
-      return cronRouteJson({ ok: false, error: "Unauthorized" }, 401, headers);
+      return operationalErrorJson("UNAUTHORIZED", "Unauthorized", 401, headers);
     }
 
+    const server = await resolveServerSource(options.server);
+    const runner =
+      pipelineRunners[req.method.toUpperCase() === "GET" ? "GET" : "POST"];
+    const pipelined = runner(server);
+    if (pipelined) return pipelined(req);
+
     let ctx: Ctx;
     try {
       ctx = await server.createRequestContext(toRequestLike(req));
     } catch {
-      return cronRouteJson(
-        {
-          ok: false,
-          error: "Schedule failed.",
-          scheduleName: schedule.name,
-        },
+      return operationalErrorJson(
+        "SCHEDULE_FAILED",
+        "Schedule failed.",
         500,
         headers,
+        { scheduleName: schedule.name },
       );
     }