serverless-offline 11.0.1 → 11.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "11.0.1",
+  "version": "11.0.3",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -86,9 +86,9 @@
     "@hapi/h2o2": "^10.0.0",
     "@hapi/hapi": "^20.2.2",
     "@serverless/utils": "^6.7.0",
-    "aws-sdk": "^2.1225.0",
+    "aws-sdk": "^2.1230.0",
     "boxen": "^7.0.0",
-    "chalk": "^5.0.1",
+    "chalk": "^5.1.0",
     "execa": "^6.1.0",
     "fs-extra": "^10.1.0",
     "java-invoke-local": "0.0.6",

package/src/errors/LambdaTimeoutError.js

@@ -0,0 +1 @@
+export default class LambdaTimeoutError extends Error {}

package/src/errors/index.js

@@ -0,0 +1,2 @@
+// eslint-disable-next-line import/prefer-default-export
+export { default as LambdaTimeoutError } from './LambdaTimeoutError.js'

package/src/events/http/HttpServer.js

@@ -912,7 +912,7 @@ export default class HttpServer {
 
           this.#apiKeysValues.add(apiKey)
 
-          log.notice(`Key with token: ${apiKey}`)
+          log.notice(`Key with token: '${apiKey}'`)
         }
       }
     }

package/src/events/http/lambda-events/LambdaProxyIntegrationEvent.js

@@ -104,8 +104,6 @@ export default class LambdaProxyIntegrationEvent {
       ) {
         headers['Content-Type'] = 'application/json'
       }
-    } else if (typeof body === 'undefined' || body === '') {
-      body = null
     }
 
     // clone own props

package/src/events/http/lambda-events/LambdaProxyIntegrationEventV2.js

@@ -87,8 +87,6 @@ export default class LambdaProxyIntegrationEventV2 {
       if (!headers['content-type']) {
         headers['content-type'] = 'application/json'
       }
-    } else if (typeof body === 'undefined' || body === '') {
-      body = null
     }
 
     // clone own props

package/src/lambda/LambdaFunction.js

@@ -14,6 +14,7 @@ import {
   DEFAULT_LAMBDA_TIMEOUT,
   supportedRuntimes,
 } from '../config/index.js'
+import { LambdaTimeoutError } from '../errors/index.js'
 import { createUniqueId } from '../utils/index.js'
 
 const { ceil } = Math
@@ -40,8 +41,6 @@ export default class LambdaFunction {
 
   #handler = null
 
-  #handlerRunDone = false
-
   #handlerRunner = null
 
   #idleTimeStarted = null
@@ -281,14 +280,7 @@ export default class LambdaFunction {
   async #timeoutAndTerminate() {
     await setTimeoutPromise(this.#timeout)
 
-    // if the handler has finished before the timeout don't terminate
-    if (this.#handlerRunDone) {
-      return
-    }
-
-    await this.#handlerRunner.cleanup()
-
-    throw new Error('Lambda timeout.')
+    throw new LambdaTimeoutError('Lambda timeout.')
   }
 
   async runHandler() {
@@ -307,31 +299,38 @@ export default class LambdaFunction {
 
     this.#startExecutionTimer()
 
-    this.#handlerRunDone = false
-
-    const result = await Promise.race([
-      this.#handlerRunner.run(this.#event, context),
-      ...(this.#noTimeout ? [] : [this.#timeoutAndTerminate()]),
-    ])
-
-    this.#handlerRunDone = true
-
-    this.#stopExecutionTimer()
-
-    // TEMP TODO FIXME find better solution
-    if (!this.#handlerRunner.isDockerRunner()) {
-      log.notice(
-        `(λ: ${
-          this.#functionKey
-        }) RequestId: ${requestId}  Duration: ${this.#executionTimeInMillis().toFixed(
-          2,
-        )} ms  Billed Duration: ${this.#billedExecutionTimeInMillis()} ms`,
-      )
+    let result
+
+    try {
+      result = await Promise.race([
+        this.#handlerRunner.run(this.#event, context),
+        ...(this.#noTimeout ? [] : [this.#timeoutAndTerminate()]),
+      ])
+
+      this.#stopExecutionTimer()
+
+      // TEMP TODO FIXME find better solution
+      if (!this.#handlerRunner.isDockerRunner()) {
+        log.notice(
+          `(λ: ${
+            this.#functionKey
+          }) RequestId: ${requestId}  Duration: ${this.#executionTimeInMillis().toFixed(
+            2,
+          )} ms  Billed Duration: ${this.#billedExecutionTimeInMillis()} ms`,
+        )
+      }
+    } catch (err) {
+      if (err instanceof LambdaTimeoutError) {
+        await this.#handlerRunner.cleanup()
+      }
+
+      throw err
+    } finally {
+      this.#status = 'IDLE'
+
+      this.#startIdleTimer()
     }
 
-    this.#status = 'IDLE'
-    this.#startIdleTimer()
-
     return result
   }
 }

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

@@ -2,7 +2,7 @@ import { env } from 'node:process'
 import { parentPort, workerData } from 'node:worker_threads'
 import InProcessRunner from '../in-process-runner/index.js'
 
-const { functionKey, handler, servicePath, timeout, codeDir } = workerData
+const { codeDir, functionKey, handler, servicePath, timeout } = workerData
 
 const inProcessRunner = new InProcessRunner(
   {