fix(updater): sync release notes across update sources
This commit is contained in:
1 parent
68e7169f1d
commit
1b399a58d0
11 files changed
+190
-17
No files matched your search
@@ -403,7 +403,7 @@ fn build_plugin_status(
|
||||
|
||||
async fn latest_jdbc_plugin() -> Option<JdbcPluginLatest> {
|
||||
// 只需 jdbc_plugin,不关心 release notes;传中文 locale 跳过英文 notes 拉取
|
||||
fetch_latest_release("zh-CN").await.ok().and_then(|release| release.jdbc_plugin)
|
||||
fetch_latest_release("zh-CN", crate::DownloadSource::Official).await.ok().and_then(|release| release.jdbc_plugin)
|
||||
}
|
||||
|
||||
async fn download_jdbc_plugin_zip_with_progress(progress: &impl Fn(AgentProgressEvent)) -> Result<Vec<u8>, String> {
|
||||
|
||||
@@ -130,18 +130,26 @@ pub async fn race_download(
|
||||
github_url: &str,
|
||||
r2_path: &str,
|
||||
user_agent: &str,
|
||||
) -> Result<reqwest::Response, String> {
|
||||
race_download_urls(client, &download_candidate_urls(github_url, r2_path), user_agent).await
|
||||
}
|
||||
|
||||
pub async fn race_download_urls(
|
||||
client: &reqwest::Client,
|
||||
urls: &[String],
|
||||
user_agent: &str,
|
||||
) -> Result<reqwest::Response, String> {
|
||||
use futures::future::select_ok;
|
||||
|
||||
let urls = download_candidate_urls(github_url, r2_path);
|
||||
let mut futs: Vec<ResponseFuture> = Vec::with_capacity(urls.len());
|
||||
|
||||
for url in urls {
|
||||
let client = client.clone();
|
||||
let url = url.clone();
|
||||
let ua = user_agent.to_string();
|
||||
futs.push(Box::pin(async move {
|
||||
client
|
||||
.get(&url)
|
||||
.get(url)
|
||||
.header(reqwest::header::USER_AGENT, ua)
|
||||
.header(reqwest::header::ACCEPT_ENCODING, "identity")
|
||||
.send()
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
const LATEST_JSON_PATH: &str = "https://github.com/t8y2/dbx/releases/latest/download/latest.json";
|
||||
const LATEST_JSON_GITHUB_PATH: &str = "https://github.com/t8y2/dbx/releases/latest/download/latest.json";
|
||||
const LATEST_JSON_R2_PATH: &str = "releases/latest/latest.json";
|
||||
const LATEST_JSON_CNB_PATH: &str = "https://cnb.cool/dbxio.com/dbx/-/releases/latest/download/latest.json";
|
||||
const LATEST_EN_NOTES_R2_PATH: &str = "changelog/latest-en.json";
|
||||
const GITHUB_RELEASE_API_PREFIX: &str = "https://api.github.com/repos/t8y2/dbx/releases/tags/v";
|
||||
const RELEASE_URL_PREFIX: &str = "https://github.com/t8y2/dbx/releases/tag/v";
|
||||
@@ -46,12 +47,11 @@ pub struct UpdateInfo {
|
||||
pub release_notes: String,
|
||||
}
|
||||
|
||||
pub async fn fetch_latest_release(locale: &str) -> Result<TauriRelease, String> {
|
||||
pub async fn fetch_latest_release(locale: &str, source: crate::DownloadSource) -> Result<TauriRelease, String> {
|
||||
let client = build_update_http_client()?;
|
||||
|
||||
let resp = crate::race_download(&client, LATEST_JSON_PATH, LATEST_JSON_R2_PATH, "dbx-update-checker")
|
||||
.await
|
||||
.map_err(|e| format!("Failed to check updates: {e}"))?;
|
||||
let candidates = update_check_candidates(source);
|
||||
let resp = fetch_first_available(&client, &candidates).await?;
|
||||
|
||||
let mut release = resp.json::<TauriRelease>().await.map_err(|e| format!("Failed to parse update response: {e}"))?;
|
||||
if let Ok(github) = fetch_github_release_metadata(&client, &release.version).await {
|
||||
@@ -66,6 +66,38 @@ pub async fn fetch_latest_release(locale: &str) -> Result<TauriRelease, String>
|
||||
Ok(release)
|
||||
}
|
||||
|
||||
async fn fetch_first_available(client: &reqwest::Client, candidates: &[String]) -> Result<reqwest::Response, String> {
|
||||
let mut errors = Vec::with_capacity(candidates.len());
|
||||
for url in candidates {
|
||||
match client
|
||||
.get(url)
|
||||
.header(reqwest::header::USER_AGENT, "dbx-update-checker")
|
||||
.header(reqwest::header::ACCEPT_ENCODING, "identity")
|
||||
.send()
|
||||
.await
|
||||
.and_then(|response| response.error_for_status())
|
||||
{
|
||||
Ok(response) => return Ok(response),
|
||||
Err(error) => errors.push(format!("{url}: {error}")),
|
||||
}
|
||||
}
|
||||
Err(format!("Failed to check updates: {}", errors.join("; ")))
|
||||
}
|
||||
|
||||
fn update_check_candidates(source: crate::DownloadSource) -> Vec<String> {
|
||||
match source {
|
||||
crate::DownloadSource::Official => {
|
||||
vec![format!("{}{LATEST_JSON_R2_PATH}", crate::R2_CDN_BASE), LATEST_JSON_GITHUB_PATH.to_string()]
|
||||
}
|
||||
// CNB exposes a moving latest release, so checking CNB does not need an official-source version first.
|
||||
crate::DownloadSource::Cnb => vec![
|
||||
LATEST_JSON_CNB_PATH.to_string(),
|
||||
format!("{}{LATEST_JSON_R2_PATH}", crate::R2_CDN_BASE),
|
||||
LATEST_JSON_GITHUB_PATH.to_string(),
|
||||
],
|
||||
}
|
||||
}
|
||||
|
||||
// 拉取 R2 上的英文 release notes(仅最新版本)。version 必须与 latest.json 的 version 一致才采用,
|
||||
// 防止 sync-changelog 尚未更新时拿到旧版本英文 notes。
|
||||
async fn fetch_latest_release_notes_en(client: &reqwest::Client, expected_version: &str) -> Result<String, String> {
|
||||
@@ -245,8 +277,8 @@ pub fn build_update_info(release: TauriRelease, current_version: &str) -> Update
|
||||
let github = release.github.as_ref();
|
||||
let release_notes = non_empty(release.notes_en.as_deref())
|
||||
.map(ToOwned::to_owned)
|
||||
.or_else(|| canonical_release_notes(release.notes.as_deref()))
|
||||
.or_else(|| github.and_then(|metadata| non_empty(metadata.body.as_deref())).map(ToOwned::to_owned))
|
||||
.or(release.notes)
|
||||
.unwrap_or_default();
|
||||
let release_name = github
|
||||
.and_then(|metadata| non_empty(metadata.name.as_deref()))
|
||||
@@ -268,6 +300,15 @@ pub fn build_update_info(release: TauriRelease, current_version: &str) -> Update
|
||||
}
|
||||
}
|
||||
|
||||
fn canonical_release_notes(notes: Option<&str>) -> Option<String> {
|
||||
let notes = non_empty(notes)?;
|
||||
// Tauri's generated updater notes are a transport fallback, not the curated release notes.
|
||||
if notes.starts_with("## What's Changed") || notes == "See the assets below to download and install." {
|
||||
return None;
|
||||
}
|
||||
Some(notes.to_owned())
|
||||
}
|
||||
|
||||
fn non_empty(value: Option<&str>) -> Option<&str> {
|
||||
value.and_then(|value| {
|
||||
let trimmed = value.trim();
|
||||
@@ -447,4 +488,38 @@ HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings
|
||||
|
||||
assert_eq!(info.release_notes, "### New Features\n\nReal release notes");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_info_ignores_generated_notes_when_curated_notes_are_unavailable() {
|
||||
let release = TauriRelease {
|
||||
version: "0.5.3".to_string(),
|
||||
notes: Some("## What's Changed\n* generated item".to_string()),
|
||||
jdbc_plugin: None,
|
||||
github: None,
|
||||
notes_en: None,
|
||||
};
|
||||
|
||||
let info = build_update_info(release, "0.5.2");
|
||||
|
||||
assert_eq!(info.release_notes, "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn update_check_candidates_follow_selected_source() {
|
||||
assert_eq!(
|
||||
super::update_check_candidates(crate::DownloadSource::Official),
|
||||
vec![
|
||||
"https://dl.dbxio.com/releases/latest/latest.json",
|
||||
"https://github.com/t8y2/dbx/releases/latest/download/latest.json",
|
||||
]
|
||||
);
|
||||
assert_eq!(
|
||||
super::update_check_candidates(crate::DownloadSource::Cnb),
|
||||
vec![
|
||||
"https://cnb.cool/dbxio.com/dbx/-/releases/latest/download/latest.json",
|
||||
"https://dl.dbxio.com/releases/latest/latest.json",
|
||||
"https://github.com/t8y2/dbx/releases/latest/download/latest.json",
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user