@furystack/rest-service 12.3.5 → 14.0.0

package/esm/helpers.js

@@ -1,119 +1,118 @@
 import { useSystemIdentityContext } from '@furystack/core';
 import { PasswordAuthenticator } from '@furystack/security';
-import { ApiManager } from './api-manager.js';
+import { PathHelper } from '@furystack/utils';
 import { createBasicAuthProvider } from './authentication-providers/basic-auth-provider.js';
 import { createCookieAuthProvider } from './authentication-providers/cookie-auth-provider.js';
 import { authenticateUserWithDataSet, findSessionById, findUserByName } from './authentication-providers/helpers.js';
-import { HttpAuthenticationSettings } from './http-authentication-settings.js';
-import { ProxyManager } from './proxy-manager.js';
-import { StaticServerManager } from './static-server-manager.js';
+import { CreateGetOpenApiDocumentAction } from './endpoint-generators/create-get-openapi-document-action.js';
+import { CreateGetSchemaAction } from './endpoint-generators/create-get-schema-action.js';
+import { defaultHttpAuthenticationSettings, HttpAuthenticationSettings } from './http-authentication-settings.js';
+import { HttpServerPoolToken } from './http-server-pool.js';
+import { HttpUserContext } from './http-user-context.js';
+import { buildProxyServerApi } from './proxy-runtime.js';
+import { compileApi, onRestApiMessage, shouldExecRequest } from './rest-api-runtime.js';
+import { ServerTelemetryToken } from './server-telemetry.js';
+import { buildStaticSiteServerApi } from './static-site-runtime.js';
 /**
- * Sets up the @furystack/rest-service with the provided settings
- * @param api The API implementation details
- * @returns a promise that resolves when the API is added to the server
+ * Acquires a pooled HTTP server, compiles the user-supplied API definition
+ * and attaches a {@link ServerApi} that dispatches matching requests.
+ *
+ * Public contract is unchanged from the pre-migration release; internally
+ * everything goes through the functional tokens.
  */
-export const useRestService = async (api) => await api.injector.getInstance(ApiManager).addApi({ ...api });
+export const useRestService = async (options) => {
+    const { injector, api, hostName, port, root, cors, deserializeQueryParams, enableGetSchema, name, description, version, } = options;
+    const extendedApi = enableGetSchema
+        ? {
+            ...api,
+            GET: {
+                ...api.GET,
+                '/schema': CreateGetSchemaAction(api, name, description, version),
+                '/openapi.json': CreateGetOpenApiDocumentAction(api, name, description, version),
+            },
+        }
+        : api;
+    const supportedMethods = Object.keys(extendedApi);
+    const rootApiPath = PathHelper.normalize(root);
+    const compiledApi = compileApi(extendedApi, root);
+    const serverApi = {
+        shouldExec: ({ req }) => shouldExecRequest({
+            method: req.method?.toUpperCase(),
+            url: PathHelper.normalize(req.url || ''),
+            rootApiPath,
+            supportedMethods,
+        }),
+        onRequest: (msg) => onRestApiMessage({
+            ...msg,
+            compiledApi,
+            rootApiPath,
+            port,
+            supportedMethods,
+            cors,
+            injector,
+            hostName,
+            deserializeQueryParams,
+        }),
+    };
+    const pool = injector.get(HttpServerPoolToken);
+    const record = await pool.acquire({ port, hostName });
+    record.apis.push(serverApi);
+    return serverApi;
+};
 /**
- * Sets up the HTTP Authentication with pluggable providers.
+ * Installs HTTP authentication on the given injector: builds the provider
+ * chain (Basic + Cookie by default), appends any caller-provided providers
+ * and rebinds {@link HttpAuthenticationSettings}.
  *
- * Registers Basic Auth (if enabled) and Cookie Auth as built-in providers,
- * then appends any custom providers passed via settings.
- *
- * @param injector  The Injector instance
- * @param settings Settings for HTTP Authentication
+ * Prerequisite: {@link UserStore} and {@link SessionStore} must be bound to
+ * persistent implementations before calling this helper, since the Basic
+ * and Cookie providers need to read users and sessions immediately.
  */
-export const useHttpAuthentication = (injector, settings) => {
-    const mergedSettings = Object.assign(new HttpAuthenticationSettings(), settings);
+export const useHttpAuthentication = (injector, overrides) => {
+    const mergedSettings = {
+        ...defaultHttpAuthenticationSettings(),
+        ...overrides,
+    };
     const systemInjector = useSystemIdentityContext({ injector, username: 'useHttpAuthentication' });
-    const passwordAuthenticator = injector.getInstance(PasswordAuthenticator);
-    const userDataSet = mergedSettings.getUserDataSet(systemInjector);
-    const sessionDataSet = mergedSettings.getSessionDataSet(systemInjector);
+    const passwordAuthenticator = injector.get(PasswordAuthenticator);
+    const userDataSet = systemInjector.get(mergedSettings.userDataSet);
+    const sessionDataSet = systemInjector.get(mergedSettings.sessionDataSet);
     const providers = [];
     if (mergedSettings.enableBasicAuth) {
         providers.push(createBasicAuthProvider((username, password) => authenticateUserWithDataSet(passwordAuthenticator, userDataSet, systemInjector, username, password)));
     }
     providers.push(createCookieAuthProvider(mergedSettings.cookieName, (sessionId) => findSessionById(sessionDataSet, systemInjector, sessionId), (username) => findUserByName(userDataSet, systemInjector, username)));
-    providers.push(...(settings?.authenticationProviders ?? []));
+    providers.push(...(overrides?.authenticationProviders ?? []));
     mergedSettings.authenticationProviders = providers;
-    injector.setExplicitInstance(mergedSettings, HttpAuthenticationSettings);
+    injector.bind(HttpAuthenticationSettings, () => mergedSettings);
+    injector.invalidate(HttpAuthenticationSettings);
+    injector.invalidate(HttpUserContext);
 };
 /**
- * Sets up a static file server
- * @param options The settings for the static file server
- * @param options.injector The Injector instance
- * @param options.settings Settings for the static file server
- * @returns a promise that resolves when the server is ready
+ * Attaches a static-file {@link ServerApi} to the pooled HTTP server
+ * identified by `options.port`/`options.hostName`.
  */
-export const useStaticFiles = (options) => {
+export const useStaticFiles = async (options) => {
     const { injector, ...settings } = options;
-    return injector.getInstance(StaticServerManager).addStaticSite(settings);
+    const pool = injector.get(HttpServerPoolToken);
+    const record = await pool.acquire({ port: settings.port, hostName: settings.hostName });
+    const serverApi = buildStaticSiteServerApi(settings);
+    record.apis.push(serverApi);
+    return serverApi;
 };
 /**
- * Sets up a proxy server that forwards HTTP requests from a source URL to a target URL.
- *
- * The proxy acts as an intermediary, forwarding requests and responses while allowing
- * transformation of headers, cookies, and paths. It returns 502 Bad Gateway on errors
- * and emits 'onProxyFailed' events for monitoring.
- *
- * WebSocket connections can also be proxied by setting `enableWebsockets: true`, allowing
- * bidirectional real-time communication through the proxy.
- *
- * @param options The settings for the proxy server
- * @param options.injector The Injector instance
- * @param options.sourceBaseUrl The base URL path to match for proxying (e.g., '/api', '/old').
- *                               Can be specified with or without a trailing slash.
- * @param options.targetBaseUrl The target server URL (must be a valid HTTP/HTTPS URL)
- * @param options.pathRewrite Optional function to rewrite the path before forwarding.
- *                            Receives the path after sourceBaseUrl, including leading slash and query string.
- *                            Example: for 'GET /api/users?active=true' with sourceBaseUrl='/api',
- *                            pathRewrite receives '/users?active=true'
- * @param options.sourceHostName The hostname for the source server (optional, defaults to all interfaces)
- * @param options.sourcePort The port for the source server
- * @param options.headers Optional function to transform request headers.
- *                        **Note**: Receives headers AFTER filtering hop-by-hop headers
- *                        (Connection, Keep-Alive, Transfer-Encoding, Upgrade, etc.) for security
- *                        and protocol compliance. The proxy automatically adds X-Forwarded-* headers.
- *                        This transformation applies to both HTTP and WebSocket requests.
- * @param options.cookies Optional function to transform request cookies (array of cookie strings)
- * @param options.responseCookies Optional function to transform response Set-Cookie headers
- * @param options.timeout Optional timeout in milliseconds for proxy requests (default: 30000).
- *                        If exceeded, the request is aborted and 502 is returned.
- *                        Applies to both HTTP and WebSocket upgrade requests.
- * @param options.enableWebsockets Optional flag to enable WebSocket proxying (default: false).
- *                                 When enabled, WebSocket upgrade requests will be forwarded to the target.
- * @returns a promise that resolves when the proxy is set up
- * @example
- * ```ts
- * // Basic HTTP proxy with timeout
- * await useProxy({
- *   injector,
- *   sourceBaseUrl: '/api',
- *   targetBaseUrl: 'https://api.example.com',
- *   sourcePort: 3000,
- *   timeout: 5000,
- * })
- *
- * // Proxy with WebSocket support
- * await useProxy({
- *   injector,
- *   sourceBaseUrl: '/ws',
- *   targetBaseUrl: 'https://ws.example.com',
- *   sourcePort: 3000,
- *   enableWebsockets: true,
- * })
- *
- * // Proxy with error monitoring (HTTP and WebSocket)
- * const proxyManager = injector.getInstance(ProxyManager)
- * proxyManager.subscribe('onProxyFailed', ({ from, to, error }) => {
- *   console.error(`HTTP Proxy failed: ${from} -> ${to}`, error)
- * })
- * proxyManager.subscribe('onWebSocketProxyFailed', ({ from, to, error }) => {
- *   console.error(`WebSocket Proxy failed: ${from} -> ${to}`, error)
- * })
- * ```
+ * Attaches a proxy {@link ServerApi} that forwards HTTP (and optionally
+ * WebSocket) traffic from `options.sourceBaseUrl` to `options.targetBaseUrl`.
+ * Emits `onProxyFailed` and `onWebSocketProxyFailed` events into the shared
+ * {@link ServerTelemetryToken} — subscribe there for observability.
  */
-export const useProxy = (options) => {
+export const useProxy = async (options) => {
     const { injector, ...settings } = options;
-    return injector.getInstance(ProxyManager).addProxy(settings);
+    const telemetry = injector.get(ServerTelemetryToken);
+    const pool = injector.get(HttpServerPoolToken);
+    const record = await pool.acquire({ port: settings.sourcePort, hostName: settings.sourceHostName });
+    const serverApi = buildProxyServerApi(settings, telemetry);
+    record.apis.push(serverApi);
+    return serverApi;
 };
 //# sourceMappingURL=helpers.js.map

package/esm/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}

package/esm/helpers.spec.d.ts

@@ -1,2 +1,3 @@
-export {};
+import type { User } from '@furystack/core';
+export type { User };
 //# sourceMappingURL=helpers.spec.d.ts.map

package/esm/helpers.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.spec.d.ts","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":""}
+{"version":3,"file":"helpers.spec.d.ts","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AA4G3C,YAAY,EAAE,IAAI,EAAE,CAAA"}

package/esm/helpers.spec.js

@@ -1,52 +1,46 @@
-import { InMemoryStore, User, addStore } from '@furystack/core';
+import { InMemoryStore, User as UserModel } from '@furystack/core';
 import { getPort } from '@furystack/core/port-generator';
-import { Injector } from '@furystack/inject';
-import { getRepository } from '@furystack/repository';
-import { PasswordCredential, PasswordResetToken, usePasswordPolicy } from '@furystack/security';
+import { createInjector } from '@furystack/inject';
+import { PasswordCredential, PasswordCredentialStore, PasswordResetToken, PasswordResetTokenStore, usePasswordPolicy, } from '@furystack/security';
 import { usingAsync } from '@furystack/utils';
 import { describe, expect, it } from 'vitest';
-import { ApiManager } from './api-manager.js';
 import { useHttpAuthentication, useProxy, useRestService, useStaticFiles } from './helpers.js';
 import { HttpAuthenticationSettings } from './http-authentication-settings.js';
+import { HttpServerPoolToken } from './http-server-pool.js';
 import { DefaultSession } from './models/default-session.js';
-import { ProxyManager } from './proxy-manager.js';
-import { StaticServerManager } from './static-server-manager.js';
+import { SessionStore, UserStore } from './user-store.js';
 const setupAuthStores = (i) => {
-    addStore(i, new InMemoryStore({ model: User, primaryKey: 'username' }))
-        .addStore(new InMemoryStore({ model: DefaultSession, primaryKey: 'sessionId' }))
-        .addStore(new InMemoryStore({ model: PasswordCredential, primaryKey: 'userName' }))
-        .addStore(new InMemoryStore({ model: PasswordResetToken, primaryKey: 'token' }));
-    const repo = getRepository(i);
-    repo.createDataSet(User, 'username');
-    repo.createDataSet(DefaultSession, 'sessionId');
-    repo.createDataSet(PasswordCredential, 'userName');
-    repo.createDataSet(PasswordResetToken, 'token');
+    i.bind(UserStore, () => new InMemoryStore({ model: UserModel, primaryKey: 'username' }));
+    i.bind(SessionStore, () => new InMemoryStore({ model: DefaultSession, primaryKey: 'sessionId' }));
+    i.bind(PasswordCredentialStore, () => new InMemoryStore({ model: PasswordCredential, primaryKey: 'userName' }));
+    i.bind(PasswordResetTokenStore, () => new InMemoryStore({ model: PasswordResetToken, primaryKey: 'token' }));
     usePasswordPolicy(i);
 };
-describe('Injector extensions', () => {
+describe('rest-service setup helpers', () => {
     describe('useHttpAuthentication', () => {
-        it('Should set up HTTP Authentication', async () => {
-            await usingAsync(new Injector(), async (i) => {
+        it('binds HttpAuthenticationSettings on the injector', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 setupAuthStores(i);
                 useHttpAuthentication(i);
-                expect(i.cachedSingletons.get(HttpAuthenticationSettings)).toBeDefined();
+                const settings = i.get(HttpAuthenticationSettings);
+                expect(settings).toBeDefined();
             });
         });
-        it('Should register basic-auth and cookie-auth providers by default', async () => {
-            await usingAsync(new Injector(), async (i) => {
+        it('registers basic-auth and cookie-auth providers by default', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 setupAuthStores(i);
                 useHttpAuthentication(i);
-                const settings = i.getInstance(HttpAuthenticationSettings);
+                const settings = i.get(HttpAuthenticationSettings);
                 const providerNames = settings.authenticationProviders.map((p) => p.name);
                 expect(providerNames).toContain('basic-auth');
                 expect(providerNames).toContain('cookie-auth');
             });
         });
-        it('Should not register basic-auth provider when disabled', async () => {
-            await usingAsync(new Injector(), async (i) => {
+        it('omits the basic-auth provider when enableBasicAuth is false', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 setupAuthStores(i);
                 useHttpAuthentication(i, { enableBasicAuth: false });
-                const settings = i.getInstance(HttpAuthenticationSettings);
+                const settings = i.get(HttpAuthenticationSettings);
                 const providerNames = settings.authenticationProviders.map((p) => p.name);
                 expect(providerNames).not.toContain('basic-auth');
                 expect(providerNames).toContain('cookie-auth');
@@ -54,35 +48,44 @@ describe('Injector extensions', () => {
         });
     });
     describe('useRestService()', () => {
-        it('Should set up a REST service', async () => {
-            await usingAsync(new Injector(), async (i) => {
+        it('acquires a pooled HTTP server and attaches a serverApi', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await useRestService({ injector: i, api: {}, root: '/', port });
-                expect(i.cachedSingletons.get(ApiManager)).toBeDefined();
+                const serverApi = await useRestService({ injector: i, api: {}, root: '/', port });
+                expect(serverApi).toBeDefined();
+                const pool = i.get(HttpServerPoolToken);
+                const record = await pool.acquire({ port });
+                expect(record.apis).toContain(serverApi);
             });
         });
     });
     describe('useStaticFiles()', () => {
-        it('Should set up a static file server', async () => {
-            await usingAsync(new Injector(), async (i) => {
+        it('attaches a static-file serverApi to the pooled HTTP server', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await useStaticFiles({ injector: i, baseUrl: '/', path: '.', port });
-                expect(i.cachedSingletons.get(StaticServerManager)).toBeDefined();
+                const serverApi = await useStaticFiles({ injector: i, baseUrl: '/', path: '.', port });
+                expect(serverApi).toBeDefined();
+                const pool = i.get(HttpServerPoolToken);
+                const record = await pool.acquire({ port });
+                expect(record.apis).toContain(serverApi);
             });
         });
     });
     describe('useProxy()', () => {
-        it('Should set up a proxy server', async () => {
-            await usingAsync(new Injector(), async (i) => {
+        it('attaches a proxy serverApi to the pooled HTTP server', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const sourcePort = getPort();
                 const targetPort = getPort();
-                await useProxy({
+                const serverApi = await useProxy({
                     injector: i,
                     sourceBaseUrl: '/api',
                     targetBaseUrl: `http://localhost:${targetPort}`,
                     sourcePort,
                 });
-                expect(i.cachedSingletons.get(ProxyManager)).toBeDefined();
+                expect(serverApi).toBeDefined();
+                const pool = i.get(HttpServerPoolToken);
+                const record = await pool.acquire({ port: sourcePort });
+                expect(record.apis).toContain(serverApi);
             });
         });
     });

package/esm/helpers.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.spec.js","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.spec.js","sourceRoot":"","sources":["../src/helpers.spec.ts"],"names":[],"mappings":"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"}

package/esm/http-authentication-settings.d.ts

@@ -1,22 +1,45 @@
-import { User } from '@furystack/core';
-import type { Constructable, Injector } from '@furystack/inject';
+import type { User } from '@furystack/core';
+import { type Token } from '@furystack/inject';
+import type { DataSetToken } from '@furystack/repository';
 import type { AuthenticationProvider } from './authentication-providers/authentication-provider.js';
-import { DefaultSession } from './models/default-session.js';
+import type { DefaultSession } from './models/default-session.js';
 /**
- * Authentication settings object for FuryStack HTTP Api
+ * HTTP-authentication settings — rebound by {@link useHttpAuthentication}
+ * during application setup and consumed by {@link HttpUserContext},
+ * cookie-login strategies and OpenAPI generators.
+ *
+ * The field shape reflects the functional-DI redesign:
+ *
+ * - `userDataSet` / `sessionDataSet` are token references (not accessors).
+ *   Consumers resolve them through the injector at the appropriate scope.
+ * - `authenticationProviders` is a simple ordered list; `HttpUserContext`
+ *   walks it on every unauthenticated request.
  */
-export declare class HttpAuthenticationSettings<TUser extends User, TSession extends DefaultSession> {
-    model: Constructable<TUser>;
-    getUserDataSet: (injector: Injector) => import("@furystack/repository").DataSet<TUser, "username" & keyof TUser, import("@furystack/core").WithOptionalId<TUser, "username" & keyof TUser>>;
-    sessionModel: Constructable<TSession>;
-    getSessionDataSet: (injector: Injector) => import("@furystack/repository").DataSet<TSession, "sessionId" & keyof TSession, import("@furystack/core").WithOptionalId<TSession, "sessionId" & keyof TSession>>;
+export interface HttpAuthenticationSettings {
+    /** Data set token for user lookups. */
+    userDataSet: DataSetToken<User, 'username'>;
+    /** Data set token for session lookups. */
+    sessionDataSet: DataSetToken<DefaultSession, 'sessionId'>;
+    /** Cookie name used by the built-in cookie-auth provider. */
     cookieName: string;
+    /** Whether the built-in Basic Auth provider is installed by {@link useHttpAuthentication}. */
     enableBasicAuth: boolean;
     /**
-     * Ordered list of authentication providers. Populated by {@link useHttpAuthentication}
-     * and extended by `useJwtAuthentication()` or other auth plugins.
-     * Safe to mutate only during setup, before the first request is served.
+     * Ordered list of authentication providers. Populated during
+     * {@link useHttpAuthentication} and extended by plugins such as
+     * `useJwtAuthentication`.
      */
     authenticationProviders: AuthenticationProvider[];
 }
+/**
+ * Returns a fresh copy of the default {@link HttpAuthenticationSettings}.
+ * Used as the starting point inside {@link useHttpAuthentication}.
+ */
+export declare const defaultHttpAuthenticationSettings: () => HttpAuthenticationSettings;
+/**
+ * DI token carrying the current {@link HttpAuthenticationSettings}. Rebind
+ * via {@link useHttpAuthentication} (preferred) or directly through
+ * {@link Injector.bind} for advanced scenarios.
+ */
+export declare const HttpAuthenticationSettings: Token<HttpAuthenticationSettings, 'singleton'>;
 //# sourceMappingURL=http-authentication-settings.d.ts.map

package/esm/http-authentication-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-authentication-settings.d.ts","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAGhE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAA;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;GAEG;AACH,qBACa,0BAA0B,CAAC,KAAK,SAAS,IAAI,EAAE,QAAQ,SAAS,cAAc;IAClF,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAA+B;IAE1D,cAAc,GAAI,UAAU,QAAQ,yJACkC;IAEtE,YAAY,EAAE,aAAa,CAAC,QAAQ,CAAC,CAA4C;IAEjF,iBAAiB,GAAI,UAAU,QAAQ,uKAC2C;IAElF,UAAU,SAAQ;IAClB,eAAe,UAAO;IAE7B;;;;OAIG;IACI,uBAAuB,EAAE,sBAAsB,EAAE,CAAK;CAC9D"}
+{"version":3,"file":"http-authentication-settings.d.ts","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAiB,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAA;AACnG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAGjE;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,0BAA0B;IACzC,uCAAuC;IACvC,WAAW,EAAE,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC3C,0CAA0C;IAC1C,cAAc,EAAE,YAAY,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA;IACzD,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAA;IAClB,8FAA8F;IAC9F,eAAe,EAAE,OAAO,CAAA;IACxB;;;;OAIG;IACH,uBAAuB,EAAE,sBAAsB,EAAE,CAAA;CAClD;AAED;;;GAGG;AACH,eAAO,MAAM,iCAAiC,QAAO,0BAMnD,CAAA;AAEF;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,EAAE,KAAK,CAAC,0BAA0B,EAAE,WAAW,CAIpF,CAAA"}

package/esm/http-authentication-settings.js

@@ -1,32 +1,24 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { User } from '@furystack/core';
-import { Injectable } from '@furystack/inject';
-import { getDataSetFor } from '@furystack/repository';
-import { DefaultSession } from './models/default-session.js';
+import { defineService } from '@furystack/inject';
+import { SessionDataSet, UserDataSet } from './user-store.js';
 /**
- * Authentication settings object for FuryStack HTTP Api
+ * Returns a fresh copy of the default {@link HttpAuthenticationSettings}.
+ * Used as the starting point inside {@link useHttpAuthentication}.
  */
-let HttpAuthenticationSettings = class HttpAuthenticationSettings {
-    model = User;
-    getUserDataSet = (injector) => getDataSetFor(injector, this.model, 'username');
-    sessionModel = DefaultSession;
-    getSessionDataSet = (injector) => getDataSetFor(injector, this.sessionModel, 'sessionId');
-    cookieName = 'fss';
-    enableBasicAuth = true;
-    /**
-     * Ordered list of authentication providers. Populated by {@link useHttpAuthentication}
-     * and extended by `useJwtAuthentication()` or other auth plugins.
-     * Safe to mutate only during setup, before the first request is served.
-     */
-    authenticationProviders = [];
-};
-HttpAuthenticationSettings = __decorate([
-    Injectable({ lifetime: 'singleton' })
-], HttpAuthenticationSettings);
-export { HttpAuthenticationSettings };
+export const defaultHttpAuthenticationSettings = () => ({
+    userDataSet: UserDataSet,
+    sessionDataSet: SessionDataSet,
+    cookieName: 'fss',
+    enableBasicAuth: true,
+    authenticationProviders: [],
+});
+/**
+ * DI token carrying the current {@link HttpAuthenticationSettings}. Rebind
+ * via {@link useHttpAuthentication} (preferred) or directly through
+ * {@link Injector.bind} for advanced scenarios.
+ */
+export const HttpAuthenticationSettings = defineService({
+    name: 'furystack/rest-service/HttpAuthenticationSettings',
+    lifetime: 'singleton',
+    factory: () => defaultHttpAuthenticationSettings(),
+});
 //# sourceMappingURL=http-authentication-settings.js.map

package/esm/http-authentication-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-authentication-settings.js","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;GAEG;AAEI,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAC9B,KAAK,GAAyB,IAA4B,CAAA;IAE1D,cAAc,GAAG,CAAC,QAAkB,EAAE,EAAE,CAC7C,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,UAAsC,CAAC,CAAA;IAEtE,YAAY,GAA4B,cAAyC,CAAA;IAEjF,iBAAiB,GAAG,CAAC,QAAkB,EAAE,EAAE,CAChD,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,WAA2C,CAAC,CAAA;IAElF,UAAU,GAAG,KAAK,CAAA;IAClB,eAAe,GAAG,IAAI,CAAA;IAE7B;;;;OAIG;IACI,uBAAuB,GAA6B,EAAE,CAAA;CAC9D,CAAA;AApBY,0BAA0B;IADtC,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,0BAA0B,CAoBtC"}
+{"version":3,"file":"http-authentication-settings.js","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAc,MAAM,mBAAmB,CAAA;AAI7D,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AA+B7D;;;GAGG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,GAA+B,EAAE,CAAC,CAAC;IAClF,WAAW,EAAE,WAAW;IACxB,cAAc,EAAE,cAAc;IAC9B,UAAU,EAAE,KAAK;IACjB,eAAe,EAAE,IAAI;IACrB,uBAAuB,EAAE,EAAE;CAC5B,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAmD,aAAa,CAAC;IACtG,IAAI,EAAE,mDAAmD;IACzD,QAAQ,EAAE,WAAW;IACrB,OAAO,EAAE,GAAG,EAAE,CAAC,iCAAiC,EAAE;CACnD,CAAC,CAAA"}

package/esm/http-server-pool.d.ts

@@ -0,0 +1,64 @@
+import { type Token } from '@furystack/inject';
+import type { IncomingMessage, Server, ServerResponse } from 'http';
+import type { Duplex } from 'stream';
+/**
+ * Options accepted by {@link HttpServerPool.acquire}.
+ */
+export interface ServerOptions {
+    hostName?: string;
+    port: number;
+}
+/** Payload passed to every {@link ServerApi.onRequest} invocation. */
+export interface OnRequest {
+    req: IncomingMessage;
+    res: ServerResponse;
+}
+/** Payload passed to every {@link ServerApi.onUpgrade} invocation. */
+export interface OnUpgrade {
+    req: IncomingMessage;
+    socket: Duplex;
+    head: Buffer;
+}
+/**
+ * Contract every server-side consumer (REST, static sites, proxies,
+ * websockets) implements. Pushed into {@link ServerRecord.apis} by
+ * `useRestService` / `useStaticFiles` / `useProxy` / websocket wiring.
+ */
+export interface ServerApi {
+    shouldExec: (options: OnRequest) => boolean;
+    onRequest: (options: OnRequest) => Promise<void>;
+    onUpgrade?: (options: OnUpgrade) => Promise<void>;
+}
+/**
+ * Shared-port registry entry. Multiple {@link ServerApi}s attached to the
+ * same `port`/`hostName` share a single `http.Server` via the pool and
+ * dispatch to the first matching `shouldExec`.
+ */
+export interface ServerRecord {
+    server: Server;
+    apis: ServerApi[];
+}
+export declare const DEFAULT_HOST = "localhost";
+/**
+ * Public surface of the {@link HttpServerPoolToken}. Acquires shared
+ * `http.Server` instances keyed by url. Consumers push their
+ * {@link ServerApi}s onto the returned record's `apis` array.
+ *
+ * Internal to the rest-service package — application code interacts with
+ * the pool indirectly through `useRestService` / `useStaticFiles` /
+ * `useProxy`.
+ */
+export interface HttpServerPool {
+    /**
+     * Returns the {@link ServerRecord} for the given options, opening a new
+     * `http.Server` on first request and returning the cached instance on
+     * subsequent requests to the same url.
+     */
+    acquire(options: ServerOptions): Promise<ServerRecord>;
+}
+/**
+ * DI token for the {@link HttpServerPool}. Scoped so each test / application
+ * scope has its own set of HTTP servers and sockets.
+ */
+export declare const HttpServerPoolToken: Token<HttpServerPool, 'scoped'>;
+//# sourceMappingURL=http-server-pool.d.ts.map

package/esm/http-server-pool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-server-pool.d.ts","sourceRoot":"","sources":["../src/http-server-pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAGnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAGpC;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;CACb;AAED,sEAAsE;AACtE,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,eAAe,CAAA;IACpB,GAAG,EAAE,cAAc,CAAA;CACpB;AAED,sEAAsE;AACtE,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,eAAe,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,MAAM,CAAA;CACb;AAED;;;;GAIG;AACH,MAAM,WAAW,SAAS;IACxB,UAAU,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,OAAO,CAAA;IAC3C,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAChD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAClD;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,SAAS,EAAE,CAAA;CAClB;AAED,eAAO,MAAM,YAAY,cAAc,CAAA;AAIvC;;;;;;;;GAQG;AACH,MAAM,WAAW,cAAc;IAC7B;;;;OAIG;IACH,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;CACvD;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,cAAc,EAAE,QAAQ,CA6F9D,CAAA"}