@furystack/rest-service 13.0.0 → 14.1.0

package/esm/rest.integration.test.js

@@ -1,5 +1,5 @@
 import { getPort } from '@furystack/core/port-generator';
-import { Injector } from '@furystack/inject';
+import { createInjector } from '@furystack/inject';
 import { createClient } from '@furystack/rest-client-fetch';
 import { usingAsync } from '@furystack/utils';
 import { describe, expect, it } from 'vitest';
@@ -8,7 +8,7 @@ import { JsonResult } from './request-action-implementation.js';
 const createEchoApiServer = async () => {
     const port = getPort();
     const root = '/api';
-    const injector = new Injector();
+    const injector = createInjector();
     await useRestService({
         injector,
         port,
@@ -40,115 +40,57 @@ const createEchoApiServer = async () => {
     };
 };
 describe('REST Integration tests with FETCH client', () => {
-    it('Should execute a single parameterless GET query', async () => {
+    it('executes a parameterless GET request', async () => {
         await usingAsync(await createEchoApiServer(), async ({ client }) => {
-            const result = await client({
-                method: 'GET',
-                action: '/plain',
-            });
+            const result = await client({ method: 'GET', action: '/plain' });
             expect(result.response.status).toBe(200);
             expect(result.result).toEqual({});
         });
     });
-    it('Should execute a request with headers', async () => {
+    it('passes headers through', async () => {
         await usingAsync(await createEchoApiServer(), async ({ client }) => {
-            const value = 'value';
-            const result = await client({
-                method: 'GET',
-                action: '/headers',
-                headers: {
-                    value,
-                },
-            });
+            const result = await client({ method: 'GET', action: '/headers', headers: { value: 'hello' } });
             expect(result.response.status).toBe(200);
-            expect(result.result.headers.value).toEqual(value);
+            expect(result.result.headers.value).toBe('hello');
         });
     });
-    it('Should execute a request with query', async () => {
+    it('serialises url params', async () => {
         await usingAsync(await createEchoApiServer(), async ({ client }) => {
-            const value = 'value2';
-            const result = await client({
-                method: 'GET',
-                action: '/query',
-                query: {
-                    someObject: {
-                        foo: value,
-                    },
-                },
-            });
-            expect(result.response.status).toBe(200);
-            expect(result.result.query.someObject.foo).toEqual(value);
+            const result = await client({ method: 'GET', action: '/urlParams/:id', url: { id: '42' } });
+            expect(result.result.url.id).toBe('42');
         });
     });
-    it('Should execute a request with URL parameters', async () => {
+    it('serialises a structured query', async () => {
         await usingAsync(await createEchoApiServer(), async ({ client }) => {
-            const value = 'value3';
             const result = await client({
                 method: 'GET',
-                action: '/urlParams/:id',
-                url: {
-                    id: value,
-                },
-            });
-            expect(result.response.status).toBe(200);
-            expect(result.result.url.id).toEqual(value);
-        });
-    });
-    it('should execute a request for a segment', async () => {
-        await usingAsync(await createEchoApiServer(), async ({ client }) => {
-            const result = await client({
-                method: 'GET',
-                action: '/segment',
-            });
-            expect(result.response.status).toBe(200);
-            expect(result.result.name).toEqual('segment');
-        });
-    });
-    it('should execute a request for a subsegment', async () => {
-        await usingAsync(await createEchoApiServer(), async ({ client }) => {
-            const result = await client({
-                method: 'GET',
-                action: '/segment/subsegment',
+                action: '/query',
+                query: { someObject: { foo: 'bar' } },
             });
-            expect(result.response.status).toBe(200);
-            expect(result.result.name).toEqual('segment-subsegment');
+            expect(result.result.query.someObject.foo).toBe('bar');
         });
     });
-    it('should execute a request for a subsegment with URL parameters', async () => {
+    it('dispatches plain and multi-segment URLs correctly', async () => {
         await usingAsync(await createEchoApiServer(), async ({ client }) => {
-            const value = 'value4';
-            const result = await client({
+            expect((await client({ method: 'GET', action: '/segment' })).result.name).toBe('segment');
+            expect((await client({ method: 'GET', action: '/segment/subsegment' })).result.name).toBe('segment-subsegment');
+            const subsegment = await client({
                 method: 'GET',
                 action: '/segment/:id/subsegment',
-                url: {
-                    id: value,
-                },
+                url: { id: 'abc' },
             });
-            expect(result.response.status).toBe(200);
-            expect(result.result.url.id).toEqual(value);
-            expect(result.result.url.name).toEqual('segment-subsegment');
+            expect(subsegment.result.url.id).toBe('abc');
+            expect(subsegment.result.url.name).toBe('segment-subsegment');
         });
     });
-    it('should evaluate optional parameters in the URL', async () => {
+    it('forwards POST bodies', async () => {
         await usingAsync(await createEchoApiServer(), async ({ client }) => {
             const result = await client({
-                method: 'GET',
-                action: '/segment{/:optionalId}?/optionalSubsegment/',
-                url: {},
-            });
-            expect(result.response.status).toBe(200);
-            expect(result.result.url.optionalId).toBeUndefined();
-            expect(result.result.name).toEqual('optional-id');
-            const result2 = await client({
-                method: 'GET',
-                action: '/segment{/:optionalId}?/optionalSubsegment/',
-                url: {
-                    optionalId: 'value',
-                },
+                method: 'POST',
+                action: '/body',
+                body: { foo: 'hi', bar: 42 },
             });
-            expect(result2.response.status).toBe(200);
-            expect(result2.result.url.optionalId).toEqual('value');
-            expect(result2.result.name).toEqual('optional-id');
+            expect(result.result.body).toEqual({ foo: 'hi', bar: 42 });
         });
     });
 });

package/esm/rest.integration.test.js.map

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

package/esm/server-telemetry.d.ts

@@ -0,0 +1,49 @@
+import { type Token } from '@furystack/inject';
+import { EventHub, type ListenerErrorPayload } from '@furystack/utils';
+import type { IncomingMessage, ServerResponse } from 'http';
+import type { Data, WebSocket } from 'ws';
+/**
+ * Union of every server-lifecycle event the rest-service runtime emits.
+ * The HTTP server pool, proxy runtime and websocket-api all forward into
+ * this single hub so subscribers can observe every source from one place.
+ */
+export type ServerTelemetryEvents = {
+    onServerListening: {
+        url: string;
+        port: number;
+        hostName?: string;
+    };
+    onServerClosed: {
+        url: string;
+    };
+    /** Tuple-shaped to match the underlying Node `request` callback signature. */
+    onRequestFailed: [unknown, IncomingMessage, ServerResponse<IncomingMessage>];
+    onProxyFailed: {
+        from: string;
+        to: string;
+        error: unknown;
+    };
+    onWebSocketProxyFailed: {
+        from: string;
+        to: string;
+        error: unknown;
+    };
+    onWebSocketActionFailed: {
+        error: unknown;
+        data?: Data;
+        socket?: WebSocket;
+    };
+    onListenerError: ListenerErrorPayload;
+};
+/**
+ * Application-facing telemetry surface. Extends {@link EventHub} so
+ * subscribers use the standard `addListener` / `subscribe` API.
+ */
+export declare class ServerTelemetry extends EventHub<ServerTelemetryEvents> {
+}
+/**
+ * DI token for the shared {@link ServerTelemetry} instance. Scoped so each
+ * injector tree (in particular, each test) gets an isolated event stream.
+ */
+export declare const ServerTelemetryToken: Token<ServerTelemetry, 'scoped'>;
+//# sourceMappingURL=server-telemetry.d.ts.map

package/esm/server-telemetry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-telemetry.d.ts","sourceRoot":"","sources":["../src/server-telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAAE,KAAK,oBAAoB,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAC3D,OAAO,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAEzC;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,iBAAiB,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;IACnE,cAAc,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;IAC/B,8EAA8E;IAC9E,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,CAAC,CAAC,CAAA;IAC5E,aAAa,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAA;IAC3D,sBAAsB,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,CAAA;IACpE,uBAAuB,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,IAAI,CAAC,EAAE,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,SAAS,CAAA;KAAE,CAAA;IAC5E,eAAe,EAAE,oBAAoB,CAAA;CACtC,CAAA;AAED;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,QAAQ,CAAC,qBAAqB,CAAC;CAAG;AAEvE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,eAAe,EAAE,QAAQ,CAWhE,CAAA"}

package/esm/server-telemetry.js

@@ -0,0 +1,25 @@
+import { defineService } from '@furystack/inject';
+import { EventHub } from '@furystack/utils';
+/**
+ * Application-facing telemetry surface. Extends {@link EventHub} so
+ * subscribers use the standard `addListener` / `subscribe` API.
+ */
+export class ServerTelemetry extends EventHub {
+}
+/**
+ * DI token for the shared {@link ServerTelemetry} instance. Scoped so each
+ * injector tree (in particular, each test) gets an isolated event stream.
+ */
+export const ServerTelemetryToken = defineService({
+    name: 'furystack/rest-service/ServerTelemetry',
+    lifetime: 'scoped',
+    factory: ({ onDispose }) => {
+        const telemetry = new ServerTelemetry();
+        // Disposal is delegated to the injector via `onDispose`; the telemetry
+        // outlives this factory invocation and is torn down on scope teardown.
+        // eslint-disable-next-line furystack/prefer-using-wrapper
+        onDispose(() => telemetry[Symbol.dispose]());
+        return telemetry;
+    },
+});
+//# sourceMappingURL=server-telemetry.js.map

package/esm/server-telemetry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-telemetry.js","sourceRoot":"","sources":["../src/server-telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,QAAQ,EAA6B,MAAM,kBAAkB,CAAA;AAoBtE;;;GAGG;AACH,MAAM,OAAO,eAAgB,SAAQ,QAA+B;CAAG;AAEvE;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAqC,aAAa,CAAC;IAClF,IAAI,EAAE,wCAAwC;IAC9C,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;QACzB,MAAM,SAAS,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,uEAAuE;QACvE,uEAAuE;QACvE,0DAA0D;QAC1D,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC5C,OAAO,SAAS,CAAA;IAClB,CAAC;CACF,CAAC,CAAA"}

package/esm/server-telemetry.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=server-telemetry.spec.d.ts.map

package/esm/server-telemetry.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server-telemetry.spec.d.ts","sourceRoot":"","sources":["../src/server-telemetry.spec.ts"],"names":[],"mappings":""}

package/esm/server-telemetry.spec.js

@@ -0,0 +1,52 @@
+import { createInjector } from '@furystack/inject';
+import { usingAsync } from '@furystack/utils';
+import { describe, expect, it, vi } from 'vitest';
+import { ServerTelemetry, ServerTelemetryToken } from './server-telemetry.js';
+describe('ServerTelemetry', () => {
+    it('ServerTelemetryToken resolves to a ServerTelemetry EventHub and is cached per scope', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const a = injector.get(ServerTelemetryToken);
+            const b = injector.get(ServerTelemetryToken);
+            expect(a).toBe(b);
+            expect(a).toBeInstanceOf(ServerTelemetry);
+        });
+    });
+    it('Emitted events are dispatched to subscribers', async () => {
+        await usingAsync(createInjector(), async (injector) => {
+            const telemetry = injector.get(ServerTelemetryToken);
+            const onListening = vi.fn();
+            telemetry.subscribe('onServerListening', onListening);
+            telemetry.emit('onServerListening', { url: 'http://localhost:1', port: 1 });
+            expect(onListening).toHaveBeenCalledWith({ url: 'http://localhost:1', port: 1 });
+        });
+    });
+    it('Disposes cleanly with the injector and stops routing events', async () => {
+        const injector = createInjector();
+        const telemetry = injector.get(ServerTelemetryToken);
+        const onClosed = vi.fn();
+        telemetry.subscribe('onServerClosed', onClosed);
+        await injector[Symbol.asyncDispose]();
+        // After the owning injector is disposed, emit on the captured reference
+        // should still work (the EventHub is disposed separately via onDispose,
+        // but listeners are cleared). The key guarantee: previously-attached
+        // listeners receive nothing new after dispose.
+        telemetry.emit('onServerClosed', { url: 'http://localhost:2' });
+        expect(onClosed).not.toHaveBeenCalled();
+    });
+    it('Scopes have isolated telemetry instances', async () => {
+        await usingAsync(createInjector(), async (root) => {
+            const scope1 = root.createScope();
+            const scope2 = root.createScope();
+            try {
+                const t1 = scope1.get(ServerTelemetryToken);
+                const t2 = scope2.get(ServerTelemetryToken);
+                expect(t1).not.toBe(t2);
+            }
+            finally {
+                await scope1[Symbol.asyncDispose]();
+                await scope2[Symbol.asyncDispose]();
+            }
+        });
+    });
+});
+//# sourceMappingURL=server-telemetry.spec.js.map

package/esm/server-telemetry.spec.js.map

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

package/esm/static-server-manager.spec.js

@@ -1,182 +1,118 @@
-import { Injector } from '@furystack/inject';
-import { sleepAsync, usingAsync } from '@furystack/utils';
-import { ServerManager } from './server-manager.js';
-import { StaticServerManager } from './static-server-manager.js';
-import { describe, it, expect, vi } from 'vitest';
 import { getPort } from '@furystack/core/port-generator';
-describe('StaticServerManager', () => {
+import { createInjector } from '@furystack/inject';
+import { sleepAsync, usingAsync } from '@furystack/utils';
+import { describe, expect, it, vi } from 'vitest';
+import { useStaticFiles } from './helpers.js';
+import { HttpServerPoolToken } from './http-server-pool.js';
+import { buildStaticSiteServerApi } from './static-site-runtime.js';
+describe('useStaticFiles / buildStaticSiteServerApi', () => {
     describe('Top level routing', () => {
-        it('Should return a 404 without fallback', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('responds 404 without a fallback', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/',
-                    path: '.',
-                    port,
-                });
+                await useStaticFiles({ injector: i, baseUrl: '/', path: '.', port });
                 const result = await fetch(`http://127.0.0.1:${port}/not-found.html`);
                 expect(result.ok).toBe(false);
                 expect(result.status).toBe(404);
-                expect(result?.headers.get('content-type')).toBe('text/plain');
-                const body = await result.text();
-                expect(body).toBe('Not found');
+                expect(result.headers.get('content-type')).toBe('text/plain');
+                expect(await result.text()).toBe('Not found');
             });
         });
-        it('Should return a fallback', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('falls back to the configured file and returns its content-type', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
+                await useStaticFiles({
+                    injector: i,
                     baseUrl: '/',
                     path: '.',
                     fallback: 'package.json',
                     port,
-                    headers: {
-                        'custom-header': 'custom-value',
-                    },
+                    headers: { 'custom-header': 'custom-value' },
                 });
                 const result = await fetch(`http://localhost:${port}/not-found.html`);
                 expect(result.headers.get('content-type')).toBe('application/json');
                 expect(result.headers.get('custom-header')).toBe('custom-value');
             });
         });
-        it('Should return a fallback for root files', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('falls back for the root url when no index exists', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
+                await useStaticFiles({
+                    injector: i,
                     baseUrl: '/',
                     path: '.',
                     fallback: 'package.json',
                     port,
-                    headers: {
-                        'custom-header': 'custom-value',
-                    },
+                    headers: { 'custom-header': 'custom-value' },
                 });
                 const result = await fetch(`http://localhost:${port}`);
                 expect(result.headers.get('content-type')).toBe('application/json');
                 expect(result.headers.get('custom-header')).toBe('custom-value');
             });
         });
-        it('Should return a defined file from a root directory', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('serves an existing file from the root directory', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/',
-                    path: '.',
-                    port,
-                    headers: {
-                        'custom-header': 'custom-value',
-                    },
-                });
+                await useStaticFiles({ injector: i, baseUrl: '/', path: '.', port });
                 const result = await fetch(`http://localhost:${port}/README.md`);
                 expect(result.headers.get('content-type')).toBe('text/markdown');
-                expect(result.headers.get('custom-header')).toBe('custom-value');
             });
         });
-        it('Should return a defined file from a subdirectory', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('serves files from subdirectories', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/',
-                    path: '.',
-                    port,
-                });
+                await useStaticFiles({ injector: i, baseUrl: '/', path: '.', port });
                 const result = await fetch(`http://localhost:${port}/packages/utils/README.md`);
                 expect(result.headers.get('content-type')).toBe('text/markdown');
             });
         });
     });
     describe('Non-top level routing', () => {
-        it('Should not handle a request when the path is not matching', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('leaves requests outside the base url to the next api in the chain', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/bundle',
-                    path: '.',
-                    port,
-                });
-                const server = [...injector.getInstance(ServerManager).servers.values()][0];
-                server.apis[0].onRequest = vi.fn();
+                const serverApi = await useStaticFiles({ injector: i, baseUrl: '/bundle', path: '.', port });
+                const record = await i.get(HttpServerPoolToken).acquire({ port });
+                const onRequest = vi.fn();
+                // Swap in a spy to observe non-matching requests never reach the handler.
+                serverApi.onRequest = onRequest;
+                record.apis[0] = serverApi;
                 fetch(`http://localhost:${port}/bundleToAnotherFolder/not-found.html`).catch(() => {
-                    /** should fall, ignore */
+                    // Expected to fail: the server has no matching API and drops the socket.
                 });
                 await sleepAsync(100);
-                expect(server.apis[0].onRequest).not.toHaveBeenCalled();
+                expect(onRequest).not.toHaveBeenCalled();
             });
         });
-        it('Should return a 404 without fallback', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('returns 404 under a sub-base url when the file is missing and no fallback is set', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/bundle',
-                    path: '.',
-                    port,
-                });
+                await useStaticFiles({ injector: i, baseUrl: '/bundle', path: '.', port });
                 const result = await fetch(`http://localhost:${port}/bundle/not-found.html`);
                 expect(result.ok).toBe(false);
                 expect(result.status).toBe(404);
                 expect(result.headers.get('content-type')).toBe('text/plain');
-                const body = await result.text();
-                expect(body).toBe('Not found');
+                expect(await result.text()).toBe('Not found');
             });
         });
-        it('Should return a fallback', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
+        it('serves the configured fallback under a sub-base url', async () => {
+            await usingAsync(createInjector(), async (i) => {
                 const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/bundle',
-                    path: '.',
-                    fallback: 'package.json',
-                    port,
-                });
+                await useStaticFiles({ injector: i, baseUrl: '/bundle', path: '.', fallback: 'package.json', port });
                 const result = await fetch(`http://localhost:${port}/bundle/not-found.html`);
                 expect(result.headers.get('content-type')).toBe('application/json');
             });
         });
-        it('Should return a defined file from a root directory', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
-                const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/',
-                    path: '.',
-                    port,
-                });
-                const result = await fetch(`http://localhost:${port}/README.md`);
-                expect(result.headers.get('content-type')).toBe('text/markdown');
-            });
-        });
-        it('Should return a defined file from a subdirectory', async () => {
-            await usingAsync(new Injector(), async (injector) => {
-                const staticServerManager = injector.getInstance(StaticServerManager);
-                const port = getPort();
-                await staticServerManager.addStaticSite({
-                    baseUrl: '/',
-                    path: '.',
-                    port,
-                });
-                const result = await fetch(`http://localhost:${port}/packages/utils/README.md`);
-                expect(result.headers.get('content-type')).toBe('text/markdown');
-            });
-        });
     });
     describe('shouldExec', () => {
-        it('Should NOT match for requests with not defined method', () => {
-            const staticServerManager = new StaticServerManager();
-            expect(staticServerManager.shouldExec('/')({ req: { url: '/' } })).toBe(false);
+        const api = (baseUrl) => buildStaticSiteServerApi({ baseUrl, path: '.', port: 0 });
+        it('does not match when the request method is missing', () => {
+            expect(api('/').shouldExec({ req: { url: '/' }, res: {} })).toBe(false);
         });
-        it('Should NOT match for non-GET requests', () => {
-            const staticServerManager = new StaticServerManager();
-            expect(staticServerManager.shouldExec('/')({ req: { method: 'POST', url: '/' } })).toBe(false);
+        it('does not match non-GET methods', () => {
+            expect(api('/').shouldExec({ req: { method: 'POST', url: '/' }, res: {} })).toBe(false);
         });
-        [
+        const positiveCases = [
             ['/', '/'],
             ['/', '/index.html'],
             ['/', '/subdir'],
@@ -186,17 +122,16 @@ describe('StaticServerManager', () => {
             ['/subdir', '/subdir/'],
             ['/subdir', '/subdir/file.js'],
             ['/subdir', '/subdir/s2/file.js'],
-        ].forEach(([root, url]) => it(`Should match for '${root}' root and '${url}' url`, () => {
-            const staticServerManager = new StaticServerManager();
-            const shouldExec = staticServerManager.shouldExec(root)({ req: { method: 'GET', url } });
-            expect(shouldExec).toBe(true);
+        ];
+        positiveCases.forEach(([baseUrl, url]) => it(`matches GET '${url}' against base '${baseUrl}'`, () => {
+            expect(api(baseUrl).shouldExec({ req: { method: 'GET', url }, res: {} })).toBe(true);
         }));
-        it('Should not exec different paths for non-top level root directory', () => {
-            const staticServerManager = new StaticServerManager();
-            expect(staticServerManager.shouldExec('/subdir')({ req: { method: 'GET', url: '/' } })).toBe(false);
-            expect(staticServerManager.shouldExec('/subdir')({ req: { method: 'GET', url: '/other/index.html' } })).toBe(false);
-            expect(staticServerManager.shouldExec('/subdir')({ req: { method: 'GET', url: '/subdir2' } })).toBe(false);
-            expect(staticServerManager.shouldExec('/subdir')({ req: { method: 'GET', url: '/subdir2/index.html' } })).toBe(false);
+        it('does not match unrelated urls under a non-root base', () => {
+            const subdir = api('/subdir');
+            expect(subdir.shouldExec({ req: { method: 'GET', url: '/' }, res: {} })).toBe(false);
+            expect(subdir.shouldExec({ req: { method: 'GET', url: '/other/index.html' }, res: {} })).toBe(false);
+            expect(subdir.shouldExec({ req: { method: 'GET', url: '/subdir2' }, res: {} })).toBe(false);
+            expect(subdir.shouldExec({ req: { method: 'GET', url: '/subdir2/index.html' }, res: {} })).toBe(false);
         });
     });
 });