Support for static files with arbitrary mimetypes

Includes static binary files, and audio/video files that require range support

Author: shirish87

lib/server.js

@@ -8,17 +8,9 @@ var Log = require('./logger'),
   utils = require('./utils'),
   config = require('../lib/config'),
   proxyServer = require('./proxy').proxyServer,
-  chalk = require('chalk');
-
-var mimeTypes = {
-  'html': 'text/html',
-  'json': 'text/json',
-  'jpeg': 'image/jpeg',
-  'jpg': 'image/jpeg',
-  'png': 'image/png',
-  'js': 'text/javascript',
-  'css': 'text/css'
-};
+  chalk = require('chalk'),
+  mime = require('mime'),
+  send = require('send');
 
 
 exports.Server = function Server(bsClient, workers) {
@@ -37,7 +29,7 @@ exports.Server = function Server(bsClient, workers) {
       worker.markAckd();
     }
 
-    var getReporterPatch = function (mimeType) {
+    var getReporterPatch = function () {
       var scripts = [
         'json2.js',
         'browserstack.js',
@@ -53,7 +45,7 @@ exports.Server = function Server(bsClient, workers) {
       var filePath = path.relative(process.cwd(), filename);
       var pathMatches = (testFilePaths.indexOf(filePath) !== -1);
 
-      if (pathMatches && mimeType === 'text/html') {
+      if (pathMatches) {
         var framework = config['test_framework'];
         var tag_name = (framework === 'mocha') ? 'head' : 'body';
         var patch = '$1';
@@ -98,13 +90,12 @@ exports.Server = function Server(bsClient, workers) {
         return;
       }
 
-      var mimeType = mimeTypes[path.extname(filename).split('.')[1]];
       response.writeHead(200, {
-        'Content-Type': mimeType + '; charset=utf-8',
+        'Content-Type': 'text/html; charset=utf-8'
       });
       var tag_name = (config['test_framework'] === 'mocha') ? 'head' : 'body';
       var matcher = new RegExp('(.*)<\/' + tag_name + '>'); ///(.*)<\/body>/;
-      var patch = getReporterPatch(mimeType);
+      var patch = getReporterPatch();
       data = data.replace(matcher, patch);
 
       response.write(data);
@@ -113,12 +104,12 @@ exports.Server = function Server(bsClient, workers) {
 
     if (!doNotUseProxy && config.test_server) {
       proxyServer.onRequest(request, response, config.test_server, function(remote_response, response_data) {
-        var mimeType = mimeTypes[path.extname(filename).split('.')[1]];
+        var mimeType = mime.lookup(filename);
         var final_data = response_data;
         var headers = remote_response.headers;
         if (mimeType === 'text/html') {
           var matcher = /(.*)<\/head>/;
-          var patch = getReporterPatch(mimeType);
+          var patch = getReporterPatch();
           final_data = response_data.replace(matcher, patch);
           headers['content-length'] = final_data.length;
         }
@@ -144,7 +135,19 @@ exports.Server = function Server(bsClient, workers) {
           filename = filename + (filename.lastIndexOf('/') === filename.length - 1 ? '' : '/') + 'index.html';
         }
 
-        fs.readFile(filename, {encoding: 'utf8'}, writeResponse);
+        var mimeType = mime.lookup(filename);
+        if (mimeType === 'text/html') {
+          fs.readFile(filename, { encoding: 'utf8' }, function (err, data) {
+            writeResponse(err, data);
+          });
+        } else {
+          send(request, filename)
+            .on('error', function onSendError(err) {
+              response.statusCode = err.status || 500;
+              response.end(err.message || 'Internal Server Error');
+            })
+            .pipe(response);
+        }
       });
     }
   }

package.json

@@ -10,6 +10,8 @@
   "dependencies": {
     "browserstack": "1.1.0",
     "chalk": "0.4.0",
+    "mime": "1.3.4",
+    "send": "0.13.0",
     "tunnel": "0.0.3"
   },
   "devDependencies": {