@@ -3,7 +3,6 @@ var tls = require('tls');
3
3
var http = require ( 'http' ) ;
4
4
var https = require ( 'https' ) ;
5
5
var ws = require ( 'ws' ) ;
6
- var _ = require ( 'underscore' ) ;
7
6
var url = require ( 'url' ) ;
8
7
var wsStream = require ( 'websocket-stream' ) ;
9
8
var async = require ( 'async' ) ;
@@ -53,7 +52,9 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
53
52
54
53
var servers = { } ;
55
54
56
- _ . each ( serverConfig , function ( config , id ) {
55
+ Object . keys ( serverConfig ) . forEach ( function ( id ) {
56
+ var config = serverConfig [ id ] ;
57
+
57
58
if ( typeof config == 'string' ) {
58
59
var c = url . parse ( config ) ;
59
60
config = {
@@ -63,9 +64,8 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
63
64
} ;
64
65
}
65
66
66
- config = _ . defaults ( config , sharedConfig , {
67
- host : 'localhost'
68
- } ) ;
67
+ config . host = config . host || sharedConfig . host || 'localhost' ;
68
+ config . ssl = config . ssl || sharedConfig . ssl ;
69
69
70
70
var server ;
71
71
@@ -79,33 +79,32 @@ module.exports = function(serverConfig, sharedConfig, clientStreamHandler){
79
79
server = createSecureWebSocketServer ( config . ssl , clientStreamHandler ) ;
80
80
}
81
81
82
- server . _host = config . host ;
83
- server . _port = config . port ;
82
+ server . _css_host = config . host ;
83
+ server . _css_port = config . port ;
84
84
85
85
servers [ id ] = server ;
86
86
} ) ;
87
87
88
88
return {
89
89
servers : servers ,
90
90
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 ( ) { } ) ;
99
98
} ,
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 ( ) { } ) ;
104
103
} ,
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 ( ) { } ) ;
109
108
}
110
109
} ;
111
110
} ;
0 commit comments