@furystack/rest-service 13.0.0 → 14.0.0

package/esm/http-server-pool.spec.js

@@ -0,0 +1,193 @@
+import { getPort } from '@furystack/core/port-generator';
+import { createInjector } from '@furystack/inject';
+import { usingAsync } from '@furystack/utils';
+import { describe, expect, it, vi } from 'vitest';
+import { WebSocket } from 'ws';
+import { HttpServerPoolToken } from './http-server-pool.js';
+import { ServerTelemetryToken } from './server-telemetry.js';
+/** Returns a `ServerApi` that executes `handler` on every matching request. */
+const makeApi = (handler) => ({
+    shouldExec: () => true,
+    onRequest: handler,
+});
+describe('HttpServerPool', () => {
+    it('Should return the cached record on subsequent acquire calls for the same url', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const pool = injector.get(HttpServerPoolToken);
+            const port = getPort();
+            const first = await pool.acquire({ port });
+            const second = await pool.acquire({ port });
+            expect(second).toBe(first);
+        });
+    });
+    it('Should de-duplicate concurrent acquire calls into a single server creation', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const pool = injector.get(HttpServerPoolToken);
+            const port = getPort();
+            const [a, b, c] = await Promise.all([pool.acquire({ port }), pool.acquire({ port }), pool.acquire({ port })]);
+            expect(b).toBe(a);
+            expect(c).toBe(a);
+        });
+    });
+    it('Should emit onServerListening when a new record is opened', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const telemetry = injector.get(ServerTelemetryToken);
+            const listening = vi.fn();
+            telemetry.subscribe('onServerListening', listening);
+            const port = getPort();
+            await injector.get(HttpServerPoolToken).acquire({ port });
+            expect(listening).toHaveBeenCalledWith({ url: `http://localhost:${port}`, port, hostName: undefined });
+        });
+    });
+    it('Should destroy the socket and route the rejection through telemetry when onUpgrade rejects', async () => {
+        const injector = createInjector();
+        try {
+            const pool = injector.get(HttpServerPoolToken);
+            const telemetry = injector.get(ServerTelemetryToken);
+            const onRequestFailed = vi.fn();
+            telemetry.subscribe('onRequestFailed', onRequestFailed);
+            const port = getPort();
+            const record = await pool.acquire({ port });
+            const rejection = new Error('upgrade boom');
+            const onUpgrade = vi.fn().mockRejectedValue(rejection);
+            record.apis.push({
+                shouldExec: () => true,
+                onRequest: () => Promise.resolve(),
+                onUpgrade,
+            });
+            const socketClosed = new Promise((resolve) => {
+                const ws = new WebSocket(`ws://127.0.0.1:${port}`);
+                ws.on('close', () => resolve());
+                ws.on('error', () => resolve());
+            });
+            await socketClosed;
+            await new Promise((r) => setTimeout(r, 20));
+            expect(onUpgrade).toHaveBeenCalledTimes(1);
+            expect(onRequestFailed).toHaveBeenCalledTimes(1);
+            const [error] = onRequestFailed.mock.calls[0][0];
+            expect(error).toBe(rejection);
+        }
+        finally {
+            await injector[Symbol.asyncDispose]();
+        }
+    });
+    it('Should destroy the socket when no API claims the upgrade', async () => {
+        const injector = createInjector();
+        try {
+            const pool = injector.get(HttpServerPoolToken);
+            const port = getPort();
+            await pool.acquire({ port });
+            const ws = new WebSocket(`ws://127.0.0.1:${port}`);
+            await new Promise((resolve) => {
+                ws.on('close', () => resolve());
+                ws.on('error', () => resolve());
+            });
+            expect(ws.readyState).toBe(WebSocket.CLOSED);
+        }
+        finally {
+            await injector[Symbol.asyncDispose]();
+        }
+    });
+    it('Should destroy the raw socket when no API matches a normal request', async () => {
+        const injector = createInjector();
+        try {
+            const pool = injector.get(HttpServerPoolToken);
+            const port = getPort();
+            await pool.acquire({ port });
+            await expect(fetch(`http://127.0.0.1:${port}/nothing`)).rejects.toBeDefined();
+        }
+        finally {
+            await injector[Symbol.asyncDispose]();
+        }
+    });
+    it('Should surface onRequest rejections through telemetry without crashing the server', async () => {
+        const injector = createInjector();
+        try {
+            const pool = injector.get(HttpServerPoolToken);
+            const telemetry = injector.get(ServerTelemetryToken);
+            const onRequestFailed = vi.fn();
+            telemetry.subscribe('onRequestFailed', onRequestFailed);
+            const port = getPort();
+            const record = await pool.acquire({ port });
+            const rejection = new Error('request boom');
+            record.apis.push(makeApi(async ({ res }) => {
+                res.end();
+                throw rejection;
+            }));
+            await fetch(`http://127.0.0.1:${port}/test`);
+            await new Promise((r) => setTimeout(r, 20));
+            expect(onRequestFailed).toHaveBeenCalledTimes(1);
+            const [error] = onRequestFailed.mock.calls[0][0];
+            expect(error).toBe(rejection);
+        }
+        finally {
+            await injector[Symbol.asyncDispose]();
+        }
+    });
+    it('Should destroy open client sockets during disposal', async () => {
+        const injector = createInjector();
+        const pool = injector.get(HttpServerPoolToken);
+        const port = getPort();
+        const record = await pool.acquire({ port });
+        record.apis.push({
+            shouldExec: () => true,
+            onRequest: async ({ res }) => {
+                res.writeHead(200);
+                res.write('streaming');
+            },
+        });
+        // Keep a client socket open so the dispose path has something to destroy.
+        const inflight = fetch(`http://127.0.0.1:${port}/slow`).catch(() => undefined);
+        await new Promise((r) => setTimeout(r, 50));
+        await injector[Symbol.asyncDispose]();
+        await inflight;
+    });
+    it('Should absorb server.close errors during dispose without crashing', async () => {
+        const injector = createInjector();
+        const pool = injector.get(HttpServerPoolToken);
+        const port = getPort();
+        const record = await pool.acquire({ port });
+        // Force `server.close` to invoke its callback with an error -- the pool
+        // wraps every close in `Promise.allSettled`, so the rejected branch
+        // (`if (err) { reject(err); return }`) is exercised but the injector's
+        // dispose still resolves cleanly.
+        const closeError = new Error('close boom');
+        const closeSpy = vi.fn((cb) => {
+            cb?.(closeError);
+            return record.server;
+        });
+        record.server.close = closeSpy;
+        record.server.off = () => undefined;
+        await expect(injector[Symbol.asyncDispose]()).resolves.toBeUndefined();
+        expect(closeSpy).toHaveBeenCalled();
+    });
+    it('Should drain in-flight acquire promises during dispose', async () => {
+        const injector = createInjector();
+        const port = getPort();
+        const pool = injector.get(HttpServerPoolToken);
+        const inflight = pool.acquire({ port });
+        await injector[Symbol.asyncDispose]();
+        // The in-flight promise either resolved (server opened before dispose)
+        // or rejected cleanly — both are acceptable; we just assert no process
+        // crash / unhandled rejection escaped the pool's `allSettled` guard.
+        await inflight.catch(() => undefined);
+    });
+    it('Should stop tracking sockets that close before dispose', async () => {
+        const injector = createInjector();
+        try {
+            const pool = injector.get(HttpServerPoolToken);
+            const port = getPort();
+            const record = await pool.acquire({ port });
+            record.apis.push(makeApi(async ({ res }) => {
+                res.end('ok');
+            }));
+            await fetch(`http://127.0.0.1:${port}/ok`);
+            // Let the TCP socket actually flip to 'close' before we tear down.
+            await new Promise((r) => setTimeout(r, 50));
+        }
+        finally {
+            await injector[Symbol.asyncDispose]();
+        }
+    });
+});
+//# sourceMappingURL=http-server-pool.spec.js.map

package/esm/http-server-pool.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-server-pool.spec.js","sourceRoot":"","sources":["../src/http-server-pool.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,EAAE,mBAAmB,EAAkD,MAAM,uBAAuB,CAAA;AAC3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAE5D,+EAA+E;AAC/E,MAAM,OAAO,GAAG,CAAC,OAA8C,EAAa,EAAE,CAAC,CAAC;IAC9E,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;IACtB,SAAS,EAAE,OAAO;CACnB,CAAC,CAAA;AAEF,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAC3C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC5B,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;YAC7G,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACjB,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,UAAU,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;YACpD,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAA;YACzB,SAAS,CAAC,SAAS,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAA;YAEnD,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YACzD,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,EAAE,GAAG,EAAE,oBAAoB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAA;QACxG,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4FAA4F,EAAE,KAAK,IAAI,EAAE;QAC1G,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;YACpD,MAAM,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAA;YAC/B,SAAS,CAAC,SAAS,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAA;YAEvD,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAE3C,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;YAC3C,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,EAAyC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAA;YAC7F,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBACf,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;gBACtB,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;gBAClC,SAAS;aACV,CAAC,CAAA;YAEF,MAAM,YAAY,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBACjD,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAA;gBAClD,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;gBAC/B,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,MAAM,YAAY,CAAA;YAClB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;YAE3C,MAAM,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;YAC1C,MAAM,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;YAChD,MAAM,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAA+C,CAAA;YAC9F,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC/B,CAAC;gBAAS,CAAC;YACT,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QACvC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAE5B,MAAM,EAAE,GAAG,IAAI,SAAS,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAA;YAClD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAClC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;gBAC/B,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC9C,CAAC;gBAAS,CAAC;YACT,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QACvC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAE5B,MAAM,MAAM,CAAC,KAAK,CAAC,oBAAoB,IAAI,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAA;QAC/E,CAAC;gBAAS,CAAC;YACT,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QACvC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mFAAmF,EAAE,KAAK,IAAI,EAAE;QACjG,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;YACpD,MAAM,eAAe,GAAG,EAAE,CAAC,EAAE,EAAE,CAAA;YAC/B,SAAS,CAAC,SAAS,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAA;YAEvD,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAC3C,MAAM,SAAS,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;YAC3C,MAAM,CAAC,IAAI,CAAC,IAAI,CACd,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBACxB,GAAG,CAAC,GAAG,EAAE,CAAA;gBACT,MAAM,SAAS,CAAA;YACjB,CAAC,CAAC,CACH,CAAA;YAED,MAAM,KAAK,CAAC,oBAAoB,IAAI,OAAO,CAAC,CAAA;YAC5C,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;YAE3C,MAAM,CAAC,eAAe,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAA;YAChD,MAAM,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAA+C,CAAA;YAC9F,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC/B,CAAC;gBAAS,CAAC;YACT,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QACvC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;QAE3C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YACf,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;YACtB,SAAS,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBAC3B,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;gBAClB,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;YACxB,CAAC;SACF,CAAC,CAAA;QAEF,0EAA0E;QAC1E,MAAM,QAAQ,GAAG,KAAK,CAAC,oBAAoB,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAC9E,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QAE3C,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QACrC,MAAM,QAAQ,CAAA;IAChB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;QAE3C,wEAAwE;QACxE,oEAAoE;QACpE,uEAAuE;QACvE,kCAAkC;QAClC,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAA;QAC1C,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAA0B,EAAE,EAAE;YACpD,EAAE,EAAE,CAAC,UAAU,CAAC,CAAA;YAChB,OAAO,MAAM,CAAC,MAAM,CAAA;QACtB,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,QAAiD,CACtE;QAAC,MAAM,CAAC,MAA2D,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,CAAA;QAE1F,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAA;QACtE,MAAM,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;QACtB,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;QACvC,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QACrC,uEAAuE;QACvE,uEAAuE;QACvE,qEAAqE;QACrE,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;QACjC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;YAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAA;YACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;YAC3C,MAAM,CAAC,IAAI,CAAC,IAAI,CACd,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;gBACxB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACf,CAAC,CAAC,CACH,CAAA;YAED,MAAM,KAAK,CAAC,oBAAoB,IAAI,KAAK,CAAC,CAAA;YAC1C,mEAAmE;YACnE,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QAC7C,CAAC;gBAAS,CAAC;YACT,MAAM,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAA;QACvC,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/esm/http-user-context.d.ts

@@ -1,10 +1,11 @@
 import type { User } from '@furystack/core';
+import { type Token } from '@furystack/inject';
 import { EventHub, type ListenerErrorPayload } from '@furystack/utils';
 import type { IncomingMessage } from 'http';
 import { HttpAuthenticationSettings } from './http-authentication-settings.js';
-import type { DefaultSession } from './models/default-session.js';
 /**
- * Events emitted by the {@link HttpUserContext}
+ * Events emitted by a per-request {@link HttpUserContext} instance. Since
+ * the context is scoped, each request sees its own event stream.
  */
 export type HttpUserContextEvents = {
     onLogin: {
@@ -15,56 +16,42 @@ export type HttpUserContextEvents = {
     onListenerError: ListenerErrorPayload;
 };
 /**
- * Injectable UserContext for FuryStack HTTP Api
+ * Request-scoped authentication/authorization facade.
+ *
+ * `HttpUserContext` consolidates identity lookup, authentication-provider
+ * walk-through and cookie session helpers behind a single object. Resolved
+ * users are memoized per `request.headers` via a {@link WeakMap} so repeated
+ * calls within the same request skip re-authentication — and so ancestor
+ * scopes caching the same `HttpUserContext` instance cannot leak an
+ * authenticated user into sibling requests.
  */
-export declare class HttpUserContext extends EventHub<HttpUserContextEvents> {
-    getUserDataSet: () => import("@furystack/repository").DataSet<User, "username", import("@furystack/core").WithOptionalId<User, "username">>;
-    getSessionDataSet: () => import("@furystack/repository").DataSet<DefaultSession, "sessionId", import("@furystack/core").WithOptionalId<DefaultSession, "sessionId">>;
-    private getUserByName;
-    private user?;
-    /**
-     * @param request The request to be authenticated
-     * @returns whether the current user is authenticated
-     */
-    isAuthenticated(request: IncomingMessage): Promise<boolean>;
-    /**
-     * Returns whether the current user can be authorized with ALL of the specified roles
-     * @param request The request to be authenticated
-     * @param roles The list of roles to authorize
-     * @returns a boolean value that indicates whether the user is authorized
-     */
-    isAuthorized(request: IncomingMessage, ...roles: string[]): Promise<boolean>;
-    /**
-     * Checks if the system contains a user with the provided name and password, throws an error otherwise
-     * @param userName The username
-     * @param password The password
-     * @returns the authenticated User
-     */
-    authenticateUser(userName: string, password: string): Promise<import("@furystack/core").PartialResult<User, (keyof User)[]>>;
+export interface HttpUserContext extends EventHub<HttpUserContextEvents> {
+    /** The active {@link HttpAuthenticationSettings} captured at resolve time. */
+    readonly authentication: HttpAuthenticationSettings;
+    /** Whether the current user is authenticated according to the bound providers. */
+    isAuthenticated(request: Pick<IncomingMessage, 'headers'>): Promise<boolean>;
+    /** Returns `true` when the current user has **all** of the supplied roles. */
+    isAuthorized(request: Pick<IncomingMessage, 'headers'>, ...roles: string[]): Promise<boolean>;
+    /** Verifies a username/password pair against the system `PasswordAuthenticator`. */
+    authenticateUser(userName: string, password: string): Promise<User>;
+    /** Returns the cached user for this request or resolves it via the provider chain. */
     getCurrentUser(request: Pick<IncomingMessage, 'headers'>): Promise<User>;
+    /** Extracts the session id for `request` using the configured cookie name. */
     getSessionIdFromRequest(request: Pick<IncomingMessage, 'headers'>): string | null;
-    /**
-     * Iterates registered authentication providers in order.
-     * - A provider returning `User` means authentication succeeded.
-     * - A provider returning `null` means it does not apply; try the next one.
-     * - A provider throwing means it owns the request but auth failed; propagate the error.
-     */
+    /** Walks the configured authentication providers and returns the first match. */
     authenticateRequest(request: Pick<IncomingMessage, 'headers'>): Promise<User>;
-    /**
-     * Creates and sets up a cookie-based session for the provided user
-     * @param user The user to create a session for
-     * @param serverResponse A serverResponse to set the cookie
-     * @returns the current User
-     */
-    cookieLogin(user: User, serverResponse: {
+    /** Creates and persists a session for `user`, setting the cookie on `response`. */
+    cookieLogin(user: User, response: {
         setHeader: (header: string, value: string) => void;
     }): Promise<User>;
+    /** Clears the session identified by the request's cookie (if any). */
     cookieLogout(request: Pick<IncomingMessage, 'headers'>, response: {
         setHeader: (header: string, value: string) => void;
     }): Promise<void>;
-    readonly authentication: HttpAuthenticationSettings<User, DefaultSession>;
-    private readonly systemInjector;
-    private readonly authenticator;
-    init(): void;
 }
+/**
+ * DI token for the per-request {@link HttpUserContext}. Scoped — each HTTP
+ * request resolves its own instance with a fresh `user` cache.
+ */
+export declare const HttpUserContext: Token<HttpUserContext, 'scoped'>;
 //# sourceMappingURL=http-user-context.d.ts.map

package/esm/http-user-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-user-context.d.ts","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAK3C,OAAO,EAAE,QAAQ,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAE3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAEjE;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,CAAA;IACvB,QAAQ,EAAE,SAAS,CAAA;IACnB,oBAAoB,EAAE,SAAS,CAAA;IAC/B,eAAe,EAAE,oBAAoB,CAAA;CACtC,CAAA;AAED;;GAEG;AACH,qBACa,eAAgB,SAAQ,QAAQ,CAAC,qBAAqB,CAAC;IAC3D,cAAc,8HAAgE;IAE9E,iBAAiB,oJAAmE;IAE3F,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,IAAI,CAAC,CAAM;IAEnB;;;OAGG;IACU,eAAe,CAAC,OAAO,EAAE,eAAe;IASrD;;;;;OAKG;IACU,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzF;;;;;OAKG;IACU,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAanD,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC;IAQ9D,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,MAAM,GAAG,IAAI;IAIxF;;;;;OAKG;IACU,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1F;;;;;OAKG;IACU,WAAW,CACtB,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,GACrE,OAAO,CAAC,IAAI,CAAC;IASH,YAAY,CACvB,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EACzC,QAAQ,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;IAclE,SACwB,cAAc,EAAE,0BAA0B,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IAExF,iBACyB,cAAc,CAAU;IAEjD,iBACyB,aAAa,CAAuB;IAEtD,IAAI;CAmBZ"}
+{"version":3,"file":"http-user-context.d.ts","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAG3C,OAAO,EAAiB,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAE7D,OAAO,EAAE,QAAQ,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAE3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAE9E;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,CAAA;IACvB,QAAQ,EAAE,SAAS,CAAA;IACnB,oBAAoB,EAAE,SAAS,CAAA;IAC/B,eAAe,EAAE,oBAAoB,CAAA;CACtC,CAAA;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,eAAgB,SAAQ,QAAQ,CAAC,qBAAqB,CAAC;IACtE,8EAA8E;IAC9E,QAAQ,CAAC,cAAc,EAAE,0BAA0B,CAAA;IACnD,kFAAkF;IAClF,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5E,8EAA8E;IAC9E,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7F,oFAAoF;IACpF,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnE,sFAAsF;IACtF,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACxE,8EAA8E;IAC9E,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,MAAM,GAAG,IAAI,CAAA;IACjF,iFAAiF;IACjF,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7E,mFAAmF;IACnF,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACxG,sEAAsE;IACtE,YAAY,CACV,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EACzC,QAAQ,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,GAC/D,OAAO,CAAC,IAAI,CAAC,CAAA;CACjB;AAoID;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,eAAe,EAAE,QAAQ,CAW3D,CAAA"}

package/esm/http-user-context.js

@@ -1,53 +1,47 @@
-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;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 import { useSystemIdentityContext } from '@furystack/core';
-import { Injectable, Injected } from '@furystack/inject';
+import { defineService } from '@furystack/inject';
 import { PasswordAuthenticator, UnauthenticatedError } from '@furystack/security';
 import { EventHub } from '@furystack/utils';
 import { randomBytes } from 'crypto';
 import { extractSessionIdFromCookies } from './authentication-providers/helpers.js';
 import { HttpAuthenticationSettings } from './http-authentication-settings.js';
 /**
- * Injectable UserContext for FuryStack HTTP Api
+ * Internal concrete EventHub-backed {@link HttpUserContext}. Exposed via
+ * the {@link HttpUserContextToken} token; constructed by its factory.
  */
-let HttpUserContext = class HttpUserContext extends EventHub {
-    getUserDataSet = () => this.authentication.getUserDataSet(this.systemInjector);
-    getSessionDataSet = () => this.authentication.getSessionDataSet(this.systemInjector);
-    getUserByName = async (userName) => {
-        const userDataSet = this.getUserDataSet();
-        const users = await userDataSet.find(this.systemInjector, { filter: { username: { $eq: userName } }, top: 2 });
-        if (users.length !== 1) {
-            throw new UnauthenticatedError();
-        }
-        return users[0];
-    };
-    user;
+class HttpUserContextImpl extends EventHub {
+    authentication;
+    resolveAuthenticator;
+    systemInjector;
     /**
-     * @param request The request to be authenticated
-     * @returns whether the current user is authenticated
+     * Per-request user cache keyed by the request's `headers` object identity.
+     * Each incoming HTTP/WS message allocates its own `headers` object, so
+     * entries here never leak between requests — even when this
+     * `HttpUserContext` instance happens to be cached by an ancestor scope
+     * (e.g. because setup code resolved it on the root injector before any
+     * per-request child scope existed).
      */
+    userCache = new WeakMap();
+    /**
+     * `authenticator` is resolved lazily so that tests (and applications) that
+     * never invoke `authenticateUser` don't need to bind password-credential
+     * stores.
+     */
+    constructor(authentication, resolveAuthenticator, systemInjector) {
+        super();
+        this.authentication = authentication;
+        this.resolveAuthenticator = resolveAuthenticator;
+        this.systemInjector = systemInjector;
+    }
     async isAuthenticated(request) {
         try {
             const currentUser = await this.getCurrentUser(request);
             return currentUser !== null;
         }
-        catch (error) {
+        catch {
             return false;
         }
     }
-    /**
-     * Returns whether the current user can be authorized with ALL of the specified roles
-     * @param request The request to be authenticated
-     * @param roles The list of roles to authorize
-     * @returns a boolean value that indicates whether the user is authorized
-     */
     async isAuthorized(request, ...roles) {
         const currentUser = await this.getCurrentUser(request);
         for (const role of roles) {
@@ -57,14 +51,8 @@ let HttpUserContext = class HttpUserContext extends EventHub {
         }
         return true;
     }
-    /**
-     * Checks if the system contains a user with the provided name and password, throws an error otherwise
-     * @param userName The username
-     * @param password The password
-     * @returns the authenticated User
-     */
     async authenticateUser(userName, password) {
-        const result = await this.authenticator.checkPasswordForUser(userName, password);
+        const result = await this.resolveAuthenticator().checkPasswordForUser(userName, password);
         if (!result.isValid) {
             throw new UnauthenticatedError();
         }
@@ -75,21 +63,24 @@ let HttpUserContext = class HttpUserContext extends EventHub {
         return user;
     }
     async getCurrentUser(request) {
-        if (!this.user) {
-            this.user = await this.authenticateRequest(request);
-            return this.user;
+        const key = request.headers;
+        const cached = this.userCache.get(key);
+        if (cached) {
+            return cached;
+        }
+        const pending = this.authenticateRequest(request);
+        this.userCache.set(key, pending);
+        try {
+            return await pending;
+        }
+        catch (error) {
+            this.userCache.delete(key);
+            throw error;
         }
-        return this.user;
     }
     getSessionIdFromRequest(request) {
         return extractSessionIdFromCookies(request, this.authentication.cookieName);
     }
-    /**
-     * Iterates registered authentication providers in order.
-     * - A provider returning `User` means authentication succeeded.
-     * - A provider returning `null` means it does not apply; try the next one.
-     * - A provider throwing means it owns the request but auth failed; propagate the error.
-     */
     async authenticateRequest(request) {
         for (const provider of this.authentication.authenticationProviders) {
             const user = await provider.authenticate(request);
@@ -98,63 +89,53 @@ let HttpUserContext = class HttpUserContext extends EventHub {
         }
         throw new UnauthenticatedError();
     }
-    /**
-     * Creates and sets up a cookie-based session for the provided user
-     * @param user The user to create a session for
-     * @param serverResponse A serverResponse to set the cookie
-     * @returns the current User
-     */
-    async cookieLogin(user, serverResponse) {
+    async cookieLogin(user, response) {
         const sessionId = randomBytes(32).toString('hex');
-        await this.getSessionDataSet().add(this.systemInjector, { sessionId, username: user.username });
-        serverResponse.setHeader('Set-Cookie', `${this.authentication.cookieName}=${sessionId}; Path=/; HttpOnly`);
-        this.user = user;
+        const sessionDataSet = this.systemInjector.get(this.authentication.sessionDataSet);
+        await sessionDataSet.add(this.systemInjector, { sessionId, username: user.username });
+        response.setHeader('Set-Cookie', `${this.authentication.cookieName}=${sessionId}; Path=/; HttpOnly`);
         this.emit('onLogin', { user });
         return user;
     }
     async cookieLogout(request, response) {
-        this.user = undefined;
+        this.userCache.delete(request.headers);
         const sessionId = this.getSessionIdFromRequest(request);
         response.setHeader('Set-Cookie', `${this.authentication.cookieName}=; Path=/; HttpOnly`);
         if (sessionId) {
-            const sessionDataSet = this.getSessionDataSet();
-            const sessions = await sessionDataSet.find(this.systemInjector, { filter: { sessionId: { $eq: sessionId } } });
-            await sessionDataSet.remove(this.systemInjector, ...sessions.map((s) => s[sessionDataSet.primaryKey]));
+            const sessionDataSet = this.systemInjector.get(this.authentication.sessionDataSet);
+            const sessions = await sessionDataSet.find(this.systemInjector, {
+                filter: { sessionId: { $eq: sessionId } },
+            });
+            await sessionDataSet.remove(this.systemInjector, ...sessions.map((s) => s.sessionId));
         }
         this.emit('onLogout', undefined);
     }
-    init() {
-        this.getUserDataSet().addListener('onEntityUpdated', ({ id, change }) => {
-            if (this.user?.username === id) {
-                this.user = { ...this.user, ...change };
-            }
-        });
-        this.getUserDataSet().addListener('onEntityRemoved', ({ key }) => {
-            if (this.user?.username === key) {
-                this.user = undefined;
-                this.emit('onSessionInvalidated', undefined);
-            }
-        });
-        this.getSessionDataSet().addListener('onEntityRemoved', () => {
-            this.user = undefined;
-            this.emit('onSessionInvalidated', undefined);
+    async getUserByName(userName) {
+        const userDataSet = this.systemInjector.get(this.authentication.userDataSet);
+        const users = await userDataSet.find(this.systemInjector, {
+            filter: { username: { $eq: userName } },
+            top: 2,
         });
+        if (users.length !== 1) {
+            throw new UnauthenticatedError();
+        }
+        return users[0];
     }
-};
-__decorate([
-    Injected(HttpAuthenticationSettings),
-    __metadata("design:type", HttpAuthenticationSettings)
-], HttpUserContext.prototype, "authentication", void 0);
-__decorate([
-    Injected((injector) => useSystemIdentityContext({ injector, username: 'HttpUserContext' })),
-    __metadata("design:type", Function)
-], HttpUserContext.prototype, "systemInjector", void 0);
-__decorate([
-    Injected(PasswordAuthenticator),
-    __metadata("design:type", PasswordAuthenticator)
-], HttpUserContext.prototype, "authenticator", void 0);
-HttpUserContext = __decorate([
-    Injectable({ lifetime: 'scoped' })
-], HttpUserContext);
-export { HttpUserContext };
+}
+/**
+ * DI token for the per-request {@link HttpUserContext}. Scoped — each HTTP
+ * request resolves its own instance with a fresh `user` cache.
+ */
+export const HttpUserContext = defineService({
+    name: 'furystack/rest-service/HttpUserContext',
+    lifetime: 'scoped',
+    factory: ({ inject, injector, onDispose }) => {
+        const authentication = inject(HttpAuthenticationSettings);
+        const systemInjector = useSystemIdentityContext({ injector, username: 'HttpUserContext' });
+        onDispose(() => systemInjector[Symbol.asyncDispose]());
+        // Password authenticator resolution is deferred: tests that exercise only
+        // unauthenticated endpoints never have to bind credential stores.
+        return new HttpUserContextImpl(authentication, () => injector.get(PasswordAuthenticator), systemInjector);
+    },
+});
 //# sourceMappingURL=http-user-context.js.map

package/esm/http-user-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-user-context.js","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"http-user-context.js","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAE1D,OAAO,EAAE,aAAa,EAAc,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACjF,OAAO,EAAE,QAAQ,EAA6B,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAEpC,OAAO,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAA;AACnF,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AA+C9E;;;GAGG;AACH,MAAM,mBAAoB,SAAQ,QAA+B;IAiB7C;IACC;IACA;IAlBnB;;;;;;;OAOG;IACc,SAAS,GAAG,IAAI,OAAO,EAAyB,CAAA;IAEjE;;;;OAIG;IACH,YACkB,cAA0C,EACzC,oBAAiD,EACjD,cAAwB;QAEzC,KAAK,EAAE,CAAA;QAJS,mBAAc,GAAd,cAAc,CAA4B;QACzC,yBAAoB,GAApB,oBAAoB,CAA6B;QACjD,mBAAc,GAAd,cAAc,CAAU;IAG3C,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,OAAyC;QACpE,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;YACtD,OAAO,WAAW,KAAK,IAAI,CAAA;QAC7B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,OAAyC,EAAE,GAAG,KAAe;QACrF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QACtD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;gBAC/D,OAAO,KAAK,CAAA;YACd,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACzF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,oBAAoB,EAAE,CAAA;QAClC,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,oBAAoB,EAAE,CAAA;QAClC,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,OAAyC;QACnE,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAA;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAA;QACf,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;QACjD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAChC,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAA;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC1B,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAEM,uBAAuB,CAAC,OAAyC;QACtE,OAAO,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;IAC7E,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAyC;QACxE,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,CAAC;YACnE,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;YACjD,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAA;QACvB,CAAC;QACD,MAAM,IAAI,oBAAoB,EAAE,CAAA;IAClC,CAAC;IAEM,KAAK,CAAC,WAAW,CACtB,IAAU,EACV,QAAgE;QAEhE,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QACjD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;QAClF,MAAM,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;QACrF,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,IAAI,SAAS,oBAAoB,CAAC,CAAA;QACpG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9B,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,OAAyC,EACzC,QAAgE;QAEhE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAA;QACvD,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,qBAAqB,CAAC,CAAA;QAExF,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;YAClF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBAC9D,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE;aAC1C,CAAC,CAAA;YACF,MAAM,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QACvF,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IAClC,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAgB;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAC5E,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACxD,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;YACvC,GAAG,EAAE,CAAC;SACP,CAAC,CAAA;QACF,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,oBAAoB,EAAE,CAAA;QAClC,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAqC,aAAa,CAAC;IAC7E,IAAI,EAAE,wCAAwC;IAC9C,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAmB,EAAE;QAC5D,MAAM,cAAc,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAA;QACzD,MAAM,cAAc,GAAG,wBAAwB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAA;QAC1F,SAAS,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;QACtD,0EAA0E;QAC1E,kEAAkE;QAClE,OAAO,IAAI,mBAAmB,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,cAAc,CAAC,CAAA;IAC3G,CAAC;CACF,CAAC,CAAA"}

package/esm/http-user-context.spec.d.ts

@@ -1,5 +1,11 @@
-import { Injector } from '@furystack/inject';
+import { type Injector } from '@furystack/inject';
+/**
+ * Binds in-memory implementations for every persistent token required by
+ * the authentication subsystem (users, sessions, credentials, reset tokens)
+ * on the provided injector, then installs the default password policy and
+ * HTTP-authentication stack.
+ */
 export declare const prepareInjector: (i: Injector, options?: {
     enableBasicAuth?: boolean;
-}) => Promise<void>;
+}) => void;
 //# sourceMappingURL=http-user-context.spec.d.ts.map

package/esm/http-user-context.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-user-context.spec.d.ts","sourceRoot":"","sources":["../src/http-user-context.spec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAgB5C,eAAO,MAAM,eAAe,GAAU,GAAG,QAAQ,EAAE,UAAU;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,kBAczF,CAAA"}
+{"version":3,"file":"http-user-context.spec.d.ts","sourceRoot":"","sources":["../src/http-user-context.spec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAkBjE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,GAAG,QAAQ,EAAE,UAAU;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,KAAG,IAQtF,CAAA"}