fixed bug

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

View File

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

View File

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

View File

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

View File

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