41b7ae82e4
四个独立的 bug 叠在一起，表现为「只同步两天、没有进度」：
* 前端 `...(days ? { days } : {})` 把 days=0 当成未传。「全部历史」
存的就是 0，请求体里根本没有 days，后端退回 7 天默认值。
* scheduler 用 `s[0]` 读 query_one 返回的 dict，抛 KeyError 后被
per-account 的 except 吞掉。只要用户存过一次设置，每 30 分钟的
自动同步就一次都没成功过——库里那 2 天全是手动点出来的。
* 增量同步查 `health_daily`（表其实叫 health_data），后台线程直接
死掉，状态永远卡在 syncing，进度条不动。
* UI 完全不看 /sync 的返回值，rate_limited 时按钮点了没反应；轮询
结束时又把 rate_limited 归进 else 分支报「同步完成」。
顺带：
* 日循环遇到 429 立即退避并保留已拉到的天数，而不是当成「跳过一天」
继续往下捶 700 天——这正是之前限流死循环的来源之一。
* 定时循环显式传 SYNC_DAYS。历史范围按 UI 文案只描述手动全量同步，
让半小时一次的 tick 重拉 730 天必然把限流撞得更深。
* 短同步逐天上报进度（原来每 5 天一次，7 天的同步全程停在 0）。
* /sync 路由重复解析 body，空 body 会 None.get 崩。
* 4 个 StubGarth 缺 configure()，7 个测试在此之前一直是红的。
新增 deploy/push.sh：NAS 只认密码，脚本开一个 ssh 复用连接，密码只
输一次，后面推送 / 重启 / 健康检查全走它。不碰 .env、.venv 和数据库。
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
61 lines
2.3 KiB
Bash
Executable File
61 lines
2.3 KiB
Bash
Executable File
#!/bin/sh
|
|
# Push this working tree to the NAS and restart it.
|
|
#
|
|
# The NAS only accepts password auth, so one ssh master connection is opened
|
|
# up front and every later step rides on it: you type the password once, not
|
|
# five times. (macOS's bundled rsync 2.6.9 cannot carry a password through
|
|
# -e at all — hence tar over ssh.)
|
|
#
|
|
# ./deploy/push.sh [user@host] [port]
|
|
#
|
|
# Never touches .env, .venv or the database on the far side.
|
|
set -e
|
|
|
|
HOST="${1:-ericwyuan@192.168.50.64}"
|
|
PORT="${2:-22}"
|
|
REPO="$(cd "$(dirname "$0")/.." && pwd)"
|
|
CTL="$(mktemp -u /tmp/garmin-deploy-XXXXXX)"
|
|
|
|
sh_() { ssh -S "$CTL" -o BatchMode=yes "$HOST" "$@"; }
|
|
|
|
cleanup() { ssh -S "$CTL" -O exit "$HOST" 2>/dev/null || true; }
|
|
trap cleanup EXIT
|
|
|
|
echo "==> connecting to $HOST:$PORT (password prompt follows, once)"
|
|
ssh -M -S "$CTL" -fN -p "$PORT" -o ControlPersist=300 "$HOST"
|
|
|
|
# The app dir has moved before; find it rather than assume it.
|
|
APP=$(sh_ 'for d in ~/apps/garmin-health-lab /volume1/web/garmin-health-lab; do
|
|
[ -d "$d/backend" ] && { echo "$d"; break; }; done')
|
|
[ -n "$APP" ] || { echo "cannot find the app dir on $HOST" >&2; exit 1; }
|
|
echo "==> app dir: $APP"
|
|
|
|
# STATIC_DIR is ./static relative to backend/, which is where start.sh cds to.
|
|
STATIC="$APP/backend/static"
|
|
# `cmd && VAR=x` would trip `set -e` when cmd fails, so spell it out.
|
|
if sh_ "[ -f '$APP/static/index.html' ]" 2>/dev/null; then
|
|
STATIC="$APP/static"
|
|
fi
|
|
echo "==> static dir: $STATIC"
|
|
|
|
echo "==> backend"
|
|
tar czf - --exclude .venv --exclude .env --exclude __pycache__ \
|
|
--exclude '*.db' --exclude tests --exclude .pytest_cache \
|
|
-C "$REPO/backend" . | sh_ "tar xzf - -C '$APP/backend'"
|
|
|
|
echo "==> static (cleared first, so stale JS chunks do not pile up)"
|
|
if [ ! -f "$REPO/client/build/index.html" ]; then
|
|
echo "client/build is missing — run 'npm run build' first" >&2
|
|
exit 1
|
|
fi
|
|
sh_ "rm -rf '$STATIC' && mkdir -p '$STATIC'"
|
|
tar czf - -C "$REPO/client/build" . | sh_ "tar xzf - -C '$STATIC'"
|
|
|
|
echo "==> restart"
|
|
sh_ "sh '$APP/deploy/stop.sh' >/dev/null 2>&1; sleep 2; sh '$APP/deploy/start.sh'"
|
|
|
|
echo "==> health"
|
|
sh_ "curl -sf -m 5 -o /dev/null -w 'local api: %{http_code}\n' \
|
|
http://127.0.0.1:8124/api/health/status" || echo "local api: unreachable"
|
|
echo "done. The public URL takes a few seconds longer (frp reconnecting)."
|