Merge pull request http-party#463 from thornjad/brotli-en...

...coding

Add support for brotli encoding

Author: thornjad

README.md

@@ -43,7 +43,9 @@ Using `npx` you can run the script without installing it first:
 
 `-i` Display autoIndex (defaults to `true`)
 
-`-g` or `--gzip` When enabled (defaults to `false`) it will serve `./public/some-file.js.gz` in place of `./public/some-file.js` when a gzipped version of the file exists and the request accepts gzip encoding.
+`-g` or `--gzip` When enabled (defaults to `false`) it will serve `./public/some-file.js.gz` in place of `./public/some-file.js` when a gzipped version of the file exists and the request accepts gzip encoding. If brotli is also enabled, it will try to serve brotli first.
+
+`-b` or `--brotli` When enabled (defaults to `false`) it will serve `./public/some-file.js.br` in place of `./public/some-file.js` when a brotli compressed version of the file exists and the request accepts `br` encoding. If gzip is also enabled, it will try to serve brotli first.
 
 `-e` or `--ext` Default file extension if none supplied (defaults to `html`)
 

bin/http-server

@@ -24,6 +24,8 @@ if (argv.h || argv.help) {
     '  -d           Show directory listings [true]',
     '  -i           Display autoIndex [true]',
     '  -g --gzip    Serve gzip files when possible [false]',
+    '  -b --brotli  Serve brotli files when possible [false]',
+    '               If both brotli and gzip are enabled, brotli takes precedence',
     '  -e --ext     Default file extension if none supplied [none]',
     '  -s --silent  Suppress log messages from output',
     '  --cors[=headers]   Enable CORS via the "Access-Control-Allow-Origin" header',
@@ -109,6 +111,7 @@ function listen(port) {
     showDir: argv.d,
     autoIndex: argv.i,
     gzip: argv.g || argv.gzip,
+    brotli: argv.b || argv.brotli,
     robots: argv.r || argv.robots,
     ext: argv.e || argv.ext,
     logFn: logger.request,

lib/http-server.js

@@ -56,6 +56,7 @@ function HttpServer(options) {
   this.autoIndex = options.autoIndex !== 'false';
   this.showDotfiles = options.showDotfiles;
   this.gzip = options.gzip === true;
+  this.brotli = options.brotli === true;
   this.contentType = options.contentType || 'application/octet-stream';
 
   if (options.ext) {
@@ -130,6 +131,7 @@ function HttpServer(options) {
     autoIndex: this.autoIndex,
     defaultExt: this.ext,
     gzip: this.gzip,
+    brotli: this.brotli,
     contentType: this.contentType,
     handleError: typeof options.proxy !== 'string'
   }));

test/fixtures/root/compression/index.html

@@ -0,0 +1 @@
+I'm not compressed!

test/fixtures/root/compression/index.html.br

@@ -0,0 +1,3 @@
+
+�im brotli compressed!!
+

test/fixtures/root/compression/index.html.gz

@@ -158,6 +158,59 @@ vows.describe('http-server').addBatch({
       }
     }
   },
+  'When gzip and brotli compression is enabled and a compressed file is available': {
+    topic: function () {
+      var server = httpServer.createServer({
+        root: root,
+        brotli: true,
+        gzip: true
+      });
+      server.listen(8084);
+      this.callback(null, server);
+    },
+    'and a request accepting only gzip is made': {
+      topic: function () {
+        request({
+          uri: 'http://127.0.0.1:8084/compression/',
+          headers: {
+            'accept-encoding': 'gzip'
+          }
+        }, this.callback);
+      },
+      'response should be gzip compressed': function (err, res, body) {
+        assert.equal(res.statusCode, 200);
+        assert.equal(res.headers['content-encoding'], 'gzip');
+      }
+    },
+    'and a request accepting only brotli is made': {
+      topic: function () {
+        request({
+          uri: 'http://127.0.0.1:8084/compression/',
+          headers: {
+            'accept-encoding': 'br'
+          }
+        }, this.callback);
+      },
+      'response should be brotli compressed': function (err, res, body) {
+        assert.equal(res.statusCode, 200);
+        assert.equal(res.headers['content-encoding'], 'br');
+      }
+    },
+    'and a request accepting both brotli and gzip is made': {
+      topic: function () {
+        request({
+          uri: 'http://127.0.0.1:8084/compression/',
+          headers: {
+            'accept-encoding': 'gzip, br'
+          }
+        }, this.callback);
+      },
+      'response should be brotli compressed': function (err, res, body) {
+        assert.equal(res.statusCode, 200);
+        assert.equal(res.headers['content-encoding'], 'br');
+      }
+    }
+  },
   'When http-server is listening on 8083 with username "good_username" and password "good_password"': {
     topic: function () {
       var server = httpServer.createServer({