aaden-cli 1.6.117 → 1.6.119

package/AadenDeploy/appCenterSync.sh

@@ -4,6 +4,8 @@
 #
 # light-update 只发 PHP/，AppCenter 以前只能跟 465MB 的 latest.zip 走；这里单独按应用同步。
 #   - 灰度门：manifest 的 rollout = {"devices":[...], "percent":N}，本机在名单里或 deviceId%100 < N 才动；没有 rollout = 全量
+#   - 按应用灰度：manifest 带 perAppRollout=true 时，每个应用按自己的 apps.<App>.rollout 判断（没有 = 全量），
+#     顶层 rollout 只管 ensureNoCache；老版本 CLI 不认 perAppRollout，照旧整体按顶层 rollout
 #   - ensureNoCache：manifest 打开时先确保 AppCenter 的 index.html 带 no-cache（ensureAppCenterNoCache.sh）
 #   - manifest 门：本机 .appcenter-manifest 的 sha256 == manifest 的 treeSha256 且 `sha256sum -c` 通过 → 什么都不做，
 #     每天只花一次几 KB 的请求。被 latest.zip 全量覆盖过、文件对不上 → 校验失败 → 重新铺一遍（自愈）
@@ -19,7 +21,7 @@
 #   APPCENTER_DEVICE_ID  本机 deviceId（CLI 会传）；不传就问本机 PHP
 #   APPCENTER_RESULT     结果行另存的文件（CLI 会传）
 # 结果行（同时写进 $RESULT 给 CLI 上报）：APP_OK <App> <sha12> | APP_UP_TO_DATE <App> | APP_SKIP <App> <原因> |
-#   APP_ROLLED_BACK <App> | APP_ABORT_* <App> | NOCACHE_* | SKIP_ROLLOUT | SKIP_DEPS | SKIP_LOCKED | ABORT_*
+#   APP_ROLLED_BACK <App> | APP_ABORT_* <App> | APP_SKIP_ROLLOUT <App> | NOCACHE_* | SKIP_ROLLOUT | SKIP_DEPS | SKIP_LOCKED | ABORT_*
 # 退出码：0=全部成功、无需更新或不在灰度内；1=有失败（失败的已回滚或未动线上目录）
 set -uo pipefail
 BASE="${APPCENTER_BASE:-https://aaden-backend.s3.eu-central-1.amazonaws.com/appcenter}"
@@ -48,21 +50,29 @@ flock -n 9 || { res "SKIP_LOCKED"; exit 0; }
 
 MANIFEST=$(curl -fsSL --max-time 30 "$BASE/$CHANNEL/manifest.json") \
   || { echo "取不到 $BASE/$CHANNEL/manifest.json"; res "ABORT_MANIFEST"; exit 1; }
-# 读 manifest：mf apps.Admin.zip / mf ensureNoCache / mf eligible <deviceId>
+# 读 manifest：mf apps.Admin.zip / mf ensureNoCache / mf eligible <deviceId> / mf eligible_app <App> <deviceId>
 mf(){
   printf '%s' "$MANIFEST" | python3 -c '
 import json, sys
 m = json.load(sys.stdin)
-if sys.argv[1] == "eligible":
-    r = m.get("rollout")
+def gate(r, dev):
     if r is None:
-        print("yes"); sys.exit()
+        return "yes"
     try:
-        d = int(sys.argv[2])
+        d = int(dev)
     except ValueError:
-        print("no"); sys.exit()
+        return "no"
     ok = d in [int(x) for x in r.get("devices", [])] or d % 100 < int(r.get("percent", 0))
-    print("yes" if ok else "no"); sys.exit()
+    return "yes" if ok else "no"
+if sys.argv[1] == "eligible":
+    print(gate(m.get("rollout"), sys.argv[2])); sys.exit()
+if sys.argv[1] == "eligible_app":
+    if m.get("perAppRollout") is True:
+        app = (m.get("apps") or {}).get(sys.argv[2]) or {}
+        print(gate(app.get("rollout"), sys.argv[3]))
+    else:
+        print(gate(m.get("rollout"), sys.argv[3]))
+    sys.exit()
 v = m
 for k in sys.argv[1].split("."):
     v = v.get(k) if isinstance(v, dict) else None
@@ -76,13 +86,14 @@ if [ -z "$DEVICE_ID" ] || [ "$DEVICE_ID" = "-1" ]; then
   DEVICE_ID=$(curl -s --max-time 10 "http://localhost/PHP/AccessLog.php?op=deviceId" \
     | python3 -c 'import json,sys; print(json.load(sys.stdin).get("content",""))' 2>/dev/null)
 fi
-if [ "$(mf eligible "${DEVICE_ID:-x}")" != "yes" ]; then
+TOP_ELIGIBLE=$(mf eligible "${DEVICE_ID:-x}")
+if [ "$TOP_ELIGIBLE" != "yes" ] && [ "$(mf perAppRollout)" != "true" ]; then
   res "SKIP_ROLLOUT device=${DEVICE_ID:-?}"; exit 0
 fi
 
 FAILED=0
 # ---- index.html no-cache（先于换前端：让之后拿到的 index.html 都不再被启发式缓存）----
-if [ "$(mf ensureNoCache)" = "true" ]; then
+if [ "$TOP_ELIGIBLE" = "yes" ] && [ "$(mf ensureNoCache)" = "true" ]; then
   NC=$(bash "$HERE/ensureAppCenterNoCache.sh"); NC_CODE=$?
   printf '%s\n' "$NC" | sed '$d'
   res "$(printf '%s\n' "$NC" | tail -1)"
@@ -101,6 +112,7 @@ sync_app(){
   local APP="$1" LIVE="$WEB/$1" NEW="$STAGE/$1" TREE ZIP ZSHA
   TREE=$(mf "apps.$APP.treeSha256"); ZIP=$(mf "apps.$APP.zip"); ZSHA=$(mf "apps.$APP.zipSha256")
   if [ -z "$TREE" ]; then res "APP_SKIP $APP 不在manifest里"; return 0; fi
+  if [ "$(mf eligible_app "$APP" "${DEVICE_ID:-x}")" != "yes" ]; then res "APP_SKIP_ROLLOUT $APP"; return 0; fi
   # manifest 来自网络：只接受预期格式，防止路径穿越
   if ! [[ "$TREE" =~ ^[0-9a-f]{64}$ && "$ZSHA" =~ ^[0-9a-f]{64}$ && "$ZIP" =~ ^blobs/[A-Za-z0-9._-]+\.zip$ ]]; then
     res "APP_ABORT_BAD_MANIFEST $APP"; return 1

package/dist/index.js

@@ -694,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 {
@@ -776,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 是第二代）
@@ -825,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 之前的构建）报空串
@@ -843,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}
 }
 
 // 整体出错就什么都不报，云端保留上次的值
@@ -19183,7 +19246,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.117"};
+module.exports = {"i8":"1.6.119"};
 
 /***/ })
 

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.117",
+  "version": "1.6.119",
   "description": "",
   "main": "dist/index.js",
   "scripts": {