@mstuercke/api-utils 4.1.0 → 4.2.1

package/dist/rest/server/RestApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RestApi.d.ts","sourceRoot":"","sources":["../../../src/rest/server/RestApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,qBAAqB,EAAC,MAAM,YAAY,CAAC;AAEvE,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,yBAAyB,EACzB,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAUlB,MAAM,MAAM,sBAAsB,GAAG,mBAAmB,CACpD,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,yBAAyB,CAC5B,CAAA;AAOD,qBAAa,OAAO;IAClB,OAAO,CAAC,aAAa,CAAgC;IAErD,eAAe,CACX,UAAU,SAAS,cAAc,EACjC,WAAW,SAAS,eAAe,EACnC,cAAc,SAAS,kBAAkB,EACzC,WAAW,SAAS,eAAe,EACnC,YAAY,SAAS,gBAAgB,EACrC,qBAAqB,SAAS,yBAAyB,EACvD,YAAY,EAAE,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,qBAAqB,CAAC;IAK1H,aAAa,CAAC,UAAU,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAwDlI,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,uBAAuB;IAK/B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,kBAAkB;CAc3B"}
+{"version":3,"file":"RestApi.d.ts","sourceRoot":"","sources":["../../../src/rest/server/RestApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,qBAAqB,EAAC,MAAM,YAAY,CAAC;AAGvE,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,yBAAyB,EACzB,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAUlB,MAAM,MAAM,sBAAsB,GAAG,mBAAmB,CACpD,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,eAAe,EACf,gBAAgB,EAChB,yBAAyB,CAC5B,CAAA;AAOD,qBAAa,OAAO;IAClB,OAAO,CAAC,aAAa,CAAgC;IAErD,eAAe,CACX,UAAU,SAAS,cAAc,EACjC,WAAW,SAAS,eAAe,EACnC,cAAc,SAAS,kBAAkB,EACzC,WAAW,SAAS,eAAe,EACnC,YAAY,SAAS,gBAAgB,EACrC,qBAAqB,SAAS,yBAAyB,EACvD,YAAY,EAAE,mBAAmB,CAAC,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,qBAAqB,CAAC;IAK1H,aAAa,CAAC,UAAU,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAwDlI,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,uBAAuB;IAK/B,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,kBAAkB;CAc3B"}

package/dist/rest/server/RestApi.js

@@ -1,3 +1,4 @@
+import { URL } from 'node:url';
 import { match } from 'path-to-regexp';
 const DEFAULT_RESPONSE_HEADERS = {
     'Content-Type': 'application/json; charset=utf-8',

package/dist/rest/server/RestApi.js.map

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

package/dist/rest/server/buildRestApiRouteHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildRestApiRouteHandler.d.ts","sourceRoot":"","sources":["../../../src/rest/server/buildRestApiRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,mBAAmB,EAMnB,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,wBAAwB,smBAanC,CAAC"}
+{"version":3,"file":"buildRestApiRouteHandler.d.ts","sourceRoot":"","sources":["../../../src/rest/server/buildRestApiRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,mBAAmB,EAMnB,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,wBAAwB,0QAQ1B,aAAa,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,qBAAqB,CAAC,kBAC9F,sBAAsB,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,qBAAqB,CAAC,KACjI,oBAAoB,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,qBAAqB,CAG9G,CAAC"}

package/dist/ws/client/useWsApi.d.ts

@@ -1,18 +1,18 @@
-import { WsApiRequest, WsApiResponse, WsApiRoute } from '../types';
-type WsApiConnection<Request extends WsApiRequest> = {
+import { WsApiAction, WsApiRequest, WsApiResponse, WsApiRoute } from '../types';
+type WsApiConnection<Action extends WsApiAction, Request extends WsApiRequest<Action>> = {
     disconnect: () => void;
     sendRequest: (request: Request) => void;
 };
-export type WsApiOptions<Request extends WsApiRequest, Response extends WsApiResponse> = {
-    onConnected?: (connection: WsApiConnection<Request>) => void;
-    onResponse?: (response: Response, connection: WsApiConnection<Request>) => void;
-    onError?: (error: unknown, connection: WsApiConnection<Request>) => void;
+export type WsApiOptions<Action extends WsApiAction, Request extends WsApiRequest<Action>, Response extends WsApiResponse> = {
+    onConnected?: (connection: WsApiConnection<Action, Request>) => void;
+    onResponse?: (response: Response, connection: WsApiConnection<Action, Request>) => void;
+    onError?: (error: unknown, connection: WsApiConnection<Action, Request>) => void;
     onDisconnected?: () => void;
 };
-export declare const useWsApi: <Action extends string, Request_1 extends object, Response_1 extends object>(wsApiUrl: string, route: WsApiRoute<Action, Request_1, Response_1> | undefined) => {
-    connect: (options: WsApiOptions<Request_1, Response_1>) => Promise<void>;
+export declare const useWsApi: <Action extends string, Request extends WsApiRequest<Action>, Response extends object>(wsApiUrl: string, route: WsApiRoute<Action, Request, Response> | undefined) => {
+    connect: (options: WsApiOptions<Action, Request, Response>) => Promise<void>;
     connected: boolean;
-    connection: WsApiConnection<Request_1>;
+    connection: WsApiConnection<Action, Request>;
     error: boolean;
     disconnect: () => void | undefined;
 };

package/dist/ws/client/useWsApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWsApi.d.ts","sourceRoot":"","sources":["../../../src/ws/client/useWsApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,YAAY,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAE9E,KAAK,eAAe,CAAC,OAAO,SAAS,YAAY,IAAI;IACnD,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,YAAY,EAAE,QAAQ,SAAS,aAAa,IAAI;IACvF,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK,IAAI,CAAA;IAC5D,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK,IAAI,CAAA;IAC/E,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK,IAAI,CAAA;IACxE,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;CAC5B,CAAA;AACD,eAAO,MAAM,QAAQ,yFAIT,MAAM;;;;;;CA+DjB,CAAC"}
+{"version":3,"file":"useWsApi.d.ts","sourceRoot":"","sources":["../../../src/ws/client/useWsApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAE9E,KAAK,eAAe,CAChB,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,IACpC;IACF,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,YAAY,CACpB,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,EACpC,QAAQ,SAAS,aAAa,IAAI;IACpC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACpE,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IACvF,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAA;IAChF,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;CAC5B,CAAA;AACD,eAAO,MAAM,QAAQ,mGAIT,MAAM,SAAS,WAAW,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,SAAS;uBAsB9B,aAAa,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;;;;;CAyCpF,CAAC"}

package/dist/ws/client/useWsApi.js

@@ -9,8 +9,8 @@ export const useWsApi = (wsApiUrl, route) => {
         if (!webSocket.current)
             throw 'Not connected';
         webSocket.current.send(JSON.stringify({
-            action: route.action,
             ...request,
+            action: route.action,
         }));
     }, [route]);
     const disconnect = useCallback(() => webSocket.current?.close(), [webSocket]);

package/dist/ws/client/useWsApi.js.map

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

package/dist/ws/server/WsApi.d.ts

@@ -1,9 +1,8 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
-import { WsApiAction, WsApiRequest, WsApiResponse } from '../types';
-import { WsApiRouteHandler } from '../types/WsApiRouteHandler';
+import { WsApiAction, WsApiRequest, WsApiResponse, WsApiRouteHandler } from '../types';
 export declare class WsApi {
     private readonly routeHandlers;
-    addRouteHandler<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse>(routeHandler: WsApiRouteHandler<Action, Request, Response>): this;
+    addRouteHandler<Action extends WsApiAction, Request extends WsApiRequest<Action>, Response extends WsApiResponse>(routeHandler: WsApiRouteHandler<Action, Request, Response>): this;
     handleRequest(event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult>;
 }
 //# sourceMappingURL=WsApi.d.ts.map

package/dist/ws/server/WsApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WsApi.d.ts","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,qBAAqB,EAAC,MAAM,YAAY,CAAC;AACvE,OAAO,EAAC,WAAW,EAAmB,YAAY,EAAuB,aAAa,EAAC,MAAM,UAAU,CAAC;AACxG,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAI7D,qBAAa,KAAK;IAEhB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG5B;IAEF,eAAe,CACX,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,EAC5B,QAAQ,SAAS,aAAa,EAChC,YAAY,EAAE,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;IAKtD,aAAa,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CA6BjF"}
+{"version":3,"file":"WsApi.d.ts","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAE,qBAAqB,EAAC,MAAM,YAAY,CAAC;AACvE,OAAO,EACL,WAAW,EAEX,YAAY,EAEZ,aAAa,EACb,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAIlB,qBAAa,KAAK;IAEhB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG5B;IAEF,eAAe,CACX,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,EACpC,QAAQ,SAAS,aAAa,EAChC,YAAY,EAAE,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;IAKtD,aAAa,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAqCjF"}

package/dist/ws/server/WsApi.js

@@ -12,15 +12,23 @@ export class WsApi {
     }
     async handleRequest(event) {
         const { body } = event;
-        const { connectionId, domainName, stage, routeKey: action } = event.requestContext;
-        if (!action)
-            throw 'No routeKey/action';
+        const { connectionId, domainName, stage, routeKey } = event.requestContext;
+        if (!routeKey)
+            throw 'No routeKey';
         if (!connectionId)
             throw 'No connectionId';
         if (!domainName)
             throw 'No domainName';
-        if (!body && !['$connect', '$disconnect'].includes(action))
-            throw 'No body';
+        let action = routeKey;
+        let request = { action: routeKey };
+        if (routeKey !== '$connect' && routeKey !== '$disconnect') {
+            if (!body)
+                throw 'No body';
+            request = JSON.parse(body);
+            action = request.action;
+            if (!action)
+                throw 'No routeKey/action';
+        }
         const endpoint = `https://${domainName}/${stage}`;
         const connection = { endpoint, connectionId };
         const requestHandler = this.routeHandlers[action];
@@ -28,7 +36,7 @@ export class WsApi {
             await closeConnection(connection);
             throw `No requestHandler found for action ${action}`;
         }
-        await requestHandler(body && JSON.parse(body), {
+        await requestHandler(request, {
             connection,
             sendResponse: async (response) => await sendResponse(connection, response),
             closeConnection: async () => await closeConnection(connection),

package/dist/ws/server/WsApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"WsApi.js","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,KAAK;IAChB,8DAA8D;IAC7C,aAAa,GAA4D;QACxF,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACnC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KACvC,CAAC;IAEF,eAAe,CAIb,YAA0D;QAC1D,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA2B;QAC7C,MAAM,EAAC,IAAI,EAAC,GAAG,KAAK,CAAC;QACrB,MAAM,EAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAC,GAAG,KAAK,CAAC,cAAc,CAAC;QAEjF,IAAI,CAAC,MAAM;YAAE,MAAM,oBAAoB,CAAC;QACxC,IAAI,CAAC,YAAY;YAAE,MAAM,iBAAiB,CAAC;QAC3C,IAAI,CAAC,UAAU;YAAE,MAAM,eAAe,CAAC;QACvC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,MAAM,SAAS,CAAC;QAE5E,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,KAAK,EAAE,CAAC;QAClD,MAAM,UAAU,GAAoB,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;YAClC,MAAM,sCAAsC,MAAM,EAAE,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC7C,UAAU;YACV,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC;YAC1E,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC;SAC/D,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE;SACT,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"WsApi.js","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,MAAM,OAAO,KAAK;IAChB,8DAA8D;IAC7C,aAAa,GAAkE;QAC9F,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACnC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KACvC,CAAC;IAEF,eAAe,CAIb,YAA0D;QAC1D,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,cAAc,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA2B;QAC7C,MAAM,EAAC,IAAI,EAAC,GAAG,KAAK,CAAC;QACrB,MAAM,EAAC,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC,cAAc,CAAC;QAEzE,IAAI,CAAC,QAAQ;YAAE,MAAM,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY;YAAE,MAAM,iBAAiB,CAAC;QAC3C,IAAI,CAAC,UAAU;YAAE,MAAM,eAAe,CAAC;QAEvC,IAAI,MAAM,GAAgB,QAAQ,CAAC;QACnC,IAAI,OAAO,GAA8B,EAAC,MAAM,EAAE,QAAQ,EAAC,CAAC;QAC5D,IAAI,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,aAAa,EAAE,CAAC;YAC1D,IAAI,CAAC,IAAI;gBAAE,MAAM,SAAS,CAAC;YAC3B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA8B,CAAC;YACxD,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YACxB,IAAI,CAAC,MAAM;gBAAE,MAAM,oBAAoB,CAAC;QAC1C,CAAC;QAED,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,KAAK,EAAE,CAAC;QAClD,MAAM,UAAU,GAAoB,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;YAClC,MAAM,sCAAsC,MAAM,EAAE,CAAC;QACvD,CAAC;QAED,MAAM,cAAc,CAAC,OAAO,EAAE;YAC5B,UAAU;YACV,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC;YAC1E,eAAe,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,eAAe,CAAC,UAAU,CAAC;SAC/D,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE;SACT,CAAC;IACJ,CAAC;CACF"}

package/dist/ws/server/buildWsApiRouteHandler.d.ts

@@ -1,4 +1,3 @@
-import { WsApiRequestHandler, WsApiRoute } from '../types';
-import { WsApiRouteHandler } from '../types/WsApiRouteHandler';
-export declare const buildWsApiRouteHandler: <Action extends string, Request_1 extends object, Response_1 extends object>(route: WsApiRoute<Action, Request_1, Response_1>, requestHandler: WsApiRequestHandler<Action, Request_1, Response_1>) => WsApiRouteHandler<Action, Request_1, Response_1>;
+import { WsApiRequest, WsApiRequestHandler, WsApiRoute, WsApiRouteHandler } from '../types';
+export declare const buildWsApiRouteHandler: <Action extends string, Request extends WsApiRequest<Action>, Response extends object>(route: WsApiRoute<Action, Request, Response>, requestHandler: WsApiRequestHandler<Action, Request, Response>) => WsApiRouteHandler<Action, Request, Response>;
 //# sourceMappingURL=buildWsApiRouteHandler.d.ts.map

package/dist/ws/server/buildWsApiRouteHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildWsApiRouteHandler.d.ts","sourceRoot":"","sources":["../../../src/ws/server/buildWsApiRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,mBAAmB,EAAiB,UAAU,EAAC,MAAM,UAAU,CAAC;AACnG,OAAO,EAAC,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAE7D,eAAO,MAAM,sBAAsB,wPAYlC,CAAC"}
+{"version":3,"file":"buildWsApiRouteHandler.d.ts","sourceRoot":"","sources":["../../../src/ws/server/buildWsApiRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,mBAAmB,EAAiB,UAAU,EAAE,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAEtH,eAAO,MAAM,sBAAsB,gGAKxB,WAAW,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,kBAC5B,oBAAoB,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,KAC/D,kBAAkB,MAAM,EAAE,OAAO,EAAE,QAAQ,CAK7C,CAAC"}

package/dist/ws/server/buildWsApiRouteHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildWsApiRouteHandler.js","sourceRoot":"","sources":["../../../src/ws/server/buildWsApiRouteHandler.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAKlC,KAA4C,EAC5C,cAA8D,EAClB,EAAE;IAChD,OAAO;QACL,KAAK;QACL,cAAc;KACf,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"buildWsApiRouteHandler.js","sourceRoot":"","sources":["../../../src/ws/server/buildWsApiRouteHandler.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAKlC,KAA4C,EAC5C,cAA8D,EAClB,EAAE;IAChD,OAAO;QACL,KAAK;QACL,cAAc;KACf,CAAC;AACJ,CAAC,CAAC"}

package/dist/ws/server/sendResponse.d.ts

@@ -1,3 +1,3 @@
 import { WsApiConnection } from '../types';
-export declare const sendResponse: <Response_1 extends object>({ endpoint, connectionId, }: WsApiConnection, response: Response_1) => Promise<void>;
+export declare const sendResponse: <Response extends object>({ endpoint, connectionId, }: WsApiConnection, response: Response) => Promise<void>;
 //# sourceMappingURL=sendResponse.d.ts.map

package/dist/ws/server/sendResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendResponse.d.ts","sourceRoot":"","sources":["../../../src/ws/server/sendResponse.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAgB,MAAM,UAAU,CAAC;AAGxD,eAAO,MAAM,YAAY,2DAKpB,eAAe,2BAAuB,QAAQ,IAAI,CAOtD,CAAC"}
+{"version":3,"file":"sendResponse.d.ts","sourceRoot":"","sources":["../../../src/ws/server/sendResponse.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAgB,MAAM,UAAU,CAAC;AAGxD,eAAO,MAAM,YAAY,yDAKpB,eAAe,YAAY,QAAQ,KAAG,QAAQ,IAAI,CAOtD,CAAC"}

package/dist/ws/types/WsApiRequestHandler.d.ts

@@ -1,7 +1,7 @@
 import { OmitNever } from '../../types/OmitNever';
 import { WsApiConnection } from './WsApiConnection';
 import { WsApiAction, WsApiRequest, WsApiResponse } from './common';
-export type WsApiRequestHandler<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse> = (request: Request & {
+export type WsApiRequestHandler<Action extends WsApiAction, Request extends WsApiRequest<Action>, Response extends WsApiResponse> = (request: Request & {
     action: Action;
 }, responseActions: OmitNever<{
     connection: WsApiConnection;

package/dist/ws/types/WsApiRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WsApiRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/ws/types/WsApiRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAElE,MAAM,MAAM,mBAAmB,CAC3B,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,EAC5B,QAAQ,SAAS,aAAa,IAC9B,CAAC,OAAO,EAAE,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,eAAe,EAAE,SAAS,CAAC;IACrE,UAAU,EAAE,eAAe,CAAA;IAC3B,YAAY,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxF,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACrC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"WsApiRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/ws/types/WsApiRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAElE,MAAM,MAAM,mBAAmB,CAC3B,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,EACpC,QAAQ,SAAS,aAAa,IAC9B,CAAC,OAAO,EAAE,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,eAAe,EAAE,SAAS,CAAC;IACrE,UAAU,EAAE,eAAe,CAAA;IAC3B,YAAY,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IACxF,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACrC,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/ws/types/WsApiRoute.d.ts

@@ -1,5 +1,5 @@
 import { WsApiAction, WsApiRequest, WsApiResponse } from './common';
-export type WsApiRoute<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse> = {
+export type WsApiRoute<Action extends WsApiAction, Request extends WsApiRequest<Action>, Response extends WsApiResponse> = {
     action: Action;
     __types?: {
         Request: Request;

package/dist/ws/types/WsApiRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WsApiRoute.d.ts","sourceRoot":"","sources":["../../../src/ws/types/WsApiRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAElE,MAAM,MAAM,UAAU,CAClB,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,EAC5B,QAAQ,SAAS,aAAa,IAC9B;IACF,MAAM,EAAE,MAAM,CAAA;IAGd,OAAO,CAAC,EAAE;QACR,OAAO,EAAE,OAAO,CAAA;QAChB,QAAQ,EAAE,QAAQ,CAAA;KACnB,CAAC;CACH,CAAC"}
+{"version":3,"file":"WsApiRoute.d.ts","sourceRoot":"","sources":["../../../src/ws/types/WsApiRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAElE,MAAM,MAAM,UAAU,CAClB,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,EACpC,QAAQ,SAAS,aAAa,IAC9B;IACF,MAAM,EAAE,MAAM,CAAA;IAGd,OAAO,CAAC,EAAE;QACR,OAAO,EAAE,OAAO,CAAA;QAChB,QAAQ,EAAE,QAAQ,CAAA;KACnB,CAAC;CACH,CAAC"}

package/dist/ws/types/WsApiRouteHandler.d.ts

@@ -1,7 +1,7 @@
 import { WsApiRequestHandler } from './WsApiRequestHandler';
 import { WsApiRoute } from './WsApiRoute';
 import { WsApiAction, WsApiRequest, WsApiResponse } from './common';
-export type WsApiRouteHandler<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse> = {
+export type WsApiRouteHandler<Action extends WsApiAction, Request extends WsApiRequest<Action>, Response extends WsApiResponse> = {
     route: WsApiRoute<Action, Request, Response>;
     requestHandler: WsApiRequestHandler<Action, Request, Response>;
 };

package/dist/ws/types/WsApiRouteHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WsApiRouteHandler.d.ts","sourceRoot":"","sources":["../../../src/ws/types/WsApiRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAElE,MAAM,MAAM,iBAAiB,CACzB,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,EAC5B,QAAQ,SAAS,aAAa,IAC9B;IACF,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,cAAc,EAAE,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;CAC/D,CAAA"}
+{"version":3,"file":"WsApiRouteHandler.d.ts","sourceRoot":"","sources":["../../../src/ws/types/WsApiRouteHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAC,MAAM,UAAU,CAAC;AAElE,MAAM,MAAM,iBAAiB,CACzB,MAAM,SAAS,WAAW,EAC1B,OAAO,SAAS,YAAY,CAAC,MAAM,CAAC,EACpC,QAAQ,SAAS,aAAa,IAC9B;IACF,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,cAAc,EAAE,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;CAC/D,CAAA"}

package/dist/ws/types/common/WsApiAction.d.ts

@@ -1,2 +1,2 @@
-export type WsApiAction = '$connect' | '$disconnect' | '$default' | string;
+export type WsApiAction = '$connect' | '$disconnect' | string;
 //# sourceMappingURL=WsApiAction.d.ts.map

package/dist/ws/types/common/WsApiAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WsApiAction.d.ts","sourceRoot":"","sources":["../../../../src/ws/types/common/WsApiAction.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,GAAG,UAAU,GAAG,MAAM,CAAA"}
+{"version":3,"file":"WsApiAction.d.ts","sourceRoot":"","sources":["../../../../src/ws/types/common/WsApiAction.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,GAAG,MAAM,CAAA"}

package/dist/ws/types/common/WsApiRequest.d.ts

@@ -1,2 +1,5 @@
-export type WsApiRequest = object;
+import { WsApiAction } from './WsApiAction';
+export type WsApiRequest<Action extends WsApiAction> = {
+    action: Action;
+};
 //# sourceMappingURL=WsApiRequest.d.ts.map

package/dist/ws/types/common/WsApiRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WsApiRequest.d.ts","sourceRoot":"","sources":["../../../../src/ws/types/common/WsApiRequest.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,MAAM,CAAA"}
+{"version":3,"file":"WsApiRequest.d.ts","sourceRoot":"","sources":["../../../../src/ws/types/common/WsApiRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,WAAW,IAAI;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mstuercke/api-utils",
-  "version": "4.1.0",
+  "version": "4.2.1",
   "type": "module",
   "files": [
     "dist/**/*.js",