serverless-offline 8.2.0 → 8.5.0

package/dist/ServerlessOffline.js

@@ -7,6 +7,10 @@ exports.default = void 0;
 
 var _updateNotifier = _interopRequireDefault(require("update-notifier"));
 
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _semver = require("semver");
+
 var _debugLog = _interopRequireDefault(require("./debugLog.js"));
 
 var _serverlessLog = _interopRequireWildcard(require("./serverlessLog.js"));
@@ -19,9 +23,9 @@ var _package = _interopRequireDefault(require("../package.json"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+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) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _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 _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; }
 
@@ -29,22 +33,22 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _cliOptions = _classPrivateFieldLooseKey("cliOptions");
+var _cliOptions = /*#__PURE__*/_classPrivateFieldLooseKey("cliOptions");
 
-var _http = _classPrivateFieldLooseKey("http");
+var _http = /*#__PURE__*/_classPrivateFieldLooseKey("http");
 
-var _options = _classPrivateFieldLooseKey("options");
+var _options = /*#__PURE__*/_classPrivateFieldLooseKey("options");
 
-var _schedule = _classPrivateFieldLooseKey("schedule");
+var _schedule = /*#__PURE__*/_classPrivateFieldLooseKey("schedule");
 
-var _webSocket = _classPrivateFieldLooseKey("webSocket");
+var _webSocket = /*#__PURE__*/_classPrivateFieldLooseKey("webSocket");
 
-var _lambda = _classPrivateFieldLooseKey("lambda");
+var _lambda = /*#__PURE__*/_classPrivateFieldLooseKey("lambda");
 
-var _serverless = _classPrivateFieldLooseKey("serverless");
+var _serverless = /*#__PURE__*/_classPrivateFieldLooseKey("serverless");
 
 class ServerlessOffline {
-  constructor(serverless, cliOptions) {
+  constructor(serverless, cliOptions, v3Utils) {
     Object.defineProperty(this, _cliOptions, {
       writable: true,
       value: null
@@ -75,6 +79,14 @@ class ServerlessOffline {
     });
     _classPrivateFieldLooseBase(this, _cliOptions)[_cliOptions] = cliOptions;
     _classPrivateFieldLooseBase(this, _serverless)[_serverless] = serverless;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
+
     (0, _serverlessLog.setLog)((...args) => serverless.cli.log(...args));
     this.commands = {
       offline: {
@@ -101,7 +113,11 @@ class ServerlessOffline {
 
   _printBlankLine() {
     if (process.env.NODE_ENV !== 'test') {
-      console.log();
+      if (this.log) {
+        this.log.notice();
+      } else {
+        console.log();
+      }
     }
   } // Entry point for the plugin (sls offline) when running 'sls offline start'
 
@@ -134,7 +150,7 @@ class ServerlessOffline {
       eventModules.push(this._createHttp(httpEvents));
     }
 
-    if (scheduleEvents.length > 0) {
+    if (!_classPrivateFieldLooseBase(this, _options)[_options].disableScheduledEvents && scheduleEvents.length > 0) {
       eventModules.push(this._createSchedule(scheduleEvents));
     }
 
@@ -157,7 +173,12 @@ class ServerlessOffline {
       return;
     }
 
-    (0, _serverlessLog.default)('Halting offline server');
+    if (this.log) {
+      this.log.info('Halting offline server');
+    } else {
+      (0, _serverlessLog.default)('Halting offline server');
+    }
+
     const eventModules = [];
 
     if (_classPrivateFieldLooseBase(this, _lambda)[_lambda]) {
@@ -204,14 +225,19 @@ class ServerlessOffline {
       // with child_process methods
       .on('SIGTERM', () => resolve('SIGTERM'));
     });
-    (0, _serverlessLog.default)(`Got ${command} signal. Offline Halting...`);
+
+    if (this.log) {
+      this.log.info(`Got ${command} signal. Offline Halting...`);
+    } else {
+      (0, _serverlessLog.default)(`Got ${command} signal. Offline Halting...`);
+    }
   }
 
   async _createLambda(lambdas, skipStart) {
     const {
       default: Lambda
     } = await Promise.resolve().then(() => _interopRequireWildcard(require('./lambda/index.js')));
-    _classPrivateFieldLooseBase(this, _lambda)[_lambda] = new Lambda(_classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options]);
+    _classPrivateFieldLooseBase(this, _lambda)[_lambda] = new Lambda(_classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options], this.v3Utils);
 
     _classPrivateFieldLooseBase(this, _lambda)[_lambda].create(lambdas);
 
@@ -224,7 +250,7 @@ class ServerlessOffline {
     const {
       default: Http
     } = await Promise.resolve().then(() => _interopRequireWildcard(require('./events/http/index.js')));
-    _classPrivateFieldLooseBase(this, _http)[_http] = new Http(_classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options], _classPrivateFieldLooseBase(this, _lambda)[_lambda]);
+    _classPrivateFieldLooseBase(this, _http)[_http] = new Http(_classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options], _classPrivateFieldLooseBase(this, _lambda)[_lambda], this.v3Utils);
     await _classPrivateFieldLooseBase(this, _http)[_http].registerPlugins();
 
     _classPrivateFieldLooseBase(this, _http)[_http].create(events); // HTTP Proxy defined in Resource
@@ -246,7 +272,7 @@ class ServerlessOffline {
     const {
       default: Schedule
     } = await Promise.resolve().then(() => _interopRequireWildcard(require('./events/schedule/index.js')));
-    _classPrivateFieldLooseBase(this, _schedule)[_schedule] = new Schedule(_classPrivateFieldLooseBase(this, _lambda)[_lambda], _classPrivateFieldLooseBase(this, _serverless)[_serverless].service.provider.region);
+    _classPrivateFieldLooseBase(this, _schedule)[_schedule] = new Schedule(_classPrivateFieldLooseBase(this, _lambda)[_lambda], _classPrivateFieldLooseBase(this, _serverless)[_serverless].service.provider.region, this.v3Utils);
 
     _classPrivateFieldLooseBase(this, _schedule)[_schedule].create(events);
   }
@@ -255,7 +281,7 @@ class ServerlessOffline {
     const {
       default: WebSocket
     } = await Promise.resolve().then(() => _interopRequireWildcard(require('./events/websocket/index.js')));
-    _classPrivateFieldLooseBase(this, _webSocket)[_webSocket] = new WebSocket(_classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options], _classPrivateFieldLooseBase(this, _lambda)[_lambda]);
+    _classPrivateFieldLooseBase(this, _webSocket)[_webSocket] = new WebSocket(_classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options], _classPrivateFieldLooseBase(this, _lambda)[_lambda], this.v3Utils);
 
     _classPrivateFieldLooseBase(this, _webSocket)[_webSocket].create(events);
 
@@ -292,8 +318,16 @@ class ServerlessOffline {
       headers: _classPrivateFieldLooseBase(this, _options)[_options].corsAllowHeaders,
       origin: _classPrivateFieldLooseBase(this, _options)[_options].corsAllowOrigin
     };
-    (0, _serverlessLog.default)(`Starting Offline: ${provider.stage}/${provider.region}.`);
-    (0, _debugLog.default)('options:', _classPrivateFieldLooseBase(this, _options)[_options]);
+
+    if (this.log) {
+      this.log.notice();
+      this.log.notice(`Starting Offline at stage ${provider.stage} ${_chalk.default.gray(`(${provider.region})`)}`);
+      this.log.notice();
+      this.log.debug('options:', _classPrivateFieldLooseBase(this, _options)[_options]);
+    } else {
+      (0, _serverlessLog.default)(`Starting Offline: ${provider.stage} ${provider.region}.`);
+      (0, _debugLog.default)('options:', _classPrivateFieldLooseBase(this, _options)[_options]);
+    }
   }
 
   _getEvents() {
@@ -338,7 +372,12 @@ class ServerlessOffline {
               };
             } else if (typeof httpEvent.http === 'object') {
               if (!httpEvent.http.method) {
-                (0, _serverlessLog.logWarning)(`Event definition is missing a method for function "${functionKey}"`);
+                if (this.log) {
+                  this.log.warning(`Event definition is missing a method for function "${functionKey}"`);
+                } else {
+                  (0, _serverlessLog.logWarning)(`Event definition is missing a method for function "${functionKey}"`);
+                }
+
                 httpEvent.http.method = '';
               }
 
@@ -349,12 +388,22 @@ class ServerlessOffline {
               delete httpEvent.http.method;
               delete httpEvent.http.path;
             } else {
-              (0, _serverlessLog.logWarning)(`Event definition must be a string or object but received ${typeof httpEvent.http} for function "${functionKey}"`);
+              if (this.log) {
+                this.log.warning(`Event definition must be a string or object but received ${typeof httpEvent.http} for function "${functionKey}"`);
+              } else {
+                (0, _serverlessLog.logWarning)(`Event definition must be a string or object but received ${typeof httpEvent.http} for function "${functionKey}"`);
+              }
+
               httpEvent.http.routeKey = '';
             }
 
             httpEvent.http.isHttpApi = true;
-            httpEvent.http.payload = service.provider.httpApi && service.provider.httpApi.payload ? service.provider.httpApi.payload : '2.0';
+
+            if (functionDefinition.httpApi && functionDefinition.httpApi.payload) {
+              httpEvent.http.payload = functionDefinition.httpApi.payload;
+            } else {
+              httpEvent.http.payload = service.provider.httpApi && service.provider.httpApi.payload ? service.provider.httpApi.payload : '2.0';
+            }
           }
 
           if (http && http.private) {
@@ -381,10 +430,20 @@ class ServerlessOffline {
     }); // for simple API Key authentication model
 
     if (hasPrivateHttpEvent) {
-      (0, _serverlessLog.default)(`Key with token: ${_classPrivateFieldLooseBase(this, _options)[_options].apiKey}`);
+      if (this.log) {
+        this.log.notice(`Key with token: ${_classPrivateFieldLooseBase(this, _options)[_options].apiKey}`);
+      } else {
+        (0, _serverlessLog.default)(`Key with token: ${_classPrivateFieldLooseBase(this, _options)[_options].apiKey}`);
+      }
 
       if (_classPrivateFieldLooseBase(this, _options)[_options].noAuth) {
-        (0, _serverlessLog.default)('Authorizers are turned off. You do not need to use x-api-key header.');
+        if (this.log) {
+          this.log.notice('Authorizers are turned off. You do not need to use x-api-key header.');
+        } else {
+          (0, _serverlessLog.default)('Authorizers are turned off. You do not need to use x-api-key header.');
+        }
+      } else if (this.log) {
+        this.log.notice('Remember to use x-api-key on the request headers');
       } else {
         (0, _serverlessLog.default)('Remember to use x-api-key on the request headers');
       }
@@ -408,13 +467,26 @@ class ServerlessOffline {
     const currentVersion = _classPrivateFieldLooseBase(this, _serverless)[_serverless].version;
 
     const requiredVersionRange = _package.default.peerDependencies.serverless;
+
+    if ((0, _semver.parse)(currentVersion).prerelease.length) {
+      // Do not validate, if run against serverless pre-release
+      return;
+    }
+
     const versionIsSatisfied = (0, _index.satisfiesVersionRange)(currentVersion, requiredVersionRange);
 
     if (!versionIsSatisfied) {
-      (0, _serverlessLog.logWarning)(`serverless-offline requires serverless version ${requiredVersionRange} but found version ${currentVersion}.
+      if (this.log) {
+        this.log.warning(`serverless-offline requires serverless version ${requiredVersionRange} but found version ${currentVersion}.
          Be aware that functionality might be limited or contains bugs.
          To avoid any issues update serverless to a later version.
         `);
+      } else {
+        (0, _serverlessLog.logWarning)(`serverless-offline requires serverless version ${requiredVersionRange} but found version ${currentVersion}.
+         Be aware that functionality might be limited or contains bugs.
+         To avoid any issues update serverless to a later version.
+        `);
+      }
     }
   }
 

package/dist/config/commandOptions.js

@@ -29,6 +29,10 @@ var _default = {
     usage: 'Used to disable cookie-validation on hapi.js-server',
     type: 'boolean'
   },
+  disableScheduledEvents: {
+    usage: 'Disables all scheduled events. Overrides configurations in serverless.yml. Default: false',
+    type: 'boolean'
+  },
   enforceSecureCookies: {
     usage: 'Enforce secure cookies',
     type: 'boolean'

package/dist/config/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_DOCKER_CONTAINER_PORT = exports.DEFAULT_WEBSOCKETS_ROUTE = exports.DEFAULT_WEBSOCKETS_API_ROUTE_SELECTION_EXPRESSION = exports.SERVER_SHUTDOWN_TIMEOUT = exports.DEFAULT_LAMBDA_TIMEOUT = exports.DEFAULT_LAMBDA_MEMORY_SIZE = exports.DEFAULT_LAMBDA_RUNTIME = exports.CUSTOM_OPTION = exports.BASE_URL_PLACEHOLDER = void 0;
+exports.SERVER_SHUTDOWN_TIMEOUT = exports.DEFAULT_WEBSOCKETS_ROUTE = exports.DEFAULT_WEBSOCKETS_API_ROUTE_SELECTION_EXPRESSION = exports.DEFAULT_LAMBDA_TIMEOUT = exports.DEFAULT_LAMBDA_RUNTIME = exports.DEFAULT_LAMBDA_MEMORY_SIZE = exports.DEFAULT_DOCKER_CONTAINER_PORT = exports.CUSTOM_OPTION = exports.BASE_URL_PLACEHOLDER = void 0;
 // dummy placeholder url for the WHATWG URL constructor
 // https://github.com/nodejs/node/issues/12682
 const BASE_URL_PLACEHOLDER = 'http://example';

package/dist/config/defaultOptions.js

@@ -16,6 +16,7 @@ var _default = {
   corsAllowOrigin: '*',
   corsExposedHeaders: 'WWW-Authenticate,Server-Authorization',
   disableCookieValidation: false,
+  disableScheduledEvents: false,
   dockerHost: 'localhost',
   dockerHostServicePath: null,
   dockerNetwork: null,

package/dist/events/http/Endpoint.js

@@ -41,12 +41,12 @@ function getResponseContentType(fep) {
   return 'application/json';
 }
 
-var _handlerPath = _classPrivateFieldLooseKey("handlerPath");
+var _handlerPath = /*#__PURE__*/_classPrivateFieldLooseKey("handlerPath");
 
-var _http = _classPrivateFieldLooseKey("http");
+var _http = /*#__PURE__*/_classPrivateFieldLooseKey("http");
 
 class Endpoint {
-  constructor(handlerPath, http) {
+  constructor(handlerPath, http, v3Utils) {
     Object.defineProperty(this, _handlerPath, {
       writable: true,
       value: null
@@ -57,6 +57,14 @@ class Endpoint {
     });
     _classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath] = handlerPath;
     _classPrivateFieldLooseBase(this, _http)[_http] = http;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
+
     return this._generate();
   } // determine whether we have function level overrides for velocity templates
   // if not we will use defaults
@@ -79,15 +87,21 @@ class Endpoint {
         });
       } // load request template if exists if not use default from serverless offline
       else if ((0, _fs.existsSync)(reqFilename)) {
-          fep.requestTemplates['application/json'] = readFile(reqFilename);
-        } else {
-          fep.requestTemplates['application/json'] = defaultRequestTemplate;
-        } // determine response template
+        fep.requestTemplates['application/json'] = readFile(reqFilename);
+      } else {
+        fep.requestTemplates['application/json'] = defaultRequestTemplate;
+      } // determine response template
 
 
       const resFilename = `${_classPrivateFieldLooseBase(this, _handlerPath)[_handlerPath]}.res.vm`;
       fep.responseContentType = getResponseContentType(fep);
-      (0, _debugLog.default)('Response Content-Type ', fep.responseContentType); // load response template from http response template, or load file if exists other use default
+
+      if (this.log) {
+        this.log.debug('Response Content-Type ', fep.responseContentType);
+      } else {
+        (0, _debugLog.default)('Response Content-Type ', fep.responseContentType);
+      } // load response template from http response template, or load file if exists other use default
+
 
       if (fep.response && fep.response.template) {
         fep.responses.default.responseTemplates[fep.responseContentType] = fep.response.template;
@@ -97,7 +111,11 @@ class Endpoint {
         fep.responses.default.responseTemplates[fep.responseContentType] = defaultResponseTemplate;
       }
     } catch (err) {
-      (0, _debugLog.default)(`Error: ${err}`);
+      if (this.log) {
+        this.log.debug(`Error: ${err}`);
+      } else {
+        (0, _debugLog.default)(`Error: ${err}`);
+      }
     }
 
     return fep;

package/dist/events/http/Http.js

@@ -17,15 +17,15 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _httpServer = _classPrivateFieldLooseKey("httpServer");
+var _httpServer = /*#__PURE__*/_classPrivateFieldLooseKey("httpServer");
 
 class Http {
-  constructor(serverless, options, lambda) {
+  constructor(serverless, options, lambda, v3Utils) {
     Object.defineProperty(this, _httpServer, {
       writable: true,
       value: null
     });
-    _classPrivateFieldLooseBase(this, _httpServer)[_httpServer] = new _HttpServer.default(serverless, options, lambda);
+    _classPrivateFieldLooseBase(this, _httpServer)[_httpServer] = new _HttpServer.default(serverless, options, lambda, v3Utils);
   }
 
   start() {