@mstuercke/api-utils 0.0.48 → 0.0.50

package/dist/ws/server/WsApi.js

@@ -1,4 +1,5 @@
-import { ApiGatewayManagementApiClient, DeleteConnectionCommand, PostToConnectionCommand, } from '@aws-sdk/client-apigatewaymanagementapi';
+import { sendResponse } from './sendResponse';
+import { closeConnection } from './closeConnection';
 export class WsApi {
     requestHandlers = {
         '$connect': () => Promise.resolve(),
@@ -23,19 +24,11 @@ export class WsApi {
         if (!requestHandler)
             throw `No requestHandler found for action ${action}`;
         const endpoint = `https://${domainName}/${stage}`;
-        const ws = new ApiGatewayManagementApiClient({ endpoint });
+        const connection = { endpoint, connectionId };
         await requestHandler(body && JSON.parse(body), {
-            sendResponse: async (response) => {
-                await ws.send(new PostToConnectionCommand({
-                    ConnectionId: connectionId,
-                    Data: JSON.stringify(response),
-                }));
-            },
-            closeConnection: async () => {
-                await ws.send(new DeleteConnectionCommand({ ConnectionId: connectionId }));
-            },
-            connectionId,
-            endpoint,
+            connection,
+            sendResponse: async (response) => await sendResponse(connection, response),
+            closeConnection: async () => await closeConnection(connection),
         });
         return {
             statusCode: 200,

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

@@ -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;IACC,eAAe,GAA4D;QAC1F,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACnC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KACvC,CAAC;IAEF,eAAe,CAIb,KAA4C,EAAE,cAA8D;QAC5G,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;QACpD,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,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc;YACjB,MAAM,sCAAsC,MAAM,EAAE,CAAC;QAEvD,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,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC7C,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;YACD,YAAY;YACZ,QAAQ;SACT,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":"AAEA,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAElD,MAAM,OAAO,KAAK;IACC,eAAe,GAA4D;QAC1F,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACnC,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;KACvC,CAAC;IAEF,eAAe,CAIb,KAA4C,EAAE,cAA8D;QAC5G,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;QACpD,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,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc;YACjB,MAAM,sCAAsC,MAAM,EAAE,CAAC;QAEvD,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,KAAK,EAAE,CAAC;QAClD,MAAM,UAAU,GAAoB,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC;QAC7D,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"}

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

@@ -0,0 +1,2 @@
+import { WsApiConnection } from '../types';
+export declare const closeConnection: ({ endpoint, connectionId }: WsApiConnection) => Promise<void>;

package/dist/ws/server/closeConnection.js

@@ -0,0 +1,12 @@
+import { ApiGatewayManagementApiClient, DeleteConnectionCommand } from '@aws-sdk/client-apigatewaymanagementapi';
+export const closeConnection = async ({ endpoint, connectionId }) => {
+    try {
+        await new ApiGatewayManagementApiClient({ endpoint }).send(new DeleteConnectionCommand({ ConnectionId: connectionId }));
+    }
+    catch (err) {
+        if (err?.name === 'GoneException')
+            return;
+        throw err;
+    }
+};
+//# sourceMappingURL=closeConnection.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"closeConnection.js","sourceRoot":"","sources":["../../../src/ws/server/closeConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAE,uBAAuB,EAAC,MAAM,yCAAyC,CAAC;AAG/G,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAkB,EAAE,EAAE;IACjF,IAAI;QACF,MAAM,IAAI,6BAA6B,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,IAAI,CACpD,IAAI,uBAAuB,CAAC,EAAC,YAAY,EAAE,YAAY,EAAC,CAAC,CAC5D,CAAC;KACH;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAI,GAAG,EAAE,IAAI,KAAK,eAAe;YAC/B,OAAO;QAET,MAAM,GAAG,CAAC;KACX;AACH,CAAC,CAAC"}

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

@@ -1 +1,3 @@
+export * from './closeConnection';
+export * from './sendResponse';
 export * from './WsApi';

package/dist/ws/server/index.js

@@ -1,2 +1,4 @@
+export * from './closeConnection';
+export * from './sendResponse';
 export * from './WsApi';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ws/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ws/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC"}

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

@@ -0,0 +1,3 @@
+import { WsApiConnection } from '../types';
+export type SendResponseResult = 'SUCCESS' | 'CONNECTION_CLOSED';
+export declare const sendResponse: <Response_1 extends object>({ endpoint, connectionId }: WsApiConnection, response: Response_1, ignoreClosedConnection?: boolean) => Promise<SendResponseResult>;

package/dist/ws/server/sendResponse.js

@@ -0,0 +1,16 @@
+import { ApiGatewayManagementApiClient, PostToConnectionCommand } from '@aws-sdk/client-apigatewaymanagementapi';
+export const sendResponse = async ({ endpoint, connectionId }, response, ignoreClosedConnection = true) => {
+    try {
+        await new ApiGatewayManagementApiClient({ endpoint }).send(new PostToConnectionCommand({
+            ConnectionId: connectionId,
+            Data: JSON.stringify(response),
+        }));
+        return 'SUCCESS';
+    }
+    catch (error) {
+        if (ignoreClosedConnection && error?.name === 'GoneException')
+            return 'CONNECTION_CLOSED';
+        throw error;
+    }
+};
+//# sourceMappingURL=sendResponse.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sendResponse.js","sourceRoot":"","sources":["../../../src/ws/server/sendResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAE,uBAAuB,EAAC,MAAM,yCAAyC,CAAC;AAI/G,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAkC,EAAC,QAAQ,EAAE,YAAY,EAAkB,EAAE,QAAkB,EAAE,yBAAkC,IAAI,EAA+B,EAAE;IACvM,IAAI;QACF,MAAM,IAAI,6BAA6B,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,IAAI,CACpD,IAAI,uBAAuB,CAAC;YAC1B,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;SAC/B,CAAC,CACL,CAAC;QACF,OAAO,SAAS,CAAC;KAClB;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,sBAAsB,IAAI,KAAK,EAAE,IAAI,KAAK,eAAe;YAC3D,OAAO,mBAAmB,CAAC;QAE7B,MAAM,KAAK,CAAC;KACb;AACH,CAAC,CAAC"}

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

@@ -0,0 +1,4 @@
+export type WsApiConnection = {
+    endpoint: string;
+    connectionId: string;
+};

package/dist/ws/types/WsApiConnection.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=WsApiConnection.js.map

package/dist/ws/types/WsApiConnection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WsApiConnection.js","sourceRoot":"","sources":["../../../src/ws/types/WsApiConnection.ts"],"names":[],"mappings":""}

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

@@ -1,10 +1,11 @@
 import { WsApiAction, WsApiRequest, WsApiResponse } from './common';
 import { OmitNever } from '../../types/OmitNever';
+import { WsApiConnection } from './WsApiConnection';
+import { SendResponseResult } from '../server';
 export type WsApiRequestHandler<Action extends WsApiAction, Request extends WsApiRequest, Response extends WsApiResponse> = (request: Request & {
     action: Action;
 }, responseActions: OmitNever<{
-    sendResponse: [Response] extends [never] ? never : (response: Response) => Promise<void>;
+    connection: WsApiConnection;
+    sendResponse: [Response] extends [never] ? never : (response: Response) => Promise<SendResponseResult>;
     closeConnection: () => Promise<void>;
-    connectionId: string;
-    endpoint: string;
 }>) => Promise<void>;

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

@@ -1,3 +1,4 @@
 export * from './common';
+export * from './WsApiConnection';
 export * from './WsApiRequestHandler';
 export * from './WsApiRoute';

package/dist/ws/types/index.js

@@ -1,4 +1,5 @@
 export * from './common';
+export * from './WsApiConnection';
 export * from './WsApiRequestHandler';
 export * from './WsApiRoute';
 //# sourceMappingURL=index.js.map

package/dist/ws/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ws/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ws/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC"}

package/package.json

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