sleepy-serv 0.24.0 → 0.25.0

package/README.md

@@ -590,6 +590,49 @@ export default function (req) {
 
 This works from both HTTP and WebSocket transports.
 
+### Typed Connection Data
+
+All WebSocket types accept an optional generic parameter `<T>` that
+constrains `session.data` in filter functions and query results:
+
+```ts
+type ConnectionData = {
+  userId: string
+  role: 'player' | 'spectator'
+}
+
+const app = createApp<ConnectionData>(3000, { ws: true })
+
+// session.data is typed as ConnectionData
+app.ws.send('event', body, session => {
+  return session.data.userId !== excludedId
+})
+
+const players = app.ws.query(session => {
+  return session.data.role === 'player'
+})
+```
+
+The type parameter propagates through `Request<T>`, `Middleware<T>`, and
+`Handler<T>`, so typed handler and middleware functions also get typed
+session data through `req.ws`:
+
+```ts
+import type { Request, AsyncHandlerResult } from 'sleepy-serv'
+
+type ConnectionData = { userId: string }
+
+export default async function (
+  req: Request<ConnectionData>,
+): AsyncHandlerResult {
+  req.ws.send('joined', {}, session => {
+    return session.data.userId !== 'some-id'
+  })
+
+  return new Response('', { status: 204 })
+}
+```
+
 ## Exports
 
 `sleepy-serv` exports several runtime constants and types:
@@ -600,9 +643,9 @@ This works from both HTTP and WebSocket transports.
 - `HttpMethod`: HTTP verbs: `Head`, `Get`, `Post`, `Put`, `Patch`, `Delete`
 - `SessionType`: session state: `Active` (`'active'`), `Inactive` (`'inactive'`)
 - `SessionFilter`: session filter: `Active` (`'active'`), `Inactive` (`'inactive'`), `All` (`'all'`)
-- `SessionEntry`: the shape returned by `query()` and received by filter callbacks: `{ clientId: string, type: SessionType, data: unknown }`
-- `FilterFn`: the filter callback type: `(session: SessionEntry, index: number) => boolean`
-- `SocketCommands`: the type for `app.ws` and `req.ws`
+- `SessionEntry<T>`: the shape returned by `query()` and received by filter callbacks: `{ clientId: string, type: SessionType, data: T }`
+- `FilterFn<T>`: the filter callback type: `(session: SessionEntry<T>, index: number) => boolean`
+- `SocketCommands<T>`: the type for `app.ws` and `req.ws`
 - Error classes for every 4xx and 5xx status (e.g. `NotFoundError`, `UnauthorizedError`, `InternalServerError`)
 - Middleware helpers: `parseJsonBody`, `validateSchemas`, `setValidationFormats`
 

package/dist/core/index.d.ts

@@ -8,33 +8,33 @@ export { parseJsonBody, setValidationFormats, validateSchemas, } from './middlew
 export type { ActiveSession, ActiveSessions, InactiveSession, SocketConnection, SocketOptions, } from './socket';
 export type { AsyncHandlerResult, BaseRequest, CloseSignal, EndpointRequest, FilterFn, FormattedError, Handler, HandlerResult, Middleware, MiddlewareChain, NextFn, Request, Server, SessionEntry, SocketCommands, SocketData, WebSocketRequest, } from './utils';
 export type { FormatterField, FormatterSchema, ValidationSchemas, } from './middleware';
-export type RouteDefinition = {
+export type RouteDefinition<T = void> = {
     method: HttpMethod;
     path: string;
-    chain: Handler | MiddlewareChain;
+    chain: Handler<T> | MiddlewareChain<T>;
 };
-export type MetaEntry = {
+export type MetaEntry<T = void> = {
     path: string;
-    middleware: Middleware[];
+    middleware: Middleware<T>[];
 };
-export type RouteConfig = {
-    routes: RouteDefinition[];
-    meta?: MetaEntry[];
+export type RouteConfig<T = void> = {
+    routes: RouteDefinition<T>[];
+    meta?: MetaEntry<T>[];
 };
-export type AppOptions = {
+export type AppOptions<T = void> = {
     hostname?: string;
     mountPath?: string;
-    middleware?: Middleware[];
+    middleware?: Middleware<T>[];
     ws?: boolean | SocketOptions;
     onClose?: () => Promise<void> | void;
 };
 type OutputRoutes = Record<string, string[]>;
 type CloseFn = (force?: boolean) => Promise<void>;
-export type App = {
-    server: Server;
+export type App<T = void> = {
+    server: Server<T>;
     routes: OutputRoutes;
-    ws: SocketCommands;
+    ws: SocketCommands<T>;
     close: CloseFn;
 };
-export declare function createApp(port: number, config: RouteConfig, opts?: AppOptions): App;
+export declare function createApp<T = void>(port: number, config: RouteConfig<T>, opts?: AppOptions<T>): App<T>;
 //# sourceMappingURL=index.d.ts.map

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAEV,UAAU,EACV,UAAU,EACV,eAAe,EAEf,OAAO,EACP,MAAM,EACP,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EACV,cAAc,EACf,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,UAAU,CAAA;AAEjB,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,aAAa,GACd,MAAM,SAAS,CAAA;AAEhB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAA;AAErB,YAAY,EACV,aAAa,EACb,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,aAAa,GACd,MAAM,UAAU,CAAA;AAEjB,YAAY,EACV,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,eAAe,EACf,QAAQ,EACR,cAAc,EACd,OAAO,EACP,aAAa,EACb,UAAU,EACV,eAAe,EACf,MAAM,EACN,OAAO,EACP,MAAM,EACN,YAAY,EACZ,cAAc,EACd,UAAU,EACV,gBAAgB,GACjB,MAAM,SAAS,CAAA;AAEhB,YAAY,EACV,cAAc,EACd,eAAe,EACf,iBAAiB,GAClB,MAAM,cAAc,CAAA;AAErB,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,GAAG,eAAe,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,UAAU,EAAE,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,eAAe,EAAE,CAAA;IACzB,IAAI,CAAC,EAAE,SAAS,EAAE,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,UAAU,EAAE,CAAA;IACzB,EAAE,CAAC,EAAE,OAAO,GAAG,aAAa,CAAA;IAC5B,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CACrC,CAAA;AAED,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AA0B5C,KAAK,OAAO,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEjD,MAAM,MAAM,GAAG,GAAG;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,YAAY,CAAA;IACpB,EAAE,EAAE,cAAc,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAsRD,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EACnB,IAAI,GAAE,UAAe,GACpB,GAAG,CAqBL"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAEV,UAAU,EACV,UAAU,EACV,eAAe,EAEf,OAAO,EACP,MAAM,EACP,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EACV,aAAa,EAGd,MAAM,UAAU,CAAA;AAEjB,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EACL,UAAU,EACV,UAAU,EACV,WAAW,EACX,aAAa,GACd,MAAM,SAAS,CAAA;AAEhB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAA;AAErB,YAAY,EACV,aAAa,EACb,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,aAAa,GACd,MAAM,UAAU,CAAA;AAEjB,YAAY,EACV,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,eAAe,EACf,QAAQ,EACR,cAAc,EACd,OAAO,EACP,aAAa,EACb,UAAU,EACV,eAAe,EACf,MAAM,EACN,OAAO,EACP,MAAM,EACN,YAAY,EACZ,cAAc,EACd,UAAU,EACV,gBAAgB,GACjB,MAAM,SAAS,CAAA;AAEhB,YAAY,EACV,cAAc,EACd,eAAe,EACf,iBAAiB,GAClB,MAAM,cAAc,CAAA;AAErB,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,IAAI,IAAI;IACtC,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,IAAI,IAAI;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,IAAI,IAAI;IAClC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5B,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,IAAI,IAAI;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,UAAU,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAA;IAC5B,EAAE,CAAC,EAAE,OAAO,GAAG,aAAa,CAAA;IAC5B,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CACrC,CAAA;AAED,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AA4B5C,KAAK,OAAO,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEjD,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,IAAI;IAC1B,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC,CAAA;IACrB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AA0RD,wBAAgB,SAAS,CAAC,CAAC,GAAG,IAAI,EAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,EACtB,IAAI,GAAE,UAAU,CAAC,CAAC,CAAM,GACvB,GAAG,CAAC,CAAC,CAAC,CAqBR"}

package/dist/core/middleware.d.ts

@@ -12,8 +12,8 @@ export type ValidationSchemas = {
     body?: Schema;
 };
 export type SchemaKey = keyof ValidationSchemas;
-export declare function parseJsonBody(): Middleware;
+export declare function parseJsonBody<T = void>(): Middleware<T>;
 export declare function setValidationFormats(formats: Record<string, Format>): void;
 export declare function resetValidationFormatsState(): void;
-export declare function validateSchemas(schemas: ValidationSchemas): Middleware;
+export declare function validateSchemas<T = void>(schemas: ValidationSchemas): Middleware<T>;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/core/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/core/middleware.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,KAAK,CAAA;AAE3D,OAAO,KAAK,EAIV,UAAU,EAGX,MAAM,SAAS,CAAA;AAEhB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;AAE5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,MAAM,CAAC,EAAE,eAAe,CAAA;IACxB,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAA;AAmF/C,wBAAgB,aAAa,IAAK,UAAU,CAoB3C;AAED,wBAAgB,oBAAoB,CAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAU3E;AAID,wBAAgB,2BAA2B,IAAK,IAAI,CAGnD;AAcD,wBAAgB,eAAe,CAAE,OAAO,EAAE,iBAAiB,GAAG,UAAU,CAgCvE"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/core/middleware.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,KAAK,CAAA;AAE3D,OAAO,KAAK,EAIV,UAAU,EAGX,MAAM,SAAS,CAAA;AAEhB,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;AAE5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,eAAe,CAAA;IACzB,MAAM,CAAC,EAAE,eAAe,CAAA;IACxB,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAA;AAmF/C,wBAAgB,aAAa,CAAC,CAAC,GAAG,IAAI,KAAM,UAAU,CAAC,CAAC,CAAC,CAoBxD;AAED,wBAAgB,oBAAoB,CAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAU3E;AAID,wBAAgB,2BAA2B,IAAK,IAAI,CAGnD;AAcD,wBAAgB,eAAe,CAAC,CAAC,GAAG,IAAI,EACtC,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAAC,CAAC,CAAC,CAgCf"}

package/dist/core/socket.d.ts

@@ -1,29 +1,29 @@
 import type { WebSocketHandler } from 'bun';
 import type { AsyncHandlerResult, CloseSignal, HttpMethod, Request, MiddlewareChain, SocketCommands, SocketData } from './utils';
-type SocketHandler = (req: Request, res: unknown) => AsyncHandlerResult;
-type SocketEndpoint = {
+type SocketHandler<T = void> = (req: Request<T>, res: unknown) => AsyncHandlerResult;
+type SocketEndpoint<T = void> = {
     method: HttpMethod;
     path: string;
-    handler: SocketHandler;
+    handler: SocketHandler<T>;
 };
-export type SocketConnection = {
-    data: SocketData;
+export type SocketConnection<T = void> = {
+    data: SocketData<T>;
     send: (data: string) => unknown;
     close: (code?: number, reason?: string) => void;
 };
-export type ActiveSession = {
+export type ActiveSession<T = void> = {
     token: string;
-    ws: SocketConnection;
+    ws: SocketConnection<T>;
 };
-export type InactiveSession = {
+export type InactiveSession<T = void> = {
     token: string;
     expiresAt: number;
-    data: unknown;
+    data: T;
 };
-export type ActiveSessions = ReadonlyMap<string, ActiveSession>;
+export type ActiveSessions<T = void> = ReadonlyMap<string, ActiveSession<T>>;
 export declare const ServerCloseSignals: Record<string, CloseSignal>;
 export type ServerCloseSignals = typeof ServerCloseSignals[keyof typeof ServerCloseSignals];
-export type Session = ActiveSession | InactiveSession;
+export type Session<T = void> = ActiveSession<T> | InactiveSession<T>;
 export type SocketOptions = {
     dropThreshold?: number;
     heartbeatInterval?: number;
@@ -33,33 +33,33 @@ export type SocketOptions = {
     onOpen?: (clientId: string) => void;
     onClose?: (clientId: string, signal: CloseSignal) => void;
 };
-export type Ticket = {
+export type Ticket<T = void> = {
     clientId: string;
     expiresAt: number;
-    data: unknown;
+    data: T;
 };
-export type SocketState = {
+export type SocketState<T = void> = {
     dropThreshold: number;
     heartbeatInterval: number;
     maxTickets: number;
     reclaimTtl: number;
     ticketTtl: number;
-    tickets: Map<string, Ticket>;
-    activeSessions: Map<string, ActiveSession>;
-    inactiveSessions: Map<string, InactiveSession>;
+    tickets: Map<string, Ticket<T>>;
+    activeSessions: Map<string, ActiveSession<T>>;
+    inactiveSessions: Map<string, InactiveSession<T>>;
     onOpen: ((clientId: string) => void) | null;
     onClose: ((clientId: string, signal: CloseSignal) => void) | null;
 };
-export type SocketRoute = {
+export type SocketRoute<T = void> = {
     method: HttpMethod;
     path: string;
     segments: string[];
-    chain: MiddlewareChain;
+    chain: MiddlewareChain<T>;
 };
-export declare function buildSocketState(opts?: SocketOptions): SocketState;
-export declare function buildSocketServer(routes: SocketRoute[], state: SocketState, commands: SocketCommands): WebSocketHandler<SocketData>;
-export declare function buildSocketHandlers(state: SocketState): SocketEndpoint[];
-export declare function buildDisabledSocketCommands(): SocketCommands;
-export declare function buildSocketCommands(state: SocketState): SocketCommands;
+export declare function buildSocketState<T = void>(opts?: SocketOptions): SocketState<T>;
+export declare function buildSocketServer<T = void>(routes: SocketRoute<T>[], state: SocketState<T>, commands: SocketCommands<T>): WebSocketHandler<SocketData<T>>;
+export declare function buildSocketHandlers<T = void>(state: SocketState<T>): SocketEndpoint<T>[];
+export declare function buildDisabledSocketCommands<T = void>(): SocketCommands<T>;
+export declare function buildSocketCommands<T = void>(state: SocketState<T>): SocketCommands<T>;
 export {};
 //# sourceMappingURL=socket.d.ts.map

package/dist/core/socket.d.ts.map

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

package/dist/core/utils.d.ts

@@ -83,19 +83,19 @@ export type FormattedError = {
 export type AsyncHandlerResult = Promise<Response>;
 export type HandlerResult = Response | AsyncHandlerResult;
 export type NextFn = (data?: unknown) => HandlerResult;
-export type Middleware = (req: Request, res: unknown, next: NextFn) => HandlerResult;
-export type Handler = (req: Request, res: unknown) => HandlerResult;
-export type MiddlewareChain = (Middleware | Handler)[];
+export type Middleware<T = void> = (req: Request<T>, res: unknown, next: NextFn) => HandlerResult;
+export type Handler<T = void> = (req: Request<T>, res: unknown) => HandlerResult;
+export type MiddlewareChain<T = void> = (Middleware<T> | Handler<T>)[];
 export type CloseSignal = {
     code: number;
     reason: string;
 };
-export type SocketData = {
+export type SocketData<T = void> = {
     clientId: string;
     superseded: boolean;
     reaped: boolean;
     reaperHandle: TimeoutHandle | null;
-    data: unknown;
+    data: T;
 };
 export declare const SessionType: {
     readonly Active: "active";
@@ -108,38 +108,38 @@ export declare const SessionFilter: {
     readonly All: "all";
 };
 export type SessionFilter = typeof SessionFilter[keyof typeof SessionFilter];
-export type SessionEntry = {
+export type SessionEntry<T = void> = {
     clientId: string;
     type: SessionType;
-    data: unknown;
+    data: T;
 };
-export type FilterFn = (session: SessionEntry, index: number) => boolean;
-export type SocketCommands = {
+export type FilterFn<T = void> = (session: SessionEntry<T>, index: number) => boolean;
+export type SocketCommands<T = void> = {
     broadcast: (event: string, body: unknown) => void;
-    send: (event: string, body: unknown, fn: FilterFn) => void;
-    drop: (signal: CloseSignal, fn: FilterFn) => void;
-    query: (fn: FilterFn, filter?: SessionFilter) => SessionEntry[];
+    send: (event: string, body: unknown, fn: FilterFn<T>) => void;
+    drop: (signal: CloseSignal, fn: FilterFn<T>) => void;
+    query: (fn: FilterFn<T>, filter?: SessionFilter) => SessionEntry<T>[];
 };
-export type BaseRequest = {
+export type BaseRequest<T = void> = {
     method: HttpMethod;
     route: string;
     headers: Headers;
     params: Record<string, string>;
     query: Record<string, unknown>;
     json: () => Promise<unknown>;
-    ws: SocketCommands;
+    ws: SocketCommands<T>;
 };
-export type EndpointRequest = BaseRequest & {
+export type EndpointRequest<T = void> = BaseRequest<T> & {
     raw: BunRequest;
-    server: Server;
+    server: Server<T>;
 };
-export type WebSocketRequest = BaseRequest & {
+export type WebSocketRequest<T = void> = BaseRequest<T> & {
     id: string;
     clientId: string;
 };
-export type Request = EndpointRequest | WebSocketRequest;
-export type Server = BunServer<SocketData>;
+export type Request<T = void> = EndpointRequest<T> | WebSocketRequest<T>;
+export type Server<T = void> = BunServer<SocketData<T>>;
 export declare function toSegments(pathString: string): string[];
 export declare function formatError(prefix: string, input: ValidationError): FormattedError;
-export declare function executeMiddlewareChain(req: Request, chain: MiddlewareChain): AsyncHandlerResult;
+export declare function executeMiddlewareChain<T = void>(req: Request<T>, chain: MiddlewareChain<T>): AsyncHandlerResult;
 //# sourceMappingURL=utils.d.ts.map

package/dist/core/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/core/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,KAAK,CAAA;AAE1D,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;AAEzD,eAAO,MAAM,UAAU;;;;;;;CAOb,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,MAAM,OAAO,UAAU,CAAC,CAAA;AAEnE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmEb,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,MAAM,OAAO,UAAU,CAAC,CAAA;AAEnE,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAElD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAClD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,kBAAkB,CAAA;AACzD,MAAM,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,aAAa,CAAA;AAEtD,MAAM,MAAM,UAAU,GAAG,CACvB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,MAAM,KACT,aAAa,CAAA;AAElB,MAAM,MAAM,OAAO,GAAG,CACpB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,KACT,aAAa,CAAA;AAElB,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,EAAE,CAAA;AAEtD,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,YAAY,EAAE,aAAa,GAAG,IAAI,CAAA;IAClC,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,eAAO,MAAM,WAAW;;;CAGd,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,MAAM,OAAO,WAAW,CAAC,CAAA;AAEtE,eAAO,MAAM,aAAa;;;;CAIhB,CAAA;AAEV,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC,MAAM,OAAO,aAAa,CAAC,CAAA;AAE5E,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,WAAW,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG,CACrB,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,MAAM,KACV,OAAO,CAAA;AAEZ,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACjD,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC1D,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;IACjD,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,aAAa,KAAK,YAAY,EAAE,CAAA;CAChE,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,UAAU,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,IAAI,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5B,EAAE,EAAE,cAAc,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG;IAC1C,GAAG,EAAE,UAAU,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG;IAC3C,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,eAAe,GAAG,gBAAgB,CAAA;AAExD,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;AAE1C,wBAAgB,UAAU,CAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAaxD;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,GACrB,cAAc,CAQhB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,eAAe,GACrB,kBAAkB,CAyBpB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/core/utils.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from './core';
 import type { AppOptions, App } from './core';
-export declare function createApp(port: number, opts?: AppOptions): App;
+export declare function createApp<T = void>(port: number, opts?: AppOptions<T>): App<T>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AAEtB,OAAO,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAE7C,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,UAAU,GAChB,GAAG,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AAEtB,OAAO,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAE7C,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,CAAC,GAAG,IAAI,EACxC,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,GACnB,GAAG,CAAC,CAAC,CAAC,CAAA"}

package/package.json

@@ -3,7 +3,7 @@
   "description": "A more opinionated web server for building REST-ful applications",
   "author": "Travis J True",
   "license": "MIT",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "type": "module",
   "bin": {
     "sleepy": "./src/cli/index.ts"

package/src/core/index.ts

@@ -35,9 +35,7 @@ import type {
   Server,
 } from './utils'
 
-import type {
-  SocketCommands,
-} from './utils'
+import type { SocketCommands } from './utils'
 
 import type {
   SocketOptions,
@@ -95,62 +93,64 @@ export type {
   ValidationSchemas,
 } from './middleware'
 
-export type RouteDefinition = {
+export type RouteDefinition<T = void> = {
   method: HttpMethod
   path: string
-  chain: Handler | MiddlewareChain
+  chain: Handler<T> | MiddlewareChain<T>
 }
 
-export type MetaEntry = {
+export type MetaEntry<T = void> = {
   path: string
-  middleware: Middleware[]
+  middleware: Middleware<T>[]
 }
 
-export type RouteConfig = {
-  routes: RouteDefinition[]
-  meta?: MetaEntry[]
+export type RouteConfig<T = void> = {
+  routes: RouteDefinition<T>[]
+  meta?: MetaEntry<T>[]
 }
 
-export type AppOptions = {
+export type AppOptions<T = void> = {
   hostname?: string
   mountPath?: string
-  middleware?: Middleware[]
+  middleware?: Middleware<T>[]
   ws?: boolean | SocketOptions
   onClose?: () => Promise<void> | void
 }
 
 type OutputRoutes = Record<string, string[]>
-type ServerRoutes = Record<string, Record<string, EndpointHandler>>
 
-type EndpointHandler = (
+type ServerRoutes<T = void> =
+  Record<string, Record<string, EndpointHandler<T>>>
+
+type EndpointHandler<T = void> = (
   bunReq: BunRequest,
-  server: Server,
+  server: Server<T>,
 ) => AsyncHandlerResult
 
-type ChainRoute = {
+type ChainRoute<T = void> = {
   method: HttpMethod
   path: string
-  chain: MiddlewareChain
+  chain: MiddlewareChain<T>
 }
 
-type ModuleRoute = {
+type ModuleRoute<T = void> = {
   method: HttpMethod
   path: string
-  handler: EndpointHandler
+  handler: EndpointHandler<T>
 }
 
-type AppRoutes = {
-  server: ServerRoutes
+type AppRoutes<T = void> = {
+  server: ServerRoutes<T>
   output: OutputRoutes
-  socket: SocketRoute[]
+  socket: SocketRoute<T>[]
 }
 
 type CloseFn = (force?: boolean) => Promise<void>
 
-export type App = {
-  server: Server
+export type App<T = void> = {
+  server: Server<T>
   routes: OutputRoutes
-  ws: SocketCommands
+  ws: SocketCommands<T>
   close: CloseFn
 }
 
@@ -158,7 +158,7 @@ function methodNotAllowedHandler (_req: unknown): never {
   throw new MethodNotAllowedError()
 }
 
-function defaultMethodMap (): Record<string, EndpointHandler> {
+function defaultMethodMap<T> (): Record<string, EndpointHandler<T>> {
   return {
     HEAD: methodNotAllowedHandler,
     GET: methodNotAllowedHandler,
@@ -183,11 +183,11 @@ function resolveSocketOptions (
   return ws
 }
 
-function buildEndpointRequest (
+function buildEndpointRequest<T> (
   bunReq: BunRequest,
-  server: Server,
-  ws: SocketCommands,
-): EndpointRequest {
+  server: Server<T>,
+  ws: SocketCommands<T>,
+): EndpointRequest<T> {
   const url = new URL(bunReq.url)
   const qs = url.search.replace('?', '')
 
@@ -214,7 +214,7 @@ function buildEndpointRequest (
   }
 }
 
-function normalizeChain (route: RouteDefinition): ChainRoute {
+function normalizeChain<T> (route: RouteDefinition<T>): ChainRoute<T> {
   const chain = Array.isArray(route.chain)
     ? route.chain
     : [route.chain]
@@ -226,13 +226,13 @@ function normalizeChain (route: RouteDefinition): ChainRoute {
   }
 }
 
-function buildMergedRoutes (
-  routePaths: ChainRoute[],
-  middleware: Middleware[],
-  meta: MetaEntry[],
-  state: SocketState,
+function buildMergedRoutes<T> (
+  routePaths: ChainRoute<T>[],
+  middleware: Middleware<T>[],
+  meta: MetaEntry<T>[],
+  state: SocketState<T>,
   mountPath: string,
-): ChainRoute[] {
+): ChainRoute<T>[] {
   const socketRoutes = buildSocketHandlers(state)
 
   for (const socketRoute of socketRoutes) {
@@ -268,19 +268,21 @@ function buildMergedRoutes (
   return routePaths
 }
 
-function buildSocketRoutes (mergedRoutes: ChainRoute[]): SocketRoute[] {
+function buildSocketRoutes<T> (
+  mergedRoutes: ChainRoute<T>[],
+): SocketRoute<T>[] {
   return mergedRoutes.map(route => ({
     ...route,
     segments: toSegments(route.path),
   }))
 }
 
-function buildModuleRoutes (
-  socketRoutes: SocketRoute[],
-  ws: SocketCommands,
-): ModuleRoute[] {
+function buildModuleRoutes<T> (
+  socketRoutes: SocketRoute<T>[],
+  ws: SocketCommands<T>,
+): ModuleRoute<T>[] {
   return socketRoutes.map(route => {
-    const handler: EndpointHandler = async (bunReq, server) => {
+    const handler: EndpointHandler<T> = async (bunReq, server) => {
       const req = buildEndpointRequest(bunReq, server, ws)
 
       return executeMiddlewareChain(req, route.chain)
@@ -294,11 +296,13 @@ function buildModuleRoutes (
   })
 }
 
-function buildServerRoutes (moduleRoutes: ModuleRoute[]): ServerRoutes {
-  return moduleRoutes.reduce<ServerRoutes>(
+function buildServerRoutes<T> (
+  moduleRoutes: ModuleRoute<T>[],
+): ServerRoutes<T> {
+  return moduleRoutes.reduce<ServerRoutes<T>>(
     (accum, curr) => {
       if (!accum[curr.path]) {
-        accum[curr.path] = defaultMethodMap()
+        accum[curr.path] = defaultMethodMap<T>()
       }
 
       accum[curr.path][curr.method] = curr.handler
@@ -307,7 +311,7 @@ function buildServerRoutes (moduleRoutes: ModuleRoute[]): ServerRoutes {
     }, {})
 }
 
-function buildOutputRoutes (moduleRoutes: ModuleRoute[]): OutputRoutes {
+function buildOutputRoutes<T> (moduleRoutes: ModuleRoute<T>[]): OutputRoutes {
   return moduleRoutes.reduce<OutputRoutes>((accum, curr) => {
     accum[curr.path] = accum[curr.path] || []
     accum[curr.path].push(curr.method)
@@ -316,12 +320,12 @@ function buildOutputRoutes (moduleRoutes: ModuleRoute[]): OutputRoutes {
   }, {})
 }
 
-function buildRoutes (
-  config: RouteConfig,
-  state: SocketState | null,
-  ws: SocketCommands,
-  opts: AppOptions,
-): AppRoutes {
+function buildRoutes<T> (
+  config: RouteConfig<T>,
+  state: SocketState<T> | null,
+  ws: SocketCommands<T>,
+  opts: AppOptions<T>,
+): AppRoutes<T> {
   const mountPath = opts.mountPath || ''
   const middleware = opts.middleware || []
   const meta = config.meta || []
@@ -360,13 +364,13 @@ function buildRoutes (
   }
 }
 
-function buildServer (
+function buildServer<T> (
   port: number,
-  routes: AppRoutes,
-  state: SocketState | null,
-  ws: SocketCommands,
-  opts: AppOptions,
-): Server {
+  routes: AppRoutes<T>,
+  state: SocketState<T> | null,
+  ws: SocketCommands<T>,
+  opts: AppOptions<T>,
+): Server<T> {
   const hostname = opts.hostname || '0.0.0.0'
 
   const websocket = state
@@ -390,10 +394,10 @@ function buildServer (
 
       return Response.json(httpError.output, { status })
     },
-  }) as Server
+  }) as Server<T>
 }
 
-function processIO (server: Server, opts: AppOptions): CloseFn {
+function processIO<T> (server: Server<T>, opts: AppOptions<T>): CloseFn {
   const onClose = opts.onClose || (() => {})
 
   console.info(`Running on port: ${server.port}`)
@@ -430,20 +434,20 @@ function processIO (server: Server, opts: AppOptions): CloseFn {
   }
 }
 
-export function createApp (
+export function createApp<T = void> (
   port: number,
-  config: RouteConfig,
-  opts: AppOptions = {},
-): App {
+  config: RouteConfig<T>,
+  opts: AppOptions<T> = {},
+): App<T> {
   const socketOpts = resolveSocketOptions(opts.ws)
 
   const state = socketOpts
-    ? buildSocketState(socketOpts)
+    ? buildSocketState<T>(socketOpts)
     : null
 
   const ws = state
-    ? buildSocketCommands(state)
-    : buildDisabledSocketCommands()
+    ? buildSocketCommands<T>(state)
+    : buildDisabledSocketCommands<T>()
 
   const routes = buildRoutes(config, state, ws, opts)
   const server = buildServer(port, routes, state, ws, opts)

package/src/core/middleware.ts

@@ -39,7 +39,7 @@ export type SchemaKey = keyof ValidationSchemas
 let _schemasCompiled = false
 let _customFormats: Record<string, Format> | null = null
 
-async function parseBody (req: Request): Promise<unknown> {
+async function parseBody<T> (req: Request<T>): Promise<unknown> {
   try {
     const result = await req.json()
 
@@ -117,9 +117,9 @@ function compileSchemas (
     })
 }
 
-export function parseJsonBody (): Middleware {
+export function parseJsonBody<T = void> (): Middleware<T> {
   return async (
-    req: Request,
+    req: Request<T>,
     res: unknown,
     next: NextFn,
   ): AsyncHandlerResult => {
@@ -158,8 +158,8 @@ export function resetValidationFormatsState (): void {
   _schemasCompiled = false
 }
 
-function buildValidationSource (
-  req: Request,
+function buildValidationSource<T> (
+  req: Request<T>,
   res: unknown,
 ): Record<SchemaKey, unknown> {
   return {
@@ -170,13 +170,15 @@ function buildValidationSource (
   }
 }
 
-export function validateSchemas (schemas: ValidationSchemas): Middleware {
+export function validateSchemas<T = void> (
+  schemas: ValidationSchemas,
+): Middleware<T> {
   const entries = compileSchemas(schemas)
 
   _schemasCompiled = true
 
   return (
-    req: Request,
+    req: Request<T>,
     res: unknown,
     next: NextFn,
   ): HandlerResult => {

package/src/core/socket.ts

@@ -50,7 +50,10 @@ import type {
   ResponseMessage,
 } from './messages'
 
-type SocketHandler = (req: Request, res: unknown) => AsyncHandlerResult
+type SocketHandler<T = void> = (
+  req: Request<T>,
+  res: unknown,
+) => AsyncHandlerResult
 
 type UpgradeData = {
   clientId?: string
@@ -62,10 +65,10 @@ type UpgradeContext = {
   [key: string]: unknown
 }
 
-type SocketEndpoint = {
+type SocketEndpoint<T = void> = {
   method: HttpMethod
   path: string
-  handler: SocketHandler
+  handler: SocketHandler<T>
 }
 
 type CreateSocketRequest = {
@@ -87,24 +90,24 @@ type UpdateTicketRequest = {
   }
 }
 
-export type SocketConnection = {
-  data: SocketData
+export type SocketConnection<T = void> = {
+  data: SocketData<T>
   send: (data: string) => unknown
   close: (code?: number, reason?: string) => void
 }
 
-export type ActiveSession = {
+export type ActiveSession<T = void> = {
   token: string
-  ws: SocketConnection
+  ws: SocketConnection<T>
 }
 
-export type InactiveSession = {
+export type InactiveSession<T = void> = {
   token: string
   expiresAt: number
-  data: unknown
+  data: T
 }
 
-export type ActiveSessions = ReadonlyMap<string, ActiveSession>
+export type ActiveSessions<T = void> = ReadonlyMap<string, ActiveSession<T>>
 
 export const ServerCloseSignals: Record<string, CloseSignal> = {
   Ok: {
@@ -124,7 +127,7 @@ export const ServerCloseSignals: Record<string, CloseSignal> = {
 export type ServerCloseSignals =
   typeof ServerCloseSignals[keyof typeof ServerCloseSignals]
 
-export type Session = ActiveSession | InactiveSession
+export type Session<T = void> = ActiveSession<T> | InactiveSession<T>
 
 export type SocketOptions = {
   dropThreshold?: number
@@ -136,30 +139,30 @@ export type SocketOptions = {
   onClose?: (clientId: string, signal: CloseSignal) => void
 }
 
-export type Ticket = {
+export type Ticket<T = void> = {
   clientId: string
   expiresAt: number
-  data: unknown
+  data: T
 }
 
-export type SocketState = {
+export type SocketState<T = void> = {
   dropThreshold: number
   heartbeatInterval: number
   maxTickets: number
   reclaimTtl: number
   ticketTtl: number
-  tickets: Map<string, Ticket>
-  activeSessions: Map<string, ActiveSession>
-  inactiveSessions: Map<string, InactiveSession>
+  tickets: Map<string, Ticket<T>>
+  activeSessions: Map<string, ActiveSession<T>>
+  inactiveSessions: Map<string, InactiveSession<T>>
   onOpen: ((clientId: string) => void) | null
   onClose: ((clientId: string, signal: CloseSignal) => void) | null
 }
 
-export type SocketRoute = {
+export type SocketRoute<T = void> = {
   method: HttpMethod
   path: string
   segments: string[]
-  chain: MiddlewareChain
+  chain: MiddlewareChain<T>
 }
 
 const ajv = new Ajv({
@@ -263,7 +266,7 @@ const updateTicketValidator = ajv.compile<UpdateTicketRequest>({
   },
 })
 
-function isSessionActive (session: InactiveSession): boolean {
+function isSessionActive<T> (session: InactiveSession<T>): boolean {
   return !session.expiresAt || session.expiresAt > Date.now()
 }
 
@@ -285,7 +288,7 @@ function parseMessage (raw: string | Buffer): RawMessage | undefined {
   }
 }
 
-function sweepInactiveSessions (state: SocketState): void {
+function sweepInactiveSessions<T> (state: SocketState<T>): void {
   for (const [key, session] of state.inactiveSessions) {
     if (!isSessionActive(session)) {
       state.inactiveSessions.delete(key)
@@ -335,10 +338,10 @@ function matchesSegments (
   )
 }
 
-function matchRoute (
-  routes: SocketRoute[],
+function matchRoute<T> (
+  routes: SocketRoute<T>[],
   message: RequestMessage,
-): SocketRoute {
+): SocketRoute<T> {
   const requestSegments = toSegments(message.route)
 
   const matchingPaths = routes.filter(route =>
@@ -358,8 +361,8 @@ function matchRoute (
   return route
 }
 
-function buildParams (
-  route: SocketRoute,
+function buildParams<T> (
+  route: SocketRoute<T>,
   message: RequestMessage,
 ): Record<string, string> {
   const requestSegments = toSegments(message.route)
@@ -372,11 +375,11 @@ function buildParams (
       } : accum, {})
 }
 
-function buildRequest (
+function buildRequest<T> (
   params: Record<string, string>,
   message: RequestMessage,
-  ws: SocketCommands,
-): WebSocketRequest {
+  ws: SocketCommands<T>,
+): WebSocketRequest<T> {
   const { id, clientId, method, route } = message
   const headers = new Headers(message.headers ?? {})
   const query = message.query ?? {}
@@ -431,7 +434,9 @@ function buildErrorMessage (
   })
 }
 
-export function buildSocketState (opts: SocketOptions = {}): SocketState {
+export function buildSocketState<T = void> (
+  opts: SocketOptions = {},
+): SocketState<T> {
   return {
     dropThreshold: opts.dropThreshold ?? 120_000,
     heartbeatInterval: opts.heartbeatInterval ?? 30_000,
@@ -446,11 +451,11 @@ export function buildSocketState (opts: SocketOptions = {}): SocketState {
   }
 }
 
-export function buildSocketServer (
-  routes: SocketRoute[],
-  state: SocketState,
-  commands: SocketCommands,
-): WebSocketHandler<SocketData> {
+export function buildSocketServer<T = void> (
+  routes: SocketRoute<T>[],
+  state: SocketState<T>,
+  commands: SocketCommands<T>,
+): WebSocketHandler<SocketData<T>> {
   const {
     dropThreshold,
     heartbeatInterval,
@@ -461,7 +466,7 @@ export function buildSocketServer (
     onClose,
   } = state
 
-  function armReaper (ws: SocketConnection) {
+  function armReaper (ws: SocketConnection<T>) {
     if (ws.data.reaperHandle) {
       clearTimeout(ws.data.reaperHandle)
     }
@@ -476,7 +481,7 @@ export function buildSocketServer (
     }, dropThreshold)
   }
 
-  function invokeOpen (ws: SocketConnection) {
+  function invokeOpen (ws: SocketConnection<T>) {
     if (onOpen) {
       try {
         onOpen(ws.data.clientId)
@@ -486,7 +491,7 @@ export function buildSocketServer (
     }
   }
 
-  function invokeClose (ws: SocketConnection, signal: CloseSignal) {
+  function invokeClose (ws: SocketConnection<T>, signal: CloseSignal) {
     if (onClose) {
       try {
         onClose(ws.data.clientId, signal)
@@ -497,7 +502,7 @@ export function buildSocketServer (
   }
 
   return {
-    open (ws: SocketConnection): void {
+    open (ws: SocketConnection<T>): void {
       sweepInactiveSessions(state)
 
       const token = randomToken()
@@ -536,7 +541,7 @@ export function buildSocketServer (
       ws.send(JSON.stringify(welcomeMessage))
       invokeOpen(ws)
     },
-    close (ws: SocketConnection, code: number, reason: string): void {
+    close (ws: SocketConnection<T>, code: number, reason: string): void {
       const signal: CloseSignal = {
         code,
         reason,
@@ -570,7 +575,10 @@ export function buildSocketServer (
 
       invokeClose(ws, signal)
     },
-    async message (ws: SocketConnection, raw: string | Buffer): Promise<void> {
+    async message (
+      ws: SocketConnection<T>,
+      raw: string | Buffer,
+    ): Promise<void> {
       const incomingMsg = parseMessage(raw)
 
       if (incomingMsg === undefined) {
@@ -610,7 +618,9 @@ export function buildSocketServer (
   }
 }
 
-export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
+export function buildSocketHandlers<T = void> (
+  state: SocketState<T>,
+): SocketEndpoint<T>[] {
   const {
     maxTickets,
     ticketTtl,
@@ -619,7 +629,7 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
     inactiveSessions,
   } = state
 
-  function issueTicket (clientId: string, data: unknown): string {
+  function issueTicket (clientId: string, data: T): string {
     for (const [key, entry] of tickets) {
       if (entry.expiresAt > Date.now()) {
         break
@@ -644,7 +654,7 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
     return hash
   }
 
-  function redeemTicket (hash: string): Ticket | undefined {
+  function redeemTicket (hash: string): Ticket<T> | undefined {
     const entry = hash ? tickets.get(hash) : undefined
 
     if (!entry) {
@@ -661,7 +671,7 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
     {
       method: 'GET',
       path: '/ws',
-      handler (req: Request, res: unknown): AsyncHandlerResult {
+      handler (req: Request<T>, res: unknown): AsyncHandlerResult {
         const validReq = validateSchema(req, createSocketValidator)
 
         if (typeof res !== 'object') {
@@ -694,11 +704,11 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
     {
       method: 'POST',
       path: '/ws',
-      async handler (req: Request, res: unknown): AsyncHandlerResult {
+      async handler (req: Request<T>, res: unknown): AsyncHandlerResult {
         validateSchema(req, createTicketValidator)
 
         const clientId = crypto.randomUUID()
-        const ticket = issueTicket(clientId, res)
+        const ticket = issueTicket(clientId, res as T)
 
         return Response.json({
           clientId,
@@ -710,12 +720,12 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
     {
       method: 'PUT',
       path: '/ws/:clientId',
-      async handler (req: Request, res: unknown): AsyncHandlerResult {
+      async handler (req: Request<T>, res: unknown): AsyncHandlerResult {
         const validReq = validateSchema(req, updateTicketValidator)
         const authHeader = validReq.headers.get('authorization')!
         const token = authHeader.slice('Bearer '.length)
 
-        let session: Session | undefined =
+        let session: Session<T> | undefined =
           activeSessions.get(validReq.params.clientId)
 
         if (!session) {
@@ -748,7 +758,7 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
   ]
 }
 
-export function buildDisabledSocketCommands (): SocketCommands {
+export function buildDisabledSocketCommands<T = void> (): SocketCommands<T> {
   const msg = 'WebSocket support is not enabled'
 
   return {
@@ -759,7 +769,9 @@ export function buildDisabledSocketCommands (): SocketCommands {
   }
 }
 
-export function buildSocketCommands (state: SocketState): SocketCommands {
+export function buildSocketCommands<T = void> (
+  state: SocketState<T>,
+): SocketCommands<T> {
   function sendToClient (clientId: string, event: string, body: unknown) {
     const session = state.activeSessions.get(clientId)
 
@@ -782,12 +794,12 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
         sendToClient(clientId, event, body)
       }
     },
-    send (event: string, body: unknown, fn: FilterFn) {
+    send (event: string, body: unknown, fn: FilterFn<T>) {
       let index = 0
 
       /* TODO: look into concurrency at some point */
       for (const [clientId, session] of state.activeSessions) {
-        const entry: SessionEntry = {
+        const entry: SessionEntry<T> = {
           clientId,
           type: SessionType.Active,
           data: session.ws.data.data,
@@ -800,7 +812,7 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
         index += 1
       }
     },
-    drop (signal: CloseSignal, fn: FilterFn) {
+    drop (signal: CloseSignal, fn: FilterFn<T>) {
       const { code, reason } = signal
 
       let index = 0
@@ -812,7 +824,7 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
       }
 
       for (const [clientId, session] of state.activeSessions) {
-        const entry: SessionEntry = {
+        const entry: SessionEntry<T> = {
           clientId,
           type: SessionType.Active,
           data: session.ws.data.data,
@@ -826,10 +838,10 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
       }
     },
     query (
-      fn: FilterFn,
+      fn: FilterFn<T>,
       filter: SessionFilter = SessionFilter.Active,
     ) {
-      const results: SessionEntry[] = []
+      const results: SessionEntry<T>[] = []
 
       function processSessions (
         type: SessionType,
@@ -849,7 +861,7 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
         for (const [clientId, session] of sessions) {
           const data = 'ws' in session ? session.ws.data.data : session.data
 
-          const entry: SessionEntry = {
+          const entry: SessionEntry<T> = {
             clientId,
             type,
             data,

package/src/core/utils.ts

@@ -96,30 +96,30 @@ export type AsyncHandlerResult = Promise<Response>
 export type HandlerResult = Response | AsyncHandlerResult
 export type NextFn = (data?: unknown) => HandlerResult
 
-export type Middleware = (
-  req: Request,
+export type Middleware<T = void> = (
+  req: Request<T>,
   res: unknown,
   next: NextFn,
 ) => HandlerResult
 
-export type Handler = (
-  req: Request,
+export type Handler<T = void> = (
+  req: Request<T>,
   res: unknown,
 ) => HandlerResult
 
-export type MiddlewareChain = (Middleware | Handler)[]
+export type MiddlewareChain<T = void> = (Middleware<T> | Handler<T>)[]
 
 export type CloseSignal = {
   code: number
   reason: string
 }
 
-export type SocketData = {
+export type SocketData<T = void> = {
   clientId: string
   superseded: boolean
   reaped: boolean
   reaperHandle: TimeoutHandle | null
-  data: unknown
+  data: T
 }
 
 export const SessionType = {
@@ -137,47 +137,47 @@ export const SessionFilter = {
 
 export type SessionFilter = typeof SessionFilter[keyof typeof SessionFilter]
 
-export type SessionEntry = {
+export type SessionEntry<T = void> = {
   clientId: string
   type: SessionType
-  data: unknown
+  data: T
 }
 
-export type FilterFn = (
-  session: SessionEntry,
+export type FilterFn<T = void> = (
+  session: SessionEntry<T>,
   index: number,
 ) => boolean
 
-export type SocketCommands = {
+export type SocketCommands<T = void> = {
   broadcast: (event: string, body: unknown) => void
-  send: (event: string, body: unknown, fn: FilterFn) => void
-  drop: (signal: CloseSignal, fn: FilterFn) => void
-  query: (fn: FilterFn, filter?: SessionFilter) => SessionEntry[]
+  send: (event: string, body: unknown, fn: FilterFn<T>) => void
+  drop: (signal: CloseSignal, fn: FilterFn<T>) => void
+  query: (fn: FilterFn<T>, filter?: SessionFilter) => SessionEntry<T>[]
 }
 
-export type BaseRequest = {
+export type BaseRequest<T = void> = {
   method: HttpMethod
   route: string
   headers: Headers
   params: Record<string, string>
   query: Record<string, unknown>
   json: () => Promise<unknown>
-  ws: SocketCommands
+  ws: SocketCommands<T>
 }
 
-export type EndpointRequest = BaseRequest & {
+export type EndpointRequest<T = void> = BaseRequest<T> & {
   raw: BunRequest
-  server: Server
+  server: Server<T>
 }
 
-export type WebSocketRequest = BaseRequest & {
+export type WebSocketRequest<T = void> = BaseRequest<T> & {
   id: string
   clientId: string
 }
 
-export type Request = EndpointRequest | WebSocketRequest
+export type Request<T = void> = EndpointRequest<T> | WebSocketRequest<T>
 
-export type Server = BunServer<SocketData>
+export type Server<T = void> = BunServer<SocketData<T>>
 
 export function toSegments (pathString: string): string[] {
   const [pathname] = String(pathString).split('?')
@@ -207,9 +207,9 @@ export function formatError (
   }
 }
 
-export async function executeMiddlewareChain (
-  req: Request,
-  chain: MiddlewareChain,
+export async function executeMiddlewareChain<T = void> (
+  req: Request<T>,
+  chain: MiddlewareChain<T>,
 ): AsyncHandlerResult {
   if (!chain.length) {
     throw new RangeError('Middleware chain is empty')
@@ -224,8 +224,8 @@ export async function executeMiddlewareChain (
     const next = (data?: unknown) => executeMiddleware(index + 1, data)
 
     const result = isLast
-      ? await (fn as Handler)(req, res)
-      : await (fn as Middleware)(req, res, next)
+      ? await (fn as Handler<T>)(req, res)
+      : await (fn as Middleware<T>)(req, res, next)
 
     if (result instanceof Response) {
       return result

package/src/index.ts

@@ -2,7 +2,7 @@ export * from './core'
 
 import type { AppOptions, App } from './core'
 
-export declare function createApp (
+export declare function createApp<T = void> (
   port: number,
-  opts?: AppOptions,
-): App
+  opts?: AppOptions<T>,
+): App<T>