fix: adjust feature flags, wrong zip usage

examples/api/src-tauri/Cargo.toml

@@ -22,7 +22,7 @@ tauri-plugin-log = { path = "../../../plugins/log" }
 tauri-plugin-fs = { path = "../../../plugins/fs" }
 tauri-plugin-clipboard = { path = "../../../plugins/clipboard" }
 tauri-plugin-dialog = { path = "../../../plugins/dialog" }
-tauri-plugin-http = { path = "../../../plugins/http", features = [ "http-multipart" ] }
+tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart" ] }
 tauri-plugin-notification = { path = "../../../plugins/notification", features = [ "windows7-compat" ] }
 tauri-plugin-os = { path = "../../../plugins/os" }
 tauri-plugin-process = { path = "../../../plugins/process" }

plugins/http/Cargo.toml

@@ -19,7 +19,7 @@ http = "0.2"
 reqwest = { version = "0.11", default-features = false, features = [ "json", "stream" ] }
 
 [features]
-http-multipart = [ "reqwest/multipart" ]
+multipart = [ "reqwest/multipart" ]
 native-tls = [ "reqwest/native-tls" ]
 native-tls-vendored = [ "reqwest/native-tls-vendored" ]
 rustls-tls = [ "reqwest/rustls-tls" ]

plugins/http/guest-js/index.ts

@@ -103,7 +103,7 @@ class Body {
    * and the value is either a string or a file object.
    *
    * By default it sets the `application/x-www-form-urlencoded` Content-Type header,
-   * but you can set it to `multipart/form-data` if the Cargo feature `http-multipart` is enabled.
+   * but you can set it to `multipart/form-data` if the Cargo feature `multipart` is enabled.
    *
    * Note that a file path must be allowed in the `fs` allowlist scope.
    * @example

plugins/http/src/commands/client.rs

@@ -91,7 +91,7 @@ impl Client {
                         headers: &mut Option<HeaderMap>,
                         form_body: FormBody,
                     ) -> crate::Result<reqwest::RequestBuilder> {
-                        #[cfg(feature = "http-multipart")]
+                        #[cfg(feature = "multipart")]
                         if matches!(
                             headers
                                 .as_ref()

plugins/updater/Cargo.toml

@@ -26,6 +26,8 @@ tempfile = "3"
 flate2 = "1"
 tar = "0.4"
 ignore = "0.4"
+
+[target."cfg(target_os = \"windows\")".dependencies]
 zip = { version = "0.6", default-features = false }
 
 [dev-dependencies]

plugins/updater/src/error.rs

@@ -84,6 +84,10 @@ pub enum Error {
     /// Ignore error.
     #[error("failed to walkdir: {0}")]
     Ignore(#[from] ignore::Error),
+    /// Zip error.
+    #[cfg(windows)]
+    #[error(transparent)]
+    ZipError(#[from] zip::result::ZipError),
 }
 
 impl Serialize for Error {

plugins/updater/src/updater/extract.rs

@@ -5,8 +5,8 @@
 use std::{
     borrow::Cow,
     fs,
-    io::{self, Cursor, Read, Seek},
+    io::{self, Read, Seek},
-    path::{self, Path, PathBuf},
+    path::{self, Path},
 };
 
 use crate::{Error, Result};
@@ -46,10 +46,20 @@ pub enum ArchiveFormat {
     /// Tar archive.
     Tar(Option<Compression>),
     /// Zip archive.
-    #[allow(dead_code)]
+    #[cfg(windows)]
     Zip,
 }
 
+impl ArchiveFormat {
+    fn compression(self) -> Option<Compression> {
+        match self {
+            Self::Tar(c) => c,
+            #[allow(unreachable_patterns)]
+            _ => None,
+        }
+    }
+}
+
 /// The supported compression types.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[non_exhaustive]
@@ -59,8 +69,9 @@ pub enum Compression {
 }
 
 /// The zip entry.
+#[cfg(windows)]
 pub struct ZipEntry {
-    path: PathBuf,
+    path: std::path::PathBuf,
     is_dir: bool,
     file_contents: Vec<u8>,
 }
@@ -73,7 +84,7 @@ pub enum Entry<'a, R: Read> {
     Tar(Box<tar::Entry<'a, R>>),
     /// An entry of a zip archive.
     #[non_exhaustive]
-    #[allow(dead_code)]
+    #[cfg(windows)]
     Zip(ZipEntry),
 }
 
@@ -82,6 +93,7 @@ impl<'a, R: Read> Entry<'a, R> {
     pub fn path(&self) -> Result<Cow<'_, Path>> {
         match self {
             Self::Tar(e) => e.path().map_err(Into::into),
+            #[cfg(windows)]
             Self::Zip(e) => Ok(Cow::Borrowed(&e.path)),
         }
     }
@@ -113,6 +125,7 @@ impl<'a, R: Read> Entry<'a, R> {
                     }
                 }
             }
+            #[cfg(windows)]
             Self::Zip(entry) => {
                 if entry.is_dir {
                     // this is a directory, lets create it
@@ -126,7 +139,10 @@ impl<'a, R: Read> Entry<'a, R> {
                     }
                 } else {
                     let mut out_file = fs::File::create(into_path)?;
-                    io::copy(&mut Cursor::new(entry.file_contents), &mut out_file)?;
+                    io::copy(
+                        &mut std::io::Cursor::new(entry.file_contents),
+                        &mut out_file,
+                    )?;
                 }
             }
         }
@@ -158,11 +174,7 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
             #[cfg(debug_assertions)]
             eprintln!("Could not seek to start of the file");
         }
-        let compression = if let ArchiveFormat::Tar(compression) = archive_format {
+        let compression = archive_format.compression();
-            compression
-        } else {
-            None
-        };
         Extract {
             reader: match compression {
                 Some(Compression::Gz) => {
@@ -198,28 +210,26 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
                 }
             }
 
+            #[cfg(windows)]
             ArchiveFormat::Zip => {
-                #[cfg(feature = "fs-extract-api")]
+                let mut archive = zip::ZipArchive::new(self.reader.get_mut())?;
-                {
+                let file_names = archive
-                    let mut archive = zip::ZipArchive::new(self.reader.get_mut())?;
+                    .file_names()
-                    let file_names = archive
+                    .map(|f| f.to_string())
-                        .file_names()
+                    .collect::<Vec<String>>();
-                        .map(|f| f.to_string())
+                for path in file_names {
-                        .collect::<Vec<String>>();
+                    let mut zip_file = archive.by_name(&path)?;
-                    for path in file_names {
+                    let is_dir = zip_file.is_dir();
-                        let mut zip_file = archive.by_name(&path)?;
+                    let mut file_contents = Vec::new();
-                        let is_dir = zip_file.is_dir();
+                    zip_file.read_to_end(&mut file_contents)?;
-                        let mut file_contents = Vec::new();
+                    let stop = f(Entry::Zip(ZipEntry {
-                        zip_file.read_to_end(&mut file_contents)?;
+                        path: path.into(),
-                        let stop = f(Entry::Zip(ZipEntry {
+                        is_dir,
-                            path: path.into(),
+                        file_contents,
-                            is_dir,
+                    }))
-                            file_contents,
+                    .map_err(Into::into)?;
-                        }))
+                    if stop {
-                        .map_err(Into::into)?;
+                        break;
-                        if stop {
-                            break;
-                        }
                     }
                 }
             }
@@ -239,34 +249,32 @@ impl<'a, R: Read + Seek> Extract<'a, R> {
                 archive.unpack(into_dir)?;
             }
 
+            #[cfg(windows)]
             ArchiveFormat::Zip => {
-                #[cfg(feature = "fs-extract-api")]
+                let mut archive = zip::ZipArchive::new(self.reader.get_mut())?;
-                {
+                for i in 0..archive.len() {
-                    let mut archive = zip::ZipArchive::new(self.reader.get_mut())?;
+                    let mut file = archive.by_index(i)?;
-                    for i in 0..archive.len() {
+                    // Decode the file name from raw bytes instead of using file.name() directly.
-                        let mut file = archive.by_index(i)?;
+                    // file.name() uses String::from_utf8_lossy() which may return messy characters
-                        // Decode the file name from raw bytes instead of using file.name() directly.
+                    // such as: 爱交易.app/, that does not work as expected.
-                        // file.name() uses String::from_utf8_lossy() which may return messy characters
+                    // Here we require the file name must be a valid UTF-8.
-                        // such as: 爱交易.app/, that does not work as expected.
+                    let file_name = String::from_utf8(file.name_raw().to_vec())?;
-                        // Here we require the file name must be a valid UTF-8.
+                    let out_path = into_dir.join(file_name);
-                        let file_name = String::from_utf8(file.name_raw().to_vec())?;
+                    if file.is_dir() {
-                        let out_path = into_dir.join(file_name);
+                        fs::create_dir_all(&out_path)?;
-                        if file.is_dir() {
+                    } else {
-                            fs::create_dir_all(&out_path)?;
+                        if let Some(out_path_parent) = out_path.parent() {
-                        } else {
+                            fs::create_dir_all(out_path_parent)?;
-                            if let Some(out_path_parent) = out_path.parent() {
-                                fs::create_dir_all(out_path_parent)?;
-                            }
-                            let mut out_file = fs::File::create(&out_path)?;
-                            io::copy(&mut file, &mut out_file)?;
                         }
-                        // Get and Set permissions
+                        let mut out_file = fs::File::create(&out_path)?;
-                        #[cfg(unix)]
+                        io::copy(&mut file, &mut out_file)?;
-                        {
+                    }
-                            use std::os::unix::fs::PermissionsExt;
+                    // Get and Set permissions
-                            if let Some(mode) = file.unix_mode() {
+                    #[cfg(unix)]
-                                fs::set_permissions(&out_path, fs::Permissions::from_mode(mode))?;
+                    {
-                            }
+                        use std::os::unix::fs::PermissionsExt;
+                        if let Some(mode) = file.unix_mode() {
+                            fs::set_permissions(&out_path, fs::Permissions::from_mode(mode))?;
                         }
                     }
                 }