sleepy-serv 0.9.0 → 0.10.0

package/README.md

@@ -5,7 +5,7 @@ A directory-driven web server designed for REST-ful applications
 ## Important Notes
 
 - This package requires [`bun.sh`](https://bun.sh) instead of NodeJS to run.
-- This project requires bun v1.3.14 or higher
+- This project requires bun v1.4 or higher
 
 ## Getting Started
 

package/dist/index.d.ts

@@ -1,11 +1,12 @@
 import type { AppOptions, Server } from './utils';
 import type { SocketCommands } from './socket';
 export * from './errors';
+export { StatusCode, CloseCode, CloseReason } from './utils';
 export { parseJsonBody, setValidationFormats, validateSchemas, } from './middleware';
-export { HttpMethod, StatusCode } from './utils';
-export type { AppOptions, EndpointRequest, FormattedError, Middleware, NextFn, Request, Server, SocketOptions, WebSocketRequest, } from './utils';
-export type { FormatterField, FormatterSchema, ValidationSchemas, } from './middleware';
 export type { SocketCommands } from './socket';
+export type { HttpMethod, ActiveSessions } from './utils';
+export type { AppOptions, AsyncHandlerResult, BaseRequest, EndpointRequest, FormattedError, Handler, Middleware, MiddlewareChain, NextFn, HandlerResult, Request, Server, SocketConnection, SocketOptions, WebSocketRequest, } from './utils';
+export type { FormatterField, FormatterSchema, ValidationSchemas, } from './middleware';
 type OutputRoutes = Record<string, string[]>;
 type CloseFn = (force?: boolean) => Promise<void>;
 export type App = {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAIV,UAAU,EACV,MAAM,EACP,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAGV,cAAc,EACf,MAAM,UAAU,CAAA;AAEjB,cAAc,UAAU,CAAA;AAExB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAEhD,YAAY,EACV,UAAU,EACV,eAAe,EACf,cAAc,EACd,UAAU,EACV,MAAM,EACN,OAAO,EACP,MAAM,EACN,aAAa,EACb,gBAAgB,GACjB,MAAM,SAAS,CAAA;AAEhB,YAAY,EACV,cAAc,EACd,eAAe,EACf,iBAAiB,GAClB,MAAM,cAAc,CAAA;AAErB,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE9C,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AA4C5C,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,QAAQ,EAAE,cAAc,CAAA;IACxB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAoZD,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,GAAG,CAAC,CAad"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAOV,UAAU,EACV,MAAM,EACP,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAGV,cAAc,EACf,MAAM,UAAU,CAAA;AAEjB,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAE5D,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAA;AAErB,YAAY,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAC9C,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAEzD,YAAY,EACV,UAAU,EACV,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,cAAc,EACd,OAAO,EACP,UAAU,EACV,eAAe,EACf,MAAM,EACN,aAAa,EACb,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,aAAa,EACb,gBAAgB,GACjB,MAAM,SAAS,CAAA;AAEhB,YAAY,EACV,cAAc,EACd,eAAe,EACf,iBAAiB,GAClB,MAAM,cAAc,CAAA;AAErB,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AA4C5C,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,QAAQ,EAAE,cAAc,CAAA;IACxB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAyaD,wBAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,GAAG,CAAC,CAad"}

package/dist/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,KAAK,CAAA;AAC3D,OAAO,KAAK,EAAkB,UAAU,EAAmB,MAAM,SAAS,CAAA;AAE1E,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;AA2F/C,wBAAgB,aAAa,IAAK,UAAU,CAoB3C;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,IAAI,CAUN;AAID,wBAAgB,2BAA2B,IAAK,IAAI,CAGnD;AAcD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,iBAAiB,GACzB,UAAU,CAgCZ"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/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"}

package/dist/socket.d.ts

@@ -1,25 +1,20 @@
+import { CloseReason } from './utils';
 import type { WebSocketHandler } from 'bun';
-import type { HttpMethod, Request, Middleware, SocketData, AppOptions } from './utils';
+import type { AsyncHandlerResult, HttpMethod, Request, MiddlewareChain, SocketData, ActiveSession, InactiveSession, AppOptions } from './utils';
+type SocketHandler = (req: Request, res: unknown) => AsyncHandlerResult;
+type FilterFn = (clientId: string, data: unknown) => boolean;
+type SocketEndpoint = {
+    method: HttpMethod;
+    path: string;
+    handler: SocketHandler;
+};
 export type Ticket = {
     clientId: string;
     expiresAt: number;
+    data: unknown;
 };
-export type SocketConnection = {
-    data: SocketData;
-    send: (data: string) => unknown;
-    close: () => void;
-};
-export type ActiveSession = {
-    token: string;
-    ws: SocketConnection;
-};
-export type InactiveSession = {
-    token: string;
-    expiresAt: number;
-};
-export type Session = ActiveSession | InactiveSession;
 export type SocketState = {
-    disconnectThreshold: number;
+    dropThreshold: number;
     heartbeatInterval: number;
     maxTickets: number;
     reclaimTtl: number;
@@ -27,24 +22,24 @@ export type SocketState = {
     tickets: Map<string, Ticket>;
     activeSessions: Map<string, ActiveSession>;
     inactiveSessions: Map<string, InactiveSession>;
+    onOpen: ((clientId: string) => void) | null;
+    onClose: ((clientId: string, reason: CloseReason) => void) | null;
 };
 export type SocketRoute = {
     method: HttpMethod;
     path: string;
     segments: string[];
-    chain: Middleware[];
-};
-export type SocketEndpoint = {
-    method: HttpMethod;
-    path: string;
-    handler: (req: Request, res: unknown) => Response;
+    chain: MiddlewareChain;
 };
 export type SocketCommands = {
     send: (clientId: string, event: string, body: unknown) => void;
+    sendToGroup: (fn: FilterFn, event: string, body: unknown) => void;
     broadcast: (event: string, body: unknown) => void;
+    drop: (clientId: string, code?: number, reason?: string) => void;
 };
 export declare function buildSocketState(opts?: AppOptions): SocketState;
 export declare function buildSocketServer(routes: SocketRoute[], state: SocketState): WebSocketHandler<SocketData>;
 export declare function buildSocketHandlers(state: SocketState): SocketEndpoint[];
 export declare function buildSocketCommands(state: SocketState): SocketCommands;
+export {};
 //# sourceMappingURL=socket.d.ts.map

package/dist/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAA;AAE3C,OAAO,KAAK,EACV,UAAU,EACV,OAAO,EAEP,UAAU,EACV,UAAU,EACV,UAAU,EACX,MAAM,SAAS,CAAA;AAShB,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,UAAU,CAAA;IAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;IAC/B,KAAK,EAAE,MAAM,IAAI,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,EAAE,gBAAgB,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,aAAa,GAAG,eAAe,CAAA;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC1C,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;CAC/C,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,EAAE,UAAU,EAAE,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,KAAK,QAAQ,CAAA;CAClD,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAC9D,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;CAClD,CAAA;AA2SD,wBAAgB,gBAAgB,CAAE,IAAI,GAAE,UAAe,GAAG,WAAW,CAWpE;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,WAAW,EAAE,EACrB,KAAK,EAAE,WAAW,GACjB,gBAAgB,CAAC,UAAU,CAAC,CAuH9B;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,EAAE,CAqIzE;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,CA+BvE"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../src/socket.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,WAAW,EAIZ,MAAM,SAAS,CAAA;AAchB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAA;AAE3C,OAAO,KAAK,EACV,kBAAkB,EAClB,UAAU,EACV,OAAO,EACP,eAAe,EAEf,UAAU,EAEV,aAAa,EAEb,eAAe,EAEf,UAAU,EACX,MAAM,SAAS,CAAA;AAShB,KAAK,aAAa,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,KAAK,kBAAkB,CAAA;AACvE,KAAK,QAAQ,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,OAAO,CAAA;AAY5D,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,aAAa,CAAA;CACvB,CAAA;AAqBD,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,EAAE,MAAM,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IAC1C,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAA;IAC9C,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,IAAI,CAAA;IAC3C,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC,GAAG,IAAI,CAAA;CAClE,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAC9D,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACjE,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACjD,IAAI,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CACjE,CAAA;AAmTD,wBAAgB,gBAAgB,CAAE,IAAI,GAAE,UAAe,GAAG,WAAW,CAapE;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,WAAW,EAAE,EACrB,KAAK,EAAE,WAAW,GACjB,gBAAgB,CAAC,UAAU,CAAC,CAoJ9B;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,EAAE,CAyIzE;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,CA6CvE"}

package/dist/utils.d.ts

@@ -79,7 +79,23 @@ export type FormattedError = {
     path: string;
     message: string;
 };
-export type NextFn = (data?: unknown) => Response | Promise<Response>;
+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 ActiveSession = {
+    token: string;
+    ws: SocketConnection;
+};
+export type InactiveSession = {
+    token: string;
+    expiresAt: number;
+    app: unknown;
+};
+export type ActiveSessions = ReadonlyMap<string, ActiveSession>;
+export type Session = ActiveSession | InactiveSession;
 export type BaseRequest = {
     method: HttpMethod;
     route: string;
@@ -87,6 +103,9 @@ export type BaseRequest = {
     params: Record<string, string>;
     query: Record<string, unknown>;
     json: () => Promise<unknown>;
+    ws: {
+        active: ActiveSessions;
+    };
 };
 export type EndpointRequest = BaseRequest & {
     raw: BunRequest;
@@ -97,19 +116,39 @@ export type WebSocketRequest = BaseRequest & {
     clientId: string;
 };
 export type Request = EndpointRequest | WebSocketRequest;
-export type Middleware = (req: Request, res: unknown, next: NextFn | null) => unknown;
+export declare const CloseCode: {
+    readonly Ok: 1000;
+    readonly Abnormal: 1006;
+    readonly Reaped: 4999;
+};
+export type CloseCode = typeof CloseCode[keyof typeof CloseCode];
+export declare const CloseReason: {
+    readonly Ok: "ok";
+    readonly Dropped: "dropped";
+    readonly Reaped: "reaped";
+    readonly Superseded: "superseded";
+};
+export type CloseReason = typeof CloseReason[keyof typeof CloseReason];
 export type SocketOptions = {
-    disconnectThreshold?: number;
+    dropThreshold?: number;
     heartbeatInterval?: number;
     maxTickets?: number;
     reclaimTtl?: number;
     ticketTtl?: number;
+    onOpen?: (clientId: string) => void;
+    onClose?: (clientId: string, reason: CloseReason) => void;
 };
 export type SocketData = {
     clientId: string;
     superseded: boolean;
     reaped: boolean;
     reaperHandle: ReturnType<typeof setTimeout> | null;
+    app: unknown;
+};
+export type SocketConnection = {
+    data: SocketData;
+    send: (data: string) => unknown;
+    close: (code?: number, reason?: string) => void;
 };
 export type Server = BunServer<SocketData>;
 export type AppOptions = {
@@ -121,5 +160,5 @@ export type AppOptions = {
 };
 export declare function toSegments(pathString: string): string[];
 export declare function formatError(prefix: string, input: ValidationError): FormattedError;
-export declare function executeMiddlewareChain(req: Request, chain: Middleware[]): Promise<Response>;
+export declare function executeMiddlewareChain(req: Request, chain: MiddlewareChain): AsyncHandlerResult;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/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,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,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,EAAE,gBAAgB,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,OAAO,CAAA;CACb,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAC/D,MAAM,MAAM,OAAO,GAAG,aAAa,GAAG,eAAe,CAAA;AAErD,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;QACF,MAAM,EAAE,cAAc,CAAA;KACvB,CAAA;CACF,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,eAAO,MAAM,SAAS;;;;CAIZ,CAAA;AAEV,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,MAAM,OAAO,SAAS,CAAC,CAAA;AAEhE,eAAO,MAAM,WAAW;;;;;CAKd,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,MAAM,OAAO,WAAW,CAAC,CAAA;AAEtE,MAAM,MAAM,aAAa,GAAG;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA;CAC1D,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,YAAY,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,GAAG,IAAI,CAAA;IAClD,GAAG,EAAE,OAAO,CAAA;CACb,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,UAAU,CAAA;IAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAA;IAC/B,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;CAChD,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;AAE1C,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,aAAa,CAAA;IAClB,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CACrC,CAAA;AAED,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"}

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.9.0",
+  "version": "0.10.0",
   "type": "module",
   "exports": {
     ".": {

package/src/index.ts

@@ -4,7 +4,11 @@ import querystring from 'querystring'
 import readline from 'node:readline'
 
 import { stdin, stdout } from 'node:process'
-import { toSegments, executeMiddlewareChain } from './utils'
+
+import {
+  toSegments,
+  executeMiddlewareChain,
+} from './utils'
 
 import {
   buildSocketState,
@@ -23,9 +27,12 @@ import {
 import type { BunRequest } from 'bun'
 
 import type {
+  AsyncHandlerResult,
   HttpMethod,
   Middleware,
+  MiddlewareChain,
   EndpointRequest,
+  ActiveSessions,
   AppOptions,
   Server,
 } from './utils'
@@ -37,6 +44,7 @@ import type {
 } from './socket'
 
 export * from './errors'
+export { StatusCode, CloseCode, CloseReason } from './utils'
 
 export {
   parseJsonBody,
@@ -44,16 +52,23 @@ export {
   validateSchemas,
 } from './middleware'
 
-export { HttpMethod, StatusCode } from './utils'
+export type { SocketCommands } from './socket'
+export type { HttpMethod, ActiveSessions } from './utils'
 
 export type {
   AppOptions,
+  AsyncHandlerResult,
+  BaseRequest,
   EndpointRequest,
   FormattedError,
+  Handler,
   Middleware,
+  MiddlewareChain,
   NextFn,
+  HandlerResult,
   Request,
   Server,
+  SocketConnection,
   SocketOptions,
   WebSocketRequest,
 } from './utils'
@@ -64,15 +79,13 @@ export type {
   ValidationSchemas,
 } from './middleware'
 
-export type { SocketCommands } from './socket'
-
 type OutputRoutes = Record<string, string[]>
 type ServerRoutes = Record<string, Record<string, EndpointHandler>>
 
 type EndpointHandler = (
   bunReq: BunRequest,
   server: Server,
-) => Promise<Response>
+) => AsyncHandlerResult
 
 type DirEntry = {
   path: string
@@ -89,7 +102,7 @@ type RoutePath = {
 type ChainRoute = {
   method: HttpMethod
   path: string
-  chain: Middleware[]
+  chain: MiddlewareChain
 }
 
 type ModuleRoute = {
@@ -154,10 +167,20 @@ function defaultMethodMap (): Record<string, EndpointHandler> {
 function buildEndpointRequest (
   bunReq: BunRequest,
   server: Server,
+  activeSessions: ActiveSessions,
 ): EndpointRequest {
   const url = new URL(bunReq.url)
   const qs = url.search.replace('?', '')
-  const json = () => bunReq.json()
+
+  let bodyPromise: Promise<unknown> | null = null
+
+  const json = (): Promise<unknown> => {
+    if (!bodyPromise) {
+      bodyPromise = bunReq.json()
+    }
+
+    return bodyPromise
+  }
 
   return {
     method: bunReq.method as HttpMethod,
@@ -168,6 +191,9 @@ function buildEndpointRequest (
     raw: bunReq,
     server,
     json,
+    ws: {
+      active: activeSessions,
+    },
   }
 }
 
@@ -279,9 +305,10 @@ function buildRoutePaths (
       .join('') || '/'
 
     const metaMiddlewarePath = selectMetaPaths(metadata, modulePath)
+    const rawMethod = segments[lastIndex].toUpperCase()
 
     return {
-      method: segments[lastIndex].toUpperCase() as HttpMethod,
+      method: rawMethod as HttpMethod,
       path: joinedPath,
       metaMiddlewarePath,
       modulePath,
@@ -376,10 +403,17 @@ function buildSocketRoutes (mergedRoutes: ChainRoute[]): SocketRoute[] {
   }))
 }
 
-function buildModuleRoutes (socketRoutes: SocketRoute[]): ModuleRoute[] {
+function buildModuleRoutes (
+  socketRoutes: SocketRoute[],
+  state: SocketState,
+): ModuleRoute[] {
   return socketRoutes.map(route => {
     const handler: EndpointHandler = async (bunReq, server) => {
-      const req = buildEndpointRequest(bunReq, server)
+      const req = buildEndpointRequest(
+        bunReq,
+        server,
+        state.activeSessions,
+      )
 
       return executeMiddlewareChain(req, route.chain)
     }
@@ -440,7 +474,7 @@ async function buildRoutes (
   )
 
   const socketRoutes = buildSocketRoutes(mergedRoutes)
-  const moduleRoutes = buildModuleRoutes(socketRoutes)
+  const moduleRoutes = buildModuleRoutes(socketRoutes, state)
   const serverRoutes = buildServerRoutes(moduleRoutes)
   const outputRoutes = buildOutputRoutes(moduleRoutes)
 

package/src/middleware.ts

@@ -10,7 +10,15 @@ import {
 } from './errors'
 
 import type { Format, Schema, ValidateFunction } from 'ajv'
-import type { FormattedError, Middleware, NextFn, Request } from './utils'
+
+import type {
+  AsyncHandlerResult,
+  FormattedError,
+  HandlerResult,
+  Middleware,
+  NextFn,
+  Request,
+} from './utils'
 
 export type FormatterField = {
   type: string
@@ -28,14 +36,6 @@ export type ValidationSchemas = {
 
 export type SchemaKey = keyof ValidationSchemas
 
-function requireNext (next: NextFn | null): NextFn {
-  if (!next) {
-    throw new TypeError('Middleware cannot be the last entry in a chain')
-  }
-
-  return next
-}
-
 let _schemasCompiled = false
 let _customFormats: Record<string, Format> | null = null
 
@@ -121,12 +121,12 @@ export function parseJsonBody (): Middleware {
   return async (
     req: Request,
     res: unknown,
-    next: NextFn | null,
-  ): Promise<unknown> => {
+    next: NextFn,
+  ): AsyncHandlerResult => {
     const contentType = req.headers.get('content-type')
 
     if (!contentType) {
-      return requireNext(next)(res)
+      return next(res)
     }
 
     if (!contentType.startsWith('application/json')) {
@@ -135,13 +135,11 @@ export function parseJsonBody (): Middleware {
 
     const body = await parseBody(req)
 
-    return requireNext(next)(body)
+    return next(body)
   }
 }
 
-export function setValidationFormats (
-  formats: Record<string, Format>,
-): void {
+export function setValidationFormats (formats: Record<string, Format>): void {
   if (_customFormats) {
     console.warn('setValidationFormats() - already initialized')
   }
@@ -172,9 +170,7 @@ function buildValidationSource (
   }
 }
 
-export function validateSchemas (
-  schemas: ValidationSchemas,
-): Middleware {
+export function validateSchemas (schemas: ValidationSchemas): Middleware {
   const entries = compileSchemas(schemas)
 
   _schemasCompiled = true
@@ -182,14 +178,14 @@ export function validateSchemas (
   return (
     req: Request,
     res: unknown,
-    next: NextFn | null,
-  ): unknown => {
+    next: NextFn,
+  ): HandlerResult => {
     const source = buildValidationSource(req, res)
 
-    const errors = entries.reduce((accum: FormattedError[], [
-      key,
-      validator,
-    ]) => {
+    const errors = entries.reduce((
+      accum: FormattedError[],
+      [key, validator]: [SchemaKey, ValidateFunction],
+    ) => {
       const valid = validator(source[key])
 
       return !valid
@@ -204,6 +200,6 @@ export function validateSchemas (
       throw new UnprocessableContentError(errors)
     }
 
-    return requireNext(next)(res)
+    return next(res)
   }
 }

package/src/socket.ts

@@ -10,6 +10,8 @@ import {
 
 import {
   StatusCode,
+  CloseCode,
+  CloseReason,
   toSegments,
   formatError,
   executeMiddlewareChain,
@@ -17,6 +19,7 @@ import {
 
 import {
   RequestError,
+  BadRequestError,
   NotFoundError,
   UnauthorizedError,
   MethodNotAllowedError,
@@ -29,11 +32,17 @@ import type { ValidateFunction } from 'ajv'
 import type { WebSocketHandler } from 'bun'
 
 import type {
+  AsyncHandlerResult,
   HttpMethod,
   Request,
+  MiddlewareChain,
   WebSocketRequest,
-  Middleware,
   SocketData,
+  SocketConnection,
+  ActiveSession,
+  ActiveSessions,
+  InactiveSession,
+  Session,
   AppOptions,
 } from './utils'
 
@@ -44,57 +53,8 @@ import type {
   ResponseMessage,
 } from './messages'
 
-export type Ticket = {
-  clientId: string
-  expiresAt: number
-}
-
-export type SocketConnection = {
-  data: SocketData
-  send: (data: string) => unknown
-  close: () => void
-}
-
-export type ActiveSession = {
-  token: string
-  ws: SocketConnection
-}
-
-export type InactiveSession = {
-  token: string
-  expiresAt: number
-}
-
-export type Session = ActiveSession | InactiveSession
-
-export type SocketState = {
-  disconnectThreshold: number
-  heartbeatInterval: number
-  maxTickets: number
-  reclaimTtl: number
-  ticketTtl: number
-  tickets: Map<string, Ticket>
-  activeSessions: Map<string, ActiveSession>
-  inactiveSessions: Map<string, InactiveSession>
-}
-
-export type SocketRoute = {
-  method: HttpMethod
-  path: string
-  segments: string[]
-  chain: Middleware[]
-}
-
-export type SocketEndpoint = {
-  method: HttpMethod
-  path: string
-  handler: (req: Request, res: unknown) => Response
-}
-
-export type SocketCommands = {
-  send: (clientId: string, event: string, body: unknown) => void
-  broadcast: (event: string, body: unknown) => void
-}
+type SocketHandler = (req: Request, res: unknown) => AsyncHandlerResult
+type FilterFn = (clientId: string, data: unknown) => boolean
 
 type UpgradeData = {
   clientId?: string
@@ -106,6 +66,12 @@ type UpgradeContext = {
   [key: string]: unknown
 }
 
+type SocketEndpoint = {
+  method: HttpMethod
+  path: string
+  handler: SocketHandler
+}
+
 type CreateSocketRequest = {
   query: {
     ticket: string
@@ -125,6 +91,39 @@ type UpdateTicketRequest = {
   }
 }
 
+export type Ticket = {
+  clientId: string
+  expiresAt: number
+  data: unknown
+}
+
+export type SocketState = {
+  dropThreshold: number
+  heartbeatInterval: number
+  maxTickets: number
+  reclaimTtl: number
+  ticketTtl: number
+  tickets: Map<string, Ticket>
+  activeSessions: Map<string, ActiveSession>
+  inactiveSessions: Map<string, InactiveSession>
+  onOpen: ((clientId: string) => void) | null
+  onClose: ((clientId: string, reason: CloseReason) => void) | null
+}
+
+export type SocketRoute = {
+  method: HttpMethod
+  path: string
+  segments: string[]
+  chain: MiddlewareChain
+}
+
+export type SocketCommands = {
+  send: (clientId: string, event: string, body: unknown) => void
+  sendToGroup: (fn: FilterFn, event: string, body: unknown) => void
+  broadcast: (event: string, body: unknown) => void
+  drop: (clientId: string, code?: number, reason?: string) => void
+}
+
 const ajv = new Ajv({
   allErrors: true,
 })
@@ -230,7 +229,7 @@ function isSessionActive (session: InactiveSession): boolean {
   return !session.expiresAt || session.expiresAt > Date.now()
 }
 
-function randomTicket (): string {
+function randomTicketHash (): string {
   return crypto.randomBytes(24).toString('base64url')
 }
 
@@ -248,6 +247,30 @@ function parseMessage (raw: string | Buffer): RawMessage | undefined {
   }
 }
 
+async function parseJsonBody (req: Request): Promise<unknown> {
+  try {
+    const body = await req.json()
+
+    return body
+  } catch {
+    throw new BadRequestError('Invalid JSON')
+  }
+}
+
+async function parseJsonBodyAppData (req: Request): Promise<unknown> {
+  const contentType = req.headers.get('content-type')
+  const usingJsonBody = contentType?.startsWith('application/json')
+
+  if (!usingJsonBody) {
+    return null
+  }
+
+  const rawBody = await parseJsonBody(req)
+  const appData = (rawBody as Record<string, unknown> | null)?.data ?? null
+
+  return appData
+}
+
 function sweepInactiveSessions (state: SocketState): void {
   for (const [key, session] of state.inactiveSessions) {
     if (!isSessionActive(session)) {
@@ -338,6 +361,7 @@ function buildParams (
 function buildRequest (
   params: Record<string, string>,
   message: RequestMessage,
+  activeSessions: ActiveSessions,
 ): WebSocketRequest {
   const { id, clientId, method, route } = message
   const headers = new Headers(message.headers ?? {})
@@ -353,6 +377,9 @@ function buildRequest (
     params,
     query,
     json,
+    ws: {
+      active: activeSessions,
+    },
   }
 }
 
@@ -364,13 +391,12 @@ async function buildOutgoingMessage (
   const text = await response.text()
   const contentType = response.headers.get('content-type') ?? ''
   const usingJson = contentType.includes('application/json')
-  const body = usingJson ? JSON.parse(text) : text
 
   return createMessage(clientId, MessageType.Response, {
     id,
     status: response.status,
     headers: response.headers,
-    body,
+    body: usingJson ? JSON.parse(text) : text,
   })
 }
 
@@ -393,9 +419,19 @@ function buildErrorMessage (
   })
 }
 
+function getCloseReason (ws: SocketConnection, code: number): CloseReason {
+  if (ws.data.reaped) {
+    return CloseReason.Reaped
+  } else if (code === CloseCode.Ok) {
+    return CloseReason.Ok
+  }
+
+  return CloseReason.Dropped
+}
+
 export function buildSocketState (opts: AppOptions = {}): SocketState {
   return {
-    disconnectThreshold: opts.ws?.disconnectThreshold ?? 120_000,
+    dropThreshold: opts.ws?.dropThreshold ?? 120_000,
     heartbeatInterval: opts.ws?.heartbeatInterval ?? 30_000,
     maxTickets: opts.ws?.maxTickets ?? 100_000,
     reclaimTtl: opts.ws?.reclaimTtl ?? 300_000,
@@ -403,6 +439,8 @@ export function buildSocketState (opts: AppOptions = {}): SocketState {
     tickets: new Map(),
     activeSessions: new Map(),
     inactiveSessions: new Map(),
+    onOpen: opts.ws?.onOpen ?? null,
+    onClose: opts.ws?.onClose ?? null,
   }
 }
 
@@ -411,14 +449,16 @@ export function buildSocketServer (
   state: SocketState,
 ): WebSocketHandler<SocketData> {
   const {
-    disconnectThreshold,
+    dropThreshold,
     heartbeatInterval,
     reclaimTtl,
     activeSessions,
     inactiveSessions,
+    onOpen,
+    onClose,
   } = state
 
-  function armReaper (ws: SocketConnection): void {
+  function armReaper (ws: SocketConnection) {
     if (ws.data.reaperHandle) {
       clearTimeout(ws.data.reaperHandle)
     }
@@ -426,8 +466,28 @@ export function buildSocketServer (
     ws.data.reaperHandle = setTimeout(() => {
       ws.data.reaped = true
 
-      ws.close()
-    }, disconnectThreshold)
+      ws.close(CloseCode.Reaped)
+    }, dropThreshold)
+  }
+
+  function invokeOpen (ws: SocketConnection) {
+    if (onOpen) {
+      try {
+        onOpen(ws.data.clientId)
+      } catch (err) {
+        console.error(err)
+      }
+    }
+  }
+
+  function invokeClose (ws: SocketConnection, reason: CloseReason) {
+    if (onClose) {
+      try {
+        onClose(ws.data.clientId, reason)
+      } catch (err) {
+        console.error(err)
+      }
+    }
   }
 
   return {
@@ -465,6 +525,7 @@ export function buildSocketServer (
       )
 
       ws.send(JSON.stringify(welcomeMessage))
+      invokeOpen(ws)
     },
     close (ws: SocketConnection, code: number): void {
       if (ws.data.reaperHandle) {
@@ -472,23 +533,29 @@ export function buildSocketServer (
       }
 
       if (ws.data.superseded) {
+        invokeClose(ws, CloseReason.Superseded)
+
         return
       }
 
-      const existingSession = activeSessions.get(ws.data.clientId)
+      const reason = getCloseReason(ws, code)
+      const exists = activeSessions.get(ws.data.clientId)
 
-      if (!existingSession || existingSession.ws !== ws) {
+      if (!exists || exists.ws !== ws) {
         return
       }
 
       activeSessions.delete(ws.data.clientId)
 
-      if (code !== 1000 || ws.data.reaped) {
+      if (code !== CloseCode.Ok || ws.data.reaped) {
         inactiveSessions.set(ws.data.clientId, {
-          token: existingSession.token,
+          token: exists.token,
           expiresAt: Date.now() + reclaimTtl,
+          app: ws.data.app,
         })
       }
+
+      invokeClose(ws, reason)
     },
     async message (ws: SocketConnection, raw: string | Buffer): Promise<void> {
       const incomingMsg = parseMessage(raw)
@@ -514,7 +581,7 @@ export function buildSocketServer (
         const { id, clientId } = message
         const route = matchRoute(routes, message)
         const params = buildParams(route, message)
-        const req = buildRequest(params, message)
+        const req = buildRequest(params, message, activeSessions)
         const res = await executeMiddlewareChain(req, route.chain)
         const outgoingMsg = await buildOutgoingMessage(id, clientId, res)
 
@@ -539,7 +606,7 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
     inactiveSessions,
   } = state
 
-  function bindTicket (clientId: string): string {
+  function issueTicket (clientId: string, data: unknown): string {
     for (const [key, entry] of tickets) {
       if (entry.expiresAt > Date.now()) {
         break
@@ -552,38 +619,36 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
       throw new ServiceUnavailableError('Unable to issue ticket')
     }
 
-    const ticket = randomTicket()
+    const hash = randomTicketHash()
     const expiresAt = Date.now() + ticketTtl
 
-    tickets.set(ticket, {
+    tickets.set(hash, {
       clientId,
       expiresAt,
+      data,
     })
 
-    return ticket
+    return hash
   }
 
-  function redeemTicket (ticket: string): string | undefined {
-    const entry = ticket ? tickets.get(ticket) : undefined
+  function redeemTicket (hash: string): Ticket | undefined {
+    const entry = hash ? tickets.get(hash) : undefined
 
     if (!entry) {
       return undefined
     }
 
-    tickets.delete(ticket)
+    tickets.delete(hash)
 
-    if (entry.expiresAt <= Date.now()) {
-      return undefined
-    }
+    return entry.expiresAt > Date.now() ? entry : undefined
 
-    return entry.clientId
   }
 
   return [
     {
       method: 'GET',
       path: '/ws',
-      handler (req: Record<string, unknown>, res: unknown): Response {
+      handler (req: Request, res: unknown): AsyncHandlerResult {
         const validReq = validateSchema(req, createSocketValidator)
 
         if (typeof res !== 'object') {
@@ -591,16 +656,18 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
         }
 
         const ctx: UpgradeContext = res ? { ...res } : {}
+        const ticket = redeemTicket(validReq.query.ticket)
+
+        if (!ticket) {
+          throw new NotFoundError()
+        }
 
         ctx.data = ctx.data ?? {}
-        ctx.data.clientId = redeemTicket(validReq.query.ticket)
+        ctx.data.clientId = ticket.clientId
         ctx.data.superseded = false
         ctx.data.reaped = false
         ctx.data.reaperHandle = null
-
-        if (!ctx.data.clientId) {
-          throw new NotFoundError()
-        }
+        ctx.data.app = ticket.data
 
         const useSocket = validReq.server.upgrade(validReq.raw, ctx)
 
@@ -608,20 +675,22 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
           throw new NotFoundError()
         }
 
-        return new Response()
+        return Promise.resolve(new Response())
       },
     },
     {
       method: 'POST',
       path: '/ws',
-      handler (req: Record<string, unknown>, res: unknown): Response {
+      async handler (req: Request, res: unknown): AsyncHandlerResult {
         validateSchema(req, createTicketValidator)
 
         const clientId = crypto.randomUUID()
+        const appData = await parseJsonBodyAppData(req)
+        const ticket = issueTicket(clientId, appData)
 
         return Response.json({
           clientId,
-          ticket: bindTicket(clientId),
+          ticket,
           data: res,
         }, { status: StatusCode.Created })
       },
@@ -629,10 +698,10 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
     {
       method: 'PUT',
       path: '/ws/:clientId',
-      handler (req: Record<string, unknown>, res: unknown): Response {
+      async handler (req: Request, res: unknown): AsyncHandlerResult {
         const validReq = validateSchema(req, updateTicketValidator)
-        const authHeader = validReq.headers.get('authorization')
-        const token = authHeader!.slice('Bearer '.length)
+        const authHeader = validReq.headers.get('authorization')!
+        const token = authHeader.slice('Bearer '.length)
 
         let session: Session | undefined =
           activeSessions.get(validReq.params.clientId)
@@ -655,9 +724,11 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
           throw new UnauthorizedError('Invalid token')
         }
 
+        const appData = 'ws' in session ? session.ws.data.app : session.app
+
         return Response.json({
           clientId: validReq.params.clientId,
-          ticket: bindTicket(validReq.params.clientId),
+          ticket: issueTicket(validReq.params.clientId, appData),
           data: res,
         })
       },
@@ -666,15 +737,11 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
 }
 
 export function buildSocketCommands (state: SocketState): SocketCommands {
-  function sendToClient (
-    clientId: string,
-    event: string,
-    body: unknown,
-  ): void {
+  function sendToClient (clientId: string, event: string, body: unknown) {
     const session = state.activeSessions.get(clientId)
 
     if (!session) {
-      throw new ReferenceError(`No live socket for client: ${clientId}`)
+      throw new ReferenceError(`No active socket for client: ${clientId}`)
     }
 
     const message = createMessage(clientId, MessageType.Notification, {
@@ -690,10 +757,28 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
     send (clientId, event, body) {
       sendToClient(clientId, event, body)
     },
+    sendToGroup (fn, event, body) {
+      for (const [clientId, session] of state.activeSessions) {
+        const allow = fn(clientId, session.ws.data)
+
+        if (allow) {
+          sendToClient(clientId, event, body)
+        }
+      }
+    },
     broadcast (event, body) {
       for (const clientId of state.activeSessions.keys()) {
         sendToClient(clientId, event, body)
       }
     },
+    drop (clientId, code, reason) {
+      const session = state.activeSessions.get(clientId)
+
+      if (!session) {
+        throw new ReferenceError(`No active socket for client: ${clientId}`)
+      }
+
+      session.ws.close(code, reason)
+    },
   }
 }

package/src/utils.ts

@@ -90,7 +90,36 @@ export type FormattedError = {
   message: string
 }
 
-export type NextFn = (data?: unknown) => Response | Promise<Response>
+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 ActiveSession = {
+  token: string
+  ws: SocketConnection
+}
+
+export type InactiveSession = {
+  token: string
+  expiresAt: number
+  app: unknown
+}
+
+export type ActiveSessions = ReadonlyMap<string, ActiveSession>
+export type Session = ActiveSession | InactiveSession
 
 export type BaseRequest = {
   method: HttpMethod
@@ -99,6 +128,9 @@ export type BaseRequest = {
   params: Record<string, string>
   query: Record<string, unknown>
   json: () => Promise<unknown>
+  ws: {
+    active: ActiveSessions
+  }
 }
 
 export type EndpointRequest = BaseRequest & {
@@ -113,18 +145,31 @@ export type WebSocketRequest = BaseRequest & {
 
 export type Request = EndpointRequest | WebSocketRequest
 
-export type Middleware = (
-  req: Request,
-  res: unknown,
-  next: NextFn | null,
-) => unknown
+export const CloseCode = {
+  Ok: 1000,
+  Abnormal: 1006,
+  Reaped: 4999,
+} as const
+
+export type CloseCode = typeof CloseCode[keyof typeof CloseCode]
+
+export const CloseReason = {
+  Ok: 'ok',
+  Dropped: 'dropped',
+  Reaped: 'reaped',
+  Superseded: 'superseded',
+} as const
+
+export type CloseReason = typeof CloseReason[keyof typeof CloseReason]
 
 export type SocketOptions = {
-  disconnectThreshold?: number
+  dropThreshold?: number
   heartbeatInterval?: number
   maxTickets?: number
   reclaimTtl?: number
   ticketTtl?: number
+  onOpen?: (clientId: string) => void
+  onClose?: (clientId: string, reason: CloseReason) => void
 }
 
 export type SocketData = {
@@ -132,6 +177,13 @@ export type SocketData = {
   superseded: boolean
   reaped: boolean
   reaperHandle: ReturnType<typeof setTimeout> | null
+  app: unknown
+}
+
+export type SocketConnection = {
+  data: SocketData
+  send: (data: string) => unknown
+  close: (code?: number, reason?: string) => void
 }
 
 export type Server = BunServer<SocketData>
@@ -174,8 +226,8 @@ export function formatError (
 
 export async function executeMiddlewareChain (
   req: Request,
-  chain: Middleware[],
-): Promise<Response> {
+  chain: MiddlewareChain,
+): AsyncHandlerResult {
   if (!chain.length) {
     throw new RangeError('Middleware chain is empty')
   }
@@ -183,15 +235,14 @@ export async function executeMiddlewareChain (
   const executeMiddleware = async (
     index: number,
     res: unknown,
-  ): Promise<Response> => {
-    const currentMiddleware = chain[index]
-    const isLastMiddleware = index === chain.length - 1
-
-    const next = !isLastMiddleware ?
-      (data?: unknown) => executeMiddleware(index + 1, data)
-      : null
-
-    const result = await currentMiddleware(req, res, next)
+  ): AsyncHandlerResult => {
+    const isLast = index === chain.length - 1
+    const fn = chain[index]
+    const next = (data?: unknown) => executeMiddleware(index + 1, data)
+
+    const result = isLast
+      ? await (fn as Handler)(req, res)
+      : await (fn as Middleware)(req, res, next)
 
     if (result instanceof Response) {
       return result