@xeno-js/core 0.1.13 → 1.1.1

package/dist/index.js

@@ -20,10 +20,7 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 
 // src/application/containers/container.utils.ts
-import {
-  Guards,
-  TOKENS
-} from "@xeno-js/shared";
+import { Guards, TOKENS } from "@xeno-js/shared";
 var ContainerUtils;
 var init_container_utils = __esm({
   "src/application/containers/container.utils.ts"() {
@@ -59,15 +56,11 @@ var init_container_utils = __esm({
        * @throws Error If the service is not found in the container.
        * @throws Error If the service is not a scoped service.
        */
-      async runExecute(endpoint, method, headers, transport, container, action) {
+      async runExecute(res, req, container, action) {
         const middleware = container.resolve(TOKENS.MIDDLEWARE);
-        return await middleware.execute(
-          { path: endpoint, method: method ?? "GET", transport },
-          { ...headers },
-          async () => {
-            return await action();
-          }
-        );
+        return await middleware.execute(req, res, async () => {
+          return await action();
+        });
       }
     });
   }
@@ -1023,7 +1016,6 @@ var init_gate_keeper = __esm({
           }
         }
         return Result14.ok(guest);
-        return Result14.ok(guest);
       }
     };
   }
@@ -1508,30 +1500,30 @@ var init_logger_utils = __esm({
        */
       async addLogger(container, opts) {
         const loggerDependencies = [];
-        const { Guards: Guards46, LOG_LEVEL: LOG_LEVEL7, TOKENS: TOKENS4 } = await import("@xeno-js/shared");
-        if (!Guards46.isDefined(opts) || opts.console) {
+        const { Guards: Guards47, LOG_LEVEL: LOG_LEVEL7, TOKENS: TOKENS5 } = await import("@xeno-js/shared");
+        if (!Guards47.isDefined(opts) || opts.console) {
           const { ConsoleLogger: ConsoleLogger2 } = await Promise.resolve().then(() => (init_console_logger(), console_logger_exports));
           loggerDependencies.push(new ConsoleLogger2(opts?.level));
         }
-        if (Guards46.isDefined(opts)) {
-          if (Guards46.isDefined(opts.sentry.config)) {
+        if (Guards47.isDefined(opts)) {
+          if (Guards47.isDefined(opts.sentry.config)) {
             const { SentryLoggerFactory: SentryLoggerFactory2 } = await Promise.resolve().then(() => (init_sentry_logger_factory(), sentry_logger_factory_exports));
             loggerDependencies.push(new SentryLoggerFactory2().create(opts));
           }
-          if (Guards46.isDefined(opts.pino.config)) {
+          if (Guards47.isDefined(opts.pino.config)) {
             const { PinoLoggerFactory: PinoLoggerFactory2 } = await Promise.resolve().then(() => (init_pino_logger_factory(), pino_logger_factory_exports));
             loggerDependencies.push(new PinoLoggerFactory2().create(opts));
           }
-          if (!Guards46.isNullOrEmpty(opts.customLoggers)) {
+          if (!Guards47.isNullOrEmpty(opts.customLoggers)) {
             const customLoggers = opts.customLoggers;
             customLoggers.forEach((fn) => {
-              if (Guards46.isDefined(fn)) loggerDependencies.push(fn(container));
+              if (Guards47.isDefined(fn)) loggerDependencies.push(fn(container));
             });
           }
         }
         const { BaseLogger } = await import("@xeno-js/shared");
-        container.addSingleton(TOKENS4.LOGGER, (c) => {
-          const context = c.resolve(TOKENS4.CONTEXT_ACCESSOR);
+        container.addSingleton(TOKENS5.LOGGER, (c) => {
+          const context = c.resolve(TOKENS5.CONTEXT_ACCESSOR);
           return new BaseLogger(context, opts?.level ?? LOG_LEVEL7.DEBUG, loggerDependencies);
         });
       }
@@ -1692,25 +1684,25 @@ var init_cache_utils = __esm({
        * @link https://github.com/xeno-js/xeno-js
        */
       async addCache(container, opts) {
-        const { Guards: Guards46, TOKENS: TOKENS4 } = await import("@xeno-js/shared");
-        if (!opts.inMemory && !Guards46.isDefined(opts.redis)) {
+        const { Guards: Guards47, TOKENS: TOKENS5 } = await import("@xeno-js/shared");
+        if (!opts.inMemory && !Guards47.isDefined(opts.redis)) {
           throw new Error(
             "No cache strategies are configured. Please provide at least one cache strategy."
           );
         }
         const { CacheKeyBuilder } = await import("@xeno-js/shared");
         container.addSingleton(
-          TOKENS4.CACHE_KEY_BUILDER,
-          (c) => new CacheKeyBuilder(c.resolve(TOKENS4.IDENTITY_ACCESSOR))
+          TOKENS5.CACHE_KEY_BUILDER,
+          (c) => new CacheKeyBuilder(c.resolve(TOKENS5.IDENTITY_ACCESSOR))
         );
-        if (opts.inMemory || !Guards46.isDefined(opts.redis)) {
+        if (opts.inMemory || !Guards47.isDefined(opts.redis)) {
           const { InMemoryCacheExtended: InMemoryCacheExtended2 } = await Promise.resolve().then(() => (init_inmemory_cache(), inmemory_cache_exports));
-          container.addSingleton(TOKENS4.CACHE, () => new InMemoryCacheExtended2());
+          container.addSingleton(TOKENS5.CACHE, () => new InMemoryCacheExtended2());
           return;
         }
-        if (Guards46.isDefined(opts.redis)) {
+        if (Guards47.isDefined(opts.redis)) {
           const { RedisCacheFactory: RedisCacheFactory2 } = await Promise.resolve().then(() => (init_redis_cache_factory(), redis_cache_factory_exports));
-          container.addSingleton(TOKENS4.CACHE, () => {
+          container.addSingleton(TOKENS5.CACHE, () => {
             const config = opts.redis;
             return new RedisCacheFactory2().create(config);
           });
@@ -1856,6 +1848,73 @@ var init_concurrency = __esm({
   }
 });
 
+// src/infrastructure/services/cookies/cookies.service.ts
+import { Guards as Guards24 } from "@xeno-js/shared";
+var CookieHandler;
+var init_cookies_service = __esm({
+  "src/infrastructure/services/cookies/cookies.service.ts"() {
+    "use strict";
+    CookieHandler = class {
+      constructor(contextAccessor, _config, _cookieOpts) {
+        this.contextAccessor = contextAccessor;
+        this._config = _config;
+        this._cookieOpts = _cookieOpts;
+      }
+      contextAccessor;
+      _config;
+      _cookieOpts;
+      getAll() {
+        const network = this.contextAccessor.getNetworkContext();
+        const req = network?.transport?.req;
+        if (!Guards24.isDefined(req) || Guards24.isNullOrEmpty(req.headers.get("cookie"))) return [];
+        return req.headers.get("cookie")?.split(";").map((cookie) => {
+          const [name, ...rest] = cookie.split("=");
+          return { name: name.trim(), value: rest.join("=") };
+        }) ?? [];
+      }
+      setAll(cookies) {
+        const network = this.contextAccessor.getNetworkContext();
+        const res = network?.transport?.res;
+        if (!Guards24.isDefined(res)) return;
+        const serializedCookies = cookies.map((c) => this.serialize(c));
+        const existingSetCookie = res.headers.getSetCookie();
+        res.headers.delete("Set-Cookie");
+        for (const cookie of [...existingSetCookie, ...serializedCookies]) {
+          res.headers.append("Set-Cookie", cookie);
+        }
+      }
+      serialize(cookie) {
+        const safeName = encodeURIComponent(cookie.name);
+        const safeValue = encodeURIComponent(cookie.value);
+        let str = `${safeName}=${safeValue}`;
+        const isProd = this._config.get("NODE_ENV") === "production";
+        const defaultOptions = {
+          path: this._cookieOpts.path,
+          httpOnly: this._cookieOpts.httpOnly,
+          secure: this._cookieOpts.secure ?? isProd,
+          sameSite: this._cookieOpts.sameSite ?? "Lax"
+        };
+        const opts = { ...defaultOptions, ...cookie.options ?? {} };
+        str += `; Path=${opts.path}`;
+        if (Guards24.isDefined(opts.maxAge)) str += `; Max-Age=${opts.maxAge}`;
+        if (Guards24.isDefined(opts.domain)) str += `; Domain=${opts.domain}`;
+        if (Guards24.isDefined(opts.sameSite)) str += `; SameSite=${opts.sameSite}`;
+        if (opts.secure) str += `; Secure`;
+        if (opts.httpOnly) str += `; HttpOnly`;
+        return str;
+      }
+    };
+  }
+});
+
+// src/infrastructure/services/cookies/index.ts
+var init_cookies = __esm({
+  "src/infrastructure/services/cookies/index.ts"() {
+    "use strict";
+    init_cookies_service();
+  }
+});
+
 // src/infrastructure/services/crypto/crypto.service.ts
 var EdgeCryptoService;
 var init_crypto_service = __esm({
@@ -1904,7 +1963,7 @@ var init_crypto = __esm({
 });
 
 // src/infrastructure/services/csrf/csrf-token.service.ts
-import { Guards as Guards24 } from "@xeno-js/shared";
+import { Guards as Guards25 } from "@xeno-js/shared";
 var CsrfTokenService;
 var init_csrf_token_service = __esm({
   "src/infrastructure/services/csrf/csrf-token.service.ts"() {
@@ -1927,7 +1986,7 @@ var init_csrf_token_service = __esm({
         if (separatorIndex <= 0) return false;
         const nonce = token.slice(0, separatorIndex);
         const signature = token.slice(separatorIndex + 1);
-        if (Guards24.isNullOrEmpty(nonce) || Guards24.isNullOrEmpty(signature)) return false;
+        if (Guards25.isNullOrEmpty(nonce) || Guards25.isNullOrEmpty(signature)) return false;
         const expected = await this._cryptoService.hmacSha256(this._secret, `${subject}.${nonce}`);
         const encoder = new TextEncoder();
         const actualBuffer = encoder.encode(signature);
@@ -1948,24 +2007,26 @@ var init_csrf = __esm({
 });
 
 // src/infrastructure/services/extractors/extract-bearer.extractor.ts
-import { Guards as Guards25, StringHelper as StringHelper2 } from "@xeno-js/shared";
+import { Guards as Guards26 } from "@xeno-js/shared";
 var BearerTokenExtractor;
 var init_extract_bearer_extractor = __esm({
   "src/infrastructure/services/extractors/extract-bearer.extractor.ts"() {
     "use strict";
     BearerTokenExtractor = class {
+      constructor(_cookiePrefix) {
+        this._cookiePrefix = _cookiePrefix;
+      }
+      _cookiePrefix;
       extract(headers) {
-        const authHeader = StringHelper2.getSingleValue(headers["authorization"]);
-        if (!Guards25.isDefined(authHeader)) {
-          return void 0;
-        }
-        if (authHeader.toLowerCase().startsWith("bearer ")) {
+        const authHeader = headers.get("Authorization");
+        if (Guards26.isDefined(authHeader) && authHeader.toLowerCase().startsWith("bearer ")) {
           return authHeader.substring(7);
         }
-        const cookieHeader = StringHelper2.getSingleValue(headers["cookie"]);
-        if (Guards25.isDefined(cookieHeader)) {
-          const match = /sb-access-token=([^;]+)/.exec(cookieHeader);
-          if (!Guards25.isNullOrEmpty(match) && Guards25.isDefined(match[1])) {
+        const cookieHeader = headers.get("cookie");
+        if (Guards26.isDefined(cookieHeader)) {
+          const regex = new RegExp(`${this._cookiePrefix}=([^;]+)`);
+          const match = regex.exec(cookieHeader);
+          if (!Guards26.isNullOrEmpty(match) && Guards26.isDefined(match[1])) {
             return match[1].trim();
           }
         }
@@ -1976,47 +2037,44 @@ var init_extract_bearer_extractor = __esm({
 });
 
 // src/infrastructure/services/extractors/extract-ssr-bearer.extractor.ts
-import {
-  Guards as Guards26,
-  StringHelper as StringHelper3
-} from "@xeno-js/shared";
+import { Guards as Guards27, StringHelper as StringHelper2 } from "@xeno-js/shared";
 var SupabaseSsrTokenExtractor;
 var init_extract_ssr_bearer_extractor = __esm({
   "src/infrastructure/services/extractors/extract-ssr-bearer.extractor.ts"() {
     "use strict";
     SupabaseSsrTokenExtractor = class {
       extract(headers) {
-        const authHeader = StringHelper3.getSingleValue(headers["authorization"]);
-        if (Guards26.isDefined(authHeader) && authHeader.toLowerCase().startsWith("bearer ")) {
+        const authHeader = headers.get("authorization");
+        if (Guards27.isDefined(authHeader) && authHeader.toLowerCase().startsWith("bearer ")) {
           return authHeader.substring(7);
         }
-        const cookieHeader = StringHelper3.getSingleValue(headers["cookie"]);
-        if (Guards26.isNullOrEmpty(cookieHeader)) return void 0;
+        const cookieHeader = headers.get("cookie");
+        if (Guards27.isNullOrEmpty(cookieHeader)) return void 0;
         const cookies = cookieHeader.split(";").map((c) => c.trim());
         const tokenChunks = {};
         let unchunkedToken;
         for (const cookie of cookies) {
           const [name, ...rest] = cookie.split("=");
-          if (!Guards26.isDefined(name) || Guards26.isNullOrEmpty(rest)) continue;
+          if (!Guards27.isDefined(name) || Guards27.isNullOrEmpty(rest)) continue;
           const value = decodeURIComponent(rest.join("="));
-          if (Guards26.isDefined(/^sb-[a-z0-9]+-auth-token$/.exec(name))) {
+          if (Guards27.isDefined(/^sb-[a-z0-9]+-auth-token$/.exec(name))) {
             unchunkedToken = value;
           } else {
             const match = /^sb-[a-z0-9]+-auth-token\.(\d+)$/.exec(name);
-            if (Guards26.isDefined(match)) tokenChunks[parseInt(match[1], 10)] = value;
+            if (Guards27.isDefined(match)) tokenChunks[parseInt(match[1], 10)] = value;
           }
         }
         let fullTokenString = unchunkedToken;
-        if (!Guards26.isDefined(fullTokenString) && Object.keys(tokenChunks).length > 0) {
+        if (!Guards27.isDefined(fullTokenString) && Object.keys(tokenChunks).length > 0) {
           const indices = Object.keys(tokenChunks).map(Number).sort((a, b) => a - b);
           fullTokenString = indices.map((i) => tokenChunks[i]).join("");
         }
-        if (Guards26.isNullOrEmpty(fullTokenString)) return void 0;
+        if (Guards27.isNullOrEmpty(fullTokenString)) return void 0;
         try {
-          const parsed = StringHelper3.safeParse(fullTokenString);
-          if (Guards26.isDefined(parsed) && Guards26.isObject(parsed) && "access_token" in parsed) {
+          const parsed = StringHelper2.safeParse(fullTokenString);
+          if (Guards27.isDefined(parsed) && Guards27.isObject(parsed) && "access_token" in parsed) {
             const accessToken = parsed["access_token"];
-            if (Guards26.isString(accessToken)) return accessToken;
+            if (Guards27.isString(accessToken)) return accessToken;
           }
         } catch {
           return void 0;
@@ -2027,14 +2085,14 @@ var init_extract_ssr_bearer_extractor = __esm({
 });
 
 // src/infrastructure/services/extractors/http-cookie.extractor.ts
-import { Guards as Guards27 } from "@xeno-js/shared";
+import { Guards as Guards28 } from "@xeno-js/shared";
 var HttpCookieExtractor;
 var init_http_cookie_extractor = __esm({
   "src/infrastructure/services/extractors/http-cookie.extractor.ts"() {
     "use strict";
     HttpCookieExtractor = class {
       extract(cookie) {
-        if (!Guards27.isDefined(cookie.header)) return void 0;
+        if (!Guards28.isDefined(cookie.header)) return void 0;
         for (const rawCookie of cookie.header.split(";")) {
           const separatorIndex = rawCookie.indexOf("=");
           if (separatorIndex <= 0) continue;
@@ -2054,13 +2112,7 @@ var init_http_cookie_extractor = __esm({
 });
 
 // src/infrastructure/services/extractors/http-header.extractor.ts
-import {
-  Guards as Guards28,
-  GuidHelper as GuidHelper4,
-  HttpHelper,
-  MathHelper,
-  StringHelper as StringHelper4
-} from "@xeno-js/shared";
+import { Guards as Guards29, GuidHelper as GuidHelper4, HttpHelper, MathHelper } from "@xeno-js/shared";
 var HttpHeaderExtractor;
 var init_http_header_extractor = __esm({
   "src/infrastructure/services/extractors/http-header.extractor.ts"() {
@@ -2086,29 +2138,29 @@ var init_http_header_extractor = __esm({
       _trustedIp;
       _cookieName;
       extract(headers) {
-        const correlationId = GuidHelper4.parse(StringHelper4.getSingleValue(headers["x-correlation-id"]));
-        const requestId = GuidHelper4.parse(StringHelper4.getSingleValue(headers["x-request-id"]));
+        const correlationId = GuidHelper4.parse(headers.get("x-correlation-id") ?? void 0);
+        const requestId = GuidHelper4.parse(headers.get("x-request-id") ?? void 0);
         const token = this._bearerExtractor.extract(headers);
-        const clientIp = StringHelper4.getSingleValue(headers[this._trustedIp?.toLowerCase() ?? "x-forwarded-for"]) ?? StringHelper4.getSingleValue(headers["x-real-ip"]);
-        const spanId = GuidHelper4.parse(StringHelper4.getSingleValue(headers["x-span-id"]));
-        const parentSpanId = StringHelper4.getSingleValue(headers["x-parent-span-id"]);
-        const acceptHeader = StringHelper4.getSingleValue(headers["accept"]);
-        const contentTypeHeader = StringHelper4.getSingleValue(headers["content-type"]);
-        const userAgent = StringHelper4.getSingleValue(headers["user-agent"]);
-        const returnAddress = StringHelper4.getSingleValue(headers["x-return-address"]);
-        const sequenceId = StringHelper4.getSingleValue(headers["x-sequence-id"]);
-        const position = StringHelper4.getSingleValue(headers["x-sequence-position"]);
-        const size = StringHelper4.getSingleValue(headers["x-sequence-size"]);
-        const expiration = StringHelper4.getSingleValue(headers["x-expiration"]);
-        const csrf = StringHelper4.getSingleValue(headers["x-csrf-token"]);
-        const cookieHeader = StringHelper4.getSingleValue(headers["cookie"]);
+        const clientIp = headers.get(this._trustedIp?.toLowerCase() ?? "x-forwarded-for") ?? headers.get("x-real-ip") ?? void 0;
+        const spanId = GuidHelper4.parse(headers.get("x-span-id") ?? void 0);
+        const parentSpanId = headers.get("x-parent-span-id") ?? void 0;
+        const acceptHeader = headers.get("accept");
+        const contentTypeHeader = headers.get("content-type");
+        const userAgent = headers.get("user-agent") ?? void 0;
+        const returnAddress = headers.get("x-return-address") ?? void 0;
+        const sequenceId = headers.get("x-sequence-id") ?? void 0;
+        const position = headers.get("x-sequence-position");
+        const size = headers.get("x-sequence-size");
+        const expiration = headers.get("x-expiration");
+        const csrf = headers.get("x-csrf-token") ?? void 0;
+        const cookieHeader = headers.get("cookie") ?? void 0;
         const csrfCookie = this._cookieExtractor.extract({
           header: cookieHeader,
           name: this._cookieName
         });
-        const origin = StringHelper4.getSingleValue(headers["origin"]);
+        const origin = headers.get("origin") ?? void 0;
         const cleanOrigin = HttpHelper.sanitizeOriginUrl(origin);
-        const referer = StringHelper4.getSingleValue(headers["referer"]);
+        const referer = headers.get("referer") ?? void 0;
         const cleanReferer = HttpHelper.sanitizeOriginUrl(referer);
         const accept = acceptHeader === "*/*" ? void 0 : acceptHeader;
         const formatIndicator = accept ?? contentTypeHeader ?? "application/json";
@@ -2128,10 +2180,10 @@ var init_http_header_extractor = __esm({
           referer: cleanReferer,
           sequence: {
             sequenceId,
-            position: Guards28.isDefined(position) ? MathHelper.toNumber(position) : void 0,
-            size: Guards28.isDefined(size) ? MathHelper.toNumber(size) : void 0
+            position: Guards29.isDefined(position) ? MathHelper.toNumber(position) : void 0,
+            size: Guards29.isDefined(size) ? MathHelper.toNumber(size) : void 0
           },
-          expiration: Guards28.isDefined(expiration) ? MathHelper.toNumber(expiration) : void 0
+          expiration: Guards29.isDefined(expiration) ? MathHelper.toNumber(expiration) : void 0
         };
         return metadata;
       }
@@ -2178,7 +2230,7 @@ var init_resiliences = __esm({
 });
 
 // src/infrastructure/services/resolver/utils/socket.utils.ts
-import { Guards as Guards29 } from "@xeno-js/shared";
+import { Guards as Guards30 } from "@xeno-js/shared";
 var SocketIpExtractor;
 var init_socket_utils = __esm({
   "src/infrastructure/services/resolver/utils/socket.utils.ts"() {
@@ -2190,7 +2242,7 @@ var init_socket_utils = __esm({
        * @returns The IP address of the remote socket, or undefined if not available.
        */
       extract(req) {
-        if (Guards29.isDefined(req) && Guards29.isObject(req)) {
+        if (Guards30.isDefined(req) && Guards30.isObject(req)) {
           const candidate = req;
           return candidate.socket?.remoteAddress ?? candidate.connection?.remoteAddress;
         }
@@ -2209,7 +2261,7 @@ var init_utils = __esm({
 });
 
 // src/infrastructure/services/resolver/client-ip.resolver.ts
-import { Guards as Guards30 } from "@xeno-js/shared";
+import { Guards as Guards31 } from "@xeno-js/shared";
 var ClientIpResolver;
 var init_client_ip_resolver = __esm({
   "src/infrastructure/services/resolver/client-ip.resolver.ts"() {
@@ -2222,11 +2274,11 @@ var init_client_ip_resolver = __esm({
       _trustedProxies;
       resolve(req, clientIp) {
         const socketIp = SocketIpExtractor.extract(req);
-        if (!Guards30.isDefined(socketIp))
-          return !Guards30.isNullOrEmpty(clientIp) ? clientIp.split(",")[0].trim() : void 0;
+        if (!Guards31.isDefined(socketIp))
+          return !Guards31.isNullOrEmpty(clientIp) ? clientIp.split(",")[0].trim() : void 0;
         const isTrustedProxy = this._trustedProxies.includes(socketIp);
         if (!isTrustedProxy) return socketIp;
-        if (Guards30.isDefined(clientIp)) return clientIp.split(",")[0].trim();
+        if (Guards31.isDefined(clientIp)) return clientIp.split(",")[0].trim();
         return socketIp;
       }
     };
@@ -2248,6 +2300,7 @@ __export(services_exports, {
   AllowOrigin: () => AllowOrigin,
   BearerTokenExtractor: () => BearerTokenExtractor,
   ClientIpResolver: () => ClientIpResolver,
+  CookieHandler: () => CookieHandler,
   CsrfTokenService: () => CsrfTokenService,
   EdgeCryptoService: () => EdgeCryptoService,
   HttpCookieExtractor: () => HttpCookieExtractor,
@@ -2262,6 +2315,7 @@ var init_services = __esm({
     init_allow_methods();
     init_allow_origins();
     init_concurrency();
+    init_cookies();
     init_crypto();
     init_csrf();
     init_extractors();
@@ -2291,13 +2345,13 @@ var init_allow_method_factory = __esm({
 // src/infrastructure/factories/axios.factory.ts
 import http from "http";
 import https from "https";
-import { AxiosFactory, AxiosHttpClient } from "@xeno-js/shared";
+import { AxiosHttpClient } from "@xeno-js/shared";
 import axios from "axios";
 var NodeAxiosFactory;
 var init_axios_factory = __esm({
   "src/infrastructure/factories/axios.factory.ts"() {
     "use strict";
-    NodeAxiosFactory = class extends AxiosFactory {
+    NodeAxiosFactory = class {
       create(config) {
         const isKeepAlive = config.keepAlive ?? true;
         const maxSockets = config.maxSockets ?? 100;
@@ -2329,7 +2383,7 @@ var init_axios_factory = __esm({
 });
 
 // src/infrastructure/factories/cockatiel-resilience.factory.ts
-import { AppError as AppError13, Guards as Guards31, RESILIENCE_DEFAULTS } from "@xeno-js/shared";
+import { AppError as AppError13, Guards as Guards32, RESILIENCE_DEFAULTS } from "@xeno-js/shared";
 import {
   bulkhead,
   circuitBreaker,
@@ -2406,13 +2460,13 @@ var init_cockatiel_resilience_factory = __esm({
         return new ServiceResilience(wrap(bulkheadPolicy, circuitBreakerPolicy, retryPolicy));
       }
       isTransientError(error) {
-        if (!Guards31.isDefined(error) || !Guards31.isObject(error)) return false;
+        if (!Guards32.isDefined(error) || !Guards32.isObject(error)) return false;
         let status;
         let isNetworkError = false;
         if (error instanceof AppError13) {
           status = error.status;
           const cause = error.cause;
-          if (Guards31.isDefined(cause) && Guards31.isString(cause.code)) {
+          if (Guards32.isDefined(cause) && Guards32.isString(cause.code)) {
             isNetworkError = [
               "ECONNABORTED",
               "ECONNRESET",
@@ -2424,7 +2478,7 @@ var init_cockatiel_resilience_factory = __esm({
         } else {
           const err = error;
           status = err.status;
-          if (Guards31.isString(err.code)) {
+          if (Guards32.isString(err.code)) {
             isNetworkError = [
               "ECONNABORTED",
               "ECONNRESET",
@@ -2435,7 +2489,7 @@ var init_cockatiel_resilience_factory = __esm({
           }
         }
         if (isNetworkError) return true;
-        if (Guards31.isDefined(status)) return status === 408 || status >= 500 && status < 600;
+        if (Guards32.isDefined(status)) return status === 408 || status >= 500 && status < 600;
         return false;
       }
       isTransientAndIdempotent(error) {
@@ -2443,22 +2497,22 @@ var init_cockatiel_resilience_factory = __esm({
         let method;
         if (error instanceof AppError13) {
           const cause = error.cause;
-          if (Guards31.isDefined(cause) && Guards31.isDefined(cause.config) && Guards31.isString(cause.config.method)) {
+          if (Guards32.isDefined(cause) && Guards32.isDefined(cause.config) && Guards32.isString(cause.config.method)) {
             method = cause.config.method.toUpperCase();
           }
         } else {
           const err = error;
-          if (Guards31.isDefined(err.config) && Guards31.isString(err.config.method)) {
+          if (Guards32.isDefined(err.config) && Guards32.isString(err.config.method)) {
             method = err.config.method.toUpperCase();
           }
         }
-        if (Guards31.isNullOrEmpty(method)) return false;
+        if (Guards32.isNullOrEmpty(method)) return false;
         const idempotentMethods = ["GET", "PUT", "DELETE", "HEAD", "OPTIONS"];
         return idempotentMethods.includes(method);
       }
       checkConfigValue(value, defaultValue, message) {
-        if (Guards31.isDefined(value)) {
-          Guards31.throwIfNegative(value, message);
+        if (Guards32.isDefined(value)) {
+          Guards32.throwIfNegative(value, message);
           return value;
         }
         return defaultValue;
@@ -2490,7 +2544,7 @@ var init_db_client_factory = __esm({
 });
 
 // src/infrastructure/context/request-context.ts
-import { Guards as Guards32 } from "@xeno-js/shared";
+import { Guards as Guards33 } from "@xeno-js/shared";
 var NodeRequestContext;
 var init_request_context = __esm({
   "src/infrastructure/context/request-context.ts"() {
@@ -2522,7 +2576,7 @@ var init_request_context = __esm({
       }
       updateIdentity(identity) {
         const store = this._storage.getStore();
-        if (Guards32.isDefined(store) && Guards32.isDefined(store.context)) {
+        if (Guards33.isDefined(store) && Guards33.isDefined(store.context)) {
           store.context = Object.freeze({
             ...store.context,
             identity: Object.freeze(identity)
@@ -2531,23 +2585,23 @@ var init_request_context = __esm({
       }
       getContext() {
         const store = this._storage.getStore();
-        if (!Guards32.isDefined(store)) return void 0;
+        if (!Guards33.isDefined(store)) return void 0;
         const context = store.context;
         return Object.freeze(context);
       }
       getIdentity() {
         const store = this._storage.getStore();
-        if (!Guards32.isDefined(store)) return void 0;
+        if (!Guards33.isDefined(store)) return void 0;
         return Object.freeze(store.context?.identity);
       }
       getScope() {
         const store = this._storage.getStore();
-        if (!Guards32.isDefined(store)) return void 0;
+        if (!Guards33.isDefined(store)) return void 0;
         return store.scope;
       }
       getNetworkContext() {
         const store = this._storage.getStore();
-        if (!Guards32.isDefined(store)) return void 0;
+        if (!Guards33.isDefined(store)) return void 0;
         return Object.freeze(store.context?.network);
       }
     };
@@ -2622,41 +2676,42 @@ var init_sql_light_db_client_factory = __esm({
 // src/infrastructure/factories/supabase.factory.ts
 import { createServerClient } from "@supabase/ssr";
 import {
-  Guards as Guards33,
+  Guards as Guards34,
   SupabaseAuthService,
   SupabaseClaimsMapper,
-  SupabaseSessionMapper
+  SupabaseSessionMapper,
+  TOKENS as TOKENS3
 } from "@xeno-js/shared";
 var SupabaseServerAuthFactory;
 var init_supabase_factory = __esm({
   "src/infrastructure/factories/supabase.factory.ts"() {
     "use strict";
+    init_services();
     SupabaseServerAuthFactory = class {
       create({
         config,
         container
       }) {
-        if (!Guards33.isDefined(config.ssrOpts)) {
-          throw new Error(
-            "ISsrCookieHandler is required for @supabase/ssr initialization., Please provide it in the config object."
-          );
-        }
-        const cookieService = config.ssrOpts(container);
+        const cookieService = this._getCookieSsr(config.ssrOpts, container, config.cookieOpts);
         const client = createServerClient(config.url, config.key, {
           ...config.opts,
-          cookies: {
-            getAll() {
-              return cookieService.getAll();
-            },
-            setAll(cookiesToSet) {
-              cookieService.setAll(cookiesToSet);
-            }
-          }
+          cookies: cookieService
         });
         const mapper = new SupabaseClaimsMapper();
         const sessionMapper = new SupabaseSessionMapper(mapper);
         return new SupabaseAuthService(client, mapper, sessionMapper, config);
       }
+      _getCookieSsr(ssrOpts, container, config) {
+        if (Guards34.isDefined(ssrOpts)) {
+          return ssrOpts(container);
+        } else {
+          return new CookieHandler(
+            container.resolve(TOKENS3.REQUEST_CONTEXT),
+            container.resolve(TOKENS3.CONFIGURATION_SERVICE),
+            config
+          );
+        }
+      }
     };
   }
 });
@@ -2666,7 +2721,7 @@ var user_context_factory_exports = {};
 __export(user_context_factory_exports, {
   UserContextFactory: () => UserContextFactory
 });
-import { Guards as Guards34 } from "@xeno-js/shared";
+import { Guards as Guards35 } from "@xeno-js/shared";
 var UserContextFactory;
 var init_user_context_factory = __esm({
   "src/infrastructure/factories/user-context.factory.ts"() {
@@ -2691,7 +2746,7 @@ var init_user_context_factory = __esm({
           tenantId: void 0
         };
         const identity = this._identityFactory.getIdentity();
-        if (Guards34.isDefined(identity)) {
+        if (Guards35.isDefined(identity)) {
           output.userId = identity.userId;
           output.tenantId = identity.tenantId;
         }
@@ -2777,28 +2832,28 @@ var init_auth_utils = __esm({
        * @link https://github.com/xeno-js/xeno-js 
        */
       async addAuthZ(container, opts) {
-        const { TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        const { TOKENS: TOKENS5 } = await import("@xeno-js/shared");
         const strategies = [];
-        const { Guards: Guards46 } = await import("@xeno-js/shared");
-        if (Guards46.isDefined(opts.policies)) {
+        const { Guards: Guards47 } = await import("@xeno-js/shared");
+        if (Guards47.isDefined(opts.policies)) {
           const { PolicyRegistry: PolicyRegistry2 } = await Promise.resolve().then(() => (init_application(), application_exports));
           const policyRegistry = opts.policies;
           const registryInstance = new PolicyRegistry2();
-          const ctxAccessor = container.resolve(TOKENS4.CONTEXT_ACCESSOR);
+          const ctxAccessor = container.resolve(TOKENS5.CONTEXT_ACCESSOR);
           const Policies = /* @__PURE__ */ new Set();
           for (const [intent, policy] of Object.entries(policyRegistry)) {
             const intentLower = intent.toLowerCase();
             registryInstance.addPolicy(intentLower, policy);
-            if (!Guards46.isNullOrEmpty(policy.roles)) {
+            if (!Guards47.isNullOrEmpty(policy.roles)) {
               Policies.add("roles");
             }
-            if (!Guards46.isNullOrEmpty(policy.permissions)) {
+            if (!Guards47.isNullOrEmpty(policy.permissions)) {
               Policies.add("permissions");
             }
-            if (!Guards46.isNullOrEmpty(policy.userId)) {
+            if (!Guards47.isNullOrEmpty(policy.userId)) {
               Policies.add("userId");
             }
-            if (!Guards46.isNullOrEmpty(policy.tenantId)) {
+            if (!Guards47.isNullOrEmpty(policy.tenantId)) {
               Policies.add("tenantId");
             }
           }
@@ -2819,10 +2874,10 @@ var init_auth_utils = __esm({
             strategies.push(new TenantAuthorizationStrategy2(registryInstance, ctxAccessor));
           }
         }
-        if (!Guards46.isNullOrEmpty(opts.customAuthorizationStrategy)) {
+        if (!Guards47.isNullOrEmpty(opts.customAuthorizationStrategy)) {
           const customStrategies = opts.customAuthorizationStrategy;
           customStrategies.forEach((strategyToken) => {
-            if (Guards46.isDefined(strategyToken)) {
+            if (Guards47.isDefined(strategyToken)) {
               strategies.push(strategyToken(container));
             }
           });
@@ -2842,17 +2897,26 @@ var init_auth_utils = __esm({
        * @link https://github.com/xeno-js/xeno-js 
        */
       async addAuthN(container, opts) {
-        const { TOKENS: TOKENS4 } = await import("@xeno-js/shared");
-        const _t = opts;
-        const { SupabaseServerAuthFactory: SupabaseServerAuthFactory2 } = await Promise.resolve().then(() => (init_factories(), factories_exports));
-        const factory = new SupabaseServerAuthFactory2();
-        const supabase = factory.create({ config: opts, container });
-        container.addScoped(TOKENS4.AUTH_SERVICE, () => {
-          return supabase;
-        });
-        container.addSingleton(TOKENS4.BASE_AUTH_SERVICE, () => {
-          return supabase;
-        });
+        const { Guards: Guards47, TOKENS: TOKENS5 } = await import("@xeno-js/shared");
+        if (Guards47.isDefined(opts.customAuth)) {
+          const authService = opts.customAuth.authExtendedService();
+          container.addScoped(TOKENS5.AUTH_SERVICE, () => {
+            return authService;
+          });
+          container.addSingleton(TOKENS5.BASE_AUTH_SERVICE, () => {
+            return authService;
+          });
+        } else {
+          const { SupabaseServerAuthFactory: SupabaseServerAuthFactory2 } = await Promise.resolve().then(() => (init_factories(), factories_exports));
+          const factory = new SupabaseServerAuthFactory2();
+          const supabase = factory.create({ config: opts, container });
+          container.addScoped(TOKENS5.AUTH_SERVICE, () => {
+            return supabase;
+          });
+          container.addSingleton(TOKENS5.BASE_AUTH_SERVICE, () => {
+            return supabase;
+          });
+        }
       }
     });
   }
@@ -2945,7 +3009,7 @@ __export(unit_of_work_exports, {
   UnitOfWork: () => UnitOfWork
 });
 import { AppError as AppError14 } from "@xeno-js/shared";
-import { Guards as Guards35 } from "@xeno-js/shared";
+import { Guards as Guards36 } from "@xeno-js/shared";
 var UnitOfWork;
 var init_unit_of_work = __esm({
   "src/infrastructure/transaction/unit-of-work.ts"() {
@@ -2980,9 +3044,9 @@ var init_unit_of_work = __esm({
         });
       }
       async dispose() {
-        if (Guards35.isDefined(this._ttx.state)) {
+        if (Guards36.isDefined(this._ttx.state)) {
           try {
-            if (Guards35.hasMethod(this._ttx.state, "rollback")) {
+            if (Guards36.hasMethod(this._ttx.state, "rollback")) {
               await this._ttx.state.rollback();
             }
           } finally {
@@ -3005,7 +3069,7 @@ var init_db_module = __esm({
     "use strict";
     DbModule = class {
       async configure(container, opts) {
-        const { Guards: Guards46, TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        const { Guards: Guards47, TOKENS: TOKENS5 } = await import("@xeno-js/shared");
         const { DbUtils: DbUtils2 } = await Promise.resolve().then(() => (init_db_utils(), db_utils_exports));
         const db = opts.enableSqlLite ? await DbUtils2.addSqlLite(opts) : await DbUtils2.addDbClient(opts);
         const { TransactionState: TransactionState2 } = await Promise.resolve().then(() => (init_transaction_state(), transaction_state_exports));
@@ -3013,16 +3077,16 @@ var init_db_module = __esm({
           return new TransactionState2();
         });
         const { UnitOfWork: UnitOfWork2 } = await Promise.resolve().then(() => (init_unit_of_work(), unit_of_work_exports));
-        container.addScoped(TOKENS4.UNIT_OF_WORK, (c) => {
+        container.addScoped(TOKENS5.UNIT_OF_WORK, (c) => {
           const ttx = c.resolve("TRANSACTION_STATE");
           return new UnitOfWork2(db, ttx);
         });
-        container.addScoped(TOKENS4.DB_CONTEXT, (c) => {
+        container.addScoped(TOKENS5.DB_CONTEXT, (c) => {
           const ttx = c.resolve("TRANSACTION_STATE");
           return new Proxy(db, {
             get(_target, prop, receiver) {
               const activeState = ttx.state;
-              if (Guards46.isDefined(activeState)) {
+              if (Guards47.isDefined(activeState)) {
                 if (prop === "transaction") {
                   return activeState.transaction.bind(activeState);
                 }
@@ -3059,14 +3123,14 @@ var init_http_utils = __esm({
        */
       async addAxios(container, opts) {
         const { NodeAxiosFactory: NodeAxiosFactory2 } = await Promise.resolve().then(() => (init_factories(), factories_exports));
-        const { Guards: Guards46 } = await import("@xeno-js/shared");
-        if (!Guards46.isDefined(opts.token)) {
+        const { Guards: Guards47 } = await import("@xeno-js/shared");
+        if (!Guards47.isDefined(opts.token)) {
           throw new Error("HttpConfig.token is required and must be defined.");
         }
         container.addSingleton(opts.token, () => {
           const factory = new NodeAxiosFactory2();
           const instance = factory.create(opts.client);
-          if (!Guards46.hasMethod(instance, "get") || !Guards46.hasMethod(instance, "post") || !Guards46.hasMethod(instance, "put") || !Guards46.hasMethod(instance, "patch") || !Guards46.hasMethod(instance, "delete")) {
+          if (!Guards47.hasMethod(instance, "get") || !Guards47.hasMethod(instance, "post") || !Guards47.hasMethod(instance, "put") || !Guards47.hasMethod(instance, "patch") || !Guards47.hasMethod(instance, "delete")) {
             throw new Error(
               "The created HTTP client instance does not implement the required methods of IHttpClient."
             );
@@ -3085,9 +3149,9 @@ var init_http_utils = __esm({
        * @link https://github.com/xeno-js/xeno-js
        */
       async addResilience(container, opts) {
-        const { TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        const { TOKENS: TOKENS5 } = await import("@xeno-js/shared");
         const { CockatielResilienceFactory: CockatielResilienceFactory2 } = await Promise.resolve().then(() => (init_factories(), factories_exports));
-        container.addSingleton(TOKENS4.RESILIENCE_CLIENT, () => {
+        container.addSingleton(TOKENS5.RESILIENCE_CLIENT, () => {
           const factory = new CockatielResilienceFactory2();
           return factory.create(opts);
         });
@@ -3136,22 +3200,22 @@ var init_validation_utils = __esm({
        * @link https://github.com/xeno-js/xeno-js
        */
       async addValidation(container, opts, logger) {
-        const { Guards: Guards46, TOKENS: TOKENS4 } = await import("@xeno-js/shared");
-        if (!Guards46.isDefined(opts.zod) && Guards46.isNullOrEmpty(opts.customValidationStrategy)) {
+        const { Guards: Guards47, TOKENS: TOKENS5 } = await import("@xeno-js/shared");
+        if (!Guards47.isDefined(opts.zod) && Guards47.isNullOrEmpty(opts.customValidationStrategy)) {
           return;
         }
         const validationStrategies = [];
-        if (Guards46.isDefined(opts.zod)) {
+        if (Guards47.isDefined(opts.zod)) {
           const config = opts.zod;
           const { ZodValidatorFactory: ZodValidatorFactory2 } = await Promise.resolve().then(() => (init_factories(), factories_exports));
           const { SchemaValidationStrategy: SchemaValidationStrategy2 } = await Promise.resolve().then(() => (init_application(), application_exports));
           const validatorService = new ZodValidatorFactory2().create({ ...config, logger });
-          container.addSingleton(TOKENS4.VALIDATOR_SERVICE, () => validatorService);
+          container.addSingleton(TOKENS5.VALIDATOR_SERVICE, () => validatorService);
           validationStrategies.push(new SchemaValidationStrategy2(validatorService));
         }
-        if (!Guards46.isNullOrEmpty(opts.customValidationStrategy)) {
+        if (!Guards47.isNullOrEmpty(opts.customValidationStrategy)) {
           for (const strategyToken of opts.customValidationStrategy) {
-            if (Guards46.isDefined(strategyToken)) validationStrategies.push(strategyToken(container));
+            if (Guards47.isDefined(strategyToken)) validationStrategies.push(strategyToken(container));
           }
         }
         const { ValidationPipeline: ValidationPipeline2 } = await Promise.resolve().then(() => (init_application(), application_exports));
@@ -3251,16 +3315,16 @@ var init_pipeline_utils = __esm({
        * @link https://github.com/xeno-js/xeno-js
        */
       async addCommand(container, opts) {
-        const { Guards: Guards46, TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        const { Guards: Guards47, TOKENS: TOKENS5 } = await import("@xeno-js/shared");
         const pipelines = [];
-        if (Guards46.isDefined(opts.idempotency)) {
+        if (Guards47.isDefined(opts.idempotency)) {
           const { IdempotencyStore: IdempotencyStore2 } = await Promise.resolve().then(() => (init_idempotency(), idempotency_exports));
           const imdStore = new IdempotencyStore2(
-            container.resolve(TOKENS4.CACHE),
-            container.resolve(TOKENS4.CACHE_KEY_BUILDER)
+            container.resolve(TOKENS5.CACHE),
+            container.resolve(TOKENS5.CACHE_KEY_BUILDER)
           );
           const { IdempotencyPipeline: IdempotencyPipeline2 } = await Promise.resolve().then(() => (init_application(), application_exports));
-          const requestContext = container.resolve(TOKENS4.NETWORK_CONTEXT_ACCESSOR);
+          const requestContext = container.resolve(TOKENS5.NETWORK_CONTEXT_ACCESSOR);
           const config = opts.idempotency;
           pipelines.push(
             new IdempotencyPipeline2(
@@ -3271,7 +3335,7 @@ var init_pipeline_utils = __esm({
             )
           );
         }
-        if (Guards46.isDefined(opts.concurrency)) {
+        if (Guards47.isDefined(opts.concurrency)) {
           const { ConcurrencyRetryPipeline: ConcurrencyRetryPipeline2 } = await Promise.resolve().then(() => (init_application(), application_exports));
           const config = opts.concurrency;
           pipelines.push(new ConcurrencyRetryPipeline2(config?.maxRetries, config?.delayConfig));
@@ -3289,12 +3353,12 @@ var init_pipeline_utils = __esm({
        * @link https://github.com/xeno-js/xeno-js
        */
       async addQuery(container) {
-        const { TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        const { TOKENS: TOKENS5 } = await import("@xeno-js/shared");
         const { QueryCachingPipeline: QueryCachingPipeline2 } = await Promise.resolve().then(() => (init_application(), application_exports));
         return new QueryCachingPipeline2(
-          container.resolve(TOKENS4.CACHE),
-          container.resolve(TOKENS4.CACHE_KEY_BUILDER),
-          container.resolve(TOKENS4.LOGGER)
+          container.resolve(TOKENS5.CACHE),
+          container.resolve(TOKENS5.CACHE_KEY_BUILDER),
+          container.resolve(TOKENS5.LOGGER)
         );
       }
     });
@@ -3312,11 +3376,11 @@ var init_cqrs_module = __esm({
     "use strict";
     CqrsModule = class {
       async configure(container, opts) {
-        const { TOKENS: TOKENS4 } = await import("@xeno-js/shared");
-        const logger = container.resolve(TOKENS4.LOGGER);
+        const { TOKENS: TOKENS5 } = await import("@xeno-js/shared");
+        const logger = container.resolve(TOKENS5.LOGGER);
         const { Mediator: Mediator2 } = await Promise.resolve().then(() => (init_application(), application_exports));
-        container.addSingleton(TOKENS4.MEDIATOR, (c) => {
-          const serviceScopeAccessor = c.resolve(TOKENS4.SERVICE_SCOPE_ACCESSOR);
+        container.addSingleton(TOKENS5.MEDIATOR, (c) => {
+          const serviceScopeAccessor = c.resolve(TOKENS5.SERVICE_SCOPE_ACCESSOR);
           return new Mediator2(serviceScopeAccessor);
         });
         const { ExceptionPipeline: ExceptionPipeline2 } = await Promise.resolve().then(() => (init_application(), application_exports));
@@ -3328,24 +3392,24 @@ var init_cqrs_module = __esm({
           new LoggingPipeline2(logger),
           new PerformancePipeline2(logger, thresholdMs)
         ];
-        const { Guards: Guards46 } = await import("@xeno-js/shared");
-        if (Guards46.isDefined(opts.authorization.policies) || Guards46.isDefined(opts.authorization.customAuthorizationStrategy)) {
+        const { Guards: Guards47 } = await import("@xeno-js/shared");
+        if (Guards47.isDefined(opts.authorization.policies) || Guards47.isDefined(opts.authorization.customAuthorizationStrategy)) {
           const { AuthUtils: AuthUtils2 } = await Promise.resolve().then(() => (init_auth_utils(), auth_utils_exports));
           const authPipelines = await AuthUtils2.addAuthZ(container, opts.authorization);
           pipelines.push(authPipelines);
         }
-        if (Guards46.isDefined(opts.validation.zod) || Guards46.isDefined(opts.validation.customValidationStrategy)) {
+        if (Guards47.isDefined(opts.validation.zod) || Guards47.isDefined(opts.validation.customValidationStrategy)) {
           const { ValidationUtils: ValidationUtils2 } = await Promise.resolve().then(() => (init_validation_utils(), validation_utils_exports));
           const validationPipelines = await ValidationUtils2.addValidation(
             container,
             opts.validation,
             logger
           );
-          if (Guards46.isDefined(validationPipelines)) pipelines.push(validationPipelines);
+          if (Guards47.isDefined(validationPipelines)) pipelines.push(validationPipelines);
         }
         const commandPipelines = [...pipelines];
         const queryPipelines = [...pipelines];
-        if (Guards46.isDefined(opts.commandBus.idempotency) || Guards46.isDefined(opts.commandBus.concurrency)) {
+        if (Guards47.isDefined(opts.commandBus.idempotency) || Guards47.isDefined(opts.commandBus.concurrency)) {
           const { PipelineUtils: PipelineUtils2 } = await Promise.resolve().then(() => (init_pipeline_utils(), pipeline_utils_exports));
           const newCommandPipelines = await PipelineUtils2.addCommand(container, opts.commandBus);
           commandPipelines.push(...newCommandPipelines);
@@ -3356,10 +3420,10 @@ var init_cqrs_module = __esm({
           queryPipelines.push(newQueryPipelines);
         }
         const { CompositePipeline: CompositePipeline2 } = await Promise.resolve().then(() => (init_application(), application_exports));
-        container.addSingleton(TOKENS4.COMMAND_PIPELINES_BEHAVIOR, () => {
+        container.addSingleton(TOKENS5.COMMAND_PIPELINES_BEHAVIOR, () => {
           return new CompositePipeline2(commandPipelines);
         });
-        container.addSingleton(TOKENS4.QUERY_PIPELINES_BEHAVIOR, () => {
+        container.addSingleton(TOKENS5.QUERY_PIPELINES_BEHAVIOR, () => {
           return new CompositePipeline2(queryPipelines);
         });
       }
@@ -3447,6 +3511,7 @@ var init_base_controller = __esm({
       /**
        * Helper to send a query through the mediator and return the result.
        * @param request - The IQuery instance to be sent.
+       * @param signal - The AbortSignal
        * @returns A promise resolving to the result of the query.
        *
        * @author Xeno
@@ -3454,13 +3519,13 @@ var init_base_controller = __esm({
        * @since 2025-09-30
        * @link https://github.com/xeno-js/xeno-js
        */
-      _query(request) {
-        const signal = new AbortController().signal;
+      _query(request, signal) {
         return this._mediator.query(request, signal);
       }
       /**
        * Helper to send a command through the mediator and return the result.
        * @param request - The ICommand instance to be sent.
+       * @param signal - The AbortSignal
        * @returns A promise resolving to the result of the command.
        *
        * @author Xeno
@@ -3468,8 +3533,7 @@ var init_base_controller = __esm({
        * @since 2025-09-30
        * @link https://github.com/xeno-js/xeno-js
        */
-      _send(request) {
-        const signal = new AbortController().signal;
+      _send(request, signal) {
         return this._mediator.send(request, signal);
       }
       getContext() {
@@ -3506,7 +3570,7 @@ var init_allow_method_middleware = __esm({
       }
       _requestContext;
       _allowMethod;
-      async execute(req, _headers, next) {
+      async execute(req, _res, next) {
         const isAllowed = this._allowMethod.check(req.path, req.method);
         if (!isAllowed) {
           const { network, tracing } = this._requestContext.getContext() ?? {};
@@ -3557,7 +3621,7 @@ var init_allow_origin_middleware = __esm({
       _allowOrigin;
       _requestContext;
       _logger;
-      async execute(req, _headers, next) {
+      async execute(req, _res, next) {
         const { network, tracing } = this._requestContext.getContext() ?? {};
         const origin = network?.origin;
         if (!this._allowOrigin.isAllowed(origin)) {
@@ -3602,8 +3666,8 @@ var init_auth_middleware = __esm({
       _tokenExtractor;
       _gateKeeper;
       _logger;
-      async execute(req, headers, next) {
-        const token = this._tokenExtractor.extract(headers);
+      async execute(req, _res, next) {
+        const token = this._tokenExtractor.extract(req.headers);
         const authResult = await this._gateKeeper.authenticate(token);
         if (!authResult.isOk()) {
           const error = authResult.getErrorOrThrow();
@@ -3646,12 +3710,12 @@ var init_composite_middleware = __esm({
         this._middlewares = _middlewares;
       }
       _middlewares;
-      async execute(req, headers, next) {
+      async execute(req, res, next) {
         let currentNext = next;
         for (let i = this._middlewares.length - 1; i >= 0; i--) {
           const currentBehavior = this._middlewares[i];
           const previousNext = currentNext;
-          currentNext = () => currentBehavior.execute(req, headers, previousNext);
+          currentNext = () => currentBehavior.execute(req, res, previousNext);
         }
         return currentNext();
       }
@@ -3660,7 +3724,7 @@ var init_composite_middleware = __esm({
 });
 
 // src/presentation/middlewares/cors.middleware.ts
-import { Guards as Guards36 } from "@xeno-js/shared";
+import { Guards as Guards37 } from "@xeno-js/shared";
 var CORSMiddleware;
 var init_cors_middleware = __esm({
   "src/presentation/middlewares/cors.middleware.ts"() {
@@ -3672,11 +3736,11 @@ var init_cors_middleware = __esm({
       }
       _requestContext;
       _withCredentials;
-      async execute(_req, _headers, next) {
+      async execute(_req, _res, next) {
         const { network } = this._requestContext.getContext() ?? {};
         const origin = network?.origin;
         const response = await next();
-        if (Guards36.isDefined(origin))
+        if (Guards37.isDefined(origin))
           response.headers = {
             ...response.headers ?? {},
             "Access-Control-Allow-Origin": origin,
@@ -3693,7 +3757,7 @@ var init_cors_middleware = __esm({
 import {
   ERROR_CODE_MESSAGES as ERROR_CODE_MESSAGES5,
   ERROR_CODES as ERROR_CODES6,
-  Guards as Guards37,
+  Guards as Guards38,
   GuidHelper as GuidHelper9,
   HttpHelper as HttpHelper6,
   STATUS_CODES as STATUS_CODES7
@@ -3709,14 +3773,14 @@ var init_csrf_middleware = __esm({
       }
       _requestContext;
       _csrfTokenService;
-      async execute(req, _headers, next) {
+      async execute(req, _res, next) {
         const method = req.method.toUpperCase();
         const isStateChanging = ["POST", "PUT", "DELETE", "PATCH"].includes(method);
         if (isStateChanging) {
           const { network, tracing, identity } = this._requestContext.getContext() ?? {};
           const headerToken = network?.csrf;
           const cookieToken = network?.csrfCookie;
-          if (!Guards37.isDefined(headerToken) || !Guards37.isDefined(cookieToken)) {
+          if (!Guards38.isDefined(headerToken) || !Guards38.isDefined(cookieToken)) {
             return HttpHelper6.error(
               {
                 success: false,
@@ -3758,7 +3822,7 @@ var init_csrf_middleware = __esm({
               }
             );
           }
-          if (!Guards37.isDefined(identity?.userId) || !await this._csrfTokenService.validate(headerToken, identity?.userId)) {
+          if (!Guards38.isDefined(identity?.userId) || !await this._csrfTokenService.validate(headerToken, identity?.userId)) {
             return HttpHelper6.error(
               {
                 success: false,
@@ -3787,7 +3851,7 @@ var init_csrf_middleware = __esm({
 });
 
 // src/presentation/middlewares/csrf-cookie.middleware.ts
-import { Guards as Guards38 } from "@xeno-js/shared";
+import { Guards as Guards39 } from "@xeno-js/shared";
 var CsrfCookieMiddleware;
 var init_csrf_cookie_middleware = __esm({
   "src/presentation/middlewares/csrf-cookie.middleware.ts"() {
@@ -3801,13 +3865,13 @@ var init_csrf_cookie_middleware = __esm({
       _requestContext;
       _csrfTokenService;
       _csrf;
-      async execute(_req, _headers, next) {
+      async execute(_req, _res, next) {
         const response = await next();
         const context = this._requestContext.getContext();
         const identity = context?.identity;
         const network = context?.network;
-        if (!Guards38.isDefined(identity?.userId)) return response;
-        if (Guards38.isDefined(network?.csrfCookie)) return response;
+        if (!Guards39.isDefined(identity?.userId)) return response;
+        if (Guards39.isDefined(network?.csrfCookie)) return response;
         const token = await this._csrfTokenService.generate(identity.userId);
         const cookieName = this._csrf.cookieName ?? "__Host-xeno-csrf";
         const maxAge = this._csrf.cookieMaxAgeSeconds ?? 3600;
@@ -3825,7 +3889,7 @@ var init_csrf_cookie_middleware = __esm({
 });
 
 // src/presentation/middlewares/options.middleware.ts
-import { Guards as Guards39, HttpHelper as HttpHelper7, STATUS_CODES as STATUS_CODES8 } from "@xeno-js/shared";
+import { Guards as Guards40, HttpHelper as HttpHelper7, STATUS_CODES as STATUS_CODES8 } from "@xeno-js/shared";
 var OptionsMiddleware;
 var init_options_middleware = __esm({
   "src/presentation/middlewares/options.middleware.ts"() {
@@ -3841,12 +3905,12 @@ var init_options_middleware = __esm({
       _alloewMethod;
       _allowHeaders;
       _withCredentials;
-      async execute(req, _headers, next) {
+      async execute(req, _res, next) {
         if (req.method.toUpperCase() === "OPTIONS") {
           const network = this._requestContext.getNetworkContext();
           const origin = network?.origin;
           const headers = {};
-          if (Guards39.isDefined(origin)) {
+          if (Guards40.isDefined(origin)) {
             headers["Access-Control-Allow-Origin"] = origin;
             headers["Access-Control-Allow-Credentials"] = this._withCredentials;
             headers["Vary"] = "Origin";
@@ -3865,7 +3929,7 @@ var init_options_middleware = __esm({
 import {
   ERROR_CODE_MESSAGES as ERROR_CODE_MESSAGES6,
   ERROR_CODES as ERROR_CODES7,
-  Guards as Guards40,
+  Guards as Guards41,
   GuidHelper as GuidHelper10,
   HttpHelper as HttpHelper8,
   STATUS_CODES as STATUS_CODES9
@@ -3887,10 +3951,10 @@ var init_rate_limiter_middleware = __esm({
       _keyBuilder;
       _logger;
       _opts;
-      async execute(req, _headers, next) {
+      async execute(req, _res, next) {
         const cacheKey = this._keyBuilder.buildRateLimitKey(req.path);
         const { network, tracing } = this._ctxAccessor.getContext() ?? {};
-        if (!Guards40.isDefined(cacheKey))
+        if (!Guards41.isDefined(cacheKey))
           return HttpHelper8.error(
             {
               success: false,
@@ -3942,10 +4006,10 @@ var init_rate_limiter_middleware = __esm({
 });
 
 // src/presentation/mappers/context.mapper.ts
-import { Guards as Guards41 } from "@xeno-js/shared";
+import { Guards as Guards42 } from "@xeno-js/shared";
 function _buildMessagingContext(meta) {
-  const hasSequenceData = Guards41.isDefined(meta.sequence?.sequenceId) || Guards41.isDefined(meta.sequence?.position) || Guards41.isDefined(meta.sequence?.size);
-  const hasMessagingData = hasSequenceData || Guards41.isDefined(meta.expiration) || Guards41.isDefined(meta.returnAddress);
+  const hasSequenceData = Guards42.isDefined(meta.sequence?.sequenceId) || Guards42.isDefined(meta.sequence?.position) || Guards42.isDefined(meta.sequence?.size);
+  const hasMessagingData = hasSequenceData || Guards42.isDefined(meta.expiration) || Guards42.isDefined(meta.returnAddress);
   const messaging = hasMessagingData ? {
     returnAddress: meta.returnAddress,
     expiration: meta.expiration,
@@ -4035,14 +4099,14 @@ var init_request_middleware = __esm({
       _extractor;
       _resolver;
       _logger;
-      async execute(req, headers, next) {
+      async execute(req, res, next) {
         const correlationId = GuidHelper11.generate();
         const requestId = GuidHelper11.generate();
         const spanId = correlationId;
         const formatIndicator = "application/json";
         try {
-          const meta = this._extractor.extract(headers);
-          const clientIp = this._resolver.resolve(req.transport.req, meta.clientIp);
+          const meta = this._extractor.extract(req.headers);
+          const clientIp = this._resolver.resolve(req, meta.clientIp);
           const metadata = {
             ...meta,
             clientIp,
@@ -4055,7 +4119,7 @@ var init_request_middleware = __esm({
             metadata,
             identity: GUEST3,
             path: req.path,
-            transport: req.transport
+            transport: { req, res }
           });
           const result = await this._requestContext.runAsync(tmpContext, async () => {
             return next();
@@ -4129,7 +4193,7 @@ var init_presentation = __esm({
 });
 
 // src/infrastructure/cache/rate-limit-key-builder.cache.ts
-import { Guards as Guards42 } from "@xeno-js/shared";
+import { Guards as Guards43 } from "@xeno-js/shared";
 var RateLimitKeyBuilder;
 var init_rate_limit_key_builder_cache = __esm({
   "src/infrastructure/cache/rate-limit-key-builder.cache.ts"() {
@@ -4144,12 +4208,12 @@ var init_rate_limit_key_builder_cache = __esm({
         const tenantId = ctx?.identity?.tenantId;
         const userId = ctx?.identity?.userId;
         const clientIp = ctx?.network?.clientIp;
-        if (!Guards42.isNullOrEmpty(tenantId) && !Guards42.isNullOrEmpty(userId))
+        if (!Guards43.isNullOrEmpty(tenantId) && !Guards43.isNullOrEmpty(userId))
           return `ratelimit:tenant:${tenantId}:user:${userId}:${resource}`;
-        if (!Guards42.isNullOrEmpty(tenantId) && !Guards42.isNullOrEmpty(clientIp))
+        if (!Guards43.isNullOrEmpty(tenantId) && !Guards43.isNullOrEmpty(clientIp))
           return `ratelimit:tenant:${tenantId}:ip:${clientIp}:${resource}`;
-        if (!Guards42.isNullOrEmpty(userId)) return `ratelimit:user:${userId}:${resource}`;
-        if (!Guards42.isNullOrEmpty(clientIp)) return `ratelimit:ip:${clientIp}:${resource}`;
+        if (!Guards43.isNullOrEmpty(userId)) return `ratelimit:user:${userId}:${resource}`;
+        if (!Guards43.isNullOrEmpty(clientIp)) return `ratelimit:ip:${clientIp}:${resource}`;
         return void 0;
       }
     };
@@ -4183,12 +4247,16 @@ var init_middleware_module = __esm({
     "use strict";
     MiddlewareModule = class {
       async configure(container, opts) {
-        const { Guards: Guards46, TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        const { Guards: Guards47, TOKENS: TOKENS5 } = await import("@xeno-js/shared");
         const { HttpCookieExtractor: HttpCookieExtractor2 } = await Promise.resolve().then(() => (init_services(), services_exports));
         const { HttpHeaderExtractor: HttpHeaderExtractor2 } = await Promise.resolve().then(() => (init_services(), services_exports));
-        const tokenExtractor = await this._getTokenExtractor(opts.isSSR);
+        const tokenExtractor = await this._getTokenExtractor(
+          opts.isSSR,
+          opts.authCookieName,
+          opts.customTokenExtractor
+        );
         container.addSingleton(
-          TOKENS4.SERVICE_EXTRACTOR,
+          TOKENS5.SERVICE_EXTRACTOR,
           () => new HttpHeaderExtractor2(
             tokenExtractor,
             new HttpCookieExtractor2(),
@@ -4198,18 +4266,18 @@ var init_middleware_module = __esm({
         );
         const { ClientIpResolver: ClientIpResolver2 } = await Promise.resolve().then(() => (init_services(), services_exports));
         const middlewares = [];
-        const requestContext = container.resolve(TOKENS4.REQUEST_CONTEXT);
-        const logger = container.resolve(TOKENS4.LOGGER);
+        const requestContext = container.resolve(TOKENS5.REQUEST_CONTEXT);
+        const logger = container.resolve(TOKENS5.LOGGER);
         const { RequestContextMiddleware: RequestContextMiddleware2 } = await Promise.resolve().then(() => (init_presentation(), presentation_exports));
         middlewares.push(
           new RequestContextMiddleware2(
             requestContext,
-            container.resolve(TOKENS4.SERVICE_EXTRACTOR),
+            container.resolve(TOKENS5.SERVICE_EXTRACTOR),
             new ClientIpResolver2(opts.trustedProxies),
             logger
           )
         );
-        if (!Guards46.isNullOrEmpty(opts.allowOrigins)) {
+        if (!Guards47.isNullOrEmpty(opts.allowOrigins)) {
           if (opts.withCredentials && opts.allowOrigins.includes("*"))
             throw new Error(
               "Wildcard CORS origin is not allowed when withCredentials is set to true in addHttpCore"
@@ -4235,7 +4303,7 @@ var init_middleware_module = __esm({
           const { CORSMiddleware: CORSMiddleware2 } = await Promise.resolve().then(() => (init_presentation(), presentation_exports));
           middlewares.push(new CORSMiddleware2(requestContext, withCredentials));
         }
-        if (Guards46.isDefined(opts.routeRegistry)) {
+        if (Guards47.isDefined(opts.routeRegistry)) {
           const { MethodCheckMiddleware: MethodCheckMiddleware2 } = await Promise.resolve().then(() => (init_presentation(), presentation_exports));
           middlewares.push(new MethodCheckMiddleware2(requestContext, allowMethod));
         }
@@ -4257,31 +4325,31 @@ var init_middleware_module = __esm({
             new AuthenticationMiddleware2(
               requestContext,
               tokenExtractor,
-              new GateKeeper2(container.resolve(TOKENS4.BASE_AUTH_SERVICE), new ClaimsIdentityMapper2()),
+              new GateKeeper2(container.resolve(TOKENS5.BASE_AUTH_SERVICE), new ClaimsIdentityMapper2()),
               logger
             )
           );
         }
-        if (Guards46.isDefined(opts.rateLimite.maxRequests) || Guards46.isDefined(opts.rateLimite.windowSeconds)) {
+        if (Guards47.isDefined(opts.rateLimite.maxRequests) || Guards47.isDefined(opts.rateLimite.windowSeconds)) {
           const maxRequests = opts.rateLimite.maxRequests ?? 30;
-          Guards46.throwIfNegative(maxRequests, "MaxRequests must be positive");
-          Guards46.throwIfNotInteger(maxRequests, "MaxRequests must be an integer");
+          Guards47.throwIfNegative(maxRequests, "MaxRequests must be positive");
+          Guards47.throwIfNotInteger(maxRequests, "MaxRequests must be an integer");
           const windowSeconds = opts.rateLimite.windowSeconds ?? 30;
-          Guards46.throwIfNegative(windowSeconds, "WindowSeconds must be positive");
-          Guards46.throwIfNotInteger(windowSeconds, "WindowSeconds must be an integer");
+          Guards47.throwIfNegative(windowSeconds, "WindowSeconds must be positive");
+          Guards47.throwIfNotInteger(windowSeconds, "WindowSeconds must be an integer");
           const { RateLimitKeyBuilder: RateLimitKeyBuilder2 } = await Promise.resolve().then(() => (init_cache(), cache_exports));
           const { RateLimitMiddleware: RateLimitMiddleware2 } = await Promise.resolve().then(() => (init_presentation(), presentation_exports));
           middlewares.push(
             new RateLimitMiddleware2(
               requestContext,
-              container.resolve(TOKENS4.CACHE),
+              container.resolve(TOKENS5.CACHE),
               new RateLimitKeyBuilder2(requestContext),
               logger,
               { maxRequests, windowSeconds }
             )
           );
         }
-        if (Guards46.isDefined(opts.csrf)) {
+        if (Guards47.isDefined(opts.csrf)) {
           const csrf = opts.csrf;
           const { EdgeCryptoService: EdgeCryptoService2 } = await Promise.resolve().then(() => (init_services(), services_exports));
           container.addSingleton("CRYPTO_SERVICE", () => new EdgeCryptoService2());
@@ -4301,22 +4369,24 @@ var init_middleware_module = __esm({
           middlewares.push(new CsrfMiddleware2(requestContext, container.resolve("CSRF_TOKEN_SERVICE")));
         }
         const { CompositeMiddleware: CompositeMiddleware2 } = await Promise.resolve().then(() => (init_presentation(), presentation_exports));
-        container.addSingleton(TOKENS4.MIDDLEWARE, () => {
+        container.addSingleton(TOKENS5.MIDDLEWARE, () => {
           return new CompositeMiddleware2(middlewares);
         });
       }
-      async _getTokenExtractor(isSSR) {
+      async _getTokenExtractor(isSSR, cookieName, customTokenExtractor) {
+        const { Guards: Guards47 } = await import("@xeno-js/shared");
+        if (Guards47.isDefined(customTokenExtractor)) return customTokenExtractor();
         if (isSSR) {
           const { SupabaseSsrTokenExtractor: SupabaseSsrTokenExtractor2 } = await Promise.resolve().then(() => (init_services(), services_exports));
           return new SupabaseSsrTokenExtractor2();
         } else {
           const { BearerTokenExtractor: BearerTokenExtractor2 } = await Promise.resolve().then(() => (init_services(), services_exports));
-          return new BearerTokenExtractor2();
+          return new BearerTokenExtractor2(cookieName ?? "sb-access-token");
         }
       }
       async _getAllowMethod(configure, opts) {
-        const { Guards: Guards46 } = await import("@xeno-js/shared");
-        if (!configure || !Guards46.isDefined(opts)) return void 0;
+        const { Guards: Guards47 } = await import("@xeno-js/shared");
+        if (!configure || !Guards47.isDefined(opts)) return void 0;
         const { AllowMethodFactory: AllowMethodFactory2 } = await Promise.resolve().then(() => (init_factories(), factories_exports));
         return new AllowMethodFactory2().create(opts);
       }
@@ -4335,17 +4405,17 @@ var init_context_module = __esm({
     "use strict";
     ContextModule = class {
       async configure(container) {
-        const { TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        const { TOKENS: TOKENS5 } = await import("@xeno-js/shared");
         const { ServiceScopeFactory: ServiceScopeFactory2 } = await Promise.resolve().then(() => (init_service_scope_factory(), service_scope_factory_exports));
         const { NodeRequestContextFactory: NodeRequestContextFactory2 } = await Promise.resolve().then(() => (init_request_context_factory(), request_context_factory_exports));
         const requestContext = new NodeRequestContextFactory2(
           new ServiceScopeFactory2(container)
         ).create();
-        container.addSingleton(TOKENS4.REQUEST_CONTEXT, () => requestContext);
-        container.addSingleton(TOKENS4.CONTEXT_ACCESSOR, () => requestContext);
-        container.addSingleton(TOKENS4.IDENTITY_ACCESSOR, () => requestContext);
-        container.addSingleton(TOKENS4.SERVICE_SCOPE_ACCESSOR, () => requestContext);
-        container.addSingleton(TOKENS4.NETWORK_CONTEXT_ACCESSOR, () => requestContext);
+        container.addSingleton(TOKENS5.REQUEST_CONTEXT, () => requestContext);
+        container.addSingleton(TOKENS5.CONTEXT_ACCESSOR, () => requestContext);
+        container.addSingleton(TOKENS5.IDENTITY_ACCESSOR, () => requestContext);
+        container.addSingleton(TOKENS5.SERVICE_SCOPE_ACCESSOR, () => requestContext);
+        container.addSingleton(TOKENS5.NETWORK_CONTEXT_ACCESSOR, () => requestContext);
         const { UserContextFactory: UserContextFactory2 } = await Promise.resolve().then(() => (init_user_context_factory(), user_context_factory_exports));
         container.addSingleton("USER_CONTEXT_FACTORY", () => {
           return new UserContextFactory2(requestContext);
@@ -4374,7 +4444,7 @@ __export(index_exports, {
 init_application();
 
 // src/infrastructure/builder/app.builder.ts
-import { Guards as Guards43, LOG_LEVEL as LOG_LEVEL6, TOKENS as TOKENS3 } from "@xeno-js/shared";
+import { Guards as Guards44, LOG_LEVEL as LOG_LEVEL6, TOKENS as TOKENS4 } from "@xeno-js/shared";
 
 // src/infrastructure/configuration/configuration.ts
 import { Guards as Guards13 } from "@xeno-js/shared";
@@ -4653,13 +4723,14 @@ var AppBuilder = class {
   constructor(container) {
     this._container = container ?? new ServiceContainer();
     this._container.addSingleton(
-      TOKENS3.CONFIGURATION_SERVICE,
+      TOKENS4.CONFIGURATION_SERVICE,
       () => new EnvironmentConfigurationService()
     );
-    this._configuration = this._container.resolve(TOKENS3.CONFIGURATION_SERVICE);
+    this._configuration = this._container.resolve(TOKENS4.CONFIGURATION_SERVICE);
     this._middlewareConfig.allowOrigins?.push(
       this._configuration.get("APP_URL") ?? `http://localhost:${this._configuration.getNumber("PORT", 3e3)}`
     );
+    this.addContext();
   }
   // --- Module Configurations ---
   _modules = [];
@@ -4695,7 +4766,23 @@ var AppBuilder = class {
     allowOrigins: [],
     allowHeaders: [],
     cors: true,
-    withCredentials: true
+    withCredentials: true,
+    authCookieName: "sb-access-token"
+  };
+  _authConfig = {
+    url: "",
+    key: "",
+    opts: void 0,
+    redirectTo: "",
+    storageOpts: { type: "memory", cookieOpts: void 0, storage: void 0 },
+    ssrOpts: void 0,
+    customAuth: void 0,
+    cookieOpts: {
+      path: "/",
+      httpOnly: true,
+      sameSite: "lax",
+      secure: true
+    }
   };
   _httpConfig = {
     dataSourceToken: void 0,
@@ -4774,7 +4861,7 @@ var AppBuilder = class {
    * @link https://github.com/xeno-js/xeno-js
    */
   addLogger(setupAction) {
-    if (Guards43.isDefined(setupAction)) setupAction(this._loggerConfig, this._configuration);
+    if (Guards44.isDefined(setupAction)) setupAction(this._loggerConfig, this._configuration);
     if (this._isLoggerModuleQueued) return this;
     this._isLoggerModuleQueued = true;
     this._modules.push({
@@ -4799,7 +4886,7 @@ var AppBuilder = class {
    * @link https://github.com/xeno-js/xeno-js 
    */
   addCache(setupAction) {
-    if (Guards43.isDefined(setupAction)) setupAction(this._config, this._configuration);
+    if (Guards44.isDefined(setupAction)) setupAction(this._config, this._configuration);
     if (this._isCacheModuleQueued) return this;
     this._isCacheModuleQueued = true;
     this._modules.push({
@@ -4826,21 +4913,13 @@ var AppBuilder = class {
   addAuth(setupAction) {
     if (this._isAuthModuleQueued) return this;
     this._isAuthModuleQueued = true;
-    const config = {
-      url: "",
-      key: "",
-      opts: void 0,
-      redirectTo: "",
-      storageOpts: { type: "memory", cookieOpts: void 0, storage: void 0 },
-      ssrOpts: void 0
-    };
-    setupAction(config, this._configuration);
+    setupAction(this._authConfig, this._configuration);
     this._modules.push({
       priority: 3,
       name: "AuthModule",
       action: async () => {
         const { AuthUtils: AuthUtils2 } = await Promise.resolve().then(() => (init_auth_utils(), auth_utils_exports));
-        await AuthUtils2.addAuthN(this._container, config);
+        await AuthUtils2.addAuthN(this._container, this._authConfig);
       }
     });
     return this;
@@ -4910,7 +4989,7 @@ var AppBuilder = class {
    * @link https://github.com/xeno-js/xeno-js 
    */
   addPipeline(setupAction) {
-    if (Guards43.isDefined(setupAction)) {
+    if (Guards44.isDefined(setupAction)) {
       setupAction(this._pipelineConfig, this._configuration);
     }
     this._queuePipelineModule();
@@ -5031,7 +5110,7 @@ var AppBuilder = class {
         console.error(`\u{1F449} Module: **${queued.name}**`);
         console.error(`\u{1F4DD} Reason: ${errorMessage}
 `);
-        if (error instanceof Error && Guards43.isDefined(error.stack)) {
+        if (error instanceof Error && Guards44.isDefined(error.stack)) {
           console.error(error.stack);
         }
         throw new Error(`Bootstrap failed at [${queued.name}]: ${errorMessage}`, { cause: error });
@@ -5092,7 +5171,8 @@ var AppBuilder = class {
         const middlewareModule = new MiddlewareModule2();
         await middlewareModule.configure(this._container, {
           ...this._middlewareConfig,
-          isAuth: this._isAuthModuleQueued
+          isAuth: this._isAuthModuleQueued,
+          customTokenExtractor: this._authConfig.customAuth?.authHeaderExtractor
         });
       }
     });
@@ -5187,7 +5267,7 @@ init_validation_utils();
 
 // src/infrastructure/repositories/read-dao.ts
 import { AppError as AppError16, Result as Result17 } from "@xeno-js/shared";
-import { Guards as Guards44 } from "@xeno-js/shared";
+import { Guards as Guards45 } from "@xeno-js/shared";
 var ReadDao = class {
   /**
    * Constructs a new ReadDao instance.
@@ -5209,7 +5289,7 @@ var ReadDao = class {
   async findById(id, ctx, signal) {
     AppError16.throwIfAborted(signal, "ReadDao.findById");
     const result = await this._dataSource.findById(id, ctx, signal);
-    if (Guards44.isNullOrEmpty(result)) return Result17.ok();
+    if (Guards45.isNullOrEmpty(result)) return Result17.ok();
     const entity = this._mapper.toEntity(result);
     return Result17.ok(entity);
   }
@@ -5223,7 +5303,7 @@ var ReadDao = class {
 
 // src/infrastructure/repositories/repository.ts
 import { AppError as AppError17, Result as Result18 } from "@xeno-js/shared";
-import { Guards as Guards45 } from "@xeno-js/shared";
+import { Guards as Guards46 } from "@xeno-js/shared";
 var Repository = class {
   /**
    * Constructs a new Repository instance.
@@ -5245,7 +5325,7 @@ var Repository = class {
   async findById(id, ctx, signal) {
     AppError17.throwIfAborted(signal, "Repository.findById");
     const result = await this._dataSource.findById(id, ctx, signal);
-    if (Guards45.isNullOrEmpty(result)) return Result18.ok();
+    if (Guards46.isNullOrEmpty(result)) return Result18.ok();
     const entity = this._mapper.toEntity(result);
     return Result18.ok(entity);
   }