@geekmidas/services 1.0.2 → 1.0.4

package/src/context.ts

@@ -19,6 +19,101 @@ export interface RequestContextData {
  */
 const requestContextStorage = new AsyncLocalStorage<RequestContextData>();
 
+/**
+ * Resolve the logger for the current request, or throw if there is none.
+ */
+function resolveRequestLogger(): Logger {
+	const store = requestContextStorage.getStore();
+	if (!store) {
+		throw new Error(
+			'ServiceContext.getLogger() called outside request context. ' +
+				'Ensure code runs within runWithRequestContext().',
+		);
+	}
+	return store.logger;
+}
+
+/**
+ * Create a Logger that re-resolves its underlying logger on every call instead
+ * of capturing it once.
+ *
+ * This is what makes it safe for a **singleton** service to grab the logger a
+ * single time (e.g. during `register()`, which `ServiceDiscovery` only runs
+ * once and then caches) and reuse that reference for every request: each log
+ * call resolves the *current* request's logger from `AsyncLocalStorage`, so
+ * requests no longer inherit the first request's logger (and its `requestId`,
+ * user bindings, etc.).
+ *
+ * Implemented as a `Proxy` rather than a fixed list of methods so it forwards
+ * the *entire* surface of whatever logger is supplied — including members
+ * beyond the base `Logger` interface (e.g. a richer pino-backed logger's
+ * `flush()` or `level`) and any methods added to `Logger` in the future.
+ *
+ * @param bindings - `child()` bindings applied, in order, on top of the
+ *   resolved logger before each call.
+ */
+function createRequestScopedLogger(bindings: object[] = []): Logger {
+	// Memoise the resolved (optionally child) logger per underlying base logger
+	// so we don't rebuild the child chain on every access within a request.
+	// Recomputed whenever the current request's logger changes — there is no
+	// await between the check and use, so this is safe under concurrency.
+	let cachedBase: Logger | undefined;
+	let cachedResolved: Logger | undefined;
+
+	const resolve = (): Logger => {
+		const base = resolveRequestLogger();
+		if (base !== cachedBase) {
+			cachedBase = base;
+			cachedResolved = bindings.reduce<Logger>(
+				(log, obj) => log.child(obj),
+				base,
+			);
+		}
+		return cachedResolved as Logger;
+	};
+
+	return new Proxy({} as Logger, {
+		get(_target, prop) {
+			// `child()` must stay request-scoped: return a new proxy carrying the
+			// extra binding, NOT the underlying logger's child (which would freeze
+			// to the current request).
+			if (prop === 'child') {
+				return (obj: object) => createRequestScopedLogger([...bindings, obj]);
+			}
+			// Never look like a thenable, and don't answer symbol/inspection probes
+			// (util.inspect, Symbol.toPrimitive, etc.) with bound functions.
+			if (prop === 'then' || typeof prop === 'symbol') {
+				return undefined;
+			}
+			const value = (resolve() as Record<string, unknown>)[prop];
+			// Functions are re-resolved at *call* time so detached references
+			// (`const info = logger.info`) still target the current request's
+			// logger. Non-function members (e.g. `level`) forward as their live
+			// value on the current request's logger.
+			return typeof value === 'function'
+				? (...args: unknown[]) =>
+						(resolve() as Record<string, (...a: unknown[]) => unknown>)[prop](
+							...args,
+						)
+				: value;
+		},
+		// Keep `'prop' in logger` / hasOwnProperty truthful against the underlying
+		// logger so feature-detection works.
+		has(_target, prop) {
+			if (prop === 'child') return true;
+			if (prop === 'then' || typeof prop === 'symbol') return false;
+			return prop in (resolve() as object);
+		},
+	});
+}
+
+/**
+ * Stable, process-wide request-scoped logger proxy. Shared across requests on
+ * purpose — it carries no request state itself, delegating to the current
+ * `AsyncLocalStorage` store on each call.
+ */
+const requestScopedLogger = createRequestScopedLogger();
+
 /**
  * ServiceContext implementation.
  * Singleton that reads from AsyncLocalStorage.
@@ -26,14 +121,13 @@ const requestContextStorage = new AsyncLocalStorage<RequestContextData>();
  */
 export const serviceContext: ServiceContext = {
 	getLogger() {
-		const store = requestContextStorage.getStore();
-		if (!store) {
-			throw new Error(
-				'ServiceContext.getLogger() called outside request context. ' +
-					'Ensure code runs within runWithRequestContext().',
-			);
-		}
-		return store.logger;
+		// Throw eagerly if there is no context, preserving the "catch bugs early"
+		// contract for callers that read the logger at an unexpected time.
+		resolveRequestLogger();
+		// Return the shared proxy rather than the raw `store.logger`. A service
+		// that captures this once still logs against the correct per-request
+		// logger because the proxy re-resolves on every call.
+		return requestScopedLogger;
 	},
 
 	getRequestId() {
@@ -89,3 +183,32 @@ export function runWithRequestContext<T>(
 ): T | Promise<T> {
 	return requestContextStorage.run(data, fn);
 }
+
+/**
+ * Mutate the current async task's store so that subsequent code in this task
+ * (and any descendants) sees the supplied request context.
+ *
+ * Unlike `runWithRequestContext`, this does not scope the context to a
+ * callback — useful when the caller can't wrap a function, for example in a
+ * Vitest fixture that suspends on `use()` and yields control to the test
+ * runner before the test body executes.
+ *
+ * **Test setup only.** In production handlers, prefer `runWithRequestContext`
+ * so the frame is automatically cleaned up.
+ */
+export function enterRequestContext(data: RequestContextData): void {
+	requestContextStorage.enterWith(data);
+}
+
+/**
+ * Clear the request context for the current async task. Pairs with
+ * `enterRequestContext`. After calling, `serviceContext.hasContext()` returns
+ * false for the remainder of the current async resource.
+ */
+export function exitRequestContext(): void {
+	// AsyncLocalStorage<T>.enterWith requires T, but Node accepts undefined at
+	// runtime — passing it resets getStore() back to undefined.
+	(requestContextStorage as unknown as AsyncLocalStorage<unknown>).enterWith(
+		undefined,
+	);
+}

package/src/index.ts

@@ -2,6 +2,8 @@
 
 // Re-export context utilities
 export {
+	enterRequestContext,
+	exitRequestContext,
 	type RequestContextData,
 	runWithRequestContext,
 	serviceContext,

package/src/types.ts

@@ -9,6 +9,13 @@ import type { Logger } from '@geekmidas/logger';
 export interface ServiceContext {
 	/**
 	 * Get the current request's logger.
+	 *
+	 * Returns a **request-scoped proxy** that re-resolves the underlying logger
+	 * from AsyncLocalStorage on every call. This makes it safe for a singleton
+	 * service to capture the logger once (e.g. during `register()`) and reuse it
+	 * across requests — each log call routes to the current request's logger
+	 * instead of freezing the first request's logger.
+	 *
 	 * @throws Error if called outside a request context
 	 */
 	getLogger(): Logger;

package/dist/context-B5YTspJR.mjs

@@ -1,61 +0,0 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-
-//#region src/context.ts
-/**
-* Internal AsyncLocalStorage instance for request context.
-* Not exported - use runWithRequestContext() to establish context
-* and serviceContext to access it.
-*/
-const requestContextStorage = new AsyncLocalStorage();
-/**
-* ServiceContext implementation.
-* Singleton that reads from AsyncLocalStorage.
-* Methods throw if called outside a request context (catches bugs early).
-*/
-const serviceContext = {
-	getLogger() {
-		const store = requestContextStorage.getStore();
-		if (!store) throw new Error("ServiceContext.getLogger() called outside request context. Ensure code runs within runWithRequestContext().");
-		return store.logger;
-	},
-	getRequestId() {
-		const store = requestContextStorage.getStore();
-		if (!store) throw new Error("ServiceContext.getRequestId() called outside request context. Ensure code runs within runWithRequestContext().");
-		return store.requestId;
-	},
-	getRequestStartTime() {
-		const store = requestContextStorage.getStore();
-		if (!store) throw new Error("ServiceContext.getRequestStartTime() called outside request context. Ensure code runs within runWithRequestContext().");
-		return store.startTime;
-	},
-	hasContext() {
-		return requestContextStorage.getStore() !== void 0;
-	}
-};
-/**
-* Run a function with request context.
-* Used by endpoint/function/subscriber adaptors.
-*
-* @param data - Request context data (logger, requestId, startTime)
-* @param fn - Function to run with context
-* @returns Result of the function
-*
-* @example
-* ```typescript
-* const result = await runWithRequestContext(
-*   { logger, requestId, startTime: Date.now() },
-*   async () => {
-*     // Inside here, serviceContext.getLogger() returns `logger`
-*     // serviceContext.getRequestId() returns `requestId`
-*     return await handleRequest();
-*   }
-* );
-* ```
-*/
-function runWithRequestContext(data, fn) {
-	return requestContextStorage.run(data, fn);
-}
-
-//#endregion
-export { runWithRequestContext, serviceContext };
-//# sourceMappingURL=context-B5YTspJR.mjs.map

package/dist/context-B5YTspJR.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-B5YTspJR.mjs","names":["serviceContext: ServiceContext","data: RequestContextData","fn: () => T | Promise<T>"],"sources":["../src/context.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { Logger } from '@geekmidas/logger';\nimport type { ServiceContext } from './types';\n\n/**\n * Internal storage for request context data.\n * Not exported - services use ServiceContext interface.\n */\nexport interface RequestContextData {\n\tlogger: Logger;\n\trequestId: string;\n\tstartTime: number;\n}\n\n/**\n * Internal AsyncLocalStorage instance for request context.\n * Not exported - use runWithRequestContext() to establish context\n * and serviceContext to access it.\n */\nconst requestContextStorage = new AsyncLocalStorage<RequestContextData>();\n\n/**\n * ServiceContext implementation.\n * Singleton that reads from AsyncLocalStorage.\n * Methods throw if called outside a request context (catches bugs early).\n */\nexport const serviceContext: ServiceContext = {\n\tgetLogger() {\n\t\tconst store = requestContextStorage.getStore();\n\t\tif (!store) {\n\t\t\tthrow new Error(\n\t\t\t\t'ServiceContext.getLogger() called outside request context. ' +\n\t\t\t\t\t'Ensure code runs within runWithRequestContext().',\n\t\t\t);\n\t\t}\n\t\treturn store.logger;\n\t},\n\n\tgetRequestId() {\n\t\tconst store = requestContextStorage.getStore();\n\t\tif (!store) {\n\t\t\tthrow new Error(\n\t\t\t\t'ServiceContext.getRequestId() called outside request context. ' +\n\t\t\t\t\t'Ensure code runs within runWithRequestContext().',\n\t\t\t);\n\t\t}\n\t\treturn store.requestId;\n\t},\n\n\tgetRequestStartTime() {\n\t\tconst store = requestContextStorage.getStore();\n\t\tif (!store) {\n\t\t\tthrow new Error(\n\t\t\t\t'ServiceContext.getRequestStartTime() called outside request context. ' +\n\t\t\t\t\t'Ensure code runs within runWithRequestContext().',\n\t\t\t);\n\t\t}\n\t\treturn store.startTime;\n\t},\n\n\thasContext() {\n\t\treturn requestContextStorage.getStore() !== undefined;\n\t},\n};\n\n/**\n * Run a function with request context.\n * Used by endpoint/function/subscriber adaptors.\n *\n * @param data - Request context data (logger, requestId, startTime)\n * @param fn - Function to run with context\n * @returns Result of the function\n *\n * @example\n * ```typescript\n * const result = await runWithRequestContext(\n *   { logger, requestId, startTime: Date.now() },\n *   async () => {\n *     // Inside here, serviceContext.getLogger() returns `logger`\n *     // serviceContext.getRequestId() returns `requestId`\n *     return await handleRequest();\n *   }\n * );\n * ```\n */\nexport function runWithRequestContext<T>(\n\tdata: RequestContextData,\n\tfn: () => T | Promise<T>,\n): T | Promise<T> {\n\treturn requestContextStorage.run(data, fn);\n}\n"],"mappings":";;;;;;;;AAmBA,MAAM,wBAAwB,IAAI;;;;;;AAOlC,MAAaA,iBAAiC;CAC7C,YAAY;EACX,MAAM,QAAQ,sBAAsB,UAAU;AAC9C,OAAK,MACJ,OAAM,IAAI,MACT;AAIF,SAAO,MAAM;CACb;CAED,eAAe;EACd,MAAM,QAAQ,sBAAsB,UAAU;AAC9C,OAAK,MACJ,OAAM,IAAI,MACT;AAIF,SAAO,MAAM;CACb;CAED,sBAAsB;EACrB,MAAM,QAAQ,sBAAsB,UAAU;AAC9C,OAAK,MACJ,OAAM,IAAI,MACT;AAIF,SAAO,MAAM;CACb;CAED,aAAa;AACZ,SAAO,sBAAsB,UAAU;CACvC;AACD;;;;;;;;;;;;;;;;;;;;;AAsBD,SAAgB,sBACfC,MACAC,IACiB;AACjB,QAAO,sBAAsB,IAAI,MAAM,GAAG;AAC1C"}

package/dist/context-BVeZOvOd.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-BVeZOvOd.d.cts","names":[],"sources":["../src/context.ts"],"sourcesContent":[],"mappings":";;;;;;;AAQA;AAkBA;AA2DgB,UA7EC,kBAAA,CA6EoB;EAAA,MAAA,EA5E5B,MA4E4B;EAAA,SAC9B,EAAA,MAAA;EAAkB,SACd,EAAA,MAAA;;;;;;AACG;cA9DD,gBAAgB;;;;;;;;;;;;;;;;;;;;;iBA2Db,+BACT,8BACI,IAAI,QAAQ,KACpB,IAAI,QAAQ"}

package/dist/context-DMExgNzl.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-DMExgNzl.d.mts","names":[],"sources":["../src/context.ts"],"sourcesContent":[],"mappings":";;;;;;;AAQA;AAkBA;AA2DgB,UA7EC,kBAAA,CA6EoB;EAAA,MAAA,EA5E5B,MA4E4B;EAAA,SAC9B,EAAA,MAAA;EAAkB,SACd,EAAA,MAAA;;;;;;AACG;cA9DD,gBAAgB;;;;;;;;;;;;;;;;;;;;;iBA2Db,+BACT,8BACI,IAAI,QAAQ,KACpB,IAAI,QAAQ"}

package/dist/context-DUTDtYd2.cjs

@@ -1,95 +0,0 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-const node_async_hooks = __toESM(require("node:async_hooks"));
-
-//#region src/context.ts
-/**
-* Internal AsyncLocalStorage instance for request context.
-* Not exported - use runWithRequestContext() to establish context
-* and serviceContext to access it.
-*/
-const requestContextStorage = new node_async_hooks.AsyncLocalStorage();
-/**
-* ServiceContext implementation.
-* Singleton that reads from AsyncLocalStorage.
-* Methods throw if called outside a request context (catches bugs early).
-*/
-const serviceContext = {
-	getLogger() {
-		const store = requestContextStorage.getStore();
-		if (!store) throw new Error("ServiceContext.getLogger() called outside request context. Ensure code runs within runWithRequestContext().");
-		return store.logger;
-	},
-	getRequestId() {
-		const store = requestContextStorage.getStore();
-		if (!store) throw new Error("ServiceContext.getRequestId() called outside request context. Ensure code runs within runWithRequestContext().");
-		return store.requestId;
-	},
-	getRequestStartTime() {
-		const store = requestContextStorage.getStore();
-		if (!store) throw new Error("ServiceContext.getRequestStartTime() called outside request context. Ensure code runs within runWithRequestContext().");
-		return store.startTime;
-	},
-	hasContext() {
-		return requestContextStorage.getStore() !== void 0;
-	}
-};
-/**
-* Run a function with request context.
-* Used by endpoint/function/subscriber adaptors.
-*
-* @param data - Request context data (logger, requestId, startTime)
-* @param fn - Function to run with context
-* @returns Result of the function
-*
-* @example
-* ```typescript
-* const result = await runWithRequestContext(
-*   { logger, requestId, startTime: Date.now() },
-*   async () => {
-*     // Inside here, serviceContext.getLogger() returns `logger`
-*     // serviceContext.getRequestId() returns `requestId`
-*     return await handleRequest();
-*   }
-* );
-* ```
-*/
-function runWithRequestContext(data, fn) {
-	return requestContextStorage.run(data, fn);
-}
-
-//#endregion
-Object.defineProperty(exports, 'runWithRequestContext', {
-  enumerable: true,
-  get: function () {
-    return runWithRequestContext;
-  }
-});
-Object.defineProperty(exports, 'serviceContext', {
-  enumerable: true,
-  get: function () {
-    return serviceContext;
-  }
-});
-//# sourceMappingURL=context-DUTDtYd2.cjs.map

package/dist/context-DUTDtYd2.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"context-DUTDtYd2.cjs","names":["AsyncLocalStorage","serviceContext: ServiceContext","data: RequestContextData","fn: () => T | Promise<T>"],"sources":["../src/context.ts"],"sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { Logger } from '@geekmidas/logger';\nimport type { ServiceContext } from './types';\n\n/**\n * Internal storage for request context data.\n * Not exported - services use ServiceContext interface.\n */\nexport interface RequestContextData {\n\tlogger: Logger;\n\trequestId: string;\n\tstartTime: number;\n}\n\n/**\n * Internal AsyncLocalStorage instance for request context.\n * Not exported - use runWithRequestContext() to establish context\n * and serviceContext to access it.\n */\nconst requestContextStorage = new AsyncLocalStorage<RequestContextData>();\n\n/**\n * ServiceContext implementation.\n * Singleton that reads from AsyncLocalStorage.\n * Methods throw if called outside a request context (catches bugs early).\n */\nexport const serviceContext: ServiceContext = {\n\tgetLogger() {\n\t\tconst store = requestContextStorage.getStore();\n\t\tif (!store) {\n\t\t\tthrow new Error(\n\t\t\t\t'ServiceContext.getLogger() called outside request context. ' +\n\t\t\t\t\t'Ensure code runs within runWithRequestContext().',\n\t\t\t);\n\t\t}\n\t\treturn store.logger;\n\t},\n\n\tgetRequestId() {\n\t\tconst store = requestContextStorage.getStore();\n\t\tif (!store) {\n\t\t\tthrow new Error(\n\t\t\t\t'ServiceContext.getRequestId() called outside request context. ' +\n\t\t\t\t\t'Ensure code runs within runWithRequestContext().',\n\t\t\t);\n\t\t}\n\t\treturn store.requestId;\n\t},\n\n\tgetRequestStartTime() {\n\t\tconst store = requestContextStorage.getStore();\n\t\tif (!store) {\n\t\t\tthrow new Error(\n\t\t\t\t'ServiceContext.getRequestStartTime() called outside request context. ' +\n\t\t\t\t\t'Ensure code runs within runWithRequestContext().',\n\t\t\t);\n\t\t}\n\t\treturn store.startTime;\n\t},\n\n\thasContext() {\n\t\treturn requestContextStorage.getStore() !== undefined;\n\t},\n};\n\n/**\n * Run a function with request context.\n * Used by endpoint/function/subscriber adaptors.\n *\n * @param data - Request context data (logger, requestId, startTime)\n * @param fn - Function to run with context\n * @returns Result of the function\n *\n * @example\n * ```typescript\n * const result = await runWithRequestContext(\n *   { logger, requestId, startTime: Date.now() },\n *   async () => {\n *     // Inside here, serviceContext.getLogger() returns `logger`\n *     // serviceContext.getRequestId() returns `requestId`\n *     return await handleRequest();\n *   }\n * );\n * ```\n */\nexport function runWithRequestContext<T>(\n\tdata: RequestContextData,\n\tfn: () => T | Promise<T>,\n): T | Promise<T> {\n\treturn requestContextStorage.run(data, fn);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmBA,MAAM,wBAAwB,IAAIA;;;;;;AAOlC,MAAaC,iBAAiC;CAC7C,YAAY;EACX,MAAM,QAAQ,sBAAsB,UAAU;AAC9C,OAAK,MACJ,OAAM,IAAI,MACT;AAIF,SAAO,MAAM;CACb;CAED,eAAe;EACd,MAAM,QAAQ,sBAAsB,UAAU;AAC9C,OAAK,MACJ,OAAM,IAAI,MACT;AAIF,SAAO,MAAM;CACb;CAED,sBAAsB;EACrB,MAAM,QAAQ,sBAAsB,UAAU;AAC9C,OAAK,MACJ,OAAM,IAAI,MACT;AAIF,SAAO,MAAM;CACb;CAED,aAAa;AACZ,SAAO,sBAAsB,UAAU;CACvC;AACD;;;;;;;;;;;;;;;;;;;;;AAsBD,SAAgB,sBACfC,MACAC,IACiB;AACjB,QAAO,sBAAsB,IAAI,MAAM,GAAG;AAC1C"}

package/dist/types-CcHmCx_U.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types-CcHmCx_U.d.mts","names":[],"sources":["../src/types.ts"],"sourcesContent":[],"mappings":";;;;;;;AAQA;AA8BA;;AAEY,UAhCK,cAAA,CAgCL;EAAiB;AAEL;AA8BxB;;EAAwB,SAIV,EAAA,EA/DA,MA+DA;EAAK;;;;EAO4C,YAAA,EAAA,EAAA,MAAA;;;;;;;;;;;;;;;;UA7C9C,sBAAA;;aAEL;;WAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8BO;;;;eAIH;;;;;;;oBAOK,yBAAyB,YAAY,QAAQ"}

package/dist/types-D7d_yeU5.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types-D7d_yeU5.d.cts","names":[],"sources":["../src/types.ts"],"sourcesContent":[],"mappings":";;;;;;;AAQA;AA8BA;;AAEY,UAhCK,cAAA,CAgCL;EAAiB;AAEL;AA8BxB;;EAAwB,SAIV,EAAA,EA/DA,MA+DA;EAAK;;;;EAO4C,YAAA,EAAA,EAAA,MAAA;;;;;;;;;;;;;;;;UA7C9C,sBAAA;;aAEL;;WAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA8BO;;;;eAIH;;;;;;;oBAOK,yBAAyB,YAAY,QAAQ"}