chore: refactor netlify-function changes

package.json

@@ -94,7 +94,6 @@
     "@ungap/from-entries": "^0.2.1",
     "ansi-styles": "^5.0.0",
     "ascii-table": "0.0.9",
-    "async-mutex": "^0.3.1",
     "backoff": "^2.5.0",
     "better-opn": "^2.1.1",
     "body-parser": "^1.19.0",

src/lib/functions/netlify-function.js

@@ -1,12 +1,7 @@
-const { Mutex, withTimeout } = require('async-mutex')
-
 const { difference } = require('../../utils/difference')
 
 const BACKGROUND_SUFFIX = '-background'
 
-// 3 minutes
-const MUTEX_TIMEOUT = 18e4
-
 class NetlifyFunction {
   constructor({
     config,
@@ -36,7 +31,6 @@ class NetlifyFunction {
     // List of the function's source files. This starts out as an empty set
     // and will get populated on every build.
     this.srcFiles = new Set()
-    this.mutex = withTimeout(new Mutex(), MUTEX_TIMEOUT)
   }
 
   // The `build` method transforms source files into invocable functions. Its
@@ -45,29 +39,25 @@ class NetlifyFunction {
   // - `srcFilesDiff`: Files that were added and removed since the last time
   //    the function was built.
   async build({ cache }) {
-    try {
-      return await this.mutex.runExclusive(async () => {
-        const buildFunction = await this.runtime.getBuildFunction({
-          config: this.config,
-          errorExit: this.errorExit,
-          func: this,
-          functionsDirectory: this.functionsDirectory,
-          projectRoot: this.projectRoot,
-        })
+    const buildFunction = await this.runtime.getBuildFunction({
+      config: this.config,
+      errorExit: this.errorExit,
+      func: this,
+      functionsDirectory: this.functionsDirectory,
+      projectRoot: this.projectRoot,
+    })
 
-        try {
-          const { srcFiles, ...buildData } = await buildFunction({ cache })
-          const srcFilesSet = new Set(srcFiles)
-          const srcFilesDiff = this.getSrcFilesDiff(srcFilesSet)
+    this.buildQueue = buildFunction({ cache })
 
-          this.buildData = buildData
-          this.srcFiles = srcFilesSet
+    try {
+      const { srcFiles, ...buildData } = await this.buildQueue
+      const srcFilesSet = new Set(srcFiles)
+      const srcFilesDiff = this.getSrcFilesDiff(srcFilesSet)
 
-          return { srcFilesDiff }
-        } catch (error) {
-          return { error }
-        }
-      })
+      this.buildData = buildData
+      this.srcFiles = srcFilesSet
+
+      return { srcFilesDiff }
     } catch (error) {
       return { error }
     }
@@ -87,22 +77,18 @@ class NetlifyFunction {
 
   // Invokes the function and returns its response object.
   async invoke(event, context) {
-    try {
-      return await this.mutex.runExclusive(async () => {
-        const timeout = this.isBackground ? this.timeoutBackground : this.timeoutSynchronous
+    await this.buildQueue
 
-        try {
-          const result = await this.runtime.invokeFunction({
-            context,
-            event,
-            func: this,
-            timeout,
-          })
-          return { result, error: null }
-        } catch (error) {
-          return { result: null, error }
-        }
+    const timeout = this.isBackground ? this.timeoutBackground : this.timeoutSynchronous
+
+    try {
+      const result = await this.runtime.invokeFunction({
+        context,
+        event,
+        func: this,
+        timeout,
       })
+      return { result, error: null }
     } catch (error) {
       return { result: null, error }
     }