@geekmidas/constructs 3.0.0 → 3.0.2

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_logger10 from "@geekmidas/logger";
+import * as _geekmidas_logger5 from "@geekmidas/logger";
 
 //#region src/subscribers/index.d.ts
-declare const s: SubscriberBuilder<[], _geekmidas_logger10.Logger, undefined, undefined, string, []>;
+declare const s: SubscriberBuilder<[], _geekmidas_logger5.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,mBAAA,CAA1B,MAAA"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../../src/subscribers/index.ts"],"sourcesContent":[],"mappings":";;;;;;cAKa,GAAC,sBAA0B,kBAAA,CAA1B,MAAA"}

package/dist/subscribers/index.d.mts

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/constructs",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "private": false,
   "type": "module",
   "exports": {
@@ -78,17 +78,17 @@
     "kysely": "~0.28.8",
     "pg": "~8.16.3",
     "zod": "~4.1.13",
+    "@geekmidas/envkit": "^1.0.3",
     "@geekmidas/audit": "^2.0.0",
-    "@geekmidas/cache": "^1.1.0",
     "@geekmidas/db": "^1.0.0",
-    "@geekmidas/envkit": "^1.0.3",
+    "@geekmidas/cache": "^1.1.0",
     "@geekmidas/errors": "^1.0.0",
     "@geekmidas/events": "^1.1.0",
     "@geekmidas/logger": "^1.0.0",
-    "@geekmidas/rate-limit": "^2.0.0",
     "@geekmidas/schema": "^1.0.0",
-    "@geekmidas/services": "^1.0.1",
-    "@geekmidas/testkit": "^1.0.2"
+    "@geekmidas/rate-limit": "^2.0.0",
+    "@geekmidas/testkit": "^1.0.2",
+    "@geekmidas/services": "^1.0.1"
   },
   "peerDependencies": {
     "@middy/core": ">=6.3.1",
@@ -97,8 +97,8 @@
     "@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": "^2.0.0",

package/src/endpoints/AmazonApiGatewayEndpointAdaptor.ts

@@ -145,6 +145,11 @@ export abstract class AmazonApiGatewayEndpoint<
 	}
 	abstract getInput(e: TEvent): GetInputResponse;
 
+	protected getCookies(e: TEvent): CookieFn {
+		const headers = e.headers as Record<string, string>;
+		return Endpoint.createCookies(headers?.cookie);
+	}
+
 	private input(): Middleware<TEvent, TInput, TServices, TLogger> {
 		return {
 			before: async (req) => {
@@ -152,7 +157,7 @@ export abstract class AmazonApiGatewayEndpoint<
 					const { body, query, params } = this.getInput(req.event);
 					const headers = req.event.headers as Record<string, string>;
 					const header = Endpoint.createHeaders(headers);
-					const cookie = Endpoint.createCookies(headers.cookie);
+					const cookie = this.getCookies(req.event);
 
 					set(req.event, 'body', await this.endpoint.parseInput(body, 'body'));
 

package/src/endpoints/AmazonApiGatewayV2EndpointAdaptor.ts

@@ -12,7 +12,8 @@ import {
 	type GetInputResponse,
 	type LoggerContext,
 } from './AmazonApiGatewayEndpointAdaptor';
-import type { Endpoint, EndpointSchemas } from './Endpoint';
+import type { CookieFn, Endpoint, EndpointSchemas } from './Endpoint';
+import { createApiGatewayCookies } from './lazyAccessors';
 import { parseQueryParams } from './parseQueryParams';
 
 export class AmazonApiGatewayV2Endpoint<
@@ -36,6 +37,13 @@ export class AmazonApiGatewayV2Endpoint<
 	TSession,
 	TEventPublisher
 > {
+	override getCookies(e: APIGatewayProxyEventV2): CookieFn {
+		return createApiGatewayCookies(
+			e.cookies,
+			(e.headers as Record<string, string>)?.cookie,
+		);
+	}
+
 	override getInput(e: APIGatewayProxyEventV2): GetInputResponse {
 		// API Gateway V2 handles arrays as comma-separated values
 		const queryParams = e.queryStringParameters || {};

package/src/endpoints/__tests__/AmazonApiGatewayV2EndpointAdaptor.spec.ts

@@ -130,7 +130,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 				headers: { 'content-type': 'application/json' },
 				body: JSON.stringify({ name: 'John', age: 30 }),
 			});
-			// @ts-expect-error
+
 			const response = await adapter.handler(event, mockContext);
 
 			expect(response).toEqual({
@@ -170,7 +170,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 					limit: '20',
 				},
 			});
-			// @ts-expect-error
+
 			const response = await adapter.handler(event, mockContext);
 
 			expect(response).toEqual({
@@ -216,7 +216,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 					'filter.active': 'true',
 				},
 			});
-			// @ts-expect-error
+
 			const response = await adapter.handler(event, mockContext);
 
 			expect(response).toEqual({
@@ -250,7 +250,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 				queryStringParameters: { include: 'profile' },
 				pathParameters: { id: '123' },
 			});
-			// @ts-expect-error
+
 			const response = await adapter.handler(event, mockContext);
 
 			expect(response).toEqual({
@@ -274,7 +274,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 
 				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
 				const event = createMockV2Event();
-				// @ts-expect-error
+
 				const response = await adapter.handler(event, mockContext);
 
 				expect(response.multiValueHeaders?.['Set-Cookie']).toEqual([
@@ -296,7 +296,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 
 				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
 				const event = createMockV2Event();
-				// @ts-expect-error
+
 				const response = await adapter.handler(event, mockContext);
 
 				expect(response.headers).toEqual({
@@ -316,7 +316,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 
 				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
 				const event = createMockV2Event({ routeKey: 'POST /test' });
-				// @ts-expect-error
+
 				const response = await adapter.handler(event, mockContext);
 
 				expect(response.statusCode).toBe(201);
@@ -337,7 +337,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 
 				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
 				const event = createMockV2Event({ routeKey: 'POST /test' });
-				// @ts-expect-error
+
 				const response = await adapter.handler(event, mockContext);
 
 				expect(response.statusCode).toBe(201);
@@ -362,7 +362,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 
 				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
 				const event = createMockV2Event();
-				// @ts-expect-error
+
 				const response = await adapter.handler(event, mockContext);
 
 				expect(response.multiValueHeaders?.['Set-Cookie']).toEqual([
@@ -384,7 +384,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 
 				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
 				const event = createMockV2Event();
-				// @ts-expect-error
+
 				const response = await adapter.handler(event, mockContext);
 
 				expect(response.statusCode).toBe(201);
@@ -403,7 +403,7 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 
 				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
 				const event = createMockV2Event();
-				// @ts-expect-error
+
 				const response = await adapter.handler(event, mockContext);
 
 				expect(response).toEqual({
@@ -414,5 +414,77 @@ describe('AmazonApiGatewayV2Endpoint', () => {
 				expect(response.multiValueHeaders).toBeUndefined();
 			});
 		});
+
+		describe('request cookies', () => {
+			it('should load cookies from V2 cookies array', async () => {
+				const endpoint = e
+					.get('/test')
+					.output(z.object({ session: z.string(), theme: z.string() }))
+					.handle(async ({ cookie }) => ({
+						session: cookie('session') ?? '',
+						theme: cookie('theme') ?? '',
+					}));
+
+				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
+				const event = createMockV2Event({
+					cookies: ['session=abc123', 'theme=dark'],
+				});
+
+				const response = await adapter.handler(event, mockContext);
+
+				expect(JSON.parse(response.body!)).toEqual({
+					session: 'abc123',
+					theme: 'dark',
+				});
+			});
+
+			it('should fall back to headers.cookie when cookies array is absent', async () => {
+				const endpoint = e
+					.get('/test')
+					.output(z.object({ session: z.string() }))
+					.handle(async ({ cookie }) => ({
+						session: cookie('session') ?? '',
+					}));
+
+				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
+				const event = createMockV2Event({
+					cookies: undefined,
+					headers: {
+						'content-type': 'application/json',
+						cookie: 'session=from-header',
+					},
+				});
+
+				const response = await adapter.handler(event, mockContext);
+
+				expect(JSON.parse(response.body!)).toEqual({
+					session: 'from-header',
+				});
+			});
+
+			it('should prefer V2 cookies array over headers.cookie', async () => {
+				const endpoint = e
+					.get('/test')
+					.output(z.object({ session: z.string() }))
+					.handle(async ({ cookie }) => ({
+						session: cookie('session') ?? '',
+					}));
+
+				const adapter = new AmazonApiGatewayV2Endpoint(envParser, endpoint);
+				const event = createMockV2Event({
+					cookies: ['session=from-array'],
+					headers: {
+						'content-type': 'application/json',
+						cookie: 'session=from-header',
+					},
+				});
+
+				const response = await adapter.handler(event, mockContext);
+
+				expect(JSON.parse(response.body!)).toEqual({
+					session: 'from-array',
+				});
+			});
+		});
 	});
 });

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;
 	}
 }