tiro-notes 0.27.13 → 0.27.16

package/cli.js

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+//const tHelpers = require('../helpers/helpers.platforms.js'); // for dev purposes
+const tHelpers = require('./helpers-build/helpers.platforms.js');
 
 // open frontend on default browser
 const openInBrowser = (url) => {
@@ -6,27 +8,6 @@ const openInBrowser = (url) => {
     require('child_process').exec(start + ' ' + url);
 }
 
-// exec cmd
-function execCmd (cmd, params, p) {
-		console.log(`ExecCMD ${JSON.stringify({cmd, params, p})}`);
-		if (!p) p = {}
-		if (!p.env) p.env = {}
-		if (!p.onLog) p.onLog = () => {}
-		if (!p.logName) p.logName = ''
-
-		var spawn = require( 'child_process' ).spawn;
-		var child = spawn( cmd, params, {env: { ...process.env, ...p.env }});  
-
-		child.stdout.on( 'data', data => {
-				var str = `[${p.logName} ${cmd}] : ${data}`;
-				console.log( str );
-		});
-		child.stderr.on( 'data', data => {
-				var str = `[${p.logName} ${cmd} ERROR!] : ${data}`;
-				console.log( str );
-		});
-		return child;
-}
 
 function getCliArgs () {
 		var args = process.argv;
@@ -55,36 +36,56 @@ function getCliArgs () {
 		return argsObj;
 }
 
-// Main script
-function startTiroServerAsCli () {
-		var argsObj = getCliArgs();
+function startTiroServer (argsObj, cb) {
 		console.log(`Starting Tiro-Notes from CLI with following arguments : ${JSON.stringify(argsObj)}`);
 
-		// start tiro server
-		execCmd('node', [`${__dirname}/server/server.js`], {
+		// start tiro server, detect success message and get server params
+		tHelpers.execCmd('node', [`${__dirname}/server/server.js`], {
 				env: { TIRO_PORT: argsObj.port },  
+				onLog: str => {
+						tHelpers.checkAndGetTiroConfig({platform: 'cli'}, cb)
+				}
 		})
+}
 
-		// open in browser
-		openInBrowser(`http://localhost:${argsObj.port}`);
+const startSshTunnel = (argsObj) => {
+		if (argsObj.tunnel.enabled) {
+				// kill previous autossh processes
+				tHelpers.execCmd('killall', [`autossh`], {logName:'tunnel'})
 
-		// start tunnel with autossh if asked
-    if (argsObj.tunnel.enabled) {
-        // kill previous autossh processes
-        execCmd('killall', [`autossh`], {logName:'tunnel'})
+				// check if autossh is working
+				try {
+						tHelpers.execCmd('autossh', [`--help`], {logName:'tunnel'})
+				} catch (e) {
+						throw Error('autossh not installed on the system, please install it.')
+				}
 
-        // check if autossh is working
-        try {
-            execCmd('autossh', [`--help`], {logName:'tunnel'})
-        } catch (e) {
-            throw Error('autossh not installed on the system, please install it.')
-        }
+				// check if autossh enabled
+				tHelpers.execCmd('autossh', ['-M','20000','-f','-N',argsObj.tunnel.remoteUrl,`-R ${argsObj.tunnel.remotePort}:localhost:${argsObj.port}`,'-C'], {logName:'tunnel'})
+		}
+		
+}
 
-        // check if autossh enabled
-        execCmd('autossh', ['-M','20000','-f','-N',argsObj.tunnel.remoteUrl,`-R ${argsObj.tunnel.remotePort}:localhost:${argsObj.port}`,'-C'], {logName:'tunnel'})
-    }
+// Main script
+function main () {
+
+		var argsObj = getCliArgs();
+
+		startTiroServer(argsObj, (configServerObj) => {
+
+				const c = configServerObj
+				const protocol = c.https ? 'https' : 'http'
+				const port = c.port
+
+				// open in browser
+				openInBrowser(`${protocol}://localhost:${port}`);
+
+				// start tunnel with autossh if asked
+				startSshTunnel(argsObj);
+				
+		})
 }
 
 // start everything
-startTiroServerAsCli();
+main();
 

package/package.json

@@ -1,12 +1,13 @@
 {																 
 		"name": "tiro-notes",
-		"version": "0.27.13",
+		"version": "0.27.16",
 		"description": "Tiro Notes for CLI",
 		"main": "index.js",
 		"scripts": {
 				"clean-previous-build": "rm -r node-build",
+				"export-helpers": "rm -r helpers-build; cp -r ../helpers helpers-build",
 				"export-cli-module": "cd ../..; cp -r build platforms/npm-cli-module/node-build; cd ./platforms/npm-cli-module; cp cli.js node-build/; cp package.json node-build/; ",
-				"build-then-publish": "cd ../..; npm run build; cd ./platforms/npm-cli-module; npm run clean-previous-build; npm run export-cli-module; echo WARNING REQUIRES NPM LOGIN BEFORE PUBLISHING!; cd node-build; npm publish"
+				"build-then-publish": "cd ../..; npm run build; cd ./platforms/npm-cli-module; npm run clean-previous-build; npm export-helpers; npm run export-cli-module; echo WARNING REQUIRES NPM LOGIN BEFORE PUBLISHING!; cd node-build; npm publish"
 		},
 		"bin": "cli.js",
 		"repository": {