serverless-offline 8.2.0 → 8.3.0

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

@@ -30,16 +30,16 @@ const {
   has
 } = Reflect;
 
-var _env = _classPrivateFieldLooseKey("env");
+var _env = /*#__PURE__*/_classPrivateFieldLooseKey("env");
 
-var _handlerName = _classPrivateFieldLooseKey("handlerName");
+var _handlerName = /*#__PURE__*/_classPrivateFieldLooseKey("handlerName");
 
-var _handlerPath = _classPrivateFieldLooseKey("handlerPath");
+var _handlerPath = /*#__PURE__*/_classPrivateFieldLooseKey("handlerPath");
 
-var _allowCache = _classPrivateFieldLooseKey("allowCache");
+var _allowCache = /*#__PURE__*/_classPrivateFieldLooseKey("allowCache");
 
 class RubyRunner {
-  constructor(funOptions, env, allowCache) {
+  constructor(funOptions, env, allowCache, v3Utils) {
     Object.defineProperty(this, _env, {
       writable: true,
       value: null
@@ -64,6 +64,13 @@ class RubyRunner {
     _classPrivateFieldLooseBase(this, _handlerName)[_handlerName] = handlerName;
     _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath] = handlerPath;
     _classPrivateFieldLooseBase(this, _allowCache)[_allowCache] = allowCache;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
   } // no-op
   // () => void
 
@@ -84,6 +91,8 @@ class RubyRunner {
 
       if (json && typeof json === 'object' && has(json, '__offline_payload__')) {
         payload = json.__offline_payload__;
+      } else if (this.log) {
+        this.log.notice(item);
       } else {
         console.log(item); // log non-JSON stdout to console (puts, p, logger.info, ...)
       }
@@ -116,16 +125,7 @@ class RubyRunner {
       input // shell: true,
 
     });
-    let result;
-
-    try {
-      result = await ruby;
-    } catch (err) {
-      // TODO
-      console.log(err);
-      throw err;
-    }
-
+    const result = await ruby;
     const {
       stderr,
       stdout
@@ -133,18 +133,16 @@ class RubyRunner {
 
     if (stderr) {
       // TODO
-      console.log(stderr);
+      if (this.log) {
+        this.log.notice(stderr);
+      } else {
+        console.log(stderr);
+      }
+
       return stderr;
     }
 
-    try {
-      return this._parsePayload(stdout);
-    } catch (err) {
-      // TODO
-      console.log('No JSON'); // TODO return or re-throw?
-
-      return err;
-    }
+    return this._parsePayload(stdout);
   }
 
 }

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

@@ -18,9 +18,9 @@ function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + n
 // eslint-disable-line import/no-unresolved
 const workerThreadHelperPath = (0, _path.resolve)(__dirname, './workerThreadHelper.js');
 
-var _workerThread = _classPrivateFieldLooseKey("workerThread");
+var _workerThread = /*#__PURE__*/_classPrivateFieldLooseKey("workerThread");
 
-var _allowCache = _classPrivateFieldLooseKey("allowCache");
+var _allowCache = /*#__PURE__*/_classPrivateFieldLooseKey("allowCache");
 
 class WorkerThreadRunner {
   constructor(funOptions

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

@@ -23,17 +23,7 @@ _worker_threads.parentPort.on('message', async messageData => {
   } = messageData; // TODO we could probably cache this in the module scope?
 
   const inProcessRunner = new _index.default(functionKey, handlerPath, handlerName, process.env, timeout, allowCache);
-  let result;
-
-  try {
-    result = await inProcessRunner.run(event, context);
-  } catch (err) {
-    // this only executes when we have an exception caused by synchronous code
-    // TODO logging
-    console.log(err);
-    throw err;
-  } // TODO check serializeability (contains function, symbol etc)
-
+  const result = await inProcessRunner.run(event, context); // TODO check serializeability (contains function, symbol etc)
 
   port.postMessage(result);
 });

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

@@ -15,15 +15,22 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _lambda = _classPrivateFieldLooseKey("lambda");
+var _lambda = /*#__PURE__*/_classPrivateFieldLooseKey("lambda");
 
 class InvocationsController {
-  constructor(lambda) {
+  constructor(lambda, v3Utils) {
     Object.defineProperty(this, _lambda, {
       writable: true,
       value: null
     });
     _classPrivateFieldLooseBase(this, _lambda)[_lambda] = lambda;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
   }
 
   async invoke(functionName, invocationType, event, clientContext) {
@@ -31,9 +38,14 @@ class InvocationsController {
     const functionNames = _classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames();
 
     if (functionNames.length === 0 || !functionNames.includes(functionName)) {
-      (0, _serverlessLog.default)(`Attempt to invoke function '${functionName}' failed. Function does not exists.`); // Conforms to the actual response from AWS Lambda when invoking a non-existent
+      if (this.log) {
+        this.log.error(`Attempt to invoke function '${functionName}' failed. Function does not exists.`);
+      } else {
+        (0, _serverlessLog.default)(`Attempt to invoke function '${functionName}' failed. Function does not exists.`);
+      } // Conforms to the actual response from AWS Lambda when invoking a non-existent
       // function. Details on the error are provided in the Payload.Message key
 
+
       return {
         FunctionError: 'ResourceNotFoundException',
         Payload: {
@@ -51,11 +63,7 @@ class InvocationsController {
 
     if (invocationType === 'Event') {
       // don't await result!
-      lambdaFunction.runHandler().catch(err => {
-        // TODO handle error
-        console.log(err);
-        throw err;
-      });
+      lambdaFunction.runHandler();
       return {
         Payload: '',
         StatusCode: 202
@@ -68,13 +76,18 @@ class InvocationsController {
       try {
         result = await lambdaFunction.runHandler();
       } catch (err) {
-        (0, _serverlessLog.default)(`Unhandled Lambda Error during invoke of '${functionName}'`);
-        console.log(err); // In most circumstances this is the correct error type/structure.
+        if (this.log) {
+          this.log.error(`Unhandled Lambda Error during invoke of '${functionName}': ${err}`);
+        } else {
+          (0, _serverlessLog.default)(`Unhandled Lambda Error during invoke of '${functionName}'`);
+          console.log(err);
+        } // In most circumstances this is the correct error type/structure.
         // The API returns a StreamingBody with status code of 200
         // that eventually spits out the error and stack trace.
         // When the request is synchronous, aws-sdk should buffer
         // the whole error stream, however this has not been validated.
 
+
         return {
           Payload: {
             errorType: 'Error',
@@ -107,7 +120,13 @@ class InvocationsController {
 
 
     const errMsg = `invocationType: '${invocationType}' not supported by serverless-offline`;
-    console.log(errMsg);
+
+    if (this.log) {
+      this.log.error(errMsg);
+    } else {
+      console.log(errMsg);
+    }
+
     return {
       FunctionError: 'InvalidParameterValueException',
       Payload: {

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

@@ -17,8 +17,8 @@ const {
   parse
 } = JSON; // https://docs.aws.amazon.com/lambda/latest/dg/API_Invoke.html
 
-function invocationsRoute(lambda, options) {
-  const invocationsController = new _InvocationsController.default(lambda);
+function invocationsRoute(lambda, options, v3Utils) {
+  const invocationsController = new _InvocationsController.default(lambda, v3Utils);
   return {
     async handler(request, h) {
       const {

package/dist/lambda/routes/invoke-async/InvokeAsyncController.js

@@ -11,7 +11,7 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _lambda = _classPrivateFieldLooseKey("lambda");
+var _lambda = /*#__PURE__*/_classPrivateFieldLooseKey("lambda");
 
 class InvokeAsyncController {
   constructor(lambda) {
@@ -27,11 +27,7 @@ class InvokeAsyncController {
 
     lambdaFunction.setEvent(event); // don't await result!
 
-    lambdaFunction.runHandler().catch(err => {
-      // TODO handle error
-      console.log(err);
-      throw err;
-    });
+    lambdaFunction.runHandler();
     return {
       StatusCode: 202
     };

package/dist/serverlessLog.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = serverlessLog;
 exports.logLayers = logLayers;
-exports.setLog = setLog;
 exports.logRoutes = logRoutes;
 exports.logWarning = logWarning;
+exports.setLog = setLog;
 
 var _boxen = _interopRequireDefault(require("boxen"));
 

package/dist/utils/getHttpApiCorsConfig.js

@@ -11,7 +11,9 @@ var _serverlessLog = require("../serverlessLog.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function getHttpApiCorsConfig(httpApiCors) {
+function getHttpApiCorsConfig(httpApiCors, {
+  log
+}) {
   if (httpApiCors === true) {
     // default values that should be set by serverless
     // https://www.serverless.com/framework/docs/providers/aws/events/http-api/
@@ -20,12 +22,23 @@ function getHttpApiCorsConfig(httpApiCors) {
       allowedHeaders: ['Content-Type', 'X-Amz-Date', 'Authorization', 'X-Api-Key', 'X-Amz-Security-Token', 'X-Amz-User-Agent'],
       allowedMethods: ['OPTIONS', 'GET', 'POST', 'PUT', 'DELETE', 'PATCH']
     };
-    (0, _debugLog.default)(c);
-    (0, _serverlessLog.logWarning)(c);
+
+    if (log) {
+      log.warning(c);
+    } else {
+      (0, _debugLog.default)(c);
+      (0, _serverlessLog.logWarning)(c);
+    }
+
     return c;
   }
 
-  (0, _debugLog.default)(httpApiCors);
-  (0, _serverlessLog.logWarning)(httpApiCors);
+  if (log) {
+    log.warning(httpApiCors);
+  } else {
+    (0, _debugLog.default)(httpApiCors);
+    (0, _serverlessLog.logWarning)(httpApiCors);
+  }
+
   return httpApiCors;
 }

package/dist/utils/index.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.detectEncoding = detectEncoding;
-exports.nullIfEmpty = nullIfEmpty;
-exports.isPlainObject = isPlainObject;
-exports.toPlainOrEmptyObject = toPlainOrEmptyObject;
+Object.defineProperty(exports, "checkDockerDaemon", {
+  enumerable: true,
+  get: function () {
+    return _checkDockerDaemon.default;
+  }
+});
 Object.defineProperty(exports, "createApiKey", {
   enumerable: true,
   get: function () {
@@ -19,6 +21,7 @@ Object.defineProperty(exports, "createUniqueId", {
     return _createUniqueId.default;
   }
 });
+exports.detectEncoding = detectEncoding;
 Object.defineProperty(exports, "detectExecutable", {
   enumerable: true,
   get: function () {
@@ -31,18 +34,26 @@ Object.defineProperty(exports, "formatToClfTime", {
     return _formatToClfTime.default;
   }
 });
+Object.defineProperty(exports, "generateHapiPath", {
+  enumerable: true,
+  get: function () {
+    return _generateHapiPath.default;
+  }
+});
 Object.defineProperty(exports, "getHttpApiCorsConfig", {
   enumerable: true,
   get: function () {
     return _getHttpApiCorsConfig.default;
   }
 });
+exports.isPlainObject = isPlainObject;
 Object.defineProperty(exports, "jsonPath", {
   enumerable: true,
   get: function () {
     return _jsonPath.default;
   }
 });
+exports.nullIfEmpty = nullIfEmpty;
 Object.defineProperty(exports, "parseHeaders", {
   enumerable: true,
   get: function () {
@@ -79,18 +90,7 @@ Object.defineProperty(exports, "splitHandlerPathAndName", {
     return _splitHandlerPathAndName.default;
   }
 });
-Object.defineProperty(exports, "checkDockerDaemon", {
-  enumerable: true,
-  get: function () {
-    return _checkDockerDaemon.default;
-  }
-});
-Object.defineProperty(exports, "generateHapiPath", {
-  enumerable: true,
-  get: function () {
-    return _generateHapiPath.default;
-  }
-});
+exports.toPlainOrEmptyObject = toPlainOrEmptyObject;
 
 var _createApiKey = _interopRequireDefault(require("./createApiKey.js"));
 

package/package.json

@@ -1,23 +1,28 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "dist/main.js",
   "type": "commonjs",
   "scripts": {
     "build": "rimraf dist && babel src --ignore \"**/__tests__/**/*\" --out-dir dist && copyfiles -u 1 \"src/**/*.{vm,py,rb}\" dist",
-    "lint": "eslint .",
     "format": "eslint . --fix",
+    "lint": "eslint .",
+    "lint:updated": "pipe-git-updated --ext=js -- eslint",
     "list-contributors": "echo 'clone https://github.com/mgechev/github-contributors-list.git first, then run npm install' && cd ../github-contributors-list && node bin/githubcontrib --owner dherault --repo serverless-offline --sortBy contributions --showlogin true --sortOrder desc > contributors.md",
     "prepare": "npm run build",
     "prepublishOnly": "npm run lint && npm run build",
+    "prettier-check": "prettier -c --ignore-path .gitignore \"**/*.{css,html,js,json,md,yaml,yml}\"",
+    "prettier-check:updated": "pipe-git-updated --ext=css --ext=html --ext=js --ext=json --ext=md --ext=yaml --ext=yml -- prettier -c",
+    "prettify": "prettier --write --ignore-path .gitignore \"**/*.{css,html,js,json,md,yaml,yml}\"",
+    "prettify:updated": "pipe-git-updated --ext=css --ext=html --ext=js --ext=json --ext=md --ext=yaml --ext=yml -- prettier --write",
     "test": "npm run build && jest --verbose --silent --runInBand",
-    "test:unit": "jest --verbose --silent --runInBand --config jest.config.units.js",
     "test:cov": "npm run build && jest --coverage --silent --runInBand --collectCoverageFrom=src/**/*.js",
     "test:log": "npm run build && jest --verbose",
     "test:noBuild": "jest --verbose --runInBand --bail",
+    "test:unit": "jest --verbose --silent --runInBand --config jest.config.units.js",
     "test:watch": "SKIP_SETUP=true jest --verbose --watch"
   },
   "repository": {
@@ -151,63 +156,78 @@
     "Justin Ng (https://github.com/njyjn)",
     "Fernando Alvarez (https://github.com/jefer590)"
   ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.js": [
+      "eslint"
+    ],
+    "*.{css,html,js,json,md,yaml,yml}": [
+      "prettier -c"
+    ]
+  },
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@hapi/boom": "^9.1.2",
-    "@hapi/h2o2": "^9.0.2",
-    "@hapi/hapi": "^20.1.3",
-    "aws-sdk": "^2.834.0",
-    "boxen": "^5.0.0",
-    "chalk": "^4.1.0",
+    "@hapi/boom": "^9.1.4",
+    "@hapi/h2o2": "^9.1.0",
+    "@hapi/hapi": "^20.2.1",
+    "aws-sdk": "^2.1032.0",
+    "boxen": "^5.1.2",
+    "chalk": "^4.1.2",
     "cuid": "^2.1.8",
-    "execa": "^5.0.0",
+    "execa": "^5.1.1",
     "extend": "^3.0.2",
     "fs-extra": "^9.1.0",
     "java-invoke-local": "0.0.6",
     "js-string-escape": "^1.0.1",
-    "jsonpath-plus": "^5.0.2",
+    "jsonpath-plus": "^5.1.0",
     "jsonschema": "^1.4.0",
     "jsonwebtoken": "^8.5.1",
-    "jszip": "^3.5.0",
-    "luxon": "^1.25.0",
-    "node-fetch": "^2.6.1",
+    "jszip": "^3.7.1",
+    "luxon": "^1.28.0",
+    "node-fetch": "^2.6.6",
     "node-schedule": "^1.3.3",
-    "object.fromentries": "^2.0.3",
-    "p-memoize": "^4.0.1",
+    "object.fromentries": "^2.0.5",
+    "p-memoize": "^4.0.3",
     "p-queue": "^6.6.2",
-    "p-retry": "^4.3.0",
+    "p-retry": "^4.6.1",
     "please-upgrade-node": "^3.2.0",
     "portfinder": "^1.0.28",
-    "semver": "^7.3.4",
-    "update-notifier": "^5.0.1",
-    "velocityjs": "^2.0.3",
-    "ws": "^7.4.2"
+    "semver": "^7.3.5",
+    "update-notifier": "^5.1.0",
+    "velocityjs": "^2.0.5",
+    "ws": "^7.5.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.10",
-    "@babel/core": "^7.12.10",
-    "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-proposal-dynamic-import": "^7.12.1",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-    "@babel/plugin-transform-modules-commonjs": "^7.12.1",
-    "@babel/register": "^7.12.10",
-    "archiver": "^5.2.0",
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-proposal-class-properties": "^7.16.0",
+    "@babel/plugin-proposal-dynamic-import": "^7.16.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.16.0",
+    "@babel/register": "^7.16.0",
+    "archiver": "^5.3.0",
     "babel-eslint": "^10.1.0",
     "copyfiles": "^2.4.1",
-    "eslint": "^7.18.0",
+    "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-prettier": "^3.4.1",
+    "git-list-updated": "^1.2.1",
     "husky": "^4.3.8",
     "jest": "^26.6.3",
+    "lint-staged": "^11.2.6",
     "p-map": "^4.0.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
-    "serverless": "^2.2.0"
+    "serverless": "^2.66.2"
   },
   "peerDependencies": {
     "serverless": "^1.60.0 || 2"