@auriclabs/events 0.2.0 → 0.4.0

package/dist/stream-handler.entry.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-handler.entry.d.mts","names":[],"sources":["../src/stream-handler.entry.ts"],"mappings":";;;cAEa,OAAA,GAAO,KAAA,EAGlB,mBAAA,KAHkB,OAAA"}

package/dist/stream-handler.entry.mjs

@@ -0,0 +1,10 @@
+import { t as createStreamHandler } from "./stream-handler.mjs";
+//#region src/stream-handler.entry.ts
+const handler = createStreamHandler({
+	busName: process.env.EVENT_BUS_NAME,
+	queueUrls: JSON.parse(process.env.QUEUE_URL_LIST ?? "[]")
+});
+//#endregion
+export { handler };
+
+//# sourceMappingURL=stream-handler.entry.mjs.map

package/dist/stream-handler.entry.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-handler.entry.mjs","names":[],"sources":["../src/stream-handler.entry.ts"],"sourcesContent":["import { createStreamHandler } from './stream-handler';\n\nexport const handler = createStreamHandler({\n  busName: process.env.EVENT_BUS_NAME,\n  queueUrls: JSON.parse(process.env.QUEUE_URL_LIST ?? '[]') as string[],\n});\n"],"mappings":";;AAEA,MAAa,UAAU,oBAAoB;CACzC,SAAS,QAAQ,IAAI;CACrB,WAAW,KAAK,MAAM,QAAQ,IAAI,kBAAkB,KAAK;CAC1D,CAAC"}

package/dist/stream-handler.mjs

@@ -0,0 +1,88 @@
+import { logger } from "@auriclabs/logger";
+import { EventBridgeClient, PutEventsCommand } from "@aws-sdk/client-eventbridge";
+import { SQSClient, SendMessageBatchCommand } from "@aws-sdk/client-sqs";
+import { unmarshall } from "@aws-sdk/util-dynamodb";
+import { kebabCase } from "lodash-es";
+//#region src/stream-handler.ts
+const BATCH_SIZE = 10;
+/**
+* Creates a Lambda handler for DynamoDB stream events.
+* Processes INSERT events from the event store table and forwards them to SQS queues and EventBridge.
+*/
+function createStreamHandler(config) {
+	const sqsClient = new SQSClient();
+	const eventBridge = new EventBridgeClient({});
+	function chunkArray(array, chunkSize) {
+		const chunks = [];
+		for (let i = 0; i < array.length; i += chunkSize) chunks.push(array.slice(i, i + chunkSize));
+		return chunks;
+	}
+	async function sendToQueuesBatch(eventRecords) {
+		await Promise.all(config.queueUrls.map((queue) => sendToQueueBatch(eventRecords, queue)));
+	}
+	async function sendToQueueBatch(eventRecords, queue) {
+		const batches = chunkArray(eventRecords, BATCH_SIZE);
+		for (const batch of batches) try {
+			const entries = batch.map((eventRecord, index) => ({
+				Id: `${eventRecord.eventId}-${index}`,
+				MessageBody: JSON.stringify(eventRecord),
+				MessageGroupId: eventRecord.aggregateId,
+				MessageDeduplicationId: eventRecord.eventId
+			}));
+			await sqsClient.send(new SendMessageBatchCommand({
+				QueueUrl: queue,
+				Entries: entries
+			}));
+		} catch (error) {
+			logger.error({
+				error,
+				batch,
+				queue
+			}, "Error sending batch to queue");
+			throw error;
+		}
+	}
+	async function sendToBusBatch(eventRecords) {
+		const batches = chunkArray(eventRecords, BATCH_SIZE);
+		for (const batch of batches) try {
+			const entries = batch.map((eventRecord) => {
+				return {
+					Source: eventRecord.source ?? kebabCase(eventRecord.aggregateType.split(".")[0]),
+					DetailType: eventRecord.eventType,
+					Detail: JSON.stringify(eventRecord),
+					EventBusName: config.busName
+				};
+			});
+			await eventBridge.send(new PutEventsCommand({ Entries: entries }));
+		} catch (error) {
+			logger.error({
+				error,
+				batch
+			}, "Error sending batch to bus");
+			throw error;
+		}
+	}
+	return async (event) => {
+		const eventRecords = event.Records.filter((record) => record.eventName === "INSERT").map((record) => {
+			try {
+				const data = record.dynamodb?.NewImage;
+				return unmarshall(data);
+			} catch (error) {
+				logger.error({
+					error,
+					record
+				}, "Error unmarshalling event record");
+				return;
+			}
+		}).filter((eventRecord) => eventRecord?.itemType === "event");
+		if (eventRecords.length > 0) {
+			const tasks = [sendToQueuesBatch(eventRecords)];
+			if (config.busName) tasks.push(sendToBusBatch(eventRecords));
+			await Promise.all(tasks);
+		}
+	};
+}
+//#endregion
+export { createStreamHandler as t };
+
+//# sourceMappingURL=stream-handler.mjs.map

package/dist/stream-handler.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-handler.mjs","names":[],"sources":["../src/stream-handler.ts"],"sourcesContent":["import { logger } from '@auriclabs/logger';\nimport { AttributeValue } from '@aws-sdk/client-dynamodb';\nimport { EventBridgeClient, PutEventsCommand } from '@aws-sdk/client-eventbridge';\nimport { SendMessageBatchCommand, SQSClient } from '@aws-sdk/client-sqs';\nimport { unmarshall } from '@aws-sdk/util-dynamodb';\nimport { DynamoDBStreamEvent } from 'aws-lambda';\nimport { kebabCase } from 'lodash-es';\n\nimport { AggregateHead, EventRecord } from './types';\n\nconst BATCH_SIZE = 10;\n\nexport interface CreateStreamHandlerConfig {\n  busName?: string;\n  queueUrls: string[];\n}\n\n/**\n * Creates a Lambda handler for DynamoDB stream events.\n * Processes INSERT events from the event store table and forwards them to SQS queues and EventBridge.\n */\nexport function createStreamHandler(config: CreateStreamHandlerConfig) {\n  const sqsClient = new SQSClient();\n  const eventBridge = new EventBridgeClient({});\n\n  function chunkArray<T>(array: T[], chunkSize: number): T[][] {\n    const chunks: T[][] = [];\n    for (let i = 0; i < array.length; i += chunkSize) {\n      chunks.push(array.slice(i, i + chunkSize));\n    }\n    return chunks;\n  }\n\n  async function sendToQueuesBatch(eventRecords: EventRecord[]) {\n    await Promise.all(config.queueUrls.map((queue) => sendToQueueBatch(eventRecords, queue)));\n  }\n\n  async function sendToQueueBatch(eventRecords: EventRecord[], queue: string) {\n    const batches = chunkArray(eventRecords, BATCH_SIZE);\n\n    for (const batch of batches) {\n      try {\n        const entries = batch.map((eventRecord, index) => ({\n          Id: `${eventRecord.eventId}-${index}`,\n          MessageBody: JSON.stringify(eventRecord),\n          MessageGroupId: eventRecord.aggregateId,\n          MessageDeduplicationId: eventRecord.eventId,\n        }));\n\n        await sqsClient.send(\n          new SendMessageBatchCommand({\n            QueueUrl: queue,\n            Entries: entries,\n          }),\n        );\n      } catch (error) {\n        logger.error({ error, batch, queue }, 'Error sending batch to queue');\n        throw error;\n      }\n    }\n  }\n\n  async function sendToBusBatch(eventRecords: EventRecord[]) {\n    const batches = chunkArray(eventRecords, BATCH_SIZE);\n\n    for (const batch of batches) {\n      try {\n        const entries = batch.map((eventRecord) => {\n          // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n          const source = eventRecord.source ?? kebabCase(eventRecord.aggregateType.split('.')[0]);\n          return {\n            Source: source,\n            DetailType: eventRecord.eventType,\n            Detail: JSON.stringify(eventRecord),\n            EventBusName: config.busName,\n          };\n        });\n\n        await eventBridge.send(\n          new PutEventsCommand({\n            Entries: entries,\n          }),\n        );\n      } catch (error) {\n        logger.error({ error, batch }, 'Error sending batch to bus');\n        throw error;\n      }\n    }\n  }\n\n  return async (event: DynamoDBStreamEvent): Promise<void> => {\n    const eventRecords = event.Records.filter((record) => record.eventName === 'INSERT')\n      .map((record) => {\n        try {\n          const data = record.dynamodb?.NewImage;\n          return unmarshall(data as Record<string, AttributeValue>) as EventRecord | AggregateHead;\n        } catch (error) {\n          logger.error({ error, record }, 'Error unmarshalling event record');\n          return undefined;\n        }\n      })\n      .filter((eventRecord): eventRecord is EventRecord => eventRecord?.itemType === 'event');\n\n    if (eventRecords.length > 0) {\n      const tasks: Promise<void>[] = [sendToQueuesBatch(eventRecords)];\n      if (config.busName) {\n        tasks.push(sendToBusBatch(eventRecords));\n      }\n      await Promise.all(tasks);\n    }\n  };\n}\n"],"mappings":";;;;;;AAUA,MAAM,aAAa;;;;;AAWnB,SAAgB,oBAAoB,QAAmC;CACrE,MAAM,YAAY,IAAI,WAAW;CACjC,MAAM,cAAc,IAAI,kBAAkB,EAAE,CAAC;CAE7C,SAAS,WAAc,OAAY,WAA0B;EAC3D,MAAM,SAAgB,EAAE;AACxB,OAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK,UACrC,QAAO,KAAK,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC;AAE5C,SAAO;;CAGT,eAAe,kBAAkB,cAA6B;AAC5D,QAAM,QAAQ,IAAI,OAAO,UAAU,KAAK,UAAU,iBAAiB,cAAc,MAAM,CAAC,CAAC;;CAG3F,eAAe,iBAAiB,cAA6B,OAAe;EAC1E,MAAM,UAAU,WAAW,cAAc,WAAW;AAEpD,OAAK,MAAM,SAAS,QAClB,KAAI;GACF,MAAM,UAAU,MAAM,KAAK,aAAa,WAAW;IACjD,IAAI,GAAG,YAAY,QAAQ,GAAG;IAC9B,aAAa,KAAK,UAAU,YAAY;IACxC,gBAAgB,YAAY;IAC5B,wBAAwB,YAAY;IACrC,EAAE;AAEH,SAAM,UAAU,KACd,IAAI,wBAAwB;IAC1B,UAAU;IACV,SAAS;IACV,CAAC,CACH;WACM,OAAO;AACd,UAAO,MAAM;IAAE;IAAO;IAAO;IAAO,EAAE,+BAA+B;AACrE,SAAM;;;CAKZ,eAAe,eAAe,cAA6B;EACzD,MAAM,UAAU,WAAW,cAAc,WAAW;AAEpD,OAAK,MAAM,SAAS,QAClB,KAAI;GACF,MAAM,UAAU,MAAM,KAAK,gBAAgB;AAGzC,WAAO;KACL,QAFa,YAAY,UAAU,UAAU,YAAY,cAAc,MAAM,IAAI,CAAC,GAAG;KAGrF,YAAY,YAAY;KACxB,QAAQ,KAAK,UAAU,YAAY;KACnC,cAAc,OAAO;KACtB;KACD;AAEF,SAAM,YAAY,KAChB,IAAI,iBAAiB,EACnB,SAAS,SACV,CAAC,CACH;WACM,OAAO;AACd,UAAO,MAAM;IAAE;IAAO;IAAO,EAAE,6BAA6B;AAC5D,SAAM;;;AAKZ,QAAO,OAAO,UAA8C;EAC1D,MAAM,eAAe,MAAM,QAAQ,QAAQ,WAAW,OAAO,cAAc,SAAS,CACjF,KAAK,WAAW;AACf,OAAI;IACF,MAAM,OAAO,OAAO,UAAU;AAC9B,WAAO,WAAW,KAAuC;YAClD,OAAO;AACd,WAAO,MAAM;KAAE;KAAO;KAAQ,EAAE,mCAAmC;AACnE;;IAEF,CACD,QAAQ,gBAA4C,aAAa,aAAa,QAAQ;AAEzF,MAAI,aAAa,SAAS,GAAG;GAC3B,MAAM,QAAyB,CAAC,kBAAkB,aAAa,CAAC;AAChE,OAAI,OAAO,QACT,OAAM,KAAK,eAAe,aAAa,CAAC;AAE1C,SAAM,QAAQ,IAAI,MAAM"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@auriclabs/events",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Event sourcing runtime utilities for DynamoDB-backed event stores",
   "prettier": "@auriclabs/prettier-config",
   "main": "dist/index.cjs",
@@ -11,6 +11,11 @@
       "types": "./dist/index.d.mts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
+    },
+    "./stream-handler": {
+      "types": "./dist/stream-handler.entry.d.mts",
+      "import": "./dist/stream-handler.entry.mjs",
+      "require": "./dist/stream-handler.entry.cjs"
     }
   },
   "keywords": [],
@@ -47,7 +52,7 @@
     "directory": "packages/events"
   },
   "scripts": {
-    "build": "tsdown src/index.ts --format cjs,esm --dts --no-hash",
+    "build": "tsdown src/index.ts src/stream-handler.entry.ts --format cjs,esm --dts --no-hash",
     "dev": "concurrently \"pnpm build --watch\" \"pnpm:y:watch\"",
     "y:watch": "chokidar dist --initial --silent -c \"yalc publish --push\"",
     "lint": "eslint .",

package/src/create-event-listener.test.ts

@@ -14,13 +14,13 @@ import { logger } from '@auriclabs/logger';
 
 import { createEventListener } from './create-event-listener';
 
-import type { SQSEvent } from 'aws-lambda';
+import type { SQSEvent, SQSRecordAttributes } from 'aws-lambda';
 
 const makeRecord = (body: object, messageId = 'msg-1') => ({
   messageId,
   body: JSON.stringify(body),
   receiptHandle: 'handle',
-  attributes: {} as any,
+  attributes: {} as SQSRecordAttributes,
   messageAttributes: {},
   md5OfBody: '',
   eventSource: 'aws:sqs',
@@ -31,6 +31,7 @@ const makeRecord = (body: object, messageId = 'msg-1') => ({
 const makeEvent = (overrides = {}) => ({
   eventType: 'OrderCreated',
   eventId: 'evt-1',
+  tenantId: 'tenant-1',
   aggregateType: 'order',
   aggregateId: 'o-1',
   correlationId: 'corr-1',
@@ -186,7 +187,7 @@ describe('createEventListener', () => {
     await handler(sqsEvent);
 
     expect(logger.debug).toHaveBeenCalledWith(
-      { event: expect.objectContaining({ eventType: 'OrderCreated' }) },
+      { event: expect.objectContaining({ eventType: 'OrderCreated' }) as unknown },
       'Processing event',
     );
   });
@@ -219,7 +220,7 @@ describe('createEventListener', () => {
     await handler(sqsEvent);
 
     expect(logger.error).toHaveBeenCalledWith(
-      expect.objectContaining({ error, event: expect.any(Object) }),
+      expect.objectContaining({ error, event: expect.any(Object) as unknown }),
       'Error processing event',
     );
   });

package/src/dispatch-event.test.ts

@@ -50,6 +50,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
     });
 
     expect(mockAppendEvent).toHaveBeenCalledWith(
@@ -65,6 +66,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
       eventId: 'custom-event-id',
     });
 
@@ -81,6 +83,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
       idempotencyKey: 'my-idem-key',
     });
 
@@ -97,6 +100,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
     });
 
     expect(mockAppendEvent).toHaveBeenCalledWith(
@@ -114,6 +118,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderUpdated',
+      tenantId: 'tenant-1',
     });
 
     expect(mockGetHead).toHaveBeenCalledWith('order', 'o-1');
@@ -132,6 +137,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
     });
 
     expect(mockAppendEvent).toHaveBeenCalledWith(
@@ -152,6 +158,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
     });
 
     expect(mockAppendEvent).toHaveBeenCalledWith(
@@ -173,6 +180,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
       correlationId: 'event-corr',
     });
 
@@ -190,6 +198,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
     });
 
     expect(retry).toHaveBeenCalledTimes(1);
@@ -202,6 +211,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
     });
 
     expect(mockAppendEvent).toHaveBeenCalledWith(
@@ -220,6 +230,7 @@ describe('dispatchEvent', () => {
       aggregateId: 'o-1',
       source: 'test',
       eventType: 'OrderCreated',
+      tenantId: 'tenant-1',
     });
 
     expect(result).toEqual(expected);

package/src/dispatch-events.test.ts

@@ -30,10 +30,10 @@ describe('dispatchEvents', () => {
   });
 
   it('dispatches events sequentially with inOrder: true', async () => {
-    const callOrder: number[] = [];
-    mockDispatchEvent.mockImplementation(async (event) => {
+    const callOrder: string[] = [];
+    mockDispatchEvent.mockImplementation((event: { aggregateId: string }) => {
       callOrder.push(event.aggregateId);
-      return { pk: 'pk', sk: 'sk', version: 1 };
+      return Promise.resolve({ pk: 'pk', sk: 'sk', version: 1 });
     });
 
     const events = [

package/src/event-service.test.ts

@@ -27,6 +27,41 @@ import { TransactWriteCommand, GetCommand, QueryCommand } from '@aws-sdk/lib-dyn
 
 import { createEventService } from './event-service';
 
+interface TransactItem {
+  TableName?: string;
+  Key?: Record<string, string>;
+  Item?: {
+    pk?: string;
+    sk?: string;
+    itemType?: string;
+    eventType?: string;
+    payload?: unknown;
+    version?: number;
+    source?: string;
+    schemaVersion?: number;
+    occurredAt?: string;
+    correlationId?: string;
+    causationId?: string;
+    actorId?: string;
+    [key: string]: unknown;
+  };
+  [key: string]: unknown;
+}
+
+interface TransactWriteInput {
+  TransactItems?: {
+    Update?: TransactItem;
+    Put?: TransactItem;
+    [key: string]: unknown;
+  }[];
+}
+
+interface QueryInput {
+  ExpressionAttributeValues?: Record<string, unknown>;
+  Limit?: number;
+  [key: string]: unknown;
+}
+
 describe('event-service', () => {
   const TABLE_NAME = 'test-events';
 
@@ -53,6 +88,7 @@ describe('event-service', () => {
       mockSend.mockResolvedValue({});
 
       await service.appendEvent({
+        tenantId: 'tenant-1',
         aggregateType: 'order',
         aggregateId: 'order-123',
         source: 'order-service',
@@ -64,24 +100,24 @@ describe('event-service', () => {
       });
 
       expect(TransactWriteCommand).toHaveBeenCalledTimes(1);
-      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0];
+      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0] as TransactWriteInput;
 
       // Check Update item (HEAD)
-      const updateItem = cmdInput.TransactItems![0].Update!;
-      expect(updateItem.TableName).toBe(TABLE_NAME);
-      expect(updateItem.Key).toEqual({ pk: 'AGG#order#order-123', sk: 'HEAD' });
+      const updateItem = cmdInput.TransactItems?.[0]?.Update;
+      expect(updateItem?.TableName).toBe(TABLE_NAME);
+      expect(updateItem?.Key).toEqual({ pk: 'AGG#order#order-123', sk: 'HEAD' });
 
       // Check Put item (event)
-      const putItem = cmdInput.TransactItems![1].Put!;
-      expect(putItem.TableName).toBe(TABLE_NAME);
-      expect(putItem.Item!.pk).toBe('AGG#order#order-123');
-      expect(putItem.Item!.sk).toBe('EVT#000000001');
-      expect(putItem.Item!.itemType).toBe('event');
-      expect(putItem.Item!.eventType).toBe('OrderCreated');
-      expect(putItem.Item!.payload).toEqual({ total: 100 });
-      expect(putItem.Item!.version).toBe(1);
-      expect(putItem.Item!.source).toBe('order-service');
-      expect(putItem.Item!.schemaVersion).toBe(1);
+      const putItem = cmdInput.TransactItems?.[1]?.Put;
+      expect(putItem?.TableName).toBe(TABLE_NAME);
+      expect(putItem?.Item?.pk).toBe('AGG#order#order-123');
+      expect(putItem?.Item?.sk).toBe('EVT#000000001');
+      expect(putItem?.Item?.itemType).toBe('event');
+      expect(putItem?.Item?.eventType).toBe('OrderCreated');
+      expect(putItem?.Item?.payload).toEqual({ total: 100 });
+      expect(putItem?.Item?.version).toBe(1);
+      expect(putItem?.Item?.source).toBe('order-service');
+      expect(putItem?.Item?.schemaVersion).toBe(1);
     });
 
     it('pads version number to 9 digits', async () => {
@@ -89,6 +125,7 @@ describe('event-service', () => {
       mockSend.mockResolvedValue({});
 
       await service.appendEvent({
+        tenantId: 'tenant-1',
         aggregateType: 'order',
         aggregateId: '1',
         source: 'test',
@@ -98,10 +135,10 @@ describe('event-service', () => {
         eventType: 'T',
       });
 
-      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0];
-      const putItem = cmdInput.TransactItems![1].Put!;
-      expect(putItem.Item!.sk).toBe('EVT#000000042');
-      expect(putItem.Item!.version).toBe(42);
+      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0] as TransactWriteInput;
+      const putItem = cmdInput.TransactItems?.[1]?.Put;
+      expect(putItem?.Item?.sk).toBe('EVT#000000042');
+      expect(putItem?.Item?.version).toBe(42);
     });
 
     it('returns pk, sk, and version', async () => {
@@ -109,6 +146,7 @@ describe('event-service', () => {
       mockSend.mockResolvedValue({});
 
       const result = await service.appendEvent({
+        tenantId: 'tenant-1',
         aggregateType: 'wallet',
         aggregateId: 'w-1',
         source: 'billing',
@@ -130,6 +168,7 @@ describe('event-service', () => {
       mockSend.mockResolvedValue({});
 
       await service.appendEvent({
+        tenantId: 'tenant-1',
         aggregateType: 'order',
         aggregateId: '1',
         source: 'test',
@@ -140,9 +179,9 @@ describe('event-service', () => {
         occurredAt: '2025-01-01T00:00:00.000Z',
       });
 
-      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0];
-      const putItem = cmdInput.TransactItems![1].Put!;
-      expect(putItem.Item!.occurredAt).toBe('2025-01-01T00:00:00.000Z');
+      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0] as TransactWriteInput;
+      const putItem = cmdInput.TransactItems?.[1]?.Put;
+      expect(putItem?.Item?.occurredAt).toBe('2025-01-01T00:00:00.000Z');
     });
 
     it('includes optional metadata fields', async () => {
@@ -150,6 +189,7 @@ describe('event-service', () => {
       mockSend.mockResolvedValue({});
 
       await service.appendEvent({
+        tenantId: 'tenant-1',
         aggregateType: 'order',
         aggregateId: '1',
         source: 'test',
@@ -163,12 +203,12 @@ describe('event-service', () => {
         schemaVersion: 2,
       });
 
-      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0];
-      const putItem = cmdInput.TransactItems![1].Put!;
-      expect(putItem.Item!.correlationId).toBe('corr-1');
-      expect(putItem.Item!.causationId).toBe('cause-1');
-      expect(putItem.Item!.actorId).toBe('user-1');
-      expect(putItem.Item!.schemaVersion).toBe(2);
+      const cmdInput = vi.mocked(TransactWriteCommand).mock.calls[0][0] as TransactWriteInput;
+      const putItem = cmdInput.TransactItems?.[1]?.Put;
+      expect(putItem?.Item?.correlationId).toBe('corr-1');
+      expect(putItem?.Item?.causationId).toBe('cause-1');
+      expect(putItem?.Item?.actorId).toBe('user-1');
+      expect(putItem?.Item?.schemaVersion).toBe(2);
     });
 
     it('throws OCC error on ConditionalCheckFailedException', async () => {
@@ -178,6 +218,7 @@ describe('event-service', () => {
 
       await expect(
         service.appendEvent({
+          tenantId: 'tenant-1',
           aggregateType: 'order',
           aggregateId: 'o-1',
           source: 'test',
@@ -195,6 +236,7 @@ describe('event-service', () => {
 
       await expect(
         service.appendEvent({
+          tenantId: 'tenant-1',
           aggregateType: 'order',
           aggregateId: 'o-1',
           source: 'test',
@@ -285,9 +327,9 @@ describe('event-service', () => {
         fromVersionExclusive: 5,
       });
 
-      const cmdInput = vi.mocked(QueryCommand).mock.calls[0][0];
+      const cmdInput = vi.mocked(QueryCommand).mock.calls[0][0] as QueryInput;
       // fromVersionExclusive=5 means start from version 6
-      expect(cmdInput.ExpressionAttributeValues![':from']).toBe('EVT#000000006');
+      expect(cmdInput.ExpressionAttributeValues?.[':from']).toBe('EVT#000000006');
     });
 
     it('respects toVersionInclusive', async () => {
@@ -300,8 +342,8 @@ describe('event-service', () => {
         toVersionInclusive: 10,
       });
 
-      const cmdInput = vi.mocked(QueryCommand).mock.calls[0][0];
-      expect(cmdInput.ExpressionAttributeValues![':to']).toBe('EVT#000000010');
+      const cmdInput = vi.mocked(QueryCommand).mock.calls[0][0] as QueryInput;
+      expect(cmdInput.ExpressionAttributeValues?.[':to']).toBe('EVT#000000010');
     });
 
     it('respects limit parameter', async () => {
@@ -314,7 +356,7 @@ describe('event-service', () => {
         limit: 25,
       });
 
-      const cmdInput = vi.mocked(QueryCommand).mock.calls[0][0];
+      const cmdInput = vi.mocked(QueryCommand).mock.calls[0][0] as QueryInput;
       expect(cmdInput.Limit).toBe(25);
     });
 

package/src/event-service.ts

@@ -29,6 +29,7 @@ const pkFor = (aggregateType: string, aggregateId: string): AggregatePK =>
   `AGG#${aggregateType}#${aggregateId}`;
 
 export interface AppendArgs<P = unknown> {
+  tenantId: string;
   aggregateType: string;
   aggregateId: string;
   source: string;
@@ -79,6 +80,7 @@ export function createEventService(tableName: string): EventService {
   return {
     async appendEvent<P = unknown>(args: AppendArgs<P>): Promise<AppendEventResult> {
       const {
+        tenantId,
         aggregateType,
         aggregateId,
         expectedVersion,
@@ -138,6 +140,8 @@ export function createEventService(tableName: string): EventService {
                     aggregateType: aggregateType as AggregateType,
                     version: nextVersion,
 
+                    tenantId,
+
                     eventId: eventId as EventId,
                     eventType: eventType,
                     schemaVersion: schemaVersion ?? 1,

package/src/init.test.ts

@@ -19,6 +19,8 @@ describe('init', () => {
       // Re-import to get fresh module state
       // Since the module state persists, we need to test the throw case first
       // Actually with vi.mock the module is already imported. We need to use dynamic import.
+      // See 'init (fresh module)' describe block below for the actual test
+      expect(true).toBe(true);
     });
   });
 

package/src/stream-handler.entry.ts

@@ -0,0 +1,6 @@
+import { createStreamHandler } from './stream-handler';
+
+export const handler = createStreamHandler({
+  busName: process.env.EVENT_BUS_NAME,
+  queueUrls: JSON.parse(process.env.QUEUE_URL_LIST ?? '[]') as string[],
+});