@mstuercke/api-utils 0.0.24 → 0.0.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ws/client/useWsApi.d.ts +1 -1
- package/dist/ws/client/useWsApi.js +2 -2
- package/dist/ws/client/useWsApi.js.map +1 -1
- package/dist/ws/server/WsApi.d.ts +4 -4
- package/dist/ws/server/WsApi.js +12 -7
- package/dist/ws/server/WsApi.js.map +1 -1
- package/dist/ws/types/WsApiRequestHandler.d.ts +4 -4
- package/dist/ws/types/WsApiRoute.d.ts +3 -3
- package/dist/ws/types/common/WsApiAction.d.ts +1 -0
- package/dist/ws/types/common/WsApiAction.js +2 -0
- package/dist/ws/types/common/WsApiAction.js.map +1 -0
- package/dist/ws/types/common/index.d.ts +1 -1
- package/dist/ws/types/common/index.js +1 -1
- package/dist/ws/types/common/index.js.map +1 -1
- package/package.json +1 -1
- package/dist/ws/types/common/WsApiRouteKey.d.ts +0 -1
- package/dist/ws/types/common/WsApiRouteKey.js +0 -2
- package/dist/ws/types/common/WsApiRouteKey.js.map +0 -1
|
@@ -5,7 +5,7 @@ export type WsApiOptions<Response extends WsApiResponse> = {
|
|
|
5
5
|
onError?: (error: unknown) => void;
|
|
6
6
|
onDisconnected?: () => void;
|
|
7
7
|
};
|
|
8
|
-
export declare const useWsApi: <
|
|
8
|
+
export declare const useWsApi: <Action extends string, Request_1 extends object, Response_1 extends object>(wsApiUrl: string, route: WsApiRoute<Action, Request_1, Response_1>, options: WsApiOptions<Response_1>) => {
|
|
9
9
|
sendRequest: (request: Request_1) => void;
|
|
10
10
|
connected: boolean;
|
|
11
11
|
error: boolean;
|
|
@@ -31,11 +31,11 @@ export const useWsApi = (wsApiUrl, route, options) => {
|
|
|
31
31
|
useEffect(() => {
|
|
32
32
|
if (request && readyState === ReadyState.OPEN) {
|
|
33
33
|
sendMessage(JSON.stringify({
|
|
34
|
-
action: route.
|
|
34
|
+
action: route.action,
|
|
35
35
|
request,
|
|
36
36
|
}));
|
|
37
37
|
}
|
|
38
|
-
}, [request, readyState, route.
|
|
38
|
+
}, [request, readyState, route.action, sendMessage]);
|
|
39
39
|
// response received
|
|
40
40
|
useEffect(() => {
|
|
41
41
|
if (!lastJsonMessage || JSON.stringify(lastJsonMessage) === '{}')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWsApi.js","sourceRoot":"","sources":["../../../src/ws/client/useWsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvD,OAAO,YAAY,EAAE,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAU7D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAKpB,QAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"useWsApi.js","sourceRoot":"","sources":["../../../src/ws/client/useWsApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { WsApiRequest, WsApiRequestHandler, WsApiResponse, WsApiRoute,
|
|
2
|
-
import { APIGatewayProxyEvent } from 'aws-lambda';
|
|
1
|
+
import { WsApiRequest, WsApiRequestHandler, WsApiResponse, WsApiRoute, WsApiAction } from '../types';
|
|
2
|
+
import { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
|
|
3
3
|
export declare class WsApi {
|
|
4
4
|
private requestHandlers;
|
|
5
|
-
addRouteHandler<
|
|
6
|
-
handleRequest(event: APIGatewayProxyEvent):
|
|
5
|
+
addRouteHandler<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse = never>(route: WsApiRoute<Action, Request, Response>, requestHandler: WsApiRequestHandler<Action, Request, Response>): this;
|
|
6
|
+
handleRequest(event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult>;
|
|
7
7
|
}
|
package/dist/ws/server/WsApi.js
CHANGED
|
@@ -2,10 +2,10 @@ import { ApiGatewayManagementApiClient, DeleteConnectionCommand, PostToConnectio
|
|
|
2
2
|
export class WsApi {
|
|
3
3
|
requestHandlers = {};
|
|
4
4
|
addRouteHandler(route, requestHandler) {
|
|
5
|
-
this.requestHandlers[route.
|
|
5
|
+
this.requestHandlers[route.action] = requestHandler;
|
|
6
6
|
return this;
|
|
7
7
|
}
|
|
8
|
-
handleRequest(event) {
|
|
8
|
+
async handleRequest(event) {
|
|
9
9
|
const { body } = event;
|
|
10
10
|
const { connectionId, domainName, stage, routeKey } = event.requestContext;
|
|
11
11
|
if (!connectionId)
|
|
@@ -16,22 +16,27 @@ export class WsApi {
|
|
|
16
16
|
throw 'No routeKey';
|
|
17
17
|
if (!body)
|
|
18
18
|
throw 'No body';
|
|
19
|
-
const
|
|
19
|
+
const action = routeKey;
|
|
20
|
+
const requestHandler = this.requestHandlers[action];
|
|
20
21
|
if (!requestHandler)
|
|
21
|
-
throw `No requestHandler found for
|
|
22
|
+
throw `No requestHandler found for action ${action}`;
|
|
22
23
|
const endpoint = `https://${domainName}/${stage}`;
|
|
23
24
|
const ws = new ApiGatewayManagementApiClient({ endpoint });
|
|
24
|
-
requestHandler(JSON.parse(body), {
|
|
25
|
-
|
|
25
|
+
await requestHandler(JSON.parse(body), {
|
|
26
|
+
sendResponse: async (response) => {
|
|
26
27
|
await ws.send(new PostToConnectionCommand({
|
|
27
28
|
ConnectionId: connectionId,
|
|
28
|
-
Data: JSON.stringify(
|
|
29
|
+
Data: JSON.stringify(response),
|
|
29
30
|
}));
|
|
30
31
|
},
|
|
31
32
|
closeConnection: async () => {
|
|
32
33
|
await ws.send(new DeleteConnectionCommand({ ConnectionId: connectionId }));
|
|
33
34
|
},
|
|
34
35
|
});
|
|
36
|
+
return {
|
|
37
|
+
statusCode: 200,
|
|
38
|
+
body: '',
|
|
39
|
+
};
|
|
35
40
|
}
|
|
36
41
|
}
|
|
37
42
|
//# sourceMappingURL=WsApi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WsApi.js","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,yCAAyC,CAAC;AAEjD,MAAM,OAAO,KAAK;IACR,eAAe,
|
|
1
|
+
{"version":3,"file":"WsApi.js","sourceRoot":"","sources":["../../../src/ws/server/WsApi.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACvB,uBAAuB,GACxB,MAAM,yCAAyC,CAAC;AAEjD,MAAM,OAAO,KAAK;IACR,eAAe,GAA4D,EAAE,CAAC;IAEtF,eAAe,CAIb,KAA4C,EAAE,cAA8D;QAC5G,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;QAEpD,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,YAAY;YAAE,MAAM,iBAAiB,CAAC;QAC3C,IAAI,CAAC,UAAU;YAAE,MAAM,eAAe,CAAC;QACvC,IAAI,CAAC,QAAQ;YAAE,MAAM,aAAa,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,MAAM,SAAS,CAAC;QAE3B,MAAM,MAAM,GAAG,QAAQ,CAAA;QACvB,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc;YAAE,MAAM,sCAAsC,MAAM,EAAE,CAAC;QAE1E,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,KAAK,EAAE,CAAC;QAClD,MAAM,EAAE,GAAG,IAAI,6BAA6B,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC;QACzD,MAAM,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACrC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBAC/B,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC;oBACxC,YAAY,EAAE,YAAY;oBAC1B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;iBAC/B,CAAC,CAAC,CAAC;YACN,CAAC;YACD,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1B,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,EAAC,YAAY,EAAE,YAAY,EAAC,CAAC,CAAC,CAAC;YAC3E,CAAC;SACF,CAAC,CAAC;QAEH,OAAO;YACL,UAAU,EAAE,GAAG;YACf,IAAI,EAAE,EAAE;SACT,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { WsApiRequest, WsApiResponse,
|
|
1
|
+
import { WsApiRequest, WsApiResponse, WsApiAction } from './common';
|
|
2
2
|
import { OmitNever } from '../../types/OmitNever';
|
|
3
|
-
export type WsApiRequestHandler<
|
|
4
|
-
action:
|
|
3
|
+
export type WsApiRequestHandler<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse> = (request: Request & {
|
|
4
|
+
action: Action;
|
|
5
5
|
}, responseActions: OmitNever<{
|
|
6
|
-
|
|
6
|
+
sendResponse: [Response] extends [never] ? never : (response: Response) => void;
|
|
7
7
|
closeConnection: () => void;
|
|
8
8
|
}>) => Promise<void>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { WsApiRequest, WsApiResponse
|
|
2
|
-
export type WsApiRoute<
|
|
3
|
-
|
|
1
|
+
import { WsApiAction, WsApiRequest, WsApiResponse } from './common';
|
|
2
|
+
export type WsApiRoute<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse> = {
|
|
3
|
+
action: Action;
|
|
4
4
|
__types?: {
|
|
5
5
|
Request: Request;
|
|
6
6
|
Response: Response;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type WsApiAction = '$connect' | '$disconnect' | '$default' | string;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WsApiAction.js","sourceRoot":"","sources":["../../../../src/ws/types/common/WsApiAction.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ws/types/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/ws/types/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,eAAe,CAAA"}
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export type WsApiRouteKey = '$connect' | '$disconnect' | '$default' | string;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"WsApiRouteKey.js","sourceRoot":"","sources":["../../../../src/ws/types/common/WsApiRouteKey.ts"],"names":[],"mappings":""}
|