@xeno-js/core 0.1.13 → 1.0.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { ICache, Optional, IExtendendAuthService, IBaseAuthService, ICacheKeyBuilder, IPipelineBehavior, ICommand, IConcurrencyService, IConfigurationService, ILogger, IMediator, IMiddleware, HttpHeaders, IQuery, RequestContext, IServiceResilience, IServiceExtractor, Metadata, IUnitOfWork, IDisposable, IValidatorService, IIdentityAccessor, IContextAccessor, INetworkContextAccessor, IFactory, UserContext, ITransactionState, Factory, IBaseAccessor, Identity, HttpMethod, AuthConfig, CookieOptions, SetupAction, HttpClientConfig, LogLevel, ILoggerClient, Dictionary, AuthPolicy, IStrategy, IRequest, ResponseDto, IHandler, ResultType, ISpecification, CacheConfig, DbConfig, IReadDao, IReadDataSource, IMapper, IRepository, IWriteDataSource, IController, AppError } from '@xeno-js/shared';
+import { ICache, Optional, IExtendendAuthService, IBaseAuthService, ICacheKeyBuilder, IPipelineBehavior, ICommand, IConcurrencyService, IConfigurationService, ILogger, IMediator, IMiddleware, IQuery, RequestContext, IServiceResilience, IServiceExtractor, Metadata, IUnitOfWork, IDisposable, IValidatorService, IIdentityAccessor, IContextAccessor, INetworkContextAccessor, IFactory, UserContext, ITransactionState, Factory, IBaseAccessor, Identity, HttpMethod, AuthConfig, CookieOptions, SetupAction, HttpClientConfig, LogLevel, ILoggerClient, Dictionary, AuthPolicy, IStrategy, IRequest, ExtendedRequest, ResponseDto, IHandler, ResultType, ISpecification, CacheConfig, DbConfig, IReadDao, IReadDataSource, IMapper, IRepository, IWriteDataSource, IController, AppError } from '@xeno-js/shared';
 export * from '@xeno-js/shared';
 export { Query as BaseQuery } from '@xeno-js/shared';
 import { SupabaseClientOptions } from '@supabase/supabase-js';
@@ -158,7 +158,7 @@ interface ApplicationRegistry<T = unknown, Ttx = unknown> {
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    readonly MIDDLEWARE: IMiddleware<HttpHeaders>;
+    readonly MIDDLEWARE: IMiddleware;
     /** @description Token used to register and resolve the QueryPipeline behaviors in the dependency injection container.
      *
      * @author Xeno
@@ -198,7 +198,7 @@ interface ApplicationRegistry<T = unknown, Ttx = unknown> {
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    readonly SERVICE_EXTRACTOR: IServiceExtractor<HttpHeaders, Metadata>;
+    readonly SERVICE_EXTRACTOR: IServiceExtractor<Request['headers'], Metadata>;
     /** @description Token used to register and resolve the UnitOfWork instance in the dependency injection container.
      *
      * @author Xeno
@@ -717,6 +717,10 @@ interface ISsrCookieHandler {
 }
 interface AuthSsrConfig<TOption, TRegistry extends ApplicationRegistry = ApplicationRegistry> extends AuthConfig<TOption> {
     ssrOpts: Optional<(container: IServiceContainer<TRegistry>) => ISsrCookieHandler>;
+    customAuth: Optional<{
+        authHeaderExtractor: () => IServiceExtractor<Request['headers'], Optional<string>>;
+        authExtendedService: () => IExtendendAuthService;
+    }>;
 }
 
 /**
@@ -1165,6 +1169,10 @@ interface MiddlewareConfig {
      * @link https://github.com/xeno-js/xeno-js
      */
     withCredentials: boolean;
+    /**
+     * @description The cookie prefix
+     */
+    authCookieName: Optional<string>;
 }
 /**
  * @description
@@ -1414,10 +1422,7 @@ declare const ContainerUtils: Readonly<{
      * @throws Error If the service is not found in the container.
      * @throws Error If the service is not a scoped service.
      */
-    runExecute<TResponse, T extends ApplicationRegistry, TRes, TReq>(endpoint: string, method: Optional<string>, headers: HttpHeaders, transport: {
-        res: TRes;
-        req: TReq;
-    }, container: IServiceContainer<T>, action: () => Promise<ResponseDto<TResponse>>): Promise<ResponseDto<TResponse>>;
+    runExecute<TResponse, T extends ApplicationRegistry, TRes extends Response, TReq extends ExtendedRequest>(res: TRes, req: TReq, container: IServiceContainer<T>, action: () => Promise<ResponseDto<TResponse>>): Promise<ResponseDto<TResponse>>;
 }>;
 
 /**
@@ -1610,6 +1615,7 @@ declare class AppBuilder<TRegistry extends XenoRegistry = XenoRegistry> {
     private _pipelineConfig;
     private _config;
     private _middlewareConfig;
+    private readonly _authConfig;
     private readonly _httpConfig;
     private readonly _loggerConfig;
     private _isContextModuleQueued;
@@ -1934,7 +1940,7 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
      * @link https://github.com/xeno-js/xeno-js
      */
     constructor(_requestContext: IContextAccessor<RequestContext>, _mediator: IMediator);
-    abstract handle(request: TRequest): Promise<ResponseDto<TResponse>>;
+    abstract handle(request: TRequest, signal: AbortSignal): Promise<ResponseDto<TResponse>>;
     /**
      * Helper to return a successful 200/201 response.
      * @param data - The data to include in the response.
@@ -1966,6 +1972,7 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
     /**
      * 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
@@ -1973,10 +1980,11 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    protected _query(request: IQuery<TResponse>): Promise<ResultType<TResponse>>;
+    protected _query(request: IQuery<TResponse>, signal: AbortSignal): Promise<ResultType<TResponse>>;
     /**
      * 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
@@ -1984,7 +1992,7 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    protected _send(request: ICommand<TResponse>): Promise<ResultType<TResponse>>;
+    protected _send(request: ICommand<TResponse>, signal: AbortSignal): Promise<ResultType<TResponse>>;
     protected getContext(): Optional<RequestContext>;
 }
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ICache, Optional, IExtendendAuthService, IBaseAuthService, ICacheKeyBuilder, IPipelineBehavior, ICommand, IConcurrencyService, IConfigurationService, ILogger, IMediator, IMiddleware, HttpHeaders, IQuery, RequestContext, IServiceResilience, IServiceExtractor, Metadata, IUnitOfWork, IDisposable, IValidatorService, IIdentityAccessor, IContextAccessor, INetworkContextAccessor, IFactory, UserContext, ITransactionState, Factory, IBaseAccessor, Identity, HttpMethod, AuthConfig, CookieOptions, SetupAction, HttpClientConfig, LogLevel, ILoggerClient, Dictionary, AuthPolicy, IStrategy, IRequest, ResponseDto, IHandler, ResultType, ISpecification, CacheConfig, DbConfig, IReadDao, IReadDataSource, IMapper, IRepository, IWriteDataSource, IController, AppError } from '@xeno-js/shared';
+import { ICache, Optional, IExtendendAuthService, IBaseAuthService, ICacheKeyBuilder, IPipelineBehavior, ICommand, IConcurrencyService, IConfigurationService, ILogger, IMediator, IMiddleware, IQuery, RequestContext, IServiceResilience, IServiceExtractor, Metadata, IUnitOfWork, IDisposable, IValidatorService, IIdentityAccessor, IContextAccessor, INetworkContextAccessor, IFactory, UserContext, ITransactionState, Factory, IBaseAccessor, Identity, HttpMethod, AuthConfig, CookieOptions, SetupAction, HttpClientConfig, LogLevel, ILoggerClient, Dictionary, AuthPolicy, IStrategy, IRequest, ExtendedRequest, ResponseDto, IHandler, ResultType, ISpecification, CacheConfig, DbConfig, IReadDao, IReadDataSource, IMapper, IRepository, IWriteDataSource, IController, AppError } from '@xeno-js/shared';
 export * from '@xeno-js/shared';
 export { Query as BaseQuery } from '@xeno-js/shared';
 import { SupabaseClientOptions } from '@supabase/supabase-js';
@@ -158,7 +158,7 @@ interface ApplicationRegistry<T = unknown, Ttx = unknown> {
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    readonly MIDDLEWARE: IMiddleware<HttpHeaders>;
+    readonly MIDDLEWARE: IMiddleware;
     /** @description Token used to register and resolve the QueryPipeline behaviors in the dependency injection container.
      *
      * @author Xeno
@@ -198,7 +198,7 @@ interface ApplicationRegistry<T = unknown, Ttx = unknown> {
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    readonly SERVICE_EXTRACTOR: IServiceExtractor<HttpHeaders, Metadata>;
+    readonly SERVICE_EXTRACTOR: IServiceExtractor<Request['headers'], Metadata>;
     /** @description Token used to register and resolve the UnitOfWork instance in the dependency injection container.
      *
      * @author Xeno
@@ -717,6 +717,10 @@ interface ISsrCookieHandler {
 }
 interface AuthSsrConfig<TOption, TRegistry extends ApplicationRegistry = ApplicationRegistry> extends AuthConfig<TOption> {
     ssrOpts: Optional<(container: IServiceContainer<TRegistry>) => ISsrCookieHandler>;
+    customAuth: Optional<{
+        authHeaderExtractor: () => IServiceExtractor<Request['headers'], Optional<string>>;
+        authExtendedService: () => IExtendendAuthService;
+    }>;
 }
 
 /**
@@ -1165,6 +1169,10 @@ interface MiddlewareConfig {
      * @link https://github.com/xeno-js/xeno-js
      */
     withCredentials: boolean;
+    /**
+     * @description The cookie prefix
+     */
+    authCookieName: Optional<string>;
 }
 /**
  * @description
@@ -1414,10 +1422,7 @@ declare const ContainerUtils: Readonly<{
      * @throws Error If the service is not found in the container.
      * @throws Error If the service is not a scoped service.
      */
-    runExecute<TResponse, T extends ApplicationRegistry, TRes, TReq>(endpoint: string, method: Optional<string>, headers: HttpHeaders, transport: {
-        res: TRes;
-        req: TReq;
-    }, container: IServiceContainer<T>, action: () => Promise<ResponseDto<TResponse>>): Promise<ResponseDto<TResponse>>;
+    runExecute<TResponse, T extends ApplicationRegistry, TRes extends Response, TReq extends ExtendedRequest>(res: TRes, req: TReq, container: IServiceContainer<T>, action: () => Promise<ResponseDto<TResponse>>): Promise<ResponseDto<TResponse>>;
 }>;
 
 /**
@@ -1610,6 +1615,7 @@ declare class AppBuilder<TRegistry extends XenoRegistry = XenoRegistry> {
     private _pipelineConfig;
     private _config;
     private _middlewareConfig;
+    private readonly _authConfig;
     private readonly _httpConfig;
     private readonly _loggerConfig;
     private _isContextModuleQueued;
@@ -1934,7 +1940,7 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
      * @link https://github.com/xeno-js/xeno-js
      */
     constructor(_requestContext: IContextAccessor<RequestContext>, _mediator: IMediator);
-    abstract handle(request: TRequest): Promise<ResponseDto<TResponse>>;
+    abstract handle(request: TRequest, signal: AbortSignal): Promise<ResponseDto<TResponse>>;
     /**
      * Helper to return a successful 200/201 response.
      * @param data - The data to include in the response.
@@ -1966,6 +1972,7 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
     /**
      * 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
@@ -1973,10 +1980,11 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    protected _query(request: IQuery<TResponse>): Promise<ResultType<TResponse>>;
+    protected _query(request: IQuery<TResponse>, signal: AbortSignal): Promise<ResultType<TResponse>>;
     /**
      * 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
@@ -1984,7 +1992,7 @@ declare abstract class BaseController<TRequest, TResponse> implements IControlle
      * @since 2025-09-30
      * @link https://github.com/xeno-js/xeno-js
      */
-    protected _send(request: ICommand<TResponse>): Promise<ResultType<TResponse>>;
+    protected _send(request: ICommand<TResponse>, signal: AbortSignal): Promise<ResultType<TResponse>>;
     protected getContext(): Optional<RequestContext>;
 }
 

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);
       }
     };
   }
@@ -1948,23 +1940,25 @@ 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 Guards25 } 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 (Guards25.isDefined(authHeader) && authHeader.toLowerCase().startsWith("bearer ")) {
           return authHeader.substring(7);
         }
-        const cookieHeader = StringHelper2.getSingleValue(headers["cookie"]);
+        const cookieHeader = headers.get("cookie");
         if (Guards25.isDefined(cookieHeader)) {
-          const match = /sb-access-token=([^;]+)/.exec(cookieHeader);
+          const regex = new RegExp(`${this._cookiePrefix}=([^;]+)`);
+          const match = regex.exec(cookieHeader);
           if (!Guards25.isNullOrEmpty(match) && Guards25.isDefined(match[1])) {
             return match[1].trim();
           }
@@ -1976,21 +1970,18 @@ 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 Guards26, 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"]);
+        const authHeader = headers.get("authorization");
         if (Guards26.isDefined(authHeader) && authHeader.toLowerCase().startsWith("bearer ")) {
           return authHeader.substring(7);
         }
-        const cookieHeader = StringHelper3.getSingleValue(headers["cookie"]);
+        const cookieHeader = headers.get("cookie");
         if (Guards26.isNullOrEmpty(cookieHeader)) return void 0;
         const cookies = cookieHeader.split(";").map((c) => c.trim());
         const tokenChunks = {};
@@ -2013,7 +2004,7 @@ var init_extract_ssr_bearer_extractor = __esm({
         }
         if (Guards26.isNullOrEmpty(fullTokenString)) return void 0;
         try {
-          const parsed = StringHelper3.safeParse(fullTokenString);
+          const parsed = StringHelper2.safeParse(fullTokenString);
           if (Guards26.isDefined(parsed) && Guards26.isObject(parsed) && "access_token" in parsed) {
             const accessToken = parsed["access_token"];
             if (Guards26.isString(accessToken)) return accessToken;
@@ -2054,13 +2045,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 Guards28, 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 +2071,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";
@@ -2291,13 +2276,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;
@@ -2842,17 +2827,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: Guards46, TOKENS: TOKENS4 } = await import("@xeno-js/shared");
+        if (Guards46.isDefined(opts.customAuth)) {
+          const authService = opts.customAuth.authExtendedService();
+          container.addScoped(TOKENS4.AUTH_SERVICE, () => {
+            return authService;
+          });
+          container.addSingleton(TOKENS4.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(TOKENS4.AUTH_SERVICE, () => {
+            return supabase;
+          });
+          container.addSingleton(TOKENS4.BASE_AUTH_SERVICE, () => {
+            return supabase;
+          });
+        }
       }
     });
   }
@@ -3447,6 +3441,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 +3449,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 +3463,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 +3500,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 +3551,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 +3596,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 +3640,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();
       }
@@ -3672,7 +3666,7 @@ 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();
@@ -3709,7 +3703,7 @@ 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) {
@@ -3801,7 +3795,7 @@ 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;
@@ -3841,7 +3835,7 @@ 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;
@@ -3887,7 +3881,7 @@ 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))
@@ -4035,14 +4029,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 +4049,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();
@@ -4186,7 +4180,11 @@ var init_middleware_module = __esm({
         const { Guards: Guards46, TOKENS: TOKENS4 } = 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,
           () => new HttpHeaderExtractor2(
@@ -4305,13 +4303,15 @@ var init_middleware_module = __esm({
           return new CompositeMiddleware2(middlewares);
         });
       }
-      async _getTokenExtractor(isSSR) {
+      async _getTokenExtractor(isSSR, cookieName, customTokenExtractor) {
+        const { Guards: Guards46 } = await import("@xeno-js/shared");
+        if (Guards46.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) {
@@ -4695,7 +4695,17 @@ 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
   };
   _httpConfig = {
     dataSourceToken: void 0,
@@ -4826,21 +4836,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;
@@ -5092,7 +5094,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
         });
       }
     });