tiro-notes 0.30.4211 → 0.30.4212

package/cli.js

@@ -3,6 +3,7 @@
 // const isDev = false
 const isDev = process.env.ISDEV
 const tHelpers = isDev ? require('../shared.helpers.js') : require(`./shared.helpers.build.js`);
+const pathServerJs = isDev ? `${__dirname}/node-build/server/tiro-server.js` : `${__dirname}/server/tiro-server.js`
 
 
 // CLI HELP MANUAL
@@ -22,7 +23,14 @@ ARGS:
 
 --https/-s : enable https ssl with self signed certificate (boolean, false by default)
 --port/-p : port to use (number, 3023 by default)
---tunnel/-t : uses autossh to "publish" the app on the web, requires a server you can access with ssh and autossh installed on that device. (ex:npx tiro-notes@latest -t REMOTE_USER@REMOTE_URL:REMOTE_PORT)
+--no-open/-no : do not open Tiro in browser when starting
+
+--tunnel/-t : [require autossh] uses autossh to "publish" the app on the web, requires a server you can access with ssh and autossh installed on that device. (ex:npx tiro-notes@latest -t REMOTE_USER@REMOTE_URL:REMOTE_PORT)
+
+--backup/-b : [require tar] will incrementally backup changes in archives.
+--backup-folder : modify backup folder destination. (default: "your/path/to/tiro/data_folder"+_backup
+--backup-post-script : modify script to be executed after a backup finishes. Should be a ".txt" file with your OS commands. (default: "your/path/to/tiro/data_folder"+_backup/post_backup_script.txt
+
 --help/-h : help 
 
 EXAMPLES:
@@ -48,6 +56,12 @@ function getCliArgs () {
 				port: 3023,
 				https: false,
 				help: false,
+				open: true,
+				backup: {
+						enabled: false,
+						location: "default", 
+						scriptLocation: "default"
+				},
 				tunnel: {
             enabled: false,
         },
@@ -60,6 +74,12 @@ function getCliArgs () {
 				if (argName === 'p' || argName === 'port') argsObj.port = parseInt(argVal);
 				if (argName === 's' || argName === 'https') argsObj.https = true
 				if (argName === 'h' || argName === 'help') argsObj.help = true
+				if (argName === 'no-open' || argName === 'no') argsObj.open = false
+
+				if (argName === 'b' || argName === 'backup') argsObj.backup.enabled = true
+				if (argName === 'backup-location') argsObj.backup.location = argVal
+				if (argName === 'backup-post-script') argsObj.backup.scriptLocation = argVal 
+
 				if (argName === 't' || argName === 'tunnel') {
             const argsArr = argVal.split(':')
             if (argsArr.length > 1) {
@@ -79,19 +99,83 @@ function startTiroServer (argsObj, cb) {
 		tHelpers.killPreviousInstances(() => {
 
 				// start tiro server, detect success message and get server params
-				tHelpers.execCmd('node', [`${__dirname}/server/tiro-server.js`], {
+				tHelpers.execCmd('node', [pathServerJs], {
 						env: {
 								TIRO_PORT: argsObj.port,
 								TIRO_HTTPS: argsObj.https
 						},  
 						logName: 'tiroServer',
 						onLog: str => {
+								// we get params like dataFolder from server.js directly
 								tHelpers.checkAndGetTiroConfig(str, {platform: 'cli', cb})
 						}
 				})
 		});
 }
 
+const startBackupScript = async (argsObj, dataFolder) => {
+		if (argsObj.backup.enabled) return;
+		if (!dataFolder) return console.warn ("[BACKUP] no dataFolder detected!");
+
+		// get BACKUP_FOLDER path
+		const defaultBackupFolder = dataFolder + "_backup/"
+		const backupFolder = argsObj.backup.location !== "default" ? argsObj.backup.location : defaultBackupFolder
+		// if does not exists, create it
+		if (!tHelpers.fileExists(backupFolder)) await tHelpers.createDir(backupFolder)
+		
+
+		// get POST_BACKUP_SCRIPT
+		const defaultPostBackupScript = backupFolder + "post_backup_script.txt"
+		const postBackupScriptFile = argsObj.backup.scriptLocation !== "default" ? argsObj.backup.scriptLocation : defaultPostBackupScript 
+		// if does not exists, create it, empty
+		if (!tHelpers.fileExists(postBackupScriptFile)) await tHelpers.saveFile(postBackupScriptFile, "")
+		let postBackupScript = await tHelpers.openFile(postBackupScriptFile) 
+		if (postBackupScript) postBackupScript += ";"
+
+
+		// get LAST_BACKUP_TIMESTAMP
+		const timestampFile = backupFolder + "last_backup_timestamp.txt"
+		const now = () => new Date().getTime()
+		// if does not exists, create it, then give a timestamp of 0
+		if (!tHelpers.fileExists(timestampFile)) await tHelpers.saveFile(timestampFile, "0")
+		let lastBackupTimestampRaw = await tHelpers.openFile(timestampFile);		
+		let lastBackupTimestamp = parseInt(lastBackupTimestampRaw) 
+		let replaceTimestampCli = () => `echo ${now()} > '${timestampFile}'`
+		
+		// START INTERVAL
+		const timeInterval = 1000 * 60 * 60 // one hour
+		const backupInterval = 1000 * 60 * 60 * 24 // one day
+
+		const tarExec = process.platform === "darwin" ? "gtar" : "tar"
+
+		let backupCli = `mkdir '${backupFolder}'; mkdir '${backupFolder}/backups'; cd '${backupFolder}'; ${tarExec} --xz --verbose --create --file="backups/tiro.$(ls backups/ | wc -l | sed 's/^ *//;s/ *$//').tar.xz" '${dataFolder}' --listed-incremental='${backupFolder}metadata.snar'; ${replaceTimestampCli()}; ${postBackupScript}` 
+
+
+
+		const debugBackupNow = isDev ? false : false
+		const processBackupEveryDay = () => {
+				// if > 1 day
+				console.log({backupFolder, postBackupScriptFile, postBackupScript, lastBackupTimestamp, timeInterval, backupCli});
+				const diff = backupInterval + lastBackupTimestamp - new Date().getTime()
+				const diffMin = Math.round(diff / (1000 * 60))
+				if (diff < 0 || debugBackupNow) {
+						console.log(`[BACKUP] time has come, BACKUP!`);
+						// append to backup CLI current timestamp to last_backup_timestamp
+						// execute cli
+						tHelpers.execCmdInFile(backupCli, backupFolder+"cli.sh")
+				} else {
+						console.log(`[BACKUP] time has no come... still waiting for ${diffMin} mins`);
+				}
+		}
+
+		// every hour
+		processBackupEveryDay();
+		let int = setInterval(() => {
+				processBackupEveryDay()
+		}, timeInterval)
+
+}
+
 const startSshTunnel = (argsObj) => {
 		if (argsObj.tunnel.enabled) {
 				// kill previous autossh processes
@@ -135,12 +219,17 @@ function main () {
 						const c = configServerObj
 						const protocol = c.https ? 'https' : 'http'
 						const port = c.port
+						const dataFolder = c.dataFolder
 
 						// open in browser
-						openInBrowser(`${protocol}://localhost:${port}`);
+						if (c.open) openInBrowser(`${protocol}://localhost:${port}`);
 
 						// start tunnel with autossh if asked
 						startSshTunnel(argsObj);
+
+						// start backup script
+						startBackupScript(argsObj, dataFolder);
+						// console.log(333333, dataFolder);
 						
 				})
 		}
@@ -148,11 +237,14 @@ function main () {
 
 const test = () => {
 		var argsObj = getCliArgs();
-		startSshTunnel(argsObj);
+		// startSshTunnel(argsObj);
+		console.log(argsObj);
+		// startBackupScript(argsObj, "/Users/gregoirethiebault/Desktop/your markdown notes")
+		startBackupScript(argsObj, "/Users/gregoirethiebault/Desktop/nodal_ex")
 }
 
 
 // start everything
-// isDev ? test() : main();
-isDev ? main() : main();
+isDev ? test() : main();
+// isDev ? main() : main();
 

package/client/asset-manifest.json

@@ -2,10 +2,10 @@
   "files": {
     "static/js/0.c490099b.chunk.js": "/static/js/0.c490099b.chunk.js",
     "static/js/1.d5c20c38.chunk.js": "/static/js/1.d5c20c38.chunk.js",
-    "main.js": "/static/js/main.4186260d.chunk.js",
+    "main.js": "/static/js/main.06401a25.chunk.js",
     "runtime-main.js": "/static/js/runtime-main.8aa8b9eb.js",
     "static/css/4.992ae4ff.chunk.css": "/static/css/4.992ae4ff.chunk.css",
-    "static/js/4.950dfeb6.chunk.js": "/static/js/4.950dfeb6.chunk.js",
+    "static/js/4.83d4d41c.chunk.js": "/static/js/4.83d4d41c.chunk.js",
     "static/js/5.7154c544.chunk.js": "/static/js/5.7154c544.chunk.js",
     "static/js/6.3b3ed6b3.chunk.js": "/static/js/6.3b3ed6b3.chunk.js",
     "static/js/7.05cc9dbd.chunk.js": "/static/js/7.05cc9dbd.chunk.js",
@@ -80,7 +80,7 @@
     "static/js/76.6e339e9f.chunk.js": "/static/js/76.6e339e9f.chunk.js",
     "static/js/77.46a6b6a0.chunk.js": "/static/js/77.46a6b6a0.chunk.js",
     "index.html": "/index.html",
-    "static/js/4.950dfeb6.chunk.js.LICENSE.txt": "/static/js/4.950dfeb6.chunk.js.LICENSE.txt",
+    "static/js/4.83d4d41c.chunk.js.LICENSE.txt": "/static/js/4.83d4d41c.chunk.js.LICENSE.txt",
     "static/js/70.16aeae57.chunk.js.LICENSE.txt": "/static/js/70.16aeae57.chunk.js.LICENSE.txt",
     "static/media/book-solid.87f5b737.svg": "/static/media/book-solid.87f5b737.svg",
     "static/media/codicon.css": "/static/media/codicon.0e0f4555.ttf",
@@ -104,7 +104,7 @@
   "entrypoints": [
     "static/js/runtime-main.8aa8b9eb.js",
     "static/css/4.992ae4ff.chunk.css",
-    "static/js/4.950dfeb6.chunk.js",
-    "static/js/main.4186260d.chunk.js"
+    "static/js/4.83d4d41c.chunk.js",
+    "static/js/main.06401a25.chunk.js"
   ]
 }

package/client/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Tiro</title><link href="/static/css/4.992ae4ff.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,o,f=t[0],u=t[1],i=t[2],l=0,b=[];l<f.length;l++)o=f[l],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&b.push(a[o][0]),a[o]=0;for(n in u)Object.prototype.hasOwnProperty.call(u,n)&&(e[n]=u[n]);for(d&&d(t);b.length;)b.shift()();return c.push.apply(c,i||[]),r()}function r(){for(var e,t=0;t<c.length;t++){for(var r=c[t],n=!0,f=1;f<r.length;f++){var u=r[f];0!==a[u]&&(n=!1)}n&&(c.splice(t--,1),e=o(o.s=r[0]))}return e}var n={},a={3:0},c=[];function o(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var t=[],r=a[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=a[e]=[t,n]}));t.push(r[2]=n);var c,f=document.createElement("script");f.charset="utf-8",f.timeout=120,o.nc&&f.setAttribute("nonce",o.nc),f.src=function(e){return o.p+"static/js/"+({}[e]||e)+"."+{0:"c490099b",1:"d5c20c38",5:"7154c544",6:"3b3ed6b3",7:"05cc9dbd",8:"02f6f6d2",9:"0cb915ad",10:"95b2edda",11:"04e83a60",12:"23f17cae",13:"e2ce43ca",14:"d1f78332",15:"19558fb3",16:"9356c734",17:"249c76f1",18:"6f0a373c",19:"545642bc",20:"f8215841",21:"e5f7c151",22:"ed91e085",23:"7dadd977",24:"966c0e2e",25:"f5bf249a",26:"f1dbe9b2",27:"50ee22bc",28:"7a8292e6",29:"54345dda",30:"2ba035b4",31:"32245201",32:"5a19b5ee",33:"f99079cd",34:"a20b4464",35:"506e1750",36:"45194f2c",37:"6cacdf19",38:"26ac693b",39:"c4112562",40:"eeca90df",41:"7b68c511",42:"9c2c5e97",43:"5d7317a5",44:"fe9af4f2",45:"44342f11",46:"e98dbf2f",47:"7557c994",48:"6196bde4",49:"96931133",50:"4b6c4945",51:"a0453ca7",52:"02d806fa",53:"2eb3a4c2",54:"d45590e9",55:"7b65aff4",56:"aba293cf",57:"fe307fff",58:"9911af61",59:"3ece5218",60:"8022a138",61:"aa0a68a3",62:"5b759580",63:"3704ad94",64:"a56b476c",65:"5cb7a5a5",66:"c79fff81",67:"fbae1306",68:"7889a44c",69:"39edff23",70:"16aeae57",71:"a1d51cd4",72:"27125a85",73:"e79ee491",74:"17cd2084",75:"804c47a0",76:"6e339e9f",77:"46a6b6a0"}[e]+".chunk.js"}(e);var u=new Error;c=function(t){f.onerror=f.onload=null,clearTimeout(i);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),c=t&&t.target&&t.target.src;u.message="Loading chunk "+e+" failed.\n("+n+": "+c+")",u.name="ChunkLoadError",u.type=n,u.request=c,r[1](u)}a[e]=void 0}};var i=setTimeout((function(){c({type:"timeout",target:f})}),12e4);f.onerror=f.onload=c,document.head.appendChild(f)}return Promise.all(t)},o.m=e,o.c=n,o.d=function(e,t,r){o.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,t){if(1&t&&(e=o(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(o.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)o.d(r,n,function(t){return e[t]}.bind(null,n));return r},o.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(t,"a",t),t},o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},o.p="/",o.oe=function(e){throw console.error(e),e};var f=this["webpackJsonptiro-notes-client"]=this["webpackJsonptiro-notes-client"]||[],u=f.push.bind(f);f.push=t,f=f.slice();for(var i=0;i<f.length;i++)t(f[i]);var d=u;r()}([])</script><script src="/static/js/4.950dfeb6.chunk.js"></script><script src="/static/js/main.4186260d.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Tiro</title><link href="/static/css/4.992ae4ff.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,o,f=t[0],u=t[1],i=t[2],l=0,b=[];l<f.length;l++)o=f[l],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&b.push(a[o][0]),a[o]=0;for(n in u)Object.prototype.hasOwnProperty.call(u,n)&&(e[n]=u[n]);for(d&&d(t);b.length;)b.shift()();return c.push.apply(c,i||[]),r()}function r(){for(var e,t=0;t<c.length;t++){for(var r=c[t],n=!0,f=1;f<r.length;f++){var u=r[f];0!==a[u]&&(n=!1)}n&&(c.splice(t--,1),e=o(o.s=r[0]))}return e}var n={},a={3:0},c=[];function o(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var t=[],r=a[e];if(0!==r)if(r)t.push(r[2]);else{var n=new Promise((function(t,n){r=a[e]=[t,n]}));t.push(r[2]=n);var c,f=document.createElement("script");f.charset="utf-8",f.timeout=120,o.nc&&f.setAttribute("nonce",o.nc),f.src=function(e){return o.p+"static/js/"+({}[e]||e)+"."+{0:"c490099b",1:"d5c20c38",5:"7154c544",6:"3b3ed6b3",7:"05cc9dbd",8:"02f6f6d2",9:"0cb915ad",10:"95b2edda",11:"04e83a60",12:"23f17cae",13:"e2ce43ca",14:"d1f78332",15:"19558fb3",16:"9356c734",17:"249c76f1",18:"6f0a373c",19:"545642bc",20:"f8215841",21:"e5f7c151",22:"ed91e085",23:"7dadd977",24:"966c0e2e",25:"f5bf249a",26:"f1dbe9b2",27:"50ee22bc",28:"7a8292e6",29:"54345dda",30:"2ba035b4",31:"32245201",32:"5a19b5ee",33:"f99079cd",34:"a20b4464",35:"506e1750",36:"45194f2c",37:"6cacdf19",38:"26ac693b",39:"c4112562",40:"eeca90df",41:"7b68c511",42:"9c2c5e97",43:"5d7317a5",44:"fe9af4f2",45:"44342f11",46:"e98dbf2f",47:"7557c994",48:"6196bde4",49:"96931133",50:"4b6c4945",51:"a0453ca7",52:"02d806fa",53:"2eb3a4c2",54:"d45590e9",55:"7b65aff4",56:"aba293cf",57:"fe307fff",58:"9911af61",59:"3ece5218",60:"8022a138",61:"aa0a68a3",62:"5b759580",63:"3704ad94",64:"a56b476c",65:"5cb7a5a5",66:"c79fff81",67:"fbae1306",68:"7889a44c",69:"39edff23",70:"16aeae57",71:"a1d51cd4",72:"27125a85",73:"e79ee491",74:"17cd2084",75:"804c47a0",76:"6e339e9f",77:"46a6b6a0"}[e]+".chunk.js"}(e);var u=new Error;c=function(t){f.onerror=f.onload=null,clearTimeout(i);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),c=t&&t.target&&t.target.src;u.message="Loading chunk "+e+" failed.\n("+n+": "+c+")",u.name="ChunkLoadError",u.type=n,u.request=c,r[1](u)}a[e]=void 0}};var i=setTimeout((function(){c({type:"timeout",target:f})}),12e4);f.onerror=f.onload=c,document.head.appendChild(f)}return Promise.all(t)},o.m=e,o.c=n,o.d=function(e,t,r){o.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,t){if(1&t&&(e=o(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(o.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)o.d(r,n,function(t){return e[t]}.bind(null,n));return r},o.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(t,"a",t),t},o.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},o.p="/",o.oe=function(e){throw console.error(e),e};var f=this["webpackJsonptiro-notes-client"]=this["webpackJsonptiro-notes-client"]||[],u=f.push.bind(f);f.push=t,f=f.slice();for(var i=0;i<f.length;i++)t(f[i]);var d=u;r()}([])</script><script src="/static/js/4.83d4d41c.chunk.js"></script><script src="/static/js/main.06401a25.chunk.js"></script></body></html>