[opinionated] Rename optional ssl to manual ssl

Author: gilbert

bin/config.js

@@ -79,7 +79,7 @@ async function fromArgs() {
       },
       acme,
       title       : (x, xs) => x || path.basename(xs.cwd),
-      secure      : (x, xs) => !!(xs.ssl.cert || xs.acme.domains.length || xs.ssl.mode === 'optional'),
+      secure      : (x, xs) => !!(xs.ssl.cert || xs.acme.domains.length || xs.ssl.mode === 'manual'),
       httpsPort   : (x, xs) => x || (xs.secure ? (x ? parseInt(x) : (xs.port || 443)) : null),
       httpPort    : (x, xs) => xs.secure && xs.ssl.mode === 'only' ? null : (xs.secure ? 80 : x ? parseInt(x) : (xs.port || 80)),
       address     : x => x || env.ADDRESS || '0.0.0.0',
@@ -208,8 +208,8 @@ function getPort(x, config) {
 
 function getMode(x) {
   x = x || env.SSL_MODE || 'redirect'
-  if (!'only redirect optional'.includes(x))
-    throw new Error('SSL Mode must be: only | redirect | optional')
+  if (!'only redirect manual'.includes(x))
+    throw new Error('SSL Mode must be: only | redirect | manual')
   return x
 }
 

bin/start/serve.js

@@ -64,9 +64,9 @@ 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 === 'optional') {
+  } else if (config.secure && config.ssl.mode === 'manual') {
     await router.listen(config.httpPort, config.address)
-    console.log('HTTP (optional) listening on', config.httpPort) // eslint-disable-line
+    console.log('HTTP (manual ssl) listening on', config.httpPort) // eslint-disable-line
   } else {
     await router.listen(config.httpPort, config.address)
     console.log('HTTP Listening on', config.httpPort) // eslint-disable-line

shared/server/index.js

@@ -127,7 +127,7 @@ export default function Server({
 
         port = parseInt(port)
         wrapper = wrap
-        isSsl = !!(o.cert || o.mode === 'optional')
+        isSsl = !!(o.cert || o.mode === 'manual')
         uws = isSsl
           ? uWS.SSLApp({ cert_file_name: o.cert, key_file_name: o.key, ...o })
           : uWS.App(o)

shared/server/request.js

@@ -146,7 +146,7 @@ export default class Request {
   }
 
   get protocol() {
-    return this.options.cert || this.options.mode === 'optional'
+    return this.options.cert || this.options.mode === 'manual'
       ? 'https'
       : header(this, 'x-forwarded-proto') || 'http'
   }