serve web: Fix socket support (#8936)

redwoodjs · Jul 20, 2023 · fdc9a17 · fdc9a17
1 parent dbcde88
commit fdc9a17
Showing 1 changed file with 36 additions and 12 deletions.
diff --git a/packages/cli/src/commands/serveHandler.js b/packages/cli/src/commands/serveHandler.js
@@ -27,10 +27,18 @@ export const apiServerHandler = async (options) => {
     },
   })
 
-  fastify.listen({
-    port: socket ? parseInt(socket) : port,
-    host: process.env.NODE_ENV === 'production' ? '0.0.0.0' : '::',
-  })
+  let listenOptions
+
+  if (socket) {
+    listenOptions = { path: socket }
+  } else {
+    listenOptions = {
+      port,
+      host: process.env.NODE_ENV === 'production' ? '0.0.0.0' : '::',
+    }
+  }
+
+  fastify.listen(listenOptions)
 
   fastify.ready(() => {
     fastify.log.trace(
@@ -79,10 +87,18 @@ export const bothServerHandler = async (options) => {
     },
   })
 
-  fastify.listen({
-    port: socket ? parseInt(socket) : port,
-    host: process.env.NODE_ENV === 'production' ? '0.0.0.0' : '::',
-  })
+  let listenOptions
+
+  if (socket) {
+    listenOptions = { path: socket }
+  } else {
+    listenOptions = {
+      port,
+      host: process.env.NODE_ENV === 'production' ? '0.0.0.0' : '::',
+    }
+  }
+
+  fastify.listen(listenOptions)
 
   fastify.ready(() => {
     console.log(chalk.italic.dim('Took ' + (Date.now() - tsServer) + ' ms'))
@@ -136,10 +152,18 @@ export const webServerHandler = async (options) => {
     fastify.register(withApiProxy, { apiHost, apiUrl })
   }
 
-  fastify.listen({
-    port: socket ? parseInt(socket) : port,
-    host: process.env.NODE_ENV === 'production' ? '0.0.0.0' : '::',
-  })
+  let listenOptions
+
+  if (socket) {
+    listenOptions = { path: socket }
+  } else {
+    listenOptions = {
+      port,
+      host: process.env.NODE_ENV === 'production' ? '0.0.0.0' : '::',
+    }
+  }
+
+  fastify.listen(listenOptions)
 
   fastify.ready(() => {
     console.log(chalk.italic.dim('Took ' + (Date.now() - tsServer) + ' ms'))