tiro-notes 0.27.16 → 0.27.20

package/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-//const tHelpers = require('../helpers/helpers.platforms.js'); // for dev purposes
-const tHelpers = require('./helpers-build/helpers.platforms.js');
+//const tHelpers = require('../shared.helpers.js'); // for dev purposes
+const tHelpers = require(`./shared.helpers.build.js`);
 
 // open frontend on default browser
 const openInBrowser = (url) => {
@@ -40,7 +40,7 @@ function startTiroServer (argsObj, cb) {
 		console.log(`Starting Tiro-Notes from CLI with following arguments : ${JSON.stringify(argsObj)}`);
 
 		// start tiro server, detect success message and get server params
-		tHelpers.execCmd('node', [`${__dirname}/server/server.js`], {
+		tHelpers.execCmd('node', [`${__dirname}/node-build/server/server.js`], {
 				env: { TIRO_PORT: argsObj.port },  
 				onLog: str => {
 						tHelpers.checkAndGetTiroConfig({platform: 'cli'}, cb)

package/package.json

@@ -1,13 +1,12 @@
 {																 
 		"name": "tiro-notes",
-		"version": "0.27.16",
+		"version": "0.27.20",
 		"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 export-helpers; npm run export-cli-module; echo WARNING REQUIRES NPM LOGIN BEFORE PUBLISHING!; cd node-build; npm publish"
+				"export-cli-module": "cp -r ../../build node-build; cp cli.js node-build/; cp package.json node-build/; ",
+				"export-helpers": "cp ../shared.helpers.js ./node-build/shared.helpers.build.js",
+				"build-then-publish": "cd ../..; npm run build; cd ./platforms/npm-cli-module; npm run clean-previous-build; npm run export-cli-module; npm run export-helpers; echo WARNING REQUIRES NPM LOGIN BEFORE PUBLISHING!; cd node-build; npm publish"
 		},
 		"bin": "cli.js",
 		"repository": {

package/shared.helpers.build.js

@@ -0,0 +1,75 @@
+// Logging
+const homedir = require('os').homedir();
+const electronLogFile = `${homedir}/.tiro-electron-log.txt` 
+const fs = require('fs')
+const cleanLog = () => {
+		fs.writeFile(electronLogFile, '', err => {})
+}
+const writeLog = (p) => (content) => {
+		content = `[ELECTRON] ${new Date().getTime()} => ${content} \n\r`
+		console.log(content);
+		fs.appendFile(electronLogFile, content, err => {})
+}
+
+const whichLog = (p) => p.platform === 'electron' ? writeLog : console.log
+
+
+let hasStarted = false
+const checkAndGetTiroConfig = (p, cb) => {
+		if (!p) p = {}
+		if (!p.platform) p.platform = false
+		const log = whichLog(p);
+
+		if ( !hasStarted) {
+				const successMessage = 'SERVER_LOAD_SUCCESS';
+				if (str.includes(successMessage)) {
+						hasStarted = true;
+						log(`-- ${str} --`);
+						try {
+								let objStr = str.match(/\{.*\}/gm);
+								let configServerObj = JSON.parse(objStr)
+								log(`server config loaded successfully: ${JSON.stringify(configServerObj)}`);
+								if (cb) cb(configServerObj);
+						} catch(e){
+								log(`ERROR! could not get the server config ${JSON.stringify(e)}`)
+						}
+
+				}
+		}
+}
+
+// more general exec func
+const execCmd = (cmd, params, p) => {
+		if (!p) p = {}
+		if (!p.env) p.env = {}
+		if (!p.platform) p.platform = false
+		if (!p.logName) p.logName = ''
+		const log = whichLog(p);
+
+		log(`ExecCMD ${JSON.stringify({cmd, params, p})}`);
+
+		let child 
+		let spawn = require( 'child_process' ).spawn;
+		child = spawn( cmd, params, {env: { ...process.env, ...p.env }});  
+
+		// try {
+		child.stdout.on( 'data', data => {
+				const str = `[${p.logName} ${cmd}] : ${data}`;
+				console.log( str );
+				if (p && p.onLog) p.onLog(str)
+		});
+		child.stderr.on( 'data', data => {
+				const str = `[${p.logName} ${cmd} ERROR!] : ${data}`;
+				log( str );
+		});
+		log(`ExecCMD SUCCESS ${JSON.stringify({cmd, params, p})}`);
+		return child;
+}
+
+
+const e = {
+		checkAndGetTiroConfig,
+		execCmd
+}
+
+module.exports = e;

package/#package.json#

@@ -1,13 +0,0 @@
-{
-		"name": "tiro-notes",
-		"version": "0.27.",
-		"description": "Tiro Notes",
-		"main": "index.js",
-		"scripts": {
-				"start": "node server/server.js",
-				"publish": "echo WARNING REQUIRES NPM LOGIN BEFORE PUBLISHING!; npm publish"
-		},
-    "bin": "cli.js",
-		"author": "thiebault.gregoire@gmail.com",
-		"license": "ISC"
-}

package/cli.js~

@@ -1,51 +0,0 @@
-#! /usr/bin/env node
-
-// EXEC Function
-const 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 = () => {}
-
-		let spawn = require( 'child_process' ).spawn;
-		let child = spawn( cmd, params, {env: { ...process.env, ...p.env }});  
-
-		child.stdout.on( 'data', data => {
-				const str = `[${cmd}] : ${data}`;
-				console.log( str );
-		});
-		child.stderr.on( 'data', data => {
-				const str = `[${cmd} ERROR!] : ${data}`;
-				console.log( str );
-		});
-		return child;
-}
-
-const getCliArgs = () => {
-		const args = process.argv;
-		let argsObj = {
-				port: 3023
-		}
-		for (let i = 0; i < args.length; i++) {
-				if (i % 2 !== 0) continue
-				console.log(i);
-				let argName = args[i];
-				let argVal = args[i+1];
-				argName = argName.replace('--', '').replace('-','')
-				if (argName === 'p' || argName === 'port') argsObj.port = parseInt(argVal);
-		}
-		return argsObj;
-}
-
-// Main script
-function startTiroServerAsCli () {
-		const argsObj = getCliArgs();
-		console.log(`Starting Tiro-Notes from CLI with following arguments : ${JSON.stringify(argsObj)}`);
-		execCmd('node', ['./server/server.js'], {
-				env: { TIRO_PORT: argsObj.port },  
-		})
-}
-module.exports = startTiroServerAsCli;
-
-// for testing purposes
-//startTiroServerAsCli();