support attaching to an existing http server

Author: 256dpi

index.js

@@ -26,6 +26,7 @@ function attachServer(server, clientHandler) {
   })).on('connection', function(ws) {
     clientHandler(wsStream(ws));
   });
+  return server;
 }
 
 function createWebSocketServer(clientHandler){
@@ -69,7 +70,10 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
 
     var server;
 
-    if(config.protocol == 'tcp') {
+    if(config.attach) {
+      server = attachServer(config.attach, clientStreamHandler);
+      server._css_exclude = true;
+    } else if(config.protocol == 'tcp') {
       server = createServer(clientStreamHandler);
     } else if(config.protocol == 'ssl') {
       server = createSecureServer(config.ssl, clientStreamHandler);
@@ -90,20 +94,25 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
     listen: function(callback){
       async.mapSeries(Object.keys(servers), function(id, cb){
         var server = servers[id];
+        if(server._css_exclude) return cb();
         server.listen(server._css_port, server._css_host, function(){
           enableDestroy(server);
-          cb();
+          return cb();
         });
       }, callback || function(){});
     },
     close: function(callback){
       async.mapSeries(Object.keys(servers), function(id, cb){
-        servers[id].close(cb);
+        var server = servers[id];
+        if(server._css_exclude) return cb();
+        server.close(cb);
       }, callback || function(){});
     },
     destroy: function(callback){
       async.mapSeries(Object.keys(servers), function(id, cb){
-        servers[id].destroy(cb);
+        var server = servers[id];
+        if(server._css_exclude) return cb();
+        server.destroy(cb);
       }, callback || function(){});
     }
   };

tests.js

@@ -2,6 +2,7 @@ var assert = require('assert');
 var fs = require('fs');
 var net = require('net');
 var tls = require('tls');
+var http = require('http');
 var ws = require('ws');
 
 var css = require('./index');
@@ -149,4 +150,20 @@ describe('create-stream-server', function(){
       });
     });
   });
+
+  it('should allow attaching ws servers to an existing http server', function(done) {
+    var httpServer = http.createServer();
+
+    var servers = css({
+      s3: {
+        attach: httpServer
+      }
+    }, function(){});
+
+    servers.listen(function () {
+      servers.close(function () {
+        done();
+      });
+    });
+  });
 });