bitinflow/localtunnel
1
0
Fork 0
mirror of https://github.com/bitinflow/localtunnel.git synced 2026-03-21 17:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

more resilient to upstream server failure and restart

Browse Source
This commit is contained in:
Roman Shtylman
2013-11-06 23:25:05 -05:00
parent 2c38aefb9d
commit 34afd6537d
2 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
client.js
View File

@@ -2,6 +2,7 @@ var net = require('net');
var url = require('url'); var url = require('url');
var EventEmitter = require('events').EventEmitter; var EventEmitter = require('events').EventEmitter;
var after = require('after');
var request = require('request'); var request = require('request');
// request upstream url and connection info // request upstream url and connection info
@@ -30,7 +31,7 @@ var connect = function(opt) {
var assigned_domain = opt.subdomain; var assigned_domain = opt.subdomain;
// connect to upstream given connection parameters // connect to upstream given connection parameters
var tunnel = function (remote_host, remote_port) { var tunnel = function (remote_host, remote_port, dead) {
var remote_opt = { var remote_opt = {
host: remote_host, host: remote_host,
@@ -49,9 +50,9 @@ var connect = function(opt) {
return; return;
} }
// we need a new tunnel
if (++remote_attempts >= 3) { if (++remote_attempts >= 3) {
console.error('localtunnel server offline - try again'); return dead();
process.exit(-1);
} }
// connection to localtunnel server // connection to localtunnel server
@@ -108,32 +109,42 @@ var connect = function(opt) {
// where to quest // where to quest
params.uri = base_uri + ((assigned_domain) ? assigned_domain : '?new'); params.uri = base_uri + ((assigned_domain) ? assigned_domain : '?new');
// get an id from lt server and setup forwarding tcp connections function init_tunnel() {
request_url(params, function(err, body) { // get an id from lt server and setup forwarding tcp connections
request_url(params, function(err, body) {
if (err) {
ev.emit('error', new Error('tunnel server not available: ' + err.message + ', retry 1s'));
if (err) { // retry interval for id request
ev.emit('error', new Error('tunnel server not available: %s, retry 1s', err.message)); return setTimeout(function() {
init_tunnel();
}, 1000);
}
// retry interval for id request // our assigned hostname and tcp port
return setTimeout(function() { var port = body.port;
connect_proxy(opt); var host = upstream.hostname;
}, 1000);
}
// our assigned hostname and tcp port // store the id so we can try to get the same one
var port = body.port; assigned_domain = body.id;
var host = upstream.hostname;
// store the id so we can try to get the same one var max_conn = body.max_conn_count || 1;
assigned_domain = body.id;
var max_conn = body.max_conn_count || 1; // after all our tunnels die, we ask for new ones
for (var count = 0 ; count < max_conn ; ++count) { // this might happen if the upstream server dies
tunnel(host, port); var dead = after(max_conn, function() {
} init_tunnel();
});
ev.emit('url', body.url); for (var count = 0 ; count < max_conn ; ++count) {
}); tunnel(host, port, dead);
}
ev.emit('url', body.url);
});
}
init_tunnel();
return ev; return ev;
}; };

3
package.json
View File

@@ -9,7 +9,8 @@
}, },
"dependencies": { "dependencies": {
"request": "2.11.4", "request": "2.11.4",
"optimist": "0.3.4" "optimist": "0.3.4",
"after": "0.8.1"
}, },
"devDependencies": {}, "devDependencies": {},
"bin": { "bin": {