Incremented coverage

daquinoaldo · daquinoaldo · commit 2921cc44a3b9 · 2018-09-11T10:33:52.000+02:00
diff --git a/README.md b/README.md
@@ -48,10 +48,6 @@ 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 a promise: `app.close().then(...)`.
-
 ---
 
 ### License
diff --git a/index.js b/index.js
@@ -21,55 +21,23 @@ const port = process.env.PORT || 443
 const app = express()
 app.server = https.createServer(certOptions, app).listen(port)
 
-// save sockets for fast close
-const sockets = []
-let nextSocketId = 0
-app.server.on("connection", socket => {
-  const socketId = nextSocketId++
-  sockets[socketId] = socket
-  socket.on("close", () => delete sockets[socketId])
-})
-
 // gzip compression and minify
 app.use(compression())
 app.set("json spaces", 0)
 
 // redirect http to https
-if (port === 443 || process.env.HTTP_PORT) {
+if (port === 443 || process.env.HTTP_PORT)
   app.http = http.createServer((req, res) => {
     res.writeHead(301, { Location: "https://" + req.headers["host"] + req.url })
     res.end()
   }).listen(process.env.HTTP_PORT || 80)
 
-  app.http.on("connection", socket => {
-    const socketId = nextSocketId++
-    sockets[socketId] = socket
-    socket.on("close", () => delete sockets[socketId])
-  })
-}
-
 // serve static files, if launched as: "node index.js <static-path>"
-if (require.main === module) {
-  const staticPath = process.argv[2]
-  app.use(express.static(staticPath || process.cwd()))
-}
+if (require.main === module)
+  app.use(express.static(process.argv[2] || process.cwd()))
 
 // ready
 console.info("Server running on port " + port + ".")
 
-// close the app
-app.close = () => {
-  const promises = [
-    new Promise(resolve => app.http.close(resolve)),
-    new Promise(resolve => app.server.close(resolve))
-  ]
-  // destroy all opens
-  for (const socketId in sockets)
-    sockets[socketId].destroy()
-  return Promise.all(promises).then(() => {
-    console.info("Server closed.")
-  })
-}
-
 // export as module
 module.exports = app
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "pretest": "eslint --ignore-path .gitignore .",
     "test": "mocha --exit",
-    "posttest": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec ./test/*.js",
+    "posttest": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec ./test/*.js --exit",
     "start": "node index.js"
   },
   "bin": {
diff --git a/test/test.js b/test/test.js
@@ -72,7 +72,8 @@ describe("Testing https-localhost", () => {
       .then(res => assert(res.data === "TEST"))
   })
   it("serve static file used as standalone tool", async function() {
-    await app.close()
+    process.env.PORT = 4444
+    process.env.HTTP_PORT = 8081
     runScript("index.js", ["test"], true)
       .then(process => proc = process) // eslint-disable-line no-return-assign
       .catch(err => console.error(err))
