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

fixed bug

Browse Source
This commit is contained in:
VincentChanX
2017-04-06 15:02:53 +08:00
parent 5dabe063ec
commit 42cf14642d
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
local.js
View File

@@ -2,7 +2,7 @@ const TCPRelay = require('./tcprelay').TCPRelay;
const local = require('commander'); const local = require('commander');
local local
.version('0.1.2') .version('0.1.3')
.option('-m --method [method]', 'encryption method, default: aes-256-cfb') .option('-m --method [method]', 'encryption method, default: aes-256-cfb')
.option('-k --password [password]', 'password') .option('-k --password [password]', 'password')
.option('-s --server-address [address]', 'server address') .option('-s --server-address [address]', 'server address')

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "shadowsocks-over-websocket", "name": "shadowsocks-over-websocket",
"version": "0.1.2", "version": "0.1.3",
"description": "A fast tunnel proxy that helps you bypass firewalls", "description": "A fast tunnel proxy that helps you bypass firewalls",
"main": "tcprelay.js", "main": "tcprelay.js",
"scripts": { "scripts": {

2
server.js
View File

@@ -2,7 +2,7 @@ const TCPRelay = require('./tcprelay').TCPRelay;
const server = require('commander'); const server = require('commander');
server server
.version('0.1.2') .version('0.1.3')
.option('-m --method [method]', 'encryption method, default: aes-256-cfb') .option('-m --method [method]', 'encryption method, default: aes-256-cfb')
.option('-k --password [password]', 'password') .option('-k --password [password]', 'password')
.option('-s --server-address [address]', 'server address') .option('-s --server-address [address]', 'server address')

7
tcprelay.js
View File

@@ -111,9 +111,10 @@ TCPRelay.prototype.bootstrap = function() {
}; };
TCPRelay.prototype.stop = function() { TCPRelay.prototype.stop = function() {
var self = this;
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
if (this.server) { if (self.server) {
this.server.close(function() { self.server.close(function() {
resolve(); resolve();
}); });
} else { } else {
@@ -123,8 +124,8 @@ TCPRelay.prototype.stop = function() {
}; };
TCPRelay.prototype.init = function() { TCPRelay.prototype.init = function() {
var self = this;
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var self = this;
var config = self.config; var config = self.config;
var port = self.isLocal ? config.localPort : config.serverPort; var port = self.isLocal ? config.localPort : config.serverPort;
var address = self.isLocal ? config.localAddress : config.serverAddress; var address = self.isLocal ? config.localAddress : config.serverAddress;