refactor: follow-ups to 5998 (#6044)

* refactor: reuse regex in isFunction * refactor: always rely on getFunctionForURLPath
netlify · Oct 10, 2023 · 25a10d2 · 25a10d2 · github-actions · Oct 10, 2023
1 parent e7d258b
commit 25a10d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/lib/functions/registry.mjs b/src/lib/functions/registry.mjs
@@ -24,7 +24,7 @@ import { getPathInProject } from '../settings.mjs'
 import NetlifyFunction from './netlify-function.mjs'
 import runtimes from './runtimes/index.mjs'
 
-const DEFAULT_URL_EXPRESSION = /^\/.netlify\/(functions|builders)\/([^/]+).*/
+export const DEFAULT_FUNCTION_URL_EXPRESSION = /^\/.netlify\/(functions|builders)\/([^/]+).*/
 const TYPES_PACKAGE = '@netlify/functions'
 const ZIP_EXTENSION = '.zip'
 
@@ -238,7 +238,7 @@ export class FunctionsRegistry {
     // the incoming URL. It doesn't really matter that we don't have the actual
     // local URL with the correct port.
     const urlPath = new URL(url, 'http://localhost').pathname
-    const defaultURLMatch = urlPath.match(DEFAULT_URL_EXPRESSION)
+    const defaultURLMatch = urlPath.match(DEFAULT_FUNCTION_URL_EXPRESSION)
 
     if (defaultURLMatch) {
       const func = this.get(defaultURLMatch[2])

diff --git a/src/utils/proxy.mjs b/src/utils/proxy.mjs
@@ -27,6 +27,7 @@ import {
   isEdgeFunctionsRequest,
 } from '../lib/edge-functions/proxy.mjs'
 import { fileExistsAsync, isFileAsync } from '../lib/fs.mjs'
+import { DEFAULT_FUNCTION_URL_EXPRESSION } from '../lib/functions/registry.mjs'
 import renderErrorTemplate from '../lib/render-error-template.mjs'
 
 import { NETLIFYDEVLOG, NETLIFYDEVWARN, log, chalk } from './command-helpers.mjs'
@@ -87,7 +88,7 @@ function isInternal(url) {
  * @param {string} url
  */
 function isFunction(functionsPort, url) {
-  return functionsPort && url.match(/^\/.netlify\/(functions|builders)\/.+/)
+  return functionsPort && url.match(DEFAULT_FUNCTION_URL_EXPRESSION)
 }
 
 /**
@@ -328,24 +329,24 @@ const serveRedirect = async function ({ env, functionsRegistry, match, options,
       return proxy.web(req, res, { target: options.functionsServer })
     }
 
-    const functionWithCustomRoute =
-      functionsRegistry && (await functionsRegistry.getFunctionForURLPath(destURL, req.method))
+    const matchingFunction = functionsRegistry && (await functionsRegistry.getFunctionForURLPath(destURL, req.method))
     const destStaticFile = await getStatic(dest.pathname, options.publicFolder)
     let statusValue
     if (
       match.force ||
-      (!staticFile && ((!options.framework && destStaticFile) || isInternal(destURL) || functionWithCustomRoute))
+      (!staticFile && ((!options.framework && destStaticFile) || isInternal(destURL) || matchingFunction))
     ) {
       req.url = destStaticFile ? destStaticFile + dest.search : destURL
       const { status } = match
       statusValue = status
       console.log(`${NETLIFYDEVLOG} Rewrote URL to`, req.url)
     }
 
-    if (isFunction(options.functionsPort, req.url) || functionWithCustomRoute) {
-      const functionHeaders = functionWithCustomRoute
-        ? { [NFFunctionName]: functionWithCustomRoute.func.name, [NFFunctionRoute]: functionWithCustomRoute.route }
-        : {}
+    if (matchingFunction) {
+      const functionHeaders = {
+        [NFFunctionName]: matchingFunction.func.name,
+        [NFFunctionRoute]: matchingFunction.route,
+      }
       const url = reqToURL(req, originalURL)
       req.headers['x-netlify-original-pathname'] = url.pathname
       req.headers['x-netlify-original-search'] = url.search