@celerity-sdk/core 0.4.0 → 0.6.0

package/dist/index.js

@@ -378,10 +378,10 @@ __name(EventType, "EventType");
 
 // src/decorators/consumer.ts
 import "reflect-metadata";
-function Consumer(sourceId) {
+function Consumer(source) {
   return (target) => {
     const meta = {};
-    if (sourceId !== void 0) meta.sourceId = sourceId;
+    if (source !== void 0) meta.source = source;
     Reflect.defineMetadata(CONSUMER_METADATA, meta, target);
     Reflect.defineMetadata(INJECTABLE_METADATA, true, target);
   };
@@ -440,11 +440,11 @@ function parseScheduleArg(arg) {
     return isScheduleExpression(arg) ? {
       schedule: arg
     } : {
-      scheduleId: arg
+      source: arg
     };
   }
   const meta = {};
-  if (arg.scheduleId !== void 0) meta.scheduleId = arg.scheduleId;
+  if (arg.source !== void 0) meta.source = arg.source;
   if (arg.schedule !== void 0) meta.schedule = arg.schedule;
   return meta;
 }
@@ -835,6 +835,10 @@ __name(runLayerPipeline, "runLayerPipeline");
 // src/layers/system.ts
 import { ConfigLayer, captureResourceLinks, getResourceTypes } from "@celerity-sdk/config";
 var RESOURCE_LAYER_MAP = {
+  datastore: {
+    pkg: "@celerity-sdk/datastore",
+    className: "DatastoreLayer"
+  },
   bucket: {
     pkg: "@celerity-sdk/bucket",
     className: "ObjectStorageLayer"
@@ -843,9 +847,17 @@ var RESOURCE_LAYER_MAP = {
     pkg: "@celerity-sdk/queue",
     className: "QueueLayer"
   },
+  topic: {
+    pkg: "@celerity-sdk/topic",
+    className: "TopicLayer"
+  },
   cache: {
     pkg: "@celerity-sdk/cache",
     className: "CacheLayer"
+  },
+  sqlDatabase: {
+    pkg: "@celerity-sdk/sql-database",
+    className: "SqlDatabaseLayer"
   }
 };
 async function createDefaultSystemLayers() {
@@ -1323,6 +1335,7 @@ __name(matchRoute, "matchRoute");
 // src/bootstrap/module-graph.ts
 import "reflect-metadata";
 import createDebug4 from "debug";
+import { isResourceLayerToken } from "@celerity-sdk/common";
 var debug4 = createDebug4("celerity:core:bootstrap");
 function buildModuleGraph(rootModule) {
   const graph = /* @__PURE__ */ new Map();
@@ -1351,7 +1364,8 @@ function buildModuleGraph(rootModule) {
         controllers: [],
         functionHandlers: [],
         guards: [],
-        providers: []
+        providers: [],
+        layers: []
       });
       return;
     }
@@ -1393,7 +1407,8 @@ function buildModuleGraph(rootModule) {
       controllers,
       functionHandlers: metadata.functionHandlers ?? [],
       guards,
-      providers
+      providers,
+      layers: metadata.layers ?? []
     });
   }
   __name(walk, "walk");
@@ -1511,6 +1526,7 @@ function checkDependencies(consumer, depTokens, visibleTokens, moduleClass, grap
       checkDependencies(dep, adoptedDeps, visibleTokens, moduleClass, graph, container, diagnostics);
       continue;
     }
+    if (isResourceLayerToken(dep)) continue;
     diagnostics.push({
       type: "missing_dependency",
       message: `${tokenToString(consumer)} in ${moduleClass.name} requires ${tokenToString(dep)} \u2014 no provider registered. Ensure the module providing it is included in your module's "imports" array, or register a provider for it directly.`
@@ -1536,10 +1552,10 @@ var debug5 = createDebug5("celerity:core:scanner:http");
 async function scanHttpHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler(controllerClass, container, registry);
+      await scanClassHandler(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler(fnHandler, registry);
+      scanFunctionHandler(fnHandler, registry, node.layers);
     }
   }
 }
@@ -1563,11 +1579,10 @@ async function scanModule(moduleClass, container, registry) {
   await scanHttpGuards(graph, container, registry);
 }
 __name(scanModule, "scanModule");
-async function scanClassHandler(controllerClass, container, registry) {
+async function scanClassHandler(controllerClass, container, registry, moduleLayers) {
   const controllerMeta = Reflect.getOwnMetadata(CONTROLLER_METADATA, controllerClass);
   if (!controllerMeta) return;
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classProtectedBy = Reflect.getOwnMetadata(GUARD_PROTECTEDBY_METADATA, controllerClass) ?? [];
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
@@ -1585,6 +1600,7 @@ async function scanClassHandler(controllerClass, container, registry) {
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1609,15 +1625,16 @@ async function scanClassHandler(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler, "scanClassHandler");
-function scanFunctionHandler(definition, registry) {
+function scanFunctionHandler(definition, registry, moduleLayers) {
   if (definition.type !== "http") return;
   const meta = definition.metadata;
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -1650,8 +1667,7 @@ __name(scanFunctionHandler, "scanFunctionHandler");
 async function scanClassGuard(guardClass, container, registry) {
   const guardName = Reflect.getOwnMetadata(GUARD_CUSTOM_METADATA, guardClass);
   if (!guardName) return;
-  const instance = await container.resolve(guardClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = guardClass.prototype;
   const descriptor = Object.getOwnPropertyDescriptor(prototype, "check");
   if (!descriptor?.value || typeof descriptor.value !== "function") {
     debug5("scanClassGuard: %s has no check() method, skipping", guardClass.name);
@@ -1663,7 +1679,7 @@ async function scanClassGuard(guardClass, container, registry) {
   registry.registerGuard({
     name: guardName,
     handlerFn: descriptor.value,
-    handlerInstance: instance,
+    guardClass,
     paramMetadata,
     customMetadata
   });
@@ -1755,19 +1771,18 @@ var debug6 = createDebug6("celerity:core:scanner:websocket");
 async function scanWebSocketHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler2(controllerClass, container, registry);
+      await scanClassHandler2(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler2(fnHandler, registry);
+      scanFunctionHandler2(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanWebSocketHandlers, "scanWebSocketHandlers");
-async function scanClassHandler2(controllerClass, container, registry) {
+async function scanClassHandler2(controllerClass, container, registry, moduleLayers) {
   const isWsController = Reflect.getOwnMetadata(WEBSOCKET_CONTROLLER_METADATA, controllerClass);
   if (!isWsController) return;
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classProtectedBy = Reflect.getOwnMetadata(GUARD_PROTECTEDBY_METADATA, controllerClass) ?? [];
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
@@ -1783,6 +1798,7 @@ async function scanClassHandler2(controllerClass, container, registry) {
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     debug6("scanClassHandler: %s %s (%s.%s)", eventMeta.eventType, eventMeta.route, controllerClass.name, methodName);
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1804,15 +1820,16 @@ async function scanClassHandler2(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler2, "scanClassHandler");
-function scanFunctionHandler2(definition, registry) {
+function scanFunctionHandler2(definition, registry, moduleLayers) {
   if (definition.type !== "websocket") return;
   const meta = definition.metadata;
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -1844,19 +1861,18 @@ var debug7 = createDebug7("celerity:core:scanner:consumer");
 async function scanConsumerHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler3(controllerClass, container, registry);
+      await scanClassHandler3(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler3(fnHandler, registry);
+      scanFunctionHandler3(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanConsumerHandlers, "scanConsumerHandlers");
-async function scanClassHandler3(controllerClass, container, registry) {
+async function scanClassHandler3(controllerClass, container, registry, moduleLayers) {
   const consumerMeta = Reflect.getOwnMetadata(CONSUMER_METADATA, controllerClass);
   if (!consumerMeta) return;
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
   const classCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, controllerClass) ?? {};
@@ -1868,8 +1884,9 @@ async function scanClassHandler3(controllerClass, container, registry) {
     const methodCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, prototype, methodName) ?? {};
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
-    const handlerTag = handlerMeta.route ?? methodName;
+    const handlerTag = consumerMeta.source ? `${consumerMeta.source}::${methodName}` : methodName;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1890,16 +1907,17 @@ async function scanClassHandler3(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler3, "scanClassHandler");
-function scanFunctionHandler3(definition, registry) {
+function scanFunctionHandler3(definition, registry, moduleLayers) {
   if (definition.type !== "consumer") return;
   const meta = definition.metadata;
-  const handlerTag = meta.route ?? definition.id ?? "default";
+  const handlerTag = definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.messageSchema) {
@@ -1929,17 +1947,16 @@ var debug8 = createDebug8("celerity:core:scanner:schedule");
 async function scanScheduleHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler4(controllerClass, container, registry);
+      await scanClassHandler4(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler4(fnHandler, registry);
+      scanFunctionHandler4(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanScheduleHandlers, "scanScheduleHandlers");
-async function scanClassHandler4(controllerClass, container, registry) {
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+async function scanClassHandler4(controllerClass, container, registry, moduleLayers) {
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
   const classCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, controllerClass) ?? {};
@@ -1951,8 +1968,9 @@ async function scanClassHandler4(controllerClass, container, registry) {
     const methodCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, prototype, methodName) ?? {};
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
-    const handlerTag = handlerMeta.scheduleId ?? methodName;
+    const handlerTag = handlerMeta.source ? `${handlerMeta.source}::${methodName}` : methodName;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -1974,21 +1992,22 @@ async function scanClassHandler4(controllerClass, container, registry) {
         ...handlerMeta.schedule ? {
           schedule: handlerMeta.schedule
         } : {},
-        ...handlerMeta.scheduleId ? {
-          scheduleId: handlerMeta.scheduleId
+        ...handlerMeta.source ? {
+          source: handlerMeta.source
         } : {}
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler4, "scanClassHandler");
-function scanFunctionHandler4(definition, registry) {
+function scanFunctionHandler4(definition, registry, moduleLayers) {
   if (definition.type !== "schedule") return;
   const meta = definition.metadata;
-  const handlerTag = meta.scheduleId ?? definition.id ?? "default";
+  const handlerTag = meta.source ?? definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -2000,7 +2019,7 @@ function scanFunctionHandler4(definition, registry) {
     ...meta.customMetadata ?? {}
   };
   if (meta.schedule) customMetadata.schedule = meta.schedule;
-  if (meta.scheduleId) customMetadata.scheduleId = meta.scheduleId;
+  if (meta.source) customMetadata.source = meta.source;
   debug8("scanFunctionHandler: tag=%s", handlerTag);
   registry.register({
     type: "schedule",
@@ -2023,17 +2042,16 @@ var debug9 = createDebug9("celerity:core:scanner:custom");
 async function scanCustomHandlers(graph, container, registry) {
   for (const [, node] of graph) {
     for (const controllerClass of node.controllers) {
-      await scanClassHandler5(controllerClass, container, registry);
+      await scanClassHandler5(controllerClass, container, registry, node.layers);
     }
     for (const fnHandler of node.functionHandlers) {
-      scanFunctionHandler5(fnHandler, registry);
+      scanFunctionHandler5(fnHandler, registry, node.layers);
     }
   }
 }
 __name(scanCustomHandlers, "scanCustomHandlers");
-async function scanClassHandler5(controllerClass, container, registry) {
-  const instance = await container.resolve(controllerClass);
-  const prototype = Object.getPrototypeOf(instance);
+async function scanClassHandler5(controllerClass, container, registry, moduleLayers) {
+  const prototype = controllerClass.prototype;
   const methods = Object.getOwnPropertyNames(prototype).filter((name) => name !== "constructor");
   const classLayers = Reflect.getOwnMetadata(LAYER_METADATA, controllerClass) ?? [];
   const classCustomMetadata = Reflect.getOwnMetadata(CUSTOM_METADATA, controllerClass) ?? {};
@@ -2046,6 +2064,7 @@ async function scanClassHandler5(controllerClass, container, registry) {
     const descriptor = Object.getOwnPropertyDescriptor(prototype, methodName);
     if (!descriptor?.value || typeof descriptor.value !== "function") continue;
     const layers = [
+      ...moduleLayers,
       ...classLayers,
       ...methodLayers
     ];
@@ -2066,16 +2085,17 @@ async function scanClassHandler5(controllerClass, container, registry) {
         ...methodCustomMetadata
       },
       handlerFn: descriptor.value,
-      handlerInstance: instance
+      controllerClass
     });
   }
 }
 __name(scanClassHandler5, "scanClassHandler");
-function scanFunctionHandler5(definition, registry) {
+function scanFunctionHandler5(definition, registry, moduleLayers) {
   if (definition.type !== "custom") return;
   const meta = definition.metadata;
   const name = meta.name ?? definition.id ?? "default";
   const layers = [
+    ...moduleLayers,
     ...meta.layers ?? []
   ];
   if (meta.schema) {
@@ -2272,6 +2292,28 @@ function buildHttpContext(request, metadata, container, logger) {
 }
 __name(buildHttpContext, "buildHttpContext");
 
+// src/handlers/types.ts
+async function resolveHandlerInstance(handler, container) {
+  if (handler.handlerInstance) return handler.handlerInstance;
+  if (!handler.controllerClass) {
+    throw new Error("Handler has no controllerClass for deferred resolution");
+  }
+  const instance = await container.resolve(handler.controllerClass);
+  handler.handlerInstance = instance;
+  return instance;
+}
+__name(resolveHandlerInstance, "resolveHandlerInstance");
+async function resolveGuardInstance(guard, container) {
+  if (guard.handlerInstance) return guard.handlerInstance;
+  if (!guard.guardClass) {
+    throw new Error("Guard has no guardClass for deferred resolution");
+  }
+  const instance = await container.resolve(guard.guardClass);
+  guard.handlerInstance = instance;
+  return instance;
+}
+__name(resolveGuardInstance, "resolveGuardInstance");
+
 // src/handlers/http-pipeline.ts
 var debug12 = createDebug12("celerity:core:pipeline");
 async function executeHttpPipeline(handler, request, options) {
@@ -2322,6 +2364,9 @@ async function executeHttpPipeline(handler, request, options) {
         error: message,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2347,7 +2392,8 @@ async function invokeClassHandler(handler, context) {
   for (const meta of sorted) {
     args[meta.index] = extractValidatedParam(meta.type, meta.key, context.request, context.metadata);
   }
-  return handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler, "invokeClassHandler");
 var VALIDATED_METADATA_KEYS = {
@@ -2446,6 +2492,9 @@ async function executeWebSocketPipeline(handler, message, options) {
         eventType: message.eventType,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2462,7 +2511,8 @@ async function invokeClassHandler2(handler, context) {
   for (const meta of sorted) {
     args[meta.index] = extractWebSocketParam(meta, context);
   }
-  await handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  await handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler2, "invokeClassHandler");
 async function invokeFunctionHandler2(handler, context) {
@@ -2560,6 +2610,9 @@ async function executeConsumerPipeline(handler, event, options) {
         messageCount: event.messages.length,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2581,7 +2634,8 @@ async function invokeClassHandler3(handler, context, validatedMessages, rawMessa
   for (const meta of sorted) {
     args[meta.index] = extractConsumerParam(meta, context, validatedMessages, rawMessages);
   }
-  return await handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return await handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler3, "invokeClassHandler");
 async function invokeFunctionHandler3(handler, context, validatedMessages, _rawMessages) {
@@ -2654,6 +2708,9 @@ async function executeSchedulePipeline(handler, event, options) {
         scheduleId: event.scheduleId,
         ...error instanceof Error && error.stack ? {
           stack: error.stack
+        } : {},
+        ...error instanceof Error && error.cause ? {
+          cause: String(error.cause)
         } : {}
       });
     } else {
@@ -2675,7 +2732,8 @@ async function invokeClassHandler4(handler, context, validatedInput) {
   for (const meta of sorted) {
     args[meta.index] = extractScheduleParam(meta, context, validatedInput);
   }
-  return await handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return await handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler4, "invokeClassHandler");
 async function invokeFunctionHandler4(handler, context, _validatedInput) {
@@ -2746,7 +2804,8 @@ async function invokeClassHandler5(handler, context, validatedPayload) {
   for (const meta of sorted) {
     args[meta.index] = extractCustomParam(meta, context, validatedPayload);
   }
-  return handler.handlerFn.apply(handler.handlerInstance, args);
+  const instance = await resolveHandlerInstance(handler, context.container);
+  return handler.handlerFn.apply(instance, args);
 }
 __name(invokeClassHandler5, "invokeClassHandler");
 async function invokeFunctionHandler5(handler, context, validatedPayload) {
@@ -3103,7 +3162,7 @@ function createScheduleHandler(configOrString, configOrHandler, maybeHandler) {
     if (isScheduleExpression2(configOrString)) {
       config.schedule = configOrString;
     } else {
-      config.scheduleId = configOrString;
+      config.source = configOrString;
     }
   } else {
     config = configOrString;
@@ -3114,7 +3173,7 @@ function createScheduleHandler(configOrString, configOrHandler, maybeHandler) {
     inject: config.inject ?? [],
     customMetadata: config.metadata ?? {}
   };
-  if (config.scheduleId !== void 0) metadata.scheduleId = config.scheduleId;
+  if (config.source !== void 0) metadata.source = config.source;
   if (config.schedule !== void 0) metadata.schedule = config.schedule;
   if (config.schema !== void 0) metadata.schema = config.schema;
   return {
@@ -3237,7 +3296,7 @@ function buildResolvedFromExport(handlerId, handlerType, handlerFn, fnDef) {
       return {
         ...base,
         type: "schedule",
-        handlerTag: meta?.scheduleId ?? handlerId
+        handlerTag: meta?.source ?? handlerId
       };
     case "custom":
       return {
@@ -3356,7 +3415,8 @@ async function invokeClassGuard(guard, input, metadata, options, logger) {
       args[i] = guardContext;
     }
   }
-  return guard.handlerFn.apply(guard.handlerInstance, args);
+  const instance = await resolveGuardInstance(guard, options.container);
+  return guard.handlerFn.apply(instance, args);
 }
 __name(invokeClassGuard, "invokeClassGuard");
 async function invokeFunctionGuard(guard, input, metadata, options, logger) {
@@ -3748,22 +3808,37 @@ __name(registerWebSocketHandlers, "registerWebSocketHandlers");
 async function registerConsumerHandlers(app, consumers, result) {
   for (const consumer of consumers?.consumers ?? []) {
     for (const def of consumer.handlers) {
-      const tag = `source::${consumer.sourceId}::${def.name}`;
-      const callback = result.createConsumerCallback(tag, def.name) ?? await result.createConsumerCallbackById(def.handler, def.location, def.name);
+      const methodName = def.handler.split(".").pop() ?? def.name;
+      const lookupKey = `${consumer.consumerName}::${methodName}`;
+      const callback = result.createConsumerCallback(lookupKey, def.name) ?? await result.createConsumerCallbackById(def.handler, def.location, def.name);
       if (callback) {
-        app.registerConsumerHandler(tag, def.timeout, callback);
+        app.registerConsumerHandler(def.name, def.timeout, callback);
       }
     }
   }
 }
 __name(registerConsumerHandlers, "registerConsumerHandlers");
+async function registerEventHandlers(app, events, result) {
+  for (const event of events?.events ?? []) {
+    for (const def of event.handlers) {
+      const methodName = def.handler.split(".").pop() ?? def.name;
+      const lookupKey = `${event.consumerName}::${methodName}`;
+      const callback = result.createConsumerCallback(lookupKey, def.name) ?? await result.createConsumerCallbackById(def.handler, def.location, def.name);
+      if (callback) {
+        app.registerConsumerHandler(def.name, def.timeout, callback);
+      }
+    }
+  }
+}
+__name(registerEventHandlers, "registerEventHandlers");
 async function registerScheduleHandlers(app, schedules, result) {
   for (const schedule of schedules?.schedules ?? []) {
     for (const def of schedule.handlers) {
-      const tag = `source::${schedule.scheduleId}::${def.name}`;
-      const callback = result.createScheduleCallback(tag, def.name) ?? await result.createScheduleCallbackById(def.handler, def.location, def.name);
+      const methodName = def.handler.split(".").pop() ?? def.name;
+      const lookupKey = `${schedule.scheduleId}::${methodName}`;
+      const callback = result.createScheduleCallback(lookupKey, def.name) ?? await result.createScheduleCallbackById(def.handler, def.location, def.name);
       if (callback) {
-        app.registerScheduleHandler(tag, def.timeout, callback);
+        app.registerScheduleHandler(def.name, def.timeout, callback);
       }
     }
   }
@@ -3785,6 +3860,7 @@ async function startRuntime(options) {
   await registerGuardHandlers(app, appConfig.api?.guards, result);
   await registerWebSocketHandlers(app, appConfig.api?.websocket, result);
   await registerConsumerHandlers(app, appConfig.consumers, result);
+  await registerEventHandlers(app, appConfig.events, result);
   await registerScheduleHandlers(app, appConfig.schedules, result);
   await registerCustomHandlers(app, appConfig.customHandlers, result);
   if (appConfig.api?.websocket) {