Felix-sec/shadowsocks-over-websocket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update the default number of workers

Browse Source
This commit is contained in:
VincentChanX
2017-04-10 16:32:33 +08:00
parent 3bf624f397
commit 0c2b2e33ec
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@@ -16,7 +16,7 @@ server
.parse(process.argv); .parse(process.argv);
throng({ throng({
workers: process.env.WEB_CONCURRENCY || 2, workers: process.env.WEB_CONCURRENCY || 1,
master: startMaster, master: startMaster,
start: startWorker start: startWorker
}); });

11
tcprelay.js
View File

@@ -72,6 +72,7 @@ var connections = {};
function parseAddressHeader(data, offset) { function parseAddressHeader(data, offset) {
var addressType = data.readUInt8(offset); var addressType = data.readUInt8(offset);
var headerLen, dstAddr, dstPort, dstAddrLen; var headerLen, dstAddr, dstPort, dstAddrLen;
//domain name
if (addressType == ADDRESS_TYPE_DOMAIN_NAME) { if (addressType == ADDRESS_TYPE_DOMAIN_NAME) {
dstAddrLen = data.readUInt8(offset + 1); dstAddrLen = data.readUInt8(offset + 1);
dstAddr = data.slice(offset + 2, offset + 2 + dstAddrLen).toString(); dstAddr = data.slice(offset + 2, offset + 2 + dstAddrLen).toString();
@@ -295,12 +296,12 @@ TCPRelay.prototype.handleConnectionByServer = function(connection) {
return connection.pong('', false, true); return connection.pong('', false, true);
}); });
connection.on('close', function(hadError) { connection.on('close', function(hadError) {
logger.info(`[${connectionId}]: close event[had error = ${hadError}] of connection has been triggered`); logger.info(`[${connectionId}]: close event[had error = ${hadError}] of local connection has been triggered`);
connections[connectionId] = null; connections[connectionId] = null;
targetConnection && targetConnection.destroy(); targetConnection && targetConnection.destroy();
}); });
connection.on('error', function(error) { connection.on('error', function(error) {
logger.error(`[${connectionId}]: an error of connection occured`, error); logger.error(`[${connectionId}]: an error of connection local occured`, error);
connection.terminate(); connection.terminate();
connections[connectionId] = null; connections[connectionId] = null;
targetConnection && targetConnection.end(); targetConnection && targetConnection.end();
@@ -370,7 +371,7 @@ TCPRelay.prototype.handleConnectionByLocal = function(connection) {
perMessageDeflate: false perMessageDeflate: false
}); });
serverConnection.on('open', function() { serverConnection.on('open', function() {
logger.info(`[${connectionId}]: connecting to websocket server`); logger.info(`[${connectionId}]: connecting to server`);
serverConnection.send(encryptor.encrypt(data.slice(3)), function() { serverConnection.send(encryptor.encrypt(data.slice(3)), function() {
stage = STAGE_STREAM; stage = STAGE_STREAM;
dataCache = Buffer.concat(dataCache); dataCache = Buffer.concat(dataCache);
@@ -387,7 +388,7 @@ TCPRelay.prototype.handleConnectionByLocal = function(connection) {
}, 30000); }, 30000);
}); });
serverConnection.on('message', function(data) { serverConnection.on('message', function(data) {
logger.debug(`[${connectionId}]: read data[length = ${data.length}] from websocket server connection`); logger.debug(`[${connectionId}]: read data[length = ${data.length}] from server connection`);
canWriteToLocalConnection && connection.write(encryptor.decrypt(data), function() { canWriteToLocalConnection && connection.write(encryptor.decrypt(data), function() {
logger.debug(`[${connectionId}]: write data[length = ${data.length}] to client connection`); logger.debug(`[${connectionId}]: write data[length = ${data.length}] to client connection`);
}); });
@@ -418,7 +419,7 @@ TCPRelay.prototype.handleConnectionByLocal = function(connection) {
canWriteToLocalConnection && serverConnection.send(encryptor.encrypt(data), { canWriteToLocalConnection && serverConnection.send(encryptor.encrypt(data), {
binary: true binary: true
}, function() { }, function() {
logger.debug(`[${connectionId}]: write data[length = ${data.length}] to websocket server connection`); logger.debug(`[${connectionId}]: write data[length = ${data.length}] to server connection`);
}); });
break; break;
} }