@navios/commander 0.7.1 → 0.9.0

package/lib/index.cjs

@@ -46,7 +46,7 @@ zod_v4 = __toESM(zod_v4);
 let util = require("util");
 let node_async_hooks = require("node:async_hooks");
 
-//#region ../core/lib/use-guards.decorator-kZ3lNK8v.mjs
+//#region ../core/lib/use-guards.decorator-CzVXuLkz.mjs
 const EndpointMetadataKey = Symbol("EndpointMetadataKey");
 function getAllEndpointMetadata(context) {
 	if (context.metadata) {
@@ -139,13 +139,13 @@ function hasModuleMetadata(target) {
 }
 /**
 * Decorator that marks a class as a Navios controller.
-* 
+*
 * Controllers handle HTTP requests and define endpoints.
 * They are request-scoped by default, meaning a new instance is created for each request.
-* 
+*
 * @param options - Controller configuration options
 * @returns A class decorator
-* 
+*
 * @example
 * ```typescript
 * @Controller({ guards: [AuthGuard] })
@@ -156,7 +156,7 @@ function hasModuleMetadata(target) {
 *   }
 * }
 * ```
-*/ function Controller({ guards } = {}) {
+*/ function Controller({ guards, registry, priority, scope } = {}) {
 	return function(target, context) {
 		if (context.kind !== "class") throw new Error("[Navios] @Controller decorator can only be used on classes.");
 		const token = _navios_di.InjectionToken.create(target);
@@ -166,7 +166,9 @@ function hasModuleMetadata(target) {
 		}
 		return (0, _navios_di.Injectable)({
 			token,
-			scope: _navios_di.InjectableScope.Request
+			registry,
+			priority,
+			scope
 		})(target, context);
 	};
 }
@@ -175,40 +177,12 @@ const ExecutionContextInjectionToken = "ExecutionContextInjectionToken";
 const ExecutionContext = _navios_di.InjectionToken.create(ExecutionContextInjectionToken);
 const HttpAdapterToken = _navios_di.InjectionToken.create("HttpAdapterToken");
 const MultipartAdapterToken = _navios_di.InjectionToken.create("MultipartAdapterToken");
+const NaviosOptionsToken = _navios_di.InjectionToken.create("NaviosOptionsToken");
 const Reply = _navios_di.InjectionToken.create("ReplyToken");
 const Request = _navios_di.InjectionToken.create("RequestToken");
 const StreamAdapterToken = _navios_di.InjectionToken.create("StreamAdapterToken");
 const XmlStreamAdapterToken = _navios_di.InjectionToken.create("XmlStreamAdapterToken");
-/**
-* Decorator that marks a method as an HTTP endpoint.
-*
-* The endpoint must be defined using @navios/builder's `declareEndpoint` method.
-* This ensures type safety and consistency between client and server.
-*
-* @param endpoint - The endpoint declaration from @navios/builder
-* @returns A method decorator
-*
-* @example
-* ```typescript
-* import { builder } from '@navios/builder'
-*
-* const api = builder()
-* const getUserEndpoint = api.declareEndpoint({
-*   method: 'get',
-*   url: '/users/$userId',
-*   responseSchema: z.object({ id: z.string(), name: z.string() }),
-* })
-*
-* @Controller()
-* export class UserController {
-*   @Endpoint(getUserEndpoint)
-*   async getUser(request: EndpointParams<typeof getUserEndpoint>) {
-*     const { userId } = request.urlParams
-*     return { id: userId, name: 'John' }
-*   }
-* }
-* ```
-*/ function Endpoint(endpoint) {
+function Endpoint(endpoint) {
 	return (target, context) => {
 		if (context.kind !== "method") throw new Error("[Navios] Endpoint decorator can only be used on methods.");
 		const config = endpoint.config;
@@ -279,13 +253,13 @@ const XmlStreamAdapterToken = _navios_di.InjectionToken.create("XmlStreamAdapter
 }
 /**
 * Decorator that marks a class as a Navios module.
-* 
+*
 * Modules are the basic building blocks of a Navios application.
 * They organize controllers, services, and other modules into logical units.
-* 
+*
 * @param options - Module configuration options
 * @returns A class decorator
-* 
+*
 * @example
 * ```typescript
 * @Module({
@@ -295,7 +269,7 @@ const XmlStreamAdapterToken = _navios_di.InjectionToken.create("XmlStreamAdapter
 * })
 * export class AppModule {}
 * ```
-*/ function Module({ controllers = [], imports = [], guards = [] } = {
+*/ function Module({ controllers = [], imports = [], guards = [], priority, registry } = {
 	controllers: [],
 	imports: [],
 	guards: []
@@ -309,41 +283,14 @@ const XmlStreamAdapterToken = _navios_di.InjectionToken.create("XmlStreamAdapter
 		for (const guard of Array.from(guards).reverse()) moduleMetadata.guards.add(guard);
 		return (0, _navios_di.Injectable)({
 			token,
-			scope: _navios_di.InjectableScope.Singleton
+			scope: _navios_di.InjectableScope.Singleton,
+			priority,
+			registry
 		})(target, context);
 	};
 }
-/**
-* Decorator that marks a method as a multipart/form-data endpoint.
-* 
-* Use this decorator for endpoints that handle file uploads or form data.
-* The endpoint must be defined using @navios/builder's `declareMultipart` method.
-* 
-* @param endpoint - The multipart endpoint declaration from @navios/builder
-* @returns A method decorator
-* 
-* @example
-* ```typescript
-* const uploadFileEndpoint = api.declareMultipart({
-*   method: 'post',
-*   url: '/upload',
-*   requestSchema: z.object({ file: z.instanceof(File) }),
-*   responseSchema: z.object({ url: z.string() }),
-* })
-* 
-* @Controller()
-* export class FileController {
-*   @Multipart(uploadFileEndpoint)
-*   async uploadFile(request: MultipartParams<typeof uploadFileEndpoint>) {
-*     const { file } = request.data
-*     // Handle file upload
-*     return { url: 'https://example.com/file.jpg' }
-*   }
-* }
-* ```
-*/ function Multipart(endpoint) {
+function Multipart(endpoint) {
 	return (target, context) => {
-		if (typeof target !== "function") throw new Error("[Navios] Endpoint decorator can only be used on functions.");
 		if (context.kind !== "method") throw new Error("[Navios] Endpoint decorator can only be used on methods.");
 		const config = endpoint.config;
 		if (context.metadata) {
@@ -358,34 +305,8 @@ const XmlStreamAdapterToken = _navios_di.InjectionToken.create("XmlStreamAdapter
 		return target;
 	};
 }
-/**
-* Decorator that marks a method as a streaming endpoint.
-* 
-* Use this decorator for endpoints that stream data (e.g., file downloads, SSE).
-* The endpoint must be defined using @navios/builder's `declareStream` method.
-* 
-* @param endpoint - The stream endpoint declaration from @navios/builder
-* @returns A method decorator
-* 
-* @example
-* ```typescript
-* const downloadFileEndpoint = api.declareStream({
-*   method: 'get',
-*   url: '/files/$fileId',
-* })
-* 
-* @Controller()
-* export class FileController {
-*   @Stream(downloadFileEndpoint)
-*   async downloadFile(request: StreamParams<typeof downloadFileEndpoint>, reply: any) {
-*     const { fileId } = request.urlParams
-*     // Stream file data to reply
-*   }
-* }
-* ```
-*/ function Stream(endpoint) {
+function Stream(endpoint) {
 	return (target, context) => {
-		if (typeof target !== "function") throw new Error("[Navios] Endpoint decorator can only be used on functions.");
 		if (context.kind !== "method") throw new Error("[Navios] Endpoint decorator can only be used on methods.");
 		const config = endpoint.config;
 		if (context.metadata) {
@@ -468,7 +389,7 @@ const XmlStreamAdapterToken = _navios_di.InjectionToken.create("XmlStreamAdapter
 };
 
 //#endregion
-//#region ../core/lib/src-DpPBxmjz.mjs
+//#region ../core/lib/src-Bo23RIo-.mjs
 function envInt(key, defaultValue) {
 	const envKey = node_process.env[key] || process.env[key];
 	return envKey ? parseInt(envKey, 10) : defaultValue;
@@ -551,6 +472,15 @@ const isConstructor = (val) => val === "constructor";
 const isNil = (val) => isUndefined(val) || val === null;
 const isEmpty = (array) => !(array && array.length > 0);
 const isSymbol = (val) => typeof val === "symbol";
+let requestCounter = 0;
+/**
+* Generates a simple incremental request ID.
+* Much faster than crypto.randomUUID() and sufficient for request tracking.
+*
+* @returns A unique request ID string (e.g., "req-1", "req-2", ...)
+*/ function generateRequestId() {
+	return `req-${++requestCounter}`;
+}
 /**
 * AsyncLocalStorage store for the current request ID.
 *
@@ -570,22 +500,42 @@ const isSymbol = (val) => typeof val === "symbol";
 * // Get current request ID (returns undefined if not in a request context)
 * const currentId = getRequestId()
 * ```
-*/ const requestIdStore = new node_async_hooks.AsyncLocalStorage();
+*/ let requestIdStore = null;
+function getRequestIdStore() {
+	if (!requestIdStore) requestIdStore = new node_async_hooks.AsyncLocalStorage();
+	return requestIdStore;
+}
+/**
+* Whether request ID propagation is enabled.
+* When disabled, runWithRequestId is a pass-through for better performance.
+*/ let requestIdEnabled = false;
+/**
+* Enables or disables request ID propagation.
+* Called by NaviosFactory based on the enableRequestId option.
+*
+* @param enabled - Whether to enable request ID propagation
+*/ function setRequestIdEnabled(enabled) {
+	requestIdEnabled = enabled;
+}
 /**
 * Runs a function with a request ID in the async local storage context.
+* If request ID propagation is disabled, the function is called directly
+* without AsyncLocalStorage overhead.
 *
 * @param requestId - The request ID to set for this context
 * @param fn - The function to run within this context
 * @returns The return value of the function
 */ function runWithRequestId(requestId, fn) {
-	return requestIdStore.run(requestId, fn);
+	if (!requestIdEnabled) return fn();
+	return getRequestIdStore().run(requestId, fn);
 }
 /**
 * Gets the current request ID from the async local storage context.
 *
 * @returns The current request ID, or undefined if not in a request context
 */ function getRequestId() {
-	return requestIdStore.getStore();
+	if (!requestIdEnabled) return;
+	return getRequestIdStore().getStore();
 }
 /**
 * Injection token for the logger output service.
@@ -607,7 +557,7 @@ const isSymbol = (val) => typeof val === "symbol";
 * logger.log('Hello world') // Logs with context: [MyService]
 * ```
 */ const Logger = _navios_di.InjectionToken.create("Logger", loggerOptionsSchema);
-function applyDecs2203RFactory$13() {
+function applyDecs2203RFactory$14() {
 	function createAddInitializerMethod(initializers, decoratorFinishedRef) {
 		return function addInitializer(initializer) {
 			assertNotFinished(decoratorFinishedRef, "addInitializer");
@@ -881,10 +831,10 @@ function applyDecs2203RFactory$13() {
 		};
 	};
 }
-function _apply_decs_2203_r$13(targetClass, memberDecs, classDecs, parentClass) {
-	return (_apply_decs_2203_r$13 = applyDecs2203RFactory$13())(targetClass, memberDecs, classDecs, parentClass);
+function _apply_decs_2203_r$14(targetClass, memberDecs, classDecs, parentClass) {
+	return (_apply_decs_2203_r$14 = applyDecs2203RFactory$14())(targetClass, memberDecs, classDecs, parentClass);
 }
-var _dec$13, _initClass$13;
+var _dec$14, _initClass$14;
 const DEFAULT_DEPTH = 5;
 const DEFAULT_LOG_LEVELS = [
 	"log",
@@ -903,10 +853,10 @@ const dateTimeFormatter = new Intl.DateTimeFormat(void 0, {
 	month: "2-digit"
 });
 let _ConsoleLogger;
-_dec$13 = (0, _navios_di.Injectable)({ token: LoggerOutput });
+_dec$14 = (0, _navios_di.Injectable)({ token: LoggerOutput });
 (class {
 	static {
-		({c: [_ConsoleLogger, _initClass$13]} = _apply_decs_2203_r$13(this, [], [_dec$13]));
+		({c: [_ConsoleLogger, _initClass$14]} = _apply_decs_2203_r$14(this, [], [_dec$14]));
 	}
 	/**
 	* The options of the logger.
@@ -1155,10 +1105,10 @@ _dec$13 = (0, _navios_di.Injectable)({ token: LoggerOutput });
 		}
 	}
 	static {
-		_initClass$13();
+		_initClass$14();
 	}
 });
-function applyDecs2203RFactory$12() {
+function applyDecs2203RFactory$13() {
 	function createAddInitializerMethod(initializers, decoratorFinishedRef) {
 		return function addInitializer(initializer) {
 			assertNotFinished(decoratorFinishedRef, "addInitializer");
@@ -1432,15 +1382,15 @@ function applyDecs2203RFactory$12() {
 		};
 	};
 }
-function _apply_decs_2203_r$12(targetClass, memberDecs, classDecs, parentClass) {
-	return (_apply_decs_2203_r$12 = applyDecs2203RFactory$12())(targetClass, memberDecs, classDecs, parentClass);
+function _apply_decs_2203_r$13(targetClass, memberDecs, classDecs, parentClass) {
+	return (_apply_decs_2203_r$13 = applyDecs2203RFactory$13())(targetClass, memberDecs, classDecs, parentClass);
 }
-var _dec$12, _initClass$12;
+var _dec$13, _initClass$13;
 let _LoggerInstance;
-_dec$12 = (0, _navios_di.Injectable)({ token: Logger });
+_dec$13 = (0, _navios_di.Injectable)({ token: Logger });
 (class {
 	static {
-		({c: [_LoggerInstance, _initClass$12]} = _apply_decs_2203_r$12(this, [], [_dec$12]));
+		({c: [_LoggerInstance, _initClass$13]} = _apply_decs_2203_r$13(this, [], [_dec$13]));
 	}
 	constructor(config = {}) {
 		this.context = config.context;
@@ -1472,10 +1422,10 @@ _dec$12 = (0, _navios_di.Injectable)({ token: Logger });
 		this.localInstance?.fatal?.(message, ...optionalParams);
 	}
 	static {
-		_initClass$12();
+		_initClass$13();
 	}
 });
-function applyDecs2203RFactory$11() {
+function applyDecs2203RFactory$12() {
 	function createAddInitializerMethod(initializers, decoratorFinishedRef) {
 		return function addInitializer(initializer) {
 			assertNotFinished(decoratorFinishedRef, "addInitializer");
@@ -1749,10 +1699,10 @@ function applyDecs2203RFactory$11() {
 		};
 	};
 }
-function _apply_decs_2203_r$11(targetClass, memberDecs, classDecs, parentClass) {
-	return (_apply_decs_2203_r$11 = applyDecs2203RFactory$11())(targetClass, memberDecs, classDecs, parentClass);
+function _apply_decs_2203_r$12(targetClass, memberDecs, classDecs, parentClass) {
+	return (_apply_decs_2203_r$12 = applyDecs2203RFactory$12())(targetClass, memberDecs, classDecs, parentClass);
 }
-var _dec$11, _initClass$11;
+var _dec$12, _initClass$12;
 /**
 * Schema for validating configuration service options.
 */ const ConfigServiceOptionsSchema = zod_v4.z.record(zod_v4.z.string(), zod_v4.z.unknown());
@@ -1760,11 +1710,11 @@ var _dec$11, _initClass$11;
 * Injection token for ConfigService.
 */ const ConfigServiceToken = _navios_di.InjectionToken.create(Symbol.for("ConfigService"), ConfigServiceOptionsSchema);
 let _ConfigService;
-_dec$11 = (0, _navios_di.Injectable)({ token: ConfigServiceToken });
+_dec$12 = (0, _navios_di.Injectable)({ token: ConfigServiceToken });
 (class {
 	config;
 	static {
-		({c: [_ConfigService, _initClass$11]} = _apply_decs_2203_r$11(this, [], [_dec$11]));
+		({c: [_ConfigService, _initClass$12]} = _apply_decs_2203_r$12(this, [], [_dec$12]));
 	}
 	/**
 	* Creates a new ConfigService instance.
@@ -1846,7 +1796,7 @@ _dec$11 = (0, _navios_di.Injectable)({ token: ConfigServiceToken });
 		return value;
 	}
 	static {
-		_initClass$11();
+		_initClass$12();
 	}
 });
 /**
@@ -2081,6 +2031,357 @@ _dec$11 = (0, _navios_di.Injectable)({ token: ConfigServiceToken });
 		super(409, message, error);
 	}
 };
+function applyDecs2203RFactory$11() {
+	function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+		return function addInitializer(initializer) {
+			assertNotFinished(decoratorFinishedRef, "addInitializer");
+			assertCallable(initializer, "An initializer");
+			initializers.push(initializer);
+		};
+	}
+	function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+		var kindStr;
+		switch (kind) {
+			case 1:
+				kindStr = "accessor";
+				break;
+			case 2:
+				kindStr = "method";
+				break;
+			case 3:
+				kindStr = "getter";
+				break;
+			case 4:
+				kindStr = "setter";
+				break;
+			default: kindStr = "field";
+		}
+		var ctx = {
+			kind: kindStr,
+			name: isPrivate ? "#" + name : name,
+			static: isStatic,
+			private: isPrivate,
+			metadata
+		};
+		var decoratorFinishedRef = { v: false };
+		ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+		var get, set;
+		if (kind === 0) if (isPrivate) {
+			get = desc.get;
+			set = desc.set;
+		} else {
+			get = function() {
+				return this[name];
+			};
+			set = function(v) {
+				this[name] = v;
+			};
+		}
+		else if (kind === 2) get = function() {
+			return desc.value;
+		};
+		else {
+			if (kind === 1 || kind === 3) get = function() {
+				return desc.get.call(this);
+			};
+			if (kind === 1 || kind === 4) set = function(v) {
+				desc.set.call(this, v);
+			};
+		}
+		ctx.access = get && set ? {
+			get,
+			set
+		} : get ? { get } : { set };
+		try {
+			return dec(value, ctx);
+		} finally {
+			decoratorFinishedRef.v = true;
+		}
+	}
+	function assertNotFinished(decoratorFinishedRef, fnName) {
+		if (decoratorFinishedRef.v) throw new Error("attempted to call " + fnName + " after decoration was finished");
+	}
+	function assertCallable(fn, hint) {
+		if (typeof fn !== "function") throw new TypeError(hint + " must be a function");
+	}
+	function assertValidReturnValue(kind, value) {
+		var type = typeof value;
+		if (kind === 1) {
+			if (type !== "object" || value === null) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+			if (value.get !== void 0) assertCallable(value.get, "accessor.get");
+			if (value.set !== void 0) assertCallable(value.set, "accessor.set");
+			if (value.init !== void 0) assertCallable(value.init, "accessor.init");
+		} else if (type !== "function") {
+			var hint;
+			if (kind === 0) hint = "field";
+			else if (kind === 10) hint = "class";
+			else hint = "method";
+			throw new TypeError(hint + " decorators must return a function or void 0");
+		}
+	}
+	function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+		var decs = decInfo[0];
+		var desc, init, value;
+		if (isPrivate) if (kind === 0 || kind === 1) desc = {
+			get: decInfo[3],
+			set: decInfo[4]
+		};
+		else if (kind === 3) desc = { get: decInfo[3] };
+		else if (kind === 4) desc = { set: decInfo[3] };
+		else desc = { value: decInfo[3] };
+		else if (kind !== 0) desc = Object.getOwnPropertyDescriptor(base, name);
+		if (kind === 1) value = {
+			get: desc.get,
+			set: desc.set
+		};
+		else if (kind === 2) value = desc.value;
+		else if (kind === 3) value = desc.get;
+		else if (kind === 4) value = desc.set;
+		var newValue, get, set;
+		if (typeof decs === "function") {
+			newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+			if (newValue !== void 0) {
+				assertValidReturnValue(kind, newValue);
+				if (kind === 0) init = newValue;
+				else if (kind === 1) {
+					init = newValue.init;
+					get = newValue.get || value.get;
+					set = newValue.set || value.set;
+					value = {
+						get,
+						set
+					};
+				} else value = newValue;
+			}
+		} else for (var i = decs.length - 1; i >= 0; i--) {
+			var dec = decs[i];
+			newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+			if (newValue !== void 0) {
+				assertValidReturnValue(kind, newValue);
+				var newInit;
+				if (kind === 0) newInit = newValue;
+				else if (kind === 1) {
+					newInit = newValue.init;
+					get = newValue.get || value.get;
+					set = newValue.set || value.set;
+					value = {
+						get,
+						set
+					};
+				} else value = newValue;
+				if (newInit !== void 0) if (init === void 0) init = newInit;
+				else if (typeof init === "function") init = [init, newInit];
+				else init.push(newInit);
+			}
+		}
+		if (kind === 0 || kind === 1) {
+			if (init === void 0) init = function(instance, init$1) {
+				return init$1;
+			};
+			else if (typeof init !== "function") {
+				var ownInitializers = init;
+				init = function(instance, init$1) {
+					var value$1 = init$1;
+					for (var i$1 = 0; i$1 < ownInitializers.length; i$1++) value$1 = ownInitializers[i$1].call(instance, value$1);
+					return value$1;
+				};
+			} else {
+				var originalInitializer = init;
+				init = function(instance, init$1) {
+					return originalInitializer.call(instance, init$1);
+				};
+			}
+			ret.push(init);
+		}
+		if (kind !== 0) {
+			if (kind === 1) {
+				desc.get = value.get;
+				desc.set = value.set;
+			} else if (kind === 2) desc.value = value;
+			else if (kind === 3) desc.get = value;
+			else if (kind === 4) desc.set = value;
+			if (isPrivate) if (kind === 1) {
+				ret.push(function(instance, args) {
+					return value.get.call(instance, args);
+				});
+				ret.push(function(instance, args) {
+					return value.set.call(instance, args);
+				});
+			} else if (kind === 2) ret.push(value);
+			else ret.push(function(instance, args) {
+				return value.call(instance, args);
+			});
+			else Object.defineProperty(base, name, desc);
+		}
+	}
+	function applyMemberDecs(Class, decInfos, metadata) {
+		var ret = [];
+		var protoInitializers;
+		var staticInitializers;
+		var existingProtoNonFields = /* @__PURE__ */ new Map();
+		var existingStaticNonFields = /* @__PURE__ */ new Map();
+		for (var i = 0; i < decInfos.length; i++) {
+			var decInfo = decInfos[i];
+			if (!Array.isArray(decInfo)) continue;
+			var kind = decInfo[1];
+			var name = decInfo[2];
+			var isPrivate = decInfo.length > 3;
+			var isStatic = kind >= 5;
+			var base;
+			var initializers;
+			if (isStatic) {
+				base = Class;
+				kind = kind - 5;
+				staticInitializers = staticInitializers || [];
+				initializers = staticInitializers;
+			} else {
+				base = Class.prototype;
+				protoInitializers = protoInitializers || [];
+				initializers = protoInitializers;
+			}
+			if (kind !== 0 && !isPrivate) {
+				var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+				var existingKind = existingNonFields.get(name) || 0;
+				if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+				else if (!existingKind && kind > 2) existingNonFields.set(name, kind);
+				else existingNonFields.set(name, true);
+			}
+			applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+		}
+		pushInitializers(ret, protoInitializers);
+		pushInitializers(ret, staticInitializers);
+		return ret;
+	}
+	function pushInitializers(ret, initializers) {
+		if (initializers) ret.push(function(instance) {
+			for (var i = 0; i < initializers.length; i++) initializers[i].call(instance);
+			return instance;
+		});
+	}
+	function applyClassDecs(targetClass, classDecs, metadata) {
+		if (classDecs.length > 0) {
+			var initializers = [];
+			var newClass = targetClass;
+			var name = targetClass.name;
+			for (var i = classDecs.length - 1; i >= 0; i--) {
+				var decoratorFinishedRef = { v: false };
+				try {
+					var nextNewClass = classDecs[i](newClass, {
+						kind: "class",
+						name,
+						addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+						metadata
+					});
+				} finally {
+					decoratorFinishedRef.v = true;
+				}
+				if (nextNewClass !== void 0) {
+					assertValidReturnValue(10, nextNewClass);
+					newClass = nextNewClass;
+				}
+			}
+			return [defineMetadata(newClass, metadata), function() {
+				for (var i$1 = 0; i$1 < initializers.length; i$1++) initializers[i$1].call(newClass);
+			}];
+		}
+	}
+	function defineMetadata(Class, metadata) {
+		return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+			configurable: true,
+			enumerable: true,
+			value: metadata
+		});
+	}
+	return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+		if (parentClass !== void 0) var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+		var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+		var e = applyMemberDecs(targetClass, memberDecs, metadata);
+		if (!classDecs.length) defineMetadata(targetClass, metadata);
+		return {
+			e,
+			get c() {
+				return applyClassDecs(targetClass, classDecs, metadata);
+			}
+		};
+	};
+}
+function _apply_decs_2203_r$11(targetClass, memberDecs, classDecs, parentClass) {
+	return (_apply_decs_2203_r$11 = applyDecs2203RFactory$11())(targetClass, memberDecs, classDecs, parentClass);
+}
+var _dec$11, _initClass$11;
+let _InstanceResolverService;
+_dec$11 = (0, _navios_di.Injectable)();
+(class {
+	static {
+		({c: [_InstanceResolverService, _initClass$11]} = _apply_decs_2203_r$11(this, [], [_dec$11]));
+	}
+	container = (0, _navios_di.inject)(_navios_di.Container);
+	/**
+	* Attempts to resolve a class instance, automatically detecting if it needs
+	* request scope based on its dependencies.
+	*
+	* @param classType - The class to resolve
+	* @returns A resolution result containing either a cached instance or resolver function
+	*/ async resolve(classType) {
+		let cachedInstance = null;
+		try {
+			cachedInstance = await this.container.get(classType);
+		} catch {
+			const token = (0, _navios_di.getInjectableToken)(classType);
+			this.container.getRegistry().updateScope(token, _navios_di.InjectableScope.Request);
+		}
+		return {
+			cached: cachedInstance !== null,
+			instance: cachedInstance,
+			resolve: (scoped) => scoped.get(classType)
+		};
+	}
+	/**
+	* Attempts to resolve multiple class instances, automatically detecting if any need
+	* request scope based on their dependencies.
+	*
+	* Returns `cached: true` only if ALL classes can be resolved as singletons.
+	* If any class has request-scoped dependencies, returns `cached: false`.
+	*
+	* @param classTypes - The classes to resolve
+	* @returns A resolution result containing either all cached instances or resolver function
+	*/ async resolveMany(classTypes) {
+		if (classTypes.length === 0) return {
+			cached: true,
+			instances: [],
+			classTypes: [],
+			resolve: async () => []
+		};
+		const results = await Promise.all(classTypes.map(async (classType) => {
+			try {
+				return {
+					success: true,
+					instance: await this.container.get(classType)
+				};
+			} catch {
+				const token = (0, _navios_di.getInjectableToken)(classType);
+				this.container.getRegistry().updateScope(token, _navios_di.InjectableScope.Request);
+				return {
+					success: false,
+					instance: null
+				};
+			}
+		}));
+		const allCached = results.every((r) => r.success);
+		return {
+			cached: allCached,
+			instances: allCached ? results.map((r) => r.instance) : null,
+			classTypes,
+			resolve: (scoped) => Promise.all(classTypes.map((classType) => scoped.get(classType)))
+		};
+	}
+	static {
+		_initClass$11();
+	}
+});
+/**
+* @deprecated Use InstanceResolverService instead
+*/ const ControllerResolverService = _InstanceResolverService;
 function applyDecs2203RFactory$10() {
 	function createAddInitializerMethod(initializers, decoratorFinishedRef) {
 		return function addInitializer(initializer) {
@@ -2366,23 +2667,40 @@ _dec$10 = (0, _navios_di.Injectable)();
 		({c: [_GuardRunnerService, _initClass$10]} = _apply_decs_2203_r$10(this, [], [_dec$10]));
 	}
 	logger = (0, _navios_di.inject)(Logger, { context: _GuardRunnerService.name });
-	async runGuards(allGuards, executionContext, context) {
-		let canActivate = true;
-		for (const guard of Array.from(allGuards).reverse()) {
+	/**
+	* Runs guards that need to be resolved from a scoped container.
+	* Use this when guards have request-scoped dependencies.
+	*/ async runGuards(allGuards, executionContext, context) {
+		const guardsArray = Array.from(allGuards).reverse();
+		const guardInstances = await Promise.all(guardsArray.map(async (guard) => {
 			const guardInstance = await context.get(guard);
 			if (!guardInstance.canActivate) throw new Error(`[Navios] Guard ${guard.name} does not implement canActivate()`);
-			try {
-				canActivate = await guardInstance.canActivate(executionContext);
-				if (!canActivate) break;
-			} catch (error) {
-				if (error instanceof HttpException) {
-					executionContext.getReply().status(error.statusCode).send(error.response);
-					return false;
-				} else {
-					this.logger.error("Error running guard", error);
-					executionContext.getReply().status(500).send({ message: "Internal server error" });
-					return false;
-				}
+			return guardInstance;
+		}));
+		return this.executeGuards(guardInstances, executionContext);
+	}
+	/**
+	* Runs pre-resolved guard instances.
+	* Use this when all guards are singletons and have been pre-resolved at startup.
+	*/ async runGuardsStatic(guardInstances, executionContext) {
+		return this.executeGuards(guardInstances, executionContext);
+	}
+	/**
+	* Shared guard execution logic.
+	* Iterates through guard instances and calls canActivate on each.
+	*/ async executeGuards(guardInstances, executionContext) {
+		let canActivate = true;
+		for (const guardInstance of guardInstances) try {
+			canActivate = await guardInstance.canActivate(executionContext);
+			if (!canActivate) break;
+		} catch (error) {
+			if (error instanceof HttpException) {
+				executionContext.getReply().status(error.statusCode).send(error.response);
+				return false;
+			} else {
+				this.logger.error("Error running guard", error);
+				executionContext.getReply().status(500).send({ message: "Internal server error" });
+				return false;
 			}
 		}
 		if (!canActivate) {
@@ -2699,10 +3017,53 @@ _dec$9 = (0, _navios_di.Injectable)();
 		await this.traverseModules(appModule);
 		this.initialized = true;
 	}
+	/**
+	* Extends the module tree with additional modules or controllers.
+	*
+	* This method is designed to be called by plugins during registration,
+	* which happens after initial module loading but before route registration.
+	*
+	* @param extensions - Array of module extensions to add
+	* @throws Error if not initialized (loadModules must be called first)
+	*
+	* @example
+	* ```typescript
+	* // In plugin registration
+	* const moduleLoader = await context.container.get(ModuleLoaderService)
+	* await moduleLoader.extendModules([{
+	*   controllers: [OpenApiJsonController, OpenApiYamlController],
+	*   moduleName: 'OpenApiBunModule',
+	* }])
+	* ```
+	*/ async extendModules(extensions) {
+		if (!this.initialized) throw new Error("ModuleLoaderService must be initialized before extending. Call loadModules() first.");
+		for (const extension of extensions) if (extension.module) await this.traverseModules(extension.module);
+		else if (extension.controllers && extension.moduleName) await this.registerControllers(extension.controllers, extension.moduleName);
+		else if (extension.controllers) throw new Error("moduleName is required when providing controllers without a module");
+	}
+	/**
+	* Registers controllers under a synthetic module.
+	* Used when plugins want to add controllers without a full module class.
+	*/ async registerControllers(controllers, moduleName) {
+		if (this.modulesMetadata.has(moduleName)) {
+			const existing = this.modulesMetadata.get(moduleName);
+			for (const controller of controllers) existing.controllers.add(controller);
+			this.logger.debug(`Extended module ${moduleName} with ${controllers.length} controllers`);
+		} else {
+			const metadata = {
+				controllers: new Set(controllers),
+				imports: /* @__PURE__ */ new Set(),
+				guards: /* @__PURE__ */ new Set(),
+				customAttributes: /* @__PURE__ */ new Map()
+			};
+			this.modulesMetadata.set(moduleName, metadata);
+			this.logger.debug(`Created module ${moduleName} with ${controllers.length} controllers`);
+		}
+	}
 	async traverseModules(module$1, parentMetadata) {
 		const metadata = extractModuleMetadata(module$1);
 		if (parentMetadata) this.mergeMetadata(metadata, parentMetadata);
-		const moduleName = module$1.name;
+		const moduleName = (0, _navios_di.getInjectableToken)(module$1).id;
 		if (this.modulesMetadata.has(moduleName)) return;
 		try {
 			this.modulesMetadata.set(moduleName, metadata);
@@ -3099,7 +3460,7 @@ _dec$8 = (0, _navios_di.Injectable)();
 	}
 	httpTokens = /* @__PURE__ */ new Map();
 	setupHttpEnvironment(tokens) {
-		this.httpTokens = tokens;
+		for (const [token, value] of tokens) this.httpTokens.set(token, value);
 	}
 	getHttpToken(token) {
 		return this.httpTokens.get(token);
@@ -5175,7 +5536,7 @@ _dec$1$1 = (0, _navios_di.Factory)({ token: XmlStreamAdapterToken });
 		_initClass$1$1();
 	}
 });
-function applyDecs2203RFactory$14() {
+function applyDecs2203RFactory$15() {
 	function createAddInitializerMethod(initializers, decoratorFinishedRef) {
 		return function addInitializer(initializer) {
 			assertNotFinished(decoratorFinishedRef, "addInitializer");
@@ -5449,15 +5810,15 @@ function applyDecs2203RFactory$14() {
 		};
 	};
 }
-function _apply_decs_2203_r$14(targetClass, memberDecs, classDecs, parentClass) {
-	return (_apply_decs_2203_r$14 = applyDecs2203RFactory$14())(targetClass, memberDecs, classDecs, parentClass);
+function _apply_decs_2203_r$15(targetClass, memberDecs, classDecs, parentClass) {
+	return (_apply_decs_2203_r$15 = applyDecs2203RFactory$15())(targetClass, memberDecs, classDecs, parentClass);
 }
-var _dec$14, _initClass$14;
+var _dec$15, _initClass$15;
 let _NaviosApplication;
-_dec$14 = (0, _navios_di.Injectable)();
+_dec$15 = (0, _navios_di.Injectable)();
 (class {
 	static {
-		({c: [_NaviosApplication, _initClass$14]} = _apply_decs_2203_r$14(this, [], [_dec$14]));
+		({c: [_NaviosApplication, _initClass$15]} = _apply_decs_2203_r$15(this, [], [_dec$15]));
 	}
 	environment = (0, _navios_di.inject)(_NaviosEnvironment);
 	moduleLoader = (0, _navios_di.inject)(_ModuleLoaderService);
@@ -5474,7 +5835,7 @@ _dec$14 = (0, _navios_di.Injectable)();
 	/**
 	* Sets up the application with the provided module and options.
 	* This is called automatically by NaviosFactory.create().
-	* 
+	*
 	* @param appModule - The root application module
 	* @param options - Application configuration options
 	* @internal
@@ -5485,7 +5846,7 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Gets the dependency injection container used by this application.
-	* 
+	*
 	* @returns The Container instance
 	*/ getContainer() {
 		return this.container;
@@ -5537,8 +5898,8 @@ _dec$14 = (0, _navios_di.Injectable)();
 		if (!this.appModule) throw new Error("App module is not set. Call setAppModule() first.");
 		await this.moduleLoader.loadModules(this.appModule);
 		if (this.environment.hasHttpSetup()) await this.httpApplication?.setupHttpServer(this.options);
-		await this.initModules();
 		await this.initPlugins();
+		await this.initModules();
 		if (this.environment.hasHttpSetup()) await this.httpApplication?.ready();
 		this.isInitialized = true;
 		this.logger.debug("Navios application initialized");
@@ -5549,11 +5910,16 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	async initPlugins() {
 		if (this.plugins.length === 0) return;
+		let server = null;
+		try {
+			server = this.httpApplication?.getServer() ?? null;
+		} catch {}
 		const context = {
 			modules: this.moduleLoader.getAllModules(),
-			server: this.httpApplication?.getServer() ?? null,
+			server,
 			container: this.container,
-			globalPrefix: this.httpApplication?.getGlobalPrefix() ?? ""
+			globalPrefix: this.httpApplication?.getGlobalPrefix() ?? "",
+			moduleLoader: this.moduleLoader
 		};
 		for (const { plugin, options } of this.plugins) {
 			this.logger.debug(`Initializing plugin: ${plugin.name}`);
@@ -5562,10 +5928,10 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Enables CORS (Cross-Origin Resource Sharing) for the application.
-	* 
+	*
 	* @param options - CORS configuration options (adapter-specific)
 	* @throws Error if HTTP application is not set
-	* 
+	*
 	* @example
 	* ```typescript
 	* app.enableCors({
@@ -5580,10 +5946,10 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Enables multipart/form-data support for file uploads.
-	* 
+	*
 	* @param options - Multipart configuration options (adapter-specific)
 	* @throws Error if HTTP application is not set
-	* 
+	*
 	* @example
 	* ```typescript
 	* app.enableMultipart({
@@ -5598,10 +5964,10 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Sets a global prefix for all routes.
-	* 
+	*
 	* @param prefix - The prefix to prepend to all route URLs (e.g., '/api')
 	* @throws Error if HTTP application is not set
-	* 
+	*
 	* @example
 	* ```typescript
 	* app.setGlobalPrefix('/api/v1')
@@ -5613,14 +5979,14 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Gets the underlying HTTP server instance.
-	* 
+	*
 	* The type of the returned server depends on the adapter used:
 	* - Fastify adapter: Returns FastifyInstance
 	* - Bun adapter: Returns Bun.Server
-	* 
+	*
 	* @returns The HTTP server instance
 	* @throws Error if HTTP application is not set
-	* 
+	*
 	* @example
 	* ```typescript
 	* const server = app.getServer()
@@ -5632,10 +5998,10 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Starts the HTTP server and begins listening for requests.
-	* 
+	*
 	* @param options - Listen options (port, host, etc.)
 	* @throws Error if HTTP application is not set
-	* 
+	*
 	* @example
 	* ```typescript
 	* await app.listen({ port: 3000, host: '0.0.0.0' })
@@ -5646,7 +6012,7 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Disposes of application resources.
-	* 
+	*
 	* Cleans up the HTTP server and module loader.
 	* This method is called automatically by `close()`.
 	*/ async dispose() {
@@ -5655,9 +6021,9 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	/**
 	* Closes the application and cleans up all resources.
-	* 
+	*
 	* This is an alias for `dispose()`.
-	* 
+	*
 	* @example
 	* ```typescript
 	* // Graceful shutdown
@@ -5670,36 +6036,36 @@ _dec$14 = (0, _navios_di.Injectable)();
 		await this.dispose();
 	}
 	static {
-		_initClass$14();
+		_initClass$15();
 	}
 });
 /**
 * Factory class for creating and configuring Navios applications.
-* 
+*
 * This is the main entry point for bootstrapping a Navios application.
 * It handles dependency injection container setup, adapter registration,
 * and logger configuration.
-* 
+*
 * @example
 * ```typescript
 * import { NaviosFactory } from '@navios/core'
 * import { defineFastifyEnvironment } from '@navios/adapter-fastify'
-* 
+*
 * const app = await NaviosFactory.create(AppModule, {
 *   adapter: defineFastifyEnvironment(),
 *   logger: ['log', 'error', 'warn'],
 * })
-* 
+*
 * await app.init()
 * await app.listen({ port: 3000 })
 * ```
 */ var NaviosFactory = class {
 	/**
 	* Creates a new Navios application instance.
-	* 
+	*
 	* This method sets up the dependency injection container, registers the HTTP adapter,
 	* configures logging, and initializes the application with the provided module.
-	* 
+	*
 	* @param appModule - The root application module class decorated with @Module()
 	* @param options - Configuration options for the application
 	* @param options.adapter - HTTP adapter environment (required for HTTP server functionality)
@@ -5709,20 +6075,20 @@ _dec$14 = (0, _navios_di.Injectable)();
 	*   - `false` to disable logging
 	* @param options.container - Optional custom dependency injection container (useful for testing)
 	* @returns A configured NaviosApplication instance ready to be initialized
-	* 
+	*
 	* @example
 	* ```typescript
 	* // Basic setup with Fastify adapter
 	* const app = await NaviosFactory.create(AppModule, {
 	*   adapter: defineFastifyEnvironment(),
 	* })
-	* 
+	*
 	* // With custom logger configuration
 	* const app = await NaviosFactory.create(AppModule, {
 	*   adapter: defineFastifyEnvironment(),
 	*   logger: ['error', 'warn', 'log'],
 	* })
-	* 
+	*
 	* // With custom container for testing
 	* const container = new Container()
 	* const app = await NaviosFactory.create(AppModule, {
@@ -5731,7 +6097,9 @@ _dec$14 = (0, _navios_di.Injectable)();
 	* })
 	* ```
 	*/ static async create(appModule, options = { adapter: [] }) {
-		const container = options.container ?? new _navios_di.Container();
+		const container = options.container ?? new _navios_di.Container(options.registry);
+		if (options.enableRequestId === true) setRequestIdEnabled(true);
+		container.addInstance(NaviosOptionsToken, options);
 		await this.registerLoggerConfiguration(container, options);
 		const adapters = Array.isArray(options.adapter) ? options.adapter : [options.adapter];
 		for (const adapter of adapters) await this.registerEnvironment(container, adapter);
@@ -5746,8 +6114,14 @@ _dec$14 = (0, _navios_di.Injectable)();
 	}
 	static async registerLoggerConfiguration(container, options) {
 		const { logger } = options;
-		if (Array.isArray(logger) || isNil(logger)) (await container.get(LoggerOutput))?.setup({ logLevels: logger });
-		if (logger !== true && !isNil(logger)) container.getServiceLocator().getManager().storeCreatedHolder(LoggerOutput.toString(), logger, _navios_di.InjectableType.Class, _navios_di.InjectableScope.Singleton);
+		if (Array.isArray(logger) || isNil(logger) || options.enableRequestId) {
+			(await container.get(LoggerOutput))?.setup({
+				logLevels: Array.isArray(logger) ? logger : void 0,
+				requestId: options.enableRequestId ?? false
+			});
+			return;
+		}
+		if (logger !== true && !isNil(logger)) container.addInstance(LoggerOutput, logger);
 	}
 };
 
@@ -5764,6 +6138,7 @@ var lib_exports = /* @__PURE__ */ __export({
 	ConsoleLogger: () => _ConsoleLogger,
 	Controller: () => Controller,
 	ControllerMetadataKey: () => ControllerMetadataKey,
+	ControllerResolverService: () => ControllerResolverService,
 	Endpoint: () => Endpoint,
 	EndpointAdapterFactory: () => _EndpointAdapterFactory,
 	EndpointAdapterToken: () => EndpointAdapterToken,
@@ -5778,6 +6153,7 @@ var lib_exports = /* @__PURE__ */ __export({
 	HttpAdapterToken: () => HttpAdapterToken,
 	HttpCode: () => HttpCode,
 	HttpException: () => HttpException,
+	InstanceResolverService: () => _InstanceResolverService,
 	InternalServerErrorException: () => InternalServerErrorException,
 	LOG_LEVELS: () => LOG_LEVELS,
 	Logger: () => Logger,
@@ -5791,6 +6167,7 @@ var lib_exports = /* @__PURE__ */ __export({
 	MultipartAdapterToken: () => MultipartAdapterToken,
 	NaviosApplication: () => _NaviosApplication,
 	NaviosFactory: () => NaviosFactory,
+	NaviosOptionsToken: () => NaviosOptionsToken,
 	NotFoundException: () => NotFoundException,
 	Reply: () => Reply,
 	ReplyFactory: () => _ReplyFactory,
@@ -5810,6 +6187,7 @@ var lib_exports = /* @__PURE__ */ __export({
 	extractControllerMetadata: () => extractControllerMetadata,
 	extractModuleMetadata: () => extractModuleMetadata,
 	filterLogLevels: () => filterLogLevels,
+	generateRequestId: () => generateRequestId,
 	getAllEndpointMetadata: () => getAllEndpointMetadata,
 	getControllerMetadata: () => getControllerMetadata,
 	getEndpointMetadata: () => getEndpointMetadata,
@@ -5832,8 +6210,8 @@ var lib_exports = /* @__PURE__ */ __export({
 	loggerOptionsSchema: () => loggerOptionsSchema,
 	normalizePath: () => normalizePath,
 	provideConfig: () => provideConfig,
-	requestIdStore: () => requestIdStore,
 	runWithRequestId: () => runWithRequestId,
+	setRequestIdEnabled: () => setRequestIdEnabled,
 	stripEndSlash: () => stripEndSlash,
 	yellow: () => yellow
 });
@@ -6318,7 +6696,7 @@ var CliModuleLoaderService = class {
 	async traverseModules(module$1, parentMetadata) {
 		const metadata = extractCliModuleMetadata(module$1);
 		if (parentMetadata) this.mergeMetadata(metadata, parentMetadata);
-		const moduleName = module$1.name;
+		const moduleName = (0, lib_exports.getInjectableToken)(module$1).id;
 		if (this.modulesMetadata.has(moduleName)) return;
 		this.modulesMetadata.set(moduleName, metadata);
 		for (const command of metadata.commands) {
@@ -7407,14 +7785,16 @@ var CommanderApplication = class {
 *   }
 * }
 * ```
-*/ function Command({ path, optionsSchema }) {
+*/ function Command({ path, optionsSchema, priority, registry }) {
 	return function(target, context) {
 		if (context.kind !== "class") throw new Error("[Navios Commander] @Command decorator can only be used on classes.");
 		const token = lib_exports.InjectionToken.create(target);
 		if (context.metadata) getCommandMetadata(target, context, path, optionsSchema);
 		return (0, lib_exports.Injectable)({
 			token,
-			scope: lib_exports.InjectableScope.Singleton
+			scope: lib_exports.InjectableScope.Singleton,
+			priority,
+			registry
 		})(target, context);
 	};
 }
@@ -7442,7 +7822,7 @@ var CommanderApplication = class {
 * })
 * export class AppModule {}
 * ```
-*/ function CliModule({ commands = [], imports = [] } = {
+*/ function CliModule({ commands = [], imports = [], priority, registry } = {
 	commands: [],
 	imports: []
 }) {
@@ -7454,7 +7834,9 @@ var CommanderApplication = class {
 		for (const importedModule of imports) moduleMetadata.imports.add(importedModule);
 		return (0, lib_exports.Injectable)({
 			token,
-			scope: lib_exports.InjectableScope.Singleton
+			scope: lib_exports.InjectableScope.Singleton,
+			priority,
+			registry
 		})(target, context);
 	};
 }
@@ -7482,6 +7864,7 @@ var src_exports = /* @__PURE__ */ __export({
 	ConsoleLogger: () => _ConsoleLogger,
 	Controller: () => Controller,
 	ControllerMetadataKey: () => ControllerMetadataKey,
+	ControllerResolverService: () => ControllerResolverService,
 	Endpoint: () => Endpoint,
 	EndpointAdapterFactory: () => _EndpointAdapterFactory,
 	EndpointAdapterToken: () => EndpointAdapterToken,
@@ -7496,6 +7879,7 @@ var src_exports = /* @__PURE__ */ __export({
 	HttpAdapterToken: () => HttpAdapterToken,
 	HttpCode: () => HttpCode,
 	HttpException: () => HttpException,
+	InstanceResolverService: () => _InstanceResolverService,
 	InternalServerErrorException: () => InternalServerErrorException,
 	LOG_LEVELS: () => LOG_LEVELS,
 	Logger: () => Logger,
@@ -7509,6 +7893,7 @@ var src_exports = /* @__PURE__ */ __export({
 	MultipartAdapterToken: () => MultipartAdapterToken,
 	NaviosApplication: () => _NaviosApplication,
 	NaviosFactory: () => NaviosFactory,
+	NaviosOptionsToken: () => NaviosOptionsToken,
 	NotFoundException: () => NotFoundException,
 	Reply: () => Reply,
 	ReplyFactory: () => _ReplyFactory,
@@ -7530,6 +7915,7 @@ var src_exports = /* @__PURE__ */ __export({
 	extractControllerMetadata: () => extractControllerMetadata,
 	extractModuleMetadata: () => extractModuleMetadata,
 	filterLogLevels: () => filterLogLevels,
+	generateRequestId: () => generateRequestId,
 	getAllEndpointMetadata: () => getAllEndpointMetadata,
 	getCliModuleMetadata: () => getCliModuleMetadata,
 	getCommandMetadata: () => getCommandMetadata,
@@ -7556,8 +7942,8 @@ var src_exports = /* @__PURE__ */ __export({
 	loggerOptionsSchema: () => loggerOptionsSchema,
 	normalizePath: () => normalizePath,
 	provideConfig: () => provideConfig,
-	requestIdStore: () => requestIdStore,
 	runWithRequestId: () => runWithRequestId,
+	setRequestIdEnabled: () => setRequestIdEnabled,
 	stripEndSlash: () => stripEndSlash,
 	yellow: () => yellow
 });
@@ -7609,6 +7995,7 @@ Object.defineProperty(exports, 'ConsoleLogger', {
 });
 exports.Controller = Controller;
 exports.ControllerMetadataKey = ControllerMetadataKey;
+exports.ControllerResolverService = ControllerResolverService;
 exports.Endpoint = Endpoint;
 Object.defineProperty(exports, 'EndpointAdapterFactory', {
   enumerable: true,
@@ -7638,6 +8025,12 @@ Object.defineProperty(exports, 'HttpAdapterFactory', {
 exports.HttpAdapterToken = HttpAdapterToken;
 exports.HttpCode = HttpCode;
 exports.HttpException = HttpException;
+Object.defineProperty(exports, 'InstanceResolverService', {
+  enumerable: true,
+  get: function () {
+    return _InstanceResolverService;
+  }
+});
 exports.InternalServerErrorException = InternalServerErrorException;
 exports.LOG_LEVELS = LOG_LEVELS;
 exports.Logger = Logger;
@@ -7671,6 +8064,7 @@ Object.defineProperty(exports, 'NaviosApplication', {
   }
 });
 exports.NaviosFactory = NaviosFactory;
+exports.NaviosOptionsToken = NaviosOptionsToken;
 exports.NotFoundException = NotFoundException;
 exports.Reply = Reply;
 Object.defineProperty(exports, 'ReplyFactory', {
@@ -7712,6 +8106,7 @@ exports.extractCommandMetadata = extractCommandMetadata;
 exports.extractControllerMetadata = extractControllerMetadata;
 exports.extractModuleMetadata = extractModuleMetadata;
 exports.filterLogLevels = filterLogLevels;
+exports.generateRequestId = generateRequestId;
 exports.getAllEndpointMetadata = getAllEndpointMetadata;
 exports.getCliModuleMetadata = getCliModuleMetadata;
 exports.getCommandMetadata = getCommandMetadata;
@@ -7738,8 +8133,8 @@ exports.isUndefined = isUndefined;
 exports.loggerOptionsSchema = loggerOptionsSchema;
 exports.normalizePath = normalizePath;
 exports.provideConfig = provideConfig;
-exports.requestIdStore = requestIdStore;
 exports.runWithRequestId = runWithRequestId;
+exports.setRequestIdEnabled = setRequestIdEnabled;
 exports.stripEndSlash = stripEndSlash;
 exports.yellow = yellow;
 Object.keys(_navios_di).forEach(function (k) {