aaden-cli 1.6.69 → 1.6.71

package/dist/index.js

@@ -23,43 +23,60 @@ function showCommand(arr) {
     console.log('')
 }
 
-function executeInShell(cmd, debug = false, needResult = false) {
-    let _cmd = commandBuilder(cmd)
+
+function executeInShellSync(cmd) {
+    let _cmd = commandBuilder([cmd])
     try {
-        showCommand(cmd)
-        if (debug) {
-            return {
-                result: false
-            }
-        }
-        if (needResult) {
-            const res = spawnSync(_cmd, [], {
-                shell: true, stdio: 'pipe', encoding: 'utf-8'
-            })
-            return {
-                result: true, output: res.stdout
-            }
-        } else {
-            spawn(_cmd, [], {
-                shell: true, stdio: 'inherit',
-            })
-            return {
-                result: true
-            }
+        showCommand([cmd])
+        const res = spawnSync(_cmd, [], {
+            shell: true, stdio: 'pipe', encoding: 'utf-8'
+        })
+        return {
+            result: true, output: res.stdout
         }
-
     } catch (e) {
         console.log(getLine('*'))
         console.log(e.bgRed)
         console.log(_cmd)
         console.log(getLine('*'))
     }
-    console.log(getLine('*'))
     return {result: false}
 }
 
+function executeInShell(cmd, debug = false) {
+    let _cmd = commandBuilder(cmd)
+    return new Promise(resolve => {
+        try {
+            showCommand(cmd)
+            if (debug) {
+                resolve({result: false})
+                return
+            }
+
+
+            const child = spawn(_cmd, [], {
+                shell: true, stdio: 'inherit',
+            })
+            child.on('close', (code) => {
+                resolve({result: true, code})
+            })
+
+
+        } catch (e) {
+            console.log(getLine('*'))
+            console.log(e.bgRed)
+            console.log(_cmd)
+            console.log(getLine('*'))
+            console.log(getLine('*'))
+            resolve({result: false})
+        }
+
+    })
+
+}
+
 module.exports = {
-    getLine, executeInShell
+    getLine, executeInShell, executeInShellSync,
 }
 
 
@@ -98,22 +115,27 @@ async function deviceEcho(data) {
         return
     }
     const {name, adress1, postCode, city, state} = await getNiceRestaurantInfo()
-    await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
-        deviceId: myDeviceId,
-        frontendVersion: frontendVersion,
-        cliVersion,
-        backendVersion: await getCurrentBackendVersion(),
-        timestamp: dayjs().valueOf(),
-        accessFrom: 'aaden-cli v' + cliVersion,
-        diskUsage,
-        lastUptime: upTime,
-        ngrokOk: ngrokIsNew,
-        deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
-    })
-    console.log('report to remote server complete')
+    const waitSecond = parseInt(myDeviceId) % 30 * 1000
+    setTimeout(async () => {
+        await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
+            deviceId: myDeviceId,
+            frontendVersion: frontendVersion,
+            cliVersion,
+            backendVersion: await getCurrentBackendVersion(),
+            timestamp: dayjs().valueOf(),
+            accessFrom: 'aaden-cli v' + cliVersion,
+            diskUsage,
+            lastUptime: upTime,
+            ngrokOk: ngrokIsNew,
+            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
+        })
+        console.log('report to remote server complete')
+    }, waitSecond)
+
+
 }
 
-async function logAction(content) {
+async function logAction(content, result = 0) {
     const deviceId = await getCurrentDeviceId()
     console.log(
         '*******************************************************\n' +
@@ -123,7 +145,7 @@ async function logAction(content) {
     )
     await hillo.jsonPost("https://cloud-v2.aaden.io/deviceLog/createEvent", {
         deviceId,
-        content,
+        content: content + ' result:' + result,
         type: '系统生成',
         operator: "aaden-cli v" + version
     })
@@ -18478,7 +18500,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.69"};
+module.exports = {"i8":"1.6.71"};
 
 /***/ })
 
@@ -18560,7 +18582,7 @@ const colors = __nccwpck_require__(3045)
 const fs = __nccwpck_require__(7147)
 const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = __nccwpck_require__(9646)
-const {deviceEcho,logAction} = __nccwpck_require__(7415)
+const {deviceEcho, logAction} = __nccwpck_require__(7415)
 const GlobalDeviceId = 'notset'
 
 const {program} = __nccwpck_require__(1904)
@@ -18571,7 +18593,6 @@ hillo.initial('http://localhost/PHP/')
 program.version(version)
 
 
-
 console.log(
     '*******************************************************\n' +
     'Aaden CLI'.bgCyan + ' Version:' + version.bgRed + '\n' +
@@ -18697,11 +18718,11 @@ async function fixNgrok() {
     logAction("手动修复了ngrok")
 }
 
-function testPrinter() {
+async function testPrinter() {
     const command = [
         `wget localhost/PHP/Complex.php?op=testAllPrinter`
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 
@@ -18770,7 +18791,7 @@ async function runMultiple(files) {
         arr.push('./' + f)
         return arr
     }, [])
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 async function run(filePath) {
@@ -18778,10 +18799,10 @@ async function run(filePath) {
         ...getPrivilegeCMD(filePath),
         './' + filePath
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
-function fullUpdate() {
+async function fullUpdate() {
     const command = [
         'sudo apt install git -y',
         'aaden-cli backup',
@@ -18792,8 +18813,8 @@ function fullUpdate() {
         'aaden-cli auto-write-gdpdu',
         'sudo systemctl daemon-reload'
     ]
-    cli.executeInShell(command, program.debug)
-    logAction("进行了full-update")
+    const {code} = await cli.executeInShell(command, program.debug)
+    await logAction("进行了full-update", code)
 }
 
 async function updateNgrokConfig(deviceId) {
@@ -18833,7 +18854,7 @@ tunnels:
             tcp: 22
         remote_port: ${parseInt(deviceId) + 10000}" > ngrok-config.yml`
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 async function startNgrokService() {
@@ -18842,7 +18863,7 @@ async function startNgrokService() {
         'cd AadenDeploy/ngrok',
         './ngrok -config=/etc/aaden/ngrok-config.yml start-all --log=/etc/aaden/ngrok.log'
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 async function doCompress() {
@@ -18851,8 +18872,8 @@ async function doCompress() {
         'cd',
         'sudo rm -rf backups'
     ]
-    cli.executeInShell(command, program.debug)
-    logAction("清理了空间")
+    const result = cli.executeInShell(command, program.debug)
+    logAction("清理了空间", result.code)
 }
 
 async function backup() {
@@ -18876,8 +18897,8 @@ async function backup() {
         'sudo rsync -av --delete /var/www/html/Resource ./Resource'
     ]
 
-    cli.executeInShell(command, program.debug)
-    logAction("执行了手动备份")
+    const {code} = await cli.executeInShell(command, program.debug)
+    logAction("执行了手动备份", code)
 
 }
 
@@ -18918,7 +18939,7 @@ async function migrate() {
             'vendor/bin/phinx migrate',
             'cd'
         ]
-        cli.executeInShell(command, program.debug)
+        await cli.executeInShell(command, program.debug)
 
     } catch (e) {
         console.error(e)
@@ -18939,7 +18960,7 @@ async function convertDataBaseCharset() {
                 'cd AadenDeploy/Utils',
                 `./updateDataBaseCharSet.sh`
             ]
-            cli.executeInShell(command, program.debug)
+            await cli.executeInShell(command, program.debug)
         } else {
             console.log('已经转换完成')
         }
@@ -18962,7 +18983,7 @@ async function loadNewVersion() {
                 'cd AadenDeploy/files',
                 `./getFile.sh`
             ]
-            cli.executeInShell(command, program.debug)
+            await cli.executeInShell(command, program.debug)
         } else {
             console.log('后端文件已经是最新')
         }
@@ -18983,7 +19004,7 @@ async function rollback() {
             'cd AadenDeploy',
             `./update.sh`
         ])
-        cli.executeInShell(command, program.debug)
+        await cli.executeInShell(command, program.debug)
     } catch (e) {
         console.error(e)
     }
@@ -19009,8 +19030,8 @@ async function update(channel = '') {
             'cd AadenDeploy',
             `./update.sh ${channel}`
         ])
-        cli.executeInShell(command, program.debug)
-        logAction("进行了手动更新update")
+        const {code} = await cli.executeInShell(command, program.debug)
+        await logAction("进行了手动更新update",code)
     } catch (e) {
         console.error(e)
     }
@@ -19035,7 +19056,7 @@ async function install(deviceId) {
             'cd AadenDeploy',
             `./aadensetup.sh ${deviceId} ${channel}` + (installApp ? ' b' : '')
         ]
-        cli.executeInShell(command, program.debug)
+        await cli.executeInShell(command, program.debug)
     } else {
         console.log('Device Id is invalid.')
     }
@@ -19060,13 +19081,13 @@ async function autoUpgrade() {
     logAction("自动执行了更新aaden-cli")
 }
 
-function upgrade() {
+async function upgrade() {
     const command = [
         ...getPrivilegeCMD('AadenDeploy/upgrade.sh'),
         'cd AadenDeploy',
         `./upgrade.sh`
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 function getStorageBackendFileVersion() {
@@ -19145,13 +19166,13 @@ async function removeAllData() {
         'echo "请输入数据库密码(和开机密码，sudo密码相同)"',
         'mysql -u aaden -p < AadenDeploy/purge.sql'
     ]
-    cli.executeInShell(command, program.debug)
-    logAction("清空了数据")
+    const {code} = await cli.executeInShell(command, program.debug)
+    await logAction("清空了数据", code)
 }
 
 function getUpTime() {
     try {
-        return cli.executeInShell(['uptime'], program.debug, true).output.split(',')[0].split(' up ')[1]
+        return cli.executeInShellSync('uptime').output.split(',')[0].split(' up ')[1]
     } catch (e) {
         return e.message
     }
@@ -19159,24 +19180,26 @@ function getUpTime() {
 }
 
 async function doLog() {
-    const res = cli.executeInShell(['snap info aaden'], program.debug, true)
+    const res = cli.executeInShellSync('snap info aaden')
     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
+        cli.executeInShellSync('df -h --total | command grep total | df -h --total | command grep total | head -c-3 && echo \'\'',)
+            .output.split(' ')
     const log = res.output
     const list = log.split('\n')
     const frontendVersion = list[list.length - 2].replace(/\s+/g, ' ')
         .split(' ')[1]
-    await deviceEcho({
-            frontendVersion,
-            cliVersion: version,
-            diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
-            upTime: getUpTime(),
-            ngrokIsNew: ngrokNewestVersion()
-        }
-    )
-    console.log('finish')
+
+        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

@@ -8,7 +8,7 @@ const colors = require('colors')
 const fs = require('fs')
 const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = require('prompts')
-const {deviceEcho,logAction} = require('./modules/firebase')
+const {deviceEcho, logAction} = require('./modules/firebase')
 const GlobalDeviceId = 'notset'
 
 const {program} = require('commander')
@@ -19,7 +19,6 @@ hillo.initial('http://localhost/PHP/')
 program.version(version)
 
 
-
 console.log(
     '*******************************************************\n' +
     'Aaden CLI'.bgCyan + ' Version:' + version.bgRed + '\n' +
@@ -145,11 +144,11 @@ async function fixNgrok() {
     logAction("手动修复了ngrok")
 }
 
-function testPrinter() {
+async function testPrinter() {
     const command = [
         `wget localhost/PHP/Complex.php?op=testAllPrinter`
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 
@@ -218,7 +217,7 @@ async function runMultiple(files) {
         arr.push('./' + f)
         return arr
     }, [])
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 async function run(filePath) {
@@ -226,10 +225,10 @@ async function run(filePath) {
         ...getPrivilegeCMD(filePath),
         './' + filePath
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
-function fullUpdate() {
+async function fullUpdate() {
     const command = [
         'sudo apt install git -y',
         'aaden-cli backup',
@@ -240,8 +239,8 @@ function fullUpdate() {
         'aaden-cli auto-write-gdpdu',
         'sudo systemctl daemon-reload'
     ]
-    cli.executeInShell(command, program.debug)
-    logAction("进行了full-update")
+    const {code} = await cli.executeInShell(command, program.debug)
+    await logAction("进行了full-update", code)
 }
 
 async function updateNgrokConfig(deviceId) {
@@ -281,7 +280,7 @@ tunnels:
             tcp: 22
         remote_port: ${parseInt(deviceId) + 10000}" > ngrok-config.yml`
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 async function startNgrokService() {
@@ -290,7 +289,7 @@ async function startNgrokService() {
         'cd AadenDeploy/ngrok',
         './ngrok -config=/etc/aaden/ngrok-config.yml start-all --log=/etc/aaden/ngrok.log'
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 async function doCompress() {
@@ -299,8 +298,8 @@ async function doCompress() {
         'cd',
         'sudo rm -rf backups'
     ]
-    cli.executeInShell(command, program.debug)
-    logAction("清理了空间")
+    const result = cli.executeInShell(command, program.debug)
+    logAction("清理了空间", result.code)
 }
 
 async function backup() {
@@ -324,8 +323,8 @@ async function backup() {
         'sudo rsync -av --delete /var/www/html/Resource ./Resource'
     ]
 
-    cli.executeInShell(command, program.debug)
-    logAction("执行了手动备份")
+    const {code} = await cli.executeInShell(command, program.debug)
+    logAction("执行了手动备份", code)
 
 }
 
@@ -366,7 +365,7 @@ async function migrate() {
             'vendor/bin/phinx migrate',
             'cd'
         ]
-        cli.executeInShell(command, program.debug)
+        await cli.executeInShell(command, program.debug)
 
     } catch (e) {
         console.error(e)
@@ -387,7 +386,7 @@ async function convertDataBaseCharset() {
                 'cd AadenDeploy/Utils',
                 `./updateDataBaseCharSet.sh`
             ]
-            cli.executeInShell(command, program.debug)
+            await cli.executeInShell(command, program.debug)
         } else {
             console.log('已经转换完成')
         }
@@ -410,7 +409,7 @@ async function loadNewVersion() {
                 'cd AadenDeploy/files',
                 `./getFile.sh`
             ]
-            cli.executeInShell(command, program.debug)
+            await cli.executeInShell(command, program.debug)
         } else {
             console.log('后端文件已经是最新')
         }
@@ -431,7 +430,7 @@ async function rollback() {
             'cd AadenDeploy',
             `./update.sh`
         ])
-        cli.executeInShell(command, program.debug)
+        await cli.executeInShell(command, program.debug)
     } catch (e) {
         console.error(e)
     }
@@ -457,8 +456,8 @@ async function update(channel = '') {
             'cd AadenDeploy',
             `./update.sh ${channel}`
         ])
-        cli.executeInShell(command, program.debug)
-        logAction("进行了手动更新update")
+        const {code} = await cli.executeInShell(command, program.debug)
+        await logAction("进行了手动更新update",code)
     } catch (e) {
         console.error(e)
     }
@@ -483,7 +482,7 @@ async function install(deviceId) {
             'cd AadenDeploy',
             `./aadensetup.sh ${deviceId} ${channel}` + (installApp ? ' b' : '')
         ]
-        cli.executeInShell(command, program.debug)
+        await cli.executeInShell(command, program.debug)
     } else {
         console.log('Device Id is invalid.')
     }
@@ -508,13 +507,13 @@ async function autoUpgrade() {
     logAction("自动执行了更新aaden-cli")
 }
 
-function upgrade() {
+async function upgrade() {
     const command = [
         ...getPrivilegeCMD('AadenDeploy/upgrade.sh'),
         'cd AadenDeploy',
         `./upgrade.sh`
     ]
-    cli.executeInShell(command, program.debug)
+    await cli.executeInShell(command, program.debug)
 }
 
 function getStorageBackendFileVersion() {
@@ -593,13 +592,13 @@ async function removeAllData() {
         'echo "请输入数据库密码(和开机密码，sudo密码相同)"',
         'mysql -u aaden -p < AadenDeploy/purge.sql'
     ]
-    cli.executeInShell(command, program.debug)
-    logAction("清空了数据")
+    const {code} = await cli.executeInShell(command, program.debug)
+    await logAction("清空了数据", code)
 }
 
 function getUpTime() {
     try {
-        return cli.executeInShell(['uptime'], program.debug, true).output.split(',')[0].split(' up ')[1]
+        return cli.executeInShellSync('uptime').output.split(',')[0].split(' up ')[1]
     } catch (e) {
         return e.message
     }
@@ -607,24 +606,26 @@ function getUpTime() {
 }
 
 async function doLog() {
-    const res = cli.executeInShell(['snap info aaden'], program.debug, true)
+    const res = cli.executeInShellSync('snap info aaden')
     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
+        cli.executeInShellSync('df -h --total | command grep total | df -h --total | command grep total | head -c-3 && echo \'\'',)
+            .output.split(' ')
     const log = res.output
     const list = log.split('\n')
     const frontendVersion = list[list.length - 2].replace(/\s+/g, ' ')
         .split(' ')[1]
-    await deviceEcho({
-            frontendVersion,
-            cliVersion: version,
-            diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
-            upTime: getUpTime(),
-            ngrokIsNew: ngrokNewestVersion()
-        }
-    )
-    console.log('finish')
+
+        await deviceEcho({
+                frontendVersion,
+                cliVersion: version,
+                diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
+                upTime: getUpTime(),
+                ngrokIsNew: ngrokNewestVersion()
+            }
+        )
+        console.log('finish')
+
+
 
     process.exit(0)
 }

package/modules/cli-utils.js

@@ -16,41 +16,58 @@ function showCommand(arr) {
     console.log('')
 }
 
-function executeInShell(cmd, debug = false, needResult = false) {
-    let _cmd = commandBuilder(cmd)
+
+function executeInShellSync(cmd) {
+    let _cmd = commandBuilder([cmd])
     try {
-        showCommand(cmd)
-        if (debug) {
-            return {
-                result: false
-            }
-        }
-        if (needResult) {
-            const res = spawnSync(_cmd, [], {
-                shell: true, stdio: 'pipe', encoding: 'utf-8'
-            })
-            return {
-                result: true, output: res.stdout
-            }
-        } else {
-            spawn(_cmd, [], {
-                shell: true, stdio: 'inherit',
-            })
-            return {
-                result: true
-            }
+        showCommand([cmd])
+        const res = spawnSync(_cmd, [], {
+            shell: true, stdio: 'pipe', encoding: 'utf-8'
+        })
+        return {
+            result: true, output: res.stdout
         }
-
     } catch (e) {
         console.log(getLine('*'))
         console.log(e.bgRed)
         console.log(_cmd)
         console.log(getLine('*'))
     }
-    console.log(getLine('*'))
     return {result: false}
 }
 
+function executeInShell(cmd, debug = false) {
+    let _cmd = commandBuilder(cmd)
+    return new Promise(resolve => {
+        try {
+            showCommand(cmd)
+            if (debug) {
+                resolve({result: false})
+                return
+            }
+
+
+            const child = spawn(_cmd, [], {
+                shell: true, stdio: 'inherit',
+            })
+            child.on('close', (code) => {
+                resolve({result: true, code})
+            })
+
+
+        } catch (e) {
+            console.log(getLine('*'))
+            console.log(e.bgRed)
+            console.log(_cmd)
+            console.log(getLine('*'))
+            console.log(getLine('*'))
+            resolve({result: false})
+        }
+
+    })
+
+}
+
 module.exports = {
-    getLine, executeInShell
+    getLine, executeInShell, executeInShellSync,
 }

package/modules/firebase.js

@@ -19,22 +19,27 @@ export async function deviceEcho(data) {
         return
     }
     const {name, adress1, postCode, city, state} = await getNiceRestaurantInfo()
-    await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
-        deviceId: myDeviceId,
-        frontendVersion: frontendVersion,
-        cliVersion,
-        backendVersion: await getCurrentBackendVersion(),
-        timestamp: dayjs().valueOf(),
-        accessFrom: 'aaden-cli v' + cliVersion,
-        diskUsage,
-        lastUptime: upTime,
-        ngrokOk: ngrokIsNew,
-        deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
-    })
-    console.log('report to remote server complete')
+    const waitSecond = parseInt(myDeviceId) % 30 * 1000
+    setTimeout(async () => {
+        await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
+            deviceId: myDeviceId,
+            frontendVersion: frontendVersion,
+            cliVersion,
+            backendVersion: await getCurrentBackendVersion(),
+            timestamp: dayjs().valueOf(),
+            accessFrom: 'aaden-cli v' + cliVersion,
+            diskUsage,
+            lastUptime: upTime,
+            ngrokOk: ngrokIsNew,
+            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
+        })
+        console.log('report to remote server complete')
+    }, waitSecond)
+
+
 }
 
-export async function logAction(content) {
+export async function logAction(content, result = 0) {
     const deviceId = await getCurrentDeviceId()
     console.log(
         '*******************************************************\n' +
@@ -44,7 +49,7 @@ export async function logAction(content) {
     )
     await hillo.jsonPost("https://cloud-v2.aaden.io/deviceLog/createEvent", {
         deviceId,
-        content,
+        content: content + ' result:' + result,
         type: '系统生成',
         operator: "aaden-cli v" + version
     })

package/package.json

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