feat: add timeout feature, hookup noTimeout option (#1551)

src/lambda/LambdaFunction.js

@@ -2,6 +2,7 @@ import { readFile, writeFile } from 'node:fs/promises'
 import { dirname, join, resolve } from 'node:path'
 import process from 'node:process'
 import { performance } from 'node:perf_hooks'
+import { promisify } from 'node:util'
 import { log } from '@serverless/utils/log.js'
 import { emptyDir, ensureDir, remove } from 'fs-extra'
 import jszip from 'jszip'
@@ -18,6 +19,8 @@ import { createUniqueId } from '../utils/index.js'
 const { ceil } = Math
 const { entries, fromEntries } = Object
 
+const setTimeoutPromise = promisify(setTimeout)
+
 export default class LambdaFunction {
   #artifact = null
 
@@ -37,6 +40,8 @@ export default class LambdaFunction {
 
   #handler = null
 
+  #handlerRunDone = false
+
   #handlerRunner = null
 
   #idleTimeStarted = null
@@ -49,13 +54,15 @@ export default class LambdaFunction {
 
   #memorySize = null
 
+  #noTimeout = null
+
   #region = null
 
   #runtime = null
 
-  #timeout = null
+  #status = 'IDLE' // can be 'BUSY' or 'IDLE'
 
-  status = 'IDLE' // can be 'BUSY' or 'IDLE'
+  #timeout = null
 
   constructor(functionKey, functionDefinition, serverless, options) {
     const {
@@ -81,6 +88,8 @@ export default class LambdaFunction {
       provider.memorySize ||
       DEFAULT_LAMBDA_MEMORY_SIZE
 
+    this.#noTimeout = options.noTimeout
+
     this.#region = provider.region
 
     this.#runtime =
@@ -265,8 +274,25 @@ export default class LambdaFunction {
     return this.#functionName
   }
 
+  get status() {
+    return this.#status
+  }
+
+  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.')
+  }
+
   async runHandler() {
-    this.status = 'BUSY'
+    this.#status = 'BUSY'
 
     if (!this.#initialized) {
       await this.#initialize()
@@ -281,7 +307,14 @@ export default class LambdaFunction {
 
     this.#startExecutionTimer()
 
-    const result = await this.#handlerRunner.run(this.#event, context)
+    this.#handlerRunDone = false
+
+    const result = await Promise.race([
+      this.#handlerRunner.run(this.#event, context),
+      ...(this.#noTimeout ? [] : [this.#timeoutAndTerminate()]),
+    ])
+
+    this.#handlerRunDone = true
 
     this.#stopExecutionTimer()
 
@@ -296,7 +329,7 @@ export default class LambdaFunction {
       )
     }
 
-    this.status = 'IDLE'
+    this.#status = 'IDLE'
     this.#startIdleTimer()
 
     return result

tests/integration/docker/access-host/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/artifact/serverless.yml

@@ -18,6 +18,7 @@ package:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/go/go1.x/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/layers/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/multiple/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/nodejs/nodejs12.x/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/provided/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/python/python3.6/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/python/python3.7/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/python/python3.8/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/integration/docker/ruby/ruby2.7/serverless.yml

@@ -15,6 +15,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions:

tests/lambda-run-mode/worker-threads/instances/worker-threads-instances.test.js

@@ -39,7 +39,7 @@ describe('run mode with worker threads', function desc() {
     const url = new URL('/dev/foo', BASE_URL)
 
     // eslint-disable-next-line no-unused-vars
-    for (const i of Array(10).keys()) {
+    for (const i of Array(5).keys()) {
       // eslint-disable-next-line no-await-in-loop
       const response = await fetch(url)
       // eslint-disable-next-line no-await-in-loop

tests/lambda-run-mode/worker-threads/timeout/worker-threads-timeout.test.js

@@ -51,7 +51,7 @@ describe('run mode with worker threads', function desc() {
     const url = new URL('/dev/foo', BASE_URL)
 
     // eslint-disable-next-line no-unused-vars
-    for (const i of Array(10).keys()) {
+    for (const i of Array(5).keys()) {
       // eslint-disable-next-line no-await-in-loop
       const response = await fetch(url)
       // eslint-disable-next-line no-await-in-loop

tests/runtimes/go/aws-golang-simple-http-endpoint/serverless.yml

@@ -11,6 +11,10 @@ package:
 plugins:
   - ../../../../
 
+custom:
+  serverless-offline:
+    noTimeout: true
+
 provider:
   name: aws
   runtime: go1.x

tests/runtimes/go/go1.x/serverless.yml

@@ -13,6 +13,10 @@ provider:
   stage: dev
   versionFunctions: false
 
+custom:
+  serverless-offline:
+    noTimeout: true
+
 functions:
   hello:
     events:

tests/scenario/docker/docker-serverless-webpack/app/serverless.yml

@@ -16,6 +16,7 @@ provider:
 
 custom:
   serverless-offline:
+    noTimeout: true
     useDocker: true
 
 functions: