serverless-offline 8.4.0 → 8.5.0

package/README.md

@@ -49,6 +49,7 @@ This plugin is updated by its users, I just do maintenance and ensure that PRs a
 - [Custom authorizers](#custom-authorizers)
 - [Remote authorizers](#remote-authorizers)
 - [JWT authorizers](#jwt-authorizers)
+- [Serverless plugin authorizers](#serverless-plugin-authorizers)
 - [Custom headers](#custom-headers)
 - [Environment variables](#environment-variables)
 - [AWS API Gateway Features](#aws-api-gateway-features)
@@ -360,14 +361,36 @@ defined in the `serverless.yml` can be used to validate the token and scopes in
 the signature of the JWT is not validated with the defined issuer. Since this is a security risk, this feature is
 only enabled with the `--ignoreJWTSignature` flag. Make sure to only set this flag for local development work.
 
+## Serverless plugin authorizers
+
+If your authentication needs are custom and not satisfied by the existing capabilities of the Serverless offline project, you can inject your own authentication strategy. To inject a custom strategy for Lambda invocation, you define a custom variable under `serverless-offline` called `authenticationProvider` in the serverless.yml file. The value of the custom variable will be used to `require(your authenticationProvider value)` where the location is expected to return a function with the following signature.
+
+```js
+module.exports = function (endpoint, functionKey, method, path) {
+  return {
+    name: 'your strategy name',
+    scheme: 'your scheme name',
+
+    getAuthenticateFunction: () => ({
+      async authenticate(request, h) {
+        // your implementation
+      },
+    }),
+  }
+}
+```
+
+A working example of injecting a custom authorization provider can be found in the projects integration tests under the folder `custom-authentication`.
+
 ## Custom headers
 
 You are able to use some custom headers in your request to gain more control over the requestContext object.
 
-| Header                          | Event key                                                   |
-| ------------------------------- | ----------------------------------------------------------- |
-| cognito-identity-id             | event.requestContext.identity.cognitoIdentityId             |
-| cognito-authentication-provider | event.requestContext.identity.cognitoAuthenticationProvider |
+| Header                          | Event key                                                   | Example                                                                           |
+| ------------------------------- | ----------------------------------------------------------- | --------------------------------------------------------------------------------- |
+| cognito-identity-id             | event.requestContext.identity.cognitoIdentityId             |                                                                                   |
+| cognito-authentication-provider | event.requestContext.identity.cognitoAuthenticationProvider |                                                                                   |
+| sls-offline-authorizer-override | event.requestContext.authorizer                             | { "iam": {"cognitoUser": { "amr": ["unauthenticated"], "identityId": "abc123" }}} |
 
 By doing this you are now able to change those values using a custom header. This can help you with easier authentication or retrieving the userId from a `cognitoAuthenticationProvider` value.
 
@@ -744,6 +767,10 @@ We try to follow [Airbnb's JavaScript Style Guide](https://github.com/airbnb/jav
 | :------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------: |
 |                                             [lteacher](https://github.com/lteacher)                                              |                                             [martinmicunda](https://github.com/martinmicunda)                                              |                                             [nori3tsu](https://github.com/nori3tsu)                                             |                                             [ppasmanik](https://github.com/ppasmanik)                                              |                                             [ryanzyy](https://github.com/ryanzyy)                                              |
 
-| [<img alt="m0ppers" src="https://avatars3.githubusercontent.com/u/819421?v=4&s=117" width="117">](https://github.com/m0ppers) | [<img alt="footballencarta" src="https://avatars0.githubusercontent.com/u/1312258?v=4&s=117" width="117">](https://github.com/footballencarta) | [<img alt="bryanvaz" src="https://avatars0.githubusercontent.com/u/9157498?v=4&s=117" width="117">](https://github.com/bryanvaz) | [<img alt="njyjn" src="https://avatars.githubusercontent.com/u/10694375?v=4&s=117" width="117">](https://github.com/njyjn) |
+| [<img alt="m0ppers" src="https://avatars3.githubusercontent.com/u/819421?v=4&s=117" width="117">](https://github.com/m0ppers) | [<img alt="footballencarta" src="https://avatars0.githubusercontent.com/u/1312258?v=4&s=117" width="117">](https://github.com/footballencarta) | [<img alt="bryanvaz" src="https://avatars0.githubusercontent.com/u/9157498?v=4&s=117" width="117">](https://github.com/bryanvaz) | [<img alt="njyjn" src="https://avatars.githubusercontent.com/u/10694375?v=4&s=117" width="117">](https://github.com/njyjn) |                                       |
 | :---------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------: | ------------------------------------- |
 |                                             [m0ppers](https://github.com/m0ppers)                                             |                                             [footballencarta](https://github.com/footballencarta)                                              |                                             [bryanvaz](https://github.com/bryanvaz)                                              |                                             [njyjn](https://github.com/njyjn)                                              | [kdybicz](https://github.com/kdybicz) |
+
+| [<img alt="ericctsf" src="https://avatars.githubusercontent.com/u/42775388?s=400&v=4" width="117">](https://github.com/ericctsf) |     |     |     |     |
+| :------------------------------------------------------------------------------------------------------------------------------: | :-: | :-: | :-: | :-: |
+|                                              [ericctsf](https://github.com/erictsf)                                              |     |     |     |     |

package/dist/events/http/HttpServer.js

@@ -9,12 +9,14 @@ var _buffer = require("buffer");
 
 var _fs = require("fs");
 
-var _path = require("path");
+var pathUtils = _interopRequireWildcard(require("path"));
 
 var _h2o = _interopRequireDefault(require("@hapi/h2o2"));
 
 var _hapi = require("@hapi/hapi");
 
+var _module = require("module");
+
 var _authFunctionNameExtractor = _interopRequireDefault(require("./authFunctionNameExtractor.js"));
 
 var _authJWTSettingsExtractor = _interopRequireDefault(require("./authJWTSettingsExtractor.js"));
@@ -39,12 +41,12 @@ var _index2 = require("../../utils/index.js");
 
 var _LambdaProxyIntegrationEventV = _interopRequireDefault(require("./lambda-events/LambdaProxyIntegrationEventV2.js"));
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; }
 
 var id = 0;
@@ -134,8 +136,8 @@ class HttpServer {
 
     if (typeof httpsProtocol === 'string' && httpsProtocol.length > 0) {
       serverOptions.tls = {
-        cert: (0, _fs.readFileSync)((0, _path.resolve)(httpsProtocol, 'cert.pem'), 'ascii'),
-        key: (0, _fs.readFileSync)((0, _path.resolve)(httpsProtocol, 'key.pem'), 'ascii')
+        cert: (0, _fs.readFileSync)((0, pathUtils.resolve)(httpsProtocol, 'cert.pem'), 'ascii'),
+        key: (0, _fs.readFileSync)((0, pathUtils.resolve)(httpsProtocol, 'key.pem'), 'ascii')
       };
     } // Hapijs server creation
 
@@ -428,6 +430,36 @@ class HttpServer {
     return authStrategyName;
   }
 
+  _setAuthorizationStrategy(endpoint, functionKey, method, path) {
+    var _customizations$offli;
+
+    /*
+     *  The authentication strategy can be provided outside of this project
+     *  by injecting the provider through a custom variable in the serverless.yml.
+     *
+     *  see the example in the tests for more details
+     *    /tests/integration/custom-authentication
+     */
+    const customizations = _classPrivateFieldLooseBase(this, _serverless)[_serverless].service.custom;
+
+    if (customizations && (_customizations$offli = customizations.offline) !== null && _customizations$offli !== void 0 && _customizations$offli.customAuthenticationProvider) {
+      const root = pathUtils.resolve(_classPrivateFieldLooseBase(this, _serverless)[_serverless].serviceDir, 'require-resolver');
+      const customRequire = (0, _module.createRequire)(root);
+      const provider = customRequire(customizations.offline.customAuthenticationProvider);
+      const strategy = provider(endpoint, functionKey, method, path);
+
+      _classPrivateFieldLooseBase(this, _server)[_server].auth.scheme(strategy.scheme, strategy.getAuthenticateFunction);
+
+      _classPrivateFieldLooseBase(this, _server)[_server].auth.strategy(strategy.name, strategy.scheme);
+
+      return strategy.name;
+    } // If the endpoint has an authorization function, create an authStrategy for the route
+
+
+    const authStrategyName = _classPrivateFieldLooseBase(this, _options)[_options].noAuth ? null : this._configureJWTAuthorization(endpoint, functionKey, method, path) || this._configureAuthorization(endpoint, functionKey, method, path);
+    return authStrategyName;
+  }
+
   createRoutes(functionKey, httpEvent, handler) {
     const [handlerPath] = (0, _index2.splitHandlerPathAndName)(handler);
     let method;
@@ -455,7 +487,7 @@ class HttpServer {
       hapiPath = (0, _index2.generateHapiPath)(path, _classPrivateFieldLooseBase(this, _options)[_options], _classPrivateFieldLooseBase(this, _serverless)[_serverless]);
     }
 
-    const endpoint = new _Endpoint.default((0, _path.join)(_classPrivateFieldLooseBase(this, _serverless)[_serverless].config.servicePath, handlerPath), httpEvent, this.v3Utils);
+    const endpoint = new _Endpoint.default((0, pathUtils.join)(_classPrivateFieldLooseBase(this, _serverless)[_serverless].config.servicePath, handlerPath), httpEvent, this.v3Utils);
     const stage = endpoint.isHttpApi ? '$default' : _classPrivateFieldLooseBase(this, _options)[_options].stage || _classPrivateFieldLooseBase(this, _serverless)[_serverless].service.provider.stage;
     const protectedRoutes = [];
 
@@ -477,10 +509,10 @@ class HttpServer {
       server,
       stage: endpoint.isHttpApi || _classPrivateFieldLooseBase(this, _options)[_options].noPrependStageInUrl ? null : stage,
       invokePath: `/2015-03-31/functions/${functionKey}/invocations`
-    }); // If the endpoint has an authorization function, create an authStrategy for the route
+    });
 
+    const authStrategyName = this._setAuthorizationStrategy(endpoint, functionKey, method, path);
 
-    const authStrategyName = _classPrivateFieldLooseBase(this, _options)[_options].noAuth ? null : this._configureJWTAuthorization(endpoint, functionKey, method, path) || this._configureAuthorization(endpoint, functionKey, method, path);
     let cors = null;
 
     if (endpoint.cors) {
@@ -538,6 +570,12 @@ class HttpServer {
       };
     }
 
+    const additionalRequestContext = {};
+
+    if (httpEvent.operationId) {
+      additionalRequestContext.operationName = httpEvent.operationId;
+    }
+
     hapiOptions.tags = ['api'];
 
     const hapiHandler = async (request, h) => {
@@ -682,7 +720,7 @@ class HttpServer {
         }
       } else if (integration === 'AWS_PROXY') {
         const stageVariables = _classPrivateFieldLooseBase(this, _serverless)[_serverless].service.custom ? _classPrivateFieldLooseBase(this, _serverless)[_serverless].service.custom.stageVariables : null;
-        const lambdaProxyIntegrationEvent = endpoint.isHttpApi && endpoint.payload === '2.0' ? new _LambdaProxyIntegrationEventV.default(request, stage, endpoint.routeKey, stageVariables, this.v3Utils) : new _index.LambdaProxyIntegrationEvent(request, stage, requestPath, stageVariables, endpoint.isHttpApi ? endpoint.routeKey : null, this.v3Utils);
+        const lambdaProxyIntegrationEvent = endpoint.isHttpApi && endpoint.payload === '2.0' ? new _LambdaProxyIntegrationEventV.default(request, stage, endpoint.routeKey, stageVariables, additionalRequestContext, this.v3Utils) : new _index.LambdaProxyIntegrationEvent(request, stage, requestPath, stageVariables, endpoint.isHttpApi ? endpoint.routeKey : null, additionalRequestContext, this.v3Utils);
         event = lambdaProxyIntegrationEvent.create();
       }
 

package/dist/events/http/lambda-events/LambdaProxyIntegrationEvent.js

@@ -39,8 +39,10 @@ var _stage = /*#__PURE__*/_classPrivateFieldLooseKey("stage");
 
 var _stageVariables = /*#__PURE__*/_classPrivateFieldLooseKey("stageVariables");
 
+var _additionalRequestContext = /*#__PURE__*/_classPrivateFieldLooseKey("additionalRequestContext");
+
 class LambdaProxyIntegrationEvent {
-  constructor(request, stage, path, stageVariables, routeKey = null, v3Utils) {
+  constructor(request, stage, path, stageVariables, routeKey = null, additionalRequestContext = null, v3Utils) {
     Object.defineProperty(this, _path, {
       writable: true,
       value: null
@@ -61,11 +63,16 @@ class LambdaProxyIntegrationEvent {
       writable: true,
       value: null
     });
+    Object.defineProperty(this, _additionalRequestContext, {
+      writable: true,
+      value: null
+    });
     _classPrivateFieldLooseBase(this, _path)[_path] = path;
     _classPrivateFieldLooseBase(this, _routeKey)[_routeKey] = routeKey;
     _classPrivateFieldLooseBase(this, _request)[_request] = request;
     _classPrivateFieldLooseBase(this, _stage)[_stage] = stage;
     _classPrivateFieldLooseBase(this, _stageVariables)[_stageVariables] = stageVariables;
+    _classPrivateFieldLooseBase(this, _additionalRequestContext)[_additionalRequestContext] = additionalRequestContext || {};
 
     if (v3Utils) {
       this.log = v3Utils.log;
@@ -103,6 +110,18 @@ class LambdaProxyIntegrationEvent {
 
     const headers = (0, _index.parseHeaders)(rawHeaders || []) || {};
 
+    if (headers['sls-offline-authorizer-override']) {
+      try {
+        authAuthorizer = parse(headers['sls-offline-authorizer-override']);
+      } catch (error) {
+        if (this.log) {
+          this.log.error('Could not parse header sls-offline-authorizer-override, make sure it is correct JSON');
+        } else {
+          console.error('Serverless-offline: Could not parse header sls-offline-authorizer-override make sure it is correct JSON.');
+        }
+      }
+    }
+
     if (body) {
       if (typeof body !== 'string') {
         // this.#request.payload is NOT the same as the rawPayload
@@ -205,6 +224,7 @@ class LambdaProxyIntegrationEvent {
           userAgent: _headers['user-agent'] || '',
           userArn: 'offlineContext_userArn'
         },
+        operationName: _classPrivateFieldLooseBase(this, _additionalRequestContext)[_additionalRequestContext].operationName,
         path: _classPrivateFieldLooseBase(this, _path)[_path],
         protocol: 'HTTP/1.1',
         requestId: (0, _index.createUniqueId)(),

package/dist/events/http/lambda-events/LambdaProxyIntegrationEventV2.js

@@ -36,8 +36,10 @@ var _stage = /*#__PURE__*/_classPrivateFieldLooseKey("stage");
 
 var _stageVariables = /*#__PURE__*/_classPrivateFieldLooseKey("stageVariables");
 
+var _additionalRequestContext = /*#__PURE__*/_classPrivateFieldLooseKey("additionalRequestContext");
+
 class LambdaProxyIntegrationEventV2 {
-  constructor(request, stage, routeKey, stageVariables, v3Utils) {
+  constructor(request, stage, routeKey, stageVariables, additionalRequestContext, v3Utils) {
     Object.defineProperty(this, _routeKey, {
       writable: true,
       value: null
@@ -54,10 +56,15 @@ class LambdaProxyIntegrationEventV2 {
       writable: true,
       value: null
     });
+    Object.defineProperty(this, _additionalRequestContext, {
+      writable: true,
+      value: null
+    });
     _classPrivateFieldLooseBase(this, _routeKey)[_routeKey] = routeKey;
     _classPrivateFieldLooseBase(this, _request)[_request] = request;
     _classPrivateFieldLooseBase(this, _stage)[_stage] = stage;
     _classPrivateFieldLooseBase(this, _stageVariables)[_stageVariables] = stageVariables;
+    _classPrivateFieldLooseBase(this, _additionalRequestContext)[_additionalRequestContext] = additionalRequestContext || {};
 
     if (v3Utils) {
       this.log = v3Utils.log;
@@ -92,6 +99,18 @@ class LambdaProxyIntegrationEventV2 {
 
     const headers = (0, _index.parseHeaders)(rawHeaders || []) || {};
 
+    if (headers['sls-offline-authorizer-override']) {
+      try {
+        authAuthorizer = parse(headers['sls-offline-authorizer-override']);
+      } catch (error) {
+        if (this.log) {
+          this.log.error('Could not parse header sls-offline-authorizer-override, make sure it is correct JSON');
+        } else {
+          console.error('Serverless-offline: Could not parse header sls-offline-authorizer-override make sure it is correct JSON.');
+        }
+      }
+    }
+
     if (body) {
       if (typeof body !== 'string') {
         // this.#request.payload is NOT the same as the rawPayload
@@ -177,6 +196,7 @@ class LambdaProxyIntegrationEventV2 {
           sourceIp: remoteAddress,
           userAgent: _headers['user-agent'] || ''
         },
+        operationName: _classPrivateFieldLooseBase(this, _additionalRequestContext)[_additionalRequestContext].operationName,
         requestId: 'offlineContext_resourceId',
         routeKey: _classPrivateFieldLooseBase(this, _routeKey)[_routeKey],
         stage: _classPrivateFieldLooseBase(this, _stage)[_stage],

package/dist/events/websocket/WebSocketClients.js

@@ -160,14 +160,53 @@ class WebSocketClients {
     clearTimeout(timeoutId);
   }
 
-  async _processEvent(websocketClient, connectionId, route, event) {
-    let functionKey = _classPrivateFieldLooseBase(this, _webSocketRoutes)[_webSocketRoutes].get(route);
+  async verifyClient(connectionId, request) {
+    const route = _classPrivateFieldLooseBase(this, _webSocketRoutes)[_webSocketRoutes].get('$connect');
+
+    if (!route) {
+      return {
+        verified: false,
+        statusCode: 502
+      };
+    }
+
+    const connectEvent = new _index.WebSocketConnectEvent(connectionId, request, _classPrivateFieldLooseBase(this, _options)[_options]).create();
+
+    const lambdaFunction = _classPrivateFieldLooseBase(this, _lambda)[_lambda].get(route.functionKey);
+
+    lambdaFunction.setEvent(connectEvent);
+
+    try {
+      const {
+        statusCode
+      } = await lambdaFunction.runHandler();
+      const verified = statusCode >= 200 && statusCode < 300;
+      return {
+        verified,
+        statusCode
+      };
+    } catch (err) {
+      if (this.log) {
+        this.log.debug(`Error in route handler '${route.functionKey}'`, err);
+      } else {
+        (0, _debugLog.default)(`Error in route handler '${route.functionKey}'`, err);
+      }
 
-    if (!functionKey && route !== '$connect' && route !== '$disconnect') {
-      functionKey = _classPrivateFieldLooseBase(this, _webSocketRoutes)[_webSocketRoutes].get('$default');
+      return {
+        verified: false,
+        statusCode: 502
+      };
+    }
+  }
+
+  async _processEvent(websocketClient, connectionId, routeKey, event) {
+    let route = _classPrivateFieldLooseBase(this, _webSocketRoutes)[_webSocketRoutes].get(routeKey);
+
+    if (!route && routeKey !== '$disconnect') {
+      route = _classPrivateFieldLooseBase(this, _webSocketRoutes)[_webSocketRoutes].get('$default');
     }
 
-    if (!functionKey) {
+    if (!route) {
       return;
     }
 
@@ -178,27 +217,30 @@ class WebSocketClients {
           message: 'Internal server error',
           requestId: '1234567890'
         }));
-      } // mimic AWS behaviour (close connection) when the $connect route handler throws
-
-
-      if (route === '$connect') {
-        websocketClient.close();
       }
 
       if (this.log) {
-        this.log.debug(`Error in route handler '${functionKey}'`, err);
+        this.log.debug(`Error in route handler '${route.functionKey}'`, err);
       } else {
-        (0, _debugLog.default)(`Error in route handler '${functionKey}'`, err);
+        (0, _debugLog.default)(`Error in route handler '${route.functionKey}'`, err);
       }
     };
 
-    const lambdaFunction = _classPrivateFieldLooseBase(this, _lambda)[_lambda].get(functionKey);
+    const lambdaFunction = _classPrivateFieldLooseBase(this, _lambda)[_lambda].get(route.functionKey);
 
-    lambdaFunction.setEvent(event); // let result
+    lambdaFunction.setEvent(event);
 
     try {
-      /* result = */
-      await lambdaFunction.runHandler(); // TODO what to do with "result"?
+      const {
+        body
+      } = await lambdaFunction.runHandler();
+
+      if (body && routeKey !== '$disconnect' && route.definition.routeResponseSelectionExpression === '$default') {
+        // https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-route-response-selection-expressions
+        // TODO: Once API gateway supports RouteResponses, this will need to change to support that functionality
+        // For now, send body back to the client
+        this.send(connectionId, body);
+      }
     } catch (err) {
       if (this.log) {
         this.log.error(err);
@@ -230,13 +272,9 @@ class WebSocketClients {
     return route || _index2.DEFAULT_WEBSOCKETS_ROUTE;
   }
 
-  addClient(webSocketClient, request, connectionId) {
+  addClient(webSocketClient, connectionId) {
     this._addWebSocketClient(webSocketClient, connectionId);
 
-    const connectEvent = new _index.WebSocketConnectEvent(connectionId, request, _classPrivateFieldLooseBase(this, _options)[_options]).create();
-
-    this._processEvent(webSocketClient, connectionId, '$connect', connectEvent);
-
     webSocketClient.on('close', () => {
       if (this.log) {
         this.log.debug(`disconnect:${connectionId}`);
@@ -277,14 +315,17 @@ class WebSocketClients {
     });
   }
 
-  addRoute(functionKey, route) {
+  addRoute(functionKey, definition) {
     // set the route name
-    _classPrivateFieldLooseBase(this, _webSocketRoutes)[_webSocketRoutes].set(route, functionKey);
+    _classPrivateFieldLooseBase(this, _webSocketRoutes)[_webSocketRoutes].set(definition.route, {
+      functionKey,
+      definition
+    });
 
     if (this.log) {
-      this.log.notice(`route '${route}'`);
+      this.log.notice(`route '${definition}'`);
     } else {
-      (0, _serverlessLog.default)(`route '${route}'`);
+      (0, _serverlessLog.default)(`route '${definition}'`);
     }
   }
 

package/dist/events/websocket/WebSocketServer.js

@@ -25,6 +25,8 @@ var _options = /*#__PURE__*/_classPrivateFieldLooseKey("options");
 
 var _webSocketClients = /*#__PURE__*/_classPrivateFieldLooseKey("webSocketClients");
 
+var _connectionIds = /*#__PURE__*/_classPrivateFieldLooseKey("connectionIds");
+
 class WebSocketServer {
   constructor(options, webSocketClients, sharedServer, v3Utils) {
     Object.defineProperty(this, _options, {
@@ -35,6 +37,10 @@ class WebSocketServer {
       writable: true,
       value: null
     });
+    Object.defineProperty(this, _connectionIds, {
+      writable: true,
+      value: new Map()
+    });
     _classPrivateFieldLooseBase(this, _options)[_options] = options;
     _classPrivateFieldLooseBase(this, _webSocketClients)[_webSocketClients] = webSocketClients;
 
@@ -46,7 +52,42 @@ class WebSocketServer {
     }
 
     const server = new _ws.Server({
-      server: sharedServer
+      server: sharedServer,
+      verifyClient: ({
+        req
+      }, cb) => {
+        const connectionId = (0, _index.createUniqueId)();
+        const {
+          headers
+        } = req;
+        const key = headers['sec-websocket-key'];
+
+        if (this.log) {
+          this.log.debug(`verifyClient:${key} ${connectionId}`);
+        } else {
+          (0, _debugLog.default)(`verifyClient:${key} ${connectionId}`);
+        } // Use the websocket key to coorelate connection IDs
+
+
+        _classPrivateFieldLooseBase(this, _connectionIds)[_connectionIds][key] = connectionId;
+
+        _classPrivateFieldLooseBase(this, _webSocketClients)[_webSocketClients].verifyClient(connectionId, req).then(({
+          verified,
+          statusCode
+        }) => {
+          try {
+            if (!verified) {
+              cb(false, statusCode);
+              return;
+            }
+
+            cb(true);
+          } catch (e) {
+            (0, _debugLog.default)(`Error verifying`, e);
+            cb(false);
+          }
+        });
+      }
     });
     server.on('connection', (webSocketClient, request) => {
       if (this.log) {
@@ -55,7 +96,12 @@ class WebSocketServer {
         console.log('received connection');
       }
 
-      const connectionId = (0, _index.createUniqueId)();
+      const {
+        headers
+      } = request;
+      const key = headers['sec-websocket-key'];
+
+      const connectionId = _classPrivateFieldLooseBase(this, _connectionIds)[_connectionIds][key];
 
       if (this.log) {
         this.log.debug(`connect:${connectionId}`);
@@ -63,7 +109,7 @@ class WebSocketServer {
         (0, _debugLog.default)(`connect:${connectionId}`);
       }
 
-      _classPrivateFieldLooseBase(this, _webSocketClients)[_webSocketClients].addClient(webSocketClient, request, connectionId);
+      _classPrivateFieldLooseBase(this, _webSocketClients)[_webSocketClients].addClient(webSocketClient, connectionId);
     });
   }
 
@@ -85,7 +131,7 @@ class WebSocketServer {
   stop() {}
 
   addRoute(functionKey, webSocketEvent) {
-    _classPrivateFieldLooseBase(this, _webSocketClients)[_webSocketClients].addRoute(functionKey, webSocketEvent.route); // serverlessLog(`route '${route}'`)
+    _classPrivateFieldLooseBase(this, _webSocketClients)[_webSocketClients].addRoute(functionKey, webSocketEvent); // serverlessLog(`route '${route}'`)
 
   }
 

package/dist/lambda/handler-runner/in-process-runner/InProcessRunner.js

@@ -74,7 +74,7 @@ const clearModule = (fP, opts) => {
         cleanup = false;
 
         for (const fn of Object.keys(require.cache)) {
-          if (require.cache[fn].id !== '.' && require.cache[fn].parent && require.cache[fn].parent.id !== '.' && !require.cache[require.cache[fn].parent.id]) {
+          if (require.cache[fn] && require.cache[fn].id !== '.' && require.cache[fn].parent && require.cache[fn].parent.id !== '.' && !require.cache[require.cache[fn].parent.id]) {
             delete require.cache[fn];
             cleanup = true;
           }

package/dist/lambda/routes/invocations/invocationsRoute.js

@@ -53,7 +53,8 @@ function invocationsRoute(lambda, options, v3Utils) {
       let functionError = null;
 
       if (invokeResults) {
-        resultPayload = invokeResults.Payload || '';
+        const isPayloadDefined = typeof invokeResults.Payload !== 'undefined';
+        resultPayload = isPayloadDefined ? invokeResults.Payload : '';
         statusCode = invokeResults.StatusCode || 200;
         functionError = invokeResults.FunctionError || null;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "dist/main.js",
@@ -149,6 +149,7 @@
     "Stewart Gleadow (https://github.com/sgleadow)",
     "Thales Minussi (https://github.com/tminussi)",
     "Thang Minh Vu (https://github.com/ittus)",
+    "Tom St. Clair (https://github.com/tom-stclair)",
     "Trevor Leach (https://github.com/trevor-leach)",
     "Tuan Minh Huynh (https://github.com/tuanmh)",
     "Utku Turunc (https://github.com/utkuturunc)",
@@ -156,7 +157,8 @@
     "Dima Krutolianov (https://github.com/dimadk24)",
     "Bryan Vaz (https://github.com/bryanvaz)",
     "Justin Ng (https://github.com/njyjn)",
-    "Fernando Alvarez (https://github.com/jefer590)"
+    "Fernando Alvarez (https://github.com/jefer590)",
+    "Eric Carter (https://github.com/ericctsf)"
   ],
   "husky": {
     "hooks": {
@@ -202,7 +204,7 @@
     "@hapi/boom": "^9.1.4",
     "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.2.1",
-    "aws-sdk": "^2.1065.0",
+    "aws-sdk": "^2.1076.0",
     "boxen": "^5.1.2",
     "chalk": "^4.1.2",
     "cuid": "^2.1.8",
@@ -227,17 +229,17 @@
     "semver": "^7.3.5",
     "update-notifier": "^5.1.0",
     "velocityjs": "^2.0.6",
-    "ws": "^7.5.6"
+    "ws": "^7.5.7"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.8",
-    "@babel/core": "^7.16.12",
+    "@babel/cli": "^7.17.3",
+    "@babel/core": "^7.17.5",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-dynamic-import": "^7.16.7",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
     "@babel/plugin-proposal-optional-chaining": "^7.16.7",
     "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-    "@babel/register": "^7.16.9",
+    "@babel/register": "^7.17.0",
     "archiver": "^5.3.0",
     "babel-eslint": "^10.1.0",
     "copyfiles": "^2.4.1",

package/CHANGELOG.md

@@ -1,21 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-## [8.4.0](https://github.com/dherault/serverless-offline/compare/v8.3.1...v8.4.0) (2022-01-28)
-
-### Features
-
-- `go-runner` implementation ([#1320](https://github.com/dherault/serverless-offline/issues/1320)) ([6bb54fd](https://github.com/dherault/serverless-offline/commit/6bb54fdccebd3db61221a9b8f709414876086324))
-- `--disableScheduledEvents` CLI param support ([#1185](https://github.com/dherault/serverless-offline/issues/1185)) ([4503567](https://github.com/dherault/serverless-offline/commit/4503567cdb8fa31ac9df98b667a403b0408f8444))
-
-### Bug Fixes
-
-- Handle custom authorizer 401 in non in-process runners ([#1319](https://github.com/dherault/serverless-offline/issues/1319)) ([8d61bde](https://github.com/dherault/serverless-offline/commit/8d61bde74cdfb37410a5c1952ca608e815eeb1cf))
-- Support `httpApi` payload override on function level ([#1312](https://github.com/dherault/serverless-offline/issues/1312)) ([8db63dd](https://github.com/dherault/serverless-offline/commit/8db63dda6054198775ed3b567dc3c1dbf73eb574))
-
-### [8.3.1](https://github.com/dherault/serverless-offline/compare/v8.3.0...v8.3.1) (2021-11-25)
-
-### Bug Fixes
-
-- Fix handling of modern logs (`Cannot read properties of undefined (reading 'notice')` error)