From 93071e727f4a1e20836cf9272f995c47bf6706dd Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Tue, 22 Jul 2025 15:00:19 +0800 Subject: [PATCH] linux: fixed multiple instances created in OAuth, closes #1654 (#1659) --- Cargo.lock | 119 +++++------------- Cargo.toml | 12 +- apps/readest-app/src-tauri/Cargo.toml | 30 ++--- .../tauri-plugin-native-bridge/Cargo.toml | 4 +- .../tauri-plugin-native-tts/Cargo.toml | 4 +- 5 files changed, 57 insertions(+), 112 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89d9730b..07ff689e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.3.0", + "tauri-build", "tauri-plugin-cli", "tauri-plugin-deep-link", "tauri-plugin-dialog", @@ -249,7 +249,7 @@ dependencies = [ "enumflags2", "futures-channel", "futures-util", - "rand 0.9.1", + "rand 0.9.2", "raw-window-handle", "serde", "serde_repr", @@ -3881,7 +3881,7 @@ dependencies = [ "bitflags 2.9.1", "lazy_static", "num-traits", - "rand 0.9.1", + "rand 0.9.2", "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax", @@ -4001,7 +4001,7 @@ dependencies = [ "bytes", "getrandom 0.3.3", "lru-slab", - "rand 0.9.1", + "rand 0.9.2", "ring", "rustc-hash", "rustls", @@ -4075,9 +4075,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", @@ -4186,9 +4186,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec" dependencies = [ "bitflags 2.9.1", ] @@ -5282,11 +5282,11 @@ dependencies = [ "specta", "swift-rs", "tauri", - "tauri-build 2.3.1", + "tauri-build", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.6.0", + "tauri-utils", "thiserror 2.0.12", "tokio", "tracing", @@ -5300,28 +5300,6 @@ dependencies = [ "windows", ] -[[package]] -name = "tauri-build" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f025c389d3adb83114bec704da973142e82fc6ec799c7c750c5e21cefaec83" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs", - "glob", - "heck 0.5.0", - "json-patch", - "schemars 0.8.22", - "semver", - "serde", - "serde_json", - "tauri-utils 2.5.0", - "tauri-winres", - "toml 0.8.23", - "walkdir", -] - [[package]] name = "tauri-build" version = "2.3.1" @@ -5338,7 +5316,7 @@ dependencies = [ "serde", "serde_json", "tauri-codegen", - "tauri-utils 2.6.0", + "tauri-utils", "tauri-winres", "toml 0.8.23", "walkdir", @@ -5361,7 +5339,7 @@ dependencies = [ "serde_json", "sha2", "syn 2.0.104", - "tauri-utils 2.6.0", + "tauri-utils", "thiserror 2.0.12", "time", "url", @@ -5378,14 +5356,14 @@ dependencies = [ "quote", "syn 2.0.104", "tauri-codegen", - "tauri-utils 2.6.0", + "tauri-utils", ] [[package]] name = "tauri-plugin" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9a0bd00bf1930ad1a604d08b0eb6b2a9c1822686d65d7f4731a7723b8901d3" +checksum = "5bd5c1e56990c70a906ef67a9851bbdba9136d26075ee9a2b19c8b46986b3e02" dependencies = [ "anyhow", "glob", @@ -5393,7 +5371,7 @@ dependencies = [ "schemars 0.8.22", "serde", "serde_json", - "tauri-utils 2.5.0", + "tauri-utils", "toml 0.8.23", "walkdir", ] @@ -5423,7 +5401,7 @@ dependencies = [ "serde_json", "tauri", "tauri-plugin", - "tauri-utils 2.5.0", + "tauri-utils", "thiserror 2.0.12", "tracing", "url", @@ -5433,9 +5411,9 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aefb14219b492afb30b12647b5b1247cadd2c0603467310c36e0f7ae1698c28" +checksum = "05bedd4c3cf6f7aa97918a8814a736bd3695c9ddf3ede2d50eda6069c3290edc" dependencies = [ "log", "raw-window-handle", @@ -5451,9 +5429,9 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c341290d31991dbca38b31d412c73dfbdb070bb11536784f19dd2211d13b778f" +checksum = "8c6ef84ee2f2094ce093e55106d90d763ba343fad57566992962e8f76d113f99" dependencies = [ "anyhow", "dunce", @@ -5465,7 +5443,7 @@ dependencies = [ "serde_repr", "tauri", "tauri-plugin", - "tauri-utils 2.5.0", + "tauri-utils", "thiserror 2.0.12", "toml 0.8.23", "url", @@ -5487,9 +5465,9 @@ dependencies = [ [[package]] name = "tauri-plugin-http" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c1a38da944b357ffa23bafd563b1579f18e6fbd118fcd84769406d35dcc5c7" +checksum = "fcde333d97e565a7765aad82f32d8672458f7bd77b6ee653830d5dded9d7b5c2" dependencies = [ "bytes", "cookie_store", @@ -5654,9 +5632,9 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b441b6d5d1a194e9fee0b358fe0d602ded845d0f580e1f8c8ef78ebc3c8b225d" +checksum = "e2e5df105284154e5ec277e1b42d022cb2ccd0da08a6bc10eea70eb2a60c9475" dependencies = [ "serde", "serde_json", @@ -5701,9 +5679,9 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3d22b21b9cec73601b512a868f7c74f93c044d44fd6ca1c84e9d6afb6b1559" +checksum = "2d5f6fe3291bfa609c7e0b0ee3bedac294d94c7018934086ce782c1d0f2a468e" dependencies = [ "bitflags 2.9.1", "log", @@ -5728,7 +5706,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils 2.6.0", + "tauri-utils", "thiserror 2.0.12", "url", "windows", @@ -5751,7 +5729,7 @@ dependencies = [ "softbuffer", "tao", "tauri-runtime", - "tauri-utils 2.6.0", + "tauri-utils", "tracing", "url", "webkit2gtk", @@ -5760,43 +5738,6 @@ dependencies = [ "wry", ] -[[package]] -name = "tauri-utils" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41743bbbeb96c3a100d234e5a0b60a46d5aa068f266160862c7afdbf828ca02e" -dependencies = [ - "anyhow", - "cargo_metadata", - "ctor", - "dunce", - "glob", - "html5ever", - "http", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.11.3", - "proc-macro2", - "quote", - "regex", - "schemars 0.8.22", - "semver", - "serde", - "serde-untagged", - "serde_json", - "serde_with", - "swift-rs", - "thiserror 2.0.12", - "toml 0.8.23", - "url", - "urlpattern", - "uuid", - "walkdir", -] - [[package]] name = "tauri-utils" version = "2.6.0" diff --git a/Cargo.toml b/Cargo.toml index be75a10d..1874591a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,8 @@ members = [ "apps/readest-app/src-tauri", "packages/tauri/crates/tauri", + "packages/tauri/crates/tauri-utils", + "packages/tauri/crates/tauri-build", "packages/tauri-plugins/plugins/deep-link", ] resolver = "2" @@ -10,10 +12,10 @@ resolver = "2" serde = { version = "1", features = ["derive"] } tracing = "0.1" log = "0.4" -tauri = { version = "2.6", default-features = false } -tauri-build = "2.3" -tauri-plugin = "2.3" -tauri-utils = "2.5" +tauri = { version = "2", default-features = false } +tauri-build = "2" +tauri-plugin = "2" +tauri-utils = "2" serde_json = "1" thiserror = "2" url = "2" @@ -29,4 +31,6 @@ rust-version = "1.77.2" [patch.crates-io] tauri = { path = "packages/tauri/crates/tauri" } +tauri-utils = { path = "packages/tauri/crates/tauri-utils" } +tauri-build = { path = "packages/tauri/crates/tauri-build" } tauri-plugin-deep-link = { path = "packages/tauri-plugins/plugins/deep-link" } \ No newline at end of file diff --git a/apps/readest-app/src-tauri/Cargo.toml b/apps/readest-app/src-tauri/Cargo.toml index 1713869e..687f845b 100644 --- a/apps/readest-app/src-tauri/Cargo.toml +++ b/apps/readest-app/src-tauri/Cargo.toml @@ -15,7 +15,7 @@ name = "readestlib" crate-type = ["staticlib", "cdylib", "lib"] [build-dependencies] -tauri-build = { version = "2.3.0", features = [] } +tauri-build = { version = "2", features = [] } [dependencies] serde_json = "1.0" @@ -31,19 +31,19 @@ reqwest = { version = "0.12", default-features = false, features = [ "stream", ] } tauri = { version = "2.5.1", features = [ "protocol-asset" ] } -tauri-build = "2.3.0" -tauri-plugin-log = "2.4.0" -tauri-plugin-fs = "2.2.1" -tauri-plugin-dialog = "2.2.1" -tauri-plugin-os = "2.2.1" -tauri-plugin-http = "2.4.3" -tauri-plugin-shell = "2.2.1" -tauri-plugin-process = "2.2.1" +tauri-build = "2" +tauri-plugin-log = "2" +tauri-plugin-fs = "2" +tauri-plugin-dialog = "2" +tauri-plugin-os = "2" +tauri-plugin-http = "2" +tauri-plugin-shell = "2" +tauri-plugin-process = "2" tauri-plugin-oauth = "2" -tauri-plugin-opener = "2.2.6" -tauri-plugin-deep-link = "2.2.1" +tauri-plugin-opener = "2" +tauri-plugin-deep-link = "2" tauri-plugin-sign-in-with-apple = "1.0.2" -tauri-plugin-haptics = "2.2.4" +tauri-plugin-haptics = "2" tauri-plugin-native-bridge = { path = "./plugins/tauri-plugin-native-bridge" } tauri-plugin-native-tts = { path = "./plugins/tauri-plugin-native-tts" } @@ -60,6 +60,6 @@ objc2-foundation = { version = "0.3", features = ["NSError", "NSArray"] } [target.'cfg(any(target_os = "macos", windows, target_os = "linux"))'.dependencies] tauri-plugin-cli = "2" -tauri-plugin-single-instance = "2.2.3" -tauri-plugin-updater = "2.7.0" -tauri-plugin-window-state = "2.2.2" +tauri-plugin-single-instance = "2" +tauri-plugin-updater = "2" +tauri-plugin-window-state = "2" diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/Cargo.toml b/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/Cargo.toml index b85ede13..6512a73d 100644 --- a/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/Cargo.toml +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/Cargo.toml @@ -9,13 +9,13 @@ exclude = ["/examples", "/dist-js", "/guest-js", "/node_modules"] links = "tauri-plugin-native-bridge" [dependencies] -tauri = { version = "2.3.1" } +tauri = { version = "2" } serde = "1.0" thiserror = "2" schemars = "0.8" [build-dependencies] -tauri-plugin = { version = "2.0.4", features = ["build"] } +tauri-plugin = { version = "2", features = ["build"] } schemars = "0.8" [target.'cfg(any(target_os = "macos", windows, target_os = "linux"))'.dependencies] diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-native-tts/Cargo.toml b/apps/readest-app/src-tauri/plugins/tauri-plugin-native-tts/Cargo.toml index 1a244595..e67b114c 100644 --- a/apps/readest-app/src-tauri/plugins/tauri-plugin-native-tts/Cargo.toml +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-native-tts/Cargo.toml @@ -9,11 +9,11 @@ exclude = ["/examples", "/dist-js", "/guest-js", "/node_modules"] links = "tauri-plugin-native-tts" [dependencies] -tauri = { version = "2.5.0" } +tauri = { version = "2" } serde = "1.0" thiserror = "2" schemars = "0.8" [build-dependencies] -tauri-plugin = { version = "2.2.0", features = ["build"] } +tauri-plugin = { version = "2", features = ["build"] } schemars = "0.8"