aaden-cli 1.6.101 → 1.6.102

package/dist/index.js

@@ -99,7 +99,7 @@ const {hillo} = __nccwpck_require__(6365)
 const version = (__nccwpck_require__(4147)/* .version */ .i8)
 const colors = __nccwpck_require__(3045)
 const defaultData = {
-    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false
+    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false, hostInfo: {}
 }
 
 async function deviceEcho(data) {
@@ -110,7 +110,7 @@ async function deviceEcho(data) {
     Object.entries(data).forEach(en => {
         console.log(...en)
     })
-    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew} = Object.assign({}, defaultData, data)
+    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew, hostInfo} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
         return
     }
@@ -131,7 +131,8 @@ async function deviceEcho(data) {
             diskUsage,
             lastUptime: upTime,
             ngrokOk: ngrokIsNew,
-            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
+            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`,
+            ...hostInfo
         })
         console.log('report to remote server complete')
     } catch (e) {
@@ -179,6 +180,75 @@ async function getNiceRestaurantInfo() {
 
 
 
+/***/ }),
+
+/***/ 3727:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const os = __nccwpck_require__(2037)
+const fs = __nccwpck_require__(7147)
+const {execSync} = __nccwpck_require__(8493)
+
+// do-log 顺带上报的宿主机信息，用来在云端看车队的系统/硬件分布。
+// 每一项单独兜底：探测失败就报 null，不能让 do-log 本身挂掉。
+
+function safe(fn, fallback = null) {
+    try {
+        const value = fn()
+        return value === undefined ? fallback : value
+    } catch (e) {
+        return fallback
+    }
+}
+
+function run(cmd) {
+    return execSync(cmd, {
+        encoding: 'utf-8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore']
+    }).trim()
+}
+
+function osRelease() {
+    const text = fs.readFileSync('/etc/os-release', 'utf-8')
+    const match = text.match(/^PRETTY_NAME="?([^"\n]*)"?$/m)
+    return match ? match[1] : null
+}
+
+function rootDisk() {
+    // 第二行是 "<size> <avail>"，单位字节
+    const [size, avail] = run('df -B1 --output=size,avail /')
+        .split('\n')[1].trim().split(/\s+/).map(Number)
+    const toGb = bytes => Math.round(bytes / 1024 / 1024 / 1024)
+    return {diskTotalGb: toGb(size), diskAvailGb: toGb(avail)}
+}
+
+function dockerVersion() {
+    // 没装 docker 报空串，和"探测失败"(null) 区分开
+    const output = run('command -v docker >/dev/null && docker --version || true')
+    const match = output.match(/version ([^,\s]+)/)
+    return match ? match[1] : ''
+}
+
+function collectHostInfo() {
+    const cpus = safe(() => os.cpus(), [])
+    const disk = safe(rootDisk, {diskTotalGb: null, diskAvailGb: null})
+    return {
+        osRelease: safe(osRelease),
+        kernelVersion: safe(() => os.release()),
+        // WSL1 内核是 "4.4.0-19041-Microsoft"，WSL2 是 "5.15.x-microsoft-standard-WSL2"
+        wsl: safe(() => /microsoft|wsl/i.test(os.release())),
+        cpuModel: cpus.length ? cpus[0].model.trim() : null,
+        cpuCores: cpus.length || null,
+        cpuArch: safe(() => os.arch()),
+        memTotalMb: safe(() => Math.round(os.totalmem() / 1024 / 1024)),
+        diskTotalGb: disk.diskTotalGb,
+        diskAvailGb: disk.diskAvailGb,
+        dockerVersion: safe(dockerVersion),
+    }
+}
+
+module.exports = {collectHostInfo}
+
+
 /***/ }),
 
 /***/ 6545:
@@ -18507,7 +18577,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.101"};
+module.exports = {"i8":"1.6.102"};
 
 /***/ })
 
@@ -18590,6 +18660,7 @@ const fs = __nccwpck_require__(7147)
 const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = __nccwpck_require__(9646)
 const {deviceEcho, logAction, getCurrentDeviceId} = __nccwpck_require__(7415)
+const {collectHostInfo} = __nccwpck_require__(3727)
 const GlobalDeviceId = 'notset'
 
 const {program} = __nccwpck_require__(1904)
@@ -19362,7 +19433,8 @@ async function doLog() {
             cliVersion: version,
             diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
             upTime: getUpTime(),
-            ngrokIsNew: ngrokNewestVersion()
+            ngrokIsNew: ngrokNewestVersion(),
+            hostInfo: collectHostInfo()
         }
     )
     console.log('finish')

package/index.js

@@ -9,6 +9,7 @@ const fs = require('fs')
 const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = require('prompts')
 const {deviceEcho, logAction, getCurrentDeviceId} = require('./modules/firebase')
+const {collectHostInfo} = require('./modules/host-info')
 const GlobalDeviceId = 'notset'
 
 const {program} = require('commander')
@@ -781,7 +782,8 @@ async function doLog() {
             cliVersion: version,
             diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
             upTime: getUpTime(),
-            ngrokIsNew: ngrokNewestVersion()
+            ngrokIsNew: ngrokNewestVersion(),
+            hostInfo: collectHostInfo()
         }
     )
     console.log('finish')

package/modules/firebase.js

@@ -3,7 +3,7 @@ const {hillo} = require('hillo')
 const version = require('./../package.json').version
 const colors = require('colors')
 const defaultData = {
-    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false
+    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false, hostInfo: {}
 }
 
 export async function deviceEcho(data) {
@@ -14,7 +14,7 @@ export async function deviceEcho(data) {
     Object.entries(data).forEach(en => {
         console.log(...en)
     })
-    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew} = Object.assign({}, defaultData, data)
+    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew, hostInfo} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
         return
     }
@@ -35,7 +35,8 @@ export async function deviceEcho(data) {
             diskUsage,
             lastUptime: upTime,
             ngrokOk: ngrokIsNew,
-            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`
+            deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`,
+            ...hostInfo
         })
         console.log('report to remote server complete')
     } catch (e) {

package/modules/host-info.js

@@ -0,0 +1,62 @@
+const os = require('os')
+const fs = require('fs')
+const {execSync} = require('child_process')
+
+// do-log 顺带上报的宿主机信息，用来在云端看车队的系统/硬件分布。
+// 每一项单独兜底：探测失败就报 null，不能让 do-log 本身挂掉。
+
+function safe(fn, fallback = null) {
+    try {
+        const value = fn()
+        return value === undefined ? fallback : value
+    } catch (e) {
+        return fallback
+    }
+}
+
+function run(cmd) {
+    return execSync(cmd, {
+        encoding: 'utf-8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore']
+    }).trim()
+}
+
+function osRelease() {
+    const text = fs.readFileSync('/etc/os-release', 'utf-8')
+    const match = text.match(/^PRETTY_NAME="?([^"\n]*)"?$/m)
+    return match ? match[1] : null
+}
+
+function rootDisk() {
+    // 第二行是 "<size> <avail>"，单位字节
+    const [size, avail] = run('df -B1 --output=size,avail /')
+        .split('\n')[1].trim().split(/\s+/).map(Number)
+    const toGb = bytes => Math.round(bytes / 1024 / 1024 / 1024)
+    return {diskTotalGb: toGb(size), diskAvailGb: toGb(avail)}
+}
+
+function dockerVersion() {
+    // 没装 docker 报空串，和"探测失败"(null) 区分开
+    const output = run('command -v docker >/dev/null && docker --version || true')
+    const match = output.match(/version ([^,\s]+)/)
+    return match ? match[1] : ''
+}
+
+function collectHostInfo() {
+    const cpus = safe(() => os.cpus(), [])
+    const disk = safe(rootDisk, {diskTotalGb: null, diskAvailGb: null})
+    return {
+        osRelease: safe(osRelease),
+        kernelVersion: safe(() => os.release()),
+        // WSL1 内核是 "4.4.0-19041-Microsoft"，WSL2 是 "5.15.x-microsoft-standard-WSL2"
+        wsl: safe(() => /microsoft|wsl/i.test(os.release())),
+        cpuModel: cpus.length ? cpus[0].model.trim() : null,
+        cpuCores: cpus.length || null,
+        cpuArch: safe(() => os.arch()),
+        memTotalMb: safe(() => Math.round(os.totalmem() / 1024 / 1024)),
+        diskTotalGb: disk.diskTotalGb,
+        diskAvailGb: disk.diskAvailGb,
+        dockerVersion: safe(dockerVersion),
+    }
+}
+
+module.exports = {collectHostInfo}

package/package.json

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