@open-mercato/events 0.4.11-develop.1966.1d166d19f6 → 0.4.11-develop.1968.48731d5ebc

package/AGENTS.md

@@ -85,6 +85,14 @@ packages/events/src/
 
 Workers in `modules/events/workers/` handle async event processing. Follow the standard worker contract: export default handler + `metadata` with `{ queue, id?, concurrency? }`.
 
+## Testing
+
+- Tests inside `packages/events` SHOULD import the public `@open-mercato/events/...` API when validating package behavior
+- `tenantId` and `organizationId` in subscriber context are trusted scope inputs from `emit(..., options)` or queued job `options`, not from arbitrary payload fields
+- Add regression tests for both paths:
+  - trusted scope is forwarded when explicitly provided
+  - payload-provided scope is ignored when trusted scope is omitted
+
 ## Cross-Reference
 
 - **Declaring events in a module**: `packages/core/AGENTS.md` → Events

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

@@ -29,14 +29,18 @@ function getListenerMap() {
   return cachedListenerMap;
 }
 async function handle(job, ctx) {
-  const { event, payload } = job.payload;
+  const { event, payload, options } = job.payload;
   const listeners = getListenerMap();
   const subscribers = listeners.get(event);
   if (!subscribers || subscribers.length === 0) return;
   const errors = [];
   for (const sub of subscribers) {
     try {
-      await sub.handler(payload, { resolve: ctx.resolve });
+      await sub.handler(payload, {
+        resolve: ctx.resolve,
+        tenantId: options?.tenantId ?? null,
+        organizationId: options?.organizationId ?? null
+      });
     } catch (error) {
       console.error(`[events] Subscriber "${sub.id}" failed for event "${event}":`, error);
       errors.push({ subscriberId: sub.id, error });

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'\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}\n\ntype HandlerContext = { resolve: <T = unknown>(name: string) => T }\n\ntype SubscriberEntry = {\n  id: string\n  event: string\n  handler: (payload: unknown, ctx: unknown) => Promise<void> | void\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 } = job.payload\n  const listeners = getListenerMap()\n  const subscribers = listeners.get(event)\n\n  if (!subscribers || subscribers.length === 0) return\n\n  const errors: Array<{ subscriberId: string; error: unknown }> = []\n\n  for (const sub of subscribers) {\n    try {\n      await sub.handler(payload, { resolve: ctx.resolve })\n    } catch (error) {\n      // Log error but continue processing other subscribers\n      console.error(`[events] Subscriber \"${sub.id}\" failed for event \"${event}\":`, error)\n      errors.push({ subscriberId: sub.id, error })\n    }\n  }\n\n  // If all subscribers failed, throw to trigger retry\n  if (errors.length === subscribers.length) {\n    throw new Error(`All ${errors.length} subscriber(s) failed for event \"${event}\"`)\n  }\n\n  // Log partial failures but don't fail the job\n  if (errors.length > 0) {\n    console.warn(`[events] ${errors.length}/${subscribers.length} subscriber(s) failed for event \"${event}\"`)\n  }\n}\n"],
-  "mappings": "AACA,SAAS,qBAAqB;AAEvB,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;AAgBA,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,QAAQ,IAAI,IAAI;AAC/B,QAAM,YAAY,eAAe;AACjC,QAAM,cAAc,UAAU,IAAI,KAAK;AAEvC,MAAI,CAAC,eAAe,YAAY,WAAW,EAAG;AAE9C,QAAM,SAA0D,CAAC;AAEjE,aAAW,OAAO,aAAa;AAC7B,QAAI;AACF,YAAM,IAAI,QAAQ,SAAS,EAAE,SAAS,IAAI,QAAQ,CAAC;AAAA,IACrD,SAAS,OAAO;AAEd,cAAQ,MAAM,wBAAwB,IAAI,EAAE,uBAAuB,KAAK,MAAM,KAAK;AACnF,aAAO,KAAK,EAAE,cAAc,IAAI,IAAI,MAAM,CAAC;AAAA,IAC7C;AAAA,EACF;AAGA,MAAI,OAAO,WAAW,YAAY,QAAQ;AACxC,UAAM,IAAI,MAAM,OAAO,OAAO,MAAM,oCAAoC,KAAK,GAAG;AAAA,EAClF;AAGA,MAAI,OAAO,SAAS,GAAG;AACrB,YAAQ,KAAK,YAAY,OAAO,MAAM,IAAI,YAAY,MAAM,oCAAoC,KAAK,GAAG;AAAA,EAC1G;AACF;",
+  "sourcesContent": ["import type { QueuedJob, JobContext, WorkerMeta } from '@open-mercato/queue'\nimport { getCliModules } from '@open-mercato/shared/modules/registry'\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  handler: (payload: unknown, ctx: unknown) => Promise<void> | void\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 = listeners.get(event)\n\n  if (!subscribers || subscribers.length === 0) return\n\n  const errors: Array<{ subscriberId: string; error: unknown }> = []\n\n  for (const sub of subscribers) {\n    try {\n      await sub.handler(payload, {\n        resolve: ctx.resolve,\n        tenantId: options?.tenantId ?? null,\n        organizationId: options?.organizationId ?? null,\n      })\n    } catch (error) {\n      // Log error but continue processing other subscribers\n      console.error(`[events] Subscriber \"${sub.id}\" failed for event \"${event}\":`, error)\n      errors.push({ subscriberId: sub.id, error })\n    }\n  }\n\n  // If all subscribers failed, throw to trigger retry\n  if (errors.length === subscribers.length) {\n    throw new Error(`All ${errors.length} subscriber(s) failed for event \"${event}\"`)\n  }\n\n  // Log partial failures but don't fail the job\n  if (errors.length > 0) {\n    console.warn(`[events] ${errors.length}/${subscribers.length} subscriber(s) failed for event \"${event}\"`)\n  }\n}\n"],
+  "mappings": "AACA,SAAS,qBAAqB;AAEvB,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;AAwBA,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,UAAU,IAAI,KAAK;AAEvC,MAAI,CAAC,eAAe,YAAY,WAAW,EAAG;AAE9C,QAAM,SAA0D,CAAC;AAEjE,aAAW,OAAO,aAAa;AAC7B,QAAI;AACF,YAAM,IAAI,QAAQ,SAAS;AAAA,QACzB,SAAS,IAAI;AAAA,QACb,UAAU,SAAS,YAAY;AAAA,QAC/B,gBAAgB,SAAS,kBAAkB;AAAA,MAC7C,CAAC;AAAA,IACH,SAAS,OAAO;AAEd,cAAQ,MAAM,wBAAwB,IAAI,EAAE,uBAAuB,KAAK,MAAM,KAAK;AACnF,aAAO,KAAK,EAAE,cAAc,IAAI,IAAI,MAAM,CAAC;AAAA,IAC7C;AAAA,EACF;AAGA,MAAI,OAAO,WAAW,YAAY,QAAQ;AACxC,UAAM,IAAI,MAAM,OAAO,OAAO,MAAM,oCAAoC,KAAK,GAAG;AAAA,EAClF;AAGA,MAAI,OAAO,SAAS,GAAG;AACrB,YAAQ,KAAK,YAAY,OAAO,MAAM,IAAI,YAAY,MAAM,oCAAoC,KAAK,GAAG;AAAA,EAC1G;AACF;",
   "names": []
 }

package/jest.config.cjs

@@ -5,6 +5,11 @@ module.exports = {
   watchman: false,
   rootDir: '.',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+  moduleNameMapper: {
+    '^@open-mercato/events/(.*)$': '<rootDir>/src/$1',
+    '^@open-mercato/shared/(.*)$': '<rootDir>/../shared/src/$1',
+    '^@open-mercato/queue/(.*)$': '<rootDir>/../queue/src/$1',
+  },
   transform: {
     '^.+\\.(t|j)sx?$': [
       'ts-jest',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/events",
-  "version": "0.4.11-develop.1966.1d166d19f6",
+  "version": "0.4.11-develop.1968.48731d5ebc",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -32,8 +32,8 @@
     }
   },
   "dependencies": {
-    "@open-mercato/queue": "0.4.11-develop.1966.1d166d19f6",
-    "@open-mercato/shared": "0.4.11-develop.1966.1d166d19f6",
+    "@open-mercato/queue": "0.4.11-develop.1968.48731d5ebc",
+    "@open-mercato/shared": "0.4.11-develop.1968.48731d5ebc",
     "pg": "8.20.0"
   },
   "devDependencies": {

package/src/__tests__/local.strategy.test.ts

@@ -42,6 +42,18 @@ describe('Event bus', () => {
     expect(calls).toEqual([{ tenantId: 'tenant-1', organizationId: 'org-1' }])
   })
 
+  test('does not trust payload scope when trusted scope is omitted', async () => {
+    const calls: Array<{ tenantId?: string | null; organizationId?: string | null }> = []
+    const bus = createEventBus({ resolve: ((name: string) => name) as any })
+    bus.on('demo', async (_payload, ctx) => {
+      calls.push({ tenantId: ctx.tenantId, organizationId: ctx.organizationId })
+    })
+
+    await bus.emit('demo', { a: 1, tenantId: 'tenant-from-payload', organizationId: 'org-from-payload' } as any)
+
+    expect(calls).toEqual([{ tenantId: null, organizationId: null }])
+  })
+
   test('emitEvent alias works for backward compatibility', async () => {
     const calls: any[] = []
     const bus = createEventBus({ resolve: ((name: string) => name) as any })

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

@@ -33,9 +33,13 @@ describe('Events Worker', () => {
   })
 
   describe('handle', () => {
-    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(),
     })
 
@@ -184,6 +188,66 @@ describe('Events Worker', () => {
       expect((capturedContext as { resolve: unknown }).resolve).toBeDefined()
     })
 
+    it('should pass trusted tenant and organization scope to subscriber context', async () => {
+      let capturedContext: { tenantId?: string | null; organizationId?: string | null } | null = null
+
+      const mockModule: Module = {
+        id: 'test-module',
+        subscribers: [
+          {
+            id: 'test:subscriber',
+            event: 'test.event',
+            handler: async (_payload: unknown, ctx: unknown) => {
+              const typed = ctx as { tenantId?: string | null; organizationId?: string | null }
+              capturedContext = {
+                tenantId: typed.tenantId,
+                organizationId: typed.organizationId,
+              }
+            },
+          },
+        ],
+      }
+
+      registerCliModules([mockModule])
+
+      const job = createMockJob('test.event', {}, { tenantId: 'tenant-1', organizationId: 'org-1' })
+      const ctx = createMockContext()
+
+      await handle(job, ctx)
+
+      expect(capturedContext).toEqual({ tenantId: 'tenant-1', organizationId: 'org-1' })
+    })
+
+    it('should not trust payload scope when trusted scope is omitted', async () => {
+      let capturedContext: { tenantId?: string | null; organizationId?: string | null } | null = null
+
+      const mockModule: Module = {
+        id: 'test-module',
+        subscribers: [
+          {
+            id: 'test:subscriber',
+            event: 'test.event',
+            handler: async (_payload: unknown, ctx: unknown) => {
+              const typed = ctx as { tenantId?: string | null; organizationId?: string | null }
+              capturedContext = {
+                tenantId: typed.tenantId,
+                organizationId: typed.organizationId,
+              }
+            },
+          },
+        ],
+      }
+
+      registerCliModules([mockModule])
+
+      const job = createMockJob('test.event', { tenantId: 'payload-tenant', organizationId: 'payload-org' })
+      const ctx = createMockContext()
+
+      await handle(job, ctx)
+
+      expect(capturedContext).toEqual({ tenantId: null, organizationId: null })
+    })
+
     it('should handle modules without subscribers', async () => {
       const mockModule: Module = {
         id: 'module-without-subscribers',

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

@@ -14,9 +14,17 @@ export const metadata: WorkerMeta = {
 type EventJobPayload = {
   event: string
   payload: unknown
+  options?: {
+    tenantId?: string | null
+    organizationId?: string | null
+  }
 }
 
-type HandlerContext = { resolve: <T = unknown>(name: string) => T }
+type HandlerContext = {
+  resolve: <T = unknown>(name: string) => T
+  tenantId?: string | null
+  organizationId?: string | null
+}
 
 type SubscriberEntry = {
   id: string
@@ -65,7 +73,7 @@ export default async function handle(
   job: QueuedJob<EventJobPayload>,
   ctx: JobContext & HandlerContext
 ): Promise<void> {
-  const { event, payload } = job.payload
+  const { event, payload, options } = job.payload
   const listeners = getListenerMap()
   const subscribers = listeners.get(event)
 
@@ -75,7 +83,11 @@ export default async function handle(
 
   for (const sub of subscribers) {
     try {
-      await sub.handler(payload, { resolve: ctx.resolve })
+      await sub.handler(payload, {
+        resolve: ctx.resolve,
+        tenantId: options?.tenantId ?? null,
+        organizationId: options?.organizationId ?? null,
+      })
     } catch (error) {
       // Log error but continue processing other subscribers
       console.error(`[events] Subscriber "${sub.id}" failed for event "${event}":`, error)