aaden-cli 1.6.118 → 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

@@ -19246,7 +19246,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.118"};
+module.exports = {"i8":"1.6.119"};
 
 /***/ })
 

package/package.json

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