serverless-offline 9.2.5 → 9.2.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "9.2.5",
+  "version": "9.2.6",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "./src/index.js",

package/src/ServerlessOffline.js

@@ -83,6 +83,15 @@ export default class ServerlessOffline {
     }
 
     await Promise.all(eventModules)
+
+    if (this.#options.useChildProcesses) {
+      log.notice()
+      log.warning(
+        orange(`'--useChildProcesses' is deprecated and will be removed in the next major version. Worker threads, the current default, should provide the same if not an even better developer experience.
+If you are experiencing any issues please let us know: https://github.com/dherault/serverless-offline/issues`),
+      )
+      log.notice()
+    }
   }
 
   async #ready() {
@@ -225,14 +234,6 @@ export default class ServerlessOffline {
       ...this.#cliOptions,
     }
 
-    if (this.#options.useChildProcesses) {
-      log.notice()
-      log.warning(
-        orange(`'--useChildProcesses' is deprecated and will be removed in the next major version. Worker threads, the current default, should provide the same if not an even better developer experience.
-If you are experiencing any issues please let us know: https://github.com/dherault/serverless-offline/issues`),
-      )
-    }
-
     // Parse CORS options
     this.#options.corsAllowHeaders = this.#options.corsAllowHeaders
       .replace(/\s/g, '')

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

@@ -123,6 +123,13 @@ export default class HandlerRunner {
       this.#runner = await this.#loadRunner()
     }
 
-    return this.#runner.run(event, context)
+    try {
+      return await this.#runner.run(event, context)
+    } catch (err) {
+      log.error(
+        `Unhandled exception in handler '${this.#funOptions.functionKey}'.`,
+      )
+      throw err
+    }
   }
 }

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

@@ -11,8 +11,6 @@ export default class InProcessRunner {
 
   #env = null
 
-  #functionKey = null
-
   #handler = null
 
   #servicePath = null
@@ -20,11 +18,10 @@ export default class InProcessRunner {
   #timeout = null
 
   constructor(funOptions, env) {
-    const { codeDir, functionKey, handler, servicePath, timeout } = funOptions
+    const { codeDir, handler, servicePath, timeout } = funOptions
 
     this.#codeDir = codeDir
     this.#env = env
-    this.#functionKey = functionKey
     this.#handler = handler
     this.#servicePath = servicePath
     this.#timeout = timeout
@@ -48,7 +45,7 @@ export default class InProcessRunner {
 
     let callback
 
-    const callbackCalled = new Promise((res, rej) => {
+    const callbackWrapper = new Promise((res, rej) => {
       callback = (err, data) => {
         if (err === 'Unauthorized') {
           res('Unauthorized')
@@ -85,29 +82,22 @@ export default class InProcessRunner {
       },
     }
 
-    let result
-
     // execute (run) handler
-    try {
-      result = handler(event, lambdaContext, callback)
-    } catch {
-      throw new Error(`Uncaught error in '${this.#functionKey}' handler.`)
-    }
+    // no try/catch so that errors bubble up and are logged with root stack traces
+    const result = handler(event, lambdaContext, callback)
 
     // // not a Promise, which is not supported by aws
     // if (result == null || typeof result.then !== 'function') {
     //   throw new Error(`Synchronous function execution is not supported.`)
     // }
 
-    const callbacks = [callbackCalled]
+    const responses = [callbackWrapper]
 
     // Promise was returned
     if (result != null && typeof result.then === 'function') {
-      callbacks.push(result)
+      responses.push(result)
     }
 
-    const callbackResult = await Promise.race(callbacks)
-
-    return callbackResult
+    return Promise.race(responses)
   }
 }