Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(update): 旧客户端兼容门槛与完整包回退

longmeidao4c812ee2e49b
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1d9aa956..f1da42dda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,10 @@ Removed / Fixed / Security。
## [未发布]
+### 修复
+
+- **更新**:应用更新包与已装版本的更新器对不上时,改为下载同版本的完整包,不再停在「更新包工具清单无效」;以后随包工具增减也不会卡住自动更新。
+
## [0.48.2] - 2026-10-24
已安装的 Windows 版请手动下载并运行一次完整安装包:人脸模型改随安装包分发,旧版自动更新器跨不过这次升级,之后照常自动更新。
diff --git a/docs/OPERATIONS.md b/docs/OPERATIONS.md
index a78a282dd..84c0d747f 100644
--- a/docs/OPERATIONS.md
+++ b/docs/OPERATIONS.md
@@ -97,6 +97,8 @@ GitLab 标签流水线通过 R2 暂存传递媒体工具、Windows 发行目录
Windows 轻量安装器缺少本地工具包时,先从 R2 下载当前版本的工具;连接失败或内容校验失败时,尝试 GitHub 的同版本文件。两个来源均须匹配安装器内置清单的大小与 SHA-256,不能混用其他版本。发布完成后,用 `scripts/smoke_split_update.py` 的 `--prepare-with-app --online` 在空缓存中运行实际制品,核对联网取得的工具能否重建完整程序。GitLab Release 的下载表使用 R2,资产区另列 GitGud 副本,文档链接指向对应版本标签。
+已装的独立包用自己的代码读新版本的发布条目与更新包,发版时改不了。`build-windows` 拆包后运行 `scripts/update_compat.py`,用 0.48.0 起每个已发布版本标签里的更新代码原样读这一版:选不中新版本、读不了工具清单,或清单里有旧版不认得、运行时又补不齐的工具时,作业失败,不上传任何文件。本机测试用合成制品跑同一道核对,检出须带发布标签。客户端只准备自己认得、清单里也有的工具;应用更新包用不了时改下同版本完整包。0.47.3 及更早的版本读不了 0.48 起的清单,需手动运行一次完整安装包。依据见 [ADR-0120](adr/0120-standalone-update-client-compatibility.md)。
+
双后端发布复用官方 `glab packages upload`,将安装包、工具包、对应源码与 SHA-256 清单保存在 `peach-release/<版本标签>/`。上传前验证本地文件与 R2 发行清单一致,上传后检查 GitGud 服务端记录的大小与 SHA-256;同版本同名同内容直接复用,内容不同则保留原文件并停止。R2 保留原下载路径,GitGud Release 的备用直链使用 `/gitgud/<文件名>`,避免与主要下载入口冲突。两份存储均就绪后才登记 Release;官网继续优先从 Cloudflare 下载。
R2 公网下载流量免费,存储与请求按账户共享额度计费。预算告警只通知,不会停止服务;R2 后端不提供零费用硬封顶。要求绝不产生按量费用的部署应使用不绑定按量计费的下载服务,不启用 R2 自动发布。
diff --git a/docs/adr/0120-standalone-update-client-compatibility.md b/docs/adr/0120-standalone-update-client-compatibility.md
new file mode 100644
index 000000000..e01144c08
--- /dev/null
+++ b/docs/adr/0120-standalone-update-client-compatibility.md
@@ -0,0 +1,33 @@
+# ADR-0120:独立包更新对旧客户端的兼容门槛
+
+- 状态:已采纳
+- 日期:2026-10-24
+- 关系:补充 [ADR-0012](0012-version-and-update-boundary.md) 的更新边界与 [ADR-0119](0119-mainline-changed-scope-release-full-suite.md) 的发布门槛
+
+## 背景
+
+独立 Windows 包的在线更新由已装版本自己的代码完成:`release_updates.check` 读 `releases.json` 选包,选中应用更新包时由 `update_packages.read_manifest` 读包里的 `update-manifest.json`,再按清单复用或下载各工具包。这段代码装在用户机器上,发版时改不了。
+
+0.42.0 到 0.47.3 的 `read_manifest` 要求清单里的工具集合与它认得的完全相等。0.48.0 往清单里加了人脸模型,这批客户端下载完 108 MB 的更新包后一律报「更新包工具清单无效」,只能手动装完整包。0.48.0 起的读法允许多出工具,但仍要求它认得的工具一个不少:哪天删掉一个工具,0.48.x 会以同样方式卡住。发布流程里没有任何一步拿旧客户端的代码去读新包,问题要等用户点了更新才暴露。
+
+## 决策
+
+**一、清单按交集读。** 客户端只准备自己认得、清单里也有的工具:清单多出的工具不下载,清单少了的工具视为新版本不再需要。旧客户端不认得的新工具装好后要由运行时自己补齐,这类工具登记在 `update_packages.SELF_PROVISIONED`(目前是人脸模型,缺失时由 `face_models` 下载)。
+
+**二、应用更新包用不了就改下完整包。** `release_updates.check` 同时给出同版本完整包的地址、大小与摘要。应用更新包的清单读不了、格式不认得或工具包校验失败时,`standalone_update.prepare` 改下完整包解压到同一个暂存目录。完整包自带全部工具,不经清单,所以以后清单格式再怎么变,这一版起的客户端都还有一条能走通的路。
+
+**三、发布门槛:旧版本的更新代码原样读新版本。** `scripts/update_compat.py` 对每个不早于 `OLDEST_CLIENT`、早于本版的版本标签,用 `git archive` 取出那一版的 `src/peach`,在独立进程里只导入那一版的 `release_updates` 与 `update_packages`,把网络换成本次的发布条目,核对三件事:
+
+1. 检查结果是有更新,并选中本版;
+2. 选中应用更新包时,读得了本版的工具清单;
+3. 清单里那一版不认得的工具都登记在 `SELF_PROVISIONED`。
+
+有一个版本过不了就拒绝。门槛跑两处:`tests/test_standalone_update.py` 用打包代码合成的制品跑,改动在提交阶段就被拦下;标签流水线的 `build-windows` 在拆包后用真实制品再跑一遍,在任何文件上传之前。检出必须带发布标签,取不到旧版本标签时门槛失败,不跳过。
+
+**四、放弃旧客户端要显式改下限。** `OLDEST_CLIENT` 定为 0.48.0:0.47.3 及更早的版本要求工具集合完全相等,与 0.48 起的清单无法同时满足,只能手动装一次完整包。以后确需放弃一批客户端时,改这个常量,并在变更日志里写明受影响的版本与手动升级方法。
+
+## 已拒绝方案
+
+- **冻结清单的 `tools` 为最初三项,新工具另起一个键**:0.48.x 要求人脸模型在 `tools` 里,0.47.x 要求 `tools` 恰好三项,同一份清单两边无法同时满足;冻结只是把卡住的人从一批换成另一批。
+- **只在文档里约定「清单只增不减」**:这次的问题正是约定不在任何门槛里;`update_compat.py` 把约定写成拒绝。
+- **在标签流水线里装上一版的独立包、实际跑一次升级**:能多覆盖替换与迁移阶段,但旧客户端把检查地址写死为公开下载入口,没有可指向待发布制品的开关;取证成本高,留待替换阶段出现兼容问题时再做。替换阶段的助手由已装版本复制自身执行,新版本只提供暂存目录的内容,与清单无关。
diff --git a/scripts/ci_windows.ps1 b/scripts/ci_windows.ps1
index 332ad5d30..2bb4f3e0c 100644
--- a/scripts/ci_windows.ps1
+++ b/scripts/ci_windows.ps1
@@ -55,6 +55,8 @@ if ($Mode -eq 'build') {
New-Item -ItemType Directory -Path release -Force | Out-Null
& .venv/Scripts/python.exe scripts/package_windows_release.py --source dist/Peach --output release --version $Version --lite-installer
Assert-Exit '发行包拆分失败'
+ & .venv/Scripts/python.exe scripts/update_compat.py --packages release --version $Version
+ Assert-Exit '支持范围内的旧版客户端装不上这一版'
Copy-Item -LiteralPath "dist/Peach-$Version-windows-x64-setup.exe" -Destination release/
Copy-Item -LiteralPath dist/ffmpeg-corresponding-source.zip, dist/untrunc-corresponding-source.zip -Destination release/
Copy-Item -LiteralPath scripts/smoke_desktop.py, scripts/smoke_update_tasks.py, scripts/smoke_split_update.py, scripts/ci_windows.ps1 -Destination release/
diff --git a/scripts/update_compat.py b/scripts/update_compat.py
new file mode 100644
index 000000000..e5b4fce49
--- /dev/null
+++ b/scripts/update_compat.py
@@ -0,0 +1,141 @@
+"""发布前核对:仍在支持范围内的旧版独立包,用它们自己的更新代码能不能装上这一版。
+
+旧客户端的更新代码装在用户机器上,改不了;能改的只有这一版发出去的发布条目与更新包。
+所以拿每个旧版本标签里的 `release_updates` 与 `update_packages` 原样去读这一版:选得中新版本,
+选中应用更新包时读得了它的工具清单,清单里旧版不认得的工具都是运行时自己能补齐的
+(`update_packages.SELF_PROVISIONED`)。有一个旧版本过不了就拒绝发布(ADR-0120)。
+
+本机测试用打包代码合成的制品跑这道核对,构建作业用真实制品再跑一遍。
+"""
+from __future__ import annotations
+
+import argparse
+import hashlib
+import io
+import json
+from pathlib import Path
+import re
+import subprocess
+import sys
+import tarfile
+import tempfile
+import zipfile
+
+ROOT = Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(ROOT / "src"))
+from peach.update_packages import MANIFEST, SELF_PROVISIONED # noqa: E402
+
+#: 支持自动更新到新版的最旧客户端。更早的版本要求工具集合与它认得的完全相等,0.48.0 加入人脸
+#: 模型后它们只能手动装一次完整包。放弃一批旧客户端要改这里,并在变更日志里写明怎么手动升级。
+OLDEST_CLIENT = "0.48.0"
+
+#: 在旧版本的源码树里执行:只走它自己的检查与清单读取,网络换成本次的发布条目。
+PROBE = r"""
+import json, sys, tempfile
+from pathlib import Path
+from types import SimpleNamespace
+sys.path.insert(0, sys.argv[1])
+import peach
+if not Path(peach.__file__).resolve().is_relative_to(Path(sys.argv[1]).resolve()):
+ raise SystemExit(f"导入的不是旧版本源码:{peach.__file__}")
+from peach import release_updates, update_packages
+payload = json.load(sys.stdin)
+def transport(request, *_):
+ if request.url == release_updates.DOWNLOADS_API:
+ return SimpleNamespace(status=200, headers={}, body=json.dumps(payload["rows"]).encode(), url=request.url)
+ return SimpleNamespace(status=404, headers={}, body=b"", url=request.url)
+release = release_updates.check(transport=transport)
+result = {"state": release.get("state"), "latest": release.get("latest_version"),
+ "kind": release.get("package_kind"), "tools": sorted(update_packages.TOOL_PATHS)}
+if release.get("package_kind") == "update":
+ with tempfile.TemporaryDirectory() as stage:
+ Path(stage, update_packages.MANIFEST).write_text(json.dumps(payload["manifest"]), encoding="utf-8")
+ try:
+ update_packages.read_manifest(Path(stage), payload["version"])
+ except Exception as exc:
+ result["error"] = f"{type(exc).__name__}: {exc}"
+print(json.dumps(result, ensure_ascii=False))
+"""
+
+
+def _version(value: str) -> tuple[int, ...]:
+ return tuple(map(int, value.removeprefix("v").split(".")))
+
+
+def client_tags(root: Path, version: str, oldest: str = OLDEST_CLIENT) -> list[str]:
+ """已发布、不早于 `oldest`、早于本版的版本标签。"""
+ listed = subprocess.run(["git", "-C", str(root), "tag", "--list", "v*"], capture_output=True, text=True, check=True)
+ tags = [tag for tag in listed.stdout.split() if re.fullmatch(r"v\d+\.\d+\.\d+", tag)
+ and _version(oldest) <= _version(tag) < _version(version)]
+ if not tags:
+ raise ValueError(f"没有可核对的旧版本标签({oldest} 起);检出须带发布标签")
+ return sorted(tags, key=_version)
+
+
+def release_row(packages: Path, version: str) -> dict:
+ """这一版在 `releases.json` 里的那一条,字段同 `release_r2.publish` 写出的。"""
+ assets = []
+ for path in sorted(packages.glob(f"Peach-{version}-windows-x64*")):
+ if path.is_file() and path.suffix in {".zip", ".exe"}:
+ with path.open("rb") as source:
+ checksum = hashlib.file_digest(source, "sha256").hexdigest()
+ assets.append({"name": path.name, "size": path.stat().st_size, "sha256": checksum,
+ "digest": "sha256:" + checksum, "state": "uploaded"})
+ return {"tag_name": "v" + version, "draft": False, "prerelease": True, "assets": assets}
+
+
+def package_manifest(packages: Path, version: str) -> dict:
+ with zipfile.ZipFile(packages / f"Peach-{version}-windows-x64-update.zip") as package:
+ return json.loads(package.read("Peach/" + MANIFEST))
+
+
+def probe(root: Path, tag: str, payload: dict) -> dict:
+ with tempfile.TemporaryDirectory(prefix="peach-update-compat-") as folder:
+ exported = subprocess.run(["git", "-C", str(root), "archive", "--format=tar", tag, "src/peach"],
+ capture_output=True, check=True).stdout
+ with tarfile.open(fileobj=io.BytesIO(exported)) as archive:
+ archive.extractall(folder, filter="data")
+ completed = subprocess.run([sys.executable, "-I", "-X", "utf8", "-c", PROBE, str(Path(folder) / "src")],
+ input=json.dumps(payload), capture_output=True, text=True, encoding="utf-8")
+ if completed.returncode != 0:
+ return {"error": (completed.stderr or completed.stdout).strip().splitlines()[-1:] or ["无输出"]}
+ return json.loads(completed.stdout.strip().splitlines()[-1])
+
+
+def check_clients(root: Path, rows: list[dict], manifest: dict, version: str,
+ oldest: str = OLDEST_CLIENT) -> dict[str, list[str]]:
+ """逐个旧版本核对;返回每个过不了的版本与原因,全部通过时为空。"""
+ payload = {"rows": rows, "manifest": manifest, "version": version}
+ problems: dict[str, list[str]] = {}
+ for tag in client_tags(root, version, oldest):
+ result, reasons = probe(root, tag, payload), []
+ if result.get("state") != "available" or result.get("latest") != version:
+ reasons.append(f"检查结果是 {result.get('state')}、{result.get('latest')},选不中 {version}")
+ if result.get("error"):
+ reasons.append(f"读不了这一版:{result['error']}")
+ if result.get("kind") == "update":
+ orphaned = set(manifest.get("tools", {})) - set(result.get("tools", [])) - SELF_PROVISIONED
+ if orphaned:
+ reasons.append("清单里有它不认得、运行时也补不齐的工具:" + "、".join(sorted(orphaned)))
+ if reasons:
+ problems[tag] = reasons
+ return problems
+
+
+def verify(packages: Path, version: str, root: Path = ROOT) -> dict[str, list[str]]:
+ return check_clients(root, [release_row(packages, version)], package_manifest(packages, version), version)
+
+
+def main(argv: list[str] | None = None) -> int:
+ parser = argparse.ArgumentParser(description=__doc__)
+ parser.add_argument("--packages", type=Path, required=True, help="package_windows_release.py 的输出目录")
+ parser.add_argument("--version", required=True)
+ args = parser.parse_args(argv)
+ problems = verify(args.packages, args.version)
+ print(json.dumps({"version": args.version, "oldest_client": OLDEST_CLIENT, "problems": problems},
+ ensure_ascii=False, indent=2))
+ return 1 if problems else 0
+
+
+if __name__ == "__main__":
+ raise SystemExit(main())
diff --git a/src/peach/release_updates.py b/src/peach/release_updates.py
index e74ac928b..0e45d3e08 100644
--- a/src/peach/release_updates.py
+++ b/src/peach/release_updates.py
@@ -47,14 +47,14 @@ def _release_candidates(rows: list, endpoint: str) -> list[tuple]:
complete_tools = all(prefix + f"-tools-{tool}.zip" in uploaded for tool in TOOL_PATHS)
asset = uploaded.get(prefix + "-update.zip", full) if complete_tools else full
if endpoint == DOWNLOADS_API:
- if not re.fullmatch(r"sha256:[0-9a-f]{64}", asset.get("digest") or ""):
+ if not all(re.fullmatch(r"sha256:[0-9a-f]{64}", item.get("digest") or "") for item in (asset, full)):
continue
- asset_url = f"{DOWNLOADS_BASE}/{tag}/{asset['name']}"
+ directory = f"{DOWNLOADS_BASE}/{tag}"
release_url = f"{GITGUD_RELEASES}/{tag}"
else:
- asset_url = f"{RELEASES_URL}/download/{tag}/{asset['name']}"
+ directory = f"{RELEASES_URL}/download/{tag}"
release_url = f"{RELEASES_URL}/tag/{tag}"
- releases.append((version, tag, asset, full, asset_url, release_url))
+ releases.append((version, tag, asset, full, directory, release_url))
return releases
@@ -82,16 +82,19 @@ def check(*, transport=None) -> dict:
if not releases:
return dict(result, state="empty" if obtained else "error",
message="暂未找到可下载的测试版。" if obtained else "未能取得版本信息,请重试。")
- version, tag, asset, full, asset_url, release_url = max(releases, key=lambda item: item[0])
+ version, tag, asset, full, directory, release_url = max(releases, key=lambda item: item[0])
current = _version(result["current_version"])
if current is None:
raise ValueError("current version required")
state = "available" if version > current else "ahead" if version < current else "current"
message = {"available": "有新版本可下载。", "ahead": "当前版本高于已发布测试版。", "current": "已是最新测试版。"}[state]
return dict(result, latest_version=tag.removeprefix("v"), state=state, message=message,
- asset_url=asset_url,
+ asset_url=f"{directory}/{asset['name']}",
asset_size=asset.get("size", 0), asset_digest=asset.get("digest"),
package_kind="update" if asset is not full else "full",
+ # 应用更新包准备不下去(清单或工具包与本版更新器对不上)时改下的同版本完整包。
+ full_url=f"{directory}/{full['name']}", full_size=full.get("size", 0),
+ full_digest=full.get("digest"),
release_url=release_url)
except (OSError, ValueError, TypeError, TimeoutError, httpx.HTTPError):
return dict(result, state="error", message="未能取得版本信息,请重试。")
diff --git a/src/peach/standalone_update.py b/src/peach/standalone_update.py
index 7313c9af5..1d47a7a1c 100644
--- a/src/peach/standalone_update.py
+++ b/src/peach/standalone_update.py
@@ -158,37 +158,58 @@ def prepare_tools(stage: Path, target: Path, transaction: Path, release: dict, d
raise ValueError(f"{tool} 工具复用校验失败")
+def checked_asset(digest: object, size: object, label: str) -> tuple[str, int]:
+ if not isinstance(digest, str) or not digest.startswith("sha256:") or len(digest) != 71:
+ raise ValueError(f"{label}缺少 SHA-256 校验信息")
+ if not isinstance(size, int) or not 0 < size <= MAX_ARCHIVE:
+ raise ValueError(f"{label}大小无效")
+ return digest[7:], size
+
+
+def fetch_package(url: str, size: int, digest: str, transaction: Path, name: str, version: str, data: dict) -> Path:
+ """下载、校验程序包并解压到 `stage/Peach`(`apply` 只认这一处);进度接在已下载的字节数后面。"""
+ archive, start = transaction / f"{name}.zip", data.get("downloaded", 0)
+ download(url, archive, size, digest,
+ lambda count: write(data, downloaded=start + count, progress=round((start + count) / data["total"] * 65, 1)))
+ write(data, state="verifying", progress=66, message="正在校验")
+ write(data, state="extracting", message="正在解压")
+ shutil.rmtree(transaction / "stage", ignore_errors=True)
+ stage = extract(archive, transaction / "stage", lambda done, count: write(data, progress=67 + round(done / count * 8)))
+ from .buildinfo import read_build_info
+ info = read_build_info(stage / "_internal")
+ if not info or info.version != version:
+ raise ValueError("包内版本与发布版本不符")
+ return stage
+
+
def prepare(data: dict, lock: FileLock) -> None:
try:
release = release_updates.check()
if release["state"] != "available":
raise ValueError(release["message"])
- digest = release.get("asset_digest") or ""
- if not digest.startswith("sha256:") or len(digest) != 71:
- raise ValueError("更新包缺少 SHA-256 校验信息")
- total = release.get("asset_size", 0)
- if not isinstance(total, int) or not 0 < total <= MAX_ARCHIVE:
- raise ValueError("更新包大小无效")
+ digest, total = checked_asset(release.get("asset_digest"), release.get("asset_size", 0), "更新包")
target = Path(sys.executable).resolve().parent
if state_path().resolve().is_relative_to(target):
raise ValueError("数据目录位于程序目录内,不能自动替换")
transaction = target.parent / f".{target.name}-update-{data['id']}"
transaction.mkdir()
- write(data, transaction=str(transaction), target=str(target), version=release["latest_version"],
+ version = release["latest_version"]
+ write(data, transaction=str(transaction), target=str(target), version=version,
total=total, downloaded=0, message="正在下载", state="downloading")
- archive = transaction / "package.zip"
- download(release["asset_url"], archive, total, digest[7:],
- lambda count: write(data, downloaded=count, progress=round(count / total * 65, 1)))
- write(data, state="verifying", progress=66, message="正在校验")
- write(data, state="extracting", message="正在解压")
- stage = extract(archive, transaction / "stage", lambda done, count: write(data, progress=67 + round(done / count * 8)))
- from .buildinfo import read_build_info
- info = read_build_info(stage / "_internal")
- if not info or info.version != release["latest_version"]:
- raise ValueError("包内版本与发布版本不符")
+ stage = fetch_package(release["asset_url"], total, digest, transaction, "package", version, data)
if release.get("package_kind") == "update":
write(data, state="preparing", message="正在复用和校验已安装工具")
- prepare_tools(stage, target, transaction, release, data)
+ try:
+ prepare_tools(stage, target, transaction, release, data)
+ except (ValueError, KeyError, TypeError, FileNotFoundError) as exc:
+ # 清单格式、工具集合或工具包与本版更新器对不上:完整包自带全部工具,不经清单。
+ try:
+ full_digest, full_size = checked_asset(release.get("full_digest"), release.get("full_size", 0), "完整包")
+ except ValueError:
+ raise exc from None
+ write(data, state="downloading", total=data["downloaded"] + full_size,
+ message=f"应用更新包无法使用({exc}),改为下载完整包")
+ stage = fetch_package(release["full_url"], full_size, full_digest, transaction, "full", version, data)
write(data, state="preparing", progress=90, message="正在准备安装")
desktop_installer.carry_uninstaller(target, stage)
# 助手从自己的目录运行,正式目录与暂存目录都不会被它的 DLL 句柄占用。
diff --git a/src/peach/update_packages.py b/src/peach/update_packages.py
index 06c06f9f9..c50c578ca 100644
--- a/src/peach/update_packages.py
+++ b/src/peach/update_packages.py
@@ -14,6 +14,10 @@ TOOL_PATHS = {
"face-models": ("tools/face-models", {"face_detection_yunet_2023mar.onnx", "face_recognition_sface_2021dec.onnx",
"LICENSE-yunet.txt", "LICENSE-sface.txt", "manifest.json"}),
}
+#: 运行时自己能补齐的工具:旧版更新器不认得它、装好的新版里缺了它,由它自己的运行时下载
+#: (人脸模型见 `face_models`)。新版本往清单里加旧客户端不认得的工具,必须登记在这里,
+#: 否则 `scripts/update_compat.py` 拒绝发布(ADR-0120)。
+SELF_PROVISIONED = frozenset({"face-models"})
def digest(path: Path) -> str:
@@ -42,17 +46,17 @@ def matches(root: Path, files: dict[str, str]) -> bool:
def read_manifest(stage: Path, version: str) -> dict:
- """读更新包的工具清单,只留本版认得的工具。
+ """读更新包的工具清单,只留本版认得、清单里也有的工具。
- 清单可以多出本版不认得的工具:那是更新版本新增的工具包,这一版不下载,装好后由那个
- 工具自己的运行时兜底补齐。认得的工具一个都不能少。
+ 工具集合两个方向都可能变,哪一边都不拒:清单多出本版不认得的工具,是更新版本新增的
+ 工具包,这一版不下载,装好后由那个工具自己的运行时补齐(`SELF_PROVISIONED`);清单里
+ 少了本版认得的工具,是更新版本不再需要它,不准备也不校验。
"""
manifest = json.loads((stage / MANIFEST).read_text(encoding="utf-8"))
if (not isinstance(manifest, dict) or manifest.get("format") != 1 or manifest.get("version") != version
- or not isinstance(manifest.get("tools"), dict)
- or not set(TOOL_PATHS) <= set(manifest.get("tools", {}))):
+ or not isinstance(manifest.get("tools"), dict)):
raise ValueError("更新包工具清单无效")
- manifest["tools"] = {tool: manifest["tools"][tool] for tool in TOOL_PATHS}
+ manifest["tools"] = {tool: manifest["tools"][tool] for tool in TOOL_PATHS if tool in manifest["tools"]}
all_names: set[str] = set()
for tool, bundle in manifest["tools"].items():
if not isinstance(bundle, dict):
diff --git a/tests/test_release_updates.py b/tests/test_release_updates.py
index f7edf71aa..25ee2537b 100644
--- a/tests/test_release_updates.py
+++ b/tests/test_release_updates.py
@@ -80,6 +80,8 @@ class ReleaseUpdateTests(unittest.TestCase):
self.assertEqual(result["package_kind"], "update")
self.assertTrue(result["asset_url"].endswith("-update.zip"))
self.assertEqual(result["asset_size"], 123)
+ self.assertEqual(result["full_url"], release_updates.RELEASES_URL + "/download/v1.0.0/Peach-1.0.0-windows-x64.zip",
+ "应用更新包准备不下去时改下的同版本完整包")
row["assets"][1]["state"] = "new"
self.assertEqual(self.check([row])["package_kind"], "full")
row["assets"].pop(0)
diff --git a/tests/test_standalone_update.py b/tests/test_standalone_update.py
index 72ca31562..13dcf4c09 100644
--- a/tests/test_standalone_update.py
+++ b/tests/test_standalone_update.py
@@ -375,7 +375,7 @@ class StandaloneUpdateTests(unittest.TestCase):
self.assertEqual(binary.read_bytes(), b"old version")
self.assertEqual((target / "Peach.exe").read_bytes(), b"old application")
- def test_manifest_rejects_path_escape_tool_scope_collision_and_incomplete_tools(self):
+ def test_manifest_rejects_path_escape_tool_scope_collision_and_incomplete_tool_files(self):
source, output, manifest, target, archive, release = self.release_fixture()
for name in ("../escape.exe", "tools/ffmpeg/../../Peach.exe", "Peach.exe", "tools/untrunc/untrunc.exe",
"tools/ffmpeg/bin/FFMPEG.exe"):
@@ -385,9 +385,9 @@ class StandaloneUpdateTests(unittest.TestCase):
(source / update_packages.MANIFEST).write_text(json.dumps(invalid), encoding="utf-8")
with self.assertRaises(ValueError):
update_packages.read_manifest(source, "1.0.0")
- del manifest["tools"]["untrunc"]
+ del manifest["tools"]["untrunc"]["files"]["tools/untrunc/untrunc.exe"]
(source / update_packages.MANIFEST).write_text(json.dumps(manifest), encoding="utf-8")
- with self.assertRaises(ValueError):
+ with self.assertRaisesRegex(ValueError, "缺少必需文件"):
update_packages.read_manifest(source, "1.0.0")
def test_a_tool_this_version_does_not_know_is_left_out_not_refused(self):
@@ -399,6 +399,46 @@ class StandaloneUpdateTests(unittest.TestCase):
self.assertEqual(set(update_packages.read_manifest(source, "1.0.0")["tools"]),
set(update_packages.TOOL_PATHS))
+ def test_a_tool_the_new_version_dropped_is_neither_prepared_nor_required(self):
+ """更新版本不再需要的工具:清单里没有它就不准备,不当成清单残缺。"""
+ source, output, manifest, target, archive, release = self.release_fixture()
+ del manifest["tools"]["untrunc"]
+ (source / update_packages.MANIFEST).write_text(json.dumps(manifest), encoding="utf-8")
+ self.assertEqual(set(update_packages.read_manifest(source, "1.0.0")["tools"]),
+ set(update_packages.TOOL_PATHS) - {"untrunc"})
+
+ def test_an_update_package_this_updater_cannot_use_falls_back_to_the_full_package(self):
+ source, output, manifest, target, archive, release = self.release_fixture()
+ full = output / "Peach-1.0.0-windows-x64.zip"
+ release.update(full_url=release["asset_url"].rsplit("/", 1)[0] + "/" + full.name,
+ full_size=full.stat().st_size, full_digest="sha256:" + update_packages.digest(full))
+ (target / "cloudflared.exe").unlink()
+ with patch.object(update.update_packages, "read_manifest", side_effect=ValueError("更新包工具清单无效")):
+ state, requests = self.prepare_fixture(target, output, release)
+ self.assertEqual(state["state"], "ready", state)
+ self.assertEqual(requests, [archive.name, full.name], "清单读不了时不再下单个工具包")
+ self.assertEqual(Path(state["stage"]), Path(state["transaction"]) / "stage" / "Peach")
+ for bundle in manifest["tools"].values():
+ self.assertTrue(update_packages.matches(Path(state["stage"]), bundle["files"]))
+ self.assertEqual(state["downloaded"], state["total"])
+ self.assertEqual((target / "Peach.exe").read_bytes(), b"old application")
+
+ def test_supported_older_clients_can_install_this_release(self):
+ """旧版本标签里的更新代码原样读这一版的发布条目与更新包(ADR-0120)。"""
+ from scripts import update_compat
+ source, output, manifest, target, archive, release = self.release_fixture()
+ self.assertEqual(update_compat.verify(output, "1.0.0"), {})
+ rows = [update_compat.release_row(output, "1.0.0")]
+ strict = update_compat.check_clients(update_compat.ROOT, rows, manifest, "1.0.0", oldest="0.47.3")
+ self.assertIn("更新包工具清单无效", " ".join(strict["v0.47.3"]),
+ "0.47.x 要求工具集合完全相等,人脸模型加入后它读不了更新包")
+ future = json.loads(json.dumps(manifest))
+ future["tools"]["future-tool"] = {"files": {"tools/future/x.bin": "a" * 64}, "asset": {}}
+ orphaned = update_compat.check_clients(update_compat.ROOT, rows, future, "1.0.0")
+ self.assertTrue(orphaned)
+ for reasons in orphaned.values():
+ self.assertIn("future-tool", " ".join(reasons), "新增工具旧版不认得、又没登记为运行时补齐时拒绝发布")
+
def test_tool_archive_cannot_replace_application_files(self):
archive = self.archive(["Peach/tools/ffmpeg/bin/ffmpeg.exe", "Peach/Peach.exe"])
with self.assertRaisesRegex(ValueError, "清单外"):