tiro-notes 0.27.25 → 0.27.28

package/cli.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
-//const tHelpers = require('../shared.helpers.js'); // for dev purposes
-const tHelpers = require(`./shared.helpers.build.js`);
+//const isDev = true
+const isDev = false
+
+const tHelpers = isDev ? require('../shared.helpers.js') : require(`./shared.helpers.build.js`);
 
 // open frontend on default browser
 const openInBrowser = (url) => {
@@ -52,31 +54,28 @@ function startTiroServer (argsObj, cb) {
 const startSshTunnel = (argsObj) => {
 		if (argsObj.tunnel.enabled) {
 				// kill previous autossh processes
-				let cb1 = true
 				let cb2 = true
+				let cb1 = true
 				tHelpers.execCmd('killall', [`autossh`], {
-						logName:'tunnel 1',
-						onLog: str => {
-								if (!cb1) return
-								cb1 = false
-
-								tHelpers.execCmd('autossh', [`--help`], {
-										logName:'tunnel 2',
+						logName:'tunnel 1/3',
+						onLog: () => {
+								if (!cb2) return
+								cb2 = false
+								// check if autossh is working
+								tHelpers.execCmd('autossh', [`-V`], {
+										logName:'tunnel 2/3',
 										onLog: str => {
-												if (!cb2) return
-												cb2 = false
+												if (!cb1) return
+												cb1 = false
+												// start autossh finally
 												tHelpers.execCmd('autossh',['-M','20000','-N', argsObj.tunnel.remoteUrl,'-R', `${argsObj.tunnel.remotePort}:localhost:${argsObj.port}`,'-C'], {
-														logName:'tunnel 3'
+														logName:'tunnel 3/3'
 												})
 										}
 								})
-
 						}
-				}
-												})
-
-		// check if autossh is working
-		
+				})
+		}
 }
 
 // Main script
@@ -99,6 +98,13 @@ function main () {
 		})
 }
 
+const test = () => {
+
+		var argsObj = getCliArgs();
+		startSshTunnel(argsObj);
+}
+
+
 // start everything
-main();
+isDev ? test() : main();
 

package/package.json

@@ -1,6 +1,6 @@
 {																 
 		"name": "tiro-notes",
-		"version": "0.27.25",
+		"version": "0.27.28",
 		"description": "Tiro Notes for CLI",
 		"scripts": {
 				"clean-previous-build": "rm -r node-build",

package/shared.helpers.build.js

@@ -45,10 +45,10 @@ const execCmd = (cmd, params, p) => {
 		if (!p) p = {}
 		if (!p.env) p.env = {}
 		if (!p.platform) p.platform = false
-		if (!p.logName) p.logName = ''
+		p.logName = !p.logName ? '' : `${p.logName} `
 		const log = whichLog(p);
 
-		log(`ExecCMD ${JSON.stringify({cmd, params, p})}`);
+		log(`[${p.logName}] === ExecCMD ${JSON.stringify({cmd, params, p})}`);
 
 		let child 
 		let spawn = require( 'child_process' ).spawn;
@@ -62,9 +62,10 @@ const execCmd = (cmd, params, p) => {
 		});
 		child.stderr.on( 'data', data => {
 				const str = `[${p.logName} ${cmd} ERROR!] : ${data}`;
-				log( str );
+				console.log( str );
+				if (p && p.onLog) p.onLog(str)
 		});
-		log(`ExecCMD SUCCESS ${JSON.stringify({cmd, params, p})}`);
+		if (p && p.onDone) p.onDone()
 		return child;
 }