actor-ts 0.9.1 → 0.11.0

package/dist/http/Route.js

@@ -1,5 +1,6 @@
 import { match } from 'ts-pattern';
 import { HttpError, Status } from './types.js';
+import { expandCors } from './middleware/Cors.js';
 /** Compose several sibling routes (OR semantics — first matching wins). */
 export function concat(...routes) {
     return { kind: 'concat', routes };
@@ -12,6 +13,81 @@ export function path(segment, child) {
 export function pathPrefix(segment, child) {
     return { kind: 'path', segment: normalizeSegment(segment), child };
 }
+/**
+ * Wrap every handler in `child`'s subtree with the given `Middleware`.
+ * The middleware runs **before** the handler; it can short-circuit
+ * (return without calling `next()`) or transform the response.
+ *
+ * Nesting composes outside-in: `withMiddleware(a, withMiddleware(b,
+ * get(h)))` runs `a` first, then if it calls `next()`, `b` runs, and
+ * if `b` calls `next()`, the handler `h` runs.
+ *
+ *     const protectedRoutes = withMiddleware(
+ *       BearerTokenAuth({ tokens: [process.env.MGMT_TOKEN!] }),
+ *       withMiddleware(
+ *         IpAllowlist({ allow: ['10.0.0.0/8'] }),
+ *         path('cluster', concat(
+ *           path('down', post(handleDown)),
+ *           path('leave', post(handleLeave)),
+ *         )),
+ *       ),
+ *     );
+ */
+export function withMiddleware(middleware, child) {
+    return { kind: 'middleware', middleware, child };
+}
+/**
+ * Scope an exception handler over `child`'s subtree — the akka-http
+ * `ExceptionHandler` analogue, implemented as sugar over a `middleware`
+ * node so it inherits handler-wrapping (and the WebSocket authorize fold)
+ * for free.
+ *
+ * The handler sees the ORIGINAL thrown value — e.g. the `HttpError`
+ * instance with its `status` / `extra` / `headers` — because DSL-level
+ * wrappers run strictly before any backend's default error mapping.
+ * Handlers nest outside-in like {@link withMiddleware}: the innermost
+ * `handleErrors` gets first refusal, and returning `null` delegates
+ * outward.  Placed around a `withMiddleware(...)` node it also catches
+ * that middleware's throws (e.g. an auth 401).
+ *
+ *     handleErrors(
+ *       (err) => err instanceof NotFoundError ? complete(Status.NotFound, ...) : null,
+ *       path('users', concat(...)),
+ *     )
+ */
+export function handleErrors(handler, child) {
+    const middleware = async (req, next) => {
+        try {
+            return await next();
+        }
+        catch (err) {
+            const recovered = await handler(err, req);
+            if (recovered !== null && recovered !== undefined)
+                return recovered;
+            throw err; // declined → escalate to the next enclosing handler / default
+        }
+    };
+    return { kind: 'middleware', middleware, child };
+}
+/**
+ * Answer any request that matched no other route — the server-global
+ * not-found handler expressed in the DSL.  Wired to the backend's
+ * not-found hook at bind time, so it is method-agnostic (it also answers
+ * unmatched OPTIONS/HEAD) and MUST sit at the root of the tree: a fallback
+ * scoped under `path()` / `pathPrefix()` is rejected at compile time,
+ * because a server has exactly one not-found handler.  At most one
+ * `fallback()` per server.  It still composes with
+ * `withMiddleware()` / `handleErrors()`, which wrap its handler like any
+ * other, so a fallback can carry security headers or its own recovery.
+ *
+ *     concat(
+ *       path('api', apiRoutes),
+ *       fallback((req) => completeJson(Status.NotFound, { error: 'no route', path: req.path })),
+ *     )
+ */
+export function fallback(handler) {
+    return { kind: 'fallback', handler };
+}
 function normalizeSegment(s) {
     const trimmed = s.replace(/^\/+|\/+$/g, '');
     return trimmed;
@@ -48,19 +124,104 @@ export function redirect(url, status = Status.Found) {
 export function reject(status, message, extra) {
     throw new HttpError(status, message, extra);
 }
+/**
+ * The framework's default error→response mapping: an {@link HttpError}
+ * becomes its status + `{ error, ...extra }` JSON (carrying any custom
+ * `headers`); anything else becomes a generic 500 that deliberately does
+ * NOT echo the thrown message.  Kept in one place so the WebSocket
+ * upgrade-reject path and the `fallback()` wrapper map errors identically.
+ */
+export function defaultErrorResponse(err) {
+    if (err instanceof HttpError) {
+        return { status: err.status, headers: err.headers, body: { error: err.message, ...(err.extra ?? {}) } };
+    }
+    return { status: Status.InternalServerError, body: { error: 'Internal Server Error' } };
+}
 /* ------------------------------- Compilation ----------------------------- */
-/** Flatten a Route tree into the list of concrete route registrations. */
+/**
+ * Sentinel returned by a WS route's inner `authorize` to mean "proceed
+ * with the upgrade".  Middleware that calls `next()` and passes the
+ * result through untouched yields this exact frozen object (identity
+ * check) → accept; anything else → reject the upgrade with that response.
+ */
+const WS_ACCEPT = Object.freeze({ status: 101, body: null });
+/** Flatten a Route tree into the list of concrete endpoint registrations. */
 export function compile(route, prefix = []) {
     return match(route)
         .with({ kind: 'terminal' }, (r) => [{
+            kind: 'http',
             method: r.method,
             pattern: buildPattern(prefix),
             handler: r.handler,
         }])
+        .with({ kind: 'websocket' }, (r) => {
+        // Innermost gate: a route-level upgrade check (the CSWSH Origin
+        // allowlist from `websocket({ allowedOrigins })`) if the node
+        // carries one, else accept unconditionally.  Enclosing
+        // withMiddleware() nodes fold their checks around this below.
+        const gate = r.authorize;
+        return [{
+                kind: 'websocket',
+                method: 'GET',
+                pattern: buildPattern(prefix),
+                connect: r.connect,
+                authorize: gate
+                    ? async (req) => gate(req)
+                    : async () => null,
+            }];
+    })
         .with({ kind: 'path' }, (r) => compile(r.child, [...prefix, r.segment]))
         .with({ kind: 'concat' }, (r) => r.routes.flatMap((child) => compile(child, prefix)))
+        .with({ kind: 'fallback' }, (r) => {
+        if (prefix.length > 0) {
+            throw new Error('fallback() must sit at the root of the route tree — the not-found '
+                + 'handler is server-global, so a fallback scoped under path()/'
+                + 'pathPrefix() is not supported.');
+        }
+        return [{ kind: 'fallback', handler: r.handler }];
+    })
+        .with({ kind: 'middleware' }, (r) => {
+        // Compile the subtree, then fold the middleware in.  For HTTP
+        // children it wraps the handler (nested middlewares stack
+        // outside-in).  For WebSocket children it folds into `authorize`:
+        // the middleware runs once, against the upgrade request.
+        return compile(r.child, prefix).map((c) => {
+            if (c.kind === 'http') {
+                return { ...c, handler: wrapHandler(r.middleware, c.handler) };
+            }
+            if (c.kind === 'fallback') {
+                // A fallback under middleware: wrap its handler the same way
+                // (the fallback stays root-scoped — middleware doesn't add a
+                // path prefix, so the compile-time root guard still holds).
+                return { ...c, handler: wrapHandler(r.middleware, c.handler) };
+            }
+            const inner = c.authorize;
+            const authorize = async (req) => {
+                try {
+                    const res = await r.middleware(req, async (override) => (await inner(override ?? req)) ?? WS_ACCEPT);
+                    // Identity: middleware passed the sentinel through → accept.
+                    // Any other response (short-circuit or transform) → reject.
+                    return res === WS_ACCEPT ? null : res;
+                }
+                catch (err) {
+                    return defaultErrorResponse(err);
+                }
+            };
+            return { ...c, authorize };
+        });
+    })
+        .with({ kind: 'cors' }, (r) => expandCors(compile(r.child, prefix), r.settings))
         .exhaustive();
 }
+function wrapHandler(middleware, handler) {
+    return async (req) => {
+        // `next(override?)` lets a middleware replace the request the handler
+        // (and any inner middleware) sees — the override threads through the
+        // stacked wraps because each wrap's `handler` is the next-inner one.
+        const next = async (override) => Promise.resolve(handler(override ?? req));
+        return Promise.resolve(middleware(req, next));
+    };
+}
 function buildPattern(segments) {
     const cleaned = segments
         .flatMap(s => s.split('/'))
@@ -76,18 +237,18 @@ function buildPattern(segments) {
  * params (e.g. `?x=1&x=2`) return the first value.
  */
 export function queryParam(req, name) {
-    const v = req.query[name];
-    if (v === undefined)
+    const value = req.query[name];
+    if (value === undefined)
         return undefined;
-    if (Array.isArray(v))
-        return v[0];
-    return v;
+    if (Array.isArray(value))
+        return value[0];
+    return value;
 }
 /** Extract a path parameter (guaranteed present by the pattern). */
 export function pathParam(req, name) {
-    const v = req.params[name];
-    if (v === undefined)
+    const value = req.params[name];
+    if (value === undefined)
         throw new HttpError(500, `Missing path parameter "${name}"`);
-    return v;
+    return value;
 }
 //# sourceMappingURL=Route.js.map

package/dist/http/Route.js.map

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

package/dist/http/backend/ExpressBackend.d.ts

@@ -1,6 +1,7 @@
 import type { Server } from 'node:http';
 import { type HttpRequest, type HttpResponse } from '../types.js';
-import type { HttpServerBackend, RouteRegistration, ServerBinding } from './HttpServerBackend.js';
+import type { ExpressBackendOptions } from './ExpressBackendOptions.js';
+import type { HttpServerBackend, RouteRegistration, ServerBinding, WebsocketRouteRegistration } from './HttpServerBackend.js';
 /** Minimal shape of the Express Request we rely on. */
 interface ExpressRequestLike {
     method: string;
@@ -12,6 +13,16 @@ interface ExpressRequestLike {
     /** Populated by our raw-body middleware. */
     rawBody?: Uint8Array | null;
     body?: unknown;
+    /**
+     * Express's IP accessor — by default the socket peer; when
+     * `app.set('trust proxy', ...)` is configured, the leftmost
+     * `X-Forwarded-For` entry.  Forwarded into `HttpRequest.remoteAddress`.
+     */
+    ip?: string;
+    /** Raw socket — fallback when `req.ip` isn't populated. */
+    socket?: {
+        remoteAddress?: string;
+    };
 }
 /** Minimal shape of the Express Response we rely on. */
 interface ExpressResponseLike {
@@ -22,28 +33,23 @@ interface ExpressResponseLike {
 type ExpressNext = (err?: unknown) => void;
 type ExpressHandler = (req: ExpressRequestLike, res: ExpressResponseLike, next: ExpressNext) => void | Promise<void>;
 type ExpressErrorHandler = (err: unknown, req: ExpressRequestLike, res: ExpressResponseLike, next: ExpressNext) => void | Promise<void>;
-/** Subset of the Express app API we touch.  Covers v4 and v5. */
-interface ExpressAppLike {
-    get(path: string, handler: ExpressHandler): void;
-    post(path: string, handler: ExpressHandler): void;
-    put(path: string, handler: ExpressHandler): void;
-    delete(path: string, handler: ExpressHandler): void;
-    patch(path: string, handler: ExpressHandler): void;
-    head(path: string, handler: ExpressHandler): void;
-    options(path: string, handler: ExpressHandler): void;
+/**
+ * Subset of the Express app API we touch.  Covers v4 and v5.  Paths accept
+ * a RegExp as well as a string: a trailing-`*` wildcard route registers as
+ * a RegExp so it works identically on Express 4 and 5 (v5's path-to-regexp
+ * rejects a bare string `*`).
+ */
+export interface ExpressAppLike {
+    get(path: string | RegExp, handler: ExpressHandler): void;
+    post(path: string | RegExp, handler: ExpressHandler): void;
+    put(path: string | RegExp, handler: ExpressHandler): void;
+    delete(path: string | RegExp, handler: ExpressHandler): void;
+    patch(path: string | RegExp, handler: ExpressHandler): void;
+    head(path: string | RegExp, handler: ExpressHandler): void;
+    options(path: string | RegExp, handler: ExpressHandler): void;
     use(mw: ExpressHandler | ExpressErrorHandler): void;
     listen(port: number, hostname: string, cb: (err?: Error) => void): Server;
 }
-export interface ExpressBackendOptions {
-    /**
-     * Bring-your-own app — useful when you already attach custom middleware
-     * (CORS, sessions, metrics, …) outside the DSL.  When omitted, a fresh
-     * Express app is created via the installed `express` package.
-     */
-    readonly app?: ExpressAppLike;
-    /** Maximum allowed body size in bytes (default: 10 MiB).  Exceeding it returns 413. */
-    readonly maxBodyBytes?: number;
-}
 /**
  * Express-backed HTTP backend — drop-in alternative to the Fastify
  * default.  Intended for teams that already have an Express-based plugin
@@ -60,15 +66,20 @@ export declare class ExpressBackend implements HttpServerBackend {
     private readonly ownsApp;
     private readonly maxBodyBytes;
     private readonly registered;
+    private readonly wsRegistered;
+    private wss;
     private notFoundHandler;
     private errorHandler;
     constructor(options?: ExpressBackendOptions);
     /** Inject / access the underlying Express app — useful for native middleware. */
     getApp(): ExpressAppLike;
     registerRoute(route: RouteRegistration): void;
+    registerWebSocket(reg: WebsocketRouteRegistration): void;
     setNotFound(handler: (req: HttpRequest) => Promise<HttpResponse> | HttpResponse): void;
     setErrorHandler(handler: (err: unknown, req: HttpRequest) => Promise<HttpResponse> | HttpResponse): void;
     listen(host: string, port: number): Promise<ServerBinding>;
+    private attachUpgradeHandling;
+    private adaptUpgradeRequest;
     private attachRoute;
     /**
      * Read the whole request body into a single Uint8Array on `req.rawBody`.

package/dist/http/backend/ExpressBackend.d.ts.map

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