From 42cf14642db880f8e04447ab409ae635bd461609 Mon Sep 17 00:00:00 2001 From: VincentChanX <710852740@qq.com> Date: Thu, 6 Apr 2017 15:02:53 +0800 Subject: [PATCH] fixed bug --- local.js | 2 +- package.json | 2 +- server.js | 2 +- tcprelay.js | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/local.js b/local.js index dffe1f6..84b8797 100644 --- a/local.js +++ b/local.js @@ -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') diff --git a/package.json b/package.json index 39594a6..1491d31 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/server.js b/server.js index da06524..0c56ef2 100644 --- a/server.js +++ b/server.js @@ -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') diff --git a/tcprelay.js b/tcprelay.js index 224a9db..28326fb 100644 --- a/tcprelay.js +++ b/tcprelay.js @@ -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() { + var self = this; return new Promise(function(resolve, reject) { - var self = this; var config = self.config; var port = self.isLocal ? config.localPort : config.serverPort; var address = self.isLocal ? config.localAddress : config.serverAddress;