moony/blinksocks
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: refactor server creation

Browse Source
This commit is contained in:
Micooz 2018-06-17 18:29:39 +08:00
parent c046ece56a
commit a9ec378a42
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/hub.js
View File

@ -203,61 +203,56 @@ export class Hub {
async _createServerOnServer() { async _createServerOnServer() {
const { local_protocol, local_host, local_port, local_pathname, tls_key, tls_cert } = this._config; const { local_protocol, local_host, local_port, local_pathname, tls_key, tls_cert } = this._config;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const address = {
host: local_host,
port: local_port,
};
const onListening = (server) => {
const service = `${local_protocol}://${local_host}:${local_port}` + (local_pathname ? local_pathname : '');
logger.info(`[hub] blinksocks server is running at ${service}`);
resolve(server);
};
let server = null; let server = null;
switch (local_protocol) { switch (local_protocol) {
case 'tcp': { case 'tcp': {
server = net.createServer(); server = net.createServer();
server.on('connection', this._onConnection); server.on('connection', this._onConnection);
server.listen(address, () => onListening(server));
break; break;
} }
case 'wss': case 'wss':
case 'ws': { case 'ws': {
let http_s_server = null;
if (local_protocol === 'wss') { if (local_protocol === 'wss') {
http_s_server = https.createServer({ key: tls_key, cert: tls_cert }); server = https.createServer({ key: tls_key, cert: tls_cert });
} else { } else {
http_s_server = http.createServer(); server = http.createServer();
} }
server = new ws.Server({ const wss = new ws.Server({
server: http_s_server, server: server,
path: local_pathname, path: local_pathname,
perMessageDeflate: false, perMessageDeflate: false,
}); });
server.getConnections = server._server.getConnections.bind(server._server); wss.getConnections = wss._server.getConnections.bind(wss._server);
server.on('connection', (ws, req) => { wss.on('connection', (ws, req) => {
ws.remoteAddress = req.connection.remoteAddress; ws.remoteAddress = req.connection.remoteAddress;
ws.remotePort = req.connection.remotePort; ws.remotePort = req.connection.remotePort;
this._onConnection(ws); this._onConnection(ws);
}); });
http_s_server.listen(address, () => onListening(http_s_server));
break; break;
} }
case 'tls': { case 'tls': {
server = tls.createServer({ key: tls_key, cert: tls_cert }); server = tls.createServer({ key: tls_key, cert: tls_cert });
server.on('secureConnection', this._onConnection); server.on('secureConnection', this._onConnection);
server.listen(address, () => onListening(server));
break; break;
} }
case 'h2': { case 'h2': {
server = http2.createSecureServer({ key: tls_key, cert: tls_cert }); server = http2.createSecureServer({ key: tls_key, cert: tls_cert });
server.on('stream', (stream) => this._onConnection(stream)); server.on('stream', (stream) => this._onConnection(stream));
server.listen(address, () => onListening(server));
break; break;
} }
default: default:
return reject(Error(`unsupported protocol: "${local_protocol}"`)); return reject(Error(`unsupported protocol: "${local_protocol}"`));
} }
const address = {
host: local_host,
port: local_port,
};
server.on('error', reject); server.on('error', reject);
server.listen(address, () => {
const service = `${local_protocol}://${local_host}:${local_port}` + (local_pathname ? local_pathname : '');
logger.info(`[hub] blinksocks server is running at ${service}`);
resolve(server);
});
}); });
} }