serverless-offline 7.1.0 → 8.3.0

package/dist/lambda/HttpServer.js

@@ -21,14 +21,14 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _lambda = _classPrivateFieldLooseKey("lambda");
+var _lambda = /*#__PURE__*/_classPrivateFieldLooseKey("lambda");
 
-var _options = _classPrivateFieldLooseKey("options");
+var _options = /*#__PURE__*/_classPrivateFieldLooseKey("options");
 
-var _server = _classPrivateFieldLooseKey("server");
+var _server = /*#__PURE__*/_classPrivateFieldLooseKey("server");
 
 class HttpServer {
-  constructor(options, lambda) {
+  constructor(options, lambda, v3Utils) {
     Object.defineProperty(this, _lambda, {
       writable: true,
       value: null
@@ -51,12 +51,20 @@ class HttpServer {
       host,
       port: lambdaPort
     };
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
+
     _classPrivateFieldLooseBase(this, _server)[_server] = new _hapi.Server(serverOptions);
   }
 
   async start() {
     // add routes
-    const _invocationsRoute = (0, _index.invocationsRoute)(_classPrivateFieldLooseBase(this, _lambda)[_lambda], _classPrivateFieldLooseBase(this, _options)[_options]);
+    const _invocationsRoute = (0, _index.invocationsRoute)(_classPrivateFieldLooseBase(this, _lambda)[_lambda], _classPrivateFieldLooseBase(this, _options)[_options], this.v3Utils);
 
     const _invokeAsyncRoute = (0, _index.invokeAsyncRoute)(_classPrivateFieldLooseBase(this, _lambda)[_lambda], _classPrivateFieldLooseBase(this, _options)[_options]);
 
@@ -71,19 +79,35 @@ class HttpServer {
     try {
       await _classPrivateFieldLooseBase(this, _server)[_server].start();
     } catch (err) {
-      console.error(`Unexpected error while starting serverless-offline lambda server on port ${lambdaPort}:`, err);
+      if (this.log) {
+        this.log.error(`Unexpected error while starting serverless-offline lambda server on port ${lambdaPort}:`, err);
+      } else {
+        console.error(`Unexpected error while starting serverless-offline lambda server on port ${lambdaPort}:`, err);
+      }
+
       process.exit(1);
     }
 
-    (0, _serverlessLog.default)(`Offline [http for lambda] listening on http${httpsProtocol ? 's' : ''}://${host}:${lambdaPort}`); // Print all the invocation routes to debug
+    if (this.log) {
+      this.log.notice(`Offline [http for lambda] listening on http${httpsProtocol ? 's' : ''}://${host}:${lambdaPort}`);
+    } else {
+      (0, _serverlessLog.default)(`Offline [http for lambda] listening on http${httpsProtocol ? 's' : ''}://${host}:${lambdaPort}`);
+    } // Print all the invocation routes to debug
+
 
     const basePath = `http${httpsProtocol ? 's' : ''}://${host}:${lambdaPort}`;
 
     const funcNamePairs = _classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNamePairs();
 
-    (0, _serverlessLog.default)([`Function names exposed for local invocation by aws-sdk:`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${funcNamePairs[functionName]}: ${functionName}`)].join('\n'));
-    (0, _debugLog.default)([`Lambda Invocation Routes (for AWS SDK or AWS CLI):`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${_invocationsRoute.method} ${basePath}${_invocationsRoute.path.replace('{functionName}', functionName)}`)].join('\n'));
-    (0, _debugLog.default)([`Lambda Async Invocation Routes (for AWS SDK or AWS CLI):`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${_invokeAsyncRoute.method} ${basePath}${_invokeAsyncRoute.path.replace('{functionName}', functionName)}`)].join('\n'));
+    if (this.log) {
+      this.log.notice([`Function names exposed for local invocation by aws-sdk:`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${funcNamePairs[functionName]}: ${functionName}`)].join('\n'));
+      this.log.debug([`Lambda Invocation Routes (for AWS SDK or AWS CLI):`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${_invocationsRoute.method} ${basePath}${_invocationsRoute.path.replace('{functionName}', functionName)}`)].join('\n'));
+      this.log.debug([`Lambda Async Invocation Routes (for AWS SDK or AWS CLI):`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${_invokeAsyncRoute.method} ${basePath}${_invokeAsyncRoute.path.replace('{functionName}', functionName)}`)].join('\n'));
+    } else {
+      (0, _serverlessLog.default)([`Function names exposed for local invocation by aws-sdk:`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${funcNamePairs[functionName]}: ${functionName}`)].join('\n'));
+      (0, _debugLog.default)([`Lambda Invocation Routes (for AWS SDK or AWS CLI):`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${_invocationsRoute.method} ${basePath}${_invocationsRoute.path.replace('{functionName}', functionName)}`)].join('\n'));
+      (0, _debugLog.default)([`Lambda Async Invocation Routes (for AWS SDK or AWS CLI):`, ..._classPrivateFieldLooseBase(this, _lambda)[_lambda].listFunctionNames().map(functionName => `           * ${_invokeAsyncRoute.method} ${basePath}${_invokeAsyncRoute.path.replace('{functionName}', functionName)}`)].join('\n'));
+    }
   } // stops the server
 
 

package/dist/lambda/Lambda.js

@@ -17,16 +17,16 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _httpServer = _classPrivateFieldLooseKey("httpServer");
+var _httpServer = /*#__PURE__*/_classPrivateFieldLooseKey("httpServer");
 
-var _lambdas = _classPrivateFieldLooseKey("lambdas");
+var _lambdas = /*#__PURE__*/_classPrivateFieldLooseKey("lambdas");
 
-var _lambdaFunctionNamesKeys = _classPrivateFieldLooseKey("lambdaFunctionNamesKeys");
+var _lambdaFunctionNamesKeys = /*#__PURE__*/_classPrivateFieldLooseKey("lambdaFunctionNamesKeys");
 
-var _lambdaFunctionPool = _classPrivateFieldLooseKey("lambdaFunctionPool");
+var _lambdaFunctionPool = /*#__PURE__*/_classPrivateFieldLooseKey("lambdaFunctionPool");
 
 class Lambda {
-  constructor(serverless, options) {
+  constructor(serverless, options, v3Utils) {
     Object.defineProperty(this, _httpServer, {
       writable: true,
       value: null
@@ -43,8 +43,16 @@ class Lambda {
       writable: true,
       value: null
     });
-    _classPrivateFieldLooseBase(this, _httpServer)[_httpServer] = new _HttpServer.default(options, this);
-    _classPrivateFieldLooseBase(this, _lambdaFunctionPool)[_lambdaFunctionPool] = new _LambdaFunctionPool.default(serverless, options);
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
+
+    _classPrivateFieldLooseBase(this, _httpServer)[_httpServer] = new _HttpServer.default(options, this, v3Utils);
+    _classPrivateFieldLooseBase(this, _lambdaFunctionPool)[_lambdaFunctionPool] = new _LambdaFunctionPool.default(serverless, options, v3Utils);
   }
 
   _create(functionKey, functionDefinition) {

package/dist/lambda/LambdaContext.js

@@ -11,7 +11,7 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _context = _classPrivateFieldLooseKey("context");
+var _context = /*#__PURE__*/_classPrivateFieldLooseKey("context");
 
 // class for creating a LambdaContext
 // http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-context.html

package/dist/lambda/LambdaFunction.js

@@ -40,43 +40,43 @@ const {
   ceil
 } = Math;
 
-var _artifact = _classPrivateFieldLooseKey("artifact");
+var _artifact = /*#__PURE__*/_classPrivateFieldLooseKey("artifact");
 
-var _clientContext = _classPrivateFieldLooseKey("clientContext");
+var _clientContext = /*#__PURE__*/_classPrivateFieldLooseKey("clientContext");
 
-var _codeDir = _classPrivateFieldLooseKey("codeDir");
+var _codeDir = /*#__PURE__*/_classPrivateFieldLooseKey("codeDir");
 
-var _event = _classPrivateFieldLooseKey("event");
+var _event = /*#__PURE__*/_classPrivateFieldLooseKey("event");
 
-var _executionTimeEnded = _classPrivateFieldLooseKey("executionTimeEnded");
+var _executionTimeEnded = /*#__PURE__*/_classPrivateFieldLooseKey("executionTimeEnded");
 
-var _executionTimeStarted = _classPrivateFieldLooseKey("executionTimeStarted");
+var _executionTimeStarted = /*#__PURE__*/_classPrivateFieldLooseKey("executionTimeStarted");
 
-var _functionKey = _classPrivateFieldLooseKey("functionKey");
+var _functionKey = /*#__PURE__*/_classPrivateFieldLooseKey("functionKey");
 
-var _functionName = _classPrivateFieldLooseKey("functionName");
+var _functionName = /*#__PURE__*/_classPrivateFieldLooseKey("functionName");
 
-var _handlerRunner = _classPrivateFieldLooseKey("handlerRunner");
+var _handlerRunner = /*#__PURE__*/_classPrivateFieldLooseKey("handlerRunner");
 
-var _idleTimeStarted = _classPrivateFieldLooseKey("idleTimeStarted");
+var _idleTimeStarted = /*#__PURE__*/_classPrivateFieldLooseKey("idleTimeStarted");
 
-var _initialized = _classPrivateFieldLooseKey("initialized");
+var _initialized = /*#__PURE__*/_classPrivateFieldLooseKey("initialized");
 
-var _lambdaContext = _classPrivateFieldLooseKey("lambdaContext");
+var _lambdaContext = /*#__PURE__*/_classPrivateFieldLooseKey("lambdaContext");
 
-var _lambdaDir = _classPrivateFieldLooseKey("lambdaDir");
+var _lambdaDir = /*#__PURE__*/_classPrivateFieldLooseKey("lambdaDir");
 
-var _memorySize = _classPrivateFieldLooseKey("memorySize");
+var _memorySize = /*#__PURE__*/_classPrivateFieldLooseKey("memorySize");
 
-var _region = _classPrivateFieldLooseKey("region");
+var _region = /*#__PURE__*/_classPrivateFieldLooseKey("region");
 
-var _runtime = _classPrivateFieldLooseKey("runtime");
+var _runtime = /*#__PURE__*/_classPrivateFieldLooseKey("runtime");
 
-var _timeout = _classPrivateFieldLooseKey("timeout");
+var _timeout = /*#__PURE__*/_classPrivateFieldLooseKey("timeout");
 
 class LambdaFunction {
   // can be 'BUSY' or 'IDLE'
-  constructor(functionKey, functionDefinition, serverless, options) {
+  constructor(functionKey, functionDefinition, serverless, options, v3Utils) {
     var _functionDefinition$p;
 
     Object.defineProperty(this, _artifact, {
@@ -158,10 +158,18 @@ class LambdaFunction {
         provider,
         package: servicePackage = {}
       }
-    } = serverless; // TEMP options.location, for compatibility with serverless-webpack:
+    } = serverless;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    } // TEMP options.location, for compatibility with serverless-webpack:
     // https://github.com/dherault/serverless-offline/issues/787
     // TODO FIXME look into better way to work with serverless-webpack
 
+
     const _servicePath = (0, _path.resolve)(servicePath, options.location || '');
 
     const {
@@ -216,7 +224,7 @@ class LambdaFunction {
       servicePackage: servicePackage.artifact ? (0, _path.resolve)(_servicePath, servicePackage.artifact) : undefined,
       functionPackage: functionPackage.artifact ? (0, _path.resolve)(_servicePath, functionPackage.artifact) : undefined
     };
-    _classPrivateFieldLooseBase(this, _handlerRunner)[_handlerRunner] = new _index.default(funOptions, options, env);
+    _classPrivateFieldLooseBase(this, _handlerRunner)[_handlerRunner] = new _index.default(funOptions, options, env, v3Utils);
     _classPrivateFieldLooseBase(this, _lambdaContext)[_lambdaContext] = new _LambdaContext.default(name, memorySize);
   }
 
@@ -236,8 +244,13 @@ class LambdaFunction {
     // print message but keep working (don't error out or exit process)
     if (!_index2.supportedRuntimes.has(_classPrivateFieldLooseBase(this, _runtime)[_runtime])) {
       // this.printBlankLine(); // TODO
-      console.log('');
-      (0, _serverlessLog.default)(`Warning: found unsupported runtime '${_classPrivateFieldLooseBase(this, _runtime)[_runtime]}' for function '${_classPrivateFieldLooseBase(this, _functionKey)[_functionKey]}'`);
+      if (this.log) {
+        this.log.warning();
+        this.log.warning(`Warning: found unsupported runtime '${_classPrivateFieldLooseBase(this, _runtime)[_runtime]}' for function '${_classPrivateFieldLooseBase(this, _functionKey)[_functionKey]}'`);
+      } else {
+        console.log('');
+        (0, _serverlessLog.default)(`Warning: found unsupported runtime '${_classPrivateFieldLooseBase(this, _runtime)[_runtime]}' for function '${_classPrivateFieldLooseBase(this, _functionKey)[_functionKey]}'`);
+      }
     }
   } // based on:
   // https://github.com/serverless/serverless/blob/v1.50.0/lib/plugins/aws/invokeLocal/index.js#L108
@@ -358,7 +371,11 @@ class LambdaFunction {
 
 
     if (!_classPrivateFieldLooseBase(this, _handlerRunner)[_handlerRunner].isDockerRunner()) {
-      (0, _serverlessLog.default)(`(λ: ${_classPrivateFieldLooseBase(this, _functionKey)[_functionKey]}) RequestId: ${requestId}  Duration: ${this._executionTimeInMillis().toFixed(2)} ms  Billed Duration: ${this._billedExecutionTimeInMillis()} ms`);
+      if (this.log) {
+        this.log.notice(`(λ: ${_classPrivateFieldLooseBase(this, _functionKey)[_functionKey]}) RequestId: ${requestId}  Duration: ${this._executionTimeInMillis().toFixed(2)} ms  Billed Duration: ${this._billedExecutionTimeInMillis()} ms`);
+      } else {
+        (0, _serverlessLog.default)(`(λ: ${_classPrivateFieldLooseBase(this, _functionKey)[_functionKey]}) RequestId: ${requestId}  Duration: ${this._executionTimeInMillis().toFixed(2)} ms  Billed Duration: ${this._billedExecutionTimeInMillis()} ms`);
+      }
     }
 
     this.status = 'IDLE';

package/dist/lambda/LambdaFunctionPool.js

@@ -15,16 +15,16 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _options = _classPrivateFieldLooseKey("options");
+var _options = /*#__PURE__*/_classPrivateFieldLooseKey("options");
 
-var _pool = _classPrivateFieldLooseKey("pool");
+var _pool = /*#__PURE__*/_classPrivateFieldLooseKey("pool");
 
-var _serverless = _classPrivateFieldLooseKey("serverless");
+var _serverless = /*#__PURE__*/_classPrivateFieldLooseKey("serverless");
 
-var _timerRef = _classPrivateFieldLooseKey("timerRef");
+var _timerRef = /*#__PURE__*/_classPrivateFieldLooseKey("timerRef");
 
 class LambdaFunctionPool {
-  constructor(serverless, options) {
+  constructor(serverless, options, v3Utils) {
     Object.defineProperty(this, _options, {
       writable: true,
       value: null
@@ -42,7 +42,8 @@ class LambdaFunctionPool {
       value: null
     });
     _classPrivateFieldLooseBase(this, _options)[_options] = options;
-    _classPrivateFieldLooseBase(this, _serverless)[_serverless] = serverless; // start cleaner
+    _classPrivateFieldLooseBase(this, _serverless)[_serverless] = serverless;
+    this.v3Utils = v3Utils; // start cleaner
 
     this._startCleanTimer();
   }
@@ -98,7 +99,7 @@ class LambdaFunctionPool {
     let lambdaFunction; // we don't have any instances
 
     if (lambdaFunctions == null) {
-      lambdaFunction = new _LambdaFunction.default(functionKey, functionDefinition, _classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options]);
+      lambdaFunction = new _LambdaFunction.default(functionKey, functionDefinition, _classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options], this.v3Utils);
 
       _classPrivateFieldLooseBase(this, _pool)[_pool].set(functionKey, new Set([lambdaFunction]));
 
@@ -112,7 +113,7 @@ class LambdaFunctionPool {
     }) => status === 'IDLE'); // we don't have any IDLE instances
 
     if (lambdaFunction == null) {
-      lambdaFunction = new _LambdaFunction.default(functionKey, functionDefinition, _classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options]);
+      lambdaFunction = new _LambdaFunction.default(functionKey, functionDefinition, _classPrivateFieldLooseBase(this, _serverless)[_serverless], _classPrivateFieldLooseBase(this, _options)[_options], this.v3Utils);
       lambdaFunctions.add(lambdaFunction); // console.log(`${lambdaFunctions.size} lambdaFunctions`)
 
       return lambdaFunction;

package/dist/lambda/handler-runner/HandlerRunner.js

@@ -15,9 +15,9 @@ var _index2 = require("../../utils/index.js");
 
 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; }
 
@@ -25,16 +25,16 @@ var id = 0;
 
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 
-var _env = _classPrivateFieldLooseKey("env");
+var _env = /*#__PURE__*/_classPrivateFieldLooseKey("env");
 
-var _funOptions = _classPrivateFieldLooseKey("funOptions");
+var _funOptions = /*#__PURE__*/_classPrivateFieldLooseKey("funOptions");
 
-var _options = _classPrivateFieldLooseKey("options");
+var _options = /*#__PURE__*/_classPrivateFieldLooseKey("options");
 
-var _runner = _classPrivateFieldLooseKey("runner");
+var _runner = /*#__PURE__*/_classPrivateFieldLooseKey("runner");
 
 class HandlerRunner {
-  constructor(funOptions, options, env) {
+  constructor(funOptions, options, env, v3Utils) {
     Object.defineProperty(this, _env, {
       writable: true,
       value: null
@@ -54,6 +54,13 @@ class HandlerRunner {
     _classPrivateFieldLooseBase(this, _env)[_env] = env;
     _classPrivateFieldLooseBase(this, _funOptions)[_funOptions] = funOptions;
     _classPrivateFieldLooseBase(this, _options)[_options] = options;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
   }
 
   async _loadRunner() {
@@ -72,12 +79,31 @@ class HandlerRunner {
       timeout
     } = _classPrivateFieldLooseBase(this, _funOptions)[_funOptions];
 
-    (0, _debugLog.default)(`Loading handler... (${handlerPath})`);
+    if (this.log) {
+      this.log.debug(`Loading handler... (${handlerPath})`);
+    } else {
+      (0, _debugLog.default)(`Loading handler... (${handlerPath})`);
+    }
 
     if (useDocker) {
       // https://github.com/lambci/docker-lambda/issues/329
       if (runtime === 'nodejs14.x') {
-        (0, _serverlessLog.logWarning)('"nodejs14.x" runtime is not supported with docker. See https://github.com/lambci/docker-lambda/issues/329');
+        if (this.log) {
+          this.log.warning('"nodejs14.x" runtime is not supported with docker. See https://github.com/lambci/docker-lambda/issues/329');
+        } else {
+          (0, _serverlessLog.logWarning)('"nodejs14.x" runtime is not supported with docker. See https://github.com/lambci/docker-lambda/issues/329');
+        }
+
+        throw new Error('Unsupported runtime');
+      }
+
+      if (runtime === 'python3.9') {
+        if (this.log) {
+          this.log.warning('"python3.9" runtime is not supported with docker.');
+        } else {
+          (0, _serverlessLog.logWarning)('"python3.9" runtime is not supported with docker.');
+        }
+
         throw new Error('Unsupported runtime');
       }
 
@@ -91,7 +117,7 @@ class HandlerRunner {
       const {
         default: DockerRunner
       } = await Promise.resolve().then(() => _interopRequireWildcard(require('./docker-runner/index.js')));
-      return new DockerRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], dockerOptions);
+      return new DockerRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], dockerOptions, this.v3Utils);
     }
 
     if (_index.supportedNodejs.has(runtime)) {
@@ -99,7 +125,7 @@ class HandlerRunner {
         const {
           default: ChildProcessRunner
         } = await Promise.resolve().then(() => _interopRequireWildcard(require('./child-process-runner/index.js')));
-        return new ChildProcessRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache);
+        return new ChildProcessRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache, this.v3Utils);
       }
 
       if (useWorkerThreads) {
@@ -122,21 +148,21 @@ class HandlerRunner {
       const {
         default: PythonRunner
       } = await Promise.resolve().then(() => _interopRequireWildcard(require('./python-runner/index.js')));
-      return new PythonRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache);
+      return new PythonRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache, this.v3Utils);
     }
 
     if (_index.supportedRuby.has(runtime)) {
       const {
         default: RubyRunner
       } = await Promise.resolve().then(() => _interopRequireWildcard(require('./ruby-runner/index.js')));
-      return new RubyRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache);
+      return new RubyRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache, this.v3Utils);
     }
 
     if (_index.supportedJava.has(runtime)) {
       const {
         default: JavaRunner
       } = await Promise.resolve().then(() => _interopRequireWildcard(require('./java-runner/index.js')));
-      return new JavaRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache);
+      return new JavaRunner(_classPrivateFieldLooseBase(this, _funOptions)[_funOptions], _classPrivateFieldLooseBase(this, _env)[_env], allowCache, this.v3Utils);
     } // TODO FIXME
 
 
@@ -151,9 +177,16 @@ class HandlerRunner {
     const versionIsSatisfied = (0, _index2.satisfiesVersionRange)(currentVersion, requiredVersionRange); // we're happy
 
     if (!versionIsSatisfied) {
-      (0, _serverlessLog.logWarning)(`"worker threads" require node.js version ${requiredVersionRange}, but found version ${currentVersion}.
+      if (this.log) {
+        this.log.warning(`"worker threads" require node.js version ${requiredVersionRange}, but found version ${currentVersion}.
+         To use this feature you have to update node.js to a later version.
+        `);
+      } else {
+        (0, _serverlessLog.logWarning)(`"worker threads" require node.js version ${requiredVersionRange}, but found version ${currentVersion}.
          To use this feature you have to update node.js to a later version.
         `);
+      }
+
       throw new Error('"worker threads" are not supported with this node.js version');
     }
   } // TEMP TODO FIXME

package/dist/lambda/handler-runner/child-process-runner/ChildProcessRunner.js

@@ -19,20 +19,20 @@ function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + n
 
 const childProcessHelperPath = _path.default.resolve(__dirname, 'childProcessHelper.js');
 
-var _env = _classPrivateFieldLooseKey("env");
+var _env = /*#__PURE__*/_classPrivateFieldLooseKey("env");
 
-var _functionKey = _classPrivateFieldLooseKey("functionKey");
+var _functionKey = /*#__PURE__*/_classPrivateFieldLooseKey("functionKey");
 
-var _handlerName = _classPrivateFieldLooseKey("handlerName");
+var _handlerName = /*#__PURE__*/_classPrivateFieldLooseKey("handlerName");
 
-var _handlerPath = _classPrivateFieldLooseKey("handlerPath");
+var _handlerPath = /*#__PURE__*/_classPrivateFieldLooseKey("handlerPath");
 
-var _timeout = _classPrivateFieldLooseKey("timeout");
+var _timeout = /*#__PURE__*/_classPrivateFieldLooseKey("timeout");
 
-var _allowCache = _classPrivateFieldLooseKey("allowCache");
+var _allowCache = /*#__PURE__*/_classPrivateFieldLooseKey("allowCache");
 
 class ChildProcessRunner {
-  constructor(funOptions, env, allowCache) {
+  constructor(funOptions, env, allowCache, v3Utils) {
     Object.defineProperty(this, _env, {
       writable: true,
       value: null
@@ -63,6 +63,14 @@ class ChildProcessRunner {
       handlerPath,
       timeout
     } = funOptions;
+
+    if (v3Utils) {
+      this.log = v3Utils.log;
+      this.progress = v3Utils.progress;
+      this.writeText = v3Utils.writeText;
+      this.v3Utils = v3Utils;
+    }
+
     _classPrivateFieldLooseBase(this, _env)[_env] = env;
     _classPrivateFieldLooseBase(this, _functionKey)[_functionKey] = functionKey;
     _classPrivateFieldLooseBase(this, _handlerName)[_handlerName] = handlerName;
@@ -99,7 +107,12 @@ class ChildProcessRunner {
       result = await message;
     } catch (err) {
       // TODO
-      console.log(err);
+      if (this.log) {
+        this.log.error(err);
+      } else {
+        console.log(err);
+      }
+
       throw err;
     }
 

package/dist/lambda/handler-runner/child-process-runner/childProcessHelper.js

@@ -34,16 +34,7 @@ process.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) {
-    // 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)
 
   process.send(result);
 });