fix: fall back to full installer after delta update failure
Windows Package CI / package-fresh-install (push) Waiting to run
Windows Package CI / package-fresh-install (push) Waiting to run
This commit is contained in:
1 parent
13aa60c06a
commit
a870e0cbf9
3 files changed
+267
-54
No files matched your search
@@ -15,6 +15,11 @@
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Fixed
|
||||
|
||||
- 自动更新差量包下载、校验或启动失败时自动回退完整安装包,避免旧版本反复卡在失败的 delta 更新上。
|
||||
- 记录已启动的差量更新尝试;如果下次启动仍停留在旧版本,则跳过同一个 delta 并改用完整安装包。
|
||||
|
||||
### Added
|
||||
|
||||
- Dashboard 顶部新增“检查更新”按钮,可手动触发在线更新检查。
|
||||
|
||||
+139
-54
@@ -294,6 +294,74 @@ def _safe_delta_name(delta: dict[str, Any], download_url: str, version: str) ->
|
||||
return re.sub(r'[<>:"/\\|?*]+', "_", raw)
|
||||
|
||||
|
||||
def _delta_attempt_state_path(settings: UpdateSettings) -> Path:
|
||||
return settings.download_dir / "delta_attempt_state.json"
|
||||
|
||||
|
||||
def _delta_attempt_key(delta: dict[str, Any], current_version: str, latest_version: str) -> str:
|
||||
filename = str(delta.get("filename") or delta.get("url") or "").strip()
|
||||
sha = str(delta.get("sha256") or "").strip().lower()
|
||||
return "|".join([str(current_version), str(latest_version), filename, sha])
|
||||
|
||||
|
||||
def _read_delta_attempt_state(settings: UpdateSettings) -> dict[str, Any]:
|
||||
path = _delta_attempt_state_path(settings)
|
||||
try:
|
||||
obj = json.loads(path.read_text(encoding="utf-8-sig"))
|
||||
return obj if isinstance(obj, dict) else {}
|
||||
except Exception:
|
||||
return {}
|
||||
|
||||
|
||||
def _write_delta_attempt_state(settings: UpdateSettings, payload: dict[str, Any]) -> None:
|
||||
path = _delta_attempt_state_path(settings)
|
||||
try:
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
path.write_text(json.dumps(payload, ensure_ascii=False, indent=2), encoding="utf-8")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def _clear_delta_attempt_state(settings: UpdateSettings) -> None:
|
||||
try:
|
||||
_delta_attempt_state_path(settings).unlink(missing_ok=True)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def _should_skip_delta_after_previous_attempt(
|
||||
settings: UpdateSettings,
|
||||
delta: dict[str, Any],
|
||||
current_version: str,
|
||||
latest_version: str,
|
||||
) -> bool:
|
||||
state = _read_delta_attempt_state(settings)
|
||||
if state.get("status") != "started":
|
||||
return False
|
||||
if state.get("key") != _delta_attempt_key(delta, current_version, latest_version):
|
||||
return False
|
||||
return compare_versions(current_version, latest_version) < 0
|
||||
|
||||
|
||||
def _mark_delta_attempt_started(
|
||||
settings: UpdateSettings,
|
||||
delta: dict[str, Any],
|
||||
current_version: str,
|
||||
latest_version: str,
|
||||
delta_path: Path,
|
||||
) -> None:
|
||||
_write_delta_attempt_state(
|
||||
settings,
|
||||
{
|
||||
"status": "started",
|
||||
"key": _delta_attempt_key(delta, current_version, latest_version),
|
||||
"from_version": current_version,
|
||||
"to_version": latest_version,
|
||||
"filename": delta_path.name,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
def _safe_delta_path(raw_path: Any) -> str:
|
||||
rel = str(raw_path or "").replace("\\", "/").strip("/")
|
||||
parts = [part for part in rel.split("/") if part]
|
||||
@@ -516,69 +584,86 @@ def perform_forced_update(
|
||||
if not latest_version:
|
||||
raise UpdateError("manifest 缺少 version")
|
||||
if compare_versions(latest_version, current_version) <= 0:
|
||||
_clear_delta_attempt_state(settings)
|
||||
return UpdateResult("up_to_date", "已是最新版本", version=latest_version)
|
||||
|
||||
def launch_full_installer() -> UpdateResult:
|
||||
raw_url = str(manifest.get("url") or manifest.get("installer_url") or "").strip()
|
||||
if not raw_url:
|
||||
raise UpdateError("manifest 缺少 url")
|
||||
download_url = urljoin(settings.manifest_url, raw_url)
|
||||
_validate_installer_url(settings, download_url)
|
||||
expected_sha = str(manifest.get("sha256") or "").strip().lower()
|
||||
if settings.require_sha256 and not re.fullmatch(r"[0-9a-fA-F]{64}", expected_sha):
|
||||
raise UpdateError("manifest 缺少有效 sha256")
|
||||
|
||||
installer_name = _safe_installer_name(manifest, download_url, latest_version)
|
||||
installer_path = settings.download_dir / installer_name
|
||||
installer_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
download_file(download_url, installer_path, settings.timeout_seconds)
|
||||
|
||||
if expected_sha:
|
||||
actual_sha = _sha256(installer_path)
|
||||
if actual_sha.lower() != expected_sha.lower():
|
||||
try:
|
||||
installer_path.unlink()
|
||||
except Exception:
|
||||
pass
|
||||
raise UpdateError(f"sha256 校验失败: expected={expected_sha} actual={actual_sha}")
|
||||
|
||||
cmd = _build_installer_cmd(installer_path, settings.installer_args, latest_version)
|
||||
launch_installer(cmd)
|
||||
_clear_delta_attempt_state(settings)
|
||||
return UpdateResult(
|
||||
"update_started",
|
||||
f"发现新版本 {latest_version},已启动安装器",
|
||||
exit_required=True,
|
||||
version=latest_version,
|
||||
installer_path=installer_path,
|
||||
)
|
||||
|
||||
delta = _matching_delta(manifest, current_version, latest_version)
|
||||
if delta:
|
||||
if delta and not _should_skip_delta_after_previous_attempt(settings, delta, current_version, latest_version):
|
||||
raw_delta_url = str(delta.get("url") or "").strip()
|
||||
delta_sha = str(delta.get("sha256") or "").strip().lower()
|
||||
if raw_delta_url and (not settings.require_sha256 or re.fullmatch(r"[0-9a-fA-F]{64}", delta_sha)):
|
||||
delta_url = urljoin(settings.manifest_url, raw_delta_url)
|
||||
_validate_download_url(settings, delta_url, "差量包")
|
||||
delta_name = _safe_delta_name(delta, delta_url, latest_version)
|
||||
delta_path = settings.download_dir / delta_name
|
||||
delta_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
download_file(delta_url, delta_path, settings.timeout_seconds)
|
||||
if delta_sha:
|
||||
actual_sha = _sha256(delta_path)
|
||||
if actual_sha.lower() != delta_sha:
|
||||
try:
|
||||
delta_path.unlink()
|
||||
except Exception:
|
||||
pass
|
||||
raise UpdateError(f"差量包 sha256 校验失败: expected={delta_sha} actual={actual_sha}")
|
||||
validate_delta_package(delta_path, current_version=current_version, latest_version=latest_version)
|
||||
launch_delta_update(delta_path, latest_version)
|
||||
return UpdateResult(
|
||||
"delta_update_started",
|
||||
f"发现新版本 {latest_version},已启动差量更新",
|
||||
exit_required=True,
|
||||
version=latest_version,
|
||||
delta_path=delta_path,
|
||||
)
|
||||
|
||||
raw_url = str(manifest.get("url") or manifest.get("installer_url") or "").strip()
|
||||
if not raw_url:
|
||||
raise UpdateError("manifest 缺少 url")
|
||||
download_url = urljoin(settings.manifest_url, raw_url)
|
||||
_validate_installer_url(settings, download_url)
|
||||
expected_sha = str(manifest.get("sha256") or "").strip().lower()
|
||||
if settings.require_sha256 and not re.fullmatch(r"[0-9a-fA-F]{64}", expected_sha):
|
||||
raise UpdateError("manifest 缺少有效 sha256")
|
||||
|
||||
installer_name = _safe_installer_name(manifest, download_url, latest_version)
|
||||
installer_path = settings.download_dir / installer_name
|
||||
installer_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
download_file(download_url, installer_path, settings.timeout_seconds)
|
||||
|
||||
if expected_sha:
|
||||
actual_sha = _sha256(installer_path)
|
||||
if actual_sha.lower() != expected_sha.lower():
|
||||
try:
|
||||
installer_path.unlink()
|
||||
delta_url = urljoin(settings.manifest_url, raw_delta_url)
|
||||
_validate_download_url(settings, delta_url, "差量包")
|
||||
delta_name = _safe_delta_name(delta, delta_url, latest_version)
|
||||
delta_path = settings.download_dir / delta_name
|
||||
delta_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
download_file(delta_url, delta_path, settings.timeout_seconds)
|
||||
if delta_sha:
|
||||
actual_sha = _sha256(delta_path)
|
||||
if actual_sha.lower() != delta_sha:
|
||||
try:
|
||||
delta_path.unlink()
|
||||
except Exception:
|
||||
pass
|
||||
raise UpdateError(f"差量包 sha256 校验失败: expected={delta_sha} actual={actual_sha}")
|
||||
validate_delta_package(delta_path, current_version=current_version, latest_version=latest_version)
|
||||
_mark_delta_attempt_started(settings, delta, current_version, latest_version, delta_path)
|
||||
launch_delta_update(delta_path, latest_version)
|
||||
return UpdateResult(
|
||||
"delta_update_started",
|
||||
f"发现新版本 {latest_version},已启动差量更新",
|
||||
exit_required=True,
|
||||
version=latest_version,
|
||||
delta_path=delta_path,
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
raise UpdateError(f"sha256 校验失败: expected={expected_sha} actual={actual_sha}")
|
||||
_write_delta_attempt_state(
|
||||
settings,
|
||||
{
|
||||
"status": "failed",
|
||||
"key": _delta_attempt_key(delta, current_version, latest_version),
|
||||
"from_version": current_version,
|
||||
"to_version": latest_version,
|
||||
},
|
||||
)
|
||||
|
||||
cmd = _build_installer_cmd(installer_path, settings.installer_args, latest_version)
|
||||
launch_installer(cmd)
|
||||
return UpdateResult(
|
||||
"update_started",
|
||||
f"发现新版本 {latest_version},已启动安装器",
|
||||
exit_required=True,
|
||||
version=latest_version,
|
||||
installer_path=installer_path,
|
||||
)
|
||||
return launch_full_installer()
|
||||
|
||||
|
||||
def run_startup_update_check(
|
||||
|
||||
@@ -205,6 +205,129 @@ def test_forced_update_prefers_matching_delta_package(tmp_path):
|
||||
assert result.delta_path == launched[0]
|
||||
|
||||
|
||||
def test_forced_update_falls_back_to_full_installer_when_delta_download_fails(tmp_path):
|
||||
from douyin.updater.force_update import UpdateSettings, perform_forced_update
|
||||
|
||||
full_payload = b"full installer"
|
||||
full_sha = hashlib.sha256(full_payload).hexdigest()
|
||||
settings = UpdateSettings(enabled=True, manifest_url="https://example.test/update.json", download_dir=tmp_path)
|
||||
downloaded: list[str] = []
|
||||
launched: list[list[str]] = []
|
||||
|
||||
def fetch_manifest(url: str, timeout: float) -> dict:
|
||||
return {
|
||||
"version": "3.3.4",
|
||||
"url": "https://example.test/DouyinGuaji-3.3.4-Setup.exe",
|
||||
"filename": "DouyinGuaji-3.3.4-Setup.exe",
|
||||
"sha256": full_sha,
|
||||
"delta": {
|
||||
"from_version": "3.3.3",
|
||||
"to_version": "3.3.4",
|
||||
"url": "https://example.test/DouyinGuaji-3.3.3_to_3.3.4_delta.zip",
|
||||
"filename": "DouyinGuaji-3.3.3_to_3.3.4_delta.zip",
|
||||
"sha256": "1" * 64,
|
||||
},
|
||||
}
|
||||
|
||||
def download(url: str, dest: Path, timeout: float) -> None:
|
||||
downloaded.append(url)
|
||||
if url.endswith("_delta.zip"):
|
||||
raise OSError("network interrupted")
|
||||
dest.write_bytes(full_payload)
|
||||
|
||||
result = perform_forced_update(
|
||||
settings,
|
||||
current_version="3.3.3",
|
||||
fetch_manifest=fetch_manifest,
|
||||
download_file=download,
|
||||
launch_installer=lambda cmd: launched.append(cmd),
|
||||
launch_delta_update=lambda path, version: pytest.fail("should not launch broken delta"),
|
||||
)
|
||||
|
||||
assert result.status == "update_started"
|
||||
assert downloaded == [
|
||||
"https://example.test/DouyinGuaji-3.3.3_to_3.3.4_delta.zip",
|
||||
"https://example.test/DouyinGuaji-3.3.4-Setup.exe",
|
||||
]
|
||||
assert launched
|
||||
assert launched[0][0] == str(tmp_path / "DouyinGuaji-3.3.4-Setup.exe")
|
||||
|
||||
|
||||
def test_forced_update_skips_delta_after_previous_started_attempt_still_old_version(tmp_path):
|
||||
from douyin.updater.force_update import UpdateSettings, perform_forced_update
|
||||
|
||||
import zipfile
|
||||
|
||||
full_payload = b"full installer"
|
||||
full_sha = hashlib.sha256(full_payload).hexdigest()
|
||||
file_payload = b"new exe"
|
||||
file_sha = hashlib.sha256(file_payload).hexdigest()
|
||||
delta_zip = tmp_path / "delta-source.zip"
|
||||
with zipfile.ZipFile(delta_zip, "w") as zf:
|
||||
zf.writestr(
|
||||
"manifest.json",
|
||||
json.dumps(
|
||||
{
|
||||
"schema": 1,
|
||||
"from_version": "3.3.3",
|
||||
"to_version": "3.3.4",
|
||||
"files": [{"path": "DouyinGuajiGUI.exe", "sha256": file_sha, "size": len(file_payload)}],
|
||||
"delete": [],
|
||||
},
|
||||
ensure_ascii=False,
|
||||
),
|
||||
)
|
||||
zf.writestr("files/DouyinGuajiGUI.exe", file_payload)
|
||||
delta_payload = delta_zip.read_bytes()
|
||||
delta_sha = hashlib.sha256(delta_payload).hexdigest()
|
||||
settings = UpdateSettings(enabled=True, manifest_url="https://example.test/update.json", download_dir=tmp_path)
|
||||
launched_installers: list[list[str]] = []
|
||||
launched_deltas: list[Path] = []
|
||||
|
||||
manifest = {
|
||||
"version": "3.3.4",
|
||||
"url": "https://example.test/DouyinGuaji-3.3.4-Setup.exe",
|
||||
"filename": "DouyinGuaji-3.3.4-Setup.exe",
|
||||
"sha256": full_sha,
|
||||
"delta": {
|
||||
"from_version": "3.3.3",
|
||||
"to_version": "3.3.4",
|
||||
"url": "https://example.test/DouyinGuaji-3.3.3_to_3.3.4_delta.zip",
|
||||
"filename": "DouyinGuaji-3.3.3_to_3.3.4_delta.zip",
|
||||
"sha256": delta_sha,
|
||||
},
|
||||
}
|
||||
|
||||
def download(url: str, dest: Path, timeout: float) -> None:
|
||||
if url.endswith("_delta.zip"):
|
||||
dest.write_bytes(delta_payload)
|
||||
else:
|
||||
dest.write_bytes(full_payload)
|
||||
|
||||
first = perform_forced_update(
|
||||
settings,
|
||||
current_version="3.3.3",
|
||||
fetch_manifest=lambda url, timeout: manifest,
|
||||
download_file=download,
|
||||
launch_installer=lambda cmd: pytest.fail("first attempt should prefer delta"),
|
||||
launch_delta_update=lambda path, version: launched_deltas.append(path),
|
||||
)
|
||||
|
||||
second = perform_forced_update(
|
||||
settings,
|
||||
current_version="3.3.3",
|
||||
fetch_manifest=lambda url, timeout: manifest,
|
||||
download_file=download,
|
||||
launch_installer=lambda cmd: launched_installers.append(cmd),
|
||||
launch_delta_update=lambda path, version: pytest.fail("second attempt should skip failed delta"),
|
||||
)
|
||||
|
||||
assert first.status == "delta_update_started"
|
||||
assert launched_deltas == [tmp_path / "DouyinGuaji-3.3.3_to_3.3.4_delta.zip"]
|
||||
assert second.status == "update_started"
|
||||
assert launched_installers
|
||||
|
||||
|
||||
def test_forced_update_accepts_signed_manifest(tmp_path, monkeypatch):
|
||||
from douyin.updater import force_update
|
||||
from douyin.updater.force_update import UpdateSettings, perform_forced_update
|
||||
|
||||
Reference in new issue
Block a user