mirror of
https://github.com/zhom/donutbrowser.git
synced 2026-06-29 09:59:55 +02:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b06ca4f11e | |||
| 3ab1ea61e8 | |||
| a0599ecfc1 | |||
| 6c834b3003 | |||
| 269b4dbe77 | |||
| ef00854307 | |||
| 03d915e5c7 | |||
| 91b12e80e5 | |||
| 3af581c4ab | |||
| 7a85edfb8a | |||
| 141a5f06a4 | |||
| 7a3857c06a |
@@ -49,4 +49,4 @@ jobs:
|
|||||||
pnpm install --frozen-lockfile
|
pnpm install --frozen-lockfile
|
||||||
|
|
||||||
- name: Run lint step
|
- name: Run lint step
|
||||||
run: pnpm lint
|
run: pnpm run lint:js
|
||||||
|
|||||||
+2
-2
@@ -30,8 +30,8 @@ yarn-error.log*
|
|||||||
.pnpm-debug.log*
|
.pnpm-debug.log*
|
||||||
|
|
||||||
# nodecar
|
# nodecar
|
||||||
nodecar/dist
|
**/dist
|
||||||
nodecar/node_modules
|
**/node_modules
|
||||||
|
|
||||||
# local env files
|
# local env files
|
||||||
.env*.local
|
.env*.local
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
## Download
|
## Download
|
||||||
|
|
||||||
> As of right now, the app is not signed by Apple. You need to have Gatekeeper disabled to run it.
|
> As of right now, the app is not signed by Apple. You need to have Gatekeeper disabled to run it. The app automatically checks for updates on each launch.
|
||||||
|
|
||||||
The app can be downloaded from the [releases page](https://github.com/zhom/donutbrowser/releases/latest).
|
The app can be downloaded from the [releases page](https://github.com/zhom/donutbrowser/releases/latest).
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "AGPL-3.0",
|
||||||
"packageManager": "pnpm@10.6.1",
|
"packageManager": "pnpm@10.6.1",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/node": "^22.15.17",
|
"@types/node": "^22.15.17",
|
||||||
|
|||||||
+7
-5
@@ -1,21 +1,23 @@
|
|||||||
{
|
{
|
||||||
"name": "donutbrowser",
|
"name": "donutbrowser",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.2.2",
|
"license": "AGPL-3.0",
|
||||||
|
"version": "0.2.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev --turbopack",
|
"dev": "next dev --turbopack",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
"start": "next start",
|
"start": "next start",
|
||||||
"lint": "biome check src/ && tsc --noEmit && next lint",
|
"lint": "pnpm lint:js && pnpm lint:rust",
|
||||||
|
"lint:js": "biome check src/ && tsc --noEmit && next lint",
|
||||||
"lint:rust": "cd src-tauri && cargo clippy --all-targets --all-features -- -D warnings -D clippy::all && cargo fmt --all",
|
"lint:rust": "cd src-tauri && cargo clippy --all-targets --all-features -- -D warnings -D clippy::all && cargo fmt --all",
|
||||||
"tauri": "tauri",
|
"tauri": "tauri",
|
||||||
"shadcn:add": "pnpm dlx shadcn@latest add",
|
"shadcn:add": "pnpm dlx shadcn@latest add",
|
||||||
"prepare": "husky",
|
"prepare": "husky",
|
||||||
"format:js": "biome check src/ --fix",
|
|
||||||
"format:rust": "cd src-tauri && cargo clippy --fix --allow-dirty --all-targets --all-features -- -D warnings -D clippy::all && cargo fmt --all",
|
"format:rust": "cd src-tauri && cargo clippy --fix --allow-dirty --all-targets --all-features -- -D warnings -D clippy::all && cargo fmt --all",
|
||||||
"format:biome": "biome check src/ --fix",
|
"format:js": "biome check src/ --fix",
|
||||||
"format": "pnpm format:js && pnpm format:rust"
|
"format": "pnpm format:js && pnpm format:rust",
|
||||||
|
"cargo": "cd src-tauri && cargo"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@radix-ui/react-checkbox": "^1.3.2",
|
"@radix-ui/react-checkbox": "^1.3.2",
|
||||||
|
|||||||
Generated
+471
-624
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "donutbrowser"
|
name = "donutbrowser"
|
||||||
version = "0.2.2"
|
version = "0.2.4"
|
||||||
description = "Browser Orchestrator"
|
description = "Browser Orchestrator"
|
||||||
authors = ["zhom@github"]
|
authors = ["zhom@github"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1</string>
|
<string>1</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.2.2</string>
|
<string>0.2.4</string>
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleIconFile</key>
|
||||||
|
|||||||
+188
-67
@@ -36,12 +36,16 @@ impl VersionComponent {
|
|||||||
let version = version.trim();
|
let version = version.trim();
|
||||||
|
|
||||||
// Handle special case for Zen Browser twilight releases
|
// Handle special case for Zen Browser twilight releases
|
||||||
if version.to_lowercase().contains("twilight") {
|
if version.to_lowercase() == "twilight" {
|
||||||
|
// Pure twilight release without base version
|
||||||
return VersionComponent {
|
return VersionComponent {
|
||||||
major: u32::MAX,
|
major: 999, // High major version to indicate it's a rolling release
|
||||||
minor: u32::MAX,
|
minor: 0,
|
||||||
patch: u32::MAX,
|
patch: 0,
|
||||||
pre_release: None,
|
pre_release: Some(PreRelease {
|
||||||
|
kind: PreReleaseKind::Alpha,
|
||||||
|
number: Some(999), // High number to indicate it's a rolling release
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,6 +144,38 @@ impl Ord for VersionComponent {
|
|||||||
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
|
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
|
||||||
use std::cmp::Ordering;
|
use std::cmp::Ordering;
|
||||||
|
|
||||||
|
// Check for twilight versions
|
||||||
|
let self_is_twilight = self
|
||||||
|
.pre_release
|
||||||
|
.as_ref()
|
||||||
|
.map(|pr| pr.kind == PreReleaseKind::Alpha && pr.number == Some(999))
|
||||||
|
.unwrap_or(false);
|
||||||
|
let other_is_twilight = other
|
||||||
|
.pre_release
|
||||||
|
.as_ref()
|
||||||
|
.map(|pr| pr.kind == PreReleaseKind::Alpha && pr.number == Some(999))
|
||||||
|
.unwrap_or(false);
|
||||||
|
|
||||||
|
// If one is twilight and the other isn't, twilight always has priority
|
||||||
|
if self_is_twilight && !other_is_twilight {
|
||||||
|
return Ordering::Greater; // twilight > non-twilight
|
||||||
|
}
|
||||||
|
if !self_is_twilight && other_is_twilight {
|
||||||
|
return Ordering::Less; // non-twilight < twilight
|
||||||
|
}
|
||||||
|
|
||||||
|
// Both are twilight or both are not twilight - use normal comparison
|
||||||
|
match (self_is_twilight, other_is_twilight) {
|
||||||
|
(true, true) => {
|
||||||
|
// Both are twilight, compare by base version
|
||||||
|
return (self.major, self.minor, self.patch).cmp(&(other.major, other.minor, other.patch));
|
||||||
|
}
|
||||||
|
(false, false) => {
|
||||||
|
// Neither is twilight, continue with normal comparison
|
||||||
|
}
|
||||||
|
_ => unreachable!(), // Already handled above
|
||||||
|
}
|
||||||
|
|
||||||
// Compare major.minor.patch first
|
// Compare major.minor.patch first
|
||||||
match (self.major, self.minor, self.patch).cmp(&(other.major, other.minor, other.patch)) {
|
match (self.major, self.minor, self.patch).cmp(&(other.major, other.minor, other.patch)) {
|
||||||
Ordering::Equal => {
|
Ordering::Equal => {
|
||||||
@@ -193,6 +229,12 @@ pub fn is_alpha_version(version: &str) -> bool {
|
|||||||
version_comp.pre_release.is_some()
|
version_comp.pre_release.is_some()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Browser-specific alpha version detection for Zen Browser
|
||||||
|
pub fn is_zen_alpha_version(version: &str) -> bool {
|
||||||
|
// For Zen Browser, only "twilight" is considered alpha/pre-release
|
||||||
|
version.to_lowercase() == "twilight"
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||||
pub struct FirefoxRelease {
|
pub struct FirefoxRelease {
|
||||||
pub build_number: u32,
|
pub build_number: u32,
|
||||||
@@ -273,7 +315,7 @@ impl ApiClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_cache_dir() -> Result<PathBuf, Box<dyn std::error::Error>> {
|
fn get_cache_dir() -> Result<PathBuf, Box<dyn std::error::Error + Send + Sync>> {
|
||||||
let base_dirs = BaseDirs::new().ok_or("Failed to get base directories")?;
|
let base_dirs = BaseDirs::new().ok_or("Failed to get base directories")?;
|
||||||
let app_name = if cfg!(debug_assertions) {
|
let app_name = if cfg!(debug_assertions) {
|
||||||
"DonutBrowserDev"
|
"DonutBrowserDev"
|
||||||
@@ -343,7 +385,7 @@ impl ApiClient {
|
|||||||
&self,
|
&self,
|
||||||
browser: &str,
|
browser: &str,
|
||||||
versions: &[String],
|
versions: &[String],
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||||
let cache_dir = Self::get_cache_dir()?;
|
let cache_dir = Self::get_cache_dir()?;
|
||||||
let cache_file = cache_dir.join(format!("{browser}_versions.json"));
|
let cache_file = cache_dir.join(format!("{browser}_versions.json"));
|
||||||
|
|
||||||
@@ -378,7 +420,7 @@ impl ApiClient {
|
|||||||
&self,
|
&self,
|
||||||
browser: &str,
|
browser: &str,
|
||||||
releases: &[GithubRelease],
|
releases: &[GithubRelease],
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
|
||||||
let cache_dir = Self::get_cache_dir()?;
|
let cache_dir = Self::get_cache_dir()?;
|
||||||
let cache_file = cache_dir.join(format!("{browser}_github.json"));
|
let cache_file = cache_dir.join(format!("{browser}_github.json"));
|
||||||
|
|
||||||
@@ -569,13 +611,6 @@ impl ApiClient {
|
|||||||
Ok(releases)
|
Ok(releases)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
|
||||||
pub async fn fetch_mullvad_releases(
|
|
||||||
&self,
|
|
||||||
) -> Result<Vec<GithubRelease>, Box<dyn std::error::Error + Send + Sync>> {
|
|
||||||
self.fetch_mullvad_releases_with_caching(false).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn fetch_mullvad_releases_with_caching(
|
pub async fn fetch_mullvad_releases_with_caching(
|
||||||
&self,
|
&self,
|
||||||
no_caching: bool,
|
no_caching: bool,
|
||||||
@@ -622,13 +657,6 @@ impl ApiClient {
|
|||||||
Ok(releases)
|
Ok(releases)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
|
||||||
pub async fn fetch_zen_releases(
|
|
||||||
&self,
|
|
||||||
) -> Result<Vec<GithubRelease>, Box<dyn std::error::Error + Send + Sync>> {
|
|
||||||
self.fetch_zen_releases_with_caching(false).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn fetch_zen_releases_with_caching(
|
pub async fn fetch_zen_releases_with_caching(
|
||||||
&self,
|
&self,
|
||||||
no_caching: bool,
|
no_caching: bool,
|
||||||
@@ -654,7 +682,25 @@ impl ApiClient {
|
|||||||
.json::<Vec<GithubRelease>>()
|
.json::<Vec<GithubRelease>>()
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
// Sort releases using the new version sorting system (twilight releases will be at top)
|
// Check for twilight updates and mark alpha releases
|
||||||
|
for release in &mut releases {
|
||||||
|
// Use browser-specific alpha detection for Zen Browser
|
||||||
|
release.is_alpha = is_zen_alpha_version(&release.tag_name) || release.prerelease;
|
||||||
|
|
||||||
|
// Check for twilight update if this is a twilight release
|
||||||
|
if release.tag_name.to_lowercase() == "twilight" {
|
||||||
|
if let Ok(has_update) = self.check_twilight_update(release).await {
|
||||||
|
if has_update {
|
||||||
|
println!(
|
||||||
|
"Detected update for Zen twilight release: {}",
|
||||||
|
release.tag_name
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sort releases using the new version sorting system
|
||||||
sort_github_releases(&mut releases);
|
sort_github_releases(&mut releases);
|
||||||
|
|
||||||
// Cache the results (unless bypassing cache)
|
// Cache the results (unless bypassing cache)
|
||||||
@@ -667,13 +713,6 @@ impl ApiClient {
|
|||||||
Ok(releases)
|
Ok(releases)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
|
||||||
pub async fn fetch_brave_releases(
|
|
||||||
&self,
|
|
||||||
) -> Result<Vec<GithubRelease>, Box<dyn std::error::Error + Send + Sync>> {
|
|
||||||
self.fetch_brave_releases_with_caching(false).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn fetch_brave_releases_with_caching(
|
pub async fn fetch_brave_releases_with_caching(
|
||||||
&self,
|
&self,
|
||||||
no_caching: bool,
|
no_caching: bool,
|
||||||
@@ -935,6 +974,64 @@ impl ApiClient {
|
|||||||
// Check if there's a macOS DMG file in this version directory
|
// Check if there's a macOS DMG file in this version directory
|
||||||
Ok(html.contains("tor-browser-macos-") && html.contains(".dmg"))
|
Ok(html.contains("tor-browser-macos-") && html.contains(".dmg"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Check if a Zen twilight release has been updated by comparing file size
|
||||||
|
pub async fn check_twilight_update(
|
||||||
|
&self,
|
||||||
|
release: &GithubRelease,
|
||||||
|
) -> Result<bool, Box<dyn std::error::Error + Send + Sync>> {
|
||||||
|
if release.tag_name.to_lowercase() != "twilight" {
|
||||||
|
return Ok(false); // Not a twilight release
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find the macOS universal DMG asset
|
||||||
|
let asset = release
|
||||||
|
.assets
|
||||||
|
.iter()
|
||||||
|
.find(|asset| asset.name == "zen.macos-universal.dmg")
|
||||||
|
.ok_or("No macOS universal asset found for twilight release")?;
|
||||||
|
|
||||||
|
// Check if we have cached file size information
|
||||||
|
let cache_dir = Self::get_cache_dir()?;
|
||||||
|
let twilight_cache_file = cache_dir.join("zen_twilight_info.json");
|
||||||
|
|
||||||
|
#[derive(serde::Serialize, serde::Deserialize)]
|
||||||
|
struct TwilightInfo {
|
||||||
|
file_size: u64,
|
||||||
|
last_updated: u64,
|
||||||
|
download_url: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
let current_info = TwilightInfo {
|
||||||
|
file_size: asset.size,
|
||||||
|
last_updated: Self::get_current_timestamp(),
|
||||||
|
download_url: asset.browser_download_url.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if !twilight_cache_file.exists() {
|
||||||
|
// No cache exists, save current info and return true (new)
|
||||||
|
let content = serde_json::to_string_pretty(¤t_info)?;
|
||||||
|
fs::write(&twilight_cache_file, content)?;
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
let cached_content = fs::read_to_string(&twilight_cache_file)?;
|
||||||
|
let cached_info: TwilightInfo = serde_json::from_str(&cached_content)?;
|
||||||
|
|
||||||
|
// Check if file size has changed
|
||||||
|
if cached_info.file_size != current_info.file_size {
|
||||||
|
// File size changed, update cache and return true
|
||||||
|
let content = serde_json::to_string_pretty(¤t_info)?;
|
||||||
|
fs::write(&twilight_cache_file, content)?;
|
||||||
|
println!(
|
||||||
|
"Zen twilight release updated: file size changed from {} to {}",
|
||||||
|
cached_info.file_size, current_info.file_size
|
||||||
|
);
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(false) // No update detected
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -989,10 +1086,14 @@ mod tests {
|
|||||||
assert_eq!(pre.number, Some(5));
|
assert_eq!(pre.number, Some(5));
|
||||||
|
|
||||||
// Test twilight version (Zen Browser)
|
// Test twilight version (Zen Browser)
|
||||||
let v4 = VersionComponent::parse("1.0.0-twilight");
|
let v4 = VersionComponent::parse("twilight");
|
||||||
assert_eq!(v4.major, u32::MAX);
|
assert_eq!(v4.major, 999);
|
||||||
assert_eq!(v4.minor, u32::MAX);
|
assert_eq!(v4.minor, 0);
|
||||||
assert_eq!(v4.patch, u32::MAX);
|
assert_eq!(v4.patch, 0);
|
||||||
|
assert!(v4.pre_release.is_some());
|
||||||
|
let pre = v4.pre_release.unwrap();
|
||||||
|
assert_eq!(pre.kind, PreReleaseKind::Alpha);
|
||||||
|
assert_eq!(pre.number, Some(999));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -1022,10 +1123,15 @@ mod tests {
|
|||||||
let v10 = VersionComponent::parse("137.0b5");
|
let v10 = VersionComponent::parse("137.0b5");
|
||||||
assert!(v10 > v9); // b5 > b4
|
assert!(v10 > v9); // b5 > b4
|
||||||
|
|
||||||
// Test twilight version (should be highest)
|
// Test twilight version (should have highest priority)
|
||||||
let v11 = VersionComponent::parse("1.0.0-twilight");
|
let v11 = VersionComponent::parse("twilight");
|
||||||
let v12 = VersionComponent::parse("999.999.999");
|
let v12 = VersionComponent::parse("1.0.0");
|
||||||
assert!(v11 > v12);
|
assert!(v11 > v12); // twilight > stable due to high major version
|
||||||
|
|
||||||
|
// Test twilight vs other pre-releases
|
||||||
|
let v13 = VersionComponent::parse("twilight");
|
||||||
|
let v14 = VersionComponent::parse("1.0.0a1");
|
||||||
|
assert!(v13 > v14); // twilight > a1 due to high major version
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -1037,14 +1143,14 @@ mod tests {
|
|||||||
"137.0b4".to_string(),
|
"137.0b4".to_string(),
|
||||||
"137.0b5".to_string(),
|
"137.0b5".to_string(),
|
||||||
"137.0".to_string(),
|
"137.0".to_string(),
|
||||||
"1.0.0-twilight".to_string(),
|
"twilight".to_string(),
|
||||||
"2.0.0a1".to_string(),
|
"2.0.0a1".to_string(),
|
||||||
];
|
];
|
||||||
|
|
||||||
sort_versions(&mut versions);
|
sort_versions(&mut versions);
|
||||||
|
|
||||||
// Expected order: twilight, 137.0, 137.0b5, 137.0b4, 2.0.0a1, 1.12.6b, 1.10.0, 1.9.9b
|
// Expected order with twilight priority: twilight first due to high major version (999), then normal semantic versioning
|
||||||
assert_eq!(versions[0], "1.0.0-twilight");
|
assert_eq!(versions[0], "twilight");
|
||||||
assert_eq!(versions[1], "137.0");
|
assert_eq!(versions[1], "137.0");
|
||||||
assert_eq!(versions[2], "137.0b5");
|
assert_eq!(versions[2], "137.0b5");
|
||||||
assert_eq!(versions[3], "137.0b4");
|
assert_eq!(versions[3], "137.0b4");
|
||||||
@@ -1054,6 +1160,31 @@ mod tests {
|
|||||||
assert_eq!(versions[7], "1.9.9b");
|
assert_eq!(versions[7], "1.9.9b");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_sort_versions_comprehensive() {
|
||||||
|
let mut versions = vec![
|
||||||
|
"1.0.0".to_string(),
|
||||||
|
"1.0.1".to_string(),
|
||||||
|
"1.1.0".to_string(),
|
||||||
|
"2.0.0a1".to_string(),
|
||||||
|
"2.0.0b1".to_string(),
|
||||||
|
"2.0.0rc1".to_string(),
|
||||||
|
"2.0.0".to_string(),
|
||||||
|
"10.0.0".to_string(),
|
||||||
|
"twilight".to_string(),
|
||||||
|
];
|
||||||
|
|
||||||
|
sort_versions(&mut versions);
|
||||||
|
|
||||||
|
// Expected order with twilight priority: twilight first due to high major version (999), then normal semantic versioning
|
||||||
|
assert_eq!(versions[0], "twilight");
|
||||||
|
assert_eq!(versions[1], "10.0.0");
|
||||||
|
assert_eq!(versions[2], "2.0.0");
|
||||||
|
assert_eq!(versions[3], "2.0.0rc1");
|
||||||
|
assert_eq!(versions[4], "2.0.0b1");
|
||||||
|
assert_eq!(versions[5], "2.0.0a1");
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_firefox_api() {
|
async fn test_firefox_api() {
|
||||||
let server = setup_mock_server().await;
|
let server = setup_mock_server().await;
|
||||||
@@ -1167,7 +1298,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "mullvad-browser-macos-14.5a6.dmg",
|
"name": "mullvad-browser-macos-14.5a6.dmg",
|
||||||
"browser_download_url": "https://example.com/mullvad-14.5a6.dmg"
|
"browser_download_url": "https://example.com/mullvad-14.5a6.dmg",
|
||||||
|
"size": 100000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1200,14 +1332,15 @@ mod tests {
|
|||||||
|
|
||||||
let mock_response = r#"[
|
let mock_response = r#"[
|
||||||
{
|
{
|
||||||
"tag_name": "1.0.0-twilight",
|
"tag_name": "twilight",
|
||||||
"name": "Zen Browser Twilight",
|
"name": "Zen Browser Twilight",
|
||||||
"prerelease": false,
|
"prerelease": false,
|
||||||
"published_at": "2024-01-15T10:00:00Z",
|
"published_at": "2024-01-15T10:00:00Z",
|
||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "zen.macos-universal.dmg",
|
"name": "zen.macos-universal.dmg",
|
||||||
"browser_download_url": "https://example.com/zen-twilight.dmg"
|
"browser_download_url": "https://example.com/zen-twilight.dmg",
|
||||||
|
"size": 120000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1229,7 +1362,7 @@ mod tests {
|
|||||||
assert!(result.is_ok());
|
assert!(result.is_ok());
|
||||||
let releases = result.unwrap();
|
let releases = result.unwrap();
|
||||||
assert!(!releases.is_empty());
|
assert!(!releases.is_empty());
|
||||||
assert_eq!(releases[0].tag_name, "1.0.0-twilight");
|
assert_eq!(releases[0].tag_name, "twilight");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -1246,7 +1379,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "brave-v1.81.9-universal.dmg",
|
"name": "brave-v1.81.9-universal.dmg",
|
||||||
"browser_download_url": "https://example.com/brave-1.81.9-universal.dmg"
|
"browser_download_url": "https://example.com/brave-1.81.9-universal.dmg",
|
||||||
|
"size": 200000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1472,28 +1606,15 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_sort_versions_comprehensive() {
|
fn test_is_zen_alpha_version() {
|
||||||
let mut versions = vec![
|
// Only "twilight" should be considered alpha for Zen Browser
|
||||||
"1.0.0".to_string(),
|
assert!(is_zen_alpha_version("twilight"));
|
||||||
"1.0.1".to_string(),
|
assert!(is_zen_alpha_version("TWILIGHT")); // Case insensitive
|
||||||
"1.1.0".to_string(),
|
|
||||||
"2.0.0a1".to_string(),
|
|
||||||
"2.0.0b1".to_string(),
|
|
||||||
"2.0.0rc1".to_string(),
|
|
||||||
"2.0.0".to_string(),
|
|
||||||
"10.0.0".to_string(),
|
|
||||||
"1.0.0-twilight".to_string(),
|
|
||||||
];
|
|
||||||
|
|
||||||
sort_versions(&mut versions);
|
// Versions with "b" should NOT be considered alpha for Zen Browser
|
||||||
|
assert!(!is_zen_alpha_version("1.12.8b"));
|
||||||
// Twilight should be first, then normal semantic versioning
|
assert!(!is_zen_alpha_version("1.0.0b1"));
|
||||||
assert_eq!(versions[0], "1.0.0-twilight");
|
assert!(!is_zen_alpha_version("2.0.0"));
|
||||||
assert_eq!(versions[1], "10.0.0");
|
|
||||||
assert_eq!(versions[2], "2.0.0");
|
|
||||||
assert_eq!(versions[3], "2.0.0rc1");
|
|
||||||
assert_eq!(versions[4], "2.0.0b1");
|
|
||||||
assert_eq!(versions[5], "2.0.0a1");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
|||||||
@@ -170,6 +170,10 @@ impl AppAutoUpdater {
|
|||||||
|
|
||||||
/// Determine if an update should be performed
|
/// Determine if an update should be performed
|
||||||
fn should_update(&self, current_version: &str, new_version: &str, is_nightly: bool) -> bool {
|
fn should_update(&self, current_version: &str, new_version: &str, is_nightly: bool) -> bool {
|
||||||
|
if current_version.starts_with("dev-") {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
println!(
|
println!(
|
||||||
"Comparing versions: current={current_version}, new={new_version}, is_nightly={is_nightly}"
|
"Comparing versions: current={current_version}, new={new_version}, is_nightly={is_nightly}"
|
||||||
);
|
);
|
||||||
@@ -608,8 +612,10 @@ mod tests {
|
|||||||
// Upgrade from stable to nightly
|
// Upgrade from stable to nightly
|
||||||
assert!(updater.should_update("v1.0.0", "nightly-abc123", true));
|
assert!(updater.should_update("v1.0.0", "nightly-abc123", true));
|
||||||
|
|
||||||
// Upgrade from dev to nightly
|
// Don't upgrade dev, ever
|
||||||
assert!(updater.should_update("dev-0.1.0", "nightly-abc123", true));
|
assert!(!updater.should_update("dev-0.1.0", "nightly-xyz987", false));
|
||||||
|
assert!(!updater.should_update("dev-0.1.0", "nightly-xyz987", true));
|
||||||
|
assert!(!updater.should_update("dev-0.1.0", "v1.2.3", false));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -303,6 +303,8 @@ pub struct GithubRelease {
|
|||||||
pub struct GithubAsset {
|
pub struct GithubAsset {
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub browser_download_url: String,
|
pub browser_download_url: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub size: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|||||||
@@ -35,6 +35,11 @@ impl BrowserVersionService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
pub fn new_with_api_client(api_client: ApiClient) -> Self {
|
||||||
|
Self { api_client }
|
||||||
|
}
|
||||||
|
|
||||||
/// Get cached browser versions immediately (returns None if no cache exists)
|
/// Get cached browser versions immediately (returns None if no cache exists)
|
||||||
pub fn get_cached_browser_versions(&self, browser: &str) -> Option<Vec<String>> {
|
pub fn get_cached_browser_versions(&self, browser: &str) -> Option<Vec<String>> {
|
||||||
self.api_client.load_cached_versions(browser)
|
self.api_client.load_cached_versions(browser)
|
||||||
@@ -541,6 +546,335 @@ impl BrowserVersionService {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
use wiremock::matchers::{header, method, path};
|
||||||
|
use wiremock::{Mock, MockServer, ResponseTemplate};
|
||||||
|
|
||||||
|
async fn setup_mock_server() -> MockServer {
|
||||||
|
MockServer::start().await
|
||||||
|
}
|
||||||
|
|
||||||
|
fn create_test_api_client(server: &MockServer) -> ApiClient {
|
||||||
|
let base_url = server.uri();
|
||||||
|
ApiClient::new_with_base_urls(
|
||||||
|
base_url.clone(), // firefox_api_base
|
||||||
|
base_url.clone(), // firefox_dev_api_base
|
||||||
|
base_url.clone(), // github_api_base
|
||||||
|
base_url.clone(), // chromium_api_base
|
||||||
|
base_url.clone(), // tor_archive_base
|
||||||
|
base_url.clone(), // mozilla_download_base
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn create_test_service(api_client: ApiClient) -> BrowserVersionService {
|
||||||
|
BrowserVersionService::new_with_api_client(api_client)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_firefox_mocks(server: &MockServer) {
|
||||||
|
let mock_response = r#"{
|
||||||
|
"releases": {
|
||||||
|
"firefox-139.0": {
|
||||||
|
"build_number": 1,
|
||||||
|
"category": "major",
|
||||||
|
"date": "2024-01-15",
|
||||||
|
"description": "Firefox 139.0 Release",
|
||||||
|
"is_security_driven": false,
|
||||||
|
"product": "firefox",
|
||||||
|
"version": "139.0"
|
||||||
|
},
|
||||||
|
"firefox-138.0": {
|
||||||
|
"build_number": 1,
|
||||||
|
"category": "major",
|
||||||
|
"date": "2024-01-01",
|
||||||
|
"description": "Firefox 138.0 Release",
|
||||||
|
"is_security_driven": false,
|
||||||
|
"product": "firefox",
|
||||||
|
"version": "138.0"
|
||||||
|
},
|
||||||
|
"firefox-137.0": {
|
||||||
|
"build_number": 1,
|
||||||
|
"category": "major",
|
||||||
|
"date": "2023-12-15",
|
||||||
|
"description": "Firefox 137.0 Release",
|
||||||
|
"is_security_driven": false,
|
||||||
|
"product": "firefox",
|
||||||
|
"version": "137.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}"#;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/firefox.json"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(mock_response)
|
||||||
|
.insert_header("content-type", "application/json"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_firefox_dev_mocks(server: &MockServer) {
|
||||||
|
let mock_response = r#"{
|
||||||
|
"releases": {
|
||||||
|
"devedition-140.0b1": {
|
||||||
|
"build_number": 1,
|
||||||
|
"category": "major",
|
||||||
|
"date": "2024-01-20",
|
||||||
|
"description": "Firefox Developer Edition 140.0b1",
|
||||||
|
"is_security_driven": false,
|
||||||
|
"product": "devedition",
|
||||||
|
"version": "140.0b1"
|
||||||
|
},
|
||||||
|
"devedition-139.0b5": {
|
||||||
|
"build_number": 1,
|
||||||
|
"category": "major",
|
||||||
|
"date": "2024-01-10",
|
||||||
|
"description": "Firefox Developer Edition 139.0b5",
|
||||||
|
"is_security_driven": false,
|
||||||
|
"product": "devedition",
|
||||||
|
"version": "139.0b5"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}"#;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/devedition.json"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(mock_response)
|
||||||
|
.insert_header("content-type", "application/json"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_mullvad_mocks(server: &MockServer) {
|
||||||
|
let mock_response = r#"[
|
||||||
|
{
|
||||||
|
"tag_name": "14.5a6",
|
||||||
|
"name": "Mullvad Browser 14.5a6",
|
||||||
|
"prerelease": true,
|
||||||
|
"published_at": "2024-01-15T10:00:00Z",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"name": "mullvad-browser-macos-14.5a6.dmg",
|
||||||
|
"browser_download_url": "https://example.com/mullvad-14.5a6.dmg",
|
||||||
|
"size": 100000000
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag_name": "14.5a5",
|
||||||
|
"name": "Mullvad Browser 14.5a5",
|
||||||
|
"prerelease": true,
|
||||||
|
"published_at": "2024-01-10T10:00:00Z",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"name": "mullvad-browser-macos-14.5a5.dmg",
|
||||||
|
"browser_download_url": "https://example.com/mullvad-14.5a5.dmg",
|
||||||
|
"size": 99000000
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]"#;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/repos/mullvad/mullvad-browser/releases"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(mock_response)
|
||||||
|
.insert_header("content-type", "application/json"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_zen_mocks(server: &MockServer) {
|
||||||
|
let mock_response = r#"[
|
||||||
|
{
|
||||||
|
"tag_name": "twilight",
|
||||||
|
"name": "Zen Browser Twilight",
|
||||||
|
"prerelease": false,
|
||||||
|
"published_at": "2024-01-15T10:00:00Z",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"name": "zen.macos-universal.dmg",
|
||||||
|
"browser_download_url": "https://example.com/zen-twilight.dmg",
|
||||||
|
"size": 120000000
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag_name": "1.11b",
|
||||||
|
"name": "Zen Browser 1.11b",
|
||||||
|
"prerelease": false,
|
||||||
|
"published_at": "2024-01-10T10:00:00Z",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"name": "zen.macos-universal.dmg",
|
||||||
|
"browser_download_url": "https://example.com/zen-1.11b.dmg",
|
||||||
|
"size": 115000000
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]"#;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/repos/zen-browser/desktop/releases"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(mock_response)
|
||||||
|
.insert_header("content-type", "application/json"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_brave_mocks(server: &MockServer) {
|
||||||
|
let mock_response = r#"[
|
||||||
|
{
|
||||||
|
"tag_name": "v1.81.9",
|
||||||
|
"name": "Brave Release 1.81.9",
|
||||||
|
"prerelease": false,
|
||||||
|
"published_at": "2024-01-15T10:00:00Z",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"name": "brave-v1.81.9-universal.dmg",
|
||||||
|
"browser_download_url": "https://example.com/brave-1.81.9-universal.dmg",
|
||||||
|
"size": 200000000
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag_name": "v1.81.8",
|
||||||
|
"name": "Brave Release 1.81.8",
|
||||||
|
"prerelease": false,
|
||||||
|
"published_at": "2024-01-10T10:00:00Z",
|
||||||
|
"assets": [
|
||||||
|
{
|
||||||
|
"name": "brave-v1.81.8-universal.dmg",
|
||||||
|
"browser_download_url": "https://example.com/brave-1.81.8-universal.dmg",
|
||||||
|
"size": 199000000
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]"#;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/repos/brave/brave-browser/releases"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(mock_response)
|
||||||
|
.insert_header("content-type", "application/json"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_chromium_mocks(server: &MockServer) {
|
||||||
|
let arch = if cfg!(target_arch = "aarch64") {
|
||||||
|
"Mac_Arm"
|
||||||
|
} else {
|
||||||
|
"Mac"
|
||||||
|
};
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path(format!("/{arch}/LAST_CHANGE")))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string("1465660")
|
||||||
|
.insert_header("content-type", "text/plain"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn setup_tor_mocks(server: &MockServer) {
|
||||||
|
let mock_html = r#"
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
<a href="../">../</a>
|
||||||
|
<a href="14.0.4/">14.0.4/</a>
|
||||||
|
<a href="14.0.3/">14.0.3/</a>
|
||||||
|
<a href="14.0.2/">14.0.2/</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
"#;
|
||||||
|
|
||||||
|
let version_html_144 = r#"
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
<a href="tor-browser-macos-14.0.4.dmg">tor-browser-macos-14.0.4.dmg</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
"#;
|
||||||
|
|
||||||
|
let version_html_143 = r#"
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
<a href="tor-browser-macos-14.0.3.dmg">tor-browser-macos-14.0.3.dmg</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
"#;
|
||||||
|
|
||||||
|
let version_html_142 = r#"
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
<a href="tor-browser-macos-14.0.2.dmg">tor-browser-macos-14.0.2.dmg</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
"#;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(mock_html)
|
||||||
|
.insert_header("content-type", "text/html"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/14.0.4/"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(version_html_144)
|
||||||
|
.insert_header("content-type", "text/html"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/14.0.3/"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(version_html_143)
|
||||||
|
.insert_header("content-type", "text/html"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
Mock::given(method("GET"))
|
||||||
|
.and(path("/14.0.2/"))
|
||||||
|
.and(header("user-agent", "donutbrowser"))
|
||||||
|
.respond_with(
|
||||||
|
ResponseTemplate::new(200)
|
||||||
|
.set_body_string(version_html_142)
|
||||||
|
.insert_header("content-type", "text/html"),
|
||||||
|
)
|
||||||
|
.mount(server)
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_browser_version_service_creation() {
|
async fn test_browser_version_service_creation() {
|
||||||
@@ -550,7 +884,11 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_fetch_firefox_versions() {
|
async fn test_fetch_firefox_versions() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
setup_firefox_mocks(&server).await;
|
||||||
|
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
// Test with caching
|
// Test with caching
|
||||||
let result_cached = service.fetch_browser_versions("firefox", false).await;
|
let result_cached = service.fetch_browser_versions("firefox", false).await;
|
||||||
@@ -561,15 +899,13 @@ mod tests {
|
|||||||
|
|
||||||
if let Ok(versions) = result_cached {
|
if let Ok(versions) = result_cached {
|
||||||
assert!(!versions.is_empty(), "Should have Firefox versions");
|
assert!(!versions.is_empty(), "Should have Firefox versions");
|
||||||
|
assert_eq!(versions[0], "139.0", "Should have latest version first");
|
||||||
println!(
|
println!(
|
||||||
"Firefox cached test passed. Found {versions_count} versions",
|
"Firefox cached test passed. Found {versions_count} versions",
|
||||||
versions_count = versions.len()
|
versions_count = versions.len()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Small delay to avoid rate limiting
|
|
||||||
tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;
|
|
||||||
|
|
||||||
// Test without caching
|
// Test without caching
|
||||||
let result_no_cache = service.fetch_browser_versions("firefox", true).await;
|
let result_no_cache = service.fetch_browser_versions("firefox", true).await;
|
||||||
assert!(
|
assert!(
|
||||||
@@ -582,6 +918,7 @@ mod tests {
|
|||||||
!versions.is_empty(),
|
!versions.is_empty(),
|
||||||
"Should have Firefox versions without caching"
|
"Should have Firefox versions without caching"
|
||||||
);
|
);
|
||||||
|
assert_eq!(versions[0], "139.0", "Should have latest version first");
|
||||||
println!(
|
println!(
|
||||||
"Firefox no-cache test passed. Found {versions_count} versions",
|
"Firefox no-cache test passed. Found {versions_count} versions",
|
||||||
versions_count = versions.len()
|
versions_count = versions.len()
|
||||||
@@ -591,7 +928,11 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_fetch_browser_versions_with_count() {
|
async fn test_fetch_browser_versions_with_count() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
setup_firefox_mocks(&server).await;
|
||||||
|
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
let result = service
|
let result = service
|
||||||
.fetch_browser_versions_with_count("firefox", false)
|
.fetch_browser_versions_with_count("firefox", false)
|
||||||
@@ -605,6 +946,10 @@ mod tests {
|
|||||||
result.versions.len(),
|
result.versions.len(),
|
||||||
"Total count should match versions length"
|
"Total count should match versions length"
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
result.versions[0], "139.0",
|
||||||
|
"Should have latest version first"
|
||||||
|
);
|
||||||
println!(
|
println!(
|
||||||
"Firefox count test passed. Found {} versions, new: {}",
|
"Firefox count test passed. Found {} versions, new: {}",
|
||||||
result.total_versions_count,
|
result.total_versions_count,
|
||||||
@@ -615,7 +960,11 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_fetch_detailed_versions() {
|
async fn test_fetch_detailed_versions() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
setup_firefox_mocks(&server).await;
|
||||||
|
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
let result = service
|
let result = service
|
||||||
.fetch_browser_versions_detailed("firefox", false)
|
.fetch_browser_versions_detailed("firefox", false)
|
||||||
@@ -631,6 +980,12 @@ mod tests {
|
|||||||
!first_version.version.is_empty(),
|
!first_version.version.is_empty(),
|
||||||
"Version should not be empty"
|
"Version should not be empty"
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
first_version.version, "139.0",
|
||||||
|
"Should have latest version first"
|
||||||
|
);
|
||||||
|
assert_eq!(first_version.date, "2024-01-15", "Should have correct date");
|
||||||
|
assert!(!first_version.is_prerelease, "Should be stable release");
|
||||||
println!(
|
println!(
|
||||||
"Firefox detailed test passed. Found {versions_count} detailed versions",
|
"Firefox detailed test passed. Found {versions_count} detailed versions",
|
||||||
versions_count = versions.len()
|
versions_count = versions.len()
|
||||||
@@ -640,7 +995,9 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_unsupported_browser() {
|
async fn test_unsupported_browser() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
let result = service.fetch_browser_versions("unsupported", false).await;
|
let result = service.fetch_browser_versions("unsupported", false).await;
|
||||||
assert!(
|
assert!(
|
||||||
@@ -658,7 +1015,11 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_incremental_update() {
|
async fn test_incremental_update() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
setup_firefox_mocks(&server).await;
|
||||||
|
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
// This test might fail if there are no cached versions yet, which is fine
|
// This test might fail if there are no cached versions yet, which is fine
|
||||||
let result = service
|
let result = service
|
||||||
@@ -678,7 +1039,20 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_all_supported_browsers() {
|
async fn test_all_supported_browsers() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
|
||||||
|
// Setup all browser mocks
|
||||||
|
setup_firefox_mocks(&server).await;
|
||||||
|
setup_firefox_dev_mocks(&server).await;
|
||||||
|
setup_mullvad_mocks(&server).await;
|
||||||
|
setup_zen_mocks(&server).await;
|
||||||
|
setup_brave_mocks(&server).await;
|
||||||
|
setup_chromium_mocks(&server).await;
|
||||||
|
setup_tor_mocks(&server).await;
|
||||||
|
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
let browsers = vec![
|
let browsers = vec![
|
||||||
"firefox",
|
"firefox",
|
||||||
"firefox-developer",
|
"firefox-developer",
|
||||||
@@ -690,30 +1064,30 @@ mod tests {
|
|||||||
];
|
];
|
||||||
|
|
||||||
for browser in browsers {
|
for browser in browsers {
|
||||||
// Test that we can at least call the function without panicking
|
|
||||||
let result = service.fetch_browser_versions(browser, false).await;
|
let result = service.fetch_browser_versions(browser, false).await;
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(versions) => {
|
Ok(versions) => {
|
||||||
|
assert!(!versions.is_empty(), "Should have versions for {browser}");
|
||||||
println!(
|
println!(
|
||||||
"{browser} test passed. Found {versions_count} versions",
|
"{browser} test passed. Found {versions_count} versions",
|
||||||
versions_count = versions.len()
|
versions_count = versions.len()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
// Some browsers might fail due to network issues, but shouldn't panic
|
panic!("{browser} test failed: {e}");
|
||||||
println!("{browser} test failed (network issue): {e}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Small delay between requests to avoid rate limiting
|
|
||||||
tokio::time::sleep(tokio::time::Duration::from_millis(200)).await;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_no_caching_parameter() {
|
async fn test_no_caching_parameter() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
setup_firefox_mocks(&server).await;
|
||||||
|
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
// Test with caching enabled (default)
|
// Test with caching enabled (default)
|
||||||
let result_cached = service.fetch_browser_versions("firefox", false).await;
|
let result_cached = service.fetch_browser_versions("firefox", false).await;
|
||||||
@@ -722,9 +1096,6 @@ mod tests {
|
|||||||
"Should fetch Firefox versions with caching"
|
"Should fetch Firefox versions with caching"
|
||||||
);
|
);
|
||||||
|
|
||||||
// Small delay to avoid rate limiting
|
|
||||||
tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;
|
|
||||||
|
|
||||||
// Test with caching disabled (no_caching = true)
|
// Test with caching disabled (no_caching = true)
|
||||||
let result_no_cache = service.fetch_browser_versions("firefox", true).await;
|
let result_no_cache = service.fetch_browser_versions("firefox", true).await;
|
||||||
assert!(
|
assert!(
|
||||||
@@ -742,6 +1113,10 @@ mod tests {
|
|||||||
!no_cache_versions.is_empty(),
|
!no_cache_versions.is_empty(),
|
||||||
"No-cache versions should not be empty"
|
"No-cache versions should not be empty"
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
cached_versions, no_cache_versions,
|
||||||
|
"Both should return same versions"
|
||||||
|
);
|
||||||
println!(
|
println!(
|
||||||
"No-caching test passed. Cached: {} versions, No-cache: {} versions",
|
"No-caching test passed. Cached: {} versions, No-cache: {} versions",
|
||||||
cached_versions.len(),
|
cached_versions.len(),
|
||||||
@@ -752,7 +1127,11 @@ mod tests {
|
|||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn test_detailed_versions_with_no_caching() {
|
async fn test_detailed_versions_with_no_caching() {
|
||||||
let service = BrowserVersionService::new();
|
let server = setup_mock_server().await;
|
||||||
|
setup_firefox_mocks(&server).await;
|
||||||
|
|
||||||
|
let api_client = create_test_api_client(&server);
|
||||||
|
let service = create_test_service(api_client);
|
||||||
|
|
||||||
// Test detailed versions with caching
|
// Test detailed versions with caching
|
||||||
let result_cached = service
|
let result_cached = service
|
||||||
@@ -763,9 +1142,6 @@ mod tests {
|
|||||||
"Should fetch detailed Firefox versions with caching"
|
"Should fetch detailed Firefox versions with caching"
|
||||||
);
|
);
|
||||||
|
|
||||||
// Small delay to avoid rate limiting
|
|
||||||
tokio::time::sleep(tokio::time::Duration::from_millis(500)).await;
|
|
||||||
|
|
||||||
// Test detailed versions without caching
|
// Test detailed versions without caching
|
||||||
let result_no_cache = service
|
let result_no_cache = service
|
||||||
.fetch_browser_versions_detailed("firefox", true)
|
.fetch_browser_versions_detailed("firefox", true)
|
||||||
@@ -799,6 +1175,17 @@ mod tests {
|
|||||||
"No-cache version should not be empty"
|
"No-cache version should not be empty"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
assert_eq!(first_cached.version, "139.0", "Should have correct version");
|
||||||
|
assert_eq!(
|
||||||
|
first_no_cache.version, "139.0",
|
||||||
|
"Should have correct version"
|
||||||
|
);
|
||||||
|
assert_eq!(first_cached.date, "2024-01-15", "Should have correct date");
|
||||||
|
assert_eq!(
|
||||||
|
first_no_cache.date, "2024-01-15",
|
||||||
|
"Should have correct date"
|
||||||
|
);
|
||||||
|
|
||||||
println!(
|
println!(
|
||||||
"Detailed no-caching test passed. Cached: {} versions, No-cache: {} versions",
|
"Detailed no-caching test passed. Cached: {} versions, No-cache: {} versions",
|
||||||
cached_versions.len(),
|
cached_versions.len(),
|
||||||
|
|||||||
@@ -144,6 +144,10 @@ impl Downloader {
|
|||||||
.resolve_download_url(browser_type.clone(), version, download_info)
|
.resolve_download_url(browser_type.clone(), version, download_info)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
|
// Check if this is a twilight release for special handling
|
||||||
|
let is_twilight =
|
||||||
|
browser_type == BrowserType::Zen && version.to_lowercase().contains("twilight");
|
||||||
|
|
||||||
// Emit initial progress
|
// Emit initial progress
|
||||||
let progress = DownloadProgress {
|
let progress = DownloadProgress {
|
||||||
browser: browser_type.as_str().to_string(),
|
browser: browser_type.as_str().to_string(),
|
||||||
@@ -153,7 +157,11 @@ impl Downloader {
|
|||||||
percentage: 0.0,
|
percentage: 0.0,
|
||||||
speed_bytes_per_sec: 0.0,
|
speed_bytes_per_sec: 0.0,
|
||||||
eta_seconds: None,
|
eta_seconds: None,
|
||||||
stage: "downloading".to_string(),
|
stage: if is_twilight {
|
||||||
|
"downloading (twilight rolling release)".to_string()
|
||||||
|
} else {
|
||||||
|
"downloading".to_string()
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
let _ = app_handle.emit("download-progress", &progress);
|
let _ = app_handle.emit("download-progress", &progress);
|
||||||
@@ -205,6 +213,12 @@ impl Downloader {
|
|||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let stage_description = if is_twilight {
|
||||||
|
"downloading (twilight rolling release)".to_string()
|
||||||
|
} else {
|
||||||
|
"downloading".to_string()
|
||||||
|
};
|
||||||
|
|
||||||
let progress = DownloadProgress {
|
let progress = DownloadProgress {
|
||||||
browser: browser_type.as_str().to_string(),
|
browser: browser_type.as_str().to_string(),
|
||||||
version: version.to_string(),
|
version: version.to_string(),
|
||||||
@@ -213,7 +227,7 @@ impl Downloader {
|
|||||||
percentage,
|
percentage,
|
||||||
speed_bytes_per_sec: speed,
|
speed_bytes_per_sec: speed,
|
||||||
eta_seconds: eta,
|
eta_seconds: eta,
|
||||||
stage: "downloading".to_string(),
|
stage: stage_description,
|
||||||
};
|
};
|
||||||
|
|
||||||
let _ = app_handle.emit("download-progress", &progress);
|
let _ = app_handle.emit("download-progress", &progress);
|
||||||
@@ -267,7 +281,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "brave-v1.81.9-universal.dmg",
|
"name": "brave-v1.81.9-universal.dmg",
|
||||||
"browser_download_url": "https://example.com/brave-1.81.9-universal.dmg"
|
"browser_download_url": "https://example.com/brave-1.81.9-universal.dmg",
|
||||||
|
"size": 200000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -314,7 +329,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "zen.macos-universal.dmg",
|
"name": "zen.macos-universal.dmg",
|
||||||
"browser_download_url": "https://example.com/zen-1.11b-universal.dmg"
|
"browser_download_url": "https://example.com/zen-1.11b-universal.dmg",
|
||||||
|
"size": 120000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -361,7 +377,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "mullvad-browser-macos-14.5a6.dmg",
|
"name": "mullvad-browser-macos-14.5a6.dmg",
|
||||||
"browser_download_url": "https://example.com/mullvad-14.5a6.dmg"
|
"browser_download_url": "https://example.com/mullvad-14.5a6.dmg",
|
||||||
|
"size": 100000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -471,7 +488,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "brave-v1.81.8-universal.dmg",
|
"name": "brave-v1.81.8-universal.dmg",
|
||||||
"browser_download_url": "https://example.com/brave-1.81.8-universal.dmg"
|
"browser_download_url": "https://example.com/brave-1.81.8-universal.dmg",
|
||||||
|
"size": 200000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -520,7 +538,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "zen.linux-universal.tar.bz2",
|
"name": "zen.linux-universal.tar.bz2",
|
||||||
"browser_download_url": "https://example.com/zen-1.11b-linux.tar.bz2"
|
"browser_download_url": "https://example.com/zen-1.11b-linux.tar.bz2",
|
||||||
|
"size": 150000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -663,7 +682,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "mullvad-browser-linux-14.5a6.tar.xz",
|
"name": "mullvad-browser-linux-14.5a6.tar.xz",
|
||||||
"browser_download_url": "https://example.com/mullvad-14.5a6.tar.xz"
|
"browser_download_url": "https://example.com/mullvad-14.5a6.tar.xz",
|
||||||
|
"size": 80000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -712,7 +732,8 @@ mod tests {
|
|||||||
"assets": [
|
"assets": [
|
||||||
{
|
{
|
||||||
"name": "brave-v1.81.9-universal.dmg",
|
"name": "brave-v1.81.9-universal.dmg",
|
||||||
"browser_download_url": "https://example.com/brave-1.81.9-universal.dmg"
|
"browser_download_url": "https://example.com/brave-1.81.9-universal.dmg",
|
||||||
|
"size": 200000000
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ pub struct DownloadedBrowserInfo {
|
|||||||
pub file_path: PathBuf,
|
pub file_path: PathBuf,
|
||||||
pub verified: bool,
|
pub verified: bool,
|
||||||
pub actual_version: Option<String>, // For browsers like Chromium where we track the actual version
|
pub actual_version: Option<String>, // For browsers like Chromium where we track the actual version
|
||||||
|
pub file_size: Option<u64>, // For tracking file size changes (useful for rolling releases)
|
||||||
|
#[serde(default)] // Add default value (false) for backwards compatibility
|
||||||
|
pub is_rolling_release: bool, // True for Zen's twilight releases and other rolling releases
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Default)]
|
#[derive(Debug, Serialize, Deserialize, Default)]
|
||||||
@@ -98,6 +101,7 @@ impl DownloadedBrowsersRegistry {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn mark_download_started(&mut self, browser: &str, version: &str, file_path: PathBuf) {
|
pub fn mark_download_started(&mut self, browser: &str, version: &str, file_path: PathBuf) {
|
||||||
|
let is_rolling = Self::is_rolling_release(browser, version);
|
||||||
let info = DownloadedBrowserInfo {
|
let info = DownloadedBrowserInfo {
|
||||||
browser: browser.to_string(),
|
browser: browser.to_string(),
|
||||||
version: version.to_string(),
|
version: version.to_string(),
|
||||||
@@ -108,6 +112,8 @@ impl DownloadedBrowsersRegistry {
|
|||||||
file_path,
|
file_path,
|
||||||
verified: false,
|
verified: false,
|
||||||
actual_version: None,
|
actual_version: None,
|
||||||
|
file_size: None,
|
||||||
|
is_rolling_release: is_rolling,
|
||||||
};
|
};
|
||||||
self.add_browser(info);
|
self.add_browser(info);
|
||||||
}
|
}
|
||||||
@@ -131,6 +137,11 @@ impl DownloadedBrowsersRegistry {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_rolling_release(browser: &str, version: &str) -> bool {
|
||||||
|
// Check if this is a rolling release like twilight
|
||||||
|
browser == "zen" && version.to_lowercase() == "twilight"
|
||||||
|
}
|
||||||
|
|
||||||
pub fn cleanup_failed_download(
|
pub fn cleanup_failed_download(
|
||||||
&mut self,
|
&mut self,
|
||||||
browser: &str,
|
browser: &str,
|
||||||
@@ -186,6 +197,8 @@ mod tests {
|
|||||||
file_path: PathBuf::from("/test/path"),
|
file_path: PathBuf::from("/test/path"),
|
||||||
verified: true,
|
verified: true,
|
||||||
actual_version: None,
|
actual_version: None,
|
||||||
|
file_size: None,
|
||||||
|
is_rolling_release: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
registry.add_browser(info.clone());
|
registry.add_browser(info.clone());
|
||||||
@@ -206,6 +219,8 @@ mod tests {
|
|||||||
file_path: PathBuf::from("/test/path1"),
|
file_path: PathBuf::from("/test/path1"),
|
||||||
verified: true,
|
verified: true,
|
||||||
actual_version: None,
|
actual_version: None,
|
||||||
|
file_size: None,
|
||||||
|
is_rolling_release: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
let info2 = DownloadedBrowserInfo {
|
let info2 = DownloadedBrowserInfo {
|
||||||
@@ -215,6 +230,8 @@ mod tests {
|
|||||||
file_path: PathBuf::from("/test/path2"),
|
file_path: PathBuf::from("/test/path2"),
|
||||||
verified: false, // Not verified, should not be included
|
verified: false, // Not verified, should not be included
|
||||||
actual_version: None,
|
actual_version: None,
|
||||||
|
file_size: None,
|
||||||
|
is_rolling_release: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
let info3 = DownloadedBrowserInfo {
|
let info3 = DownloadedBrowserInfo {
|
||||||
@@ -224,6 +241,8 @@ mod tests {
|
|||||||
file_path: PathBuf::from("/test/path3"),
|
file_path: PathBuf::from("/test/path3"),
|
||||||
verified: true,
|
verified: true,
|
||||||
actual_version: None,
|
actual_version: None,
|
||||||
|
file_size: None,
|
||||||
|
is_rolling_release: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
registry.add_browser(info1);
|
registry.add_browser(info1);
|
||||||
@@ -266,6 +285,8 @@ mod tests {
|
|||||||
file_path: PathBuf::from("/test/path"),
|
file_path: PathBuf::from("/test/path"),
|
||||||
verified: true,
|
verified: true,
|
||||||
actual_version: None,
|
actual_version: None,
|
||||||
|
file_size: None,
|
||||||
|
is_rolling_release: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
registry.add_browser(info);
|
registry.add_browser(info);
|
||||||
@@ -275,4 +296,17 @@ mod tests {
|
|||||||
assert!(removed.is_some());
|
assert!(removed.is_some());
|
||||||
assert!(!registry.is_browser_downloaded("firefox", "139.0"));
|
assert!(!registry.is_browser_downloaded("firefox", "139.0"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_twilight_rolling_release() {
|
||||||
|
let mut registry = DownloadedBrowsersRegistry::new();
|
||||||
|
|
||||||
|
// Mark twilight download started
|
||||||
|
registry.mark_download_started("zen", "twilight", PathBuf::from("/test/zen-twilight"));
|
||||||
|
|
||||||
|
// Check that it's marked as rolling release
|
||||||
|
let zen_versions = ®istry.browsers["zen"];
|
||||||
|
let twilight_info = &zen_versions["twilight"];
|
||||||
|
assert!(twilight_info.is_rolling_release);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "Donut Browser",
|
"productName": "Donut Browser",
|
||||||
"version": "0.2.2",
|
"version": "0.2.4",
|
||||||
"identifier": "com.donutbrowser",
|
"identifier": "com.donutbrowser",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "pnpm dev",
|
"beforeDevCommand": "pnpm dev",
|
||||||
|
|||||||
+45
-105
@@ -48,24 +48,26 @@ export default function Home() {
|
|||||||
useState<BrowserProfile | null>(null);
|
useState<BrowserProfile | null>(null);
|
||||||
const [currentProfileForVersionChange, setCurrentProfileForVersionChange] =
|
const [currentProfileForVersionChange, setCurrentProfileForVersionChange] =
|
||||||
useState<BrowserProfile | null>(null);
|
useState<BrowserProfile | null>(null);
|
||||||
const [isClient, setIsClient] = useState(false);
|
|
||||||
|
|
||||||
// Auto-update functionality - only initialize on client
|
// Simple profiles loader without updates check (for use as callback)
|
||||||
const updateNotifications = useUpdateNotifications();
|
const loadProfiles = useCallback(async () => {
|
||||||
const { checkForUpdates, isUpdating } = updateNotifications;
|
try {
|
||||||
|
const profileList = await invoke<BrowserProfile[]>(
|
||||||
// App auto-update functionality
|
"list_browser_profiles",
|
||||||
const appUpdateNotifications = useAppUpdateNotifications();
|
);
|
||||||
const { checkForAppUpdatesManual } = appUpdateNotifications;
|
setProfiles(profileList);
|
||||||
|
} catch (err: unknown) {
|
||||||
// Ensure we're on the client side to prevent hydration mismatches
|
console.error("Failed to load profiles:", err);
|
||||||
useEffect(() => {
|
setError(`Failed to load profiles: ${JSON.stringify(err)}`);
|
||||||
setIsClient(true);
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const loadProfiles = useCallback(async () => {
|
// Auto-update functionality - pass loadProfiles to refresh profiles after updates
|
||||||
if (!isClient) return; // Only run on client side
|
const updateNotifications = useUpdateNotifications(loadProfiles);
|
||||||
|
const { checkForUpdates, isUpdating } = updateNotifications;
|
||||||
|
|
||||||
|
// Profiles loader with update check (for initial load and manual refresh)
|
||||||
|
const loadProfilesWithUpdateCheck = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
const profileList = await invoke<BrowserProfile[]>(
|
const profileList = await invoke<BrowserProfile[]>(
|
||||||
"list_browser_profiles",
|
"list_browser_profiles",
|
||||||
@@ -78,12 +80,12 @@ export default function Home() {
|
|||||||
console.error("Failed to load profiles:", err);
|
console.error("Failed to load profiles:", err);
|
||||||
setError(`Failed to load profiles: ${JSON.stringify(err)}`);
|
setError(`Failed to load profiles: ${JSON.stringify(err)}`);
|
||||||
}
|
}
|
||||||
}, [checkForUpdates, isClient]);
|
}, [checkForUpdates]);
|
||||||
|
|
||||||
|
useAppUpdateNotifications();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isClient) return; // Only run on client side
|
void loadProfilesWithUpdateCheck();
|
||||||
|
|
||||||
void loadProfiles();
|
|
||||||
|
|
||||||
// Check for startup default browser prompt
|
// Check for startup default browser prompt
|
||||||
void checkStartupPrompt();
|
void checkStartupPrompt();
|
||||||
@@ -105,11 +107,9 @@ export default function Home() {
|
|||||||
return () => {
|
return () => {
|
||||||
clearInterval(updateInterval);
|
clearInterval(updateInterval);
|
||||||
};
|
};
|
||||||
}, [loadProfiles, checkForUpdates, isClient]);
|
}, [loadProfilesWithUpdateCheck, checkForUpdates]);
|
||||||
|
|
||||||
const checkStartupPrompt = async () => {
|
const checkStartupPrompt = async () => {
|
||||||
if (!isClient) return; // Only run on client side
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const shouldShow = await invoke<boolean>(
|
const shouldShow = await invoke<boolean>(
|
||||||
"should_show_settings_on_startup",
|
"should_show_settings_on_startup",
|
||||||
@@ -123,8 +123,6 @@ export default function Home() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const checkStartupUrls = async () => {
|
const checkStartupUrls = async () => {
|
||||||
if (!isClient) return; // Only run on client side
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const hasStartupUrl = await invoke<boolean>(
|
const hasStartupUrl = await invoke<boolean>(
|
||||||
"check_and_handle_startup_url",
|
"check_and_handle_startup_url",
|
||||||
@@ -138,8 +136,6 @@ export default function Home() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const listenForUrlEvents = async () => {
|
const listenForUrlEvents = async () => {
|
||||||
if (!isClient) return; // Only run on client side
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Listen for URL open events from the deep link handler (when app is already running)
|
// Listen for URL open events from the deep link handler (when app is already running)
|
||||||
await listen<string>("url-open-request", (event) => {
|
await listen<string>("url-open-request", (event) => {
|
||||||
@@ -173,8 +169,6 @@ export default function Home() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleUrlOpen = async (url: string) => {
|
const handleUrlOpen = async (url: string) => {
|
||||||
if (!isClient) return; // Only run on client side
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Use smart profile selection
|
// Use smart profile selection
|
||||||
const result = await invoke<string>("smart_open_url", {
|
const result = await invoke<string>("smart_open_url", {
|
||||||
@@ -270,40 +264,33 @@ export default function Home() {
|
|||||||
|
|
||||||
const runningProfilesRef = useRef<Set<string>>(new Set());
|
const runningProfilesRef = useRef<Set<string>>(new Set());
|
||||||
|
|
||||||
const checkBrowserStatus = useCallback(
|
const checkBrowserStatus = useCallback(async (profile: BrowserProfile) => {
|
||||||
async (profile: BrowserProfile) => {
|
try {
|
||||||
if (!isClient) return; // Only run on client side
|
const isRunning = await invoke<boolean>("check_browser_status", {
|
||||||
|
profile,
|
||||||
|
});
|
||||||
|
|
||||||
try {
|
const currentRunning = runningProfilesRef.current.has(profile.name);
|
||||||
const isRunning = await invoke<boolean>("check_browser_status", {
|
|
||||||
profile,
|
if (isRunning !== currentRunning) {
|
||||||
|
setRunningProfiles((prev) => {
|
||||||
|
const next = new Set(prev);
|
||||||
|
if (isRunning) {
|
||||||
|
next.add(profile.name);
|
||||||
|
} else {
|
||||||
|
next.delete(profile.name);
|
||||||
|
}
|
||||||
|
runningProfilesRef.current = next;
|
||||||
|
return next;
|
||||||
});
|
});
|
||||||
|
|
||||||
const currentRunning = runningProfilesRef.current.has(profile.name);
|
|
||||||
|
|
||||||
if (isRunning !== currentRunning) {
|
|
||||||
setRunningProfiles((prev) => {
|
|
||||||
const next = new Set(prev);
|
|
||||||
if (isRunning) {
|
|
||||||
next.add(profile.name);
|
|
||||||
} else {
|
|
||||||
next.delete(profile.name);
|
|
||||||
}
|
|
||||||
runningProfilesRef.current = next;
|
|
||||||
return next;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.error("Failed to check browser status:", err);
|
|
||||||
}
|
}
|
||||||
},
|
} catch (err) {
|
||||||
[isClient],
|
console.error("Failed to check browser status:", err);
|
||||||
);
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
const launchProfile = useCallback(
|
const launchProfile = useCallback(
|
||||||
async (profile: BrowserProfile) => {
|
async (profile: BrowserProfile) => {
|
||||||
if (!isClient) return; // Only run on client side
|
|
||||||
|
|
||||||
setError(null);
|
setError(null);
|
||||||
|
|
||||||
// Check if browser is disabled due to ongoing update
|
// Check if browser is disabled due to ongoing update
|
||||||
@@ -337,11 +324,11 @@ export default function Home() {
|
|||||||
setError(`Failed to launch browser: ${JSON.stringify(err)}`);
|
setError(`Failed to launch browser: ${JSON.stringify(err)}`);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[loadProfiles, checkBrowserStatus, isUpdating, isClient],
|
[loadProfiles, checkBrowserStatus, isUpdating],
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (profiles.length === 0 || !isClient) return;
|
if (profiles.length === 0) return;
|
||||||
|
|
||||||
const interval = setInterval(() => {
|
const interval = setInterval(() => {
|
||||||
for (const profile of profiles) {
|
for (const profile of profiles) {
|
||||||
@@ -352,7 +339,7 @@ export default function Home() {
|
|||||||
return () => {
|
return () => {
|
||||||
clearInterval(interval);
|
clearInterval(interval);
|
||||||
};
|
};
|
||||||
}, [profiles, checkBrowserStatus, isClient]);
|
}, [profiles, checkBrowserStatus]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
runningProfilesRef.current = runningProfiles;
|
runningProfilesRef.current = runningProfiles;
|
||||||
@@ -408,53 +395,6 @@ export default function Home() {
|
|||||||
[loadProfiles],
|
[loadProfiles],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Don't render anything until we're on the client side to prevent hydration issues
|
|
||||||
if (!isClient) {
|
|
||||||
return (
|
|
||||||
<div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 gap-8 sm:p-12 font-[family-name:var(--font-geist-sans)]">
|
|
||||||
<main className="flex flex-col gap-8 row-start-2 items-center w-full max-w-3xl">
|
|
||||||
<Card className="w-full">
|
|
||||||
<CardHeader>
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<CardTitle>Profiles</CardTitle>
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<Tooltip>
|
|
||||||
<TooltipTrigger asChild>
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
variant="outline"
|
|
||||||
disabled
|
|
||||||
className="flex items-center gap-2"
|
|
||||||
>
|
|
||||||
<GoGear className="h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipContent>Settings</TooltipContent>
|
|
||||||
</Tooltip>
|
|
||||||
<Tooltip>
|
|
||||||
<TooltipTrigger asChild>
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
disabled
|
|
||||||
className="flex items-center gap-2"
|
|
||||||
>
|
|
||||||
<GoPlus className="h-4 w-4" />
|
|
||||||
</Button>
|
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipContent>Create a new profile</TooltipContent>
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent className="p-8 text-center">
|
|
||||||
<div className="animate-pulse">Loading...</div>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 gap-8 sm:p-12 font-[family-name:var(--font-geist-sans)]">
|
<div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 gap-8 sm:p-12 font-[family-name:var(--font-geist-sans)]">
|
||||||
<main className="flex flex-col gap-8 row-start-2 items-center w-full max-w-3xl">
|
<main className="flex flex-col gap-8 row-start-2 items-center w-full max-w-3xl">
|
||||||
|
|||||||
@@ -71,7 +71,12 @@ interface ErrorToastProps extends BaseToastProps {
|
|||||||
|
|
||||||
interface DownloadToastProps extends BaseToastProps {
|
interface DownloadToastProps extends BaseToastProps {
|
||||||
type: "download";
|
type: "download";
|
||||||
stage?: "downloading" | "extracting" | "verifying" | "completed";
|
stage?:
|
||||||
|
| "downloading"
|
||||||
|
| "extracting"
|
||||||
|
| "verifying"
|
||||||
|
| "completed"
|
||||||
|
| "downloading (twilight rolling release)";
|
||||||
progress?: {
|
progress?: {
|
||||||
percentage: number;
|
percentage: number;
|
||||||
speed?: string;
|
speed?: string;
|
||||||
@@ -93,13 +98,20 @@ interface FetchingToastProps extends BaseToastProps {
|
|||||||
browserName?: string;
|
browserName?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface TwilightUpdateToastProps extends BaseToastProps {
|
||||||
|
type: "twilight-update";
|
||||||
|
browserName?: string;
|
||||||
|
hasUpdate?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
type ToastProps =
|
type ToastProps =
|
||||||
| LoadingToastProps
|
| LoadingToastProps
|
||||||
| SuccessToastProps
|
| SuccessToastProps
|
||||||
| ErrorToastProps
|
| ErrorToastProps
|
||||||
| DownloadToastProps
|
| DownloadToastProps
|
||||||
| VersionUpdateToastProps
|
| VersionUpdateToastProps
|
||||||
| FetchingToastProps;
|
| FetchingToastProps
|
||||||
|
| TwilightUpdateToastProps;
|
||||||
|
|
||||||
function getToastIcon(type: ToastProps["type"], stage?: string) {
|
function getToastIcon(type: ToastProps["type"], stage?: string) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
@@ -122,6 +134,10 @@ function getToastIcon(type: ToastProps["type"], stage?: string) {
|
|||||||
return (
|
return (
|
||||||
<LuRefreshCw className="h-4 w-4 text-blue-500 animate-spin flex-shrink-0" />
|
<LuRefreshCw className="h-4 w-4 text-blue-500 animate-spin flex-shrink-0" />
|
||||||
);
|
);
|
||||||
|
case "twilight-update":
|
||||||
|
return (
|
||||||
|
<LuRefreshCw className="h-4 w-4 text-purple-500 animate-spin flex-shrink-0" />
|
||||||
|
);
|
||||||
default:
|
default:
|
||||||
return (
|
return (
|
||||||
<div className="animate-spin rounded-full h-4 w-4 border-2 border-blue-500 border-t-transparent flex-shrink-0" />
|
<div className="animate-spin rounded-full h-4 w-4 border-2 border-blue-500 border-t-transparent flex-shrink-0" />
|
||||||
@@ -186,6 +202,22 @@ export function UnifiedToast(props: ToastProps) {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Twilight update progress */}
|
||||||
|
{type === "twilight-update" && (
|
||||||
|
<div className="mt-2">
|
||||||
|
<p className="text-xs text-gray-600 dark:text-gray-300">
|
||||||
|
{"hasUpdate" in props && props.hasUpdate
|
||||||
|
? "New twilight build available for download"
|
||||||
|
: "Checking for twilight updates..."}
|
||||||
|
</p>
|
||||||
|
{props.browserName && (
|
||||||
|
<p className="text-xs text-purple-600 dark:text-purple-400 mt-1">
|
||||||
|
{props.browserName} • Rolling Release
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Description */}
|
{/* Description */}
|
||||||
{description && (
|
{description && (
|
||||||
<p className="mt-1 text-xs text-gray-600 dark:text-gray-300 leading-tight">
|
<p className="mt-1 text-xs text-gray-600 dark:text-gray-300 leading-tight">
|
||||||
@@ -206,6 +238,11 @@ export function UnifiedToast(props: ToastProps) {
|
|||||||
Verifying installation...
|
Verifying installation...
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
{stage === "downloading (twilight rolling release)" && (
|
||||||
|
<p className="mt-1 text-xs text-purple-600 dark:text-purple-400">
|
||||||
|
Downloading rolling release build...
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -401,7 +401,7 @@ export function ProfilesDataTable({
|
|||||||
}}
|
}}
|
||||||
disabled={!isClient || isRunning || isBrowserUpdating}
|
disabled={!isClient || isRunning || isBrowserUpdating}
|
||||||
>
|
>
|
||||||
Rename profile
|
Rename
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
@@ -411,7 +411,7 @@ export function ProfilesDataTable({
|
|||||||
className="text-red-600"
|
className="text-red-600"
|
||||||
disabled={!isClient || isRunning || isBrowserUpdating}
|
disabled={!isClient || isRunning || isBrowserUpdating}
|
||||||
>
|
>
|
||||||
Delete profile
|
Delete
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
</DropdownMenu>
|
</DropdownMenu>
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ function getSystemTheme(): string {
|
|||||||
export function CustomThemeProvider({ children }: CustomThemeProviderProps) {
|
export function CustomThemeProvider({ children }: CustomThemeProviderProps) {
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
const [isLoading, setIsLoading] = useState(true);
|
||||||
const [defaultTheme, setDefaultTheme] = useState<string>("system");
|
const [defaultTheme, setDefaultTheme] = useState<string>("system");
|
||||||
|
const [mounted, setMounted] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setMounted(true);
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const loadTheme = async () => {
|
const loadTheme = async () => {
|
||||||
@@ -65,11 +70,18 @@ export function CustomThemeProvider({ children }: CustomThemeProviderProps) {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
// Detect system theme to show appropriate loading screen
|
// Use a consistent loading screen that doesn't depend on system theme during SSR
|
||||||
const systemTheme = getSystemTheme();
|
// This prevents hydration mismatch by ensuring server and client render the same initially
|
||||||
const loadingBgColor = systemTheme === "dark" ? "bg-gray-900" : "bg-white";
|
let loadingBgColor = "bg-white";
|
||||||
const spinnerColor =
|
let spinnerColor = "border-gray-900";
|
||||||
systemTheme === "dark" ? "border-white" : "border-gray-900";
|
|
||||||
|
// Only apply system theme detection after component is mounted (client-side only)
|
||||||
|
if (mounted) {
|
||||||
|
const systemTheme = getSystemTheme();
|
||||||
|
loadingBgColor = systemTheme === "dark" ? "bg-gray-900" : "bg-white";
|
||||||
|
spinnerColor =
|
||||||
|
systemTheme === "dark" ? "border-white" : "border-gray-900";
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ export function useAppUpdateNotifications() {
|
|||||||
{
|
{
|
||||||
id: "app-update",
|
id: "app-update",
|
||||||
duration: Number.POSITIVE_INFINITY, // Persistent until user action
|
duration: Number.POSITIVE_INFINITY, // Persistent until user action
|
||||||
position: "top-right",
|
position: "top-left",
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}, [
|
}, [
|
||||||
|
|||||||
@@ -13,35 +13,66 @@ interface UpdateNotification {
|
|||||||
affected_profiles: string[];
|
affected_profiles: string[];
|
||||||
is_stable_update: boolean;
|
is_stable_update: boolean;
|
||||||
timestamp: number;
|
timestamp: number;
|
||||||
|
is_rolling_release: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useUpdateNotifications() {
|
export function useUpdateNotifications(
|
||||||
|
onProfilesUpdated?: () => Promise<void>,
|
||||||
|
) {
|
||||||
const [notifications, setNotifications] = useState<UpdateNotification[]>([]);
|
const [notifications, setNotifications] = useState<UpdateNotification[]>([]);
|
||||||
const [updatingBrowsers, setUpdatingBrowsers] = useState<Set<string>>(
|
const [updatingBrowsers, setUpdatingBrowsers] = useState<Set<string>>(
|
||||||
new Set(),
|
new Set(),
|
||||||
);
|
);
|
||||||
const [isClient, setIsClient] = useState(false);
|
const [dismissedNotifications, setDismissedNotifications] = useState<
|
||||||
|
Set<string>
|
||||||
// Ensure we're on the client side to prevent hydration mismatches
|
>(new Set());
|
||||||
useEffect(() => {
|
|
||||||
setIsClient(true);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const checkForUpdates = useCallback(async () => {
|
const checkForUpdates = useCallback(async () => {
|
||||||
if (!isClient) return; // Only run on client side
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const updates = await invoke<UpdateNotification[]>(
|
const updates = await invoke<UpdateNotification[]>(
|
||||||
"check_for_browser_updates",
|
"check_for_browser_updates",
|
||||||
);
|
);
|
||||||
setNotifications(updates);
|
|
||||||
|
// Filter out dismissed notifications unless they're for a newer version
|
||||||
|
const filteredUpdates = updates.filter((notification) => {
|
||||||
|
// Check if this exact notification was dismissed
|
||||||
|
if (dismissedNotifications.has(notification.id)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if we dismissed an older version for this browser
|
||||||
|
const dismissedForBrowser = Array.from(dismissedNotifications).find(
|
||||||
|
(dismissedId) => {
|
||||||
|
const parts = dismissedId.split("_");
|
||||||
|
if (parts.length >= 2) {
|
||||||
|
const browser = parts[0];
|
||||||
|
return browser === notification.browser;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (dismissedForBrowser) {
|
||||||
|
// Extract the dismissed version to compare
|
||||||
|
const dismissedParts = dismissedForBrowser.split("_to_");
|
||||||
|
if (dismissedParts.length === 2) {
|
||||||
|
const dismissedToVersion = dismissedParts[1];
|
||||||
|
// Only show if this is a newer version than what was dismissed
|
||||||
|
return notification.new_version !== dismissedToVersion;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
|
setNotifications(filteredUpdates);
|
||||||
|
|
||||||
// Show toasts for new notifications - we'll define handleUpdate and handleDismiss separately
|
// Show toasts for new notifications - we'll define handleUpdate and handleDismiss separately
|
||||||
// to avoid circular dependencies
|
// to avoid circular dependencies
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Failed to check for updates:", error);
|
console.error("Failed to check for updates:", error);
|
||||||
}
|
}
|
||||||
}, [isClient]);
|
}, [dismissedNotifications]);
|
||||||
|
|
||||||
const handleUpdate = useCallback(
|
const handleUpdate = useCallback(
|
||||||
async (browser: string, newVersion: string) => {
|
async (browser: string, newVersion: string) => {
|
||||||
@@ -117,6 +148,11 @@ export function useUpdateNotifications() {
|
|||||||
duration: 5000,
|
duration: 5000,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Trigger profile refresh to update UI with new versions
|
||||||
|
if (onProfilesUpdated) {
|
||||||
|
void onProfilesUpdated();
|
||||||
|
}
|
||||||
} catch (downloadError) {
|
} catch (downloadError) {
|
||||||
console.error("Failed to download browser:", downloadError);
|
console.error("Failed to download browser:", downloadError);
|
||||||
|
|
||||||
@@ -158,28 +194,28 @@ export function useUpdateNotifications() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[notifications, checkForUpdates],
|
[notifications, checkForUpdates, onProfilesUpdated],
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleDismiss = useCallback(
|
const handleDismiss = useCallback(
|
||||||
async (notificationId: string) => {
|
async (notificationId: string) => {
|
||||||
if (!isClient) return; // Only run on client side
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
toast.dismiss(notificationId);
|
toast.dismiss(notificationId);
|
||||||
await invoke("dismiss_update_notification", { notificationId });
|
await invoke("dismiss_update_notification", { notificationId });
|
||||||
|
|
||||||
|
// Track this notification as dismissed to prevent showing it again
|
||||||
|
setDismissedNotifications((prev) => new Set(prev).add(notificationId));
|
||||||
|
|
||||||
await checkForUpdates();
|
await checkForUpdates();
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Failed to dismiss notification:", error);
|
console.error("Failed to dismiss notification:", error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[checkForUpdates, isClient],
|
[checkForUpdates],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Separate effect to show toasts when notifications change
|
// Separate effect to show toasts when notifications change
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!isClient) return;
|
|
||||||
|
|
||||||
for (const notification of notifications) {
|
for (const notification of notifications) {
|
||||||
const isUpdating = updatingBrowsers.has(notification.browser);
|
const isUpdating = updatingBrowsers.has(notification.browser);
|
||||||
|
|
||||||
@@ -201,7 +237,7 @@ export function useUpdateNotifications() {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}, [notifications, updatingBrowsers, handleUpdate, handleDismiss, isClient]);
|
}, [notifications, updatingBrowsers, handleUpdate, handleDismiss]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
notifications,
|
notifications,
|
||||||
|
|||||||
+45
-4
@@ -24,7 +24,12 @@ export interface ErrorToastProps extends BaseToastProps {
|
|||||||
|
|
||||||
export interface DownloadToastProps extends BaseToastProps {
|
export interface DownloadToastProps extends BaseToastProps {
|
||||||
type: "download";
|
type: "download";
|
||||||
stage?: "downloading" | "extracting" | "verifying" | "completed";
|
stage?:
|
||||||
|
| "downloading"
|
||||||
|
| "extracting"
|
||||||
|
| "verifying"
|
||||||
|
| "completed"
|
||||||
|
| "downloading (twilight rolling release)";
|
||||||
progress?: {
|
progress?: {
|
||||||
percentage: number;
|
percentage: number;
|
||||||
speed?: string;
|
speed?: string;
|
||||||
@@ -46,13 +51,20 @@ export interface FetchingToastProps extends BaseToastProps {
|
|||||||
browserName?: string;
|
browserName?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface TwilightUpdateToastProps extends BaseToastProps {
|
||||||
|
type: "twilight-update";
|
||||||
|
browserName?: string;
|
||||||
|
hasUpdate?: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
export type ToastProps =
|
export type ToastProps =
|
||||||
| LoadingToastProps
|
| LoadingToastProps
|
||||||
| SuccessToastProps
|
| SuccessToastProps
|
||||||
| ErrorToastProps
|
| ErrorToastProps
|
||||||
| DownloadToastProps
|
| DownloadToastProps
|
||||||
| VersionUpdateToastProps
|
| VersionUpdateToastProps
|
||||||
| FetchingToastProps;
|
| FetchingToastProps
|
||||||
|
| TwilightUpdateToastProps;
|
||||||
|
|
||||||
// Unified toast function
|
// Unified toast function
|
||||||
export function showToast(props: ToastProps & { id?: string }) {
|
export function showToast(props: ToastProps & { id?: string }) {
|
||||||
@@ -81,6 +93,9 @@ export function showToast(props: ToastProps & { id?: string }) {
|
|||||||
case "version-update":
|
case "version-update":
|
||||||
duration = 15000;
|
duration = 15000;
|
||||||
break;
|
break;
|
||||||
|
case "twilight-update":
|
||||||
|
duration = 10000;
|
||||||
|
break;
|
||||||
case "success":
|
case "success":
|
||||||
duration = 3000;
|
duration = 3000;
|
||||||
break;
|
break;
|
||||||
@@ -149,7 +164,12 @@ export function showLoadingToast(
|
|||||||
export function showDownloadToast(
|
export function showDownloadToast(
|
||||||
browserName: string,
|
browserName: string,
|
||||||
version: string,
|
version: string,
|
||||||
stage: "downloading" | "extracting" | "verifying" | "completed",
|
stage:
|
||||||
|
| "downloading"
|
||||||
|
| "extracting"
|
||||||
|
| "verifying"
|
||||||
|
| "completed"
|
||||||
|
| "downloading (twilight rolling release)",
|
||||||
progress?: { percentage: number; speed?: string; eta?: string },
|
progress?: { percentage: number; speed?: string; eta?: string },
|
||||||
options?: { suppressCompletionToast?: boolean },
|
options?: { suppressCompletionToast?: boolean },
|
||||||
) {
|
) {
|
||||||
@@ -160,7 +180,9 @@ export function showDownloadToast(
|
|||||||
? `Downloading ${browserName} ${version}`
|
? `Downloading ${browserName} ${version}`
|
||||||
: stage === "extracting"
|
: stage === "extracting"
|
||||||
? `Extracting ${browserName} ${version}`
|
? `Extracting ${browserName} ${version}`
|
||||||
: `Verifying ${browserName} ${version}`;
|
: stage === "downloading (twilight rolling release)"
|
||||||
|
? `Downloading ${browserName} ${version}`
|
||||||
|
: `Verifying ${browserName} ${version}`;
|
||||||
|
|
||||||
// Don't show completion toast if suppressed (for auto-update scenarios)
|
// Don't show completion toast if suppressed (for auto-update scenarios)
|
||||||
if (stage === "completed" && options?.suppressCompletionToast) {
|
if (stage === "completed" && options?.suppressCompletionToast) {
|
||||||
@@ -245,6 +267,25 @@ export function showErrorToast(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function showTwilightUpdateToast(
|
||||||
|
browserName: string,
|
||||||
|
options?: {
|
||||||
|
id?: string;
|
||||||
|
description?: string;
|
||||||
|
hasUpdate?: boolean;
|
||||||
|
duration?: number;
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
return showToast({
|
||||||
|
type: "twilight-update",
|
||||||
|
title: options?.hasUpdate
|
||||||
|
? `${browserName} twilight update available`
|
||||||
|
: `Checking for ${browserName} twilight updates...`,
|
||||||
|
browserName,
|
||||||
|
...options,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Generic helper for dismissing toasts
|
// Generic helper for dismissing toasts
|
||||||
export function dismissToast(id: string) {
|
export function dismissToast(id: string) {
|
||||||
sonnerToast.dismiss(id);
|
sonnerToast.dismiss(id);
|
||||||
|
|||||||
Reference in New Issue
Block a user