@open-mercato/events 0.6.6-develop.6365.1.641d695f07 → 0.6.6-develop.6366.1.fba69a7362

package/dist/modules/events/workers/events.worker.js

@@ -53,6 +53,7 @@ async function handle(job, ctx) {
   if (!subscribers || subscribers.length === 0) return;
   const handlerCtx = {
     resolve: ctx.resolve,
+    eventName: event,
     tenantId: options?.tenantId ?? null,
     organizationId: options?.organizationId ?? null
   };

package/dist/modules/events/workers/events.worker.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/events/workers/events.worker.ts"],
-  "sourcesContent": ["import type { QueuedJob, JobContext, WorkerMeta } from '@open-mercato/queue'\nimport { getCliModules } from '@open-mercato/shared/modules/registry'\nimport { matchEventPattern } from '@open-mercato/shared/lib/events/patterns'\nimport { isSingleDeliveryRequested } from '../../../single-delivery'\n\nexport const EVENTS_QUEUE_NAME = 'events'\n\nconst DEFAULT_CONCURRENCY = 1\nconst envConcurrency = process.env.WORKERS_EVENTS_CONCURRENCY\n\nexport const metadata: WorkerMeta = {\n  queue: EVENTS_QUEUE_NAME,\n  concurrency: envConcurrency ? parseInt(envConcurrency, 10) : DEFAULT_CONCURRENCY,\n}\n\ntype EventJobPayload = {\n  event: string\n  payload: unknown\n  options?: {\n    tenantId?: string | null\n    organizationId?: string | null\n  }\n}\n\ntype HandlerContext = {\n  resolve: <T = unknown>(name: string) => T\n  tenantId?: string | null\n  organizationId?: string | null\n}\n\ntype SubscriberEntry = {\n  id: string\n  event: string\n  persistent?: boolean\n  handler: (payload: unknown, ctx: unknown) => Promise<void> | void\n}\n\n/**\n * Mirror of the event bus single-delivery flag. When enabled, the worker owns\n * dispatch of every persistent subscriber and matches by pattern so wildcard\n * (`event: '*'`) persistent subscribers are finally reached. Defaults ON;\n * reconciled by the server bootstrap against worker availability and read from\n * the same env var as the bus so the two always agree within a process.\n */\nfunction isSingleDeliveryEnabled(): boolean {\n  return isSingleDeliveryRequested()\n}\n\n/**\n * Resolves the subscribers to run for a queued event.\n * - Legacy (flag off): exact-match lookup of every subscriber for the event.\n * - Single-delivery (flag on): persistent subscribers whose pattern matches the\n *   event, including wildcards, so they run exactly once here instead of inline.\n */\nfunction resolveSubscribers(\n  listeners: Map<string, SubscriberEntry[]>,\n  event: string,\n): SubscriberEntry[] {\n  if (!isSingleDeliveryEnabled()) {\n    return listeners.get(event) ?? []\n  }\n  const matched: SubscriberEntry[] = []\n  for (const [pattern, subs] of listeners) {\n    if (!matchEventPattern(event, pattern)) continue\n    for (const sub of subs) {\n      if (sub.persistent) matched.push(sub)\n    }\n  }\n  return matched\n}\n\n// Cached listener map - built once on first use\nlet cachedListenerMap: Map<string, SubscriberEntry[]> | null = null\n\n/**\n * Clear the cached listener map (for testing purposes).\n */\nexport function clearListenerCache(): void {\n  cachedListenerMap = null\n}\n\n// Build listener map from module subscribers\nfunction buildListenerMap(): Map<string, SubscriberEntry[]> {\n  const listeners = new Map<string, SubscriberEntry[]>()\n  for (const mod of getCliModules()) {\n    const subs = (mod as { subscribers?: SubscriberEntry[] }).subscribers\n    if (!subs) continue\n    for (const sub of subs) {\n      if (!listeners.has(sub.event)) listeners.set(sub.event, [])\n      listeners.get(sub.event)!.push(sub)\n    }\n  }\n  return listeners\n}\n\n// Get cached listener map, building on first access\nfunction getListenerMap(): Map<string, SubscriberEntry[]> {\n  if (!cachedListenerMap) {\n    cachedListenerMap = buildListenerMap()\n  }\n  return cachedListenerMap\n}\n\n/**\n * Events worker handler.\n * Dispatches queued events to registered module subscribers.\n * Each subscriber is isolated - failures in one don't affect others.\n */\nexport default async function handle(\n  job: QueuedJob<EventJobPayload>,\n  ctx: JobContext & HandlerContext\n): Promise<void> {\n  const { event, payload, options } = job.payload\n  const listeners = getListenerMap()\n  const subscribers = resolveSubscribers(listeners, event)\n\n  if (!subscribers || subscribers.length === 0) return\n\n  const handlerCtx = {\n    resolve: ctx.resolve,\n    tenantId: options?.tenantId ?? null,\n    organizationId: options?.organizationId ?? null,\n  }\n\n  const results = await Promise.allSettled(\n    subscribers.map((sub) => Promise.resolve(sub.handler(payload, handlerCtx)))\n  )\n\n  const errors: Array<{ subscriberId: string; error: unknown }> = []\n  for (let i = 0; i < results.length; i++) {\n    const result = results[i]\n    if (result.status === 'rejected') {\n      const sub = subscribers[i]\n      console.error(`[events] Subscriber \"${sub.id}\" failed for event \"${event}\":`, result.reason)\n      errors.push({ subscriberId: sub.id, error: result.reason })\n    }\n  }\n\n  if (errors.length > 0) {\n    const failedIds = errors.map((e) => e.subscriberId).join(', ')\n    throw new Error(\n      `${errors.length}/${subscribers.length} subscriber(s) failed for event \"${event}\": ${failedIds}`\n    )\n  }\n}\n"],
-  "mappings": "AACA,SAAS,qBAAqB;AAC9B,SAAS,yBAAyB;AAClC,SAAS,iCAAiC;AAEnC,MAAM,oBAAoB;AAEjC,MAAM,sBAAsB;AAC5B,MAAM,iBAAiB,QAAQ,IAAI;AAE5B,MAAM,WAAuB;AAAA,EAClC,OAAO;AAAA,EACP,aAAa,iBAAiB,SAAS,gBAAgB,EAAE,IAAI;AAC/D;AA+BA,SAAS,0BAAmC;AAC1C,SAAO,0BAA0B;AACnC;AAQA,SAAS,mBACP,WACA,OACmB;AACnB,MAAI,CAAC,wBAAwB,GAAG;AAC9B,WAAO,UAAU,IAAI,KAAK,KAAK,CAAC;AAAA,EAClC;AACA,QAAM,UAA6B,CAAC;AACpC,aAAW,CAAC,SAAS,IAAI,KAAK,WAAW;AACvC,QAAI,CAAC,kBAAkB,OAAO,OAAO,EAAG;AACxC,eAAW,OAAO,MAAM;AACtB,UAAI,IAAI,WAAY,SAAQ,KAAK,GAAG;AAAA,IACtC;AAAA,EACF;AACA,SAAO;AACT;AAGA,IAAI,oBAA2D;AAKxD,SAAS,qBAA2B;AACzC,sBAAoB;AACtB;AAGA,SAAS,mBAAmD;AAC1D,QAAM,YAAY,oBAAI,IAA+B;AACrD,aAAW,OAAO,cAAc,GAAG;AACjC,UAAM,OAAQ,IAA4C;AAC1D,QAAI,CAAC,KAAM;AACX,eAAW,OAAO,MAAM;AACtB,UAAI,CAAC,UAAU,IAAI,IAAI,KAAK,EAAG,WAAU,IAAI,IAAI,OAAO,CAAC,CAAC;AAC1D,gBAAU,IAAI,IAAI,KAAK,EAAG,KAAK,GAAG;AAAA,IACpC;AAAA,EACF;AACA,SAAO;AACT;AAGA,SAAS,iBAAiD;AACxD,MAAI,CAAC,mBAAmB;AACtB,wBAAoB,iBAAiB;AAAA,EACvC;AACA,SAAO;AACT;AAOA,eAAO,OACL,KACA,KACe;AACf,QAAM,EAAE,OAAO,SAAS,QAAQ,IAAI,IAAI;AACxC,QAAM,YAAY,eAAe;AACjC,QAAM,cAAc,mBAAmB,WAAW,KAAK;AAEvD,MAAI,CAAC,eAAe,YAAY,WAAW,EAAG;AAE9C,QAAM,aAAa;AAAA,IACjB,SAAS,IAAI;AAAA,IACb,UAAU,SAAS,YAAY;AAAA,IAC/B,gBAAgB,SAAS,kBAAkB;AAAA,EAC7C;AAEA,QAAM,UAAU,MAAM,QAAQ;AAAA,IAC5B,YAAY,IAAI,CAAC,QAAQ,QAAQ,QAAQ,IAAI,QAAQ,SAAS,UAAU,CAAC,CAAC;AAAA,EAC5E;AAEA,QAAM,SAA0D,CAAC;AACjE,WAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACvC,UAAM,SAAS,QAAQ,CAAC;AACxB,QAAI,OAAO,WAAW,YAAY;AAChC,YAAM,MAAM,YAAY,CAAC;AACzB,cAAQ,MAAM,wBAAwB,IAAI,EAAE,uBAAuB,KAAK,MAAM,OAAO,MAAM;AAC3F,aAAO,KAAK,EAAE,cAAc,IAAI,IAAI,OAAO,OAAO,OAAO,CAAC;AAAA,IAC5D;AAAA,EACF;AAEA,MAAI,OAAO,SAAS,GAAG;AACrB,UAAM,YAAY,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,IAAI;AAC7D,UAAM,IAAI;AAAA,MACR,GAAG,OAAO,MAAM,IAAI,YAAY,MAAM,oCAAoC,KAAK,MAAM,SAAS;AAAA,IAChG;AAAA,EACF;AACF;",
+  "sourcesContent": ["import type { QueuedJob, JobContext, WorkerMeta } from '@open-mercato/queue'\nimport { getCliModules } from '@open-mercato/shared/modules/registry'\nimport { matchEventPattern } from '@open-mercato/shared/lib/events/patterns'\nimport { isSingleDeliveryRequested } from '../../../single-delivery'\n\nexport const EVENTS_QUEUE_NAME = 'events'\n\nconst DEFAULT_CONCURRENCY = 1\nconst envConcurrency = process.env.WORKERS_EVENTS_CONCURRENCY\n\nexport const metadata: WorkerMeta = {\n  queue: EVENTS_QUEUE_NAME,\n  concurrency: envConcurrency ? parseInt(envConcurrency, 10) : DEFAULT_CONCURRENCY,\n}\n\ntype EventJobPayload = {\n  event: string\n  payload: unknown\n  options?: {\n    tenantId?: string | null\n    organizationId?: string | null\n  }\n}\n\ntype HandlerContext = {\n  resolve: <T = unknown>(name: string) => T\n  eventName?: string\n  tenantId?: string | null\n  organizationId?: string | null\n}\n\ntype SubscriberEntry = {\n  id: string\n  event: string\n  persistent?: boolean\n  handler: (payload: unknown, ctx: unknown) => Promise<void> | void\n}\n\n/**\n * Mirror of the event bus single-delivery flag. When enabled, the worker owns\n * dispatch of every persistent subscriber and matches by pattern so wildcard\n * (`event: '*'`) persistent subscribers are finally reached. Defaults ON;\n * reconciled by the server bootstrap against worker availability and read from\n * the same env var as the bus so the two always agree within a process.\n */\nfunction isSingleDeliveryEnabled(): boolean {\n  return isSingleDeliveryRequested()\n}\n\n/**\n * Resolves the subscribers to run for a queued event.\n * - Legacy (flag off): exact-match lookup of every subscriber for the event.\n * - Single-delivery (flag on): persistent subscribers whose pattern matches the\n *   event, including wildcards, so they run exactly once here instead of inline.\n */\nfunction resolveSubscribers(\n  listeners: Map<string, SubscriberEntry[]>,\n  event: string,\n): SubscriberEntry[] {\n  if (!isSingleDeliveryEnabled()) {\n    return listeners.get(event) ?? []\n  }\n  const matched: SubscriberEntry[] = []\n  for (const [pattern, subs] of listeners) {\n    if (!matchEventPattern(event, pattern)) continue\n    for (const sub of subs) {\n      if (sub.persistent) matched.push(sub)\n    }\n  }\n  return matched\n}\n\n// Cached listener map - built once on first use\nlet cachedListenerMap: Map<string, SubscriberEntry[]> | null = null\n\n/**\n * Clear the cached listener map (for testing purposes).\n */\nexport function clearListenerCache(): void {\n  cachedListenerMap = null\n}\n\n// Build listener map from module subscribers\nfunction buildListenerMap(): Map<string, SubscriberEntry[]> {\n  const listeners = new Map<string, SubscriberEntry[]>()\n  for (const mod of getCliModules()) {\n    const subs = (mod as { subscribers?: SubscriberEntry[] }).subscribers\n    if (!subs) continue\n    for (const sub of subs) {\n      if (!listeners.has(sub.event)) listeners.set(sub.event, [])\n      listeners.get(sub.event)!.push(sub)\n    }\n  }\n  return listeners\n}\n\n// Get cached listener map, building on first access\nfunction getListenerMap(): Map<string, SubscriberEntry[]> {\n  if (!cachedListenerMap) {\n    cachedListenerMap = buildListenerMap()\n  }\n  return cachedListenerMap\n}\n\n/**\n * Events worker handler.\n * Dispatches queued events to registered module subscribers.\n * Each subscriber is isolated - failures in one don't affect others.\n */\nexport default async function handle(\n  job: QueuedJob<EventJobPayload>,\n  ctx: JobContext & HandlerContext\n): Promise<void> {\n  const { event, payload, options } = job.payload\n  const listeners = getListenerMap()\n  const subscribers = resolveSubscribers(listeners, event)\n\n  if (!subscribers || subscribers.length === 0) return\n\n  const handlerCtx = {\n    resolve: ctx.resolve,\n    eventName: event,\n    tenantId: options?.tenantId ?? null,\n    organizationId: options?.organizationId ?? null,\n  }\n\n  const results = await Promise.allSettled(\n    subscribers.map((sub) => Promise.resolve(sub.handler(payload, handlerCtx)))\n  )\n\n  const errors: Array<{ subscriberId: string; error: unknown }> = []\n  for (let i = 0; i < results.length; i++) {\n    const result = results[i]\n    if (result.status === 'rejected') {\n      const sub = subscribers[i]\n      console.error(`[events] Subscriber \"${sub.id}\" failed for event \"${event}\":`, result.reason)\n      errors.push({ subscriberId: sub.id, error: result.reason })\n    }\n  }\n\n  if (errors.length > 0) {\n    const failedIds = errors.map((e) => e.subscriberId).join(', ')\n    throw new Error(\n      `${errors.length}/${subscribers.length} subscriber(s) failed for event \"${event}\": ${failedIds}`\n    )\n  }\n}\n"],
+  "mappings": "AACA,SAAS,qBAAqB;AAC9B,SAAS,yBAAyB;AAClC,SAAS,iCAAiC;AAEnC,MAAM,oBAAoB;AAEjC,MAAM,sBAAsB;AAC5B,MAAM,iBAAiB,QAAQ,IAAI;AAE5B,MAAM,WAAuB;AAAA,EAClC,OAAO;AAAA,EACP,aAAa,iBAAiB,SAAS,gBAAgB,EAAE,IAAI;AAC/D;AAgCA,SAAS,0BAAmC;AAC1C,SAAO,0BAA0B;AACnC;AAQA,SAAS,mBACP,WACA,OACmB;AACnB,MAAI,CAAC,wBAAwB,GAAG;AAC9B,WAAO,UAAU,IAAI,KAAK,KAAK,CAAC;AAAA,EAClC;AACA,QAAM,UAA6B,CAAC;AACpC,aAAW,CAAC,SAAS,IAAI,KAAK,WAAW;AACvC,QAAI,CAAC,kBAAkB,OAAO,OAAO,EAAG;AACxC,eAAW,OAAO,MAAM;AACtB,UAAI,IAAI,WAAY,SAAQ,KAAK,GAAG;AAAA,IACtC;AAAA,EACF;AACA,SAAO;AACT;AAGA,IAAI,oBAA2D;AAKxD,SAAS,qBAA2B;AACzC,sBAAoB;AACtB;AAGA,SAAS,mBAAmD;AAC1D,QAAM,YAAY,oBAAI,IAA+B;AACrD,aAAW,OAAO,cAAc,GAAG;AACjC,UAAM,OAAQ,IAA4C;AAC1D,QAAI,CAAC,KAAM;AACX,eAAW,OAAO,MAAM;AACtB,UAAI,CAAC,UAAU,IAAI,IAAI,KAAK,EAAG,WAAU,IAAI,IAAI,OAAO,CAAC,CAAC;AAC1D,gBAAU,IAAI,IAAI,KAAK,EAAG,KAAK,GAAG;AAAA,IACpC;AAAA,EACF;AACA,SAAO;AACT;AAGA,SAAS,iBAAiD;AACxD,MAAI,CAAC,mBAAmB;AACtB,wBAAoB,iBAAiB;AAAA,EACvC;AACA,SAAO;AACT;AAOA,eAAO,OACL,KACA,KACe;AACf,QAAM,EAAE,OAAO,SAAS,QAAQ,IAAI,IAAI;AACxC,QAAM,YAAY,eAAe;AACjC,QAAM,cAAc,mBAAmB,WAAW,KAAK;AAEvD,MAAI,CAAC,eAAe,YAAY,WAAW,EAAG;AAE9C,QAAM,aAAa;AAAA,IACjB,SAAS,IAAI;AAAA,IACb,WAAW;AAAA,IACX,UAAU,SAAS,YAAY;AAAA,IAC/B,gBAAgB,SAAS,kBAAkB;AAAA,EAC7C;AAEA,QAAM,UAAU,MAAM,QAAQ;AAAA,IAC5B,YAAY,IAAI,CAAC,QAAQ,QAAQ,QAAQ,IAAI,QAAQ,SAAS,UAAU,CAAC,CAAC;AAAA,EAC5E;AAEA,QAAM,SAA0D,CAAC;AACjE,WAAS,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACvC,UAAM,SAAS,QAAQ,CAAC;AACxB,QAAI,OAAO,WAAW,YAAY;AAChC,YAAM,MAAM,YAAY,CAAC;AACzB,cAAQ,MAAM,wBAAwB,IAAI,EAAE,uBAAuB,KAAK,MAAM,OAAO,MAAM;AAC3F,aAAO,KAAK,EAAE,cAAc,IAAI,IAAI,OAAO,OAAO,OAAO,CAAC;AAAA,IAC5D;AAAA,EACF;AAEA,MAAI,OAAO,SAAS,GAAG;AACrB,UAAM,YAAY,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,IAAI;AAC7D,UAAM,IAAI;AAAA,MACR,GAAG,OAAO,MAAM,IAAI,YAAY,MAAM,oCAAoC,KAAK,MAAM,SAAS;AAAA,IAChG;AAAA,EACF;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/events",
-  "version": "0.6.6-develop.6365.1.641d695f07",
+  "version": "0.6.6-develop.6366.1.fba69a7362",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,8 +33,8 @@
     }
   },
   "dependencies": {
-    "@open-mercato/queue": "0.6.6-develop.6365.1.641d695f07",
-    "@open-mercato/shared": "0.6.6-develop.6365.1.641d695f07",
+    "@open-mercato/queue": "0.6.6-develop.6366.1.fba69a7362",
+    "@open-mercato/shared": "0.6.6-develop.6366.1.fba69a7362",
     "pg": "8.22.0"
   },
   "devDependencies": {

package/src/modules/events/workers/__tests__/events.worker.test.ts

@@ -453,9 +453,17 @@ describe('Events Worker', () => {
       else process.env.OM_EVENTS_SINGLE_DELIVERY = origFlag
     })
 
-    const createMockJob = (event: string, payload: unknown): QueuedJob<{ event: string; payload: unknown }> => ({
+    const createMockJob = (
+      event: string,
+      payload: unknown,
+      options?: { tenantId?: string | null; organizationId?: string | null },
+    ): QueuedJob<{
+      event: string
+      payload: unknown
+      options?: { tenantId?: string | null; organizationId?: string | null }
+    }> => ({
       id: 'test-job-id',
-      payload: { event, payload },
+      payload: { event, payload, options },
       createdAt: new Date().toISOString(),
     })
 
@@ -518,6 +526,48 @@ describe('Events Worker', () => {
       expect(calls.sort()).toEqual(['p', 'w'])
     })
 
+    it('default (unset): forwards eventName and trusted scope to persistent wildcard subscribers', async () => {
+      delete process.env.OM_EVENTS_SINGLE_DELIVERY
+      clearListenerCache()
+      const contexts: Array<{
+        eventName?: string
+        tenantId?: string | null
+        organizationId?: string | null
+      }> = []
+      registerCliModules([{
+        id: 'm',
+        subscribers: [
+          {
+            id: 'workflow:event-trigger',
+            event: '*',
+            persistent: true,
+            handler: (_payload, ctx) => {
+              contexts.push({
+                eventName: ctx.eventName,
+                tenantId: ctx.tenantId,
+                organizationId: ctx.organizationId,
+              })
+            },
+          },
+        ],
+      }])
+
+      await handle(
+        createMockJob(
+          'customers.deal.created',
+          { id: 'deal-1', tenantId: 'payload-tenant', organizationId: 'payload-org' },
+          { tenantId: 'trusted-tenant', organizationId: 'trusted-org' },
+        ),
+        createMockContext(),
+      )
+
+      expect(contexts).toEqual([{
+        eventName: 'customers.deal.created',
+        tenantId: 'trusted-tenant',
+        organizationId: 'trusted-org',
+      }])
+    })
+
     it('flag explicitly OFF (legacy opt-out): preserves exact-match dispatch and never reaches wildcards', async () => {
       process.env.OM_EVENTS_SINGLE_DELIVERY = 'false'
       clearListenerCache()

package/src/modules/events/workers/events.worker.ts

@@ -24,6 +24,7 @@ type EventJobPayload = {
 
 type HandlerContext = {
   resolve: <T = unknown>(name: string) => T
+  eventName?: string
   tenantId?: string | null
   organizationId?: string | null
 }
@@ -118,6 +119,7 @@ export default async function handle(
 
   const handlerCtx = {
     resolve: ctx.resolve,
+    eventName: event,
     tenantId: options?.tenantId ?? null,
     organizationId: options?.organizationId ?? null,
   }