aaden-cli 1.6.116 → 1.6.118

package/dist/index.js

@@ -121,6 +121,8 @@ const COMMANDS = {
 /** 每条命令最多跑多久；latest.zip 全量在慢网络上要 20 分钟 */
 const COMMAND_TIMEOUT_MS = 45 * 60 * 1000
 const REPORT_INTERVAL_MS = 10 * 1000
+/** 没有新输出也隔这么久回报一次：云端 30 分钟没回报就判失败，而下载 latest.zip 之类一声不吭能跑 20 分钟 */
+const HEARTBEAT_MS = 60 * 1000
 const MAX_OUTPUT = 60 * 1024
 
 /** 每次 auto-upgrade 开始时写；cron（root）和补跑（aaden）都要能写，所以 chmod 666 */
@@ -277,9 +279,11 @@ function runOne(id, deviceId, shellCmd) {
         })
         child.stdout.on('data', append)
         child.stderr.on('data', append)
+        let lastSent = Date.now()
         const timer = setInterval(() => {
-            if (!dirty) return
+            if (!dirty && Date.now() - lastSent < HEARTBEAT_MS) return
             dirty = false
+            lastSent = Date.now()
             report(id, deviceId, output)
         }, REPORT_INTERVAL_MS)
         const killer = setTimeout(() => {
@@ -690,6 +694,15 @@ const WINDOWS_TSE_DIR = 'Desktop/AadenTseOnWindows'
 const WINDOWS_DEFAULT_JAR = 'tse-0.0.3.jar'
 // 和 PHP 的 Api.php 一样给 3 秒
 const PROBE_TIMEOUT_MS = 3000
+const PING_RETRY_DELAY_MS = 20000
+
+function safeSync(fn, fallback = null) {
+    try {
+        return fn()
+    } catch (e) {
+        return fallback
+    }
+}
 
 async function safe(fn, fallback = null) {
     try {
@@ -772,20 +785,67 @@ function servingJarPath() {
     return match ? match[1] : LINUX_DEFAULT_JAR
 }
 
-// 门店库里最新的那块 TSE（换过 TSE 会有多行）；只读数据库，TSE 坏了也读得到
-function readCertFromDb() {
+// 只读门店库，返回第一行按 tab 分开的各列（没有结果为 null）
+function queryDb(sql) {
     const db = readIniSection('DB')
     const out = execFileSync('mysql', [
         '-h', db.host || 'localhost', '-u', db.user || 'aaden', '-N', '-B', '--raw', db.name || 'aaden',
-        '-e', 'select serialNumber, certificate from RealTseInfo order by id desc limit 1',
+        '-e', sql,
     ], {
         encoding: 'utf-8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore'],
         // 密码走环境变量，不出现在进程列表里
         env: Object.assign({}, process.env, {MYSQL_PWD: db.password || ''}),
     }).trim()
     if (!out) return null
-    const [serial, certificate] = out.split('\t')
-    return {serial, certificate: certificate && certificate !== 'NULL' ? certificate : null}
+    return out.split('\n')[0].split('\t').map(v => (v === 'NULL' ? null : v))
+}
+
+// 门店库里最新的那块 TSE（换过 TSE 会有多行）；只读数据库，TSE 坏了也读得到
+function readCertFromDb() {
+    const row = queryDb('select serialNumber, certificate from RealTseInfo order by id desc limit 1')
+    if (!row) return null
+    const [serial, certificate] = row
+    return {serial, certificate: certificate || null}
+}
+
+// 结账后签名任务进 TseExecuteQueue（finish / finish-zero），后台几秒内执行；
+// 结账超过 5 分钟还没有签名的就算漏签（任务报错、卡在队列里、或者 TSE 回了错）。
+// 同一张单可能有多条任务（补签），按单算
+const DUE_ORDERS = `select q.orderId, max(q.createdAt) as createdAt, max(q.id) as taskId,
+        exists (select 1 from RealTseLog l
+                where l.orderId = q.orderId and l.bestellungId is null and l.signature <> '') as signed
+    from TseExecuteQueue q
+    where q.executeType in ('finish', 'finish-zero')
+      and q.createdAt >= now() - interval 24 hour
+      and q.createdAt <= now() - interval 5 minute
+    group by q.orderId`
+
+// 最近 24 小时结账的单有没有真的签上：这是 TSE 有没有坏的实际结果，比 ping 准——
+// 关店、睡眠、开机自检时没人结账，不会算成故障；真坏了也一定有单签不上
+function readSigningFromDb() {
+    const counts = queryDb(`select count(*), coalesce(sum(not signed), 0),
+        unix_timestamp(max(if(signed, createdAt, null))),
+        unix_timestamp(max(if(signed, null, createdAt)))
+        from (${DUE_ORDERS}) t`)
+    if (!counts) return null
+    const [due, unsigned, lastSigned, lastUnsigned] = counts
+    // 最近一张漏签的单为什么没签上：TSE 回的错（RealTseLog.tseError），没有就看队列任务的报错 / 还在排队
+    // 单独兜底：原因查不出来（比如两张表排序规则不一样）也不能连单数一起丢
+    const reason = Number(unsigned) > 0 ? safeSync(() => queryDb(`select coalesce(
+            (select l.tseError from RealTseLog l where l.orderId = t.orderId and l.tseError <> '' order by l.id desc limit 1),
+            nullif(q.note, ''),
+            if(q.finished = 0, '签名任务还在排队', null))
+        from (${DUE_ORDERS}) t join TseExecuteQueue q on q.id = t.taskId
+        where not t.signed
+        order by t.createdAt desc limit 1`)) : null
+    const toIso = sec => (sec ? new Date(Number(sec) * 1000).toISOString() : null)
+    return {
+        tseOrders24h: Number(due) || 0,
+        tseUnsigned24h: Number(unsigned) || 0,
+        tseLastSignedAt: toIso(lastSigned),
+        tseLastUnsignedAt: toIso(lastUnsigned),
+        tseLastUnsignedReason: reason && reason[0] ? reason[0].slice(0, 250) : null,
+    }
 }
 
 // TSE 自己的序列号、证书有效期和型号（dnQualifier：BSI-DSZ-CC-1121 是第一代，-V2 是第二代）
@@ -821,7 +881,12 @@ async function probeTse() {
     }
 
     // ok：TSE 正常；error：服务在但 TSE 在自检 / 没初始化 / 硬件报错；down：服务连不上
-    const ping = await httpGet(`${tseHost}/ping`)
+    // 开机 / 唤醒时 TseHost 先自检约 15 秒，这期间 /ping 回 400：失败就等 20 秒再试一次，免得报成故障
+    let ping = await httpGet(`${tseHost}/ping`)
+    if (ping.status !== 200) {
+        await new Promise(resolve => setTimeout(resolve, PING_RETRY_DELAY_MS))
+        ping = await httpGet(`${tseHost}/ping`)
+    }
     const tseStatus = ping.status === 0 ? 'down' : (ping.status === 200 ? 'ok' : 'error')
 
     // 连不上时报 null，云端保留上次的版本；服务在但没有这个接口（2024-09 之前的构建）报空串
@@ -839,8 +904,10 @@ async function probeTse() {
     }
 
     const cert = await collectCert(tseHost, ping.status !== 0)
+    // 老版本门店库没有 TseExecuteQueue（2025-03 之前）就不报，云端保留上次的值
+    const signing = (await safe(readSigningFromDb)) || {}
 
-    return {tseEnabled, tseHost, tseStatus, tseAdapterVersion, tseJarSize, ...cert}
+    return {tseEnabled, tseHost, tseStatus, tseAdapterVersion, tseJarSize, ...cert, ...signing}
 }
 
 // 整体出错就什么都不报，云端保留上次的值
@@ -19179,7 +19246,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.116"};
+module.exports = {"i8":"1.6.118"};
 
 /***/ })
 

package/modules/device-commands.js

@@ -34,6 +34,8 @@ const COMMANDS = {
 /** 每条命令最多跑多久；latest.zip 全量在慢网络上要 20 分钟 */
 const COMMAND_TIMEOUT_MS = 45 * 60 * 1000
 const REPORT_INTERVAL_MS = 10 * 1000
+/** 没有新输出也隔这么久回报一次：云端 30 分钟没回报就判失败，而下载 latest.zip 之类一声不吭能跑 20 分钟 */
+const HEARTBEAT_MS = 60 * 1000
 const MAX_OUTPUT = 60 * 1024
 
 /** 每次 auto-upgrade 开始时写；cron（root）和补跑（aaden）都要能写，所以 chmod 666 */
@@ -190,9 +192,11 @@ function runOne(id, deviceId, shellCmd) {
         })
         child.stdout.on('data', append)
         child.stderr.on('data', append)
+        let lastSent = Date.now()
         const timer = setInterval(() => {
-            if (!dirty) return
+            if (!dirty && Date.now() - lastSent < HEARTBEAT_MS) return
             dirty = false
+            lastSent = Date.now()
             report(id, deviceId, output)
         }, REPORT_INTERVAL_MS)
         const killer = setTimeout(() => {

package/modules/tse-info.js

@@ -21,6 +21,15 @@ const WINDOWS_TSE_DIR = 'Desktop/AadenTseOnWindows'
 const WINDOWS_DEFAULT_JAR = 'tse-0.0.3.jar'
 // 和 PHP 的 Api.php 一样给 3 秒
 const PROBE_TIMEOUT_MS = 3000
+const PING_RETRY_DELAY_MS = 20000
+
+function safeSync(fn, fallback = null) {
+    try {
+        return fn()
+    } catch (e) {
+        return fallback
+    }
+}
 
 async function safe(fn, fallback = null) {
     try {
@@ -103,20 +112,67 @@ function servingJarPath() {
     return match ? match[1] : LINUX_DEFAULT_JAR
 }
 
-// 门店库里最新的那块 TSE（换过 TSE 会有多行）；只读数据库，TSE 坏了也读得到
-function readCertFromDb() {
+// 只读门店库，返回第一行按 tab 分开的各列（没有结果为 null）
+function queryDb(sql) {
     const db = readIniSection('DB')
     const out = execFileSync('mysql', [
         '-h', db.host || 'localhost', '-u', db.user || 'aaden', '-N', '-B', '--raw', db.name || 'aaden',
-        '-e', 'select serialNumber, certificate from RealTseInfo order by id desc limit 1',
+        '-e', sql,
     ], {
         encoding: 'utf-8', timeout: 5000, stdio: ['ignore', 'pipe', 'ignore'],
         // 密码走环境变量，不出现在进程列表里
         env: Object.assign({}, process.env, {MYSQL_PWD: db.password || ''}),
     }).trim()
     if (!out) return null
-    const [serial, certificate] = out.split('\t')
-    return {serial, certificate: certificate && certificate !== 'NULL' ? certificate : null}
+    return out.split('\n')[0].split('\t').map(v => (v === 'NULL' ? null : v))
+}
+
+// 门店库里最新的那块 TSE（换过 TSE 会有多行）；只读数据库，TSE 坏了也读得到
+function readCertFromDb() {
+    const row = queryDb('select serialNumber, certificate from RealTseInfo order by id desc limit 1')
+    if (!row) return null
+    const [serial, certificate] = row
+    return {serial, certificate: certificate || null}
+}
+
+// 结账后签名任务进 TseExecuteQueue（finish / finish-zero），后台几秒内执行；
+// 结账超过 5 分钟还没有签名的就算漏签（任务报错、卡在队列里、或者 TSE 回了错）。
+// 同一张单可能有多条任务（补签），按单算
+const DUE_ORDERS = `select q.orderId, max(q.createdAt) as createdAt, max(q.id) as taskId,
+        exists (select 1 from RealTseLog l
+                where l.orderId = q.orderId and l.bestellungId is null and l.signature <> '') as signed
+    from TseExecuteQueue q
+    where q.executeType in ('finish', 'finish-zero')
+      and q.createdAt >= now() - interval 24 hour
+      and q.createdAt <= now() - interval 5 minute
+    group by q.orderId`
+
+// 最近 24 小时结账的单有没有真的签上：这是 TSE 有没有坏的实际结果，比 ping 准——
+// 关店、睡眠、开机自检时没人结账，不会算成故障；真坏了也一定有单签不上
+function readSigningFromDb() {
+    const counts = queryDb(`select count(*), coalesce(sum(not signed), 0),
+        unix_timestamp(max(if(signed, createdAt, null))),
+        unix_timestamp(max(if(signed, null, createdAt)))
+        from (${DUE_ORDERS}) t`)
+    if (!counts) return null
+    const [due, unsigned, lastSigned, lastUnsigned] = counts
+    // 最近一张漏签的单为什么没签上：TSE 回的错（RealTseLog.tseError），没有就看队列任务的报错 / 还在排队
+    // 单独兜底：原因查不出来（比如两张表排序规则不一样）也不能连单数一起丢
+    const reason = Number(unsigned) > 0 ? safeSync(() => queryDb(`select coalesce(
+            (select l.tseError from RealTseLog l where l.orderId = t.orderId and l.tseError <> '' order by l.id desc limit 1),
+            nullif(q.note, ''),
+            if(q.finished = 0, '签名任务还在排队', null))
+        from (${DUE_ORDERS}) t join TseExecuteQueue q on q.id = t.taskId
+        where not t.signed
+        order by t.createdAt desc limit 1`)) : null
+    const toIso = sec => (sec ? new Date(Number(sec) * 1000).toISOString() : null)
+    return {
+        tseOrders24h: Number(due) || 0,
+        tseUnsigned24h: Number(unsigned) || 0,
+        tseLastSignedAt: toIso(lastSigned),
+        tseLastUnsignedAt: toIso(lastUnsigned),
+        tseLastUnsignedReason: reason && reason[0] ? reason[0].slice(0, 250) : null,
+    }
 }
 
 // TSE 自己的序列号、证书有效期和型号（dnQualifier：BSI-DSZ-CC-1121 是第一代，-V2 是第二代）
@@ -152,7 +208,12 @@ async function probeTse() {
     }
 
     // ok：TSE 正常；error：服务在但 TSE 在自检 / 没初始化 / 硬件报错；down：服务连不上
-    const ping = await httpGet(`${tseHost}/ping`)
+    // 开机 / 唤醒时 TseHost 先自检约 15 秒，这期间 /ping 回 400：失败就等 20 秒再试一次，免得报成故障
+    let ping = await httpGet(`${tseHost}/ping`)
+    if (ping.status !== 200) {
+        await new Promise(resolve => setTimeout(resolve, PING_RETRY_DELAY_MS))
+        ping = await httpGet(`${tseHost}/ping`)
+    }
     const tseStatus = ping.status === 0 ? 'down' : (ping.status === 200 ? 'ok' : 'error')
 
     // 连不上时报 null，云端保留上次的版本；服务在但没有这个接口（2024-09 之前的构建）报空串
@@ -170,8 +231,10 @@ async function probeTse() {
     }
 
     const cert = await collectCert(tseHost, ping.status !== 0)
+    // 老版本门店库没有 TseExecuteQueue（2025-03 之前）就不报，云端保留上次的值
+    const signing = (await safe(readSigningFromDb)) || {}
 
-    return {tseEnabled, tseHost, tseStatus, tseAdapterVersion, tseJarSize, ...cert}
+    return {tseEnabled, tseHost, tseStatus, tseAdapterVersion, tseJarSize, ...cert, ...signing}
 }
 
 // 整体出错就什么都不报，云端保留上次的值

package/package.json

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