1.2.0

return client from 'localtunnel' api call

bin/client

@@ -3,7 +3,6 @@ var lt_client = require('../client');
 
 var argv = require('optimist')
     .usage('Usage: $0 --port [num]')
-    .demand(['port'])
     .options('host', {
         default: 'http://localtunnel.me',
         describe: 'upstream server providing forwarding'
@@ -14,16 +13,30 @@ var argv = require('optimist')
     .options('local-host', {
         describe: 'tunnel traffic to this host instead of localhost'
     })
+    .options('version', {
+        describe: 'print version and exit'
+    })
     .default('local-host', 'localhost')
     .describe('port', 'internal http server port')
     .argv;
 
+if (argv.version) {
+    console.log(require('../package.json').version);
+    process.exit(0);
+}
+
+if (argv.port == null) {
+    require('optimist').showHelp();
+    console.error('Missing required arguments: port');
+    process.exit(1);
+}
+
 var opt = {
     host: argv.host,
     port: argv.port,
     local_host: argv['local-host'],
     subdomain: argv.subdomain,
-}
+};
 
 lt_client(opt.port, opt, function(err, tunnel) {
     if (err) {

client.js

@@ -120,7 +120,7 @@ TunnelCluster.prototype.open = function() {
             remote.removeListener('close', remote_close);
 
             if (err.code !== 'ECONNREFUSED') {
-                return remove.end();
+                return remote.end();
             }
 
             // retrying connection to local server
@@ -199,6 +199,11 @@ Tunnel.prototype._init = function(cb) {
                 return setTimeout(get_url, 1000);
             }
 
+            if (res.statusCode !== 200) {
+                var err = new Error((body && body.message) || 'localtunnel server returned an error, please try again');
+                return cb(err);
+            }
+
             var port = body.port;
             var host = upstream.hostname;
 
@@ -307,4 +312,5 @@ module.exports = function localtunnel(port, opt, fn) {
 
         fn(null, client);
     });
+    return client;
 };

package.json

@@ -2,7 +2,7 @@
   "author": "Roman Shtylman <shtylman@gmail.com>",
   "name": "localtunnel",
   "description": "expose localhost to the world",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/shtylman/localtunnel.git"
@@ -16,7 +16,7 @@
     "mocha": "~1.17.0"
   },
   "scripts": {
-    "test": "mocha --ui qunit --reporter list -- test/index.js"
+    "test": "mocha --ui qunit --reporter list --timeout 10000 -- test/index.js"
   },
   "bin": {
     "lt": "./bin/client"