aaden-cli 1.6.57 → 1.6.59

package/AadenDeploy/Utils/fixCronJob.sh

@@ -26,10 +26,10 @@ echo "END Aaden Deploy CONFIG"
 echo "Innerken322." | sudo -S rm -rf /etc/cron.d/aaden-cli-upgrade
 echo "Innerken322." | sudo -S touch conf
 echo "Innerken322." | sudo -S chmod 777 conf
-echo "59 4 * * * sudo npm install aaden-cli -g" >>conf
+echo "55 4 * * * sudo npm install aaden-cli -g" >>conf
 echo "59 4 * * * /usr/local/bin/aaden-cli auto-upgrade" >>conf
 echo "@reboot sleep 30 && sudo npm install aaden-cli -g" >>conf
-echo "@reboot sleep 30 &&/usr/local/bin/aaden-cli auto-upgrade" >>conf
+echo "@reboot sleep 60 &&/usr/local/bin/aaden-cli auto-upgrade" >>conf
 echo "Innerken322." | sudo -S crontab -u root -r
 echo "Innerken322." | sudo -S crontab -u root conf
 echo "Innerken322." | sudo -S rm -f conf

package/AadenDeploy/upgrade.sh

@@ -2,9 +2,10 @@
 
 
 
-echo "Innerken322." | sudo -S mkdir -p /etc/aaden/config
-echo "Innerken322." | sudo -S chmod -R 777 /etc/aaden/config
-echo "Innerken322." | sudo -S npm update aaden-cli -g
+mkdir -p /etc/aaden/config
+chmod -R 777 /etc/aaden/config
+npm update aaden-cli -g
 
 aaden-cli patch
 
+

package/dist/index.js

@@ -78,24 +78,30 @@ __nccwpck_require__.r(__webpack_exports__);
 /* harmony export */ });
 const dayjs = __nccwpck_require__(7401)
 const {hillo} = __nccwpck_require__(6365)
+const defaultData = {
+    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false
+}
 
-async function deviceEcho(frontEndVersion, cliVersion, diskUsage) {
+async function deviceEcho(data) {
     hillo.initial('http://localhost/PHP/')
     const myDeviceId = await getCurrentDeviceId()
     console.log('echo for device', myDeviceId)
+    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
         return
     }
     const {name, adress1, postCode, city, state} = await getNiceRestaurantInfo()
     await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
         deviceId: myDeviceId,
-        frontendVersion: frontEndVersion,
+        frontendVersion: frontendVersion,
         cliVersion,
         backendVersion: await getCurrentBackendVersion(),
         timestamp: dayjs().valueOf(),
         accessFrom: 'aaden-cli v' + cliVersion,
         diskUsage,
-        deviceName:`${name}\n${adress1}\n${postCode} ${city} ${state}`
+        lastUptime: upTime,
+        ngrokOk: ngrokIsNew,
+        deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
     })
     console.log('report to remote server complete')
 }
@@ -18449,7 +18455,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.57"};
+module.exports = {"i8":"1.6.59"};
 
 /***/ })
 
@@ -18663,8 +18669,8 @@ function enterDatabase() {
     cli.executeInShell(command, program.debug)
 }
 
-function fixNgrok() {
-    run('AadenDeploy/Utils/enableNgrok.sh')
+async function fixNgrok() {
+    await run('AadenDeploy/Utils/enableNgrok.sh')
 }
 
 function testPrinter() {
@@ -19016,6 +19022,9 @@ function getMyDeviceId() {
 }
 
 async function autoUpgrade() {
+    if (!ngrokNewestVersion()) {
+        await fixNgrok()
+    }
     upgrade()
 }
 
@@ -19038,7 +19047,10 @@ function getStorageBackendFileVersion() {
         frontVersion = '0.0.0'
     }
     return frontVersion
+}
 
+function ngrokNewestVersion() {
+    return fs.existsSync('/etc/systemd/system/aaden-ngrok-v3.service');
 }
 
 function getBackendVersionOffline() {
@@ -19104,18 +19116,34 @@ async function removeAllData() {
     cli.executeInShell(command, program.debug)
 }
 
+function getUpTime() {
+    try {
+        return cli.executeInShell([''], program.debug, true).output.split(',')[0]
+    } catch (e) {
+        return e.message
+    }
+
+}
 
 async function doLog() {
     const res = cli.executeInShell(['snap info aaden'], program.debug, true)
     const diskUsage =
         cli.executeInShell(['df -h --total | command grep total | df -h --total | command grep total | head -c-3 && echo \'\''],
             program.debug, true).output.split(' ')
+    const uptime = cli.executeInShell([''], program.debug, true).output
     const log = res.output
     const list = log.split('\n')
     const frontendVersion = list[list.length - 2].replace(/\s+/g, ' ')
         .split(' ')[1]
     console.log(frontendVersion)
-    await deviceEcho(frontendVersion, version, diskUsage[diskUsage.length - 1].replace('\n', ''))
+    await deviceEcho({
+            frontendVersion,
+            cliVersion: version,
+            diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
+            upTime: getUpTime(),
+            ngrokIsNew: ngrokNewestVersion()
+        }
+    )
     console.log('finish')
 
     process.exit(0)

package/index.js

@@ -140,8 +140,8 @@ function enterDatabase() {
     cli.executeInShell(command, program.debug)
 }
 
-function fixNgrok() {
-    run('AadenDeploy/Utils/enableNgrok.sh')
+async function fixNgrok() {
+    await run('AadenDeploy/Utils/enableNgrok.sh')
 }
 
 function testPrinter() {
@@ -493,6 +493,9 @@ function getMyDeviceId() {
 }
 
 async function autoUpgrade() {
+    if (!ngrokNewestVersion()) {
+        await fixNgrok()
+    }
     upgrade()
 }
 
@@ -515,7 +518,10 @@ function getStorageBackendFileVersion() {
         frontVersion = '0.0.0'
     }
     return frontVersion
+}
 
+function ngrokNewestVersion() {
+    return fs.existsSync('/etc/systemd/system/aaden-ngrok-v3.service');
 }
 
 function getBackendVersionOffline() {
@@ -581,18 +587,34 @@ async function removeAllData() {
     cli.executeInShell(command, program.debug)
 }
 
+function getUpTime() {
+    try {
+        return cli.executeInShell([''], program.debug, true).output.split(',')[0]
+    } catch (e) {
+        return e.message
+    }
+
+}
 
 async function doLog() {
     const res = cli.executeInShell(['snap info aaden'], program.debug, true)
     const diskUsage =
         cli.executeInShell(['df -h --total | command grep total | df -h --total | command grep total | head -c-3 && echo \'\''],
             program.debug, true).output.split(' ')
+    const uptime = cli.executeInShell([''], program.debug, true).output
     const log = res.output
     const list = log.split('\n')
     const frontendVersion = list[list.length - 2].replace(/\s+/g, ' ')
         .split(' ')[1]
     console.log(frontendVersion)
-    await deviceEcho(frontendVersion, version, diskUsage[diskUsage.length - 1].replace('\n', ''))
+    await deviceEcho({
+            frontendVersion,
+            cliVersion: version,
+            diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
+            upTime: getUpTime(),
+            ngrokIsNew: ngrokNewestVersion()
+        }
+    )
     console.log('finish')
 
     process.exit(0)

package/modules/firebase.js

@@ -1,23 +1,29 @@
 const dayjs = require("dayjs")
 const {hillo} = require('hillo')
+const defaultData = {
+    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false
+}
 
-export async function deviceEcho(frontEndVersion, cliVersion, diskUsage) {
+export async function deviceEcho(data) {
     hillo.initial('http://localhost/PHP/')
     const myDeviceId = await getCurrentDeviceId()
     console.log('echo for device', myDeviceId)
+    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
         return
     }
     const {name, adress1, postCode, city, state} = await getNiceRestaurantInfo()
     await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
         deviceId: myDeviceId,
-        frontendVersion: frontEndVersion,
+        frontendVersion: frontendVersion,
         cliVersion,
         backendVersion: await getCurrentBackendVersion(),
         timestamp: dayjs().valueOf(),
         accessFrom: 'aaden-cli v' + cliVersion,
         diskUsage,
-        deviceName:`${name}\n${adress1}\n${postCode} ${city} ${state}`
+        lastUptime: upTime,
+        ngrokOk: ngrokIsNew,
+        deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
     })
     console.log('report to remote server complete')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.57",
+  "version": "1.6.59",
   "description": "",
   "main": "dist/index.js",
   "scripts": {