update version

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')

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": {

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')

tcprelay.js

@@ -107,16 +107,23 @@ TCPRelay.prototype.getServerName = function() {
 
 
 TCPRelay.prototype.bootstrap = function() {
-	this.init();
+	return this.init();
 };
 
 TCPRelay.prototype.stop = function() {
+	return new Promise(function(resolve, reject) {
 		if (this.server) {
-		this.server.close();
+			this.server.close(function() {
+				resolve();
+			});
+		} else {
+			resolve();
 		}
+	});
 };
 
 TCPRelay.prototype.init = function() {
+	return new Promise(function(resolve, reject) {
 		var self = this;
 		var config = self.config;
 		var port = self.isLocal ? config.localPort : config.serverPort;
@@ -145,9 +152,12 @@ TCPRelay.prototype.init = function() {
 		}
 		server.on('error', function(error) {
 			self.logger.error('an error of', self.getServerName(), 'occured', error);
+			reject(error);
 		});
 		server.on('listening', function() {
 			self.logger.info(self.getServerName(), 'is listening on', address + ':' + port);
+			resolve();
+		});
 	});
 };