@beignet/core 0.0.34 → 0.0.36

package/src/schedules/index.ts

@@ -1,4 +1,9 @@
 import type { StandardSchemaV1 } from "@standard-schema/spec";
+import {
+  createProviderInstrumentation,
+  type ProviderInstrumentation,
+  type ProviderInstrumentationTarget,
+} from "../providers/index.js";
 import { runWithResolvedTracingContext } from "../tracing/execution.js";
 import type { TracingPort } from "../tracing/index.js";
 
@@ -312,16 +317,6 @@ export interface ScheduleDevtoolsEvent {
   details?: Record<string, unknown>;
 }
 
-/**
- * Sink for schedule devtools events, usually `ctx.ports.devtools`.
- */
-export interface ScheduleInstrumentation {
-  /**
-   * Record one schedule devtools event.
-   */
-  record(event: ScheduleDevtoolsEvent): unknown;
-}
-
 /**
  * Correlation fields attached to schedule instrumentation events.
  */
@@ -381,13 +376,14 @@ export interface InlineScheduleRunnerOptions<Ctx> {
    */
   now?: () => Date;
   /**
-   * Devtools-compatible sink that receives `schedule` events for each run.
+   * Provider instrumentation target that receives `schedule` events for each
+   * run. Pass `ctx.ports`, `ctx.ports.instrumentation`, or
+   * `ctx.ports.devtools` directly.
    *
    * The runner records `started`, `completed`, and `failed` events. Recording
-   * failures are isolated from schedule execution and reported to
-   * `onHookError` when provided.
+   * failures are isolated from schedule execution.
    */
-  instrumentation?: ScheduleInstrumentation;
+  instrumentation?: ProviderInstrumentationTarget;
   /**
    * Correlation fields attached to recorded schedule events.
    */
@@ -675,45 +671,28 @@ async function recordScheduleEvent<
   Ctx,
   S extends ScheduleDef<string, StandardSchema, Ctx>,
 >(
-  options: InlineScheduleRunnerOptions<Ctx>,
+  instrumentation: ProviderInstrumentation,
+  instrumentationContext: ScheduleInstrumentationContext | undefined,
   schedule: S,
   status: ScheduleDevtoolsEvent["status"],
   run: ScheduleRunContext,
-  args: {
-    payload?: InferSchedulePayload<S>;
-    hook: ScheduleHookName;
-    scheduleError?: unknown;
-    details?: Record<string, unknown>;
-  },
+  details?: Record<string, unknown>,
 ): Promise<void> {
-  if (!options.instrumentation) return;
-
-  try {
-    options.instrumentation.record({
-      type: "schedule",
-      watcher: "schedules",
-      requestId: options.instrumentationContext?.requestId,
-      traceId: options.instrumentationContext?.traceId,
-      scheduleName: schedule.name,
-      status,
-      cron: schedule.cron,
-      timezone: schedule.timezone,
-      details: {
-        source: run.source,
-        scheduledAt: run.scheduledAt?.toISOString(),
-        ...args.details,
-      },
-    });
-  } catch (error) {
-    await reportHookError(options.onHookError, {
-      schedule,
-      payload: args.payload,
-      run,
-      hook: args.hook,
-      error,
-      scheduleError: args.scheduleError,
-    });
-  }
+  instrumentation.record({
+    type: "schedule",
+    watcher: "schedules",
+    requestId: instrumentationContext?.requestId,
+    traceId: instrumentationContext?.traceId,
+    scheduleName: schedule.name,
+    status,
+    cron: schedule.cron,
+    timezone: schedule.timezone,
+    details: {
+      source: run.source,
+      scheduledAt: run.scheduledAt?.toISOString(),
+      ...details,
+    },
+  });
 }
 
 function defineScheduleImpl<
@@ -785,6 +764,13 @@ export function createInlineScheduleRunner<Ctx>(
   options: InlineScheduleRunnerOptions<Ctx> = {},
 ): InlineScheduleRunner<Ctx> {
   const now = options.now ?? (() => new Date());
+  const instrumentation = createProviderInstrumentation(
+    options.instrumentation,
+    {
+      providerName: "schedules",
+      watcher: "schedules",
+    },
+  );
 
   return {
     async run<S extends ScheduleDef<string, StandardSchema, Ctx>>(
@@ -798,10 +784,13 @@ export function createInlineScheduleRunner<Ctx>(
         payload = await resolveSchedulePayload(schedule, runOptions, run);
 
         const lifecycleArgs = { schedule, payload, run };
-        await recordScheduleEvent(options, schedule, "started", run, {
-          payload,
-          hook: "start",
-        });
+        await recordScheduleEvent(
+          instrumentation,
+          options.instrumentationContext,
+          schedule,
+          "started",
+          run,
+        );
         await runLifecycleHook(
           "start",
           options.onStart,
@@ -820,10 +809,13 @@ export function createInlineScheduleRunner<Ctx>(
               run,
             }),
         });
-        await recordScheduleEvent(options, schedule, "completed", run, {
-          payload,
-          hook: "success",
-        });
+        await recordScheduleEvent(
+          instrumentation,
+          options.instrumentationContext,
+          schedule,
+          "completed",
+          run,
+        );
         await runLifecycleHook(
           "success",
           options.onSuccess,
@@ -831,12 +823,14 @@ export function createInlineScheduleRunner<Ctx>(
           lifecycleArgs,
         );
       } catch (error) {
-        await recordScheduleEvent(options, schedule, "failed", run, {
-          payload,
-          hook: "error",
-          scheduleError: error,
-          details: { error },
-        });
+        await recordScheduleEvent(
+          instrumentation,
+          options.instrumentationContext,
+          schedule,
+          "failed",
+          run,
+          { error },
+        );
         await runErrorHook(options.onError, options.onHookError, {
           error,
           schedule,

package/src/server/index.ts

@@ -76,7 +76,10 @@ export type {
   RawRouteBuilder,
   RawRouteInit,
   RouteDef,
+  RouteDefinitionBuilder,
   RouteGroup,
+  RouteGroupBuilder,
+  Routes,
   ServerInstance,
 } from "./server.js";
 /**
@@ -84,9 +87,8 @@ export type {
  */
 export {
   contractsFromRoutes,
+  createRoutes,
   createServer,
-  defineRoute,
-  defineRouteGroup,
   defineRoutes,
 } from "./server.js";
 /**