aaden-cli 1.6.115 → 1.6.116

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,10 +4,23 @@ sudoS() { echo "Innerken322." | sudo -S -p '' "$@"; }
4
4
 
5
5
  sudoS npm config set prefix /usr/local
6
6
  cd || exit
7
- sudoS rm -rf ngrok
8
- axel -n 8 "https://aaden-storage.s3.eu-central-1.amazonaws.com/ngrok"
9
- sudoS cp -f ngrok /etc/aaden/ngrok
10
- sudoS chmod +x /etc/aaden/ngrok
7
+ # 用 curl 下载并按 S3 ETag(单段上传 = MD5)校验,对了再装。以前用 axel:家目录里有旧的 ngrok.N 残留时
8
+ # 它把文件存成 ngrok.21 之类,后面 cp ngrok 找不到文件,坏掉的 /etc/aaden/ngrok 一直没换掉
9
+ # (10-08 的 1233:ngrok 启动即 SEGV,systemd 重启了 64 万次)。
10
+ sudoS rm -rf ngrok ngrok.st
11
+ rm -f ngrok.[0-9]* 2>/dev/null
12
+ NGROK_URL="https://aaden-storage.s3.eu-central-1.amazonaws.com/ngrok"
13
+ NGROK_TMP=$(mktemp)
14
+ curl -fsSL "$NGROK_URL" -o "$NGROK_TMP" --max-time 300
15
+ NGROK_WANT=$(curl -sfI "$NGROK_URL" --max-time 30 | awk 'tolower($1)=="etag:"{print $2}' | tr -d '"\r')
16
+ NGROK_GOT=$(md5sum "$NGROK_TMP" | cut -d' ' -f1)
17
+ if [ -s "$NGROK_TMP" ] && { [ -z "$NGROK_WANT" ] || [ "$NGROK_GOT" = "$NGROK_WANT" ]; }; then
18
+ sudoS install -m 755 "$NGROK_TMP" /etc/aaden/ngrok
19
+ echo "ngrok 已重新安装(md5 $NGROK_GOT)"
20
+ else
21
+ echo "ngrok 下载校验失败(下载 $NGROK_GOT / 期望 $NGROK_WANT),保留原文件"
22
+ fi
23
+ rm -f "$NGROK_TMP"
11
24
 
12
25
  DeviceId=$(cat /var/www/html/Resource/config/config.ini | grep -e DeviceId | cut -d = -f 2 | grep '[1-9]*' | sed 's/"//g')
13
26
  aaden-cli update-ngrok-config $DeviceId
@@ -33,6 +33,8 @@ report() {
33
33
  echo "--- 服务日志"
34
34
  sudoS journalctl -u "$SVC" -n 15 --no-pager -q 2>/dev/null
35
35
  fi
36
+ echo "--- ngrok 文件"
37
+ 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')"
36
38
  echo "--- 进程"
37
39
  pgrep -a -f "$NGROK "
38
40
  }
package/dist/index.js CHANGED
@@ -19179,7 +19179,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.19.2","description":"P
19179
19179
  /***/ ((module) => {
19180
19180
 
19181
19181
  "use strict";
19182
- module.exports = {"i8":"1.6.115"};
19182
+ module.exports = {"i8":"1.6.116"};
19183
19183
 
19184
19184
  /***/ })
19185
19185
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aaden-cli",
3
- "version": "1.6.115",
3
+ "version": "1.6.116",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {