@middy/ws-response 3.6.1 → 4.0.0-alpha.0

package/README.md

@@ -47,19 +47,23 @@ npm install --save @middy/ws-response
 ```
 
 ## Options
-- `AwsClient` (object) (default `AWS.ApiGatewayManagementApi`): AWS.ApiGatewayManagementApi class constructor (e.g. that has been instrumented with AWS XRay). Must be from `aws-sdk` v2.
-- `awsClientOptions` (object) (default `undefined`): Options to pass to AWS.ApiGatewayManagementApi class constructor.
+
+- `AwsClient` (object) (default `ApiGatewayManagementApiClient`): ApiGatewayManagementApiClient class constructor (i.e. that has been instrumented with AWS XRay). Must be from `@aws-sdk/client-apigatewaymanagementapi`.
+- `awsClientOptions` (object) (default `undefined`): Options to pass to ApiGatewayManagementApiClient class constructor.
 - `awsClientAssumeRole` (string) (default `undefined`): Internal key where secrets are stored. See [@middy/sts](/packages/sts/README.md) on to set this.
 - `awsClientCapture` (function) (default `undefined`): Enable XRay by passing `captureAWSClient` from `aws-xray-sdk` in.
 - `disablePrefetch` (boolean) (default `false`): On cold start requests will trigger early if they can. Setting `awsClientAssumeRole` disables prefetch.
 
 NOTES:
+
 - Lambda is required to have IAM permission for `execute-api:ManageConnections`
 - If `awsClientOptions.endpoint` is not set it will be set using `event.requestContext.{domainName,stage}`
 - If response does not contain `ConnectId`, it will be set from `event.requestContext.connectionId`
 
 ## Sample usage
+
 ### API Gateway
+
 ```javascript
 import middy from '@middy/core'
 import wsResponse from '@middy/ws-response'
@@ -68,11 +72,11 @@ export const handler = middy((event, context) => {
   return 'message'
 })
 
-handler
-  .use(wsResponse())
+handler.use(wsResponse())
 ```
 
 ### General
+
 ```javascript
 import middy from '@middy/core'
 import wsResponse from '@middy/ws-response'
@@ -84,26 +88,23 @@ export const handler = middy((event, context) => {
   }
 })
 
-handler
-  .use(wsResponse({
+handler.use(
+  wsResponse({
     awsClientOptions: {
       endpoint: '...'
     }
-  }))
+  })
+)
 ```
 
-
-
 ## Middy documentation and examples
 
 For more documentation and examples, refers to the main [Middy monorepo on GitHub](https://github.com/middyjs/middy) or [Middy official website](https://middy.js.org).
 
-
 ## Contributing
 
 Everyone is very welcome to contribute to this repository. Feel free to [raise issues](https://github.com/middyjs/middy/issues) or to [submit Pull Requests](https://github.com/middyjs/middy/pulls).
 
-
 ## License
 
 Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 [Luciano Mammino](https://github.com/lmammino), [will Farrell](https://github.com/willfarrell), and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).

package/index.cjs

@@ -6,16 +6,10 @@ Object.defineProperty(module, "exports", {
     enumerable: true,
     get: ()=>_default
 });
-const _apigatewaymanagementapiJs = _interopRequireDefault(require("aws-sdk/clients/apigatewaymanagementapi.js"));
+const _clientApigatewaymanagementapi = require("@aws-sdk/client-apigatewaymanagementapi");
 const _util = require("@middy/util");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-var _response;
 const defaults = {
-    AwsClient: _apigatewaymanagementapiJs.default,
+    AwsClient: _clientApigatewaymanagementapi.ApiGatewayManagementApiClient,
     awsClientOptions: {},
     awsClientAssumeRole: undefined,
     awsClientCapture: undefined,
@@ -40,7 +34,7 @@ const wsResponseMiddleware = (opts)=>{
         if (!client) {
             client = await (0, _util.createClient)(options, request);
         }
-        await client.postToConnection(response).promise();
+        await client.send(new _clientApigatewaymanagementapi.PostToConnectionCommand(response));
         request.response.statusCode = 200;
     };
     return {
@@ -56,7 +50,7 @@ const normalizeWsResponse = (request)=>{
             Data: response
         };
     }
-    (_response = response).ConnectionId ?? (_response.ConnectionId = request.event.requestContext?.connectionId);
+    response.ConnectionId ??= request.event.requestContext?.connectionId;
     request.response = response;
     return response;
 };

package/index.d.ts

@@ -1,11 +1,20 @@
-import ApiGatewayManagementApi from 'aws-sdk/clients/apigatewaymanagementapi'
+import { ApiGatewayManagementApiClient, ApiGatewayManagementApiClientConfig } from '@aws-sdk/client-apigatewaymanagementapi'
 import middy from '@middy/core'
 import { Options as MiddyOptions } from '@middy/util'
 
-interface Options<S = ApiGatewayManagementApi>
-  extends Pick<MiddyOptions<S, ApiGatewayManagementApi.Types.ClientConfiguration>,
-  'AwsClient' | 'awsClientOptions' | 'awsClientAssumeRole' | 'awsClientCapture' | 'disablePrefetch'> {
-}
+interface Options<
+  AwsApiGatewayManagementApiClient = ApiGatewayManagementApiClient
+> extends Pick<
+  MiddyOptions<
+  AwsApiGatewayManagementApiClient,
+  ApiGatewayManagementApiClientConfig
+  >,
+  | 'AwsClient'
+  | 'awsClientOptions'
+  | 'awsClientAssumeRole'
+  | 'awsClientCapture'
+  | 'disablePrefetch'
+  > {}
 
 declare function wsResponse (options?: Options): middy.MiddlewareObj
 

package/index.js

@@ -1,8 +1,7 @@
-var _response;
-import ApiGatewayManagementApi from 'aws-sdk/clients/apigatewaymanagementapi.js';
+import { ApiGatewayManagementApiClient, PostToConnectionCommand } from '@aws-sdk/client-apigatewaymanagementapi';
 import { canPrefetch, createClient, createPrefetchClient } from '@middy/util';
 const defaults = {
-    AwsClient: ApiGatewayManagementApi,
+    AwsClient: ApiGatewayManagementApiClient,
     awsClientOptions: {},
     awsClientAssumeRole: undefined,
     awsClientCapture: undefined,
@@ -27,7 +26,7 @@ const wsResponseMiddleware = (opts)=>{
         if (!client) {
             client = await createClient(options, request);
         }
-        await client.postToConnection(response).promise();
+        await client.send(new PostToConnectionCommand(response));
         request.response.statusCode = 200;
     };
     return {
@@ -43,7 +42,7 @@ const normalizeWsResponse = (request)=>{
             Data: response
         };
     }
-    (_response = response).ConnectionId ?? (_response.ConnectionId = request.event.requestContext?.connectionId);
+    response.ConnectionId ??= request.event.requestContext?.connectionId;
     request.response = response;
     return response;
 };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@middy/ws-response",
-  "version": "3.6.1",
+  "version": "4.0.0-alpha.0",
   "description": "WebSocket response handling middleware for the middy framework",
   "type": "module",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "engineStrict": true,
   "publishConfig": {
@@ -61,13 +61,13 @@
   },
   "homepage": "https://middy.js.org",
   "dependencies": {
-    "@middy/util": "3.6.1"
+    "@middy/util": "4.0.0-alpha.0"
   },
   "devDependencies": {
-    "@middy/core": "3.6.1",
+    "@aws-sdk/client-apigatewaymanagementapi": "^3.186.0",
+    "@middy/core": "4.0.0-alpha.0",
     "@types/aws-lambda": "^8.10.97",
-    "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "31a7f9f8e93a73a8be382b3022b9cfcbc13b2961"
+  "gitHead": "306fb9aa633d5757d11ced3dc192f046ef3c2685"
 }