fix test

Author: mrluanma

config.json

@@ -1,8 +1,7 @@
 {
-  "server": [
-    "still-tor-8707.herokuapp.com"
-  ],
+  "server": "127.0.0.1",
   "local_port": 1080,
+  "remote_port": 8080,
   "password": "`try*(^^$some^$%^complex>:<>?~password/",
   "timeout": 600,
   "method": "rc4"

local.js

@@ -18,9 +18,6 @@ options =
   string: ['local_address', 'server', 'password',
            'config_file', 'method']
   default:
-    'local_address': '127.0.0.1'
-    'local_port': 1080
-    'remote_port': 80
     'config_file': path.resolve(__dirname, "config.json")
 
 inetNtoa = (buf) ->
@@ -190,5 +187,5 @@ server.listen PORT, LOCAL_ADDRESS, ->
   console.log "server listening at", address
 
 server.on "error", (e) ->
-  console.log "Address in use, aborting" if e.code is "EADDRINUSE"
+  console.log "address in use, aborting" if e.code is "EADDRINUSE"
   process.exit 1

server.js

@@ -19,9 +19,6 @@ options =
     'm': 'method'
   string: ['password', 'method', 'config_file']
   default:
-    'remote_port': process.env.PORT || 8080
-    'password': process.env.KEY
-    'method': process.env.METHOD
     'config_file': path.resolve(__dirname, "config.json")
 
 inetNtoa = (buf) ->
@@ -31,8 +28,14 @@ configFromArgs = parseArgs process.argv.slice(2), options
 configFile = configFromArgs.config_file
 configContent = fs.readFileSync(configFile)
 config = JSON.parse(configContent)
+
+config['remote_port'] = +process.env.PORT if process.env.PORT
+config['password'] = process.env.KEY if process.env.KEY
+config['method'] = process.env.METHOD if process.env.METHOD
+
 for k, v of configFromArgs
   config[k] = v
+
 timeout = Math.floor(config.timeout * 1000)
 PORT = config.remote_port
 KEY = config.password
@@ -133,3 +136,11 @@ wss.on "connection", (ws) ->
     console.warn "server: #{e}"
     console.log "concurrent connections:", wss.clients.length
     remote.destroy() if remote
+
+wss.on "listening", (address) ->
+  address = wss._server.address()
+  console.log "server listening at", address
+
+wss.on "error", (e) ->
+  console.log "address in use, aborting" if e.code is "EADDRINUSE"
+  process.exit 1

src/local.coffee

@@ -62,14 +62,14 @@ server.stderr.on 'data', (data) ->
 
 local.stdout.on 'data', (data) ->
   console.log data.toString()
-  if data.toString().indexOf('listening at port') >= 0
+  if data.toString().indexOf('listening at') >= 0
     localReady = true
     if localReady and serverReady and not curlRunning
       runCurl()
 
 server.stdout.on 'data', (data) ->
   console.log data.toString()
-  if data.toString().indexOf('listening at port') >= 0
+  if data.toString().indexOf('listening at') >= 0
     serverReady = true
     if localReady and serverReady and not curlRunning
       runCurl()