aaden-cli 1.6.108 → 1.6.109-rc.0

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, hostInfo: {}
+    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false, hostInfo: {}, tseInfo: {}
 }
 
 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, hostInfo} = Object.assign({}, defaultData, data)
+    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew, hostInfo, tseInfo} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
         return
     }
@@ -132,7 +132,8 @@ async function deviceEcho(data) {
             lastUptime: upTime,
             ngrokOk: ngrokIsNew,
             deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`,
-            ...hostInfo
+            ...hostInfo,
+            ...tseInfo
         })
         console.log('report to remote server complete')
     } catch (e) {
@@ -249,6 +250,157 @@ function collectHostInfo() {
 module.exports = {collectHostInfo}
 
 
+/***/ }),
+
+/***/ 6677:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const fs = __nccwpck_require__(7147)
+const os = __nccwpck_require__(2037)
+const http = __nccwpck_require__(3685)
+const https = __nccwpck_require__(5687)
+
+// do-log 顺带上报的 TSE 适配服务（TseHost）信息，用来在云端看车队的 TSE 版本和服务状态。
+// WSL 门店的 TseHost 跑在 Windows 侧，网站目录里的 jar 不一定是实际在跑的那个，
+// 所以和 PHP 一样按 config.ini 的 [TSE] TseHost 去访问服务，jar 也按服务配置去找。
+// 每一项单独兜底：探测失败就报 null，不能让 do-log 本身挂掉。
+
+const CONFIG_INI = '/var/www/html/Resource/config/config.ini'
+const DEFAULT_TSE_HOST = 'http://localhost:8014'
+// Linux：aaden-tse.service 执行 tseServing.sh，里面 java -jar 的那个 jar
+const LINUX_SERVING_SCRIPT = '/var/www/html/TseHost/tseServing.sh'
+const LINUX_DEFAULT_JAR = '/var/www/html/TseHost/tse-0.0.2.jar'
+// Windows（WSL 门店）：WinSW 服务目录，jar 名写在 AadenTseServiceRegister.xml 里
+const WINDOWS_USERS_DIR = '/mnt/c/Users'
+const WINDOWS_TSE_DIR = 'Desktop/AadenTseOnWindows'
+const WINDOWS_DEFAULT_JAR = 'tse-0.0.3.jar'
+// 和 PHP 的 Api.php 一样给 3 秒
+const PROBE_TIMEOUT_MS = 3000
+
+async function safe(fn, fallback = null) {
+    try {
+        const value = await fn()
+        return value === undefined ? fallback : value
+    } catch (e) {
+        return fallback
+    }
+}
+
+function readTseSection() {
+    const section = {}
+    let inTse = false
+    for (const raw of fs.readFileSync(CONFIG_INI, 'utf-8').split(/\r?\n/)) {
+        const line = raw.trim()
+        if (!line || line.startsWith(';') || line.startsWith('#')) continue
+        const header = line.match(/^\[(.+)]$/)
+        if (header) {
+            inTse = header[1].trim() === 'TSE'
+            continue
+        }
+        if (!inTse) continue
+        const eq = line.indexOf('=')
+        if (eq < 0) continue
+        section[line.slice(0, eq).trim()] = line.slice(eq + 1).trim().replace(/^"(.*)"$/, '$1')
+    }
+    return section
+}
+
+// 与 PHP 的 INI_SCANNER_TYPED 一致：true/on/yes 为真，数字按非 0 为真
+function parseEnabled(value) {
+    if (value === undefined) return false
+    const v = String(value).trim().toLowerCase()
+    if (['true', 'on', 'yes'].includes(v)) return true
+    if (/^-?\d+$/.test(v)) return parseInt(v, 10) !== 0
+    return false
+}
+
+// 连不上（服务没起、Windows 侧没开、超时）统一当作 status 0
+function httpGet(url) {
+    return new Promise(resolve => {
+        // 兜底：响应中途断掉时 end 不会触发，不能让 do-log 卡在这里
+        const timer = setTimeout(() => resolve({status: 0, body: ''}), PROBE_TIMEOUT_MS + 1000)
+        const done = result => {
+            clearTimeout(timer)
+            resolve(result)
+        }
+        try {
+            const client = url.startsWith('https:') ? https : http
+            const req = client.get(url, {timeout: PROBE_TIMEOUT_MS}, res => {
+                let body = ''
+                res.setEncoding('utf-8')
+                res.on('data', chunk => {
+                    if (body.length < 4096) body += chunk
+                })
+                res.on('end', () => done({status: res.statusCode, body}))
+                res.on('error', () => done({status: 0, body: ''}))
+            })
+            req.on('timeout', () => req.destroy(new Error('timeout')))
+            req.on('error', () => done({status: 0, body: ''}))
+        } catch (e) {
+            done({status: 0, body: ''})
+        }
+    })
+}
+
+function servingJarPath() {
+    if (/microsoft|wsl/i.test(os.release()) && fs.existsSync(WINDOWS_USERS_DIR)) {
+        for (const user of fs.readdirSync(WINDOWS_USERS_DIR)) {
+            const dir = `${WINDOWS_USERS_DIR}/${user}/${WINDOWS_TSE_DIR}`
+            const xml = `${dir}/AadenTseServiceRegister.xml`
+            if (!fs.existsSync(xml)) continue
+            const match = fs.readFileSync(xml, 'utf-8').match(/-jar\s+"?%BASE%\\([^"\s]+\.jar)/i)
+            return `${dir}/${match ? match[1] : WINDOWS_DEFAULT_JAR}`
+        }
+        // 没找到 Windows 侧的服务目录：按 Linux 的装法找
+    }
+    if (!fs.existsSync(LINUX_SERVING_SCRIPT)) return LINUX_DEFAULT_JAR
+    const match = fs.readFileSync(LINUX_SERVING_SCRIPT, 'utf-8').match(/-jar\s+(\S+\.jar)/)
+    return match ? match[1] : LINUX_DEFAULT_JAR
+}
+
+async function probeTse() {
+    const section = await safe(readTseSection, {})
+    const tseEnabled = parseEnabled(section.TseEnabled)
+    const tseHost = (section.TseHost || DEFAULT_TSE_HOST).replace(/\/+$/, '')
+    // 不同版本的 jar 大小不同，没有 /adapterVersion 的老版本只能靠它区分
+    const tseJarSize = await safe(() => {
+        const jar = servingJarPath()
+        return jar && fs.existsSync(jar) ? fs.statSync(jar).size : null
+    })
+
+    if (!tseEnabled) {
+        return {tseEnabled, tseHost, tseStatus: 'disabled', tseAdapterVersion: null, tseJarSize}
+    }
+
+    // ok：TSE 正常；error：服务在但 TSE 在自检 / 没初始化 / 硬件报错；down：服务连不上
+    const ping = await httpGet(`${tseHost}/ping`)
+    const tseStatus = ping.status === 0 ? 'down' : (ping.status === 200 ? 'ok' : 'error')
+
+    // 连不上时报 null，云端保留上次的版本；服务在但没有这个接口（2024-09 之前的构建）报空串
+    let tseAdapterVersion = null
+    if (ping.status !== 0) {
+        const res = await httpGet(`${tseHost}/adapterVersion`)
+        if (res.status === 200) {
+            tseAdapterVersion = await safe(() => {
+                const major = JSON.parse(res.body).major
+                return major === undefined || major === null ? null : String(major)
+            })
+        } else if (res.status === 404) {
+            tseAdapterVersion = ''
+        }
+    }
+
+    return {tseEnabled, tseHost, tseStatus, tseAdapterVersion, tseJarSize}
+}
+
+// 整体出错就什么都不报，云端保留上次的值
+async function collectTseInfo() {
+    return safe(probeTse, {})
+}
+
+module.exports = {collectTseInfo}
+
+
 /***/ }),
 
 /***/ 6545:
@@ -18577,7 +18729,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.108"};
+module.exports = JSON.parse('{"i8":"1.6.109-rc.0"}');
 
 /***/ })
 
@@ -18664,6 +18816,7 @@ const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = __nccwpck_require__(9646)
 const {deviceEcho, logAction, getCurrentDeviceId} = __nccwpck_require__(7415)
 const {collectHostInfo} = __nccwpck_require__(3727)
+const {collectTseInfo} = __nccwpck_require__(6677)
 const GlobalDeviceId = 'notset'
 
 const {program} = __nccwpck_require__(1904)
@@ -19540,7 +19693,8 @@ async function doLog() {
             diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
             upTime: getUpTime(),
             ngrokIsNew: ngrokNewestVersion(),
-            hostInfo: collectHostInfo()
+            hostInfo: collectHostInfo(),
+            tseInfo: await collectTseInfo()
         }
     )
     console.log('finish')

package/index.js

@@ -13,6 +13,7 @@ const InnerKenTimeStampFormat = 'YYYYMMDDHHmmss'
 const prompts = require('prompts')
 const {deviceEcho, logAction, getCurrentDeviceId} = require('./modules/firebase')
 const {collectHostInfo} = require('./modules/host-info')
+const {collectTseInfo} = require('./modules/tse-info')
 const GlobalDeviceId = 'notset'
 
 const {program} = require('commander')
@@ -889,7 +890,8 @@ async function doLog() {
             diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
             upTime: getUpTime(),
             ngrokIsNew: ngrokNewestVersion(),
-            hostInfo: collectHostInfo()
+            hostInfo: collectHostInfo(),
+            tseInfo: await collectTseInfo()
         }
     )
     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, hostInfo: {}
+    frontendVersion: '', cliVersion: '', diskUsage: '', upTime: '', ngrokIsNew: false, hostInfo: {}, tseInfo: {}
 }
 
 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, hostInfo} = Object.assign({}, defaultData, data)
+    const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew, hostInfo, tseInfo} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
         return
     }
@@ -36,7 +36,8 @@ export async function deviceEcho(data) {
             lastUptime: upTime,
             ngrokOk: ngrokIsNew,
             deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`,
-            ...hostInfo
+            ...hostInfo,
+            ...tseInfo
         })
         console.log('report to remote server complete')
     } catch (e) {

package/modules/tse-info.js

@@ -0,0 +1,144 @@
+const fs = require('fs')
+const os = require('os')
+const http = require('http')
+const https = require('https')
+
+// do-log 顺带上报的 TSE 适配服务（TseHost）信息，用来在云端看车队的 TSE 版本和服务状态。
+// WSL 门店的 TseHost 跑在 Windows 侧，网站目录里的 jar 不一定是实际在跑的那个，
+// 所以和 PHP 一样按 config.ini 的 [TSE] TseHost 去访问服务，jar 也按服务配置去找。
+// 每一项单独兜底：探测失败就报 null，不能让 do-log 本身挂掉。
+
+const CONFIG_INI = '/var/www/html/Resource/config/config.ini'
+const DEFAULT_TSE_HOST = 'http://localhost:8014'
+// Linux：aaden-tse.service 执行 tseServing.sh，里面 java -jar 的那个 jar
+const LINUX_SERVING_SCRIPT = '/var/www/html/TseHost/tseServing.sh'
+const LINUX_DEFAULT_JAR = '/var/www/html/TseHost/tse-0.0.2.jar'
+// Windows（WSL 门店）：WinSW 服务目录，jar 名写在 AadenTseServiceRegister.xml 里
+const WINDOWS_USERS_DIR = '/mnt/c/Users'
+const WINDOWS_TSE_DIR = 'Desktop/AadenTseOnWindows'
+const WINDOWS_DEFAULT_JAR = 'tse-0.0.3.jar'
+// 和 PHP 的 Api.php 一样给 3 秒
+const PROBE_TIMEOUT_MS = 3000
+
+async function safe(fn, fallback = null) {
+    try {
+        const value = await fn()
+        return value === undefined ? fallback : value
+    } catch (e) {
+        return fallback
+    }
+}
+
+function readTseSection() {
+    const section = {}
+    let inTse = false
+    for (const raw of fs.readFileSync(CONFIG_INI, 'utf-8').split(/\r?\n/)) {
+        const line = raw.trim()
+        if (!line || line.startsWith(';') || line.startsWith('#')) continue
+        const header = line.match(/^\[(.+)]$/)
+        if (header) {
+            inTse = header[1].trim() === 'TSE'
+            continue
+        }
+        if (!inTse) continue
+        const eq = line.indexOf('=')
+        if (eq < 0) continue
+        section[line.slice(0, eq).trim()] = line.slice(eq + 1).trim().replace(/^"(.*)"$/, '$1')
+    }
+    return section
+}
+
+// 与 PHP 的 INI_SCANNER_TYPED 一致：true/on/yes 为真，数字按非 0 为真
+function parseEnabled(value) {
+    if (value === undefined) return false
+    const v = String(value).trim().toLowerCase()
+    if (['true', 'on', 'yes'].includes(v)) return true
+    if (/^-?\d+$/.test(v)) return parseInt(v, 10) !== 0
+    return false
+}
+
+// 连不上（服务没起、Windows 侧没开、超时）统一当作 status 0
+function httpGet(url) {
+    return new Promise(resolve => {
+        // 兜底：响应中途断掉时 end 不会触发，不能让 do-log 卡在这里
+        const timer = setTimeout(() => resolve({status: 0, body: ''}), PROBE_TIMEOUT_MS + 1000)
+        const done = result => {
+            clearTimeout(timer)
+            resolve(result)
+        }
+        try {
+            const client = url.startsWith('https:') ? https : http
+            const req = client.get(url, {timeout: PROBE_TIMEOUT_MS}, res => {
+                let body = ''
+                res.setEncoding('utf-8')
+                res.on('data', chunk => {
+                    if (body.length < 4096) body += chunk
+                })
+                res.on('end', () => done({status: res.statusCode, body}))
+                res.on('error', () => done({status: 0, body: ''}))
+            })
+            req.on('timeout', () => req.destroy(new Error('timeout')))
+            req.on('error', () => done({status: 0, body: ''}))
+        } catch (e) {
+            done({status: 0, body: ''})
+        }
+    })
+}
+
+function servingJarPath() {
+    if (/microsoft|wsl/i.test(os.release()) && fs.existsSync(WINDOWS_USERS_DIR)) {
+        for (const user of fs.readdirSync(WINDOWS_USERS_DIR)) {
+            const dir = `${WINDOWS_USERS_DIR}/${user}/${WINDOWS_TSE_DIR}`
+            const xml = `${dir}/AadenTseServiceRegister.xml`
+            if (!fs.existsSync(xml)) continue
+            const match = fs.readFileSync(xml, 'utf-8').match(/-jar\s+"?%BASE%\\([^"\s]+\.jar)/i)
+            return `${dir}/${match ? match[1] : WINDOWS_DEFAULT_JAR}`
+        }
+        // 没找到 Windows 侧的服务目录：按 Linux 的装法找
+    }
+    if (!fs.existsSync(LINUX_SERVING_SCRIPT)) return LINUX_DEFAULT_JAR
+    const match = fs.readFileSync(LINUX_SERVING_SCRIPT, 'utf-8').match(/-jar\s+(\S+\.jar)/)
+    return match ? match[1] : LINUX_DEFAULT_JAR
+}
+
+async function probeTse() {
+    const section = await safe(readTseSection, {})
+    const tseEnabled = parseEnabled(section.TseEnabled)
+    const tseHost = (section.TseHost || DEFAULT_TSE_HOST).replace(/\/+$/, '')
+    // 不同版本的 jar 大小不同，没有 /adapterVersion 的老版本只能靠它区分
+    const tseJarSize = await safe(() => {
+        const jar = servingJarPath()
+        return jar && fs.existsSync(jar) ? fs.statSync(jar).size : null
+    })
+
+    if (!tseEnabled) {
+        return {tseEnabled, tseHost, tseStatus: 'disabled', tseAdapterVersion: null, tseJarSize}
+    }
+
+    // ok：TSE 正常；error：服务在但 TSE 在自检 / 没初始化 / 硬件报错；down：服务连不上
+    const ping = await httpGet(`${tseHost}/ping`)
+    const tseStatus = ping.status === 0 ? 'down' : (ping.status === 200 ? 'ok' : 'error')
+
+    // 连不上时报 null，云端保留上次的版本；服务在但没有这个接口（2024-09 之前的构建）报空串
+    let tseAdapterVersion = null
+    if (ping.status !== 0) {
+        const res = await httpGet(`${tseHost}/adapterVersion`)
+        if (res.status === 200) {
+            tseAdapterVersion = await safe(() => {
+                const major = JSON.parse(res.body).major
+                return major === undefined || major === null ? null : String(major)
+            })
+        } else if (res.status === 404) {
+            tseAdapterVersion = ''
+        }
+    }
+
+    return {tseEnabled, tseHost, tseStatus, tseAdapterVersion, tseJarSize}
+}
+
+// 整体出错就什么都不报，云端保留上次的值
+async function collectTseInfo() {
+    return safe(probeTse, {})
+}
+
+module.exports = {collectTseInfo}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaden-cli",
-  "version": "1.6.108",
+  "version": "1.6.109-rc.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {