From 641b809d562725b0236de7ec4084901092316cb3 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Fri, 27 Jun 2025 15:54:52 +0200 Subject: [PATCH] Add Check for Update into Settings popover --- package-lock.json | 17 +++-- package.json | 2 + src/components/GuideButton.svelte | 17 +++++ src/components/OutlineButton.svelte | 3 + src/components/Settings.svelte | 76 ++++++++++++++------ src/components/UpdateSwitch.svelte | 28 ++++++++ src/lib/updateChecker.svelte.ts | 108 ++++++++++++++++++++++++++++ 7 files changed, 227 insertions(+), 24 deletions(-) create mode 100644 src/components/UpdateSwitch.svelte create mode 100644 src/lib/updateChecker.svelte.ts diff --git a/package-lock.json b/package-lock.json index 23bde4305..bc10ac6c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@tauri-apps/plugin-window-state": "^2.2.2", "overlayscrollbars": "^2.11.4", "overlayscrollbars-svelte": "^0.5.5", + "semver": "^7.7.2", "zod": "^3.24.4" }, "devDependencies": { @@ -31,6 +32,7 @@ "@types/lodash": "^4.17.16", "@types/md5": "^2.3.5", "@types/node": "^22.15.17", + "@types/semver": "^7.7.0", "@types/wait-on": "^5.3.4", "@wooorm/starry-night": "^3.7.0", "baconjs": "^3.0.23", @@ -1487,6 +1489,13 @@ "undici-types": "~6.21.0" } }, + "node_modules/@types/semver": { + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.0.tgz", + "integrity": "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/trusted-types": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", @@ -4714,10 +4723,10 @@ } }, "node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, diff --git a/package.json b/package.json index 6a9642d42..671ca03b1 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "@tauri-apps/plugin-window-state": "^2.2.2", "overlayscrollbars": "^2.11.4", "overlayscrollbars-svelte": "^0.5.5", + "semver": "^7.7.2", "zod": "^3.24.4" }, "devDependencies": { @@ -46,6 +47,7 @@ "@types/lodash": "^4.17.16", "@types/md5": "^2.3.5", "@types/node": "^22.15.17", + "@types/semver": "^7.7.0", "@types/wait-on": "^5.3.4", "@wooorm/starry-night": "^3.7.0", "baconjs": "^3.0.23", diff --git a/src/components/GuideButton.svelte b/src/components/GuideButton.svelte index cb52b9a80..3b52a2892 100644 --- a/src/components/GuideButton.svelte +++ b/src/components/GuideButton.svelte @@ -6,6 +6,7 @@ import type { Config } from "@bindings/config/Config"; import { activeRouteStore, push } from "@app/lib/router"; + import { settingsPopoverToggleId } from "./Settings.svelte"; import { addRepoPopoverToggleId } from "./AddRepoButton.svelte"; import { didFromPublicKey, truncateDid } from "@app/lib/utils"; import { nodeRunning } from "@app/lib/events"; @@ -97,6 +98,22 @@ you can share this with anyone to find you on the network. +
+ We release a new version of the app every two weeks. To stay up to + date, go to + + and enable 'Check for updates' to receive notifications about new releases. +
{#if radicleInstalled() || $nodeRunning}
diff --git a/src/components/OutlineButton.svelte b/src/components/OutlineButton.svelte index db2c45028..00941322b 100644 --- a/src/components/OutlineButton.svelte +++ b/src/components/OutlineButton.svelte @@ -2,6 +2,7 @@ import type { Snippet } from "svelte"; interface Props { + id?: string; popoverToggle?: string; active?: boolean; children: Snippet; @@ -13,6 +14,7 @@ } const { + id, popoverToggle, active = false, children, @@ -283,6 +285,7 @@
+ export const settingsPopoverToggleId = "settings-popover-toggle"; + + + + + +
+ + + +
diff --git a/src/lib/updateChecker.svelte.ts b/src/lib/updateChecker.svelte.ts new file mode 100644 index 000000000..c1d341547 --- /dev/null +++ b/src/lib/updateChecker.svelte.ts @@ -0,0 +1,108 @@ +import * as z from "zod"; +import * as semver from "semver"; + +import useLocalStorage from "./useLocalStorage.svelte"; +import { invoke } from "./invoke"; + +interface LatestVersionInfo { + version: string; +} + +const fetchLatestVersion = async (): Promise => { + const response = await fetch( + "https://minio-api.radworks.garden/radworks-releases/radicle-desktop/latest/latest.json", + ); + const body: LatestVersionInfo = await response.json(); + return body; +}; + +// Check for new version every hour. +const VERSION_CHECK_INTERVAL = 3600 * 1000; + +const isEnabledStore = useLocalStorage( + "updateChecker.isEnabled", + z.boolean().nullable(), + null, + !window.localStorage, +); + +class UpdateChecker { + private checkInterval: number | undefined = $state(); + private latestVersionInfo: LatestVersionInfo | undefined = $state(); + public currentVersion: string | undefined = $state(); + + public isEnabled = $derived.by(() => { + if (isEnabledStore.value === null) { + return false; + } else { + return isEnabledStore.value; + } + }); + + // A state that holds the `LatestVersionInfo` if this feature has + // been enabled and if there is a newer version available. + public newVersion = $derived.by(() => { + if (this.latestVersionInfo && this.currentVersion) { + if (semver.gt(this.latestVersionInfo.version, this.currentVersion)) { + return this.latestVersionInfo.version; + } else { + return undefined; + } + } else { + return undefined; + } + }); + + public static init(): UpdateChecker { + const updateChecker = new UpdateChecker(); + if (isEnabledStore.value) { + updateChecker.enable(); + } + + void invoke("version").then(currentVersion => { + const version = semver.coerce(currentVersion); + if (version) { + updateChecker.currentVersion = version.toString(); + } + }); + + return updateChecker; + } + + // Disable background update checking. + public disable = (): void => { + isEnabledStore.value = false; + + if (this.checkInterval) { + clearInterval(this.checkInterval); + this.checkInterval = undefined; + } + }; + + private async checkNewVersion(): Promise { + try { + this.latestVersionInfo = await fetchLatestVersion(); + } catch { + return false; + } + + return ( + this.currentVersion !== undefined && + semver.gt(this.latestVersionInfo.version, this.currentVersion) + ); + } + + // Enable background udpate checking. + public enable = (): void => { + isEnabledStore.value = true; + + void this.checkNewVersion(); + if (!this.checkInterval) { + this.checkInterval = window.setInterval(() => { + void this.checkNewVersion(); + }, VERSION_CHECK_INTERVAL); + } + }; +} + +export const updateChecker = UpdateChecker.init();