serverless-offline 8.4.0 → 8.7.0

package/dist/lambda/handler-runner/docker-runner/DockerContainer.js

@@ -244,7 +244,10 @@ class DockerContainer {
       // Add `host.docker.internal` DNS name to access host from inside the container
       // https://github.com/docker/for-linux/issues/264
       const gatewayIp = await this._getBridgeGatewayIp();
-      dockerArgs.push('--add-host', `host.docker.internal:${gatewayIp}`);
+
+      if (gatewayIp) {
+        dockerArgs.push('--add-host', `host.docker.internal:${gatewayIp}`);
+      }
     }
 
     if (_classPrivateFieldLooseBase(this, _dockerOptions)[_dockerOptions].network) {

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

@@ -58,8 +58,8 @@ const clearModule = (fP, opts) => {
     delete require.cache[filePath];
 
     for (const c of cld) {
-      // Unload any non node_modules children
-      if (!c.filename.match(/node_modules/)) {
+      // Unload any non node_modules and non-binary children
+      if (!c.filename.match(/\/node_modules\//i) && !c.filename.match(/\.node$/i)) {
         clearModule(c.id, { ...options,
           cleanup: false
         });
@@ -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] && !fn.match(/\/node_modules\//i) && !fn.match(/\.node$/i)) {
             delete require.cache[fn];
             cleanup = true;
           }
@@ -92,12 +92,14 @@ var _handlerName = /*#__PURE__*/_classPrivateFieldLooseKey("handlerName");
 
 var _handlerPath = /*#__PURE__*/_classPrivateFieldLooseKey("handlerPath");
 
+var _handlerModuleNesting = /*#__PURE__*/_classPrivateFieldLooseKey("handlerModuleNesting");
+
 var _timeout = /*#__PURE__*/_classPrivateFieldLooseKey("timeout");
 
 var _allowCache = /*#__PURE__*/_classPrivateFieldLooseKey("allowCache");
 
 class InProcessRunner {
-  constructor(functionKey, handlerPath, handlerName, env, timeout, allowCache) {
+  constructor(functionKey, handlerPath, handlerName, handlerModuleNesting, env, timeout, allowCache) {
     Object.defineProperty(this, _env, {
       writable: true,
       value: null
@@ -114,6 +116,10 @@ class InProcessRunner {
       writable: true,
       value: null
     });
+    Object.defineProperty(this, _handlerModuleNesting, {
+      writable: true,
+      value: null
+    });
     Object.defineProperty(this, _timeout, {
       writable: true,
       value: null
@@ -126,6 +132,7 @@ class InProcessRunner {
     _classPrivateFieldLooseBase(this, _functionKey)[_functionKey] = functionKey;
     _classPrivateFieldLooseBase(this, _handlerName)[_handlerName] = handlerName;
     _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath] = handlerPath;
+    _classPrivateFieldLooseBase(this, _handlerModuleNesting)[_handlerModuleNesting] = handlerModuleNesting;
     _classPrivateFieldLooseBase(this, _timeout)[_timeout] = timeout;
     _classPrivateFieldLooseBase(this, _allowCache)[_allowCache] = allowCache;
   } // no-op
@@ -152,9 +159,17 @@ class InProcessRunner {
       });
     }
 
-    const {
-      [_classPrivateFieldLooseBase(this, _handlerName)[_handlerName]]: handler
-    } = await Promise.resolve(`${_classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]}`).then(s => _interopRequireWildcard(require(s)));
+    let handler;
+
+    try {
+      const handlerPathExport = await Promise.resolve(`${_classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]}`).then(s => _interopRequireWildcard(require(s))); // this supports handling of nested handler paths like <pathToFile>/<fileName>.object1.object2.object3.handler
+      // a use case for this, is when the handler is further down the export tree or in nested objects
+      // NOTE: this feature is supported in AWS Lambda
+
+      handler = _classPrivateFieldLooseBase(this, _handlerModuleNesting)[_handlerModuleNesting].reduce((obj, key) => obj[key], handlerPathExport);
+    } catch (error) {
+      throw new Error(`offline: one of the module nesting ${_classPrivateFieldLooseBase(this, _handlerModuleNesting)[_handlerModuleNesting]} for handler ${_classPrivateFieldLooseBase(this, _handlerName)[_handlerName]} is undefined or not exported`);
+    }
 
     if (typeof handler !== 'function') {
       throw new Error(`offline: handler '${_classPrivateFieldLooseBase(this, _handlerName)[_handlerName]}' in ${_classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]} is not a function`);

package/dist/lambda/handler-runner/java-runner/JavaRunner.js

@@ -116,8 +116,7 @@ class JavaRunner {
         data: input,
         function: _classPrivateFieldLooseBase(this, _functionName)[_functionName],
         jsonOutput: true,
-        serverlessOffline: true,
-        allowCache: _classPrivateFieldLooseBase(this, _allowCache)[_allowCache]
+        serverlessOffline: true
       });
       const httpOptions = {
         method: 'POST',

package/dist/lambda/handler-runner/ruby-runner/RubyRunner.js

@@ -138,8 +138,6 @@ class RubyRunner {
       } else {
         console.log(stderr);
       }
-
-      return stderr;
     }
 
     return this._parsePayload(stdout);

package/dist/lambda/handler-runner/worker-thread-runner/WorkerThreadRunner.js

@@ -39,6 +39,7 @@ class WorkerThreadRunner {
       functionKey,
       handlerName,
       handlerPath,
+      handlerModuleNesting,
       timeout
     } = funOptions;
     _classPrivateFieldLooseBase(this, _allowCache)[_allowCache] = allowCache;
@@ -49,6 +50,7 @@ class WorkerThreadRunner {
         functionKey,
         handlerName,
         handlerPath,
+        handlerModuleNesting,
         timeout
       }
     });

package/dist/lambda/handler-runner/worker-thread-runner/workerThreadHelper.js

@@ -10,7 +10,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const {
   functionKey,
   handlerName,
-  handlerPath
+  handlerPath,
+  handlerModuleNesting
 } = _worker_threads.workerData;
 
 _worker_threads.parentPort.on('message', async messageData => {
@@ -22,7 +23,7 @@ _worker_threads.parentPort.on('message', async messageData => {
     allowCache
   } = messageData; // TODO we could probably cache this in the module scope?
 
-  const inProcessRunner = new _index.default(functionKey, handlerPath, handlerName, process.env, timeout, allowCache);
+  const inProcessRunner = new _index.default(functionKey, handlerPath, handlerName, handlerModuleNesting, process.env, timeout, allowCache);
   const result = await inProcessRunner.run(event, context); // TODO check serializeability (contains function, symbol etc)
 
   port.postMessage(result);

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/dist/utils/splitHandlerPathAndName.js

@@ -8,18 +8,18 @@ exports.default = splitHandlerPathAndName;
 // some-folder/src.index => some-folder/src
 function splitHandlerPathAndName(handler) {
   // Split handler into method name and path i.e. handler.run
-  // Support Ruby paths with namespace resolution operators e.g.
+  const prepathDelimiter = handler.lastIndexOf('/');
+  const prepath = handler.substr(0, prepathDelimiter + 1); // include '/' for path
+
+  const postpath = handler.substr(prepathDelimiter + 1); // Support Ruby paths with namespace resolution operators e.g.
   //  ./src/somefolder/source.LambdaFunctions::Handler.process
   //  prepath: ./src/somefolder/
   //  postpath: source.LambdaFunctions::Handler.process
   //  filename: source
   //  path: ./src/somefolder/source
   //  name: LambdaFunctions::Handler.process
-  if (handler.match(/::/)) {
-    const prepathDelimiter = handler.lastIndexOf('/');
-    const prepath = handler.substr(0, prepathDelimiter + 1); // include '/' for path
 
-    const postpath = handler.substr(prepathDelimiter + 1);
+  if (handler.match(/::/)) {
     const nameDelimiter = postpath.indexOf('.');
     const filename = postpath.substr(0, nameDelimiter);
     const path = prepath + filename;
@@ -30,8 +30,12 @@ function splitHandlerPathAndName(handler) {
   //  name: run
 
 
-  const delimiter = handler.lastIndexOf('.');
-  const path = handler.substr(0, delimiter);
-  const name = handler.substr(delimiter + 1);
-  return [path, name];
+  const [filename, ...moduleNesting] = postpath.split('.');
+  const [name] = moduleNesting.slice(-1);
+  const path = prepath + filename; // module nesting has been added to support when the
+  // handler function is buried deep inside of a module
+  // e.g /src/somefoler/handlers/index.layer1.layer2.handler
+  // AWS supports this feature
+
+  return [path, name, moduleNesting];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "8.4.0",
+  "version": "8.7.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "dist/main.js",
@@ -117,6 +117,7 @@
     "Kiryl Yermakou (https://github.com/rma4ok)",
     "kobanyan (https://github.com/kobanyan)",
     "Leonardo Alifraco (https://github.com/lalifraco-devspark)",
+    "Leonardo Medici (https://github.com/doclm)",
     "Luke Chavers (https://github.com/vmadman)",
     "Manuel Böhm (https://github.com/boehmers)",
     "Marc Campbell (https://github.com/marccampbell)",
@@ -149,6 +150,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 +158,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 +205,7 @@
     "@hapi/boom": "^9.1.4",
     "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.2.1",
-    "aws-sdk": "^2.1065.0",
+    "aws-sdk": "^2.1097.0",
     "boxen": "^5.1.2",
     "chalk": "^4.1.2",
     "cuid": "^2.1.8",
@@ -223,21 +226,20 @@
     "p-queue": "^6.6.2",
     "p-retry": "^4.6.1",
     "please-upgrade-node": "^3.2.0",
-    "portfinder": "^1.0.28",
     "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.6",
+    "@babel/core": "^7.17.8",
     "@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/plugin-transform-modules-commonjs": "^7.17.7",
+    "@babel/register": "^7.17.7",
     "archiver": "^5.3.0",
     "babel-eslint": "^10.1.0",
     "copyfiles": "^2.4.1",
@@ -251,9 +253,9 @@
     "jest": "^26.6.3",
     "lint-staged": "^11.2.6",
     "p-map": "^4.0.0",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.0",
     "rimraf": "^3.0.2",
-    "serverless": "^2.72.2",
+    "serverless": "^2.72.3",
     "standard-version": "^9.3.2"
   },
   "peerDependencies": {

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)