aaden-cli 1.6.111 → 1.6.112

package/AadenDeploy/lightUpdate.sh

@@ -20,6 +20,14 @@ rm -f "$STATUS_FILE" 2>/dev/null || true
 # 每条退出路径都经 finish：状态既打到 stdout(人看日志)，也落盘(index.js 读了发 deviceLog)。
 finish(){ echo "$1"; echo "$1" > "$STATUS_FILE" 2>/dev/null || true; exit "$2"; }
 
+# 同一时间只跑一个：04:59 cron、开机、do-log 补跑、云端命令、远程触发可能撞在一起，两个同时 cp/migrate 会互相踩。
+# 锁文件谁先建都要让另一个用户也能打开（root 和 aaden 都会跑），所以 666；flock 只要读权限。
+LOCK=/var/tmp/aaden-lu.lock
+[ -e "$LOCK" ] || { touch "$LOCK" && chmod 666 "$LOCK"; } 2>/dev/null
+if exec 9<"$LOCK" 2>/dev/null; then
+  flock -n 9 || finish "SKIP_BUSY (另一个 light-update 正在跑)" 0
+fi
+
 # 点分数字版本比较：a > b 返回 0。与 index.js 的 versionGt 同一套语义（'1.9.61' > '1.7.908'）。
 verGt(){ python3 -c "
 import sys

package/AadenDeploy/restartNgrok.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# 重启 ngrok 隧道。云端发现「设备还在上报、ngrok 却断了 30 分钟以上」时自动下发（RESTART_NGROK 命令），
+# ERP「设备命令」里也能手动下发。输出整段回传云端，ERP 里能看到 ngrok 日志末尾。
+# 退出码：ngrok 进程起来了 = 0，否则 1。
+sudoS() { echo "Innerken322." | sudo -S -p '' "$@"; }
+SVC=aaden-ngrok-v3
+NGROK=/etc/aaden/ngrok
+CONF=/etc/aaden/ngrok-config.yml
+LOG=/etc/aaden/ngrok.log
+
+if [ -d /run/systemd/system ] && [ -f "/etc/systemd/system/$SVC.service" ]; then
+  echo "重启 systemd 服务 $SVC"
+  sudoS systemctl restart "$SVC"
+elif [ -x "$NGROK" ] && [ -f "$CONF" ]; then
+  # 没有 systemd 的老 WSL：直接重启进程
+  echo "没有 systemd 服务，直接重启 ngrok 进程"
+  sudoS pkill -f "$NGROK " 2>/dev/null
+  sleep 2
+  sudoS sh -c "nohup $NGROK -config=$CONF start-all --log=$LOG >/dev/null 2>&1 &"
+else
+  echo "ngrok 没装好（缺 $NGROK 或 $CONF），跑完整修复 fix-ngrok"
+  aaden-cli fix-ngrok
+fi
+
+sleep 20
+echo "--- 状态"
+[ -d /run/systemd/system ] && echo "systemd: $(systemctl is-active "$SVC" 2>&1)"
+echo "--- ngrok 配置"
+sudoS grep -E "server_addr|remote_port|hostname|subdomain" "$CONF" 2>/dev/null
+echo "--- $LOG 最后 15 行"
+sudoS tail -n 15 "$LOG" 2>/dev/null
+echo "--- 进程"
+if pgrep -a -f "$NGROK " ; then
+  exit 0
+fi
+echo "ngrok 进程不在"
+exit 1

package/AadenDeploy/upgrade.sh

@@ -31,13 +31,15 @@ step() {
   return "$code"
 }
 
-step config sh -c 'mkdir -p /etc/aaden/config && chmod -R 777 /etc/aaden/config'
 
 # 和 aaden-cli 其他地方一样用 -S 从 stdin 喂密码。aaden 没有免密 sudo 的设备上，裸 sudo 没有终端读不了密码、直接失败
 # （10-05 步骤上报：clean=1 npm=1 "a terminal is required to read the password"），npm 永远装不上，CLI 卡在 1.6.101。
 # root 跑（cron）时 sudo 不要密码，多喂的一行没人读，无害。
 sudoS() { echo "Innerken322." | sudo -S "$@"; }
 
+# 以 aaden 跑（远程 selfUpgrade、云端命令、do-log 补跑）时改不了 root 建的目录权限，也要 sudo
+step config sudoS sh -c 'mkdir -p /etc/aaden/config && chmod -R 777 /etc/aaden/config'
+
 # 别的 aaden-cli npm 安装还在跑时，不能动手：
 # crontab 里 04:55 和开机 sleep 30 各有一条单独的 `npm install aaden-cli -g`，慢的设备上要跑好几分钟，
 # 正好撞上 04:59 / 开机 sleep 60 的这里。两个 npm 同时重装同一个包 —— 我们这个 1 秒内 ENOTEMPTY（退出码 217），

package/dist/index.js

@@ -80,6 +80,314 @@ module.exports = {
 }
 
 
+/***/ }),
+
+/***/ 5363:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+const fs = __nccwpck_require__(7147)
+const os = __nccwpck_require__(2037)
+const path = __nccwpck_require__(1017)
+const http = __nccwpck_require__(3685)
+const https = __nccwpck_require__(5687)
+const {spawn, execFileSync} = __nccwpck_require__(2081)
+
+// 拉取式设备命令 + 自动补跑。
+//
+// 以前云端要让设备做事，只能经 ngrok POST 门店 PHP（UpdateSelf.php），ngrok 一断就够不着；
+// 而 WSL 设备的宿主机夜里睡眠会错过 04:59、又不重启，@reboot 也不触发，自动更新可能几天都不跑。
+// 设备每 5 分钟的 do-log 是唯一一直在跑的东西，所以把两件事都挂在它上面：
+//   ① do-log 上报时声明 acceptCommands，云端在回复里带上这台设备待执行的命令（ERP 下发或云端自动下发）
+//      → 起一个后台进程逐条认领、执行，输出每 10 秒回传一次（ERP 里能看到回显），最后报退出码。
+//   ② 超过 20 小时没跑过 auto-upgrade 就自己补跑一次（避开午市晚市和刚开机）。
+//
+// 只执行下面写死的几种命令，不执行云端发来的任意 shell。
+// 注意：门店设备上的 node 最老到 10，这里不能用 ?. / ?? 等新语法。
+
+// 只为本地联调留的口子；设备上从不设置
+const CLOUD = process.env.AADEN_CLOUD_URL || 'https://cloud-v2.aaden.io'
+
+const COMMANDS = {
+    AUTO_UPGRADE: () => 'aaden-cli auto-upgrade',
+    LIGHT_UPDATE: () => 'aaden-cli light-update',
+    APPCENTER_SYNC: () => 'aaden-cli appcenter-sync',
+    PATCH: () => 'aaden-cli patch',
+    RESTART_NGROK: root => 'bash ' + JSON.stringify(path.join(root, 'AadenDeploy/restartNgrok.sh')),
+}
+
+/** 每条命令最多跑多久；latest.zip 全量在慢网络上要 20 分钟 */
+const COMMAND_TIMEOUT_MS = 45 * 60 * 1000
+const REPORT_INTERVAL_MS = 10 * 1000
+const MAX_OUTPUT = 60 * 1024
+
+/** 每次 auto-upgrade 开始时写；cron（root）和补跑（aaden）都要能写，所以 chmod 666 */
+const AUTO_UPGRADE_STAMP = '/etc/aaden/config/lastAutoUpgrade'
+const CATCH_UP_AFTER_MS = 20 * 3600 * 1000
+/** 午市、晚市不补跑（设备本地时间，分钟） */
+const PEAK_WINDOWS = [[11 * 60 + 30, 14 * 60 + 30], [17 * 60 + 30, 21 * 60 + 30]]
+/** 开机 10 分钟内不补跑：@reboot 的 npm + auto-upgrade 会自己跑 */
+const MIN_UPTIME_S = 10 * 60
+
+function userName() {
+    try {
+        return os.userInfo().username
+    } catch (e) {
+        return String(process.getuid ? process.getuid() : 'x')
+    }
+}
+
+function tmpFile(name) {
+    return path.join(os.tmpdir(), name + '-' + userName())
+}
+
+function postJson(url, body, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const data = Buffer.from(JSON.stringify(body))
+        const req = (url.indexOf('http://') === 0 ? http : https).request(url, {
+            method: 'POST',
+            headers: {'Content-Type': 'application/json', 'Content-Length': data.length},
+            timeout: timeoutMs || 20000,
+        }, res => {
+            const chunks = []
+            res.on('data', c => chunks.push(c))
+            res.on('end', () => {
+                const text = Buffer.concat(chunks).toString('utf8')
+                let json = null
+                try {
+                    json = JSON.parse(text)
+                } catch (e) { /* 非 JSON */ }
+                if (res.statusCode >= 200 && res.statusCode < 300) resolve(json)
+                else reject(Object.assign(new Error('HTTP ' + res.statusCode + ' ' + text.slice(0, 200)), {status: res.statusCode}))
+            })
+        })
+        req.on('timeout', () => req.destroy(new Error('timeout')))
+        req.on('error', reject)
+        req.end(data)
+    })
+}
+
+/** 后台起一个 aaden-cli 子命令，do-log 退出后它照样跑；输出追加进 /tmp 下的日志 */
+function spawnDetached(args, logName, env) {
+    let fd = 'ignore'
+    try {
+        fd = fs.openSync(tmpFile(logName) + '.log', 'a')
+    } catch (e) { /* 写不了日志也照跑 */ }
+    const child = spawn(process.execPath, [process.argv[1]].concat(args), {
+        detached: true,
+        stdio: ['ignore', fd, fd],
+        env: Object.assign({}, process.env, env || {}),
+    })
+    child.unref()
+    return child.pid
+}
+
+// ------------------------------------------------------------------ ① 命令
+
+/** do-log 拿到云端回复后调用：有命令就起后台进程去执行 */
+function handleOffers(deviceId, reply) {
+    const body = reply && reply.data && reply.data.commands ? reply.data : reply
+    const commands = (body && Array.isArray(body.commands) ? body.commands : [])
+        .filter(c => c && c.id && c.command)
+    if (commands.length === 0) return []
+    const items = commands.map(c => c.id + ':' + c.command)
+    console.log('云端有待执行命令:', items.join(' '))
+    spawnDetached(['run-commands', String(deviceId)].concat(items), 'aaden-command-runner')
+    return commands
+}
+
+function lockFile() {
+    return tmpFile('aaden-command-runner') + '.pid'
+}
+
+/** 同一时间只有一个执行进程；上一个还在跑就退出，没领到的命令下次 do-log 会再给 */
+function acquireLock() {
+    const file = lockFile()
+    try {
+        const pid = parseInt(fs.readFileSync(file, 'utf8'), 10)
+        if (pid && pid !== process.pid) {
+            try {
+                process.kill(pid, 0)
+                return false
+            } catch (e) {
+                if (e.code === 'EPERM') return false
+            }
+        }
+    } catch (e) { /* 没有锁文件 */ }
+    try {
+        fs.writeFileSync(file, String(process.pid))
+        return true
+    } catch (e) {
+        return false
+    }
+}
+
+function releaseLock() {
+    try {
+        if (parseInt(fs.readFileSync(lockFile(), 'utf8'), 10) === process.pid) fs.unlinkSync(lockFile())
+    } catch (e) { /* 已经没了 */ }
+}
+
+function stripAnsi(s) {
+    return s.replace(/\u001b\[[0-9;?]*[A-Za-z]/g, '').replace(/\r(?!\n)/g, '\n')
+}
+
+// aaden-cli 打印要执行的命令时会带上 sudo 密码；输出要存云端、ERP 里能看到，存之前抹掉
+const SECRETS = ['Innerken322.']
+
+function redact(s) {
+    return SECRETS.reduce((acc, secret) => acc.split(secret).join('***'), s)
+}
+
+async function report(id, deviceId, output, exitCode) {
+    const body = {deviceId: String(deviceId), output: output}
+    if (exitCode !== undefined) body.exitCode = exitCode
+    // 最终结果多试几次；中途的回报丢了无所谓，下一次会整段覆盖
+    const attempts = exitCode === undefined ? 1 : 3
+    for (let i = 0; i < attempts; i++) {
+        try {
+            await postJson(CLOUD + '/device-command/' + id + '/report', body)
+            return true
+        } catch (e) {
+            console.log('回报命令 #' + id + ' 失败:', e.message)
+            if (e.status === 409 || e.status === 403 || e.status === 404) return false
+            await new Promise(r => setTimeout(r, 5000))
+        }
+    }
+    return false
+}
+
+function runOne(id, deviceId, shellCmd) {
+    return new Promise(resolve => {
+        let output = ''
+        let dirty = false
+        const append = chunk => {
+            output += redact(stripAnsi(chunk.toString('utf8')))
+            if (output.length > MAX_OUTPUT) output = output.slice(output.length - MAX_OUTPUT)
+            dirty = true
+        }
+        // 登录 shell：cron 下 PATH 只有 /usr/bin:/bin，aaden-cli 在 /usr/local/bin
+        const child = spawn('bash', ['-lc', 'export PATH="/usr/local/bin:$PATH"; ' + shellCmd], {
+            detached: true,
+            stdio: ['ignore', 'pipe', 'pipe'],
+            env: Object.assign({}, process.env, {AADEN_UPGRADE_TRIGGER: '命令 #' + id}),
+        })
+        child.stdout.on('data', append)
+        child.stderr.on('data', append)
+        const timer = setInterval(() => {
+            if (!dirty) return
+            dirty = false
+            report(id, deviceId, output)
+        }, REPORT_INTERVAL_MS)
+        const killer = setTimeout(() => {
+            append('\n[aaden-cli] 超过 ' + (COMMAND_TIMEOUT_MS / 60000) + ' 分钟，终止\n')
+            try {
+                process.kill(-child.pid, 'SIGTERM')
+            } catch (e) { /* 已经退出 */ }
+        }, COMMAND_TIMEOUT_MS)
+        child.on('error', e => append('\n[aaden-cli] 启动失败: ' + e.message + '\n'))
+        child.on('close', (code, signal) => {
+            clearInterval(timer)
+            clearTimeout(killer)
+            const exitCode = typeof code === 'number' ? code : 128
+            if (signal) append('\n[aaden-cli] 被信号 ' + signal + ' 终止\n')
+            resolve({exitCode: exitCode, output: output})
+        })
+    })
+}
+
+/** `aaden-cli run-commands <deviceId> <id:COMMAND>...`：由 do-log 在后台起，逐条认领、执行、回报 */
+async function runCommands(rootDir, version, deviceId, items) {
+    if (!acquireLock()) {
+        console.log('已有命令执行进程在跑，这次不领')
+        return
+    }
+    try {
+        for (const item of items) {
+            const parts = String(item).split(':')
+            const id = parseInt(parts[0], 10)
+            const name = parts[1]
+            if (!id || !name) continue
+            try {
+                await postJson(CLOUD + '/device-command/' + id + '/start', {deviceId: String(deviceId), cliVersion: version})
+            } catch (e) {
+                console.log('认领命令 #' + id + ' 失败（可能已被领走或取消）:', e.message)
+                continue
+            }
+            const build = COMMANDS[name]
+            if (!build) {
+                await report(id, deviceId, '这个版本的 aaden-cli (' + version + ') 不认识命令 ' + name, 2)
+                continue
+            }
+            const cmd = build(rootDir)
+            console.log('执行命令 #' + id + ' ' + name + ': ' + cmd)
+            const result = await runOne(id, deviceId, cmd)
+            await report(id, deviceId, '$ ' + cmd + '\n' + result.output, result.exitCode)
+        }
+    } finally {
+        releaseLock()
+    }
+}
+
+// ------------------------------------------------------------------ ② 自动补跑
+
+function markAutoUpgradeStarted() {
+    try {
+        fs.writeFileSync(AUTO_UPGRADE_STAMP, String(Date.now()))
+        fs.chmodSync(AUTO_UPGRADE_STAMP, 0o666)
+    } catch (e) { /* 写不了就靠补跑自己的时间戳兜底 */ }
+}
+
+function readStamp(file) {
+    try {
+        const n = parseInt(fs.readFileSync(file, 'utf8'), 10)
+        if (n > 0) return n
+        return fs.statSync(file).mtimeMs
+    } catch (e) {
+        return 0
+    }
+}
+
+function catchUpStampFile() {
+    return path.join(os.homedir(), '.aaden-catchup')
+}
+
+function autoUpgradeRunning() {
+    try {
+        // 不经 shell 直接调 pgrep：经 sh -c 的话 sh 自己的命令行里就有这串字，会把自己当成「正在跑」
+        const pids = execFileSync('pgrep', ['-f', 'aaden-cli auto-upgrade'], {encoding: 'utf8', timeout: 5000})
+            .split('\n').map(s => parseInt(s, 10)).filter(pid => pid && pid !== process.pid)
+        return pids.length > 0
+    } catch (e) {
+        return false
+    }
+}
+
+/**
+ * do-log 每次上报后调用：超过 20 小时没跑过 auto-upgrade 就在后台补跑一次。
+ * 返回没补跑的原因（或 'started'），只用于日志。
+ */
+function maybeCatchUpAutoUpgrade() {
+    const now = new Date()
+    const minutes = now.getHours() * 60 + now.getMinutes()
+    if (PEAK_WINDOWS.some(w => minutes >= w[0] && minutes < w[1])) return 'peak'
+    if (os.uptime() < MIN_UPTIME_S) return 'boot'
+    const last = Math.max(readStamp(AUTO_UPGRADE_STAMP), readStamp(catchUpStampFile()))
+    if (Date.now() - last < CATCH_UP_AFTER_MS) return 'recent'
+    if (autoUpgradeRunning()) return 'running'
+    // 先把补跑时间戳写上：写不上就不补跑，免得每 5 分钟起一次
+    try {
+        fs.writeFileSync(catchUpStampFile(), String(Date.now()))
+    } catch (e) {
+        return 'no-stamp'
+    }
+    const hours = last ? Math.round((Date.now() - last) / 3600000) + ' 小时' : '很久'
+    spawnDetached(['auto-upgrade'], 'aaden-catchup', {AADEN_UPGRADE_TRIGGER: '补跑：' + hours + '没跑过自动更新'})
+    return 'started'
+}
+
+module.exports = {handleOffers, runCommands, markAutoUpgradeStarted, maybeCatchUpAutoUpgrade}
+
+
 /***/ }),
 
 /***/ 7415:
@@ -112,7 +420,7 @@ async function deviceEcho(data) {
     })
     const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew, hostInfo, tseInfo} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
-        return
+        return null
     }
     const {name, adress1, postCode, city, state} = await getNiceRestaurantInfo()
     const waitSecond = (parseInt(myDeviceId) % 30) * 1000
@@ -121,7 +429,7 @@ async function deviceEcho(data) {
         resolve()
     }, waitSecond))
     try {
-        await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
+        const reply = await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
             deviceId: myDeviceId,
             frontendVersion: frontendVersion,
             cliVersion,
@@ -133,13 +441,17 @@ async function deviceEcho(data) {
             ngrokOk: ngrokIsNew,
             deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`,
             ...hostInfo,
-            ...tseInfo
+            ...tseInfo,
+            // 回复里要带待执行命令（见 modules/device-commands.js）；老云端忽略这个字段
+            acceptCommands: true
         })
         console.log('report to remote server complete')
+        return {deviceId: myDeviceId, reply}
     } catch (e) {
         console.log(e.message)
         console.log('report to remote server failed')
     }
+    return null
 
 
 }
@@ -18863,7 +19175,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.111"};
+module.exports = {"i8":"1.6.112"};
 
 /***/ })
 
@@ -18951,6 +19263,7 @@ const prompts = __nccwpck_require__(9646)
 const {deviceEcho, logAction, getCurrentDeviceId} = __nccwpck_require__(7415)
 const {collectHostInfo} = __nccwpck_require__(3727)
 const {collectTseInfo} = __nccwpck_require__(6677)
+const deviceCommands = __nccwpck_require__(5363)
 const GlobalDeviceId = 'notset'
 
 const {program} = __nccwpck_require__(1904)
@@ -19010,6 +19323,9 @@ program.command('auto-send-tea-maker-task').action(autoSendTeaMakerTask)
 program.command('export-tse').action(exportTse)
 program.command('fix-ngrok').action(fixNgrok)
 program.command('do-log').action(doLog)
+// do-log 领到云端命令后在后台起的执行进程（见 modules/device-commands.js），不手动调
+program.command('run-commands <deviceId> [items...]').action((deviceId, items) =>
+    deviceCommands.runCommands(path.resolve(findMe(), '..'), version, deviceId, items || []))
 program.command('clean-backup-space').action(doCompress)
 program.command('ensure-print-log-rotate').action(ensurePrintLogRotate)
 
@@ -19516,6 +19832,8 @@ async function lightUpdate() {
         const suffix = status ? ' [' + status + ']' : ''
         const newVersion = readBackendVersionFresh()
         if (code !== 0) {
+            // 退出码带出去：upgrade.sh 的 lu 步骤和云端命令的结果才看得出 light-update 失败了
+            process.exitCode = code || 1
             await logAction('light-update 失败/未部署 (仍 ' + newVersion + ')' + suffix, code || 1)
         } else if (newVersion !== localVersion) {
             await logAction('light-update 完成 ' + localVersion + ' -> ' + newVersion + suffix, 0)
@@ -19700,11 +20018,18 @@ function getMyDeviceId() {
 }
 
 async function autoUpgrade() {
+    // 记下这次开始的时间：do-log 据此判断要不要补跑（超过 20 小时没跑过）
+    deviceCommands.markAutoUpgradeStarted()
     if (!ngrokNewestVersion()) {
         await fixNgrok()
     }
     const summary = await upgrade()
-    await logAction("自动执行了更新aaden-cli" + summary)
+    // 谁触发的：cron / 开机不带；do-log 补跑、云端命令会带上（AADEN_UPGRADE_TRIGGER）
+    const trigger = process.env.AADEN_UPGRADE_TRIGGER ? ' (' + process.env.AADEN_UPGRADE_TRIGGER + ')' : ''
+    console.log('自动执行了更新aaden-cli' + trigger + summary)
+    await logAction("自动执行了更新aaden-cli" + trigger + summary)
+    // 有步骤失败就非 0 退出，云端命令的结果才看得出来
+    if (/=[1-9]|upgrade\.sh 没跑起来/.test(summary)) process.exitCode = 1
 }
 
 /**
@@ -19834,20 +20159,32 @@ function getUpTime() {
 
 }
 
+/** 单项探测失败（命令卡住、输出不对）就报空值，不能让整个 do-log 挂掉 */
+function doLogField(fn) {
+    try {
+        return fn() || ''
+    } catch (e) {
+        console.log('do-log 探测失败:', e.message)
+        return ''
+    }
+}
+
 async function doLog() {
-    const res = cli.executeInShellSync('snap info aaden')
-    const diskUsage =
-        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({
+    // snap info 加超时：snapd 刷新卡住时它会一直不返回，do-log 就再也报不上来，
+    // 设备在云端看就是「失联」，云端命令也领不到
+    const frontendVersion = doLogField(() => {
+        const list = (cli.executeInShellSync('timeout 20 snap info aaden').output || '').split('\n')
+        return (list[list.length - 2] || '').replace(/\s+/g, ' ').split(' ')[1]
+    })
+    const diskUsage = doLogField(() => {
+        const parts = (cli.executeInShellSync('timeout 20 df -h --total | command grep total | head -c-3 && echo \'\'').output || '').split(' ')
+        return parts[parts.length - 1].replace('\n', '')
+    })
+
+    const echo = await deviceEcho({
             frontendVersion,
             cliVersion: version,
-            diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
+            diskUsage,
             upTime: getUpTime(),
             ngrokIsNew: ngrokNewestVersion(),
             hostInfo: collectHostInfo(),
@@ -19856,6 +20193,25 @@ async function doLog() {
     )
     console.log('finish')
 
+    // 云端回复里的待执行命令：起后台进程去执行（do-log 自己马上退出）
+    let offered = []
+    if (echo && echo.reply) {
+        try {
+            offered = deviceCommands.handleOffers(echo.deviceId, echo.reply)
+        } catch (e) {
+            console.log('处理云端命令失败:', e.message)
+        }
+    }
+    // 超过 20 小时没跑过 auto-upgrade 就补跑（WSL 宿主机夜里睡眠错过 04:59 等）；这一轮已经有命令要跑就先不补
+    if (echo && offered.length === 0) {
+        try {
+            const r = deviceCommands.maybeCatchUpAutoUpgrade()
+            console.log('auto-upgrade 补跑检查:', r)
+            if (r === 'started') await logAction('超过 20 小时没跑过自动更新，后台补跑一次')
+        } catch (e) {
+            console.log('补跑检查失败:', e.message)
+        }
+    }
 
     process.exit(0)
 }

package/dist/patch/202610072130ensureDoLogCron.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+# 一次性修复：aaden 的 crontab 里 do-log（每 5 分钟上报 + 领云端命令 + 自动补跑）那一行
+# 缺了、或者指向的 aaden-cli 不存在时，改成标准写法 /usr/local/bin/aaden-cli do-log。
+# 起因：10-07 1541 在 npm 并发重装之后 CLI 已经修好、远程更新也都成功，do-log 却再没上报过；
+# 老设备上这一行有写裸 aaden-cli（cron 的 PATH 只有 /usr/bin:/bin）或 /usr/bin/aaden-cli 的。
+# 只动这一行，其他行原样保留；改了的话把原来那行报给云端，方便事后看是哪种情况。
+sudoS() { echo "Innerken322." | sudo -S -p '' "$@"; }
+CLI=/usr/local/bin/aaden-cli
+WANT="*/5 * * * * $CLI do-log"
+
+[ -x "$CLI" ] || { echo "没有 $CLI，跳过"; exit 0; }
+# 有的老设备 do-log 写在 root 的 crontab 或 /etc/cron.d 里：那样就别再往 aaden 这边加，不然每 5 分钟报两次
+if sudoS crontab -l -u root 2>/dev/null | grep -v '^[[:space:]]*#' | grep -q 'do-log' \
+  || grep -rqs --exclude='*.dpkg-*' 'aaden-cli do-log' /etc/cron.d 2>/dev/null; then
+  echo "do-log 在 root 的 crontab 或 /etc/cron.d 里，不动 aaden 的"; exit 0
+fi
+CUR=$(sudoS crontab -l -u aaden 2>/dev/null) || { echo "aaden 没有 crontab，跳过（整套定时任务缺失要 aaden-cli fix-cronjob）"; exit 0; }
+
+LINE=$(printf '%s\n' "$CUR" | grep -v '^[[:space:]]*#' | grep -m1 'do-log')
+if [ -n "$LINE" ]; then
+  # 第 6 个字段起是命令；@reboot 之类的特殊写法只占 1 个字段
+  case "$LINE" in
+    @*) CMD=$(printf '%s' "$LINE" | awk '{print $2}') ;;
+    *) CMD=$(printf '%s' "$LINE" | awk '{print $6}') ;;
+  esac
+  case "$CMD" in
+    "$CLI") echo "do-log 已是标准写法，不动"; exit 0 ;;
+    /*) [ -x "$CMD" ] && { echo "do-log 指向 $CMD，存在，不动"; exit 0; } ;;
+    *) [ -x "/usr/bin/$CMD" ] || [ -x "/bin/$CMD" ] && { echo "do-log 用 $CMD，cron 的 PATH 里找得到，不动"; exit 0; } ;;
+  esac
+  NEW=$(printf '%s\n' "$CUR" | awk -v line="$LINE" -v want="$WANT" '$0 == line { print want; next } { print }')
+  WHAT="do-log 那一行指向的命令不存在，已改成标准写法。原来是：$LINE"
+else
+  NEW=$(printf '%s\n%s\n' "$CUR" "$WANT")
+  WHAT="aaden 的 crontab 里没有 do-log，已补上"
+fi
+
+printf '%s\n' "$NEW" | sudoS crontab -u aaden - || { echo "写 crontab 失败"; exit 1; }
+echo "$WHAT"
+DEVICE_ID=$(grep -e DeviceId /var/www/html/Resource/config/config.ini 2>/dev/null | cut -d = -f 2 | tr -d '" \r')
+[ -n "$DEVICE_ID" ] && python3 -c 'import json, sys, urllib.request; urllib.request.urlopen(urllib.request.Request("https://cloud-v2.aaden.io/deviceLog/createEvent", json.dumps({"deviceId": sys.argv[1], "content": sys.argv[2] + " result:0", "type": "系统生成", "operator": "patch ensureDoLogCron"}).encode(), {"Content-Type": "application/json"}), timeout=10)' "$DEVICE_ID" "$WHAT" 2>/dev/null
+exit 0

package/index.js

@@ -14,6 +14,7 @@ const prompts = require('prompts')
 const {deviceEcho, logAction, getCurrentDeviceId} = require('./modules/firebase')
 const {collectHostInfo} = require('./modules/host-info')
 const {collectTseInfo} = require('./modules/tse-info')
+const deviceCommands = require('./modules/device-commands')
 const GlobalDeviceId = 'notset'
 
 const {program} = require('commander')
@@ -73,6 +74,9 @@ program.command('auto-send-tea-maker-task').action(autoSendTeaMakerTask)
 program.command('export-tse').action(exportTse)
 program.command('fix-ngrok').action(fixNgrok)
 program.command('do-log').action(doLog)
+// do-log 领到云端命令后在后台起的执行进程（见 modules/device-commands.js），不手动调
+program.command('run-commands <deviceId> [items...]').action((deviceId, items) =>
+    deviceCommands.runCommands(path.resolve(findMe(), '..'), version, deviceId, items || []))
 program.command('clean-backup-space').action(doCompress)
 program.command('ensure-print-log-rotate').action(ensurePrintLogRotate)
 
@@ -579,6 +583,8 @@ async function lightUpdate() {
         const suffix = status ? ' [' + status + ']' : ''
         const newVersion = readBackendVersionFresh()
         if (code !== 0) {
+            // 退出码带出去：upgrade.sh 的 lu 步骤和云端命令的结果才看得出 light-update 失败了
+            process.exitCode = code || 1
             await logAction('light-update 失败/未部署 (仍 ' + newVersion + ')' + suffix, code || 1)
         } else if (newVersion !== localVersion) {
             await logAction('light-update 完成 ' + localVersion + ' -> ' + newVersion + suffix, 0)
@@ -763,11 +769,18 @@ function getMyDeviceId() {
 }
 
 async function autoUpgrade() {
+    // 记下这次开始的时间：do-log 据此判断要不要补跑（超过 20 小时没跑过）
+    deviceCommands.markAutoUpgradeStarted()
     if (!ngrokNewestVersion()) {
         await fixNgrok()
     }
     const summary = await upgrade()
-    await logAction("自动执行了更新aaden-cli" + summary)
+    // 谁触发的：cron / 开机不带；do-log 补跑、云端命令会带上（AADEN_UPGRADE_TRIGGER）
+    const trigger = process.env.AADEN_UPGRADE_TRIGGER ? ' (' + process.env.AADEN_UPGRADE_TRIGGER + ')' : ''
+    console.log('自动执行了更新aaden-cli' + trigger + summary)
+    await logAction("自动执行了更新aaden-cli" + trigger + summary)
+    // 有步骤失败就非 0 退出，云端命令的结果才看得出来
+    if (/=[1-9]|upgrade\.sh 没跑起来/.test(summary)) process.exitCode = 1
 }
 
 /**
@@ -897,20 +910,32 @@ function getUpTime() {
 
 }
 
+/** 单项探测失败（命令卡住、输出不对）就报空值，不能让整个 do-log 挂掉 */
+function doLogField(fn) {
+    try {
+        return fn() || ''
+    } catch (e) {
+        console.log('do-log 探测失败:', e.message)
+        return ''
+    }
+}
+
 async function doLog() {
-    const res = cli.executeInShellSync('snap info aaden')
-    const diskUsage =
-        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({
+    // snap info 加超时：snapd 刷新卡住时它会一直不返回，do-log 就再也报不上来，
+    // 设备在云端看就是「失联」，云端命令也领不到
+    const frontendVersion = doLogField(() => {
+        const list = (cli.executeInShellSync('timeout 20 snap info aaden').output || '').split('\n')
+        return (list[list.length - 2] || '').replace(/\s+/g, ' ').split(' ')[1]
+    })
+    const diskUsage = doLogField(() => {
+        const parts = (cli.executeInShellSync('timeout 20 df -h --total | command grep total | head -c-3 && echo \'\'').output || '').split(' ')
+        return parts[parts.length - 1].replace('\n', '')
+    })
+
+    const echo = await deviceEcho({
             frontendVersion,
             cliVersion: version,
-            diskUsage: diskUsage[diskUsage.length - 1].replace('\n', ''),
+            diskUsage,
             upTime: getUpTime(),
             ngrokIsNew: ngrokNewestVersion(),
             hostInfo: collectHostInfo(),
@@ -919,6 +944,25 @@ async function doLog() {
     )
     console.log('finish')
 
+    // 云端回复里的待执行命令：起后台进程去执行（do-log 自己马上退出）
+    let offered = []
+    if (echo && echo.reply) {
+        try {
+            offered = deviceCommands.handleOffers(echo.deviceId, echo.reply)
+        } catch (e) {
+            console.log('处理云端命令失败:', e.message)
+        }
+    }
+    // 超过 20 小时没跑过 auto-upgrade 就补跑（WSL 宿主机夜里睡眠错过 04:59 等）；这一轮已经有命令要跑就先不补
+    if (echo && offered.length === 0) {
+        try {
+            const r = deviceCommands.maybeCatchUpAutoUpgrade()
+            console.log('auto-upgrade 补跑检查:', r)
+            if (r === 'started') await logAction('超过 20 小时没跑过自动更新，后台补跑一次')
+        } catch (e) {
+            console.log('补跑检查失败:', e.message)
+        }
+    }
 
     process.exit(0)
 }

package/modules/device-commands.js

@@ -0,0 +1,301 @@
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+const http = require('http')
+const https = require('https')
+const {spawn, execFileSync} = require('child_process')
+
+// 拉取式设备命令 + 自动补跑。
+//
+// 以前云端要让设备做事，只能经 ngrok POST 门店 PHP（UpdateSelf.php），ngrok 一断就够不着；
+// 而 WSL 设备的宿主机夜里睡眠会错过 04:59、又不重启，@reboot 也不触发，自动更新可能几天都不跑。
+// 设备每 5 分钟的 do-log 是唯一一直在跑的东西，所以把两件事都挂在它上面：
+//   ① do-log 上报时声明 acceptCommands，云端在回复里带上这台设备待执行的命令（ERP 下发或云端自动下发）
+//      → 起一个后台进程逐条认领、执行，输出每 10 秒回传一次（ERP 里能看到回显），最后报退出码。
+//   ② 超过 20 小时没跑过 auto-upgrade 就自己补跑一次（避开午市晚市和刚开机）。
+//
+// 只执行下面写死的几种命令，不执行云端发来的任意 shell。
+// 注意：门店设备上的 node 最老到 10，这里不能用 ?. / ?? 等新语法。
+
+// 只为本地联调留的口子；设备上从不设置
+const CLOUD = process.env.AADEN_CLOUD_URL || 'https://cloud-v2.aaden.io'
+
+const COMMANDS = {
+    AUTO_UPGRADE: () => 'aaden-cli auto-upgrade',
+    LIGHT_UPDATE: () => 'aaden-cli light-update',
+    APPCENTER_SYNC: () => 'aaden-cli appcenter-sync',
+    PATCH: () => 'aaden-cli patch',
+    RESTART_NGROK: root => 'bash ' + JSON.stringify(path.join(root, 'AadenDeploy/restartNgrok.sh')),
+}
+
+/** 每条命令最多跑多久；latest.zip 全量在慢网络上要 20 分钟 */
+const COMMAND_TIMEOUT_MS = 45 * 60 * 1000
+const REPORT_INTERVAL_MS = 10 * 1000
+const MAX_OUTPUT = 60 * 1024
+
+/** 每次 auto-upgrade 开始时写；cron（root）和补跑（aaden）都要能写，所以 chmod 666 */
+const AUTO_UPGRADE_STAMP = '/etc/aaden/config/lastAutoUpgrade'
+const CATCH_UP_AFTER_MS = 20 * 3600 * 1000
+/** 午市、晚市不补跑（设备本地时间，分钟） */
+const PEAK_WINDOWS = [[11 * 60 + 30, 14 * 60 + 30], [17 * 60 + 30, 21 * 60 + 30]]
+/** 开机 10 分钟内不补跑：@reboot 的 npm + auto-upgrade 会自己跑 */
+const MIN_UPTIME_S = 10 * 60
+
+function userName() {
+    try {
+        return os.userInfo().username
+    } catch (e) {
+        return String(process.getuid ? process.getuid() : 'x')
+    }
+}
+
+function tmpFile(name) {
+    return path.join(os.tmpdir(), name + '-' + userName())
+}
+
+function postJson(url, body, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const data = Buffer.from(JSON.stringify(body))
+        const req = (url.indexOf('http://') === 0 ? http : https).request(url, {
+            method: 'POST',
+            headers: {'Content-Type': 'application/json', 'Content-Length': data.length},
+            timeout: timeoutMs || 20000,
+        }, res => {
+            const chunks = []
+            res.on('data', c => chunks.push(c))
+            res.on('end', () => {
+                const text = Buffer.concat(chunks).toString('utf8')
+                let json = null
+                try {
+                    json = JSON.parse(text)
+                } catch (e) { /* 非 JSON */ }
+                if (res.statusCode >= 200 && res.statusCode < 300) resolve(json)
+                else reject(Object.assign(new Error('HTTP ' + res.statusCode + ' ' + text.slice(0, 200)), {status: res.statusCode}))
+            })
+        })
+        req.on('timeout', () => req.destroy(new Error('timeout')))
+        req.on('error', reject)
+        req.end(data)
+    })
+}
+
+/** 后台起一个 aaden-cli 子命令，do-log 退出后它照样跑；输出追加进 /tmp 下的日志 */
+function spawnDetached(args, logName, env) {
+    let fd = 'ignore'
+    try {
+        fd = fs.openSync(tmpFile(logName) + '.log', 'a')
+    } catch (e) { /* 写不了日志也照跑 */ }
+    const child = spawn(process.execPath, [process.argv[1]].concat(args), {
+        detached: true,
+        stdio: ['ignore', fd, fd],
+        env: Object.assign({}, process.env, env || {}),
+    })
+    child.unref()
+    return child.pid
+}
+
+// ------------------------------------------------------------------ ① 命令
+
+/** do-log 拿到云端回复后调用：有命令就起后台进程去执行 */
+function handleOffers(deviceId, reply) {
+    const body = reply && reply.data && reply.data.commands ? reply.data : reply
+    const commands = (body && Array.isArray(body.commands) ? body.commands : [])
+        .filter(c => c && c.id && c.command)
+    if (commands.length === 0) return []
+    const items = commands.map(c => c.id + ':' + c.command)
+    console.log('云端有待执行命令:', items.join(' '))
+    spawnDetached(['run-commands', String(deviceId)].concat(items), 'aaden-command-runner')
+    return commands
+}
+
+function lockFile() {
+    return tmpFile('aaden-command-runner') + '.pid'
+}
+
+/** 同一时间只有一个执行进程；上一个还在跑就退出，没领到的命令下次 do-log 会再给 */
+function acquireLock() {
+    const file = lockFile()
+    try {
+        const pid = parseInt(fs.readFileSync(file, 'utf8'), 10)
+        if (pid && pid !== process.pid) {
+            try {
+                process.kill(pid, 0)
+                return false
+            } catch (e) {
+                if (e.code === 'EPERM') return false
+            }
+        }
+    } catch (e) { /* 没有锁文件 */ }
+    try {
+        fs.writeFileSync(file, String(process.pid))
+        return true
+    } catch (e) {
+        return false
+    }
+}
+
+function releaseLock() {
+    try {
+        if (parseInt(fs.readFileSync(lockFile(), 'utf8'), 10) === process.pid) fs.unlinkSync(lockFile())
+    } catch (e) { /* 已经没了 */ }
+}
+
+function stripAnsi(s) {
+    return s.replace(/\u001b\[[0-9;?]*[A-Za-z]/g, '').replace(/\r(?!\n)/g, '\n')
+}
+
+// aaden-cli 打印要执行的命令时会带上 sudo 密码；输出要存云端、ERP 里能看到，存之前抹掉
+const SECRETS = ['Innerken322.']
+
+function redact(s) {
+    return SECRETS.reduce((acc, secret) => acc.split(secret).join('***'), s)
+}
+
+async function report(id, deviceId, output, exitCode) {
+    const body = {deviceId: String(deviceId), output: output}
+    if (exitCode !== undefined) body.exitCode = exitCode
+    // 最终结果多试几次；中途的回报丢了无所谓，下一次会整段覆盖
+    const attempts = exitCode === undefined ? 1 : 3
+    for (let i = 0; i < attempts; i++) {
+        try {
+            await postJson(CLOUD + '/device-command/' + id + '/report', body)
+            return true
+        } catch (e) {
+            console.log('回报命令 #' + id + ' 失败:', e.message)
+            if (e.status === 409 || e.status === 403 || e.status === 404) return false
+            await new Promise(r => setTimeout(r, 5000))
+        }
+    }
+    return false
+}
+
+function runOne(id, deviceId, shellCmd) {
+    return new Promise(resolve => {
+        let output = ''
+        let dirty = false
+        const append = chunk => {
+            output += redact(stripAnsi(chunk.toString('utf8')))
+            if (output.length > MAX_OUTPUT) output = output.slice(output.length - MAX_OUTPUT)
+            dirty = true
+        }
+        // 登录 shell：cron 下 PATH 只有 /usr/bin:/bin，aaden-cli 在 /usr/local/bin
+        const child = spawn('bash', ['-lc', 'export PATH="/usr/local/bin:$PATH"; ' + shellCmd], {
+            detached: true,
+            stdio: ['ignore', 'pipe', 'pipe'],
+            env: Object.assign({}, process.env, {AADEN_UPGRADE_TRIGGER: '命令 #' + id}),
+        })
+        child.stdout.on('data', append)
+        child.stderr.on('data', append)
+        const timer = setInterval(() => {
+            if (!dirty) return
+            dirty = false
+            report(id, deviceId, output)
+        }, REPORT_INTERVAL_MS)
+        const killer = setTimeout(() => {
+            append('\n[aaden-cli] 超过 ' + (COMMAND_TIMEOUT_MS / 60000) + ' 分钟，终止\n')
+            try {
+                process.kill(-child.pid, 'SIGTERM')
+            } catch (e) { /* 已经退出 */ }
+        }, COMMAND_TIMEOUT_MS)
+        child.on('error', e => append('\n[aaden-cli] 启动失败: ' + e.message + '\n'))
+        child.on('close', (code, signal) => {
+            clearInterval(timer)
+            clearTimeout(killer)
+            const exitCode = typeof code === 'number' ? code : 128
+            if (signal) append('\n[aaden-cli] 被信号 ' + signal + ' 终止\n')
+            resolve({exitCode: exitCode, output: output})
+        })
+    })
+}
+
+/** `aaden-cli run-commands <deviceId> <id:COMMAND>...`：由 do-log 在后台起，逐条认领、执行、回报 */
+async function runCommands(rootDir, version, deviceId, items) {
+    if (!acquireLock()) {
+        console.log('已有命令执行进程在跑，这次不领')
+        return
+    }
+    try {
+        for (const item of items) {
+            const parts = String(item).split(':')
+            const id = parseInt(parts[0], 10)
+            const name = parts[1]
+            if (!id || !name) continue
+            try {
+                await postJson(CLOUD + '/device-command/' + id + '/start', {deviceId: String(deviceId), cliVersion: version})
+            } catch (e) {
+                console.log('认领命令 #' + id + ' 失败（可能已被领走或取消）:', e.message)
+                continue
+            }
+            const build = COMMANDS[name]
+            if (!build) {
+                await report(id, deviceId, '这个版本的 aaden-cli (' + version + ') 不认识命令 ' + name, 2)
+                continue
+            }
+            const cmd = build(rootDir)
+            console.log('执行命令 #' + id + ' ' + name + ': ' + cmd)
+            const result = await runOne(id, deviceId, cmd)
+            await report(id, deviceId, '$ ' + cmd + '\n' + result.output, result.exitCode)
+        }
+    } finally {
+        releaseLock()
+    }
+}
+
+// ------------------------------------------------------------------ ② 自动补跑
+
+function markAutoUpgradeStarted() {
+    try {
+        fs.writeFileSync(AUTO_UPGRADE_STAMP, String(Date.now()))
+        fs.chmodSync(AUTO_UPGRADE_STAMP, 0o666)
+    } catch (e) { /* 写不了就靠补跑自己的时间戳兜底 */ }
+}
+
+function readStamp(file) {
+    try {
+        const n = parseInt(fs.readFileSync(file, 'utf8'), 10)
+        if (n > 0) return n
+        return fs.statSync(file).mtimeMs
+    } catch (e) {
+        return 0
+    }
+}
+
+function catchUpStampFile() {
+    return path.join(os.homedir(), '.aaden-catchup')
+}
+
+function autoUpgradeRunning() {
+    try {
+        // 不经 shell 直接调 pgrep：经 sh -c 的话 sh 自己的命令行里就有这串字，会把自己当成「正在跑」
+        const pids = execFileSync('pgrep', ['-f', 'aaden-cli auto-upgrade'], {encoding: 'utf8', timeout: 5000})
+            .split('\n').map(s => parseInt(s, 10)).filter(pid => pid && pid !== process.pid)
+        return pids.length > 0
+    } catch (e) {
+        return false
+    }
+}
+
+/**
+ * do-log 每次上报后调用：超过 20 小时没跑过 auto-upgrade 就在后台补跑一次。
+ * 返回没补跑的原因（或 'started'），只用于日志。
+ */
+function maybeCatchUpAutoUpgrade() {
+    const now = new Date()
+    const minutes = now.getHours() * 60 + now.getMinutes()
+    if (PEAK_WINDOWS.some(w => minutes >= w[0] && minutes < w[1])) return 'peak'
+    if (os.uptime() < MIN_UPTIME_S) return 'boot'
+    const last = Math.max(readStamp(AUTO_UPGRADE_STAMP), readStamp(catchUpStampFile()))
+    if (Date.now() - last < CATCH_UP_AFTER_MS) return 'recent'
+    if (autoUpgradeRunning()) return 'running'
+    // 先把补跑时间戳写上：写不上就不补跑，免得每 5 分钟起一次
+    try {
+        fs.writeFileSync(catchUpStampFile(), String(Date.now()))
+    } catch (e) {
+        return 'no-stamp'
+    }
+    const hours = last ? Math.round((Date.now() - last) / 3600000) + ' 小时' : '很久'
+    spawnDetached(['auto-upgrade'], 'aaden-catchup', {AADEN_UPGRADE_TRIGGER: '补跑：' + hours + '没跑过自动更新'})
+    return 'started'
+}
+
+module.exports = {handleOffers, runCommands, markAutoUpgradeStarted, maybeCatchUpAutoUpgrade}

package/modules/firebase.js

@@ -16,7 +16,7 @@ export async function deviceEcho(data) {
     })
     const {frontendVersion, cliVersion, diskUsage, upTime, ngrokIsNew, hostInfo, tseInfo} = Object.assign({}, defaultData, data)
     if (parseInt(myDeviceId) === -1) {
-        return
+        return null
     }
     const {name, adress1, postCode, city, state} = await getNiceRestaurantInfo()
     const waitSecond = (parseInt(myDeviceId) % 30) * 1000
@@ -25,7 +25,7 @@ export async function deviceEcho(data) {
         resolve()
     }, waitSecond))
     try {
-        await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
+        const reply = await hillo.jsonPost('https://cloud-v2.aaden.io/deviceLog/create', {
             deviceId: myDeviceId,
             frontendVersion: frontendVersion,
             cliVersion,
@@ -37,13 +37,17 @@ export async function deviceEcho(data) {
             ngrokOk: ngrokIsNew,
             deviceName: `${name}\n${adress1}\n${postCode} ${city} ${state}`,
             ...hostInfo,
-            ...tseInfo
+            ...tseInfo,
+            // 回复里要带待执行命令（见 modules/device-commands.js）；老云端忽略这个字段
+            acceptCommands: true
         })
         console.log('report to remote server complete')
+        return {deviceId: myDeviceId, reply}
     } catch (e) {
         console.log(e.message)
         console.log('report to remote server failed')
     }
+    return null
 
 
 }

package/package.json

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

package/patch/202610072130ensureDoLogCron.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+# 一次性修复：aaden 的 crontab 里 do-log（每 5 分钟上报 + 领云端命令 + 自动补跑）那一行
+# 缺了、或者指向的 aaden-cli 不存在时，改成标准写法 /usr/local/bin/aaden-cli do-log。
+# 起因：10-07 1541 在 npm 并发重装之后 CLI 已经修好、远程更新也都成功，do-log 却再没上报过；
+# 老设备上这一行有写裸 aaden-cli（cron 的 PATH 只有 /usr/bin:/bin）或 /usr/bin/aaden-cli 的。
+# 只动这一行，其他行原样保留；改了的话把原来那行报给云端，方便事后看是哪种情况。
+sudoS() { echo "Innerken322." | sudo -S -p '' "$@"; }
+CLI=/usr/local/bin/aaden-cli
+WANT="*/5 * * * * $CLI do-log"
+
+[ -x "$CLI" ] || { echo "没有 $CLI，跳过"; exit 0; }
+# 有的老设备 do-log 写在 root 的 crontab 或 /etc/cron.d 里：那样就别再往 aaden 这边加，不然每 5 分钟报两次
+if sudoS crontab -l -u root 2>/dev/null | grep -v '^[[:space:]]*#' | grep -q 'do-log' \
+  || grep -rqs --exclude='*.dpkg-*' 'aaden-cli do-log' /etc/cron.d 2>/dev/null; then
+  echo "do-log 在 root 的 crontab 或 /etc/cron.d 里，不动 aaden 的"; exit 0
+fi
+CUR=$(sudoS crontab -l -u aaden 2>/dev/null) || { echo "aaden 没有 crontab，跳过（整套定时任务缺失要 aaden-cli fix-cronjob）"; exit 0; }
+
+LINE=$(printf '%s\n' "$CUR" | grep -v '^[[:space:]]*#' | grep -m1 'do-log')
+if [ -n "$LINE" ]; then
+  # 第 6 个字段起是命令；@reboot 之类的特殊写法只占 1 个字段
+  case "$LINE" in
+    @*) CMD=$(printf '%s' "$LINE" | awk '{print $2}') ;;
+    *) CMD=$(printf '%s' "$LINE" | awk '{print $6}') ;;
+  esac
+  case "$CMD" in
+    "$CLI") echo "do-log 已是标准写法，不动"; exit 0 ;;
+    /*) [ -x "$CMD" ] && { echo "do-log 指向 $CMD，存在，不动"; exit 0; } ;;
+    *) [ -x "/usr/bin/$CMD" ] || [ -x "/bin/$CMD" ] && { echo "do-log 用 $CMD，cron 的 PATH 里找得到，不动"; exit 0; } ;;
+  esac
+  NEW=$(printf '%s\n' "$CUR" | awk -v line="$LINE" -v want="$WANT" '$0 == line { print want; next } { print }')
+  WHAT="do-log 那一行指向的命令不存在，已改成标准写法。原来是：$LINE"
+else
+  NEW=$(printf '%s\n%s\n' "$CUR" "$WANT")
+  WHAT="aaden 的 crontab 里没有 do-log，已补上"
+fi
+
+printf '%s\n' "$NEW" | sudoS crontab -u aaden - || { echo "写 crontab 失败"; exit 1; }
+echo "$WHAT"
+DEVICE_ID=$(grep -e DeviceId /var/www/html/Resource/config/config.ini 2>/dev/null | cut -d = -f 2 | tr -d '" \r')
+[ -n "$DEVICE_ID" ] && python3 -c 'import json, sys, urllib.request; urllib.request.urlopen(urllib.request.Request("https://cloud-v2.aaden.io/deviceLog/createEvent", json.dumps({"deviceId": sys.argv[1], "content": sys.argv[2] + " result:0", "type": "系统生成", "operator": "patch ensureDoLogCron"}).encode(), {"Content-Type": "application/json"}), timeout=10)' "$DEVICE_ID" "$WHAT" 2>/dev/null
+exit 0