Skip to content

Commit c814a56

Browse files
committed
removed underscore dependency
1 parent 1885e3f commit c814a56

File tree

2 files changed

+22
-24
lines changed

2 files changed

+22
-24
lines changed

index.js

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var tls = require('tls');
33
var http = require('http');
44
var https = require('https');
55
var ws = require('ws');
6-
var _ = require('underscore');
76
var url = require('url');
87
var wsStream = require('websocket-stream');
98
var async = require('async');
@@ -53,7 +52,9 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
5352

5453
var servers = {};
5554

56-
_.each(serverConfig, function(config, id){
55+
Object.keys(serverConfig).forEach(function(id) {
56+
var config = serverConfig[id];
57+
5758
if(typeof config == 'string') {
5859
var c = url.parse(config);
5960
config = {
@@ -63,9 +64,8 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
6364
};
6465
}
6566

66-
config = _.defaults(config, sharedConfig, {
67-
host: 'localhost'
68-
});
67+
config.host = config.host || sharedConfig.host || 'localhost';
68+
config.ssl = config.ssl || sharedConfig.ssl;
6969

7070
var server;
7171

@@ -79,33 +79,32 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
7979
server = createSecureWebSocketServer(config.ssl, clientStreamHandler);
8080
}
8181

82-
server._host = config.host;
83-
server._port = config.port;
82+
server._css_host = config.host;
83+
server._css_port = config.port;
8484

8585
servers[id] = server;
8686
});
8787

8888
return {
8989
servers: servers,
9090
listen: function(callback){
91-
async.series(_.map(servers, function(server){
92-
return function(cb){
93-
server.listen(server._port, server._host, function(){
94-
enableDestroy(server);
95-
cb();
96-
});
97-
}
98-
}), callback);
91+
async.mapSeries(Object.keys(servers), function(id, cb){
92+
var server = servers[id];
93+
server.listen(server._css_port, server._css_host, function(){
94+
enableDestroy(server);
95+
cb();
96+
});
97+
}, callback || function(){});
9998
},
100-
close: function(cb){
101-
async.series(_.map(servers, function(server){
102-
return server.close.bind(server);
103-
}), cb);
99+
close: function(callback){
100+
async.mapSeries(Object.keys(servers), function(id, cb){
101+
servers[id].close(cb);
102+
}, callback || function(){});
104103
},
105-
destroy: function(cb){
106-
async.series(_.map(servers, function(server){
107-
return server.destroy.bind(server);
108-
}), cb);
104+
destroy: function(callback){
105+
async.mapSeries(Object.keys(servers), function(id, cb){
106+
servers[id].destroy(cb);
107+
}, callback || function(){});
109108
}
110109
};
111110
};

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"dependencies": {
2323
"async": "0.9.0",
2424
"server-destroy": "1.0.0",
25-
"underscore": "1.7.0",
2625
"websocket-stream": "1.3.2",
2726
"ws": "0.7.0"
2827
},

0 commit comments

Comments
 (0)