aaden-cli 1.6.115 → 1.6.117

package/AadenDeploy/Utils/enableNgrok.sh

@@ -4,10 +4,23 @@ sudoS() { echo "Innerken322." | sudo -S -p '' "$@"; }
 
 sudoS npm config set prefix /usr/local
 cd || exit
-sudoS rm -rf ngrok
-axel -n 8 "https://aaden-storage.s3.eu-central-1.amazonaws.com/ngrok"
-sudoS cp -f ngrok /etc/aaden/ngrok
-sudoS chmod +x /etc/aaden/ngrok
+# 用 curl 下载并按 S3 ETag（单段上传 = MD5）校验，对了再装。以前用 axel：家目录里有旧的 ngrok.N 残留时
+# 它把文件存成 ngrok.21 之类，后面 cp ngrok 找不到文件，坏掉的 /etc/aaden/ngrok 一直没换掉
+# （10-08 的 1233：ngrok 启动即 SEGV，systemd 重启了 64 万次）。
+sudoS rm -rf ngrok ngrok.st
+rm -f ngrok.[0-9]* 2>/dev/null
+NGROK_URL="https://aaden-storage.s3.eu-central-1.amazonaws.com/ngrok"
+NGROK_TMP=$(mktemp)
+curl -fsSL "$NGROK_URL" -o "$NGROK_TMP" --max-time 300
+NGROK_WANT=$(curl -sfI "$NGROK_URL" --max-time 30 | awk 'tolower($1)=="etag:"{print $2}' | tr -d '"\r')
+NGROK_GOT=$(md5sum "$NGROK_TMP" | cut -d' ' -f1)
+if [ -s "$NGROK_TMP" ] && { [ -z "$NGROK_WANT" ] || [ "$NGROK_GOT" = "$NGROK_WANT" ]; }; then
+  sudoS install -m 755 "$NGROK_TMP" /etc/aaden/ngrok
+  echo "ngrok 已重新安装（md5 $NGROK_GOT）"
+else
+  echo "ngrok 下载校验失败（下载 $NGROK_GOT / 期望 $NGROK_WANT），保留原文件"
+fi
+rm -f "$NGROK_TMP"
 
 DeviceId=$(cat /var/www/html/Resource/config/config.ini | grep -e DeviceId | cut -d = -f 2 | grep '[1-9]*' | sed 's/"//g')
 aaden-cli update-ngrok-config $DeviceId

package/AadenDeploy/restartNgrok.sh

@@ -33,6 +33,8 @@ report() {
     echo "--- 服务日志"
     sudoS journalctl -u "$SVC" -n 15 --no-pager -q 2>/dev/null
   fi
+  echo "--- ngrok 文件"
+  echo "本机 md5 $(md5sum "$NGROK" 2>/dev/null | cut -d' ' -f1) / S3 $(curl -sfI https://aaden-storage.s3.eu-central-1.amazonaws.com/ngrok --max-time 15 | awk 'tolower($1)=="etag:"{print $2}' | tr -d '"\r')"
   echo "--- 进程"
   pgrep -a -f "$NGROK "
 }

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(() => {
@@ -19179,7 +19183,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"1.6.115"};
+module.exports = {"i8":"1.6.117"};
 
 /***/ })
 

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/package.json

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