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

transports: extract tls relevant logic from tcp.js to tls.js

Browse Source
This commit is contained in:
Micooz 2017-09-27 10:50:57 +08:00
parent 3386c8c84d
commit 09dc24da9e
No known key found for this signature in database
GPG Key ID: 002FB5DD584D6CB1
2 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/transports/tcp.js
View File

@ -1,5 +1,4 @@
import net from 'net';
import tls from 'tls';
import {Inbound, Outbound} from './defs';
import {MIDDLEWARE_DIRECTION_UPWARD, MIDDLEWARE_DIRECTION_DOWNWARD} from '../core';
import {logger, getRandomInt} from '../utils';
@ -93,9 +92,7 @@ export class TcpInbound extends Inbound {
}
if (this._outbound && !this._outbound.destroying) {
this._outbound.destroying = true;
// https://github.com/nodejs/node/issues/15005
const bufferSize = this._outbound.bufferSize - (__TRANSPORT__ === 'tls' ? 1 : 0);
if (bufferSize > 0) {
if (this._outbound.bufferSize > 0) {
this._outbound.once('drain', () => this._outbound.destroy());
} else {
this._outbound.destroy();
@ -237,9 +234,7 @@ export class TcpOutbound extends Outbound {
}
if (this._inbound && !this._inbound.destroying) {
this._inbound.destroying = true;
// https://github.com/nodejs/node/issues/15005
const bufferSize = this._inbound.bufferSize - (__TRANSPORT__ === 'tls' ? 1 : 0);
if (bufferSize > 0) {
if (this._inbound.bufferSize > 0) {
this._inbound.once('drain', () => this._inbound.destroy());
} else {
this._inbound.destroy();
@ -266,16 +261,21 @@ export class TcpOutbound extends Outbound {
async onConnectToRemote(action) {
const {host, port, onConnected} = action.payload;
if (__IS_SERVER__) {
await this.connect({host, port});
}
if (__IS_CLIENT__) {
logger.info(`[tcp:outbound] [${this.remote}] request: ${host}:${port}`);
await this.connect({host: __SERVER_HOST__, port: __SERVER_PORT__});
}
this._inbound._isConnectedToRemote = true; // TODO(refactor)
if (typeof onConnected === 'function') {
onConnected();
try {
if (__IS_SERVER__) {
await this.connect({host, port});
}
if (__IS_CLIENT__) {
logger.info(`[tcp:outbound] [${this.remote}] request: ${host}:${port}`);
await this.connect({host: __SERVER_HOST__, port: __SERVER_PORT__});
}
this._inbound._isConnectedToRemote = true; // TODO(refactor)
if (typeof onConnected === 'function') {
onConnected();
}
} catch (err) {
logger.warn(`[tcp:outbound] [${this.remote}] fail to connect to ${host}:${port} err=${err.message}`);
this._inbound.destroy();
}
}
@ -290,30 +290,25 @@ export class TcpOutbound extends Outbound {
}
async connect({host, port}) {
let ip = null;
try {
ip = await this._dnsCache.get(host);
} catch (err) {
logger.error(`[tcp:outbound] [${this.remote}] fail to resolve host ${host}: ${err.message}`);
// close living connection before create a new connection
if (this._socket && !this._socket.destroyed) {
this._socket.destroy();
this._socket = null;
}
this._socket = await this._connect({host, port});
this._socket.on('error', this.onError);
this._socket.on('close', this.destroy);
this._socket.on('timeout', this.onTimeout);
this._socket.on('data', this.onReceive);
this._socket.on('drain', () => this.emit('drain'));
this._socket.setTimeout(__TIMEOUT__);
}
async _connect({host, port}) {
const ip = await this._dnsCache.get(host);
logger.info(`[tcp:outbound] [${this.remote}] connecting to: ${host}(${ip}):${port}`);
return new Promise((resolve) => {
// close living connection before create a new connection
if (this._socket && !this._socket.destroyed) {
this._socket.destroy();
this._socket = null;
}
if (__IS_CLIENT__ && __TRANSPORT__ === 'tls') {
this._socket = tls.connect({host, port, ca: [__TLS_CERT__]}, () => resolve(this._socket));
} else {
this._socket = net.connect({host: ip, port}, () => resolve(this._socket));
}
this._socket.on('error', this.onError);
this._socket.on('close', this.destroy);
this._socket.on('timeout', this.onTimeout);
this._socket.on('data', this.onReceive);
this._socket.on('drain', () => this.emit('drain'));
this._socket.setTimeout(__TIMEOUT__);
const socket = net.connect({host: ip, port}, () => resolve(socket));
});
}

20
src/transports/tls.js
View File

@ -1,9 +1,29 @@
import tls from 'tls';
import {TcpInbound, TcpOutbound} from './tcp';
import {logger} from '../utils';
export class TlsInbound extends TcpInbound {
// https://github.com/nodejs/node/issues/15005
get bufferSize() {
return super.bufferSize - 1;
}
}
export class TlsOutbound extends TcpOutbound {
// https://github.com/nodejs/node/issues/15005
get bufferSize() {
return super.bufferSize - 1;
}
// overwrite _connect of tcp outbound using tls.connect()
async _connect({host, port}) {
logger.info(`[tls:outbound] [${this.remote}] connecting to: ${host}:${port}`);
return new Promise((resolve) => {
const socket = tls.connect({host, port, ca: [__TLS_CERT__]}, () => resolve(socket));
});
}
}