@geekmidas/constructs 2.0.0 → 3.0.1

package/dist/endpoints/lazyAccessors.d.mts

@@ -3,7 +3,7 @@ import "../types-aFmq5cKh.mjs";
 import "../BaseFunctionBuilder-CsvFjzA8.mjs";
 import "../Function-CZw1DRQ6.mjs";
 import "../FunctionBuilder-m5BNA2Ap.mjs";
-import "../index-CtMNRkV7.mjs";
+import "../index-_5DYCNAt.mjs";
 import "../Authorizer-DBsrDTuf.mjs";
 import "../Endpoint-BiPM0glm.mjs";
 import { createApiGatewayCookies, createApiGatewayHeaders, createCookieHeaderAccessor, createHonoCookies, createHonoHeaders, createNoopCookies, createNoopHeaders, createObjectHeaders } from "../lazyAccessors-DXkJpnyX.mjs";

package/dist/endpoints/processAudits.d.cts

@@ -3,7 +3,7 @@ import "../types-B5H3piDg.cjs";
 import "../BaseFunctionBuilder-C-4hYTfj.cjs";
 import "../Function-CwlB89lS.cjs";
 import "../FunctionBuilder-D_7f5MfS.cjs";
-import "../index-BnoOaBQV.cjs";
+import "../index-BfeupgMl.cjs";
 import "../Authorizer-DWtwC8we.cjs";
 import { CookieFn, Endpoint, HeaderFn } from "../Endpoint-C9N6CmvB.cjs";
 import { AuditStorage, AuditableAction, Auditor } from "@geekmidas/audit";

package/dist/endpoints/processAudits.d.mts

@@ -3,7 +3,7 @@ import "../types-aFmq5cKh.mjs";
 import "../BaseFunctionBuilder-CsvFjzA8.mjs";
 import "../Function-CZw1DRQ6.mjs";
 import "../FunctionBuilder-m5BNA2Ap.mjs";
-import "../index-CtMNRkV7.mjs";
+import "../index-_5DYCNAt.mjs";
 import "../Authorizer-DBsrDTuf.mjs";
 import { CookieFn, Endpoint, HeaderFn } from "../Endpoint-BiPM0glm.mjs";
 import { Service, ServiceDiscovery } from "@geekmidas/services";

package/dist/endpoints/rls.d.cts

@@ -3,7 +3,7 @@ import "../types-B5H3piDg.cjs";
 import "../BaseFunctionBuilder-C-4hYTfj.cjs";
 import "../Function-CwlB89lS.cjs";
 import "../FunctionBuilder-D_7f5MfS.cjs";
-import "../index-BnoOaBQV.cjs";
+import "../index-BfeupgMl.cjs";
 import "../Authorizer-DWtwC8we.cjs";
 import { RLS_BYPASS, RlsBypass, RlsConfig, RlsContext, RlsContextExtractor } from "../Endpoint-C9N6CmvB.cjs";
 export { RLS_BYPASS, RlsBypass, RlsConfig, RlsContext, RlsContextExtractor };

package/dist/endpoints/rls.d.mts

@@ -3,7 +3,7 @@ import "../types-aFmq5cKh.mjs";
 import "../BaseFunctionBuilder-CsvFjzA8.mjs";
 import "../Function-CZw1DRQ6.mjs";
 import "../FunctionBuilder-m5BNA2Ap.mjs";
-import "../index-CtMNRkV7.mjs";
+import "../index-_5DYCNAt.mjs";
 import "../Authorizer-DBsrDTuf.mjs";
 import { RLS_BYPASS, RlsBypass, RlsConfig, RlsContext, RlsContextExtractor } from "../Endpoint-BiPM0glm.mjs";
 export { RLS_BYPASS, RlsBypass, RlsConfig, RlsContext, RlsContextExtractor };

package/dist/functions/AWSLambdaFunction.cjs

@@ -4,6 +4,6 @@ require('../BaseFunctionBuilder-DXf6HK-N.cjs');
 require('../Function-DgQ_no6B.cjs');
 require('../FunctionBuilder-C_xG9As7.cjs');
 require('../FunctionExecutionWrapper-7B-CufYj.cjs');
-const require_AWSLambdaFunction = require('../AWSLambdaFunction-wtE9Lx_-.cjs');
+const require_AWSLambdaFunction = require('../AWSLambdaFunction-BVpc9xFN.cjs');
 
 exports.AWSLambdaFunction = require_AWSLambdaFunction.AWSLambdaFunction;

package/dist/functions/AWSLambdaFunction.mjs

@@ -4,6 +4,6 @@ import "../BaseFunctionBuilder-C3rQMoWb.mjs";
 import "../Function-xfQbftdE.mjs";
 import "../FunctionBuilder-CBeqX18X.mjs";
 import "../FunctionExecutionWrapper-Ba0Z-iwe.mjs";
-import { AWSLambdaFunction } from "../AWSLambdaFunction-BDL7Thi_.mjs";
+import { AWSLambdaFunction } from "../AWSLambdaFunction-OPazEPhQ.mjs";
 
 export { AWSLambdaFunction };

package/dist/functions/TestFunctionAdaptor.cjs

@@ -3,6 +3,6 @@ require('../publisher-lFQleddL.cjs');
 require('../BaseFunctionBuilder-DXf6HK-N.cjs');
 require('../Function-DgQ_no6B.cjs');
 require('../FunctionBuilder-C_xG9As7.cjs');
-const require_TestFunctionAdaptor = require('../TestFunctionAdaptor-CSMX7myB.cjs');
+const require_TestFunctionAdaptor = require('../TestFunctionAdaptor-CH6-gO_B.cjs');
 
 exports.TestFunctionAdaptor = require_TestFunctionAdaptor.TestFunctionAdaptor;

package/dist/functions/TestFunctionAdaptor.mjs

@@ -3,6 +3,6 @@ import "../publisher-Bw4770Hi.mjs";
 import "../BaseFunctionBuilder-C3rQMoWb.mjs";
 import "../Function-xfQbftdE.mjs";
 import "../FunctionBuilder-CBeqX18X.mjs";
-import { TestFunctionAdaptor } from "../TestFunctionAdaptor-CK-dbKpO.mjs";
+import { TestFunctionAdaptor } from "../TestFunctionAdaptor-C5CLuR-9.mjs";
 
 export { TestFunctionAdaptor };

package/dist/functions/index.d.cts

@@ -2,5 +2,5 @@ import "../Construct-CX7HyFfT.cjs";
 import { BaseFunctionBuilder } from "../BaseFunctionBuilder-C-4hYTfj.cjs";
 import { Function, FunctionContext, FunctionHandler } from "../Function-CwlB89lS.cjs";
 import { FunctionBuilder } from "../FunctionBuilder-D_7f5MfS.cjs";
-import { f } from "../index-BnoOaBQV.cjs";
+import { f } from "../index-BfeupgMl.cjs";
 export { BaseFunctionBuilder, Function, FunctionBuilder, FunctionContext, FunctionHandler, f };

package/dist/functions/index.d.mts

@@ -2,5 +2,5 @@ import "../Construct-C2SyofdS.mjs";
 import { BaseFunctionBuilder } from "../BaseFunctionBuilder-CsvFjzA8.mjs";
 import { Function, FunctionContext, FunctionHandler } from "../Function-CZw1DRQ6.mjs";
 import { FunctionBuilder } from "../FunctionBuilder-m5BNA2Ap.mjs";
-import { f } from "../index-CtMNRkV7.mjs";
+import { f } from "../index-_5DYCNAt.mjs";
 export { BaseFunctionBuilder, Function, FunctionBuilder, FunctionContext, FunctionHandler, f };

package/dist/index-BfeupgMl.d.cts

@@ -0,0 +1,12 @@
+import { FunctionBuilder } from "./FunctionBuilder-D_7f5MfS.cjs";
+import * as _geekmidas_audit5 from "@geekmidas/audit";
+import * as _geekmidas_logger4 from "@geekmidas/logger";
+import * as _geekmidas_schema3 from "@geekmidas/schema";
+
+//#region src/functions/index.d.ts
+declare const f: FunctionBuilder<_geekmidas_schema3.ComposableStandardSchema, undefined, [], _geekmidas_logger4.Logger, undefined, string, undefined, string, undefined, string, _geekmidas_audit5.AuditableAction<string, unknown>>;
+//# sourceMappingURL=index.d.ts.map
+
+//#endregion
+export { f };
+//# sourceMappingURL=index-BfeupgMl.d.cts.map

package/dist/{index-BnoOaBQV.d.cts.map → index-BfeupgMl.d.cts.map}

@@ -1 +1 @@
-{"version":3,"file":"index-BnoOaBQV.d.cts","names":[],"sources":["../src/functions/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAWa,GAAC,gBAAwB,kBAAA,CAAxB,wBAAA,iBAAA,kBAAA,CAAA,MAAA,2DAAA,iBAAA,CAAA"}
+{"version":3,"file":"index-BfeupgMl.d.cts","names":[],"sources":["../src/functions/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAWa,GAAC,gBAAwB,kBAAA,CAAxB,wBAAA,iBAAA,kBAAA,CAAA,MAAA,2DAAA,iBAAA,CAAA"}

package/dist/index-_5DYCNAt.d.mts

@@ -0,0 +1,12 @@
+import { FunctionBuilder } from "./FunctionBuilder-m5BNA2Ap.mjs";
+import * as _geekmidas_audit2 from "@geekmidas/audit";
+import * as _geekmidas_logger1 from "@geekmidas/logger";
+import * as _geekmidas_schema0 from "@geekmidas/schema";
+
+//#region src/functions/index.d.ts
+declare const f: FunctionBuilder<_geekmidas_schema0.ComposableStandardSchema, undefined, [], _geekmidas_logger1.Logger, undefined, string, undefined, string, undefined, string, _geekmidas_audit2.AuditableAction<string, unknown>>;
+//# sourceMappingURL=index.d.ts.map
+
+//#endregion
+export { f };
+//# sourceMappingURL=index-_5DYCNAt.d.mts.map

package/dist/{index-CtMNRkV7.d.mts.map → index-_5DYCNAt.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"index-CtMNRkV7.d.mts","names":[],"sources":["../src/functions/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAWa,GAAC,gBAAwB,kBAAA,CAAxB,wBAAA,iBAAA,kBAAA,CAAA,MAAA,2DAAA,iBAAA,CAAA"}
+{"version":3,"file":"index-_5DYCNAt.d.mts","names":[],"sources":["../src/functions/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAWa,GAAC,gBAAwB,kBAAA,CAAxB,wBAAA,iBAAA,kBAAA,CAAA,MAAA,2DAAA,iBAAA,CAAA"}

package/dist/subscribers/AWSLambdaSubscriberAdaptor.cjs

@@ -1,3 +1,3 @@
-const require_AWSLambdaSubscriberAdaptor = require('../AWSLambdaSubscriberAdaptor-BtBKExsh.cjs');
+const require_AWSLambdaSubscriberAdaptor = require('../AWSLambdaSubscriberAdaptor-BL7Yl1XE.cjs');
 
 exports.AWSLambdaSubscriber = require_AWSLambdaSubscriberAdaptor.AWSLambdaSubscriber;

package/dist/subscribers/AWSLambdaSubscriberAdaptor.mjs

@@ -1,3 +1,3 @@
-import { AWSLambdaSubscriber } from "../AWSLambdaSubscriberAdaptor-DsRmmGm1.mjs";
+import { AWSLambdaSubscriber } from "../AWSLambdaSubscriberAdaptor-YxZ_z3XG.mjs";
 
 export { AWSLambdaSubscriber };

package/dist/subscribers/TestSubscriberAdaptor.cjs

@@ -1,4 +1,4 @@
 require('../publisher-lFQleddL.cjs');
-const require_TestSubscriberAdaptor = require('../TestSubscriberAdaptor-1m-2bM_j.cjs');
+const require_TestSubscriberAdaptor = require('../TestSubscriberAdaptor-Dgxr_0vL.cjs');
 
 exports.TestSubscriberAdaptor = require_TestSubscriberAdaptor.TestSubscriberAdaptor;

package/dist/subscribers/TestSubscriberAdaptor.mjs

@@ -1,4 +1,4 @@
 import "../publisher-Bw4770Hi.mjs";
-import { TestSubscriberAdaptor } from "../TestSubscriberAdaptor-CrqLkyUE.mjs";
+import { TestSubscriberAdaptor } from "../TestSubscriberAdaptor-CwP3qNJ4.mjs";
 
 export { TestSubscriberAdaptor };

package/dist/subscribers/index.d.cts

@@ -1,10 +1,10 @@
 import "../Construct-CX7HyFfT.cjs";
 import { Subscriber } from "../Subscriber-1rDE7HuM.cjs";
 import { SubscriberBuilder } from "../SubscriberBuilder-B9uva8fZ.cjs";
-import * as _geekmidas_logger8 from "@geekmidas/logger";
+import * as _geekmidas_logger10 from "@geekmidas/logger";
 
 //#region src/subscribers/index.d.ts
-declare const s: SubscriberBuilder<[], _geekmidas_logger8.Logger, undefined, undefined, string, []>;
+declare const s: SubscriberBuilder<[], _geekmidas_logger10.Logger, undefined, undefined, string, []>;
 //# sourceMappingURL=index.d.ts.map
 
 //#endregion

package/dist/subscribers/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../../src/subscribers/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAKa,GAAC,sBAA0B,kBAAA,CAA1B,MAAA"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../../src/subscribers/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAKa,GAAC,sBAA0B,mBAAA,CAA1B,MAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/constructs",
-  "version": "2.0.0",
+  "version": "3.0.1",
   "private": false,
   "type": "module",
   "exports": {
@@ -78,32 +78,32 @@
     "kysely": "~0.28.8",
     "pg": "~8.16.3",
     "zod": "~4.1.13",
-    "@geekmidas/audit": "^1.0.0",
-    "@geekmidas/cache": "^1.0.0",
+    "@geekmidas/audit": "^2.0.0",
+    "@geekmidas/cache": "^1.1.0",
     "@geekmidas/db": "^1.0.0",
-    "@geekmidas/envkit": "^1.0.3",
     "@geekmidas/errors": "^1.0.0",
+    "@geekmidas/envkit": "^1.0.3",
     "@geekmidas/events": "^1.1.0",
-    "@geekmidas/logger": "^1.0.0",
-    "@geekmidas/rate-limit": "^1.0.0",
     "@geekmidas/schema": "^1.0.0",
     "@geekmidas/services": "^1.0.1",
-    "@geekmidas/testkit": "^1.0.2"
+    "@geekmidas/logger": "^1.0.0",
+    "@geekmidas/testkit": "^1.0.2",
+    "@geekmidas/rate-limit": "^2.0.0"
   },
   "peerDependencies": {
     "@middy/core": ">=6.3.1",
     "@types/aws-lambda": ">=8.10.92",
     "hono": ">=4.8.2",
-    "@geekmidas/cache": "^1.0.0",
-    "@geekmidas/envkit": "^1.0.3",
+    "@geekmidas/audit": "^2.0.0",
     "@geekmidas/db": "^1.0.0",
+    "@geekmidas/envkit": "^1.0.3",
     "@geekmidas/errors": "^1.0.0",
+    "@geekmidas/cache": "^1.1.0",
     "@geekmidas/events": "^1.1.0",
     "@geekmidas/logger": "^1.0.0",
-    "@geekmidas/rate-limit": "^1.0.0",
+    "@geekmidas/rate-limit": "^2.0.0",
     "@geekmidas/schema": "^1.0.0",
-    "@geekmidas/services": "^1.0.1",
-    "@geekmidas/audit": "^1.0.0"
+    "@geekmidas/services": "^1.0.1"
   },
   "peerDependenciesMeta": {
     "@geekmidas/audit": {

package/src/functions/AWSLambdaFunction.ts

@@ -9,6 +9,7 @@ import type {
 	InferStandardSchema,
 } from '@geekmidas/schema';
 import type { Service, ServiceRecord } from '@geekmidas/services';
+import { runWithRequestContext } from '@geekmidas/services';
 import middy, { type MiddlewareObj } from '@middy/core';
 import type { StandardSchemaV1 } from '@standard-schema/spec';
 import type { Context, Handler } from 'aws-lambda';
@@ -321,7 +322,7 @@ export class AWSLambdaFunction<
 		const handler = this._handler.bind(this);
 
 		// Apply middleware in order
-		return middy(handler)
+		const chain = middy(handler)
 			.use(this.loggerMiddleware())
 			.use(this.baseInput())
 			.use(this.error())
@@ -329,6 +330,19 @@ export class AWSLambdaFunction<
 			.use(this.database())
 			.use(this.auditor())
 			.use(this.input())
-			.use(this.events()) as unknown as AWSLambdaHandler;
+			.use(this.events());
+
+		// Wrap entire Middy chain in request context for service access
+		const wrappedHandler = async (event: unknown, context: Context) => {
+			const startTime = Date.now();
+			const requestId = context.awsRequestId;
+			const logger = this.fn.logger.child({ requestId }) as TLogger;
+
+			return runWithRequestContext({ logger, requestId, startTime }, () =>
+				chain(event as Parameters<typeof chain>[0], context),
+			);
+		};
+
+		return wrappedHandler as unknown as AWSLambdaHandler;
 	}
 }

package/src/functions/TestFunctionAdaptor.ts

@@ -9,6 +9,7 @@ import type {
 	InferStandardSchema,
 } from '@geekmidas/schema';
 import {
+	runWithRequestContext,
 	type Service,
 	ServiceDiscovery,
 	type ServiceRecord,
@@ -153,41 +154,47 @@ export class TestFunctionAdaptor<
 			});
 		}
 
-		// Execute the function
-		const response = await this.fn.fn({
-			input: parsedInput,
-			services,
-			logger,
-			db,
-			auditor,
-		} as any);
-
-		// Parse output if schema is provided
-		const output = await this.fn.parseOutput(response);
-
-		// Flush audits if any were recorded
-		if (auditor) {
-			const records = auditor.getRecords();
-			if (records.length > 0) {
-				logger.debug(
-					{ auditCount: records.length },
-					'Flushing function audits',
-				);
-				await auditor.flush();
+		// Wrap execution in request context for service access via context.getLogger()
+		const requestId = `test-${Date.now()}`;
+		const startTime = Date.now();
+
+		return runWithRequestContext({ logger, requestId, startTime }, async () => {
+			// Execute the function
+			const response = await this.fn.fn({
+				input: parsedInput,
+				services,
+				logger,
+				db,
+				auditor,
+			} as any);
+
+			// Parse output if schema is provided
+			const output = await this.fn.parseOutput(response);
+
+			// Flush audits if any were recorded
+			if (auditor) {
+				const records = auditor.getRecords();
+				if (records.length > 0) {
+					logger.debug(
+						{ auditCount: records.length },
+						'Flushing function audits',
+					);
+					await auditor.flush();
+				}
 			}
-		}
 
-		// Register publisher service if provided in context
+			// Register publisher service if provided in context
 
-		await publishEvents(
-			logger,
-			this.serviceDiscovery,
-			this.fn.events,
-			output,
-			this.fn.publisherService,
-		);
+			await publishEvents(
+				logger,
+				this.serviceDiscovery,
+				this.fn.events,
+				output,
+				this.fn.publisherService,
+			);
 
-		return output;
+			return output;
+		}) as Promise<InferStandardSchema<TOutSchema>>;
 	}
 }
 

package/src/functions/__tests__/AWSLambdaFunctionAdaptor.spec.ts

@@ -2,6 +2,7 @@ import { EnvironmentParser } from '@geekmidas/envkit';
 import type { EventPublisher, PublishableMessage } from '@geekmidas/events';
 import { ConsoleLogger } from '@geekmidas/logger/console';
 import type { Service } from '@geekmidas/services';
+import { serviceContext } from '@geekmidas/services';
 import type { Context } from 'aws-lambda';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { z } from 'zod/v4';
@@ -455,4 +456,58 @@ describe('AWSLambdaFunction', () => {
 			expect(result).toEqual({ hasDb: false });
 		});
 	});
+
+	describe('request context', () => {
+		it('should make serviceContext.getLogger() available inside handler', async () => {
+			let contextLogger: any;
+			let contextRequestId: string | undefined;
+
+			const fn = new Function(
+				async () => {
+					contextLogger = serviceContext.getLogger();
+					contextRequestId = serviceContext.getRequestId();
+					return { success: true };
+				},
+				undefined,
+				undefined,
+				undefined,
+				undefined,
+				[],
+				logger,
+			);
+
+			const adaptor = new AWSLambdaFunction(envParser, fn);
+			const handler = adaptor.handler;
+
+			const context = createMockContext();
+			await handler({}, context, vi.fn());
+
+			expect(contextLogger).toBeDefined();
+			expect(contextRequestId).toBe('test-request-id');
+		});
+
+		it('should make serviceContext.hasContext() return true inside handler', async () => {
+			let hasContext = false;
+
+			const fn = new Function(
+				async () => {
+					hasContext = serviceContext.hasContext();
+					return { success: true };
+				},
+				undefined,
+				undefined,
+				undefined,
+				undefined,
+				[],
+				logger,
+			);
+
+			const adaptor = new AWSLambdaFunction(envParser, fn);
+			const handler = adaptor.handler;
+
+			await handler({}, createMockContext(), vi.fn());
+
+			expect(hasContext).toBe(true);
+		});
+	});
 });

package/src/functions/__tests__/TestFunctionAdaptor.spec.ts

@@ -1,6 +1,7 @@
 import type { EventPublisher, PublishableMessage } from '@geekmidas/events';
 import { ConsoleLogger } from '@geekmidas/logger/console';
 import type { Service } from '@geekmidas/services';
+import { serviceContext } from '@geekmidas/services';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { z } from 'zod/v4';
 
@@ -395,4 +396,85 @@ describe.skip('TestFunctionAdaptor', () => {
 			).rejects.toThrow('Function failed');
 		});
 	});
+
+	describe('request context', () => {
+		it('should make serviceContext.getLogger() available inside handler', async () => {
+			let contextLogger: any;
+
+			const fn = new Function(
+				async () => {
+					contextLogger = serviceContext.getLogger();
+					return { success: true };
+				},
+				undefined,
+				undefined,
+				undefined,
+				undefined,
+				[],
+				logger,
+			);
+
+			const adaptor = new TestFunctionAdaptor(fn);
+
+			await adaptor.invoke({
+				input: {},
+				services: {},
+			});
+
+			expect(contextLogger).toBeDefined();
+		});
+
+		it('should make serviceContext.hasContext() return true inside handler', async () => {
+			let hasContext = false;
+
+			const fn = new Function(
+				async () => {
+					hasContext = serviceContext.hasContext();
+					return { success: true };
+				},
+				undefined,
+				undefined,
+				undefined,
+				undefined,
+				[],
+				logger,
+			);
+
+			const adaptor = new TestFunctionAdaptor(fn);
+
+			await adaptor.invoke({
+				input: {},
+				services: {},
+			});
+
+			expect(hasContext).toBe(true);
+		});
+
+		it('should provide a request ID starting with test-', async () => {
+			let requestId: string | undefined;
+
+			const fn = new Function(
+				async () => {
+					requestId = serviceContext.getRequestId();
+					return { success: true };
+				},
+				undefined,
+				undefined,
+				undefined,
+				undefined,
+				[],
+				logger,
+			);
+
+			const adaptor = new TestFunctionAdaptor(fn);
+
+			await adaptor.invoke({
+				input: {},
+				services: {},
+			});
+
+			expect(requestId).toBeDefined();
+			expect(requestId).toMatch(/^test-/);
+		});
+	});
 });

package/src/subscribers/AWSLambdaSubscriberAdaptor.ts

@@ -4,7 +4,7 @@ import type { EventPublisher } from '@geekmidas/events';
 import type { Logger } from '@geekmidas/logger';
 import type { InferStandardSchema } from '@geekmidas/schema';
 import type { Service, ServiceRecord } from '@geekmidas/services';
-import { ServiceDiscovery } from '@geekmidas/services';
+import { runWithRequestContext, ServiceDiscovery } from '@geekmidas/services';
 import middy, { type MiddlewareObj } from '@middy/core';
 import type { StandardSchemaV1 } from '@standard-schema/spec';
 import type {
@@ -318,10 +318,25 @@ export class AWSLambdaSubscriber<
 		const handler = this._handler.bind(this);
 
 		// Apply middleware in order
-		return middy(handler)
+		const chain = middy(handler)
 			.use(this.loggerMiddleware())
 			.use(this.parseEvents())
 			.use(this.error())
 			.use(this.services());
+
+		// Wrap entire Middy chain in request context for service access
+		const wrappedHandler = async (event: unknown, context: Context) => {
+			const startTime = Date.now();
+			const requestId = context.awsRequestId;
+			const logger = this.subscriber.logger.child({
+				requestId,
+			}) as TLogger;
+
+			return runWithRequestContext({ logger, requestId, startTime }, () =>
+				chain(event as Parameters<typeof chain>[0], context),
+			);
+		};
+
+		return wrappedHandler as unknown as AWSLambdaHandler;
 	}
 }

package/src/subscribers/TestSubscriberAdaptor.ts

@@ -6,7 +6,7 @@ import type {
 import type { Logger } from '@geekmidas/logger';
 import type { InferStandardSchema } from '@geekmidas/schema';
 import type { Service, ServiceRecord } from '@geekmidas/services';
-import { ServiceDiscovery } from '@geekmidas/services';
+import { runWithRequestContext, ServiceDiscovery } from '@geekmidas/services';
 import type { StandardSchemaV1 } from '@standard-schema/spec';
 import { publishEvents } from '../publisher';
 import type { Subscriber } from './Subscriber';
@@ -72,36 +72,42 @@ export class TestSubscriberAdaptor<
 			return { batchItemFailures: [] } as any;
 		}
 
-		// Execute the subscriber handler
-		const result = await this.subscriber.handler({
-			events: filteredEvents,
-			services,
-			logger,
-		});
-
-		// Validate output if schema is provided
-		let output = result;
-		if (this.subscriber.outputSchema && result) {
-			const validationResult =
-				await this.subscriber.outputSchema['~standard'].validate(result);
-
-			if (validationResult.issues) {
-				throw new Error('Subscriber output validation failed');
+		// Wrap execution in request context for service access via context.getLogger()
+		const requestId = `test-${Date.now()}`;
+		const startTime = Date.now();
+
+		return runWithRequestContext({ logger, requestId, startTime }, async () => {
+			// Execute the subscriber handler
+			const result = await this.subscriber.handler({
+				events: filteredEvents,
+				services,
+				logger,
+			});
+
+			// Validate output if schema is provided
+			let output: any = result;
+			if (this.subscriber.outputSchema && result) {
+				const validationResult =
+					await this.subscriber.outputSchema['~standard'].validate(result);
+
+				if (validationResult.issues) {
+					throw new Error('Subscriber output validation failed');
+				}
+
+				output = validationResult.value;
 			}
 
-			output = validationResult.value;
-		}
-
-		// Publish events if configured
-		await publishEvents(
-			logger,
-			this.serviceDiscovery,
-			this.subscriber.events,
-			output,
-			this.subscriber.publisherService,
-		);
-
-		return output;
+			// Publish events if configured
+			await publishEvents(
+				logger,
+				this.serviceDiscovery,
+				this.subscriber.events,
+				output,
+				this.subscriber.publisherService,
+			);
+
+			return output;
+		}) as Promise<InferStandardSchema<OutSchema>>;
 	}
 
 	private filterEvents(