@decocms/runtime 1.0.0-alpha.31 → 1.0.0-alpha.33

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@decocms/runtime",
-  "version": "1.0.0-alpha.31",
+  "version": "1.0.0-alpha.33",
   "type": "module",
+  "scripts": {
+    "check": "tsc --noEmit"
+  },
   "dependencies": {
     "@cloudflare/workers-types": "^4.20250617.0",
     "@deco/mcp": "npm:@jsr/deco__mcp@0.7.8",
-    "@decocms/bindings": "1.0.1-alpha.17",
+    "@decocms/bindings": "1.0.1-alpha.19",
     "@modelcontextprotocol/sdk": "1.20.2",
     "@ai-sdk/provider": "^2.0.0",
     "hono": "^4.10.7",

package/src/asset-server/index.ts

@@ -6,11 +6,21 @@ import { Handler } from "hono/types";
 interface AssetServerConfig {
   env: "development" | "production" | "test";
   localDevProxyUrl?: string | URL;
+  /**
+   * The prefix to use for serving the assets.
+   * Default: "/assets/*"
+   */
+  assetsMiddlewarePath?: string;
+  /**
+   * The directory to serve the assets from.
+   * Default: "./dist/client"
+   */
   assetsDirectory?: string;
 }
 
 const DEFAULT_LOCAL_DEV_PROXY_URL = "http://localhost:4000";
 const DEFAULT_ASSETS_DIRECTORY = "./dist/client";
+const DEFAULT_ASSETS_MIDDLEWARE_PATH = "/assets/*";
 
 interface HonoApp {
   use: (path: string, handler: Handler) => void;
@@ -25,11 +35,13 @@ export const applyAssetServerRoutes = (
   const localDevProxyUrl =
     config.localDevProxyUrl ?? DEFAULT_LOCAL_DEV_PROXY_URL;
   const assetsDirectory = config.assetsDirectory ?? DEFAULT_ASSETS_DIRECTORY;
+  const assetsMiddlewarePath =
+    config.assetsMiddlewarePath ?? DEFAULT_ASSETS_MIDDLEWARE_PATH;
 
   if (environment === "development") {
     app.use("*", devServerProxy(localDevProxyUrl));
   } else if (environment === "production") {
-    app.use("/assets/*", serveStatic({ root: assetsDirectory }));
+    app.use(assetsMiddlewarePath, serveStatic({ root: assetsDirectory }));
     app.get("*", serveStatic({ path: `${assetsDirectory}/index.html` }));
   }
 };

package/src/events.ts

@@ -0,0 +1,469 @@
+import type {
+  CloudEvent,
+  EventResult,
+  OnEventsOutput,
+} from "@decocms/bindings";
+import z from "zod";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export interface EventSubscription {
+  connectionId: string;
+  events: string[];
+}
+
+interface Binding {
+  __type: string;
+  value: string;
+}
+
+/**
+ * Per-event handler - handles events of a specific type
+ * Returns result for each event individually
+ */
+export type PerEventHandler<TEnv> = (
+  context: { events: CloudEvent[] },
+  env: TEnv,
+) => EventResult | Promise<EventResult>;
+
+/**
+ * Batch handler function - handles multiple events at once
+ * Can return batch result or per-event results
+ */
+export type BatchHandlerFn<TEnv> = (
+  context: { events: CloudEvent[] },
+  env: TEnv,
+) => OnEventsOutput | Promise<OnEventsOutput>;
+
+/**
+ * Batch handler with explicit event types for subscription
+ */
+export interface BatchHandler<TEnv> {
+  /** Handler function */
+  handler: BatchHandlerFn<TEnv>;
+  /** Event types to subscribe to */
+  events: string[];
+}
+
+/**
+ * Binding-level handlers - either a batch handler with events or per-event handlers
+ *
+ * @example Per-event handlers (event types inferred from keys)
+ * ```ts
+ * { "order.created": handler, "order.updated": handler }
+ * ```
+ *
+ * @example Batch handler with explicit events
+ * ```ts
+ * { handler: fn, events: ["order.created", "order.updated"] }
+ * ```
+ */
+export type BindingHandlers<TEnv> =
+  | BatchHandler<TEnv>
+  | Record<string, PerEventHandler<TEnv>>;
+
+/**
+ * EventHandlers type supports three granularity levels:
+ *
+ * @example Global handler with explicit events
+ * ```ts
+ * { handler: (ctx, env) => result, events: ["order.created"] }
+ * ```
+ *
+ * @example Per-binding batch handler
+ * ```ts
+ * { DATABASE: { handler: fn, events: ["order.created"] } }
+ * ```
+ *
+ * @example Per-event handlers (events inferred from keys)
+ * ```ts
+ * { DATABASE: { "order.created": (ctx, env) => result } }
+ * ```
+ */
+export type EventHandlers<TSchema extends z.ZodTypeAny = never> = [
+  TSchema,
+] extends [never]
+  ? Record<string, never>
+  :
+      | BatchHandler<z.infer<TSchema>> // Global handler with events
+      | {
+          [K in keyof z.infer<TSchema> as z.infer<TSchema>[K] extends {
+            __type: string;
+            value: string;
+          }
+            ? K
+            : never]?: BindingHandlers<z.infer<TSchema>>;
+        };
+
+/**
+ * Extract only the keys from T where the value is a Binding shape.
+ * Filters out non-binding properties at the type level.
+ */
+export type BindingKeysOf<T> = {
+  [K in keyof T]: T[K] extends { __type: string; value: string } ? K : never;
+}[keyof T];
+
+// ============================================================================
+// Type Guards
+// ============================================================================
+
+const isBinding = (v: unknown): v is Binding => {
+  return (
+    typeof v === "object" &&
+    v !== null &&
+    "__type" in v &&
+    typeof v.__type === "string" &&
+    "value" in v &&
+    typeof v.value === "string"
+  );
+};
+
+/**
+ * Check if handlers is a global batch handler (has handler + events at top level)
+ */
+const isGlobalHandler = <TEnv>(
+  handlers: EventHandlers<z.ZodTypeAny>,
+): handlers is BatchHandler<TEnv> => {
+  return (
+    typeof handlers === "object" &&
+    handlers !== null &&
+    "handler" in handlers &&
+    "events" in handlers &&
+    typeof handlers.handler === "function" &&
+    Array.isArray(handlers.events)
+  );
+};
+
+/**
+ * Check if a binding handler is a batch handler (has handler + events) vs per-event handlers (object of functions)
+ */
+const isBatchHandler = <TEnv>(
+  handler: BindingHandlers<TEnv>,
+): handler is BatchHandler<TEnv> => {
+  return (
+    typeof handler === "object" &&
+    handler !== null &&
+    "handler" in handler &&
+    "events" in handler &&
+    typeof handler.handler === "function" &&
+    Array.isArray(handler.events)
+  );
+};
+
+// ============================================================================
+// Helper Functions
+// ============================================================================
+
+/**
+ * Get binding keys from event handlers object
+ */
+const getBindingKeys = <TSchema extends z.ZodTypeAny>(
+  handlers: EventHandlers<TSchema>,
+): string[] => {
+  if (isGlobalHandler(handlers)) {
+    return [];
+  }
+  return Object.keys(handlers);
+};
+
+/**
+ * Get event types for a binding from handlers
+ */
+const getEventTypesForBinding = <TSchema extends z.ZodTypeAny>(
+  handlers: EventHandlers<TSchema>,
+  binding: string,
+): string[] => {
+  if (isGlobalHandler(handlers)) {
+    return handlers.events;
+  }
+  const bindingHandler = handlers[binding as keyof typeof handlers];
+  if (!bindingHandler) {
+    return [];
+  }
+  if (isBatchHandler(bindingHandler)) {
+    // Batch handler - return explicit events array
+    return bindingHandler.events;
+  }
+  // Per-event handlers - event types are the keys
+  return Object.keys(bindingHandler);
+};
+
+/**
+ * Get scopes from event handlers for subscription
+ */
+const scopesFromEvents = <TSchema extends z.ZodTypeAny = never>(
+  handlers: EventHandlers<TSchema>,
+): string[] => {
+  if (isGlobalHandler(handlers)) {
+    // Global handler - scopes are based on explicit events array
+    // Note: "*" binding means all bindings
+    return handlers.events.map((event) => `*::event@${event}`);
+  }
+
+  const scopes: string[] = [];
+  for (const binding of getBindingKeys(handlers)) {
+    const eventTypes = getEventTypesForBinding(handlers, binding);
+    for (const eventType of eventTypes) {
+      scopes.push(`${binding}::event@${eventType}`);
+    }
+  }
+  return scopes;
+};
+
+/**
+ * Get subscriptions from event handlers and state
+ */
+const eventsSubscriptions = <TSchema extends z.ZodTypeAny = never>(
+  handlers: EventHandlers<TSchema>,
+  state: z.infer<TSchema>,
+): EventSubscription[] => {
+  if (isGlobalHandler(handlers)) {
+    // Global handler - subscribe to all bindings with the explicit events
+    const subscriptions: EventSubscription[] = [];
+    for (const [, value] of Object.entries(state)) {
+      if (isBinding(value)) {
+        subscriptions.push({
+          connectionId: value.value,
+          events: handlers.events,
+        });
+      }
+    }
+    return subscriptions;
+  }
+
+  const subscriptions: EventSubscription[] = [];
+  for (const binding of getBindingKeys(handlers)) {
+    const bindingValue = state[binding as keyof typeof state];
+    if (!isBinding(bindingValue)) continue;
+
+    const eventTypes = getEventTypesForBinding(handlers, binding);
+    subscriptions.push({
+      connectionId: bindingValue.value,
+      events: eventTypes,
+    });
+  }
+  return subscriptions;
+};
+
+// ============================================================================
+// Event Execution
+// ============================================================================
+
+/**
+ * Group events by source (connection ID)
+ */
+const groupEventsBySource = (
+  events: CloudEvent[],
+): Map<string, CloudEvent[]> => {
+  const grouped = new Map<string, CloudEvent[]>();
+  for (const event of events) {
+    const source = event.source;
+    const existing = grouped.get(source) || [];
+    existing.push(event);
+    grouped.set(source, existing);
+  }
+  return grouped;
+};
+
+/**
+ * Group events by type
+ */
+const groupEventsByType = (events: CloudEvent[]): Map<string, CloudEvent[]> => {
+  const grouped = new Map<string, CloudEvent[]>();
+  for (const event of events) {
+    const type = event.type;
+    const existing = grouped.get(type) || [];
+    existing.push(event);
+    grouped.set(type, existing);
+  }
+  return grouped;
+};
+
+/**
+ * Merge multiple OnEventsOutput results into a single result
+ */
+const mergeResults = (results: OnEventsOutput[]): OnEventsOutput => {
+  const merged: OnEventsOutput = {};
+  const allResults: Record<string, EventResult> = {};
+
+  let hasAnyFailure = false;
+  let totalProcessed = 0;
+  const errors: string[] = [];
+
+  for (const result of results) {
+    // Merge per-event results
+    if (result.results) {
+      Object.assign(allResults, result.results);
+    }
+
+    // Track batch-level status
+    if (result.success === false) {
+      hasAnyFailure = true;
+      if (result.error) {
+        errors.push(result.error);
+      }
+    }
+
+    if (result.processedCount !== undefined) {
+      totalProcessed += result.processedCount;
+    }
+  }
+
+  // Build merged result
+  if (Object.keys(allResults).length > 0) {
+    merged.results = allResults;
+  }
+
+  // Set batch-level success based on all results
+  merged.success = !hasAnyFailure;
+
+  if (errors.length > 0) {
+    merged.error = errors.join("; ");
+  }
+
+  if (totalProcessed > 0) {
+    merged.processedCount = totalProcessed;
+  }
+
+  return merged;
+};
+
+/**
+ * Execute event handlers and return merged result
+ *
+ * Supports three handler formats:
+ * 1. Global: `(context, env) => result` - handles all events
+ * 2. Per-binding: `{ BINDING: (context, env) => result }` - handles all events from binding
+ * 3. Per-event: `{ BINDING: { "event.type": (context, env) => result } }` - handles specific events
+ */
+const executeEventHandlers = async <TSchema extends z.ZodTypeAny>(
+  handlers: EventHandlers<TSchema>,
+  events: CloudEvent[],
+  env: z.infer<TSchema>,
+  state: z.infer<TSchema>,
+): Promise<OnEventsOutput> => {
+  // Case 1: Global handler
+  if (isGlobalHandler(handlers)) {
+    try {
+      return await handlers.handler({ events }, env);
+    } catch (error) {
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : String(error),
+      };
+    }
+  }
+
+  // Build a map from connectionId -> binding key
+  const connectionToBinding = new Map<string, string>();
+  for (const binding of getBindingKeys(handlers)) {
+    const bindingValue = state[binding as keyof typeof state];
+    if (isBinding(bindingValue)) {
+      connectionToBinding.set(bindingValue.value, binding);
+    }
+  }
+
+  // Group events by source
+  const eventsBySource = groupEventsBySource(events);
+
+  // Process each binding's events in parallel
+  const promises: Promise<OnEventsOutput>[] = [];
+
+  for (const [source, sourceEvents] of eventsBySource) {
+    const binding = connectionToBinding.get(source);
+    if (!binding) {
+      // No handler for this source - mark as success (ignore)
+      continue;
+    }
+
+    const bindingHandler = handlers[binding as keyof typeof handlers];
+    if (!bindingHandler) continue;
+
+    // Case 2: Per-binding batch handler
+    if (isBatchHandler(bindingHandler)) {
+      promises.push(
+        (async () => {
+          try {
+            return await bindingHandler.handler({ events: sourceEvents }, env);
+          } catch (error) {
+            // Mark all events from this binding as failed
+            const results: Record<string, EventResult> = {};
+            for (const event of sourceEvents) {
+              results[event.id] = {
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+              };
+            }
+            return { results };
+          }
+        })(),
+      );
+      continue;
+    }
+
+    // Case 3: Per-event handlers
+    const perEventHandlers = bindingHandler as Record<
+      string,
+      PerEventHandler<z.infer<TSchema>>
+    >;
+    const eventsByType = groupEventsByType(sourceEvents);
+
+    for (const [eventType, typedEvents] of eventsByType) {
+      const eventHandler = perEventHandlers[eventType];
+      if (!eventHandler) {
+        // No handler for this event type - mark as success (ignore)
+        continue;
+      }
+
+      // Call handler for each event type (handler receives all events of that type)
+      promises.push(
+        (async () => {
+          try {
+            const result = await eventHandler({ events: typedEvents }, env);
+            // Convert per-event result to output with results for each event
+            const results: Record<string, EventResult> = {};
+            for (const event of typedEvents) {
+              results[event.id] = result;
+            }
+            return { results };
+          } catch (error) {
+            const results: Record<string, EventResult> = {};
+            for (const event of typedEvents) {
+              results[event.id] = {
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+              };
+            }
+            return { results };
+          }
+        })(),
+      );
+    }
+  }
+
+  // Wait for all handlers to complete
+  const results = await Promise.all(promises);
+
+  // If no handlers were called, return success
+  if (results.length === 0) {
+    return { success: true };
+  }
+
+  // Merge all results
+  return mergeResults(results);
+};
+
+// ============================================================================
+// Exports
+// ============================================================================
+
+/**
+ * Event utilities for subscriptions and execution
+ */
+export const Event = {
+  subscriptions: eventsSubscriptions,
+  scopes: scopesFromEvents,
+  execute: executeEventHandlers,
+};

package/src/tools.ts

@@ -1,13 +1,22 @@
 /* oxlint-disable no-explicit-any */
 /* oxlint-disable ban-types */
 import { HttpServerTransport } from "@deco/mcp/http";
+import {
+  OnEventsInputSchema,
+  OnEventsOutputSchema,
+  type EventBusBindingClient,
+} from "@decocms/bindings";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
+import { Event, type EventHandlers } from "./events.ts";
 import type { DefaultEnv } from "./index.ts";
 import { State } from "./state.ts";
 import { Binding } from "./wrangler.ts";
 
+// Re-export EventHandlers type for external use
+export type { EventHandlers } from "./events.ts";
+
 export const createRuntimeContext = (prev?: AppContext) => {
   const store = State.getStore();
   if (!store) {
@@ -213,12 +222,23 @@ export interface OAuthConfig {
   };
 }
 
+/**
+ * Constructs a type by picking all properties from T that are assignable to Value.
+ */
+type PickByType<T, Value> = {
+  [P in keyof T as T[P] extends Value ? P : never]: T[P];
+};
+
 export interface CreateMCPServerOptions<
   Env = unknown,
   TSchema extends z.ZodTypeAny = never,
 > {
   before?: (env: Env & DefaultEnv<TSchema>) => Promise<void> | void;
   oauth?: OAuthConfig;
+  events?: {
+    bus?: keyof PickByType<Env & DefaultEnv<TSchema>, EventBusBindingClient>;
+    handlers?: EventHandlers<TSchema>;
+  };
   configuration?: {
     onChange?: (
       env: Env & DefaultEnv<TSchema>,
@@ -255,17 +275,22 @@ export interface AppContext<TEnv extends DefaultEnv = DefaultEnv> {
   req?: Request;
 }
 
-const configurationToolsFor = <TSchema extends z.ZodTypeAny = never>({
-  state: schema,
-  scopes,
-  onChange,
-}: CreateMCPServerOptions<
-  any,
-  TSchema
->["configuration"] = {}): CreatedTool[] => {
+const getEventBus = (
+  prop: string | number,
+  env: DefaultEnv,
+): EventBusBindingClient | undefined => {
+  const bus = env as unknown as { [prop]: EventBusBindingClient };
+  return typeof bus[prop] !== "undefined" ? bus[prop] : undefined;
+};
+
+const toolsFor = <TSchema extends z.ZodTypeAny = never>({
+  events,
+  configuration: { state: schema, scopes, onChange } = {},
+}: CreateMCPServerOptions<any, TSchema> = {}): CreatedTool[] => {
   const jsonSchema = schema
     ? zodToJsonSchema(schema)
     : { type: "object", properties: {} };
+  const busProp = String(events?.bus ?? "EVENT_BUS");
   return [
     ...(onChange
       ? [
@@ -282,15 +307,60 @@ const configurationToolsFor = <TSchema extends z.ZodTypeAny = never>({
             }),
             outputSchema: z.object({}),
             execute: async (input) => {
+              const state = input.context.state as z.infer<TSchema>;
               await onChange(input.runtimeContext.env, {
-                state: input.context.state,
+                state,
                 scopes: input.context.scopes,
               });
+              const bus = getEventBus(busProp, input.runtimeContext.env);
+              if (events && state && bus) {
+                // subscribe to events
+                const subscriptions = Event.subscriptions(
+                  events?.handlers ?? {},
+                  state,
+                );
+
+                await Promise.all(
+                  subscriptions.map(async (subscription) => {
+                    return Promise.all(
+                      subscription.events.map(async (event) => {
+                        return bus.EVENT_SUBSCRIBE({
+                          publisher: subscription.connectionId,
+                          eventType: event,
+                        });
+                      }),
+                    );
+                  }),
+                );
+              }
               return Promise.resolve({});
             },
           }),
         ]
       : []),
+
+    ...(events?.handlers
+      ? [
+          createTool({
+            id: "ON_EVENTS",
+            description:
+              "Receive and process CloudEvents from the event bus. Returns per-event or batch results.",
+            inputSchema: OnEventsInputSchema,
+            outputSchema: OnEventsOutputSchema,
+            execute: async (input) => {
+              const env = input.runtimeContext.env;
+              // Get state from env - it should have the binding values
+              const state = env as z.infer<TSchema>;
+              return Event.execute(
+                events.handlers!,
+                input.context.events,
+                env,
+                state,
+              );
+            },
+          }),
+        ]
+      : []),
     createTool({
       id: "MCP_CONFIGURATION",
       description: "MCP Configuration",
@@ -302,7 +372,11 @@ const configurationToolsFor = <TSchema extends z.ZodTypeAny = never>({
       execute: () => {
         return Promise.resolve({
           stateSchema: jsonSchema,
-          scopes,
+          scopes: [
+            ...(scopes ?? []),
+            ...Event.scopes(events?.handlers ?? {}),
+            ...(busProp ? [`${busProp}::EVENT_SUBSCRIBE`] : []),
+          ],
         });
       },
     }),
@@ -353,7 +427,7 @@ export const createMCPServer = <
           };
     const tools = await toolsFn(bindings);
 
-    tools.push(...configurationToolsFor<TSchema>(options.configuration));
+    tools.push(...toolsFor<TSchema>(options));
 
     for (const tool of tools) {
       server.registerTool(