Merge branch 'v2' into feature/v2-http-dangerous-settings

Author: RickeyWard

.changes/updater-builder-header.md

@@ -0,0 +1,7 @@
+---
+"updater": "patch"
+"updater-js": "patch"
+---
+
+Add `Builder::header` and `Builder::headers` method to configure default headers for updater.
+

README.md

@@ -29,7 +29,7 @@ This repo and all plugins require a Rust version of at least **1.77.2**
 | [process](plugins/process)                     | This plugin provides APIs to access the current process. To spawn child processes, see the [`shell`](https://github.com/tauri-apps/tauri-plugin-shell) plugin. | ✅  | ✅  | ✅  | ?   | ?   |
 | [shell](plugins/shell)                         | Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application.                                        | ✅  | ✅  | ✅  | ?   | ?   |
 | [single-instance](plugins/single-instance)     | Ensure a single instance of your tauri app is running.                                                                                                         | ✅  | ✅  | ✅  | ❌  | ❌  |
-| [sql](plugins/sql)                             | Interface with SQL databases.                                                                                                                                  | ✅  | ✅  | ✅  | ?   | ✅  |
+| [sql](plugins/sql)                             | Interface with SQL databases.                                                                                                                                  | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [store](plugins/store)                         | Persistent key value storage.                                                                                                                                  | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [stronghold](plugins/stronghold)               | Encrypted, secure database.                                                                                                                                    | ✅  | ✅  | ✅  | ?   | ?   |
 | [updater](plugins/updater)                     | In-app updates for Tauri applications.                                                                                                                         | ✅  | ✅  | ✅  | ❌  | ❌  |

package.json

@@ -21,10 +21,10 @@
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-security": "3.0.1",
     "prettier": "3.4.2",
-    "rollup": "4.28.1",
+    "rollup": "4.29.1",
     "tslib": "2.8.1",
     "typescript": "5.7.2",
-    "typescript-eslint": "8.18.0"
+    "typescript-eslint": "8.18.2"
   },
   "resolutions": {
     "semver": ">=7.5.2",

plugins/sql/Cargo.toml

@@ -19,7 +19,7 @@ windows = { level = "full", notes = "" }
 linux = { level = "full", notes = "" }
 macos = { level = "full", notes = "" }
 android = { level = "full", notes = "" }
-ios = { level = "none", notes = "" }
+ios = { level = "full", notes = "" }
 
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }

plugins/updater/src/lib.rs

@@ -13,6 +13,7 @@
 
 use std::{ffi::OsString, sync::Arc};
 
+use http::{HeaderMap, HeaderName, HeaderValue};
 use semver::Version;
 use tauri::{
     plugin::{Builder as PluginBuilder, TauriPlugin},
@@ -74,13 +75,15 @@ impl<R: Runtime, T: Manager<R>> UpdaterExt<R> for T {
             config,
             target,
             version_comparator,
+            headers,
         } = self.state::<UpdaterState>().inner();
 
         let mut builder = UpdaterBuilder::new(
             package_info.name.clone(),
             package_info.version.clone(),
             config.clone(),
-        );
+        )
+        .headers(headers.clone());
 
         if let Some(target) = target {
             builder = builder.target(target);
@@ -124,13 +127,15 @@ struct UpdaterState {
     target: Option<String>,
     config: Config,
     version_comparator: Option<VersionComparator>,
+    headers: HeaderMap,
 }
 
 #[derive(Default)]
 pub struct Builder {
     target: Option<String>,
     pubkey: Option<String>,
     installer_args: Vec<OsString>,
+    headers: HeaderMap,
     default_version_comparator: Option<VersionComparator>,
 }
 
@@ -172,6 +177,26 @@ impl Builder {
         self
     }
 
+    pub fn header<K, V>(mut self, key: K, value: V) -> Result<Self>
+    where
+        HeaderName: TryFrom<K>,
+        <HeaderName as TryFrom<K>>::Error: Into<http::Error>,
+        HeaderValue: TryFrom<V>,
+        <HeaderValue as TryFrom<V>>::Error: Into<http::Error>,
+    {
+        let key: std::result::Result<HeaderName, http::Error> = key.try_into().map_err(Into::into);
+        let value: std::result::Result<HeaderValue, http::Error> =
+            value.try_into().map_err(Into::into);
+        self.headers.insert(key?, value?);
+
+        Ok(self)
+    }
+
+    pub fn headers(mut self, headers: HeaderMap) -> Self {
+        self.headers = headers;
+        self
+    }
+
     pub fn default_version_comparator<
         F: Fn(Version, RemoteRelease) -> bool + Send + Sync + 'static,
     >(
@@ -187,6 +212,7 @@ impl Builder {
         let target = self.target;
         let version_comparator = self.default_version_comparator;
         let installer_args = self.installer_args;
+        let headers = self.headers;
         PluginBuilder::<R, Config>::new("updater")
             .setup(move |app, api| {
                 let mut config = api.config().clone();
@@ -200,6 +226,7 @@ impl Builder {
                     target,
                     config,
                     version_comparator,
+                    headers,
                 });
                 Ok(())
             })

plugins/updater/src/updater.rs

@@ -179,6 +179,16 @@ impl UpdaterBuilder {
         Ok(self)
     }
 
+    pub fn headers(mut self, headers: HeaderMap) -> Self {
+        self.headers = headers;
+        self
+    }
+
+    pub fn clear_headers(mut self) -> Self {
+        self.headers.clear();
+        self
+    }
+
     pub fn timeout(mut self, timeout: Duration) -> Self {
         self.timeout = Some(timeout);
         self