update version

VincentChanX · Apr 6, 2017 · 5dabe06 · 5dabe06
1 parent f6e8fc4
commit 5dabe06
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 36 deletions.
diff --git a/local.js b/local.js
@@ -2,7 +2,7 @@ const TCPRelay = require('./tcprelay').TCPRelay;
 const local = require('commander');
 
 local
-    .version('0.1.1')
+    .version('0.1.2')
     .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
@@ -1,6 +1,6 @@
 {
   "name": "shadowsocks-over-websocket",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A fast tunnel proxy that helps you bypass firewalls",
   "main": "tcprelay.js",
   "scripts": {

diff --git a/server.js b/server.js
@@ -2,7 +2,7 @@ const TCPRelay = require('./tcprelay').TCPRelay;
 const server = require('commander');
 
 server
-    .version('0.1.1')
+    .version('0.1.2')
     .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
@@ -107,47 +107,57 @@ TCPRelay.prototype.getServerName = function() {
 
 
 TCPRelay.prototype.bootstrap = function() {
-	this.init();
+	return this.init();
 };
 
 TCPRelay.prototype.stop = function() {
-	if (this.server) {
-		this.server.close();
-	}
+	return new Promise(function(resolve, reject) {
+		if (this.server) {
+			this.server.close(function() {
+				resolve();
+			});
+		} else {
+			resolve();
+		}
+	});
 };
 
 TCPRelay.prototype.init = function() {
-	var self = this;
-	var config = self.config;
-	var port = self.isLocal ? config.localPort : config.serverPort;
-	var address = self.isLocal ? config.localAddress : config.serverAddress;
-	var server;
-
-	if (self.isLocal) {
-		server = self.server = net.createServer({
-			allowHalfOpen: true,
-		});
-		server.maxConnections = MAX_CONNECTIONS;
-		server.on('connection', function(connection) {
-			return self.handleConnectionByLocal(connection);
-		});
-		server.listen(port, address);
-	} else {
-		server = self.server = new WebSocket.Server({
-			host: address,
-			port: port,
-			perMessageDeflate: false,
-			backlog: MAX_CONNECTIONS
+	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;
+		var server;
+
+		if (self.isLocal) {
+			server = self.server = net.createServer({
+				allowHalfOpen: true,
+			});
+			server.maxConnections = MAX_CONNECTIONS;
+			server.on('connection', function(connection) {
+				return self.handleConnectionByLocal(connection);
+			});
+			server.listen(port, address);
+		} else {
+			server = self.server = new WebSocket.Server({
+				host: address,
+				port: port,
+				perMessageDeflate: false,
+				backlog: MAX_CONNECTIONS
+			});
+			server.on('connection', function(connection) {
+				return self.handleConnectionByServer(connection);
+			});
+		}
+		server.on('error', function(error) {
+			self.logger.error('an error of', self.getServerName(), 'occured', error);
+			reject(error);
 		});
-		server.on('connection', function(connection) {
-			return self.handleConnectionByServer(connection);
+		server.on('listening', function() {
+			self.logger.info(self.getServerName(), 'is listening on', address + ':' + port);
+			resolve();
 		});
-	}
-	server.on('error', function(error) {
-		self.logger.error('an error of', self.getServerName(), 'occured', error);
-	});
-	server.on('listening', function() {
-		self.logger.info(self.getServerName(), 'is listening on', address + ':' + port);
 	});
 };