Clean up and add tests for HTTPS support

src/Bundler.js

@@ -475,7 +475,7 @@ class Bundler extends EventEmitter {
     return Server.middleware(this);
   }
 
-  async serve(port = 1234, https) {
+  async serve(port = 1234, https = false) {
     let server = await Server.serve(this, port, https);
     this.bundle();
     return server;

src/Server.js

@@ -3,7 +3,6 @@ const https = require('https');
 const serveStatic = require('serve-static');
 const getPort = require('get-port');
 const serverErrors = require('./utils/customErrors').serverErrors;
-
 const generateCertificate = require('./utils/generateCertificate');
 
 function middleware(bundler) {
@@ -57,11 +56,14 @@ function middleware(bundler) {
   };
 }
 
-async function serve(bundler, port, https) {
+async function serve(bundler, port, useHTTPS = false) {
+  let handler = middleware(bundler);
+  let server = useHTTPS
+    ? https.createServer(generateCertificate(), handler)
+    : http.createServer(handler);
+
   let freePort = await getPort({port});
-  let server = https
-    ? serveHttps(bundler, freePort)
-    : http.createServer(middleware(bundler)).listen(freePort);
+  server.listen(freePort);
 
   return new Promise((resolve, reject) => {
     server.on('error', err => {
@@ -76,6 +78,7 @@ async function serve(bundler, port, https) {
               `configured port ${port} could not be used.`
             )}`
           : '';
+
       bundler.logger.persistent(
         `Server running at ${bundler.logger.chalk.cyan(
           `${https ? 'https' : 'http'}://localhost:${server.address().port}`
@@ -87,10 +90,5 @@ async function serve(bundler, port, https) {
   });
 }
 
-function serveHttps(bundler, freePort) {
-  const {key, cert} = generateCertificate();
-  return https.createServer({key, cert}, middleware(bundler)).listen(freePort);
-}
-
 exports.middleware = middleware;
 exports.serve = serve;

test/server.js

@@ -2,6 +2,7 @@ const assert = require('assert');
 const fs = require('fs');
 const {bundler} = require('./utils');
 const http = require('http');
+const https = require('https');
 
 describe('server', function() {
   let server;
@@ -12,20 +13,28 @@ describe('server', function() {
     }
   });
 
-  function get(file) {
+  function get(file, client = http) {
     return new Promise((resolve, reject) => {
-      http.get('http://localhost:' + server.address().port + file, res => {
-        if (res.statusCode !== 200) {
-          return reject(new Error('Request failed: ' + res.statusCode));
-        }
+      client.get(
+        {
+          hostname: 'localhost',
+          port: server.address().port,
+          path: file,
+          rejectUnauthorized: false
+        },
+        res => {
+          if (res.statusCode !== 200) {
+            return reject(new Error('Request failed: ' + res.statusCode));
+          }
 
-        res.setEncoding('utf8');
-        let data = '';
-        res.on('data', c => (data += c));
-        res.on('end', () => {
-          resolve(data);
-        });
-      });
+          res.setEncoding('utf8');
+          let data = '';
+          res.on('data', c => (data += c));
+          res.on('end', () => {
+            resolve(data);
+          });
+        }
+      );
     });
   }
 
@@ -78,4 +87,12 @@ describe('server', function() {
     b.errored = false;
     await get('/');
   });
+
+  it('should support HTTPS', async function() {
+    let b = bundler(__dirname + '/integration/commonjs/index.js');
+    server = await b.serve(0, true);
+
+    let data = await get('/dist/index.js', https);
+    assert.equal(data, fs.readFileSync(__dirname + '/dist/index.js', 'utf8'));
+  });
 });