diff --git a/.changes/log-cleanup.md b/.changes/log-cleanup.md new file mode 100644 index 00000000..e6343055 --- /dev/null +++ b/.changes/log-cleanup.md @@ -0,0 +1,6 @@ +--- +"log": patch +"log-js": patch +--- + +Remove log delays for iOS simulators that are no longer necessary. diff --git a/Cargo.lock b/Cargo.lock index f46f608f..0d424c66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6293,9 +6293,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.34.2" +version = "0.34.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4daa814018fecdfb977b59a094df4bd43b42e8e21f88fddfc05807e6f46efaaf" +checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" dependencies = [ "bitflags 2.9.0", "block2 0.6.0", @@ -6367,9 +6367,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.8.4" +version = "2.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d545ccf7b60dcd44e07c6fb5aeb09140966f0aabd5d2aa14a6821df7bc99348" +checksum = "9e492485dd390b35f7497401f67694f46161a2a00ffd800938d5dd3c898fb9d8" dependencies = [ "anyhow", "bytes", @@ -6413,7 +6413,6 @@ dependencies = [ "tokio", "tray-icon", "url", - "urlpattern", "uuid", "webkit2gtk", "webview2-com", @@ -6423,9 +6422,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67945dbaf8920dbe3a1e56721a419a0c3d085254ab24cff5b9ad55e2b0016e0b" +checksum = "87d6f8cafe6a75514ce5333f115b7b1866e8e68d9672bf4ca89fc0f35697ea9d" dependencies = [ "anyhow", "cargo_toml", @@ -6447,9 +6446,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.4.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab3a62cf2e6253936a8b267c2e95839674e7439f104fa96ad0025e149d54d8a" +checksum = "b7ef707148f0755110ca54377560ab891d722de4d53297595380a748026f139f" dependencies = [ "base64 0.22.1", "ico", @@ -6473,9 +6472,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.4.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4368ea8094e7045217edb690f493b55b30caf9f3e61f79b4c24b6db91f07995e" +checksum = "71664fd715ee6e382c05345ad258d6d1d50f90cf1b58c0aa726638b33c2a075d" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -6990,9 +6989,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cfc9ad45b487d3fded5a4731a567872a4812e9552e3964161b08edabf93846" +checksum = "9368f09358496f2229313fccb37682ad116b7f46fa76981efe116994a0628926" dependencies = [ "cookie", "dpi", @@ -7015,9 +7014,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.8.1" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fe9d48bd122ff002064e88cfcd7027090d789c4302714e68fcccba0f4b7807" +checksum = "929f5df216f5c02a9e894554401bcdab6eec3e39ec6a4a7731c7067fc8688a93" dependencies = [ "gtk", "http", @@ -7042,9 +7041,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a3852fdf9a4f8fbeaa63dc3e9a85284dd6ef7200751f0bd66ceee30c93f212" +checksum = "f6b8bbe426abdbf52d050e52ed693130dbd68375b9ad82a3fb17efb4c8d85673" dependencies = [ "aes-gcm", "anyhow", @@ -8803,9 +8802,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "wry" -version = "0.53.2" +version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b6763512fe4b51c80b3ce9b50939d682acb4de335dfabbdb20d7a2642199b7" +checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" dependencies = [ "base64 0.22.1", "block2 0.6.0", diff --git a/Cargo.toml b/Cargo.toml index 071f54ff..ddb3c238 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ resolver = "2" serde = { version = "1", features = ["derive"] } tracing = "0.1" log = "0.4" -tauri = { version = "2.8.2", default-features = false } +tauri = { version = "2.9.3", default-features = false } tauri-build = "2.4" tauri-plugin = "2.4" tauri-utils = "2.7" diff --git a/plugins/log/ios/Sources/LogPlugin.swift b/plugins/log/ios/Sources/LogPlugin.swift index 9903920f..d1ced2c9 100644 --- a/plugins/log/ios/Sources/LogPlugin.swift +++ b/plugins/log/ios/Sources/LogPlugin.swift @@ -7,48 +7,8 @@ import Tauri import UIKit import os.log -#if targetEnvironment(simulator) - var logReady = false -#else - var logReady = true -#endif - -var pendingLogs: [(Int, NSString)] = [] -var elapsedTime: TimeInterval = 0 -var logFlushScheduled = false - @_cdecl("tauri_log") func log(level: Int, message: NSString) { - if logReady { - os_log(level, message) - } else { - pendingLogs.append((level, message)) - scheduleLogFlush() - } -} - -// delay logging when the logger isn't immediately available -// in some cases when using the simulator the app would hang when calling os_log too soon -// better be safe here and wait a few seconds than actually freeze the app in dev mode -// in production this isn't a problem -func scheduleLogFlush() { - guard !logFlushScheduled else { return } - logFlushScheduled = true - - DispatchQueue.main.asyncAfter(deadline: .now() + 5) { - logReady = true - flushLogs() - } -} - -func flushLogs() { - for (level, message) in pendingLogs { - os_log(level, message) - } - pendingLogs.removeAll() -} - -func os_log(_ level: Int, _ message: NSString) { switch level { case 1: Logger.debug(message as String) case 2: Logger.info(message as String)