fix: show proper req.url in HTTPS mode

src/lib/edge-functions/bootstrap.mjs

@@ -1,5 +1,5 @@
 import { env } from 'process'
 
-const latestBootstrapURL = 'https://64c264287e9cbb0008621df3--edge.netlify.com/bootstrap/index-combined.ts'
+const latestBootstrapURL = 'https://deploy-preview-294--edge.netlify.app/bootstrap/index-combined.ts'
 
 export const getBootstrapURL = () => env.NETLIFY_EDGE_BOOTSTRAP || latestBootstrapURL

src/lib/edge-functions/headers.mjs

@@ -5,6 +5,7 @@ export const headers = {
   DeployID: 'x-nf-deploy-id',
   FeatureFlags: 'x-nf-feature-flags',
   ForwardedHost: 'x-forwarded-host',
+  ForwardedProtocol: 'x-forwarded-proto',
   Functions: 'x-nf-edge-functions',
   InvocationMetadata: 'x-nf-edge-functions-metadata',
   Geo: 'x-nf-geo',

src/lib/edge-functions/proxy.mjs

@@ -94,8 +94,8 @@ export const initializeProxy = async ({
   inspectSettings,
   mainPort,
   offline,
-  passthroughPort,
   projectDir,
+  settings,
   siteInfo,
   state,
 }) => {
@@ -122,6 +122,7 @@ export const initializeProxy = async ({
     internalFunctions,
     port: isolatePort,
     projectDir,
+    settings,
   })
   const hasEdgeFunctions = userFunctionsPath !== undefined || internalFunctionsPath
 
@@ -167,11 +168,11 @@ export const initializeProxy = async ({
     }
 
     const featureFlags = ['edge_functions_bootstrap_failure_mode']
-    const forwardedHost = `localhost:${passthroughPort}`
 
     req[headersSymbol] = {
       [headers.FeatureFlags]: getFeatureFlagsHeader(featureFlags),
-      [headers.ForwardedHost]: forwardedHost,
+      [headers.ForwardedHost]: req.headers.host,
+      [headers.ForwardedProtocol]: req.socket.encrypted ? 'https:' : 'http:',
       [headers.Functions]: functionNames.join(','),
       [headers.InvocationMetadata]: getInvocationMetadataHeader(invocationMetadata),
       [headers.IP]: LOCAL_HOST,
@@ -182,13 +183,6 @@ export const initializeProxy = async ({
       req[headersSymbol][headers.DebugLogging] = '1'
     }
 
-    // If we're using a different port for passthrough requests, which is the
-    // case when the CLI is running on HTTPS, use it on the Host header so
-    // that the request URL inside the edge function is something accessible.
-    if (mainPort !== passthroughPort) {
-      req[headersSymbol].host = forwardedHost
-    }
-
     return `http://${LOCAL_HOST}:${isolatePort}`
   }
 }
@@ -207,6 +201,7 @@ const prepareServer = async ({
   internalFunctions,
   port,
   projectDir,
+  settings,
 }) => {
   // Merging internal with user-defined import maps.
   const importMapPaths = [...importMaps, config.functions['*'].deno_import_map]
@@ -227,6 +222,7 @@ const prepareServer = async ({
       importMapPaths,
       inspectSettings,
       port,
+      certificatePath: settings?.https?.certFilePath,
     })
     const registry = new EdgeFunctionsRegistry({
       bundler,

src/utils/proxy.mjs

@@ -13,7 +13,6 @@ import contentType from 'content-type'
 import cookie from 'cookie'
 import { getProperty } from 'dot-prop'
 import generateETag from 'etag'
-import getAvailablePort from 'get-port'
 import httpProxy from 'http-proxy'
 import { createProxyMiddleware } from 'http-proxy-middleware'
 import jwtDecode from 'jwt-decode'
@@ -681,7 +680,6 @@ export const startProxy = async function ({
   siteInfo,
   state,
 }) {
-  const secondaryServerPort = settings.https ? await getAvailablePort() : null
   const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null
   const edgeFunctionsProxy = await initializeEdgeFunctionsProxy({
     config,
@@ -694,10 +692,10 @@ export const startProxy = async function ({
     inspectSettings,
     mainPort: settings.port,
     offline,
-    passthroughPort: secondaryServerPort || settings.port,
     projectDir,
     siteInfo,
     accountId,
+    settings,
     state,
   })
   const proxy = await initializeProxy({
@@ -742,19 +740,6 @@ export const startProxy = async function ({
 
   const eventQueue = [once(primaryServer, 'listening')]
 
-  // If we're running the main server on HTTPS, we need to start a secondary
-  // server on HTTP for receiving passthrough requests from edge functions.
-  // This lets us run the Deno server on HTTP and avoid the complications of
-  // Deno talking to Node on HTTPS with potentially untrusted certificates.
-  if (secondaryServerPort) {
-    const secondaryServer = http.createServer(onRequestWithOptions)
-
-    secondaryServer.on('upgrade', onUpgrade)
-    secondaryServer.listen({ port: secondaryServerPort })
-
-    eventQueue.push(once(secondaryServer, 'listening'))
-  }
-
   await Promise.all(eventQueue)
 
   return getProxyUrl(settings)

tests/integration/200.command.dev.test.cjs

@@ -244,6 +244,10 @@ export const handler = async function () {
 
               return new Response(text.toUpperCase(), res)
             }
+
+            if (req.url.includes('?ef=url')) {
+              return new Response(req.url)
+            }
           },
           name: 'hello',
         })
@@ -255,6 +259,12 @@ export const handler = async function () {
       ])
       await withDevServer({ cwd: builder.directory, args }, async ({ port }) => {
         const options = { https: { rejectUnauthorized: false } }
+        t.is(
+          await got(`https://localhost:${port}/?ef=url`, {
+            ...options,
+          }).text(),
+          `https://localhost:${port}/?ef=url`,
+        )
         t.is(await got(`https://localhost:${port}`, options).text(), 'index')
         t.is(await got(`https://localhost:${port}?ef=true`, options).text(), 'INDEX')
         t.is(await got(`https://localhost:${port}?ef=fetch`, options).text(), 'ORIGIN')