i更新
This commit is contained in:
+28
-6
@@ -220,6 +220,7 @@ class ConfigBody(BaseModel):
|
||||
|
||||
|
||||
class ReleaseBody(BaseModel):
|
||||
package_media_id: str = ""
|
||||
latest_version: str
|
||||
download_url: str = ""
|
||||
release_notes: str = ""
|
||||
@@ -443,13 +444,13 @@ def create_app(
|
||||
).strip().rstrip("/")
|
||||
return (configured or zyt_auth.api_base_url(), bool(configured))
|
||||
|
||||
def release_payload(row: Any) -> dict[str, Any]:
|
||||
def release_payload(row: Any, *, direct_download: bool = False) -> dict[str, Any]:
|
||||
keys = set(row.keys()) if hasattr(row, "keys") else set()
|
||||
|
||||
def value(name: str, default: Any = "") -> Any:
|
||||
return row[name] if name in keys else default
|
||||
|
||||
return {
|
||||
result = {
|
||||
"latest_version": str(value("latest_version")),
|
||||
"download_url": str(value("download_url")),
|
||||
"release_notes": str(value("release_notes")),
|
||||
@@ -468,6 +469,17 @@ def create_app(
|
||||
),
|
||||
}
|
||||
|
||||
identity = app.state.archive_store.release_package_identity(result['download_url'])
|
||||
result['package_media_id'] = identity[0] if identity else ''
|
||||
if direct_download and identity:
|
||||
try:
|
||||
result['download_url'] = app.state.archive_store.release_package_download_url(*identity)
|
||||
except (KeyError, ValueError, RuntimeError) as exc:
|
||||
raise HTTPException(status_code=409, detail=f"COS 安装包暂不可用:{exc}") from exc
|
||||
except Exception as exc:
|
||||
raise HTTPException(status_code=502, detail="COS 下载地址生成失败,请重试") from exc
|
||||
return result
|
||||
|
||||
# ── 桌面账号认证 ─────────────────────────────────────────────────────
|
||||
@app.get("/api/v2/desktop/auth/config")
|
||||
async def desktop_auth_config() -> dict:
|
||||
@@ -1009,7 +1021,7 @@ def create_app(
|
||||
# ── 桌面端版本升级 ───────────────────────────────────────────────────
|
||||
@app.get("/api/v2/release")
|
||||
async def get_release(_: Principal = Depends(require("config:read"))) -> dict:
|
||||
return release_payload(database.release())
|
||||
return release_payload(database.release(), direct_download=True)
|
||||
|
||||
@app.post("/api/v2/release")
|
||||
async def save_release(
|
||||
@@ -1018,10 +1030,13 @@ def create_app(
|
||||
principal: Principal = Depends(require("release:write")),
|
||||
) -> dict:
|
||||
try:
|
||||
download_url = app.state.archive_store.normalize_release_download(
|
||||
body.download_url, body.package_sha256, body.package_size, body.package_media_id
|
||||
)
|
||||
release = backend.validate_release_form(
|
||||
{
|
||||
"latest_version": body.latest_version,
|
||||
"download_url": body.download_url,
|
||||
"download_url": download_url,
|
||||
"release_notes": body.release_notes,
|
||||
"force_upgrade": "1" if body.force_upgrade else "",
|
||||
"auto_install": "1" if body.auto_install else "",
|
||||
@@ -1035,6 +1050,8 @@ def create_app(
|
||||
)
|
||||
except ValueError as exc:
|
||||
raise HTTPException(status_code=400, detail=str(exc)) from exc
|
||||
except RuntimeError as exc:
|
||||
raise HTTPException(status_code=409, detail=str(exc)) from exc
|
||||
database.save_release(
|
||||
release["latest_version"],
|
||||
release["download_url"],
|
||||
@@ -1050,7 +1067,7 @@ def create_app(
|
||||
rollout_percent=release["rollout_percent"],
|
||||
status=release["status"],
|
||||
)
|
||||
return {"ok": True, **release}
|
||||
return {"ok": True, **release_payload(database.release(), direct_download=True)}
|
||||
|
||||
@app.post("/api/v2/release/package/prepare")
|
||||
async def prepare_release_package(
|
||||
@@ -1195,7 +1212,11 @@ def create_app(
|
||||
eligible and app_version.is_newer_version(latest, current_version)
|
||||
)
|
||||
download_url = release["download_url"]
|
||||
if download_url.startswith("/"):
|
||||
identity = app.state.archive_store.release_package_identity(download_url)
|
||||
if identity:
|
||||
# Each check gets a fresh COS HTTPS URL, including old release rows.
|
||||
download_url = release_payload(release, direct_download=True)["download_url"] if update_available else ""
|
||||
elif download_url.startswith("/"):
|
||||
forwarded_scheme = str(
|
||||
request.headers.get("x-forwarded-proto") or request.url.scheme
|
||||
).split(",", 1)[0].strip()
|
||||
@@ -1215,6 +1236,7 @@ def create_app(
|
||||
return {
|
||||
**release,
|
||||
"download_url": download_url,
|
||||
"download_url_expires_in": 900 if identity and update_available else 0,
|
||||
"update_available": update_available,
|
||||
"eligible": eligible,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user