@vyriy/router 0.3.0 → 0.3.2

package/README.md

@@ -9,7 +9,6 @@ This package provides a small API Gateway router for Lambda handlers.
 It is intentionally kept small:
 
 - matches by HTTP method and exact path
-- supports simple prefix dispatch for handler factories such as static file serving
 - passes API Gateway event data into handlers
 - returns a Lambda-friendly response shape
 
@@ -29,16 +28,14 @@ With Yarn:
 yarn add @vyriy/router
 ```
 
-## Usage
+## Basic Router
 
 ```ts
 import { createRouter } from '@vyriy/router';
-import { staticFiles } from '@vyriy/server/static';
 
 const router = createRouter();
 
 router.get('/health', async ({ event, query, headers, pathParameters, body }) => ({
-  statusCode: 200,
   body: JSON.stringify({
     ok: true,
     method: event.httpMethod,
@@ -49,8 +46,6 @@ router.get('/health', async ({ event, query, headers, pathParameters, body }) =>
   }),
 }));
 
-router.prefix('/static', staticFiles('./public'));
-
 router.fallback(async ({ event }) => ({
   statusCode: 404,
   body: JSON.stringify({
@@ -58,16 +53,98 @@ router.fallback(async ({ event }) => ({
     path: event.path,
   }),
 }));
+
+export const handler = (event: Parameters<typeof router.route>[0]) => router.route(event);
 ```
 
-Prefix handlers receive the relative matched path in `pathParameters.proxy`, so they can behave like normal handlers:
+## Stream Router
+
+Use `createStreamRouter()` when handlers write directly to a Lambda response stream. The stream is passed as the second handler argument, and stream handlers do not return a response object.
 
 ```ts
-router.prefix('/events', async ({ pathParameters, responseStream }) => {
-  responseStream?.setContentType?.('text/plain');
-  responseStream?.write(`Path: ${pathParameters?.proxy}`);
-  responseStream?.end();
+import { createStreamRouter } from '@vyriy/router';
+
+const streamRouter = createStreamRouter();
+
+streamRouter.get('/events', ({ event, query }, responseStream) => {
+  responseStream.setContentType?.('text/plain');
+  responseStream.write(`path: ${event.path}\n`);
+  responseStream.write(`cursor: ${query?.cursor ?? 'start'}\n`);
+  responseStream.end('done');
+});
+
+streamRouter.fallback(({ event }, responseStream) => {
+  responseStream.setContentType?.('application/json');
+  responseStream.end(
+    JSON.stringify({
+      message: 'Not Found',
+      path: event.path,
+    }),
+  );
 });
+
+export const handler = (
+  event: Parameters<typeof streamRouter.route>[0],
+  responseStream: Parameters<typeof streamRouter.route>[1],
+) => streamRouter.route(event, responseStream);
+```
+
+## Calm Composition
+
+The router keeps request matching separate from handler wrappers and local server adapters. A small API can stay as a plain composition of focused packages:
+
+```ts
+import { api } from '@vyriy/handler';
+import { createRouter } from '@vyriy/router';
+import { server } from '@vyriy/server';
+
+const router = createRouter();
+
+router.get('/health', () => ({
+  body: JSON.stringify({
+    ok: true,
+  }),
+}));
+
+const handler = api((event) => router.route(event));
+
+server(handler);
+```
+
+The same shape works for Lambda response streaming:
+
+```ts
+import { streamApi } from '@vyriy/handler';
+import { createStreamRouter } from '@vyriy/router';
+import { streamServer } from '@vyriy/server';
+
+const router = createStreamRouter();
+
+router.get('/events', (_params, responseStream) => {
+  responseStream.setContentType?.('text/plain');
+  responseStream.end('ok');
+});
+
+const handler = streamApi((event, responseStream) => router.route(event, responseStream));
+
+streamServer(handler);
+```
+
+For a Lambda-only entrypoint, keep the same composition and export the handler:
+
+```ts
+import { api } from '@vyriy/handler';
+import { createRouter } from '@vyriy/router';
+
+const router = createRouter();
+
+router.get('/health', () => ({
+  body: JSON.stringify({
+    ok: true,
+  }),
+}));
+
+export const handler = api((event) => router.route(event));
 ```
 
 ## Exports
@@ -75,28 +152,33 @@ router.prefix('/events', async ({ pathParameters, responseStream }) => {
 The package exposes both the root entry and the direct module entry:
 
 ```ts
-import { createRouter } from '@vyriy/router';
-import { Router } from '@vyriy/router/router';
+import { createRouter, createStreamRouter } from '@vyriy/router';
+import { Router, StreamRouter } from '@vyriy/router/router';
 ```
 
 ## API
 
 - `createRouter()` returns a chainable router API.
+- `createStreamRouter()` returns a chainable response streaming router API.
 - `router.get(path, handler)` registers a `GET` handler.
 - `router.post(path, handler)` registers a `POST` handler.
 - `router.put(path, handler)` registers a `PUT` handler.
 - `router.delete(path, handler)` registers a `DELETE` handler.
 - `router.patch(path, handler)` registers a `PATCH` handler.
-- `router.prefix(pathPrefix, handler)` registers a handler for every request under a URL prefix.
 - `router.fallback(handler)` registers a handler for unmatched requests.
 - `router.route(event)` resolves the matching route and returns an API Gateway response.
+- `streamRouter.route(event, responseStream)` resolves the matching route and writes to the stream.
+
+Route handlers may omit `statusCode`; the router normalizes missing status codes to `200` before returning from `router.route(event)`.
 
-The low-level `Router` class is also available from `@vyriy/router/router` and exposes only:
+The low-level `Router` and `StreamRouter` classes are also available from `@vyriy/router/router`:
 
 - `router.on(method, path, handler)`
-- `router.prefix(pathPrefix, handler)`
 - `router.fallback(handler)`
 - `router.route(event)`
+- `streamRouter.on(method, path, handler)`
+- `streamRouter.fallback(handler)`
+- `streamRouter.route(event, responseStream)`
 
 Route handlers receive:
 
@@ -106,7 +188,12 @@ type HandlerParams = {
   body?: string;
   headers?: APIGatewayProxyEvent['headers'];
   pathParameters?: APIGatewayProxyEvent['pathParameters'];
-  responseStream?: ResponseStream;
   event: APIGatewayProxyEvent;
 };
 ```
+
+Stream route handlers receive the same `HandlerParams` as the first argument and `ResponseStream` as the second argument:
+
+```ts
+type StreamHandler = (params: HandlerParams, responseStream: ResponseStream) => void | Promise<void>;
+```

package/create.d.ts

@@ -1,2 +1,3 @@
-import type { RouterApi } from './types.js';
+import type { RouterApi, StreamRouterApi } from './types.js';
 export declare const createRouter: () => RouterApi;
+export declare const createStreamRouter: () => StreamRouterApi;

package/create.js

@@ -1,4 +1,4 @@
-import { Router } from './router.js';
+import { Router, StreamRouter } from './router.js';
 export const createRouter = () => {
     const router = new Router();
     const api = {
@@ -26,13 +26,42 @@ export const createRouter = () => {
             router.on('PATCH', path, handler);
             return api;
         },
-        prefix(pathPrefix, handler) {
-            router.prefix(pathPrefix, handler);
-            return api;
-        },
         route(event) {
             return router.route(event);
         },
     };
     return api;
 };
+export const createStreamRouter = () => {
+    const router = new StreamRouter();
+    const api = {
+        get(path, handler) {
+            router.on('GET', path, handler);
+            return api;
+        },
+        post(path, handler) {
+            router.on('POST', path, handler);
+            return api;
+        },
+        put(path, handler) {
+            router.on('PUT', path, handler);
+            return api;
+        },
+        delete(path, handler) {
+            router.on('DELETE', path, handler);
+            return api;
+        },
+        fallback(handler) {
+            router.fallback(handler);
+            return api;
+        },
+        patch(path, handler) {
+            router.on('PATCH', path, handler);
+            return api;
+        },
+        route(event, responseStream) {
+            return router.route(event, responseStream);
+        },
+    };
+    return api;
+};

package/index.d.ts

@@ -1,2 +1,3 @@
 export * from './create.js';
+export * from './router.js';
 export type * from './types.js';

package/index.js

@@ -1 +1,2 @@
 export * from './create.js';
+export * from './router.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyriy/router",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Router utility for Vyriy projects",
   "type": "module",
   "main": "./index.js",

package/router.d.ts

@@ -1,10 +1,14 @@
-import type { APIGatewayProxyEvent, Handler, ResponseStream, RouteResult } from './types.js';
-export declare class Router {
-    private fallbackHandler?;
-    private readonly routes;
-    private readonly staticRoutes;
-    on(method: string, path: string, handler: Handler): this;
-    fallback(handler: Handler): this;
-    prefix(pathPrefix: string, handler: Handler): this;
-    route(event: APIGatewayProxyEvent, responseStream?: ResponseStream): Promise<RouteResult | void>;
+import type { APIGatewayProxyEvent, Handler, ResponseStream, RouteResult, StreamHandler } from './types.js';
+declare class BaseRouter<CurrentHandler> {
+    protected fallbackHandler?: CurrentHandler;
+    protected readonly routes: Record<string, Record<string, CurrentHandler>>;
+    on(method: string, path: string, handler: CurrentHandler): this;
+    fallback(handler: CurrentHandler): this;
 }
+export declare class Router extends BaseRouter<Handler> {
+    route(event: APIGatewayProxyEvent): Promise<RouteResult>;
+}
+export declare class StreamRouter extends BaseRouter<StreamHandler> {
+    route(event: APIGatewayProxyEvent, responseStream: ResponseStream): Promise<void>;
+}
+export {};

package/router.js

@@ -1,25 +1,5 @@
 import { METHODS, STATUS_CODES } from 'node:http';
 const SUPPORTED_METHODS = new Set(METHODS.map((method) => method.toUpperCase()));
-const removeLeadingSlashes = (value) => {
-    let start = 0;
-    while (value[start] === '/') {
-        start += 1;
-    }
-    return value.slice(start);
-};
-const removeTrailingSlashes = (value) => {
-    let end = value.length;
-    while (end > 0 && value[end - 1] === '/') {
-        end -= 1;
-    }
-    return value.slice(0, end);
-};
-const getPrefixPath = (eventPath, route) => {
-    if (eventPath !== route.pathPrefix && !eventPath.startsWith(`${route.pathPrefix}/`)) {
-        return undefined;
-    }
-    return decodeURIComponent(removeLeadingSlashes(eventPath.slice(route.pathPrefix.length)));
-};
 const normalizeResult = (result) => ({
     statusCode: result.statusCode ?? 200,
     body: result.body,
@@ -27,34 +7,31 @@ const normalizeResult = (result) => ({
     isBase64Encoded: result.isBase64Encoded,
     multiValueHeaders: result.multiValueHeaders,
 });
-export class Router {
+const registerRoute = (routes, method, path, handler) => {
+    const normalizedMethod = method.toUpperCase();
+    if (!SUPPORTED_METHODS.has(normalizedMethod)) {
+        throw new Error(`Unsupported HTTP method: ${normalizedMethod}`);
+    }
+    const routeGroup = (routes[normalizedMethod] ??= {});
+    if (routeGroup[path]) {
+        throw new Error(`${normalizedMethod} ${path} already exists!`);
+    }
+    routeGroup[path] = handler;
+};
+class BaseRouter {
     fallbackHandler;
     routes = {};
-    staticRoutes = [];
     on(method, path, handler) {
-        const normalizedMethod = method.toUpperCase();
-        if (!SUPPORTED_METHODS.has(normalizedMethod)) {
-            throw new Error(`Unsupported HTTP method: ${normalizedMethod}`);
-        }
-        const routeGroup = (this.routes[normalizedMethod] ??= {});
-        if (routeGroup[path]) {
-            throw new Error(`${normalizedMethod} ${path} already exists!`);
-        }
-        routeGroup[path] = handler;
+        registerRoute(this.routes, method, path, handler);
         return this;
     }
     fallback(handler) {
         this.fallbackHandler = handler;
         return this;
     }
-    prefix(pathPrefix, handler) {
-        this.staticRoutes.push({
-            handler,
-            pathPrefix: removeTrailingSlashes(pathPrefix) || '/',
-        });
-        return this;
-    }
-    async route(event, responseStream) {
+}
+export class Router extends BaseRouter {
+    async route(event) {
         const { httpMethod, path, queryStringParameters, body, headers, pathParameters } = event;
         const exactHandler = this.routes[httpMethod]?.[path];
         if (exactHandler) {
@@ -63,30 +40,9 @@ export class Router {
                 body: body ?? undefined,
                 headers,
                 pathParameters: pathParameters ?? undefined,
-                responseStream,
                 event,
             });
-            return result ? normalizeResult(result) : undefined;
-        }
-        for (const staticRoute of this.staticRoutes) {
-            const proxy = getPrefixPath(path, staticRoute);
-            if (proxy !== undefined) {
-                const prefixResult = await staticRoute.handler({
-                    query: queryStringParameters ?? undefined,
-                    body: body ?? undefined,
-                    headers,
-                    pathParameters: {
-                        ...pathParameters,
-                        proxy,
-                    },
-                    responseStream,
-                    event,
-                });
-                if (prefixResult) {
-                    return normalizeResult(prefixResult);
-                }
-                return undefined;
-            }
+            return normalizeResult(result);
         }
         if (this.fallbackHandler) {
             const fallbackResult = await this.fallbackHandler({
@@ -94,10 +50,9 @@ export class Router {
                 body: body ?? undefined,
                 headers,
                 pathParameters: pathParameters ?? undefined,
-                responseStream,
                 event,
             });
-            return fallbackResult ? normalizeResult(fallbackResult) : undefined;
+            return normalizeResult(fallbackResult);
         }
         return {
             statusCode: 404,
@@ -107,3 +62,33 @@ export class Router {
         };
     }
 }
+export class StreamRouter extends BaseRouter {
+    async route(event, responseStream) {
+        const { httpMethod, path, queryStringParameters, body, headers, pathParameters } = event;
+        const exactHandler = this.routes[httpMethod]?.[path];
+        if (exactHandler) {
+            await exactHandler({
+                query: queryStringParameters ?? undefined,
+                body: body ?? undefined,
+                headers,
+                pathParameters: pathParameters ?? undefined,
+                event,
+            }, responseStream);
+            return;
+        }
+        if (this.fallbackHandler) {
+            await this.fallbackHandler({
+                query: queryStringParameters ?? undefined,
+                body: body ?? undefined,
+                headers,
+                pathParameters: pathParameters ?? undefined,
+                event,
+            }, responseStream);
+            return;
+        }
+        responseStream.setContentType?.('application/json');
+        responseStream.end(JSON.stringify({
+            message: STATUS_CODES[404],
+        }));
+    }
+}

package/types.d.ts

@@ -1,6 +1,8 @@
 import type { APIGatewayProxyEvent, APIGatewayProxyEventQueryStringParameters, APIGatewayProxyResult } from 'aws-lambda';
 export type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
-export type RouteResult = {
+type MaybePromise<Result> = Result | Promise<Result>;
+export type RouteResult = APIGatewayProxyResult;
+export type RouteHandlerResult = {
     body: APIGatewayProxyResult['body'];
     headers?: APIGatewayProxyResult['headers'];
     isBase64Encoded?: APIGatewayProxyResult['isBase64Encoded'];
@@ -21,10 +23,10 @@ export type HandlerParams = {
     body?: string;
     headers?: APIGatewayProxyEvent['headers'];
     pathParameters?: APIGatewayProxyEvent['pathParameters'];
-    responseStream?: ResponseStream;
     event: APIGatewayProxyEvent;
 };
-export type Handler = (params: HandlerParams) => Promise<RouteResult | void>;
+export type Handler = (params: HandlerParams) => MaybePromise<RouteHandlerResult>;
+export type StreamHandler = (params: HandlerParams, responseStream: ResponseStream) => MaybePromise<void>;
 export type RouterApi = {
     get(path: string, handler: Handler): RouterApi;
     post(path: string, handler: Handler): RouterApi;
@@ -32,6 +34,14 @@ export type RouterApi = {
     delete(path: string, handler: Handler): RouterApi;
     fallback(handler: Handler): RouterApi;
     patch(path: string, handler: Handler): RouterApi;
-    prefix(pathPrefix: string, handler: Handler): RouterApi;
-    route(event: APIGatewayProxyEvent, responseStream?: ResponseStream): Promise<RouteResult | void>;
+    route(event: APIGatewayProxyEvent): Promise<RouteResult>;
+};
+export type StreamRouterApi = {
+    get(path: string, handler: StreamHandler): StreamRouterApi;
+    post(path: string, handler: StreamHandler): StreamRouterApi;
+    put(path: string, handler: StreamHandler): StreamRouterApi;
+    delete(path: string, handler: StreamHandler): StreamRouterApi;
+    fallback(handler: StreamHandler): StreamRouterApi;
+    patch(path: string, handler: StreamHandler): StreamRouterApi;
+    route(event: APIGatewayProxyEvent, responseStream: ResponseStream): Promise<void>;
 };