sleepy-serv 0.23.0 → 0.24.0

package/README.md

@@ -571,10 +571,10 @@ and the server does not accept WebSocket upgrades. Calling `app.ws` or
 
 The `app.ws` object exposes four methods for interacting with connected clients:
 
-- `query(fn)`: return a filtered list of active sessions. The filter function receives `(clientId, data, index)` and returns a boolean. Each entry in the returned array is a `SessionEntry` with `clientId` and `app` (the application context). To list all sessions: `app.ws.query(() => true)`.
-- `send(event, body, fn)`: push a notification to clients matching a filter. The filter function receives `(clientId, data, index)` and returns a boolean. To target one client: `app.ws.send('ping', body, id => id === targetId)`.
+- `query(fn, filter?)`: return a filtered list of sessions. The filter function receives `(session, index)` where `session` is a `SessionEntry` (`{ clientId, type, data }`), and returns a boolean. The optional `filter` parameter controls which sessions are iterated: `'active'` (default), `'inactive'`, or `'all'`. To list all active sessions: `app.ws.query(() => true)`. To include inactive sessions: `app.ws.query(() => true, 'all')`.
+- `send(event, body, fn)`: push a notification to clients matching a filter. The filter function receives `(session, index)` and returns a boolean. To target one client: `app.ws.send('ping', body, s => s.clientId === targetId)`.
 - `broadcast(event, body)`: push a notification to all connected clients.
-- `drop(signal, fn)`: close connections matching a filter. `signal` is a `CloseSignal` (`{ code, reason }`) with `code` validated in the range [4000-4099]. The filter function receives `(clientId, data, index)` and returns a boolean. To drop one client: `app.ws.drop({ code: 4000, reason: 'kicked' }, id => id === targetId)`.
+- `drop(signal, fn)`: close connections matching a filter. `signal` is a `CloseSignal` (`{ code, reason }`) with `code` validated in the range [4000-4099]. The filter function receives `(session, index)` and returns a boolean. To drop one client: `app.ws.drop({ code: 4000, reason: 'kicked' }, s => s.clientId === targetId)`.
 
 The same commands are available inside endpoint handlers via `req.ws`:
 
@@ -582,7 +582,7 @@ The same commands are available inside endpoint handlers via `req.ws`:
 export default function (req) {
   const targetId = req.query.targetId
 
-  req.ws.send('ping', { from: 'handler' }, id => id === targetId)
+  req.ws.send('ping', { from: 'handler' }, s => s.clientId === targetId)
 
   return Response.json({ ok: true })
 }
@@ -594,12 +594,14 @@ This works from both HTTP and WebSocket transports.
 
 `sleepy-serv` exports several runtime constants and types:
 
-- `InternalCloseSignal`: internal close signals: `Ok` (`{ code: 1000, reason: 'ok' }`), `Reaped` (`{ code: 4998, reason: 'reaped' }`), `Superseded` (`{ code: 4999, reason: 'superseded' }`)
+- `ServerCloseSignals`: server close signals: `Ok` (`{ code: 1000, reason: 'ok' }`), `Reaped` (`{ code: 4998, reason: 'reaped' }`), `Superseded` (`{ code: 4999, reason: 'superseded' }`)
 - `CloseSignal`: the type for close signals: `{ code: number, reason: string }`
 - `StatusCode`: the full range of HTTP status codes (1xx through 5xx)
 - `HttpMethod`: HTTP verbs: `Head`, `Get`, `Post`, `Put`, `Patch`, `Delete`
-- `SessionEntry`: the shape returned by `query()`: `{ clientId: string, app: unknown }`
-- `FilterFn`: the filter callback type: `(clientId: string, data: unknown, index: number) => boolean`
+- `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`
 - Error classes for every 4xx and 5xx status (e.g. `NotFoundError`, `UnauthorizedError`, `InternalServerError`)
 - Middleware helpers: `parseJsonBody`, `validateSchemas`, `setValidationFormats`

package/dist/core/index.d.ts

@@ -1,10 +1,33 @@
-import type { RouteConfig, SocketCommands, AppOptions, Server } from './utils';
+import type { HttpMethod, Middleware, MiddlewareChain, Handler, Server } from './utils';
+import type { SocketCommands } from './utils';
+import type { SocketOptions } from './socket';
 export * from './errors';
-export { StatusCode, HttpMethod, InternalCloseSignal, } from './utils';
+export { ServerCloseSignals } from './socket';
+export { StatusCode, HttpMethod, SessionType, SessionFilter, } from './utils';
 export { parseJsonBody, setValidationFormats, validateSchemas, } from './middleware';
-export type { FilterFn, SessionEntry, SocketCommands } from './utils';
-export type { AppOptions, AsyncHandlerResult, BaseRequest, CloseSignal, EndpointRequest, FormattedError, Handler, MetaEntry, Middleware, MiddlewareChain, NextFn, HandlerResult, Request, RouteConfig, RouteDefinition, Server, SocketConnection, SocketOptions, WebSocketRequest, } from './utils';
+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 = {
+    method: HttpMethod;
+    path: string;
+    chain: Handler | MiddlewareChain;
+};
+export type MetaEntry = {
+    path: string;
+    middleware: Middleware[];
+};
+export type RouteConfig = {
+    routes: RouteDefinition[];
+    meta?: MetaEntry[];
+};
+export type AppOptions = {
+    hostname?: string;
+    mountPath?: string;
+    middleware?: Middleware[];
+    ws?: boolean | SocketOptions;
+    onClose?: () => Promise<void> | void;
+};
 type OutputRoutes = Record<string, string[]>;
 type CloseFn = (force?: boolean) => Promise<void>;
 export type App = {

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,EAOV,WAAW,EAEX,cAAc,EAEd,UAAU,EACV,MAAM,EACP,MAAM,SAAS,CAAA;AAOhB,cAAc,UAAU,CAAA;AAExB,OAAO,EACL,UAAU,EACV,UAAU,EACV,mBAAmB,GACpB,MAAM,SAAS,CAAA;AAEhB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAA;AAErB,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAErE,YAAY,EACV,UAAU,EACV,kBAAkB,EAClB,WAAW,EACX,WAAW,EACX,eAAe,EACf,cAAc,EACd,OAAO,EACP,SAAS,EACT,UAAU,EACV,eAAe,EACf,MAAM,EACN,aAAa,EACb,OAAO,EACP,WAAW,EACX,eAAe,EACf,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;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,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"}

package/dist/core/socket.d.ts

@@ -1,11 +1,38 @@
 import type { WebSocketHandler } from 'bun';
-import type { AsyncHandlerResult, CloseSignal, HttpMethod, Request, MiddlewareChain, SocketCommands, SocketData, ActiveSession, InactiveSession, SocketOptions } from './utils';
+import type { AsyncHandlerResult, CloseSignal, HttpMethod, Request, MiddlewareChain, SocketCommands, SocketData } from './utils';
 type SocketHandler = (req: Request, res: unknown) => AsyncHandlerResult;
 type SocketEndpoint = {
     method: HttpMethod;
     path: string;
     handler: SocketHandler;
 };
+export type SocketConnection = {
+    data: SocketData;
+    send: (data: string) => unknown;
+    close: (code?: number, reason?: string) => void;
+};
+export type ActiveSession = {
+    token: string;
+    ws: SocketConnection;
+};
+export type InactiveSession = {
+    token: string;
+    expiresAt: number;
+    data: unknown;
+};
+export type ActiveSessions = ReadonlyMap<string, ActiveSession>;
+export declare const ServerCloseSignals: Record<string, CloseSignal>;
+export type ServerCloseSignals = typeof ServerCloseSignals[keyof typeof ServerCloseSignals];
+export type Session = ActiveSession | InactiveSession;
+export type SocketOptions = {
+    dropThreshold?: number;
+    heartbeatInterval?: number;
+    maxTickets?: number;
+    reclaimTtl?: number;
+    ticketTtl?: number;
+    onOpen?: (clientId: string) => void;
+    onClose?: (clientId: string, signal: CloseSignal) => void;
+};
 export type Ticket = {
     clientId: string;
     expiresAt: number;

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

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/core/socket.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAA;AAE3C,OAAO,KAAK,EACV,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,OAAO,EAEP,eAAe,EACf,cAAc,EAGd,UAAU,EAEV,aAAa,EACb,eAAe,EAEf,aAAa,EACd,MAAM,SAAS,CAAA;AAShB,KAAK,aAAa,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,KAAK,kBAAkB,CAAA;AAYvE,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;AA+QD,wBAAgB,gBAAgB,CAAE,IAAI,GAAE,aAAkB,GAAG,WAAW,CAavE;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,WAAW,EAAE,EACrB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,cAAc,GACvB,gBAAgB,CAAC,UAAU,CAAC,CA8J9B;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,EAAE,CAwIzE;AAED,wBAAgB,2BAA2B,IAAK,cAAc,CAS7D;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,CAwEvE"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/core/socket.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,KAAK,CAAA;AAE3C,OAAO,KAAK,EACV,kBAAkB,EAClB,WAAW,EACX,UAAU,EACV,OAAO,EAEP,eAAe,EACf,cAAc,EACd,UAAU,EAGX,MAAM,SAAS,CAAA;AAShB,KAAK,aAAa,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,KAAK,kBAAkB,CAAA;AAYvE,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,UAAU,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,aAAa,CAAA;CACvB,CAAA;AAqBD,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,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,IAAI,EAAE,OAAO,CAAA;CACd,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;AAE/D,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAajD,CAAA;AAEV,MAAM,MAAM,kBAAkB,GAC5B,OAAO,kBAAkB,CAAC,MAAM,OAAO,kBAAkB,CAAC,CAAA;AAE5D,MAAM,MAAM,OAAO,GAAG,aAAa,GAAG,eAAe,CAAA;AAErD,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,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;AA+QD,wBAAgB,gBAAgB,CAAE,IAAI,GAAE,aAAkB,GAAG,WAAW,CAavE;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,WAAW,EAAE,EACrB,KAAK,EAAE,WAAW,EAClB,QAAQ,EAAE,cAAc,GACvB,gBAAgB,CAAC,UAAU,CAAC,CA8J9B;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,EAAE,CAwIzE;AAED,wBAAgB,2BAA2B,IAAK,cAAc,CAS7D;AAED,wBAAgB,mBAAmB,CAAE,KAAK,EAAE,WAAW,GAAG,cAAc,CAoHvE"}

package/dist/core/utils.d.ts

@@ -1,5 +1,6 @@
 import type { ErrorObject } from 'ajv';
 import type { BunRequest, Server as BunServer } from 'bun';
+export type TimeoutHandle = ReturnType<typeof setTimeout>;
 export declare const HttpMethod: {
     readonly Head: "HEAD";
     readonly Get: "GET";
@@ -85,27 +86,39 @@ 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 CloseSignal = {
+    code: number;
+    reason: string;
+};
+export type SocketData = {
+    clientId: string;
+    superseded: boolean;
+    reaped: boolean;
+    reaperHandle: TimeoutHandle | null;
+    data: unknown;
+};
+export declare const SessionType: {
+    readonly Active: "active";
+    readonly Inactive: "inactive";
 };
-export type InactiveSession = {
-    token: string;
-    expiresAt: number;
-    app: unknown;
+export type SessionType = typeof SessionType[keyof typeof SessionType];
+export declare const SessionFilter: {
+    readonly Active: "active";
+    readonly Inactive: "inactive";
+    readonly All: "all";
 };
-export type ActiveSessions = ReadonlyMap<string, ActiveSession>;
-export type Session = ActiveSession | InactiveSession;
+export type SessionFilter = typeof SessionFilter[keyof typeof SessionFilter];
 export type SessionEntry = {
     clientId: string;
-    app: unknown;
+    type: SessionType;
+    data: unknown;
 };
-export type FilterFn = (clientId: string, data: unknown, index: number) => boolean;
+export type FilterFn = (session: SessionEntry, index: number) => boolean;
 export type SocketCommands = {
     broadcast: (event: string, body: unknown) => void;
     send: (event: string, body: unknown, fn: FilterFn) => void;
     drop: (signal: CloseSignal, fn: FilterFn) => void;
-    query: (fn: FilterFn) => SessionEntry[];
+    query: (fn: FilterFn, filter?: SessionFilter) => SessionEntry[];
 };
 export type BaseRequest = {
     method: HttpMethod;
@@ -125,66 +138,7 @@ export type WebSocketRequest = BaseRequest & {
     clientId: string;
 };
 export type Request = EndpointRequest | WebSocketRequest;
-export type CloseSignal = {
-    code: number;
-    reason: string;
-};
-export declare const InternalCloseSignal: {
-    readonly Ok: {
-        readonly code: 1000;
-        readonly reason: "ok";
-    };
-    readonly Reaped: {
-        readonly code: 4998;
-        readonly reason: "reaped";
-    };
-    readonly Superseded: {
-        readonly code: 4999;
-        readonly reason: "superseded";
-    };
-};
-export type SocketOptions = {
-    dropThreshold?: number;
-    heartbeatInterval?: number;
-    maxTickets?: number;
-    reclaimTtl?: number;
-    ticketTtl?: number;
-    onOpen?: (clientId: string) => void;
-    onClose?: (clientId: string, signal: CloseSignal) => 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 RouteDefinition = {
-    method: HttpMethod;
-    path: string;
-    chain: Handler | MiddlewareChain;
-};
-export type MetaEntry = {
-    path: string;
-    middleware: Middleware[];
-};
-export type RouteConfig = {
-    routes: RouteDefinition[];
-    meta?: MetaEntry[];
-};
-export type AppOptions = {
-    hostname?: string;
-    mountPath?: string;
-    middleware?: Middleware[];
-    ws?: boolean | SocketOptions;
-    onClose?: () => Promise<void> | void;
-};
 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;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/core/utils.ts"],"names":[],"mappings":"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"}
+{"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 { App, AppOptions } from './core';
+import type { AppOptions, App } from './core';
 export declare function createApp(port: number, opts?: AppOptions): App;
 //# 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,GAAG,EAAE,UAAU,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,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,UAAU,GAChB,GAAG,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.23.0",
+  "version": "0.24.0",
   "type": "module",
   "bin": {
     "sleepy": "./src/cli/index.ts"

package/src/core/index.ts

@@ -31,26 +31,28 @@ import type {
   Middleware,
   MiddlewareChain,
   EndpointRequest,
-  MetaEntry,
-  RouteConfig,
-  RouteDefinition,
-  SocketCommands,
-  SocketOptions,
-  AppOptions,
+  Handler,
   Server,
 } from './utils'
 
 import type {
+  SocketCommands,
+} from './utils'
+
+import type {
+  SocketOptions,
   SocketRoute,
   SocketState,
 } from './socket'
 
 export * from './errors'
+export { ServerCloseSignals } from './socket'
 
 export {
   StatusCode,
   HttpMethod,
-  InternalCloseSignal,
+  SessionType,
+  SessionFilter,
 } from './utils'
 
 export {
@@ -59,27 +61,31 @@ export {
   validateSchemas,
 } from './middleware'
 
-export type { FilterFn, SessionEntry, SocketCommands } from './utils'
+export type {
+  ActiveSession,
+  ActiveSessions,
+  InactiveSession,
+  SocketConnection,
+  SocketOptions,
+} from './socket'
 
 export type {
-  AppOptions,
   AsyncHandlerResult,
   BaseRequest,
   CloseSignal,
   EndpointRequest,
+  FilterFn,
   FormattedError,
   Handler,
-  MetaEntry,
+  HandlerResult,
   Middleware,
   MiddlewareChain,
   NextFn,
-  HandlerResult,
   Request,
-  RouteConfig,
-  RouteDefinition,
   Server,
-  SocketConnection,
-  SocketOptions,
+  SessionEntry,
+  SocketCommands,
+  SocketData,
   WebSocketRequest,
 } from './utils'
 
@@ -89,6 +95,30 @@ export type {
   ValidationSchemas,
 } from './middleware'
 
+export type RouteDefinition = {
+  method: HttpMethod
+  path: string
+  chain: Handler | MiddlewareChain
+}
+
+export type MetaEntry = {
+  path: string
+  middleware: Middleware[]
+}
+
+export type RouteConfig = {
+  routes: RouteDefinition[]
+  meta?: MetaEntry[]
+}
+
+export type AppOptions = {
+  hostname?: string
+  mountPath?: string
+  middleware?: Middleware[]
+  ws?: boolean | SocketOptions
+  onClose?: () => Promise<void> | void
+}
+
 type OutputRoutes = Record<string, string[]>
 type ServerRoutes = Record<string, Record<string, EndpointHandler>>
 

package/src/core/socket.ts

@@ -10,7 +10,8 @@ import {
 
 import {
   StatusCode,
-  InternalCloseSignal,
+  SessionType,
+  SessionFilter,
   toSegments,
   formatError,
   executeMiddlewareChain,
@@ -37,14 +38,9 @@ import type {
   FilterFn,
   MiddlewareChain,
   SocketCommands,
+  SocketData,
   SessionEntry,
   WebSocketRequest,
-  SocketData,
-  SocketConnection,
-  ActiveSession,
-  InactiveSession,
-  Session,
-  SocketOptions,
 } from './utils'
 
 import type {
@@ -91,6 +87,55 @@ type UpdateTicketRequest = {
   }
 }
 
+export type SocketConnection = {
+  data: SocketData
+  send: (data: string) => unknown
+  close: (code?: number, reason?: string) => void
+}
+
+export type ActiveSession = {
+  token: string
+  ws: SocketConnection
+}
+
+export type InactiveSession = {
+  token: string
+  expiresAt: number
+  data: unknown
+}
+
+export type ActiveSessions = ReadonlyMap<string, ActiveSession>
+
+export const ServerCloseSignals: Record<string, CloseSignal> = {
+  Ok: {
+    code: 1000,
+    reason: 'ok',
+  },
+  Reaped: {
+    code: 4998,
+    reason: 'reaped',
+  },
+  Superseded: {
+    code: 4999,
+    reason: 'superseded',
+  },
+} as const
+
+export type ServerCloseSignals =
+  typeof ServerCloseSignals[keyof typeof ServerCloseSignals]
+
+export type Session = ActiveSession | InactiveSession
+
+export type SocketOptions = {
+  dropThreshold?: number
+  heartbeatInterval?: number
+  maxTickets?: number
+  reclaimTtl?: number
+  ticketTtl?: number
+  onOpen?: (clientId: string) => void
+  onClose?: (clientId: string, signal: CloseSignal) => void
+}
+
 export type Ticket = {
   clientId: string
   expiresAt: number
@@ -425,8 +470,8 @@ export function buildSocketServer (
       ws.data.reaped = true
 
       ws.close(
-        InternalCloseSignal.Reaped.code,
-        InternalCloseSignal.Reaped.reason,
+        ServerCloseSignals.Reaped.code,
+        ServerCloseSignals.Reaped.reason,
       )
     }, dropThreshold)
   }
@@ -462,8 +507,8 @@ export function buildSocketServer (
         existingSession.ws.data.superseded = true
 
         existingSession.ws.close(
-          InternalCloseSignal.Superseded.code,
-          InternalCloseSignal.Superseded.reason,
+          ServerCloseSignals.Superseded.code,
+          ServerCloseSignals.Superseded.reason,
         )
       }
 
@@ -515,11 +560,11 @@ export function buildSocketServer (
 
       activeSessions.delete(ws.data.clientId)
 
-      if (code !== InternalCloseSignal.Ok.code || ws.data.reaped) {
+      if (code !== ServerCloseSignals.Ok.code || ws.data.reaped) {
         inactiveSessions.set(ws.data.clientId, {
           token: exists.token,
           expiresAt: Date.now() + reclaimTtl,
-          app: ws.data.app,
+          data: ws.data.data,
         })
       }
 
@@ -635,7 +680,7 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
         ctx.data.superseded = false
         ctx.data.reaped = false
         ctx.data.reaperHandle = null
-        ctx.data.app = ticket.data
+        ctx.data.data = ticket.data
 
         const useSocket = validReq.server.upgrade(validReq.raw, ctx)
 
@@ -691,7 +736,7 @@ export function buildSocketHandlers (state: SocketState): SocketEndpoint[] {
           throw new UnauthorizedError('Invalid token')
         }
 
-        const appData = 'ws' in session ? session.ws.data.app : session.app
+        const appData = 'ws' in session ? session.ws.data.data : session.data
 
         return Response.json({
           clientId: validReq.params.clientId,
@@ -742,7 +787,13 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
 
       /* TODO: look into concurrency at some point */
       for (const [clientId, session] of state.activeSessions) {
-        if (fn(clientId, session.ws.data, index)) {
+        const entry: SessionEntry = {
+          clientId,
+          type: SessionType.Active,
+          data: session.ws.data.data,
+        }
+
+        if (fn(entry, index)) {
           sendToClient(clientId, event, body)
         }
 
@@ -761,28 +812,66 @@ export function buildSocketCommands (state: SocketState): SocketCommands {
       }
 
       for (const [clientId, session] of state.activeSessions) {
-        if (fn(clientId, session.ws.data, index)) {
+        const entry: SessionEntry = {
+          clientId,
+          type: SessionType.Active,
+          data: session.ws.data.data,
+        }
+
+        if (fn(entry, index)) {
           session.ws.close(code, reason)
         }
 
         index += 1
       }
     },
-    query (fn: FilterFn) {
+    query (
+      fn: FilterFn,
+      filter: SessionFilter = SessionFilter.Active,
+    ) {
       const results: SessionEntry[] = []
-      let index = 0
 
-      for (const [clientId, session] of state.activeSessions) {
-        if (fn(clientId, session.ws.data, index)) {
-          results.push({
+      function processSessions (
+        type: SessionType,
+        filter: SessionFilter,
+        startIndex: number,
+      ): number {
+        let index = startIndex
+
+        const sessions = type === SessionType.Active
+          ? state.activeSessions
+          : state.inactiveSessions
+
+        if (type !== filter && filter !== SessionFilter.All) {
+          return index
+        }
+
+        for (const [clientId, session] of sessions) {
+          const data = 'ws' in session ? session.ws.data.data : session.data
+
+          const entry: SessionEntry = {
             clientId,
-            app: session.ws.data.app,
-          })
+            type,
+            data,
+          }
+
+          if (fn(entry, index)) {
+            results.push(entry)
+          }
+
+          index += 1
         }
 
-        index += 1
+        return index
       }
 
+      let index = 0
+
+      sweepInactiveSessions(state)
+
+      index = processSessions(SessionType.Active, filter, index)
+      index = processSessions(SessionType.Inactive, filter, index)
+
       return results
     },
   }

package/src/core/utils.ts

@@ -1,6 +1,8 @@
 import type { ErrorObject } from 'ajv'
 import type { BunRequest, Server as BunServer } from 'bun'
 
+export type TimeoutHandle = ReturnType<typeof setTimeout>
+
 export const HttpMethod = {
   Head: 'HEAD',
   Get: 'GET',
@@ -107,28 +109,42 @@ export type Handler = (
 
 export type MiddlewareChain = (Middleware | Handler)[]
 
-export type ActiveSession = {
-  token: string
-  ws: SocketConnection
+export type CloseSignal = {
+  code: number
+  reason: string
 }
 
-export type InactiveSession = {
-  token: string
-  expiresAt: number
-  app: unknown
+export type SocketData = {
+  clientId: string
+  superseded: boolean
+  reaped: boolean
+  reaperHandle: TimeoutHandle | null
+  data: unknown
 }
 
-export type ActiveSessions = ReadonlyMap<string, ActiveSession>
-export type Session = ActiveSession | InactiveSession
+export const SessionType = {
+  Active: 'active',
+  Inactive: 'inactive',
+} as const
+
+export type SessionType = typeof SessionType[keyof typeof SessionType]
+
+export const SessionFilter = {
+  Active: 'active',
+  Inactive: 'inactive',
+  All: 'all',
+} as const
+
+export type SessionFilter = typeof SessionFilter[keyof typeof SessionFilter]
 
 export type SessionEntry = {
   clientId: string
-  app: unknown
+  type: SessionType
+  data: unknown
 }
 
 export type FilterFn = (
-  clientId: string,
-  data: unknown,
+  session: SessionEntry,
   index: number,
 ) => boolean
 
@@ -136,7 +152,7 @@ export type SocketCommands = {
   broadcast: (event: string, body: unknown) => void
   send: (event: string, body: unknown, fn: FilterFn) => void
   drop: (signal: CloseSignal, fn: FilterFn) => void
-  query: (fn: FilterFn) => SessionEntry[]
+  query: (fn: FilterFn, filter?: SessionFilter) => SessionEntry[]
 }
 
 export type BaseRequest = {
@@ -161,76 +177,8 @@ export type WebSocketRequest = BaseRequest & {
 
 export type Request = EndpointRequest | WebSocketRequest
 
-export type CloseSignal = {
-  code: number
-  reason: string
-}
-
-export const InternalCloseSignal = {
-  Ok: {
-    code: 1000,
-    reason: 'ok',
-  },
-  Reaped: {
-    code: 4998,
-    reason: 'reaped',
-  },
-  Superseded: {
-    code: 4999,
-    reason: 'superseded',
-  },
-} as const
-
-export type SocketOptions = {
-  dropThreshold?: number
-  heartbeatInterval?: number
-  maxTickets?: number
-  reclaimTtl?: number
-  ticketTtl?: number
-  onOpen?: (clientId: string) => void
-  onClose?: (clientId: string, signal: CloseSignal) => 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 RouteDefinition = {
-  method: HttpMethod
-  path: string
-  chain: Handler | MiddlewareChain
-}
-
-export type MetaEntry = {
-  path: string
-  middleware: Middleware[]
-}
-
-export type RouteConfig = {
-  routes: RouteDefinition[]
-  meta?: MetaEntry[]
-}
-
-export type AppOptions = {
-  hostname?: string
-  mountPath?: string
-  middleware?: Middleware[]
-  ws?: boolean | SocketOptions
-  onClose?: () => Promise<void> | void
-}
-
 export function toSegments (pathString: string): string[] {
   const [pathname] = String(pathString).split('?')
   const segments = pathname.split('/')

package/src/index.ts

@@ -1,6 +1,6 @@
 export * from './core'
 
-import type { App, AppOptions } from './core'
+import type { AppOptions, App } from './core'
 
 export declare function createApp (
   port: number,