serverless-offline 11.1.0 → 11.1.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {

package/src/lambda/LambdaFunctionPool.js

@@ -25,9 +25,11 @@ export default class LambdaFunctionPool {
 
     // NOTE: don't use setInterval, as it would schedule always a new run,
     // regardless of function processing time and e.g. user action (debugging)
-    this.#timerRef = setTimeout(() => {
+    this.#timerRef = setTimeout(async () => {
+      const cleanupWait = []
+
       // console.log('run cleanup')
-      this.#pool.forEach((lambdaFunctions) => {
+      this.#pool.forEach((lambdaFunctions, functionKey) => {
         lambdaFunctions.forEach((lambdaFunction) => {
           const { idleTimeInMillis, status } = lambdaFunction
 
@@ -35,37 +37,43 @@ export default class LambdaFunctionPool {
             status === 'IDLE' &&
             idleTimeInMillis >= functionCleanupIdleTimeInMillis
           ) {
-            // console.log(`removed Lambda Function ${lambdaFunction.functionName}`)
-            lambdaFunction.cleanup()
+            cleanupWait.push(lambdaFunction.cleanup())
+
             lambdaFunctions.delete(lambdaFunction)
           }
         })
+
+        if (lambdaFunctions.size === 0) {
+          this.#pool.delete(functionKey)
+        }
       })
 
+      await Promise.all(cleanupWait)
+
       // schedule new timer
       this.#startCleanTimer()
     }, functionCleanupIdleTimeInMillis)
   }
 
-  #cleanupPool() {
-    const wait = []
+  async #cleanupPool() {
+    const cleanupWait = []
 
     this.#pool.forEach((lambdaFunctions) => {
       lambdaFunctions.forEach((lambdaFunction) => {
-        // collect promises
-        wait.push(lambdaFunction.cleanup())
-        lambdaFunctions.delete(lambdaFunction)
+        cleanupWait.push(lambdaFunction.cleanup())
       })
     })
 
-    return Promise.all(wait)
+    await Promise.all(cleanupWait)
+
+    this.#pool.clear()
   }
 
   // TODO make sure to call this
   async cleanup() {
     clearTimeout(this.#timerRef)
 
-    return this.#cleanupPool()
+    await this.#cleanupPool()
   }
 
   get(functionKey, functionDefinition) {