Better handling of tunnels started with the ECM

Author: jreese802

api.js

@@ -127,6 +127,17 @@ module.exports = function(username, authkey, env){
                 return callback(err, resp);
             })
         },
+        isTunnelAlive: function(tunnelId, callback){
+            makeApiCall(server, 'GET', 'tunnels/' + tunnelId, null, username, authkey, (err, resp) => {
+                if (err) return callback(err)
+                // console.log('we got: ' + util.inspect(resp))
+                if (resp.active !== undefined){
+                    return callback(null, resp.active);
+                } else {
+                    return callback(null, false)
+                }
+            })
+        },
         checkTunnelIp: function(callback){
             makeApiCall(server, 'GET', 'tunnels/checkIp', null, username, authkey, (err, resp) => {
                 // console.log('got resp for checkTunnelIp');

cbt_tunnels.js

@@ -640,9 +640,11 @@ function cbtSocket(api, params) {
             fs.unlink(self.ready, function(err){
                 if(err){
                     global.logger.error(err);
-                    setTimeout(function(){
-                        process.exit(1);
-                    },10000);
+                    if (!self.nokill){
+                        setTimeout(function(){
+                            process.exit(1);
+                        },10000);
+                    }
                 } 
             })
         }
@@ -652,18 +654,20 @@ function cbtSocket(api, params) {
         self.end(function(err, killit){
             if(!err && killit === 'killit'){
                 global.logger.info('Local connection disconnected.');
+                if(cb) cb(null,true)
                 if(!self.nokill){
                     global.logger.info('Bye!');
-                    if(cb) cb(null,true)
                     process.exit(0);
                 }
                 if(cb) cb(null,true)
             }else if(err){
                 global.logger.error(err);
-                setTimeout(function(){
-                    if(cb) cb(err,false)
-                    process.exit(1);
-                }, 10000);
+                if(cb) cb(err,false)
+                if(!self.nokill){
+                    setTimeout(function(){
+                        process.exit(1);
+                    }, 10000);
+                }
             }
         });
     }
@@ -679,4 +683,4 @@ function cbtSocket(api, params) {
     }
 }
 
-module.exports = cbtSocket;
+module.exports = cbtSocket;

tunnel_start.js

@@ -159,9 +159,13 @@ var startTunnel = function(api, params, cb){
                                                 cbts.endWrap();
                                             }else{
                                                 warn(err);
-                                                setTimeout(function(){
-                                                    process.exit(1);
-                                                },10000);
+                                                if (!cbts.nokill){
+                                                    setTimeout(function(){
+                                                        process.exit(1);
+                                                    },10000);
+                                                } else {
+                                                    throw err;
+                                                }
                                             }
                                         })
                                     }
@@ -322,7 +326,15 @@ module.exports = {
                             if (err){
                                 return cb(err)
                             } else {
-                                var i = setInterval(()=>{}, 10000);
+                                var i = setInterval(()=>{
+                                    // console.log(`checking if tunnel ${tunnelObject.tunnel_id} is still alive`)
+                                    api.isTunnelAlive(tunnelObject.tunnel_id, (err, isAlive) =>{
+                                        if (!isAlive){
+                                            // console.log(`tunnel ${tunnelObject.tunnel_id} is dead!`)
+                                            clearInterval(i)
+                                        }
+                                    })
+                                }, 10000);
                                 process.on('SIGINT',function(){
                                     // kill tunnel
                                     api.deleteTunnel(tunnelObject.tunnel_id, (err) => {
@@ -333,7 +345,10 @@ module.exports = {
                                             fs.unlinkSync(params.ready);
                                         }
                                         global.logger.info('killed connection manager tunnel, quitting')
-                                        process.exit(0)
+                                        clearInterval(i);
+                                        if (!params.nokill){
+                                            process.exit(0);
+                                        }
                                     });
                                     global.logger.info('\nAttempting a graceful shutdown...');
                                 });
@@ -349,7 +364,10 @@ module.exports = {
                                             fs.unlinkSync(params.ready);
                                         }
                                         global.logger.info('killed connection manager tunnel, quitting')
-                                        process.exit(0)
+                                        clearInterval(i);
+                                        if (!params.nokill){
+                                            process.exit(0)
+                                        }
                                     });
                                 });
                                 if(params.ready){
@@ -381,13 +399,19 @@ module.exports = {
                                                                 fs.unlinkSync(params.ready);
                                                             }
                                                             global.logger.info('killed connection manager tunnel, quitting')
-                                                            process.exit(0)
+                                                            clearInterval(i);
+                                                            if (!params.nokill){
+                                                                process.exit(0);
+                                                            }
                                                         });
                                                     }else{
                                                         warn(err);
-                                                        setTimeout(function(){
-                                                            process.exit(1);
-                                                        },10000);
+                                                        clearInterval(i);
+                                                        if (!params.nokill){
+                                                            setTimeout(function(){
+                                                                process.exit(1);
+                                                            },10000);
+                                                        }
                                                     }
                                                 })
                                             }