Specify port via ENV

daquinoaldo · daquinoaldo · commit c0b957d587fa · 2018-09-03T17:58:39.000+02:00
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Serve static files or import as module in your project.
 [![npm version](https://img.shields.io/npm/v/https-localhost.svg)](https://www.npmjs.com/package/https-localhost?activeTab=versions)
 
 
-### Install and trust the certificate
+## Install and trust the certificate
 Add the root certificate we just generated to your list of trusted certificates.
 This step depends on the operating system you're running:
 
@@ -23,15 +23,15 @@ menu and select the file. Then double-click on the certificate and select always
 the generated root certificate as trusted.
 
 
-### Run
+## Run
 
-#### Use standalone
+### Use standalone
 From terminal navigate into the folder and run `sudo npm install -g` to install this tool globally.
 
 Then serve static file with `sudo serve <static-path>`.
 
 
-#### Use as module
+### Use as module
 Install the dependency with `npm install -s https-localhost`.  
 Then just require this module, it will start the server automatically.
 
@@ -41,6 +41,14 @@ const app = require('https-localhost')
 app.get('/', (req, res) => res.send('Hello World!'))
 ```
 
+#### Specify the port
+You can specify the port number of the SSL port with `sudo PORT=<port-number> serve <static-path>`
+or from another module with `process.env.PORT = <port-number>`.
+
+If you specify a port number the http redirect to https will be disabled.
+You can activate the http redirect again specifying not only the PORT environment variable but also the HTTP_PORT one.
+
+#### Close the server
 You can close the server with `app.close()`.  
 Closing the server is an async operation, you can get notified with `app.close(callback)` or `app.close().then(...)`.
 
diff --git a/index.js b/index.js
@@ -7,15 +7,21 @@ const https = require('spdy') // using HTTP/2: spdy will be deprecated soon, wai
 const express = require('express')
 const compression = require('compression')
 
-// SSL certificate
+// SSL CERTIFICATE
 const certOptions = {
   key: fs.readFileSync(path.resolve(__dirname + "/cert/server.key")),
   cert: fs.readFileSync(path.resolve(__dirname + "/cert/server.crt"))
 }
 
-// run express on 443
+const port = process.env.PORT || 443
+
+
+// START THE APP
+
+// run express
 const app = express()
-app.server = https.createServer(certOptions, app).listen(443)
+app.server = https.createServer(certOptions, app).listen(port)
+
 // save sockets for fast close
 const sockets = []
 let nextSocketId = 0
@@ -30,27 +36,30 @@ app.use(compression())
 app.set('json spaces', 0)
 
 // redirect http to https
-app.http = http.createServer(function (req, res) {
-  res.writeHead(301, { "Location": "https://" + req.headers['host'] + req.url })
-  res.end()
-}).listen(80)
-// save sockets for fast close
-app.server.on('connection', socket => {
-  const socketId = nextSocketId++
-  sockets[socketId] = socket
-  socket.on('close', () => delete sockets[socketId])
-})
+if (port === 443 || process.env.HTTP_PORT) {
+  app.http = http.createServer(function (req, res) {
+    res.writeHead(301, {"Location": "https://" + req.headers['host'] + req.url})
+    res.end()
+  }).listen(process.env.HTTP_PORT || 80)
 
-// ready
-if (!process.env.TEST) console.info("Server running on port 443.")
+  app.http.on('connection', socket => {
+    const socketId = nextSocketId++
+    sockets[socketId] = socket
+    socket.on('close', () => delete sockets[socketId])
+  })
+}
 
-// serve static files, launch as: 'node index.js <static-path>'
+// SERVE STATIC FILES, if launched as: 'node index.js <static-path>'
 if (require.main === module) {  // called directly (not through require)
   const staticPath = process.argv[2]
   app.use(express.static(staticPath || process.cwd()))
 }
 
-// close the app
+// ready
+if (!process.env.TEST) console.info("Server running on port " + port + ".")
+
+
+// CLOSE THE APP
 app.close = (callback) => {
   const promises = [
     new Promise(resolve => app.http.close(resolve)),
