四个独立的 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>
243 lines
9.5 KiB
Python
243 lines
9.5 KiB
Python
"""
|
|
Background scheduler.
|
|
|
|
Keeps the local database close to Garmin without the user having to press
|
|
anything: every interval it pulls the last couple of days for each account
|
|
that has stored OAuth tokens.
|
|
|
|
Two things make this fiddly in this deployment, and both are handled here:
|
|
|
|
* **Several workers.** gunicorn runs more than one process, and each would
|
|
otherwise start its own timer and sync the same account concurrently. A row
|
|
in `job_locks` is claimed before any work starts, so exactly one worker runs
|
|
a given tick.
|
|
* **Restarts.** The thread dies with its worker. The lock records when the job
|
|
last completed, so a freshly started worker picks the schedule back up
|
|
rather than either skipping an interval or immediately re-running.
|
|
"""
|
|
import datetime
|
|
import os
|
|
import threading
|
|
import time
|
|
|
|
from config import DB_TYPE
|
|
from db import execute, query_one, query_all
|
|
from services import garmin as garmin_svc
|
|
from services import settings as settings_svc
|
|
|
|
JOB_NAME = "garmin_auto_sync"
|
|
|
|
# How often to pull, and how far back. Two days rather than one: the current
|
|
# day is still being written to, and a day can arrive late.
|
|
INTERVAL_SECONDS = int(os.environ.get("AUTO_SYNC_INTERVAL_SECONDS") or 3600)
|
|
SYNC_DAYS = int(os.environ.get("AUTO_SYNC_DAYS") or 2)
|
|
ENABLED = (os.environ.get("AUTO_SYNC") or "true").lower() not in ("0", "false", "no")
|
|
|
|
# The loop wakes on this cadence; whether an account is actually due is then
|
|
# decided per account from its own 同步频率 setting. A single global interval
|
|
# would mean one user's choice of 30 minutes silently applied to everyone.
|
|
TICK_SECONDS = 300
|
|
|
|
# A claim older than this is treated as abandoned — the worker holding it died
|
|
# mid-run, and without expiry the job would never run again.
|
|
CLAIM_TIMEOUT_SECONDS = 1800
|
|
|
|
_started = False
|
|
_lock = threading.Lock()
|
|
|
|
|
|
def _now():
|
|
return datetime.datetime.utcnow()
|
|
|
|
|
|
def _iso(dt):
|
|
return dt.isoformat(timespec="seconds")
|
|
|
|
|
|
def _parse(value):
|
|
if not value:
|
|
return None
|
|
try:
|
|
return datetime.datetime.fromisoformat(str(value).replace(" ", "T"))
|
|
except ValueError:
|
|
return None
|
|
|
|
|
|
def claim(name=JOB_NAME, interval=INTERVAL_SECONDS):
|
|
"""Take the job if it is due and nobody else holds it.
|
|
|
|
Returns True when this process should do the work.
|
|
"""
|
|
holder = f"{os.getpid()}"
|
|
now = _now()
|
|
row = query_one("SELECT * FROM job_locks WHERE name = ?", [name])
|
|
|
|
if row:
|
|
last_run = _parse(row.get("last_run_at"))
|
|
if last_run and (now - last_run).total_seconds() < interval:
|
|
return False
|
|
claimed = _parse(row.get("claimed_at"))
|
|
if claimed and (now - claimed).total_seconds() < CLAIM_TIMEOUT_SECONDS:
|
|
return False
|
|
|
|
if DB_TYPE == "mariadb":
|
|
sql = ("INSERT INTO job_locks (name, holder, claimed_at) VALUES (?, ?, ?) "
|
|
"ON DUPLICATE KEY UPDATE holder=VALUES(holder), claimed_at=VALUES(claimed_at)")
|
|
else:
|
|
sql = ("INSERT INTO job_locks (name, holder, claimed_at) VALUES (?, ?, ?) "
|
|
"ON CONFLICT(name) DO UPDATE SET holder=excluded.holder, "
|
|
"claimed_at=excluded.claimed_at")
|
|
execute(sql, [name, holder, _iso(now)])
|
|
|
|
# Re-read: if another worker claimed between our check and our write, its
|
|
# holder is the one now recorded and we must stand down.
|
|
check = query_one("SELECT holder FROM job_locks WHERE name = ?", [name])
|
|
return bool(check and check.get("holder") == holder)
|
|
|
|
|
|
def release(name=JOB_NAME, ran=True):
|
|
if ran:
|
|
execute(
|
|
"UPDATE job_locks SET claimed_at = NULL, last_run_at = ? WHERE name = ?",
|
|
[_iso(_now()), name],
|
|
)
|
|
else:
|
|
execute("UPDATE job_locks SET claimed_at = NULL WHERE name = ?", [name])
|
|
|
|
|
|
def due_at(user_id):
|
|
"""When this account may next be synced automatically, or None if never.
|
|
|
|
None means auto-sync is switched off for them; a time in the past means
|
|
they are due now.
|
|
"""
|
|
prefs = settings_svc.get_raw(user_id)
|
|
if not prefs.get("auto_sync"):
|
|
return None
|
|
minutes = prefs.get("auto_sync_minutes") or (INTERVAL_SECONDS // 60)
|
|
last = _parse((garmin_svc.get_sync_status(user_id) or {}).get("lastSyncTime"))
|
|
if not last:
|
|
return _now() - datetime.timedelta(seconds=1)
|
|
return last + datetime.timedelta(minutes=minutes)
|
|
|
|
|
|
def sync_all_accounts(days=None, respect_schedule=False):
|
|
"""Sync every account that has a stored token. Returns a per-user result.
|
|
|
|
`respect_schedule` is what the background loop passes: it skips accounts
|
|
that have auto-sync off or that were synced recently enough. A direct call
|
|
(a manual "sync everything") leaves it False and syncs unconditionally.
|
|
|
|
When `days` is not provided, each account's saved `history_days` from
|
|
`user_settings` is used (the user's 历史范围 picker), falling back to
|
|
`SYNC_DAYS`. The scheduled loop always passes `days` explicitly — 历史范围
|
|
is the window for the manual 全量同步, not for a half-hourly tick.
|
|
"""
|
|
rows = query_all("SELECT user_id FROM garmin_tokens")
|
|
results = []
|
|
for row in rows:
|
|
uid = row["user_id"]
|
|
try:
|
|
if respect_schedule:
|
|
due = due_at(uid)
|
|
if due is None:
|
|
results.append({"user": uid, "status": "skipped",
|
|
"reason": "auto-sync off"})
|
|
continue
|
|
if due > _now():
|
|
results.append({"user": uid, "status": "skipped",
|
|
"reason": "not due"})
|
|
continue
|
|
# Resolve the sync window: prefer the user's saved history_days,
|
|
# then the caller override, then the global default.
|
|
if days is None:
|
|
# query_one returns a dict, so `s[0]` raised KeyError — caught
|
|
# by the per-account handler below, which meant every single
|
|
# scheduled tick failed for every account and nothing was ever
|
|
# synced automatically.
|
|
s = query_one(
|
|
"SELECT history_days FROM user_settings WHERE user_id = ?", (uid,)
|
|
)
|
|
user_days = s.get("history_days") if s else None
|
|
if user_days == 0:
|
|
user_days = 730 # 全部历史 → 最大范围
|
|
d = user_days if user_days is not None else SYNC_DAYS
|
|
else:
|
|
d = days
|
|
# Never poke Garmin while it is rate-limiting us — that is exactly
|
|
# what keeps the limit alive. Respect the persisted cooldown and sit
|
|
# this tick out.
|
|
blocked = garmin_svc.rate_limited_until(uid)
|
|
if blocked and blocked > _now():
|
|
results.append({
|
|
"user": uid, "status": "skipped", "reason": "rate-limited",
|
|
"retryAfterSeconds": int((blocked - _now()).total_seconds()),
|
|
})
|
|
continue
|
|
out = garmin_svc.sync_data(uid, {}, days=d)
|
|
results.append({"user": uid, "status": out.get("status"),
|
|
"records": out.get("recordsSynced")})
|
|
except Exception as e: # noqa: BLE001 - one account must not stop the rest
|
|
results.append({"user": uid, "status": "error", "error": str(e)[:200]})
|
|
return results
|
|
|
|
|
|
def _loop():
|
|
while True:
|
|
try:
|
|
if claim(interval=TICK_SECONDS):
|
|
try:
|
|
# Explicitly the recent window, never the user's 历史范围:
|
|
# that setting describes the manual 全量同步. Letting a
|
|
# half-hourly tick re-pull "全部历史" meant 730 days x ~7
|
|
# Garmin calls every 30 minutes, which is precisely what
|
|
# kept the account in a 429 loop.
|
|
sync_all_accounts(days=SYNC_DAYS, respect_schedule=True)
|
|
finally:
|
|
release()
|
|
except Exception as e: # noqa: BLE001 - the loop must outlive any single failure
|
|
print(f"[scheduler] tick failed: {e}")
|
|
# Checked more often than the interval so a worker that starts late
|
|
# still picks the job up promptly rather than waiting a full hour.
|
|
time.sleep(TICK_SECONDS)
|
|
|
|
|
|
def start():
|
|
"""Start the scheduler thread once per process."""
|
|
global _started
|
|
if not ENABLED:
|
|
print("[scheduler] disabled by AUTO_SYNC")
|
|
return
|
|
with _lock:
|
|
if _started:
|
|
return
|
|
_started = True
|
|
threading.Thread(target=_loop, daemon=True, name="auto-sync").start()
|
|
print(f"[scheduler] auto-sync every {INTERVAL_SECONDS}s, {SYNC_DAYS} day(s) back")
|
|
|
|
|
|
def status(user_id=None):
|
|
"""Scheduler state, and — when a user is named — their own next due time."""
|
|
row = query_one("SELECT * FROM job_locks WHERE name = ?", [JOB_NAME])
|
|
last = _parse(row.get("last_run_at")) if row else None
|
|
|
|
out = {
|
|
"enabled": ENABLED,
|
|
"intervalSeconds": INTERVAL_SECONDS,
|
|
"tickSeconds": TICK_SECONDS,
|
|
"days": SYNC_DAYS,
|
|
"lastRunAt": _iso(last) if last else None,
|
|
"nextRunAt": _iso(last + datetime.timedelta(seconds=TICK_SECONDS)) if last else None,
|
|
"running": bool(row and row.get("claimed_at")),
|
|
}
|
|
|
|
if user_id:
|
|
prefs = settings_svc.get_raw(user_id)
|
|
due = due_at(user_id)
|
|
out["account"] = {
|
|
"autoSync": bool(prefs.get("auto_sync")),
|
|
"intervalMinutes": prefs.get("auto_sync_minutes"),
|
|
"dueAt": _iso(due) if due else None,
|
|
}
|
|
return out
|