From c89f6d535406311e8e2d11500eaaf15566b8f1db Mon Sep 17 00:00:00 2001 From: goenning Date: Wed, 5 Mar 2025 08:28:16 +0000 Subject: [PATCH] rename + add to download --- .changes/updater-add-on-before-request.md | 2 +- .../process/permissions/schemas/schema.json | 2 +- plugins/updater/src/updater.rs | 23 +++++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.changes/updater-add-on-before-request.md b/.changes/updater-add-on-before-request.md index eefe685c..8405a97a 100644 --- a/.changes/updater-add-on-before-request.md +++ b/.changes/updater-add-on-before-request.md @@ -3,4 +3,4 @@ "updater-js": minor --- -Add `on_before_request` hook to the updater plugin. \ No newline at end of file +Add `configure_client` hook to the updater plugin. \ No newline at end of file diff --git a/plugins/process/permissions/schemas/schema.json b/plugins/process/permissions/schemas/schema.json index 1243c7d3..95f67149 100644 --- a/plugins/process/permissions/schemas/schema.json +++ b/plugins/process/permissions/schemas/schema.json @@ -322,4 +322,4 @@ ] } } -} +} \ No newline at end of file diff --git a/plugins/updater/src/updater.rs b/plugins/updater/src/updater.rs index 9268cf6d..98df31a3 100644 --- a/plugins/updater/src/updater.rs +++ b/plugins/updater/src/updater.rs @@ -115,7 +115,7 @@ pub struct UpdaterBuilder { installer_args: Vec, current_exe_args: Vec, on_before_exit: Option, - on_before_request: Option, + configure_client: Option, } impl UpdaterBuilder { @@ -142,7 +142,7 @@ impl UpdaterBuilder { timeout: None, proxy: None, on_before_exit: None, - on_before_request: None, + configure_client: None, } } @@ -245,13 +245,13 @@ impl UpdaterBuilder { /// Allows you to modify the `reqwest`` client builder before the HTTP request is sent. /// /// Note that `reqwest` crate may be updated in minor releases of tauri-plugin-updater. - /// Therefore it's recommended to pin the plugin to at least a minor version when you're using `on_before_request`. + /// Therefore it's recommended to pin the plugin to at least a minor version when you're using `configure_client`. /// - pub fn on_before_request ClientBuilder + Send + Sync + 'static>( + pub fn configure_client ClientBuilder + Send + Sync + 'static>( mut self, f: F, ) -> Self { - self.on_before_request.replace(Arc::new(f)); + self.configure_client.replace(Arc::new(f)); self } @@ -298,7 +298,7 @@ impl UpdaterBuilder { headers: self.headers, extract_path, on_before_exit: self.on_before_exit, - on_before_request: self.on_before_request, + configure_client: self.configure_client, }) } } @@ -333,7 +333,7 @@ pub struct Updater { headers: HeaderMap, extract_path: PathBuf, on_before_exit: Option, - on_before_request: Option, + configure_client: Option, #[allow(unused)] installer_args: Vec, #[allow(unused)] @@ -395,8 +395,8 @@ impl Updater { request = request.proxy(proxy); } - if let Some(ref on_before_request) = self.on_before_request { - request = on_before_request(request); + if let Some(ref configure_client) = self.configure_client { + request = configure_client(request); } let response = request @@ -463,6 +463,7 @@ impl Updater { headers: self.headers.clone(), installer_args: self.installer_args.clone(), current_exe_args: self.current_exe_args.clone(), + configure_client: self.configure_client.clone(), }) } else { None @@ -511,6 +512,7 @@ pub struct Update { installer_args: Vec, #[allow(unused)] current_exe_args: Vec, + configure_client: Option, } impl Resource for Update {} @@ -539,6 +541,9 @@ impl Update { let proxy = reqwest::Proxy::all(proxy.as_str())?; request = request.proxy(proxy); } + if let Some(ref configure_client) = self.configure_client { + request = configure_client(request); + } let response = request .build()? .get(self.download_url.clone())