Allow multiple listen calls

Author: gilbert

bin/start/serve.js

@@ -65,7 +65,7 @@ async function listenHttp() {
     await redirect.listen(config.httpPort, config.address)
     console.log('HTTP Redirecting to HTTPS on', config.httpPort) // eslint-disable-line
   } else if (config.secure && config.ssl.mode === 'manual') {
-    await router.listen(config.httpPort, config.address)
+    await router.listen(config.httpPort, config.address, { mode: 'manual' })
     console.log('HTTP (manual ssl) listening on', config.httpPort) // eslint-disable-line
   } else {
     await router.listen(config.httpPort, config.address)

shared/server/index.js

@@ -12,7 +12,6 @@ export default function Server({
   ...o
 } = {}) {
   let uws
-    , isSsl
     , handle
     , wrapper
 
@@ -43,7 +42,6 @@ export default function Server({
   return router
 
   function addServerName(name, options) {
-    if (!isSsl) return
     uws.addServerName(name, options)
     uws.domain(name).any('/*', wrapper)
   }
@@ -127,25 +125,26 @@ export default function Server({
 
         port = parseInt(port)
         wrapper = wrap
-        isSsl = !!(o.cert || o.mode === 'manual')
-        uws = isSsl
-          ? uWS.SSLApp({ cert_file_name: o.cert, key_file_name: o.key, ...o })
-          : uWS.App(o)
-        asn.forEach(xs => addServerName(...xs))
-        rsn.forEach(xs => removeServerName(...xs))
-        msn.forEach(xs => uws.missingServerName(...xs))
-        connects.forEach((xs) => uws.connect(...xs))
-        wss.forEach(([pattern, handlers]) =>
-          uws.ws(
-            pattern,
-            {
-              maxPayloadLength: 128 * 1024,
-              ...handlers,
-              ...(handlers.upgrade ? { upgrade: upgrader(o, pattern, handlers) } : {})
-            }
+        if (!uws) {
+          uws = !!(o.cert || o.mode === 'manual')
+            ? uWS.SSLApp({ cert_file_name: o.cert, key_file_name: o.key, ...o })
+            : uWS.App(o)
+          asn.forEach(xs => addServerName(...xs))
+          rsn.forEach(xs => removeServerName(...xs))
+          msn.forEach(xs => uws.missingServerName(...xs))
+          connects.forEach((xs) => uws.connect(...xs))
+          wss.forEach(([pattern, handlers]) =>
+            uws.ws(
+              pattern,
+              {
+                maxPayloadLength: 128 * 1024,
+                ...handlers,
+                ...(handlers.upgrade ? { upgrade: upgrader(o, pattern, handlers) } : {})
+              }
+            )
           )
-        )
-        uws.any('/*', wrap)
+          uws.any('/*', wrap)
+        }
 
         address
           ? uws.listen(address, port, callback)