From 54c48152f8e4542bcb04baf32a811379d7c6d4ce Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 10:33:25 -0800
Subject: [PATCH 01/13] Update dependencies, bump to version 0.7.3

---
 Cargo.lock     | 2243 ++++++++++++++++++++++++++++++++++--------------
 Cargo.toml     |   15 +-
 src/pandora.rs |    1 -
 src/track.rs   |   13 +-
 4 files changed, 1589 insertions(+), 683 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 36649da..b30b691 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,21 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aes"
@@ -30,12 +30,12 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom",
+ "getrandom 0.3.4",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -57,7 +57,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
 dependencies = [
  "alsa-sys",
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "libc",
 ]
@@ -72,12 +72,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -89,9 +83,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -104,43 +98,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
- "windows-sys 0.59.0",
+ "once_cell_polyfill",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea"
 
 [[package]]
 name = "async-broadcast"
@@ -158,7 +153,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener 5.4.1",
  "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
@@ -166,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.3.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
 dependencies = [
  "concurrent-queue",
  "event-listener-strategy",
@@ -178,14 +173,15 @@ dependencies = [
 
 [[package]]
 name = "async-executor"
-version = "1.13.1"
+version = "1.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
 dependencies = [
  "async-task",
  "concurrent-queue",
  "fastrand 2.3.0",
- "futures-lite 2.5.0",
+ "futures-lite 2.6.1",
+ "pin-project-lite",
  "slab",
 ]
 
@@ -215,7 +211,7 @@ dependencies = [
  "log",
  "parking",
  "polling 2.8.0",
- "rustix 0.37.27",
+ "rustix 0.37.28",
  "slab",
  "socket2 0.4.10",
  "waker-fn",
@@ -223,21 +219,20 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.4.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
 dependencies = [
- "async-lock 3.4.0",
+ "autocfg",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.5.0",
+ "futures-lite 2.6.1",
  "parking",
- "polling 3.7.4",
- "rustix 0.38.42",
+ "polling 3.11.0",
+ "rustix 1.1.3",
  "slab",
- "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -251,11 +246,11 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.4.0"
+version = "3.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener 5.4.1",
  "event-listener-strategy",
  "pin-project-lite",
 ]
@@ -273,7 +268,7 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.42",
+ "rustix 0.38.44",
  "windows-sys 0.48.0",
 ]
 
@@ -285,25 +280,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "async-signal"
-version = "0.2.10"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
 dependencies = [
- "async-io 2.4.0",
- "async-lock 3.4.0",
+ "async-io 2.6.0",
+ "async-lock 3.4.2",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.42",
+ "rustix 1.1.3",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -314,13 +309,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.83"
+version = "0.1.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -331,15 +326,37 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b7b6141e96a8c160799cc2d5adecd5cbbe5054cb8c7c4af53da0f83bb7ad256"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -347,7 +364,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -358,11 +375,11 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
-version = "0.70.1"
+version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
  "cexpr",
  "clang-sys",
  "itertools",
@@ -371,7 +388,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -382,9 +399,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "block-buffer"
@@ -406,14 +423,14 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.6.1"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
 dependencies = [
  "async-channel",
  "async-task",
  "futures-io",
- "futures-lite 2.5.0",
+ "futures-lite 2.6.1",
  "piper",
 ]
 
@@ -429,9 +446,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
 
 [[package]]
 name = "byteorder"
@@ -441,9 +458,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "castaway"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "cbc"
@@ -456,10 +482,11 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.6"
+version = "1.2.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
+checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -482,22 +509,27 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -523,18 +555,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.23"
+version = "4.5.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.23"
+version = "4.5.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -542,15 +574,24 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
+
+[[package]]
+name = "cmake"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+dependencies = [
+ "cc",
+]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "combine"
@@ -562,6 +603,20 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "compact_str"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "rustversion",
+ "ryu",
+ "static_assertions",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -581,6 +636,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -600,9 +665,9 @@ dependencies = [
 
 [[package]]
 name = "coreaudio-sys"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b"
+checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6"
 dependencies = [
  "bindgen",
 ]
@@ -627,23 +692,23 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "windows",
+ "windows 0.54.0",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -656,15 +721,15 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crossterm"
-version = "0.25.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.10.0",
  "crossterm_winapi",
- "libc",
- "mio 0.8.11",
+ "mio",
  "parking_lot",
+ "rustix 0.38.44",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -681,9 +746,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "typenum",
@@ -691,9 +756,9 @@ dependencies = [
 
 [[package]]
 name = "cursive"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839"
+checksum = "386d5a36020bb856e9a34ecb8a4e6c9bd6b0262d1857bae4db7bc7e2fdaa532e"
 dependencies = [
  "ahash",
  "cfg-if",
@@ -708,22 +773,34 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "cursive-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac7ac0eb0cede3dfdfebf4d5f22354e05a730b79c25fd03481fc69fcfba0a73e"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "cursive_core"
-version = "0.3.7"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d"
+checksum = "321ec774d27fafc66e812034d0025f8858bd7d9095304ff8fc200e0b9f9cc257"
 dependencies = [
  "ahash",
+ "compact_str",
  "crossbeam-channel",
+ "cursive-macros",
  "enum-map",
  "enumset",
  "lazy_static",
  "log",
  "num",
- "owning_ref",
+ "parking_lot",
+ "serde_json",
  "time",
- "toml 0.5.11",
+ "toml 0.8.23",
  "unicode-segmentation",
  "unicode-width",
  "xi-unicode",
@@ -731,37 +808,71 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.92",
+ "syn 2.0.115",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.115",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
- "darling_core",
+ "darling_core 0.21.3",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -772,9 +883,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4"
 dependencies = [
  "powerfmt",
 ]
@@ -803,23 +914,23 @@ dependencies = [
 
 [[package]]
 name = "dirs"
-version = "5.0.1"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
 dependencies = [
  "dirs-sys",
 ]
 
 [[package]]
 name = "dirs-sys"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
 dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.48.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -830,14 +941,20 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "encoding_rs"
@@ -865,14 +982,14 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "enumflags2"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -880,50 +997,50 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "enumset"
-version = "1.1.5"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
+checksum = "25b07a8dfbbbfc0064c0a6bdf9edcf966de6b1c33ce344bdeca3b41615452634"
 dependencies = [
  "enumset_derive",
 ]
 
 [[package]]
 name = "enumset_derive"
-version = "0.10.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
+checksum = "f43e744e4ea338060faee68ed933e46e722fb7f3617e722a5772d7e856d8b3ce"
 dependencies = [
- "darling",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -945,9 +1062,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "5.3.1"
+version = "5.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -956,11 +1073,11 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
 dependencies = [
- "event-listener 5.3.1",
+ "event-listener 5.4.1",
  "pin-project-lite",
 ]
 
@@ -997,16 +1114,21 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
 [[package]]
 name = "flexi_logger"
-version = "0.28.5"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca927478b3747ba47f98af6ba0ac0daea4f12d12f55e9104071b3dc00276310"
+checksum = "aea7feddba9b4e83022270d49a58d4a1b3fdad04b34f78cf1ce471f698e42672"
 dependencies = [
  "chrono",
- "glob",
  "log",
- "thiserror",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -1015,6 +1137,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -1032,13 +1160,19 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -1104,9 +1238,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
 dependencies = [
  "fastrand 2.3.0",
  "futures-core",
@@ -1123,7 +1257,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -1168,32 +1302,61 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasip3",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -1210,9 +1373,18 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 
 [[package]]
 name = "heck"
@@ -1228,9 +1400,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hermit-abi"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hex"
@@ -1258,12 +1430,11 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
  "bytes",
- "fnv",
  "itoa",
 ]
 
@@ -1279,12 +1450,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "pin-project-lite",
@@ -1292,41 +1463,43 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "human-panic"
-version = "2.0.2"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b84a66a325082740043a6c28bbea400c129eac0d3a27673a1de971e44bf1f7"
+checksum = "075e8747af11abcff07d55d98297c9c6c70eb5d6365b25e7b12f02e484935191"
 dependencies = [
  "anstream",
  "anstyle",
  "backtrace",
- "os_info",
  "serde",
  "serde_derive",
- "toml 0.8.19",
+ "sysinfo",
+ "toml 0.9.12+spec-1.1.0",
  "uuid",
 ]
 
 [[package]]
 name = "hyper"
-version = "1.5.2"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "h2",
  "http",
  "http-body",
  "httparse",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -1334,11 +1507,10 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "futures-util",
  "http",
  "hyper",
  "hyper-util",
@@ -1367,35 +1539,42 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
+ "base64",
  "bytes",
  "futures-channel",
  "futures-util",
  "http",
  "http-body",
  "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.8",
+ "socket2 0.6.2",
+ "system-configuration",
  "tokio",
  "tower-service",
  "tracing",
+ "windows-registry",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log",
  "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core 0.62.2",
 ]
 
 [[package]]
@@ -1409,21 +1588,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -1432,98 +1612,66 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
 dependencies = [
- "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
+ "icu_locale_core",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
+name = "id-arena"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.92",
-]
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
 name = "ident_case"
@@ -1533,9 +1681,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -1544,9 +1692,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -1554,19 +1702,21 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.16.1",
+ "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "inout"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
  "block-padding",
  "generic-array",
@@ -1594,15 +1744,25 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "iri-string"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a"
+dependencies = [
+ "memchr",
+ "serde",
+]
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.1"
+version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
 
 [[package]]
 name = "itertools"
@@ -1615,9 +1775,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
 [[package]]
 name = "jni"
@@ -1630,7 +1790,7 @@ dependencies = [
  "combine",
  "jni-sys",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
  "windows-sys 0.45.0",
 ]
@@ -1643,18 +1803,19 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
+ "getrandom 0.3.4",
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1670,7 +1831,7 @@ dependencies = [
  "lazy_static",
  "linux-keyutils",
  "secret-service",
- "security-framework",
+ "security-framework 2.11.1",
  "windows-sys 0.52.0",
 ]
 
@@ -1680,29 +1841,35 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.182"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 
 [[package]]
 name = "libloading"
-version = "0.8.6"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
  "libc",
 ]
 
@@ -1712,7 +1879,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "761e49ec5fd8a5a463f9b84e877c373d888935b71c6be78f3767fe2ae6bed18e"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
  "libc",
 ]
 
@@ -1724,46 +1891,57 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litemap"
-version = "0.7.4"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
 [[package]]
 name = "mach2"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
+checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "memoffset"
@@ -1797,34 +1975,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1838,38 +2005,28 @@ dependencies = [
  "num-rational",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "mp4ameta"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb23d62e8eb5299a3f79657c70ea9269eac8f6239a76952689bcd06a74057e81"
-dependencies = [
- "lazy_static",
- "mp4ameta_proc",
-]
-
-[[package]]
-name = "mp4ameta_proc"
-version = "0.6.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07dcca13d1740c0a665f77104803360da0bdb3323ecce2e93fa2c959a6d52806"
+checksum = "453e991b2efe96c288cbc2d03a19e353504294559ecb6c03067fff5bd824616d"
 
 [[package]]
 name = "native-tls"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "6cdede44f9a69cab2899a2049e2c3bd49bf911a157f6a3353d4a91c61abbce44"
 dependencies = [
  "libc",
  "log",
  "openssl",
- "openssl-probe",
+ "openssl-probe 0.1.6",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "security-framework-sys",
  "tempfile",
 ]
@@ -1880,12 +2037,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
  "jni-sys",
  "log",
  "ndk-sys",
  "num_enum",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -1925,6 +2082,15 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "num"
 version = "0.4.3"
@@ -1960,9 +2126,9 @@ dependencies = [
 
 [[package]]
 name = "num-conv"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
 
 [[package]]
 name = "num-derive"
@@ -1972,7 +2138,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -2018,23 +2184,24 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
 dependencies = [
  "num_enum_derive",
+ "rustversion",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.3"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -2046,11 +2213,30 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
@@ -2080,17 +2266,23 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "openssl"
-version = "0.10.68"
+version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2107,20 +2299,26 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
 dependencies = [
  "cc",
  "libc",
@@ -2144,31 +2342,11 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "os_info"
-version = "3.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb6651f4be5e39563c4fe5cc8326349eb99a25d805a3493f791d5bfd0269e430"
-dependencies = [
- "log",
- "serde",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
 [[package]]
 name = "pandora-api"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0d56b5f43950c2c6de3517aafc16a6c30c537d9c1f7ca72955e1158af520b50"
+checksum = "cf098ca2c9af7c0c954c8b90612c50d7d51156d13bd580c852c467f4efdc7fec"
 dependencies = [
  "async-trait",
  "blowfish",
@@ -2176,29 +2354,29 @@ dependencies = [
  "cipher",
  "log",
  "pandora-api-derive",
- "reqwest",
+ "reqwest 0.12.28",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "url",
 ]
 
 [[package]]
 name = "pandora-api-derive"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a56a07f647807d31b937de08cf98a0cd5a58854604ac28668ae434244ba5634"
+checksum = "9b90734e6b5fff979f0421cafee38bdbc8cff9c9317be5dfec73b2f5180acbfe"
 dependencies = [
- "darling",
+ "darling 0.20.11",
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "panharmonicon"
-version = "0.7.2"
+version = "0.7.3"
 dependencies = [
  "anyhow",
  "async-broadcast 0.7.2",
@@ -2214,13 +2392,12 @@ dependencies = [
  "log",
  "mp4ameta",
  "pandora-api",
- "rand",
  "redlux",
- "reqwest",
+ "reqwest 0.13.2",
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.18",
  "tokio",
  "winres",
 ]
@@ -2233,9 +2410,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2243,28 +2420,28 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link 0.2.1",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -2285,9 +2462,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "polling"
@@ -2307,17 +2484,25 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.4"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.4.0",
+ "hermit-abi 0.5.2",
  "pin-project-lite",
- "rustix 0.38.42",
- "tracing",
- "windows-sys 0.59.0",
+ "rustix 1.1.3",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+dependencies = [
+ "zerovec",
 ]
 
 [[package]]
@@ -2328,13 +2513,23 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.115",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@@ -2347,31 +2542,93 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit 0.22.22",
+ "toml_edit 0.23.10+spec-1.0.0",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2 0.6.2",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+dependencies = [
+ "aws-lc-rs",
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.6.2",
+ "tracing",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2379,8 +2636,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha",
- "rand_core",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -2390,7 +2657,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.5",
 ]
 
 [[package]]
@@ -2399,7 +2676,16 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.17",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+dependencies = [
+ "getrandom 0.3.4",
 ]
 
 [[package]]
@@ -2414,29 +2700,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.6"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.17",
  "libredox",
- "thiserror",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.1"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2446,9 +2732,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2457,15 +2743,15 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.11"
+version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe060fe50f524be480214aba758c71f99f90ee8c83c5a36b5e9e1d568eb4eb3"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
  "base64",
  "bytes",
@@ -2480,44 +2766,81 @@ dependencies = [
  "hyper-rustls",
  "hyper-tls",
  "hyper-util",
- "ipnet",
  "js-sys",
  "log",
  "mime",
  "native-tls",
- "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
- "system-configuration",
  "tokio",
  "tokio-native-tls",
  "tokio-util",
  "tower",
+ "tower-http",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
- "wasm-streams",
+ "wasm-streams 0.4.2",
+ "web-sys",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tokio-util",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams 0.5.0",
  "web-sys",
- "windows-registry",
 ]
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.17",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
@@ -2529,26 +2852,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3"
 dependencies = [
  "cpal",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "0.37.27"
+version = "0.37.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
@@ -2560,23 +2883,37 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.14",
+ "linux-raw-sys 0.4.15",
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "rustls"
-version = "0.23.20"
+version = "0.23.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
+checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
 dependencies = [
+ "aws-lc-rs",
  "once_cell",
  "rustls-pki-types",
  "rustls-webpki",
@@ -2585,36 +2922,77 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
+name = "rustls-native-certs"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
 dependencies = [
+ "openssl-probe 0.2.1",
  "rustls-pki-types",
+ "schannel",
+ "security-framework 3.5.1",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework 3.5.1",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
 name = "same-file"
@@ -2627,11 +3005,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2653,7 +3031,7 @@ dependencies = [
  "hkdf",
  "num",
  "once_cell",
- "rand",
+ "rand 0.8.5",
  "serde",
  "sha2",
  "zbus",
@@ -2665,75 +3043,114 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
+ "bitflags 2.10.0",
+ "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
 ]
 
 [[package]]
-name = "security-framework-sys"
-version = "2.13.0"
+name = "security-framework"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5"
+checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
 dependencies = [
+ "bitflags 2.10.0",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
+ "security-framework-sys",
 ]
 
+[[package]]
+name = "security-framework-sys"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
 name = "serde_repr"
-version = "0.1.19"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.8"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -2759,9 +3176,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2776,9 +3193,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -2786,38 +3203,36 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
+checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
 dependencies = [
  "libc",
- "mio 0.8.11",
+ "mio",
  "signal-hook",
 ]
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
 dependencies = [
+ "errno",
  "libc",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
@@ -2831,25 +3246,19 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "static_assertions"
@@ -2882,9 +3291,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.92"
+version = "2.0.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126"
+checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2902,23 +3311,37 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
+]
+
+[[package]]
+name = "sysinfo"
+version = "0.37.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16607d5caffd1c07ce073528f9ed972d88db15dd44023fa57142963be3feb11f"
+dependencies = [
+ "libc",
+ "memchr",
+ "ntapi",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows 0.61.3",
 ]
 
 [[package]]
 name = "system-configuration"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
+ "bitflags 2.10.0",
+ "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
 
@@ -2934,15 +3357,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"
 dependencies = [
- "cfg-if",
  "fastrand 2.3.0",
+ "getrandom 0.4.1",
  "once_cell",
- "rustix 0.38.42",
- "windows-sys 0.59.0",
+ "rustix 1.1.3",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -2951,7 +3374,16 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -2962,14 +3394,25 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.37"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
 dependencies = [
  "deranged",
  "itoa",
@@ -2977,22 +3420,22 @@ dependencies = [
  "num-conv",
  "num_threads",
  "powerfmt",
- "serde",
+ "serde_core",
  "time-core",
  "time-macros",
 ]
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
 
 [[package]]
 name = "time-macros"
-version = "0.2.19"
+version = "0.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
 dependencies = [
  "num-conv",
  "time-core",
@@ -3000,39 +3443,53 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
 ]
 
+[[package]]
+name = "tinyvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
- "backtrace",
  "bytes",
  "libc",
- "mio 1.0.3",
+ "mio",
  "pin-project-lite",
- "socket2 0.5.8",
+ "socket2 0.6.2",
  "tokio-macros",
- "windows-sys 0.52.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -3047,9 +3504,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -3057,9 +3514,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3079,25 +3536,46 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.19"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.22",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
+]
+
+[[package]]
+name = "toml"
+version = "0.9.12+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
+dependencies = [
+ "serde_core",
+ "serde_spanned 1.0.4",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_writer",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
@@ -3105,28 +3583,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
  "indexmap",
- "toml_datetime",
+ "toml_datetime 0.6.11",
  "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap",
  "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.20",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_write",
+ "winnow 0.7.14",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.10+spec-1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+dependencies = [
+ "indexmap",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_parser",
+ "winnow 0.7.14",
 ]
 
+[[package]]
+name = "toml_parser"
+version = "1.0.8+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0742ff5ff03ea7e67c8ae6c93cac239e0d9784833362da3f9a9c1da8dfefcbdc"
+dependencies = [
+ "winnow 0.7.14",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "toml_writer"
+version = "1.0.6+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607"
+
 [[package]]
 name = "tower"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
 dependencies = [
  "futures-core",
  "futures-util",
@@ -3137,6 +3649,24 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
+dependencies = [
+ "bitflags 2.10.0",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "iri-string",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -3151,9 +3681,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -3162,20 +3692,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
 ]
@@ -3188,9 +3718,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.17.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "uds_windows"
@@ -3205,9 +3735,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e"
 
 [[package]]
 name = "unicode-segmentation"
@@ -3221,6 +3751,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -3229,21 +3765,16 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -3258,11 +3789,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.11.0"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
+checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
 dependencies = [
- "getrandom",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
@@ -3304,42 +3835,49 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
+ "wit-bindgen",
 ]
 
 [[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.99"
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.92",
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
 dependencies = [
  "cfg-if",
+ "futures-util",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -3348,9 +3886,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3358,22 +3896,47 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.92",
- "wasm-bindgen-backend",
+ "syn 2.0.115",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
 
 [[package]]
 name = "wasm-streams"
@@ -3388,16 +3951,60 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wasm-streams"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.10.0",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+
 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -3416,11 +4023,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.9"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3440,12 +4047,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-core"
-version = "0.52.0"
+name = "windows"
+version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-collections",
+ "windows-core 0.61.2",
+ "windows-future",
+ "windows-link 0.1.3",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core 0.61.2",
 ]
 
 [[package]]
@@ -3459,14 +4079,95 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-registry"
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.1.3",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.115",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.115",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
- "windows-result 0.2.0",
- "windows-strings",
- "windows-targets 0.52.6",
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
 ]
 
 [[package]]
@@ -3480,21 +4181,38 @@ dependencies = [
 
 [[package]]
 name = "windows-result"
-version = "0.2.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.1.0"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
 dependencies = [
- "windows-result 0.2.0",
- "windows-targets 0.52.6",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
 ]
 
 [[package]]
@@ -3533,6 +4251,24 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -3572,13 +4308,39 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -3597,6 +4359,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -3615,6 +4383,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -3633,12 +4407,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -3657,6 +4443,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -3675,6 +4467,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -3693,6 +4491,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -3711,6 +4515,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
 [[package]]
 name = "winnow"
 version = "0.5.40"
@@ -3722,9 +4532,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
 dependencies = [
  "memchr",
 ]
@@ -3739,16 +4549,98 @@ dependencies = [
 ]
 
 [[package]]
-name = "write16"
-version = "1.0.0"
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn 2.0.115",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.115",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.10.0",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
 
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "xdg-home"
@@ -3768,11 +4660,10 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -3780,13 +4671,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
  "synstructure",
 ]
 
@@ -3817,7 +4708,7 @@ dependencies = [
  "nix",
  "once_cell",
  "ordered-stream",
- "rand",
+ "rand 0.8.5",
  "serde",
  "serde_repr",
  "sha1",
@@ -3858,57 +4749,67 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
 dependencies = [
- "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
  "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
 
 [[package]]
 name = "zerovec"
-version = "0.10.4"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -3917,15 +4818,21 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+
 [[package]]
 name = "zvariant"
 version = "3.15.2"
diff --git a/Cargo.toml b/Cargo.toml
index cec1aaf..3451c3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "panharmonicon"
 description = "A command line music player, unofficial client for Pandora"
-version = "0.7.2"
+version = "0.7.3"
 authors = ["Will Page <compenguy@gmail.com>"]
 edition = "2018"
 license = "Apache-2.0 AND MIT AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND MPL-2.0 AND Zlib"
@@ -13,13 +13,13 @@ emoji_labels = []
 
 [dependencies]
 anyhow = "1"
-thiserror = "1"
+thiserror = "2"
 human-panic = "2"
 clap = { version = "4", default-features = false, features = ["std", "cargo", "help"] }
 log = { version = "0.4", default-features = true, features = ["std"] }
-flexi_logger = { version = "0.28", default-features = false }
+flexi_logger = { version = "0.31", default-features = false }
 chrono = { version = "0.4", default-features = false, features = ["std"] }
-dirs = "5"
+dirs = "6"
 serde = "1"
 either = "1"
 serde_derive = "1"
@@ -28,12 +28,11 @@ keyring = "2"
 pandora-api = "0.6"
 futures = "0.3"
 tokio = { version = "1", default-features = false, features = ["fs", "io-util", "macros", "rt", "time"] }
-reqwest = { version = "0.12", features = ["stream"] }
+reqwest = { version = "0.13", features = ["stream"] }
 async-broadcast = "0.7"
 redlux = { version = "0.7", git = "https://github.com/compenguy/redlux.git" }
-mp4ameta = "0.11"
-cursive = { version = "0.20", default-features = false, features = ["crossterm-backend", "toml"] }
-rand = "0.8"
+mp4ameta = "0.13"
+cursive = { version = "0.21", default-features = false, features = ["crossterm-backend", "toml"] }
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
diff --git a/src/pandora.rs b/src/pandora.rs
index f985f98..33b6c16 100644
--- a/src/pandora.rs
+++ b/src/pandora.rs
@@ -291,7 +291,6 @@ impl PandoraSession {
         }
         .map_err(anyhow::Error::from)
         .map(|_: DeleteMusicResponse| ())
-        .map_err(anyhow::Error::from)
     }
 
     pub async fn create_station_from_track_song(
diff --git a/src/track.rs b/src/track.rs
index 7263a19..3ae2304 100644
--- a/src/track.rs
+++ b/src/track.rs
@@ -214,11 +214,12 @@ fn tag_cached_file<P: AsRef<Path>>(path: P, title: &str, artist: &str, album: &s
     debug!("Reading tags from m4a");
     let mut tag = match mp4ameta::Tag::read_from_path(path) {
         Ok(tag) => tag,
-        Err(mp4ameta::Error {
-            kind: mp4ameta::ErrorKind::NoTag,
-            ..
-        }) => mp4ameta::Tag::default(),
-        err => err.with_context(|| format!("Failed reading m4a file at {}", path.display()))?,
+        Err(e) if matches!(e.kind, mp4ameta::ErrorKind::AtomNotFound(_)) => {
+            mp4ameta::Tag::default()
+        }
+        Err(e) => {
+            Err(e).with_context(|| format!("Failed reading m4a file at {}", path.display()))?
+        }
     };
 
     debug!("Updating tags with pandora metadata");
@@ -243,7 +244,7 @@ fn tag_cached_file<P: AsRef<Path>>(path: P, title: &str, artist: &str, album: &s
         debug!("Writing tags back to file");
         tag.write_to_path(path).with_context(|| {
             format!(
-                "Failed while writing updated MP3 tags back to {}",
+                "Failed while writing updated M4A tags back to {}",
                 path.display()
             )
         })?;

From 48e0727355310f867ac9d65ab9c9f32362ad8993 Mon Sep 17 00:00:00 2001
From: Will Page <compenguy@gmail.com>
Date: Sun, 29 Dec 2024 11:39:24 -0800
Subject: [PATCH 02/13] Experimental mpris server dbus service

---
 Cargo.lock          | 201 +++++++++++++++++++++++++++++++++++++++++---
 Cargo.toml          |   3 +
 src/main.rs         |  54 +++++++++---
 src/mpris_ui/mod.rs | 147 ++++++++++++++++++++++++++++++++
 4 files changed, 381 insertions(+), 24 deletions(-)
 create mode 100644 src/mpris_ui/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index b30b691..171112c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -197,6 +197,17 @@ dependencies = [
  "futures-lite 1.13.0",
 ]
 
+[[package]]
+name = "async-fs"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
+dependencies = [
+ "async-lock 3.4.0",
+ "blocking",
+ "futures-lite 2.5.0",
+]
+
 [[package]]
 name = "async-io"
 version = "1.13.0"
@@ -272,6 +283,25 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "async-process"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+dependencies = [
+ "async-channel",
+ "async-io 2.4.0",
+ "async-lock 3.4.0",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener 5.3.1",
+ "futures-lite 2.5.0",
+ "rustix 0.38.42",
+ "tracing",
+]
+
 [[package]]
 name = "async-recursion"
 version = "1.1.1"
@@ -519,6 +549,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chrono"
 version = "0.4.43"
@@ -965,6 +1001,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "endi"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+
 [[package]]
 name = "enum-map"
 version = "2.7.3"
@@ -2014,6 +2056,19 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "453e991b2efe96c288cbc2d03a19e353504294559ecb6c03067fff5bd824616d"
 
+[[package]]
+name = "mpris-server"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "058bc2227727af394f34aa51da3e36aeecf2c808f39315d35f754872660750ae"
+dependencies = [
+ "async-channel",
+ "futures-channel",
+ "serde",
+ "trait-variant",
+ "zbus 4.4.0",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.15"
@@ -2072,6 +2127,19 @@ dependencies = [
  "memoffset 0.7.1",
 ]
 
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset 0.9.1",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2391,6 +2459,7 @@ dependencies = [
  "keyring",
  "log",
  "mp4ameta",
+ "mpris-server",
  "pandora-api",
  "redlux",
  "reqwest 0.13.2",
@@ -3034,7 +3103,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "sha2",
- "zbus",
+ "zbus 3.15.2",
 ]
 
 [[package]]
@@ -3710,6 +3779,17 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "trait-variant"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -4689,10 +4769,10 @@ checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
 dependencies = [
  "async-broadcast 0.5.1",
  "async-executor",
- "async-fs",
+ "async-fs 1.6.0",
  "async-io 1.13.0",
  "async-lock 2.8.0",
- "async-process",
+ "async-process 1.8.1",
  "async-recursion",
  "async-task",
  "async-trait",
@@ -4705,7 +4785,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "hex",
- "nix",
+ "nix 0.26.4",
  "once_cell",
  "ordered-stream",
  "rand 0.8.5",
@@ -4717,9 +4797,47 @@ dependencies = [
  "uds_windows",
  "winapi",
  "xdg-home",
- "zbus_macros",
- "zbus_names",
- "zvariant",
+ "zbus_macros 3.15.2",
+ "zbus_names 2.6.1",
+ "zvariant 3.15.2",
+]
+
+[[package]]
+name = "zbus"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+dependencies = [
+ "async-broadcast 0.7.2",
+ "async-executor",
+ "async-fs 2.1.2",
+ "async-io 2.4.0",
+ "async-lock 3.4.0",
+ "async-process 2.3.0",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener 5.3.1",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "nix 0.29.0",
+ "ordered-stream",
+ "rand",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "tracing",
+ "uds_windows",
+ "windows-sys 0.52.0",
+ "xdg-home",
+ "zbus_macros 4.4.0",
+ "zbus_names 3.0.0",
+ "zvariant 4.2.0",
 ]
 
 [[package]]
@@ -4733,7 +4851,20 @@ dependencies = [
  "quote",
  "regex",
  "syn 1.0.109",
- "zvariant_utils",
+ "zvariant_utils 1.0.1",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+dependencies = [
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -4744,7 +4875,18 @@ checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
 dependencies = [
  "serde",
  "static_assertions",
- "zvariant",
+ "zvariant 3.15.2",
+]
+
+[[package]]
+name = "zbus_names"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant 4.2.0",
 ]
 
 [[package]]
@@ -4844,7 +4986,20 @@ dependencies = [
  "libc",
  "serde",
  "static_assertions",
- "zvariant_derive",
+ "zvariant_derive 3.15.2",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zvariant_derive 4.2.0",
 ]
 
 [[package]]
@@ -4857,7 +5012,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "zvariant_utils",
+ "zvariant_utils 1.0.1",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+dependencies = [
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+ "zvariant_utils 2.1.0",
 ]
 
 [[package]]
@@ -4870,3 +5038,14 @@ dependencies = [
  "quote",
  "syn 1.0.109",
 ]
+
+[[package]]
+name = "zvariant_utils"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 3451c3c..f73094c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/compenguy/panharmonicon"
 
 [features]
 default = ["emoji_labels"]
+mpris_server = ["dep:mpris-server"]
 emoji_labels = []
 
 [dependencies]
@@ -33,6 +34,8 @@ async-broadcast = "0.7"
 redlux = { version = "0.7", git = "https://github.com/compenguy/redlux.git" }
 mp4ameta = "0.13"
 cursive = { version = "0.21", default-features = false, features = ["crossterm-backend", "toml"] }
+mpris-server = { version = "0.8", optional = true }
+rand = "0.8"
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
diff --git a/src/main.rs b/src/main.rs
index d6e582d..4aba5d4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,6 +13,8 @@ use crate::config::Config;
 mod caching;
 mod messages;
 mod model;
+#[cfg(feature = "mpris_server")]
+mod mpris_ui;
 mod pandora;
 mod player;
 mod term_ui;
@@ -123,8 +125,15 @@ async fn main() -> Result<()> {
     trace!("Initializing track fetcher");
     let mut fetcher = caching::TrackCacher::new(model.updates_channel(), model.request_channel());
 
+    #[cfg(feature = "mpris_server")]
+    trace!("Initializing mpris interface");
+    #[cfg(feature = "mpris_server")]
+    let mut mpris_ui =
+        mpris_ui::MprisPlayer::new(model.updates_channel(), model.request_channel()).await?;
+
     trace!("Initializing terminal interface");
-    let mut ui = term_ui::Terminal::new(conf_ref, model.updates_channel(), model.request_channel());
+    let mut term_ui =
+        term_ui::Terminal::new(conf_ref, model.updates_channel(), model.request_channel());
 
     trace!("Initializing player interface");
     let mut player = player::Player::new(model.updates_channel(), model.request_channel());
@@ -166,21 +175,40 @@ async fn main() -> Result<()> {
             std::thread::sleep(naptime);
         }
         */
-        let step_result = tokio::try_join!(
-            model.update(),
-            player.update(),
-            ui.update(),
-            fetcher.update()
-        );
-        match step_result {
-            Err(e) => error!("Error updating application state: {:#}", e),
-            Ok((false, false, false, false)) => std::thread::sleep(naptime),
-            Ok((_, _, _, _)) => (),
+
+        #[cfg(not(feature = "mpris_server"))]
+        {
+            let step_result = tokio::try_join!(
+                model.update(),
+                player.update(),
+                term_ui.update(),
+                fetcher.update()
+            );
+            match step_result {
+                Err(e) => error!("Error updating application state: {:#}", e),
+                Ok((false, false, false, false)) => std::thread::sleep(naptime),
+                Ok((_, _, _, _)) => (),
+            }
+        }
+        #[cfg(feature = "mpris_server")]
+        {
+            let step_result = tokio::try_join!(
+                model.update(),
+                player.update(),
+                term_ui.update(),
+                mpris_ui.update(),
+                fetcher.update()
+            );
+            match step_result {
+                Err(e) => error!("Error updating application state: {:#}", e),
+                Ok((false, false, false, false, false)) => std::thread::sleep(naptime),
+                Ok((_, _, _, _, _)) => (),
+            }
         }
     }
     debug!("Application quit request acknowledged.");
-    // Explicitly drop the UI to force it to write changed settings out
-    drop(ui);
+    // Explicitly drop the model to force it to write changed settings out
+    drop(model);
     debug!("Application interface terminated.");
 
     Ok(())
diff --git a/src/mpris_ui/mod.rs b/src/mpris_ui/mod.rs
new file mode 100644
index 0000000..7454847
--- /dev/null
+++ b/src/mpris_ui/mod.rs
@@ -0,0 +1,147 @@
+use std::time::Duration;
+
+use anyhow::Result;
+use log::trace;
+
+use crate::messages::{Request, State, StopReason};
+use crate::model::{RequestSender, StateReceiver};
+use crate::track::Track;
+
+use mpris_server::{Metadata, Player, Time};
+
+#[derive(Debug)]
+pub(crate) struct MprisPlayer {
+    player: Player,
+    _local_rt: tokio::task::LocalSet,
+    state_receiver: StateReceiver,
+}
+
+impl MprisPlayer {
+    pub(crate) async fn new(
+        state_receiver: StateReceiver,
+        request_sender: RequestSender,
+    ) -> Result<Self> {
+        let player = Player::builder("com.github.compenguy.panharmonicon")
+            .identity("panharmonicon")
+            .can_quit(true)
+            .has_track_list(true)
+            .can_go_next(true)
+            .can_go_previous(false)
+            .can_play(true)
+            .can_pause(true)
+            .can_control(true)
+            .build()
+            .await?;
+
+        let _local_rt = tokio::task::LocalSet::new();
+        _local_rt.spawn_local(player.run());
+
+        let cb_sender = request_sender.clone();
+        player.connect_next(move |_| {
+            let _ = cb_sender.send(Request::Stop(StopReason::UserRequest));
+        });
+
+        let cb_sender = request_sender.clone();
+        player.connect_quit(move |_| {
+            let _ = cb_sender.send(Request::Quit);
+        });
+
+        let cb_sender = request_sender.clone();
+        player.connect_pause(move |_| {
+            let _ = cb_sender.send(Request::Pause);
+        });
+
+        let cb_sender = request_sender.clone();
+        player.connect_play(move |_| {
+            let _ = cb_sender.send(Request::Unpause);
+        });
+
+        let cb_sender = request_sender.clone();
+        player.connect_play_pause(move |_| {
+            let _ = cb_sender.send(Request::TogglePause);
+        });
+
+        let cb_sender = request_sender.clone();
+        player.connect_set_volume(move |_, v| {
+            let _ = cb_sender.send(Request::Volume(v as f32));
+        });
+
+        Ok(Self {
+            player,
+            _local_rt,
+            state_receiver,
+        })
+    }
+
+    async fn update_state_stopped(&mut self) -> Result<()> {
+        self.player
+            .set_playback_status(mpris_server::PlaybackStatus::Stopped)
+            .await?;
+        Ok(())
+    }
+
+    async fn playing_track(&mut self, track: Track) -> Result<()> {
+        self.player
+            .set_playback_status(mpris_server::PlaybackStatus::Playing)
+            .await?;
+        let metadata = Metadata::builder()
+            .length(Time::from_millis(track.track_length.as_millis() as i64))
+            .album(track.album_name.clone())
+            .artist([track.artist_name.clone()])
+            .title(track.title.clone())
+            .build();
+        self.player.set_metadata(metadata).await?;
+        Ok(())
+    }
+
+    async fn update_playing(&mut self, elapsed: Duration, paused: bool) -> Result<()> {
+        self.player
+            .seeked(Time::from_millis(elapsed.as_millis() as i64))
+            .await?;
+        if paused {
+            self.player
+                .set_playback_status(mpris_server::PlaybackStatus::Paused)
+                .await?;
+        } else {
+            self.player
+                .set_playback_status(mpris_server::PlaybackStatus::Playing)
+                .await?;
+        }
+        Ok(())
+    }
+
+    async fn update_volume(&mut self, volume: f32) -> Result<()> {
+        self.player.set_volume(volume as f64).await?;
+        Ok(())
+    }
+
+    async fn process_messages(&mut self) -> Result<()> {
+        trace!("checking for player notifications...");
+        while let Ok(message) = self.state_receiver.try_recv() {
+            match message {
+                State::AuthFailed(_) => self.update_state_stopped().await?,
+                State::Connected => self.update_state_stopped().await?,
+                State::Disconnected => self.update_state_stopped().await?,
+                State::AddStation(_, _) => (),
+                State::Tuned(_) => (),
+                State::TrackStarting(track) => self.playing_track(track).await?,
+                State::Next(_) => (),
+                State::Playing(elapsed) => self.update_playing(elapsed, false).await?,
+                State::Volume(v) => self.update_volume(v).await?,
+                State::Paused(elapsed) => self.update_playing(elapsed, true).await?,
+                State::Stopped(_) => self.update_state_stopped().await?,
+                State::Buffering => self.update_state_stopped().await?,
+                State::TrackCaching(_) => (),
+                State::Muted => (),
+                State::Unmuted => (),
+                State::Quit => (),
+            }
+        }
+        Ok(())
+    }
+
+    pub(crate) async fn update(&mut self) -> Result<bool> {
+        self.process_messages().await?;
+        Ok(false)
+    }
+}

From 70ba6b7f570bae2b3547467d592a32d05e9b265c Mon Sep 17 00:00:00 2001
From: Will Page <compenguy@gmail.com>
Date: Sun, 29 Dec 2024 16:50:44 -0800
Subject: [PATCH 03/13] Convert to using mpris-server interfaces

---
 src/main.rs                |   2 +-
 src/mpris_ui/mod.rs        | 103 ++++------
 src/mpris_ui/mpris_intf.rs | 407 +++++++++++++++++++++++++++++++++++++
 src/track.rs               |  17 ++
 4 files changed, 459 insertions(+), 70 deletions(-)
 create mode 100644 src/mpris_ui/mpris_intf.rs

diff --git a/src/main.rs b/src/main.rs
index 4aba5d4..ee0c14d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -129,7 +129,7 @@ async fn main() -> Result<()> {
     trace!("Initializing mpris interface");
     #[cfg(feature = "mpris_server")]
     let mut mpris_ui =
-        mpris_ui::MprisPlayer::new(model.updates_channel(), model.request_channel()).await?;
+        mpris_ui::MprisUi::new(model.updates_channel(), model.request_channel()).await?;
 
     trace!("Initializing terminal interface");
     let mut term_ui =
diff --git a/src/mpris_ui/mod.rs b/src/mpris_ui/mod.rs
index 7454847..46a1c40 100644
--- a/src/mpris_ui/mod.rs
+++ b/src/mpris_ui/mod.rs
@@ -3,115 +3,80 @@ use std::time::Duration;
 use anyhow::Result;
 use log::trace;
 
-use crate::messages::{Request, State, StopReason};
+use crate::messages::State;
 use crate::model::{RequestSender, StateReceiver};
 use crate::track::Track;
 
-use mpris_server::{Metadata, Player, Time};
+use mpris_server::{Metadata, Property, Signal, Time};
+mod mpris_intf;
+use mpris_intf::MprisInterface;
 
 #[derive(Debug)]
-pub(crate) struct MprisPlayer {
-    player: Player,
-    _local_rt: tokio::task::LocalSet,
+pub(crate) struct MprisUi {
+    server: mpris_server::Server<MprisInterface>,
     state_receiver: StateReceiver,
 }
 
-impl MprisPlayer {
+impl MprisUi {
     pub(crate) async fn new(
         state_receiver: StateReceiver,
         request_sender: RequestSender,
     ) -> Result<Self> {
-        let player = Player::builder("com.github.compenguy.panharmonicon")
-            .identity("panharmonicon")
-            .can_quit(true)
-            .has_track_list(true)
-            .can_go_next(true)
-            .can_go_previous(false)
-            .can_play(true)
-            .can_pause(true)
-            .can_control(true)
-            .build()
-            .await?;
-
-        let _local_rt = tokio::task::LocalSet::new();
-        _local_rt.spawn_local(player.run());
-
-        let cb_sender = request_sender.clone();
-        player.connect_next(move |_| {
-            let _ = cb_sender.send(Request::Stop(StopReason::UserRequest));
-        });
-
-        let cb_sender = request_sender.clone();
-        player.connect_quit(move |_| {
-            let _ = cb_sender.send(Request::Quit);
-        });
-
-        let cb_sender = request_sender.clone();
-        player.connect_pause(move |_| {
-            let _ = cb_sender.send(Request::Pause);
-        });
-
-        let cb_sender = request_sender.clone();
-        player.connect_play(move |_| {
-            let _ = cb_sender.send(Request::Unpause);
-        });
+        let mpris_intf = MprisInterface::new(state_receiver.clone(), request_sender);
 
-        let cb_sender = request_sender.clone();
-        player.connect_play_pause(move |_| {
-            let _ = cb_sender.send(Request::TogglePause);
-        });
-
-        let cb_sender = request_sender.clone();
-        player.connect_set_volume(move |_, v| {
-            let _ = cb_sender.send(Request::Volume(v as f32));
-        });
+        let server = mpris_server::Server::new_with_all(clap::crate_name!(), mpris_intf).await?;
 
         Ok(Self {
-            player,
-            _local_rt,
+            server,
             state_receiver,
         })
     }
 
     async fn update_state_stopped(&mut self) -> Result<()> {
-        self.player
-            .set_playback_status(mpris_server::PlaybackStatus::Stopped)
+        self.server
+            .properties_changed([Property::PlaybackStatus(
+                mpris_server::PlaybackStatus::Playing,
+            )])
             .await?;
         Ok(())
     }
 
     async fn playing_track(&mut self, track: Track) -> Result<()> {
-        self.player
-            .set_playback_status(mpris_server::PlaybackStatus::Playing)
-            .await?;
         let metadata = Metadata::builder()
             .length(Time::from_millis(track.track_length.as_millis() as i64))
             .album(track.album_name.clone())
             .artist([track.artist_name.clone()])
             .title(track.title.clone())
             .build();
-        self.player.set_metadata(metadata).await?;
+        self.server
+            .properties_changed([
+                Property::Metadata(metadata),
+                Property::PlaybackStatus(mpris_server::PlaybackStatus::Playing),
+            ])
+            .await?;
         Ok(())
     }
 
     async fn update_playing(&mut self, elapsed: Duration, paused: bool) -> Result<()> {
-        self.player
-            .seeked(Time::from_millis(elapsed.as_millis() as i64))
+        let playback_status = match paused {
+            true => mpris_server::PlaybackStatus::Paused,
+            false => mpris_server::PlaybackStatus::Playing,
+        };
+        self.server
+            .properties_changed([Property::PlaybackStatus(playback_status)])
+            .await?;
+        self.server
+            .emit(Signal::Seeked {
+                position: Time::from_millis(elapsed.as_millis() as i64),
+            })
             .await?;
-        if paused {
-            self.player
-                .set_playback_status(mpris_server::PlaybackStatus::Paused)
-                .await?;
-        } else {
-            self.player
-                .set_playback_status(mpris_server::PlaybackStatus::Playing)
-                .await?;
-        }
         Ok(())
     }
 
     async fn update_volume(&mut self, volume: f32) -> Result<()> {
-        self.player.set_volume(volume as f64).await?;
+        self.server
+            .properties_changed([Property::Volume(volume as f64)])
+            .await?;
         Ok(())
     }
 
diff --git a/src/mpris_ui/mpris_intf.rs b/src/mpris_ui/mpris_intf.rs
new file mode 100644
index 0000000..289d912
--- /dev/null
+++ b/src/mpris_ui/mpris_intf.rs
@@ -0,0 +1,407 @@
+use std::collections::HashMap;
+use std::time::Duration;
+use std::convert::TryFrom;
+
+use anyhow::Result;
+use log::trace;
+
+use crate::messages::{Request, State, StopReason};
+use crate::model::{RequestSender, StateReceiver};
+use crate::track::Track;
+
+use mpris_server::zbus;
+use mpris_server::{LoopStatus, PlaybackRate, PlaylistId, PlaylistOrdering, TrackId, Uri};
+use mpris_server::{Metadata, PlaybackStatus, Playlist, Time, Volume};
+use mpris_server::{PlayerInterface, PlaylistsInterface, RootInterface, TrackListInterface};
+
+pub(crate) struct MprisInterface {
+    state_receiver: StateReceiver,
+    request_sender: RequestSender,
+    playlists: HashMap<String, String>,
+    active_playlist: Option<(String, String)>,
+    tracklist: Vec<Track>,
+    playing: Option<(Track, Duration, bool)>,
+    volume: f32,
+}
+
+impl MprisInterface {
+    pub(crate) fn new(state_receiver: StateReceiver, request_sender: RequestSender) -> Self {
+        Self {
+            state_receiver,
+            request_sender,
+            playlists: HashMap::with_capacity(8),
+            active_playlist: None,
+            tracklist: Vec::with_capacity(4),
+            playing: None,
+            volume: 0.0f32,
+        }
+    }
+
+    fn publish_zrequest(&self, request: Request) -> zbus::Result<()> {
+        self.request_sender
+            .send(request)
+            .map_err(|e| zbus::Error::Failure(e.to_string()))?;
+        Ok(())
+    }
+
+    fn playing_track(&mut self, track: Track) {
+        self.playing = Some((track, std::time::Duration::from_millis(0), false));
+    }
+
+    fn update_playing(&mut self, elapsed: Duration, paused: bool) {
+        if let Some((_, e, p)) = &mut self.playing {
+            *e = elapsed;
+            *p = paused;
+        }
+    }
+
+    fn update_volume(&mut self, volume: f32) {
+        self.volume = volume;
+    }
+
+    fn add_playlist(&mut self, name: String, id: String) {
+        self.playlists.insert(id, name);
+    }
+
+    fn start_playlist(&mut self, name: String) {
+        let playlist_id = self.playlists.iter().find_map(|(k, v)| {
+            if v == name.as_str() {
+                Some((k, v))
+            } else {
+                None
+            }
+        });
+        self.active_playlist = playlist_id.map(|(a, b)| (a.to_owned(), b.to_owned()));
+    }
+
+    fn update_tracklist(&mut self, track: Option<Track>) {
+        let tracklist: Vec<Track> = self
+            .playing
+            .as_ref()
+            .map(|(t, _, _)| t.clone())
+            .iter()
+            .chain(track.iter())
+            .cloned()
+            .collect();
+        self.tracklist = tracklist;
+    }
+
+    async fn process_messages(&mut self) -> Result<()> {
+        trace!("checking for player notifications...");
+        while let Ok(message) = self.state_receiver.try_recv() {
+            match message {
+                State::AuthFailed(_) => (),
+                State::Connected => (),
+                State::Disconnected => (),
+                State::AddStation(name, id) => self.add_playlist(name, id),
+                State::Tuned(name) => self.start_playlist(name),
+                State::TrackStarting(track) => self.playing_track(track),
+                State::Next(track) => self.update_tracklist(track),
+                State::Playing(elapsed) => self.update_playing(elapsed, false),
+                State::Volume(v) => self.update_volume(v),
+                State::Paused(elapsed) => self.update_playing(elapsed, true),
+                State::Stopped(_) => (),
+                State::Buffering => (),
+                State::TrackCaching(_) => (),
+                State::Muted => (),
+                State::Unmuted => (),
+                State::Quit => (),
+            }
+        }
+        Ok(())
+    }
+
+    pub(crate) async fn update(&mut self) -> zbus::Result<()> {
+        self.process_messages().await.map_err(|e| zbus::Error::Failure(e.to_string()))?;
+        Ok(())
+    }
+}
+
+// mpris-server dbus interfaces
+impl RootInterface for MprisInterface {
+    async fn raise(&self) -> zbus::fdo::Result<()> {
+        Ok(())
+    }
+
+    async fn quit(&self) -> zbus::fdo::Result<()> {
+        self.publish_zrequest(Request::Quit)?;
+        Ok(())
+    }
+
+    async fn can_quit(&self) -> zbus::fdo::Result<bool> {
+        Ok(true)
+    }
+
+    async fn fullscreen(&self) -> zbus::fdo::Result<bool> {
+        Ok(false)
+    }
+
+    async fn set_fullscreen(&self, _fullscreen: bool) -> zbus::Result<()> {
+        Ok(())
+    }
+
+    async fn can_set_fullscreen(&self) -> zbus::fdo::Result<bool> {
+        Ok(false)
+    }
+
+    async fn can_raise(&self) -> zbus::fdo::Result<bool> {
+        Ok(false)
+    }
+
+    async fn has_track_list(&self) -> zbus::fdo::Result<bool> {
+        Ok(true)
+    }
+
+    async fn identity(&self) -> zbus::fdo::Result<String> {
+        Ok(clap::crate_name!().to_string())
+    }
+
+    async fn desktop_entry(&self) -> zbus::fdo::Result<String> {
+        Ok(clap::crate_name!().to_string())
+    }
+
+    async fn supported_uri_schemes(&self) -> zbus::fdo::Result<Vec<String>> {
+        Ok(vec![])
+    }
+
+    async fn supported_mime_types(&self) -> zbus::fdo::Result<Vec<String>> {
+        Ok(vec![])
+    }
+}
+
+impl PlayerInterface for MprisInterface {
+    async fn next(&self) -> zbus::fdo::Result<()> {
+        self.publish_zrequest(Request::Stop(StopReason::UserRequest))?;
+        Ok(())
+    }
+
+    async fn previous(&self) -> zbus::fdo::Result<()> {
+        Ok(())
+    }
+
+    async fn pause(&self) -> zbus::fdo::Result<()> {
+        self.publish_zrequest(Request::Pause)?;
+        Ok(())
+    }
+
+    async fn play_pause(&self) -> zbus::fdo::Result<()> {
+        self.publish_zrequest(Request::TogglePause)?;
+        Ok(())
+    }
+
+    async fn stop(&self) -> zbus::fdo::Result<()> {
+        Ok(())
+    }
+
+    async fn play(&self) -> zbus::fdo::Result<()> {
+        self.publish_zrequest(Request::Unpause)?;
+        Ok(())
+    }
+
+    async fn seek(&self, _offset: Time) -> zbus::fdo::Result<()> {
+        Ok(())
+    }
+
+    async fn set_position(&self, _track_id: TrackId, _position: Time) -> zbus::fdo::Result<()> {
+        Ok(())
+    }
+
+    async fn open_uri(&self, _uri: String) -> zbus::fdo::Result<()> {
+        Ok(())
+    }
+
+    async fn playback_status(&self) -> zbus::fdo::Result<PlaybackStatus> {
+        let status = match self.playing {
+            Some((_, _, false)) => PlaybackStatus::Playing,
+            Some((_, _, true)) => PlaybackStatus::Paused,
+            None => PlaybackStatus::Stopped,
+        };
+        Ok(status)
+    }
+
+    async fn loop_status(&self) -> zbus::fdo::Result<LoopStatus> {
+        Ok(LoopStatus::None)
+    }
+
+    async fn set_loop_status(&self, _loop_status: LoopStatus) -> zbus::Result<()> {
+        Ok(())
+    }
+
+    async fn rate(&self) -> zbus::fdo::Result<PlaybackRate> {
+        Ok(PlaybackRate::default())
+    }
+
+    async fn set_rate(&self, _rate: PlaybackRate) -> zbus::Result<()> {
+        Ok(())
+    }
+
+    async fn shuffle(&self) -> zbus::fdo::Result<bool> {
+        Ok(false)
+    }
+
+    async fn set_shuffle(&self, _shuffle: bool) -> zbus::Result<()> {
+        Ok(())
+    }
+
+    async fn metadata(&self) -> zbus::fdo::Result<Metadata> {
+        if let Some((t, _, _)) = &self.playing {
+            Ok(Metadata::from(t))
+        } else {
+            Ok(Metadata::default())
+        }
+    }
+
+    async fn volume(&self) -> zbus::fdo::Result<Volume> {
+        Ok(self.volume as f64)
+    }
+
+    async fn set_volume(&self, volume: Volume) -> zbus::Result<()> {
+        self.publish_zrequest(Request::Volume(volume as f32))?;
+        Ok(())
+    }
+
+    async fn position(&self) -> zbus::fdo::Result<Time> {
+        if let Some((_, pos, _)) = self.playing {
+            Ok(Time::from_millis(pos.as_millis() as i64))
+        } else {
+            Ok(Time::ZERO)
+        }
+    }
+
+    async fn minimum_rate(&self) -> zbus::fdo::Result<PlaybackRate> {
+        Ok(PlaybackRate::default())
+    }
+
+    async fn maximum_rate(&self) -> zbus::fdo::Result<PlaybackRate> {
+        Ok(PlaybackRate::default())
+    }
+
+    async fn can_go_next(&self) -> zbus::fdo::Result<bool> {
+        Ok(true)
+    }
+
+    async fn can_go_previous(&self) -> zbus::fdo::Result<bool> {
+        Ok(false)
+    }
+
+    async fn can_play(&self) -> zbus::fdo::Result<bool> {
+        Ok(true)
+    }
+
+    async fn can_pause(&self) -> zbus::fdo::Result<bool> {
+        Ok(true)
+    }
+
+    async fn can_seek(&self) -> zbus::fdo::Result<bool> {
+        Ok(false)
+    }
+
+    async fn can_control(&self) -> zbus::fdo::Result<bool> {
+        Ok(true)
+    }
+}
+
+impl TrackListInterface for MprisInterface {
+    async fn get_tracks_metadata(
+        &self,
+        track_ids: Vec<TrackId>,
+    ) -> zbus::fdo::Result<Vec<Metadata>> {
+        let mut tracks_metadata = Vec::new();
+        for track_id in track_ids {
+            if let Some(md) = self.tracklist.iter().find_map(|t| {
+                if t.track_token.as_str() == track_id.as_str() {
+                    Some(Metadata::from(t))
+                } else {
+                    None
+                }
+            }) {
+                tracks_metadata.push(md);
+            } else {
+                tracks_metadata.push(Metadata::default());
+            }
+        }
+        Ok(tracks_metadata)
+    }
+
+    async fn add_track(
+        &self,
+        _uri: Uri,
+        _after_track: TrackId,
+        _set_as_current: bool,
+    ) -> zbus::fdo::Result<()> {
+        trace!("AddTrack: unsupported");
+        Ok(())
+    }
+
+    async fn remove_track(&self, _track_id: TrackId) -> zbus::fdo::Result<()> {
+        trace!("RemoveTrack: unsupported");
+        Ok(())
+    }
+
+    async fn go_to(&self, _track_id: TrackId) -> zbus::fdo::Result<()> {
+        trace!("GoTo: unsupported");
+        Ok(())
+    }
+
+    async fn tracks(&self) -> zbus::fdo::Result<Vec<TrackId>> {
+        let tracklist: Vec<TrackId> = self
+            .tracklist
+            .iter()
+            .map(|t| {
+                TrackId::try_from(t.track_token.as_str())
+                    .expect("Failed to convert track token to TrackId")
+            })
+            .collect();
+        Ok(tracklist)
+    }
+
+    async fn can_edit_tracks(&self) -> zbus::fdo::Result<bool> {
+        Ok(false)
+    }
+}
+
+impl PlaylistsInterface for MprisInterface {
+    async fn activate_playlist(&self, playlist_id: PlaylistId) -> zbus::fdo::Result<()> {
+        self.publish_zrequest(Request::Tune(playlist_id.as_str().to_string()))?;
+        Ok(())
+    }
+
+    async fn get_playlists(
+        &self,
+        _index: u32,
+        max_count: u32,
+        _order: PlaylistOrdering,
+        _reverse_order: bool,
+    ) -> zbus::fdo::Result<Vec<Playlist>> {
+        let mut playlists: Vec<Playlist> = self
+            .playlists
+            .iter()
+            .map(|p| {
+                Playlist {
+                    id: PlaylistId::try_from(p.0.as_str()) .expect("Failed to convert playlist id to PlaylistId"),
+                    name: p.1.to_string(),
+                    icon: Uri::new(),
+                }
+            })
+            .collect();
+        playlists.truncate(max_count as usize);
+        Ok(playlists)
+    }
+
+    async fn playlist_count(&self) -> zbus::fdo::Result<u32> {
+        Ok(self.playlists.len() as u32)
+    }
+
+    async fn orderings(&self) -> zbus::fdo::Result<Vec<PlaylistOrdering>> {
+        Ok(vec![PlaylistOrdering::UserDefined])
+    }
+
+    async fn active_playlist(&self) -> zbus::fdo::Result<Option<Playlist>> {
+        Ok(self.active_playlist.as_ref().map(|(id, name)| Playlist {
+            id: PlaylistId::try_from(id.as_str())
+                .expect("Failed to convert station id to PlaylistId"),
+            name: name.to_string(),
+            icon: Uri::new(),
+        }))
+    }
+}
diff --git a/src/track.rs b/src/track.rs
index 3ae2304..a75f207 100644
--- a/src/track.rs
+++ b/src/track.rs
@@ -75,6 +75,23 @@ impl std::convert::TryFrom<&PlaylistTrack> for Track {
     }
 }
 
+#[cfg(feature = "mpris_server")]
+use std::convert::TryFrom;
+#[cfg(feature = "mpris_server")]
+impl std::convert::From<&Track> for mpris_server::Metadata {
+    fn from(track: &Track) -> mpris_server::Metadata {
+        mpris_server::Metadata::builder()
+            .length(mpris_server::Time::from_millis(
+                track.track_length.as_millis() as i64,
+            ))
+            .trackid(mpris_server::TrackId::try_from(track.track_token.as_str()).expect("Failed to convert track token to TrackId"))
+            .album(track.album_name.clone())
+            .artist([track.artist_name.clone()])
+            .title(track.title.clone())
+            .build()
+    }
+}
+
 impl Track {
     pub(crate) fn cached(&self) -> bool {
         // Ensure that the track in the cache is playable, it will be deleted if it isn't

From 1126a9cb397c849f2000605328f1fd7339521e77 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 09:31:46 -0800
Subject: [PATCH 04/13] Bump dependencies

---
 Cargo.lock                 | 183 ++++++++++++++++++++-----------------
 Cargo.toml                 |   4 +-
 src/mpris_ui/mpris_intf.rs |  17 ++--
 src/track.rs               |   6 +-
 4 files changed, 114 insertions(+), 96 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 171112c..490423e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,7 +25,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
  "cipher",
- "cpufeatures",
+ "cpufeatures 0.2.17",
 ]
 
 [[package]]
@@ -197,17 +197,6 @@ dependencies = [
  "futures-lite 1.13.0",
 ]
 
-[[package]]
-name = "async-fs"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
-dependencies = [
- "async-lock 3.4.0",
- "blocking",
- "futures-lite 2.5.0",
-]
-
 [[package]]
 name = "async-io"
 version = "1.13.0"
@@ -285,21 +274,20 @@ dependencies = [
 
 [[package]]
 name = "async-process"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
+checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
 dependencies = [
  "async-channel",
- "async-io 2.4.0",
- "async-lock 3.4.0",
+ "async-io 2.6.0",
+ "async-lock 3.4.2",
  "async-signal",
  "async-task",
  "blocking",
  "cfg-if",
- "event-listener 5.3.1",
- "futures-lite 2.5.0",
- "rustix 0.38.42",
- "tracing",
+ "event-listener 5.4.1",
+ "futures-lite 2.6.1",
+ "rustix 1.1.3",
 ]
 
 [[package]]
@@ -550,10 +538,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
-name = "cfg_aliases"
-version = "0.2.1"
+name = "chacha20"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.0",
+]
 
 [[package]]
 name = "chrono"
@@ -740,6 +733,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -1003,9 +1005,9 @@ dependencies = [
 
 [[package]]
 name = "endi"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
 
 [[package]]
 name = "enum-map"
@@ -1378,6 +1380,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
+ "rand_core 0.10.0",
  "wasip2",
  "wasip3",
 ]
@@ -2058,15 +2061,15 @@ checksum = "453e991b2efe96c288cbc2d03a19e353504294559ecb6c03067fff5bd824616d"
 
 [[package]]
 name = "mpris-server"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058bc2227727af394f34aa51da3e36aeecf2c808f39315d35f754872660750ae"
+checksum = "392ce2be7224867869df37e473f28871ab0ff725c0014f1b196ba56a38aea9a8"
 dependencies = [
  "async-channel",
  "futures-channel",
  "serde",
  "trait-variant",
- "zbus 4.4.0",
+ "zbus 5.13.2",
 ]
 
 [[package]]
@@ -2127,19 +2130,6 @@ dependencies = [
  "memoffset 0.7.1",
 ]
 
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
- "memoffset 0.9.1",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2461,6 +2451,7 @@ dependencies = [
  "mp4ameta",
  "mpris-server",
  "pandora-api",
+ "rand 0.10.0",
  "redlux",
  "reqwest 0.13.2",
  "serde",
@@ -2719,6 +2710,17 @@ dependencies = [
  "rand_core 0.9.5",
 ]
 
+[[package]]
+name = "rand"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
+dependencies = [
+ "chacha20",
+ "getrandom 0.4.1",
+ "rand_core 0.10.0",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -2757,6 +2759,12 @@ dependencies = [
  "getrandom 0.3.4",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
+
 [[package]]
 name = "redlux"
 version = "0.7.0"
@@ -3239,7 +3247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -3250,7 +3258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
  "digest",
 ]
 
@@ -3787,7 +3795,7 @@ checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.115",
 ]
 
 [[package]]
@@ -3874,6 +3882,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
 dependencies = [
  "getrandom 0.3.4",
+ "js-sys",
+ "serde_core",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -4769,7 +4780,7 @@ checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
 dependencies = [
  "async-broadcast 0.5.1",
  "async-executor",
- "async-fs 1.6.0",
+ "async-fs",
  "async-io 1.13.0",
  "async-lock 2.8.0",
  "async-process 1.8.1",
@@ -4785,7 +4796,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "hex",
- "nix 0.26.4",
+ "nix",
  "once_cell",
  "ordered-stream",
  "rand 0.8.5",
@@ -4804,40 +4815,37 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "4.4.0"
+version = "5.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+checksum = "1bfeff997a0aaa3eb20c4652baf788d2dfa6d2839a0ead0b3ff69ce2f9c4bdd1"
 dependencies = [
  "async-broadcast 0.7.2",
  "async-executor",
- "async-fs 2.1.2",
- "async-io 2.4.0",
- "async-lock 3.4.0",
- "async-process 2.3.0",
+ "async-io 2.6.0",
+ "async-lock 3.4.2",
+ "async-process 2.5.0",
  "async-recursion",
  "async-task",
  "async-trait",
  "blocking",
  "enumflags2",
- "event-listener 5.3.1",
+ "event-listener 5.4.1",
  "futures-core",
- "futures-sink",
- "futures-util",
+ "futures-lite 2.6.1",
  "hex",
- "nix 0.29.0",
+ "libc",
  "ordered-stream",
- "rand",
+ "rustix 1.1.3",
  "serde",
  "serde_repr",
- "sha1",
- "static_assertions",
  "tracing",
  "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros 4.4.0",
- "zbus_names 3.0.0",
- "zvariant 4.2.0",
+ "uuid",
+ "windows-sys 0.61.2",
+ "winnow 0.7.14",
+ "zbus_macros 5.13.2",
+ "zbus_names 4.3.1",
+ "zvariant 5.9.2",
 ]
 
 [[package]]
@@ -4856,15 +4864,17 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "4.4.0"
+version = "5.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
+checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.92",
- "zvariant_utils 2.1.0",
+ "syn 2.0.115",
+ "zbus_names 4.3.1",
+ "zvariant 5.9.2",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -4880,13 +4890,13 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "3.0.0"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
 dependencies = [
  "serde",
- "static_assertions",
- "zvariant 4.2.0",
+ "winnow 0.7.14",
+ "zvariant 5.9.2",
 ]
 
 [[package]]
@@ -4991,15 +5001,16 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "4.2.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
+checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
- "static_assertions",
- "zvariant_derive 4.2.0",
+ "winnow 0.7.14",
+ "zvariant_derive 5.9.2",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -5017,15 +5028,15 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "4.2.0"
+version = "5.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.92",
- "zvariant_utils 2.1.0",
+ "syn 2.0.115",
+ "zvariant_utils 3.3.0",
 ]
 
 [[package]]
@@ -5041,11 +5052,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "2.1.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "serde",
+ "syn 2.0.115",
+ "winnow 0.7.14",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index f73094c..d5449b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,8 +34,8 @@ async-broadcast = "0.7"
 redlux = { version = "0.7", git = "https://github.com/compenguy/redlux.git" }
 mp4ameta = "0.13"
 cursive = { version = "0.21", default-features = false, features = ["crossterm-backend", "toml"] }
-mpris-server = { version = "0.8", optional = true }
-rand = "0.8"
+mpris-server = { version = "0.9", optional = true }
+rand = "0.10"
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
diff --git a/src/mpris_ui/mpris_intf.rs b/src/mpris_ui/mpris_intf.rs
index 289d912..a33f22d 100644
--- a/src/mpris_ui/mpris_intf.rs
+++ b/src/mpris_ui/mpris_intf.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
-use std::time::Duration;
 use std::convert::TryFrom;
+use std::time::Duration;
 
 use anyhow::Result;
 use log::trace;
@@ -112,7 +112,9 @@ impl MprisInterface {
     }
 
     pub(crate) async fn update(&mut self) -> zbus::Result<()> {
-        self.process_messages().await.map_err(|e| zbus::Error::Failure(e.to_string()))?;
+        self.process_messages()
+            .await
+            .map_err(|e| zbus::Error::Failure(e.to_string()))?;
         Ok(())
     }
 }
@@ -376,12 +378,11 @@ impl PlaylistsInterface for MprisInterface {
         let mut playlists: Vec<Playlist> = self
             .playlists
             .iter()
-            .map(|p| {
-                Playlist {
-                    id: PlaylistId::try_from(p.0.as_str()) .expect("Failed to convert playlist id to PlaylistId"),
-                    name: p.1.to_string(),
-                    icon: Uri::new(),
-                }
+            .map(|p| Playlist {
+                id: PlaylistId::try_from(p.0.as_str())
+                    .expect("Failed to convert playlist id to PlaylistId"),
+                name: p.1.to_string(),
+                icon: Uri::new(),
             })
             .collect();
         playlists.truncate(max_count as usize);
diff --git a/src/track.rs b/src/track.rs
index a75f207..16cee68 100644
--- a/src/track.rs
+++ b/src/track.rs
@@ -84,7 +84,10 @@ impl std::convert::From<&Track> for mpris_server::Metadata {
             .length(mpris_server::Time::from_millis(
                 track.track_length.as_millis() as i64,
             ))
-            .trackid(mpris_server::TrackId::try_from(track.track_token.as_str()).expect("Failed to convert track token to TrackId"))
+            .trackid(
+                mpris_server::TrackId::try_from(track.track_token.as_str())
+                    .expect("Failed to convert track token to TrackId"),
+            )
             .album(track.album_name.clone())
             .artist([track.artist_name.clone()])
             .title(track.title.clone())
@@ -232,6 +235,7 @@ fn tag_cached_file<P: AsRef<Path>>(path: P, title: &str, artist: &str, album: &s
     let mut tag = match mp4ameta::Tag::read_from_path(path) {
         Ok(tag) => tag,
         Err(e) if matches!(e.kind, mp4ameta::ErrorKind::AtomNotFound(_)) => {
+            // File has no metadata atoms (replaces former NoTag in mp4ameta 0.13)
             mp4ameta::Tag::default()
         }
         Err(e) => {

From 05059537973cd26976b8efb01c8c00a8f2d4acce Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 09:37:24 -0800
Subject: [PATCH 05/13] Code cleanups and log message correctness fixes

---
 src/track.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/track.rs b/src/track.rs
index 16cee68..4a3650c 100644
--- a/src/track.rs
+++ b/src/track.rs
@@ -128,13 +128,7 @@ impl Track {
         let req_builder = client.get(&self.audio_stream);
 
         if let Err(e) = download_to_cache(req_builder, &self.cache_path).await {
-            // TODO: fill in the actual error type for Connection reset by peer
-            /*
-            if let Some(e) = e.source().and_then(|e| e.downcast_ref::<reqwest::Error>()) {
-                error!("reqwest error {e:?}");
-            }
-            */
-            error!("Failed to download requested file: {}", e.source().unwrap());
+            error!("Failed to download track to cache: {e:#}");
             self.remove_from_cache();
             Err(e)
         } else {
@@ -159,7 +153,7 @@ impl Track {
             &self.artist_name,
             &self.album_name,
         ) {
-            error!("Failed to download requested file: {e:#}");
+            error!("Failed to tag cached file: {e:#}");
             self.remove_from_cache();
             Err(e)
         } else {
@@ -190,7 +184,7 @@ fn get_m4a_decoder<P: AsRef<Path>>(path: P) -> Result<redlux::Decoder<BufReader<
     redlux::Decoder::new_mpeg4(reader, metadata.len()).context("Failed initializing media decoder")
 }
 
-async fn download_to_cache<P: AsRef<std::path::Path>>(
+async fn download_to_cache<P: AsRef<Path>>(
     req_builder: reqwest::RequestBuilder,
     path: P,
 ) -> Result<()> {
@@ -283,7 +277,7 @@ fn cache_file_path(title: &str, artist: &str, album: &str) -> Result<PathBuf> {
         .join(&artist)
         .join(album);
 
-    let filename = format!("{artist} - {title}.{}", "m4a");
+    let filename = format!("{artist} - {title}.m4a");
     path.push(filename);
     Ok(path)
 }

From 51f1da620ba1150ba4d9bca316b6f5f3c3351548 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 10:11:41 -0800
Subject: [PATCH 06/13] Finish implementing mpris ui, make it default, and
 cleanup warnings

---
 Cargo.lock                 | 129 +++++++-------------------
 Cargo.toml                 |   4 +-
 src/config.rs              |   6 +-
 src/main.rs                |   4 +-
 src/model.rs               |   4 +-
 src/mpris_ui/mod.rs        |  66 ++++++++++++--
 src/mpris_ui/mpris_intf.rs | 181 ++++++++++++-------------------------
 src/player.rs              |   2 +-
 src/term_ui/callbacks.rs   |   2 +-
 src/term_ui/dialogs.rs     |   6 +-
 src/term_ui/mod.rs         |  20 ++--
 11 files changed, 168 insertions(+), 256 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 490423e..4e1bfa5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -480,15 +480,6 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
-[[package]]
-name = "castaway"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -632,20 +623,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "compact_str"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
-dependencies = [
- "castaway",
- "cfg-if",
- "itoa",
- "rustversion",
- "ryu",
- "static_assertions",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -759,15 +736,15 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crossterm"
-version = "0.28.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 1.3.2",
  "crossterm_winapi",
- "mio",
+ "libc",
+ "mio 0.8.11",
  "parking_lot",
- "rustix 0.38.44",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -794,9 +771,9 @@ dependencies = [
 
 [[package]]
 name = "cursive"
-version = "0.21.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "386d5a36020bb856e9a34ecb8a4e6c9bd6b0262d1857bae4db7bc7e2fdaa532e"
+checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839"
 dependencies = [
  "ahash",
  "cfg-if",
@@ -811,34 +788,22 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "cursive-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7ac0eb0cede3dfdfebf4d5f22354e05a730b79c25fd03481fc69fcfba0a73e"
-dependencies = [
- "proc-macro2",
-]
-
 [[package]]
 name = "cursive_core"
-version = "0.4.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321ec774d27fafc66e812034d0025f8858bd7d9095304ff8fc200e0b9f9cc257"
+checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d"
 dependencies = [
  "ahash",
- "compact_str",
  "crossbeam-channel",
- "cursive-macros",
  "enum-map",
  "enumset",
  "lazy_static",
  "log",
  "num",
- "parking_lot",
- "serde_json",
+ "owning_ref",
  "time",
- "toml 0.8.23",
+ "toml 0.5.11",
  "unicode-segmentation",
  "unicode-width",
  "xi-unicode",
@@ -2027,6 +1992,18 @@ dependencies = [
  "adler2",
 ]
 
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "mio"
 version = "1.1.1"
@@ -2034,7 +2011,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
- "log",
  "wasi",
  "windows-sys 0.61.2",
 ]
@@ -2400,6 +2376,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "owning_ref"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
+dependencies = [
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "pandora-api"
 version = "0.6.3"
@@ -3210,15 +3195,6 @@ dependencies = [
  "syn 2.0.115",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_spanned"
 version = "1.0.4"
@@ -3285,7 +3261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
@@ -3551,7 +3527,7 @@ checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
  "bytes",
  "libc",
- "mio",
+ "mio 1.1.1",
  "pin-project-lite",
  "socket2 0.6.2",
  "tokio-macros",
@@ -3611,18 +3587,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
-]
-
 [[package]]
 name = "toml"
 version = "0.9.12+spec-1.1.0"
@@ -3630,7 +3594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
  "serde_core",
- "serde_spanned 1.0.4",
+ "serde_spanned",
  "toml_datetime 0.7.5+spec-1.1.0",
  "toml_writer",
 ]
@@ -3640,9 +3604,6 @@ name = "toml_datetime"
 version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "toml_datetime"
@@ -3664,20 +3625,6 @@ dependencies = [
  "winnow 0.5.40",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.22.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_write",
- "winnow 0.7.14",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.23.10+spec-1.0.0"
@@ -3699,12 +3646,6 @@ dependencies = [
  "winnow 0.7.14",
 ]
 
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
 [[package]]
 name = "toml_writer"
 version = "1.0.6+spec-1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index d5449b9..0e3d119 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0 AND MIT AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND
 repository = "https://github.com/compenguy/panharmonicon"
 
 [features]
-default = ["emoji_labels"]
+default = ["emoji_labels", "mpris_server"]
 mpris_server = ["dep:mpris-server"]
 emoji_labels = []
 
@@ -33,7 +33,7 @@ reqwest = { version = "0.13", features = ["stream"] }
 async-broadcast = "0.7"
 redlux = { version = "0.7", git = "https://github.com/compenguy/redlux.git" }
 mp4ameta = "0.13"
-cursive = { version = "0.21", default-features = false, features = ["crossterm-backend", "toml"] }
+cursive = { version = "0.20", default-features = false, features = ["crossterm-backend", "toml"] }
 mpris-server = { version = "0.9", optional = true }
 rand = "0.10"
 
diff --git a/src/config.rs b/src/config.rs
index 8f99f11..dc596a0 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -388,8 +388,8 @@ impl Config {
     }
 
     pub(crate) fn update_from(&mut self, other: &PartialConfig) {
-        debug!("Settings before update: {:?}", self);
-        debug!("Settings being applied: {:?}", other);
+        debug!("Settings before update: {self:?}");
+        debug!("Settings being applied: {other:?}");
         if let Some(login) = &other.login {
             if self.login != *login {
                 self.dirty |= true;
@@ -424,7 +424,7 @@ impl Config {
                 self.volume = volume;
             }
         }
-        debug!("Settings after update: {:?}", self);
+        debug!("Settings after update: {self:?}");
     }
 
     pub(crate) fn login_credentials(&self) -> &Credentials {
diff --git a/src/main.rs b/src/main.rs
index ee0c14d..7a670f6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -185,7 +185,7 @@ async fn main() -> Result<()> {
                 fetcher.update()
             );
             match step_result {
-                Err(e) => error!("Error updating application state: {:#}", e),
+                Err(e) => error!("Error updating application state: {e:#}"),
                 Ok((false, false, false, false)) => std::thread::sleep(naptime),
                 Ok((_, _, _, _)) => (),
             }
@@ -200,7 +200,7 @@ async fn main() -> Result<()> {
                 fetcher.update()
             );
             match step_result {
-                Err(e) => error!("Error updating application state: {:#}", e),
+                Err(e) => error!("Error updating application state: {e:#}"),
                 Ok((false, false, false, false, false)) => std::thread::sleep(naptime),
                 Ok((_, _, _, _, _)) => (),
             }
diff --git a/src/model.rs b/src/model.rs
index 88d1a4d..f1cd6db 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -599,7 +599,7 @@ impl Model {
 
     async fn notify_next(&mut self) -> Result<()> {
         let next_track = self.get_next().cloned();
-        trace!("send notification 'Next({:?})'", next_track);
+        trace!("send notification 'Next({next_track:?})'");
         self.publish_state(State::Next(next_track)).await?;
         Ok(())
     }
@@ -749,7 +749,7 @@ impl Drop for Model {
         // If there have been any configuration changes, commit them to disk
         trace!("Flushing config file to disk...");
         if let Err(e) = self.config.borrow_mut().flush() {
-            error!("Failed commiting configuration changes to file: {:?}", e);
+            error!("Failed commiting configuration changes to file: {e:?}");
         }
         trace!("Application data model has been dropped");
     }
diff --git a/src/mpris_ui/mod.rs b/src/mpris_ui/mod.rs
index 46a1c40..5299877 100644
--- a/src/mpris_ui/mod.rs
+++ b/src/mpris_ui/mod.rs
@@ -1,7 +1,9 @@
+use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::Result;
 use log::trace;
+use tokio::sync::RwLock;
 
 use crate::messages::State;
 use crate::model::{RequestSender, StateReceiver};
@@ -9,12 +11,13 @@ use crate::track::Track;
 
 use mpris_server::{Metadata, Property, Signal, Time};
 mod mpris_intf;
-use mpris_intf::MprisInterface;
+use mpris_intf::{MprisInterface, MprisState};
 
 #[derive(Debug)]
 pub(crate) struct MprisUi {
     server: mpris_server::Server<MprisInterface>,
     state_receiver: StateReceiver,
+    shared_state: Arc<RwLock<MprisState>>,
 }
 
 impl MprisUi {
@@ -22,26 +25,36 @@ impl MprisUi {
         state_receiver: StateReceiver,
         request_sender: RequestSender,
     ) -> Result<Self> {
-        let mpris_intf = MprisInterface::new(state_receiver.clone(), request_sender);
-
+        let shared_state = Arc::new(RwLock::new(MprisState::default()));
+        let mpris_intf = MprisInterface::new(shared_state.clone(), request_sender);
         let server = mpris_server::Server::new_with_all(clap::crate_name!(), mpris_intf).await?;
 
         Ok(Self {
             server,
             state_receiver,
+            shared_state,
         })
     }
 
     async fn update_state_stopped(&mut self) -> Result<()> {
+        {
+            let mut state = self.shared_state.write().await;
+            state.playing = None;
+        }
         self.server
             .properties_changed([Property::PlaybackStatus(
-                mpris_server::PlaybackStatus::Playing,
+                mpris_server::PlaybackStatus::Stopped,
             )])
             .await?;
         Ok(())
     }
 
     async fn playing_track(&mut self, track: Track) -> Result<()> {
+        {
+            let mut state = self.shared_state.write().await;
+            state.playing = Some((track.clone(), Duration::ZERO, false));
+            state.tracklist = vec![track.clone()];
+        }
         let metadata = Metadata::builder()
             .length(Time::from_millis(track.track_length.as_millis() as i64))
             .album(track.album_name.clone())
@@ -58,9 +71,17 @@ impl MprisUi {
     }
 
     async fn update_playing(&mut self, elapsed: Duration, paused: bool) -> Result<()> {
-        let playback_status = match paused {
-            true => mpris_server::PlaybackStatus::Paused,
-            false => mpris_server::PlaybackStatus::Playing,
+        {
+            let mut state = self.shared_state.write().await;
+            if let Some((_, ref mut e, ref mut p)) = state.playing {
+                *e = elapsed;
+                *p = paused;
+            }
+        }
+        let playback_status = if paused {
+            mpris_server::PlaybackStatus::Paused
+        } else {
+            mpris_server::PlaybackStatus::Playing
         };
         self.server
             .properties_changed([Property::PlaybackStatus(playback_status)])
@@ -74,6 +95,10 @@ impl MprisUi {
     }
 
     async fn update_volume(&mut self, volume: f32) -> Result<()> {
+        {
+            let mut state = self.shared_state.write().await;
+            state.volume = volume;
+        }
         self.server
             .properties_changed([Property::Volume(volume as f64)])
             .await?;
@@ -87,10 +112,31 @@ impl MprisUi {
                 State::AuthFailed(_) => self.update_state_stopped().await?,
                 State::Connected => self.update_state_stopped().await?,
                 State::Disconnected => self.update_state_stopped().await?,
-                State::AddStation(_, _) => (),
-                State::Tuned(_) => (),
+                State::AddStation(name, id) => {
+                    let mut state = self.shared_state.write().await;
+                    state.playlists.insert(id, name);
+                }
+                State::Tuned(name) => {
+                    let mut state = self.shared_state.write().await;
+                    state.active_playlist = state
+                        .playlists
+                        .iter()
+                        .find(|(_, v)| *v == &name)
+                        .map(|(k, v)| (k.clone(), v.clone()));
+                }
                 State::TrackStarting(track) => self.playing_track(track).await?,
-                State::Next(_) => (),
+                State::Next(next_track) => {
+                    let mut state = self.shared_state.write().await;
+                    if let Some(t) = next_track {
+                        if !state
+                            .tracklist
+                            .iter()
+                            .any(|x| x.track_token == t.track_token)
+                        {
+                            state.tracklist.push(t);
+                        }
+                    }
+                }
                 State::Playing(elapsed) => self.update_playing(elapsed, false).await?,
                 State::Volume(v) => self.update_volume(v).await?,
                 State::Paused(elapsed) => self.update_playing(elapsed, true).await?,
diff --git a/src/mpris_ui/mpris_intf.rs b/src/mpris_ui/mpris_intf.rs
index a33f22d..37d8b70 100644
--- a/src/mpris_ui/mpris_intf.rs
+++ b/src/mpris_ui/mpris_intf.rs
@@ -1,12 +1,13 @@
 use std::collections::HashMap;
 use std::convert::TryFrom;
+use std::sync::Arc;
 use std::time::Duration;
 
-use anyhow::Result;
 use log::trace;
+use tokio::sync::RwLock;
 
-use crate::messages::{Request, State, StopReason};
-use crate::model::{RequestSender, StateReceiver};
+use crate::messages::{Request, StopReason};
+use crate::model::RequestSender;
 use crate::track::Track;
 
 use mpris_server::zbus;
@@ -14,26 +15,27 @@ use mpris_server::{LoopStatus, PlaybackRate, PlaylistId, PlaylistOrdering, Track
 use mpris_server::{Metadata, PlaybackStatus, Playlist, Time, Volume};
 use mpris_server::{PlayerInterface, PlaylistsInterface, RootInterface, TrackListInterface};
 
+/// Shared state between MprisUi (writer) and MprisInterface (reader) so D-Bus
+/// property reads see the same playback state as emitted signals.
+#[derive(Debug, Default)]
+pub(crate) struct MprisState {
+    pub(crate) playlists: HashMap<String, String>,
+    pub(crate) active_playlist: Option<(String, String)>,
+    pub(crate) tracklist: Vec<Track>,
+    pub(crate) playing: Option<(Track, Duration, bool)>,
+    pub(crate) volume: f32,
+}
+
 pub(crate) struct MprisInterface {
-    state_receiver: StateReceiver,
+    state: Arc<RwLock<MprisState>>,
     request_sender: RequestSender,
-    playlists: HashMap<String, String>,
-    active_playlist: Option<(String, String)>,
-    tracklist: Vec<Track>,
-    playing: Option<(Track, Duration, bool)>,
-    volume: f32,
 }
 
 impl MprisInterface {
-    pub(crate) fn new(state_receiver: StateReceiver, request_sender: RequestSender) -> Self {
+    pub(crate) fn new(state: Arc<RwLock<MprisState>>, request_sender: RequestSender) -> Self {
         Self {
-            state_receiver,
+            state,
             request_sender,
-            playlists: HashMap::with_capacity(8),
-            active_playlist: None,
-            tracklist: Vec::with_capacity(4),
-            playing: None,
-            volume: 0.0f32,
         }
     }
 
@@ -43,80 +45,6 @@ impl MprisInterface {
             .map_err(|e| zbus::Error::Failure(e.to_string()))?;
         Ok(())
     }
-
-    fn playing_track(&mut self, track: Track) {
-        self.playing = Some((track, std::time::Duration::from_millis(0), false));
-    }
-
-    fn update_playing(&mut self, elapsed: Duration, paused: bool) {
-        if let Some((_, e, p)) = &mut self.playing {
-            *e = elapsed;
-            *p = paused;
-        }
-    }
-
-    fn update_volume(&mut self, volume: f32) {
-        self.volume = volume;
-    }
-
-    fn add_playlist(&mut self, name: String, id: String) {
-        self.playlists.insert(id, name);
-    }
-
-    fn start_playlist(&mut self, name: String) {
-        let playlist_id = self.playlists.iter().find_map(|(k, v)| {
-            if v == name.as_str() {
-                Some((k, v))
-            } else {
-                None
-            }
-        });
-        self.active_playlist = playlist_id.map(|(a, b)| (a.to_owned(), b.to_owned()));
-    }
-
-    fn update_tracklist(&mut self, track: Option<Track>) {
-        let tracklist: Vec<Track> = self
-            .playing
-            .as_ref()
-            .map(|(t, _, _)| t.clone())
-            .iter()
-            .chain(track.iter())
-            .cloned()
-            .collect();
-        self.tracklist = tracklist;
-    }
-
-    async fn process_messages(&mut self) -> Result<()> {
-        trace!("checking for player notifications...");
-        while let Ok(message) = self.state_receiver.try_recv() {
-            match message {
-                State::AuthFailed(_) => (),
-                State::Connected => (),
-                State::Disconnected => (),
-                State::AddStation(name, id) => self.add_playlist(name, id),
-                State::Tuned(name) => self.start_playlist(name),
-                State::TrackStarting(track) => self.playing_track(track),
-                State::Next(track) => self.update_tracklist(track),
-                State::Playing(elapsed) => self.update_playing(elapsed, false),
-                State::Volume(v) => self.update_volume(v),
-                State::Paused(elapsed) => self.update_playing(elapsed, true),
-                State::Stopped(_) => (),
-                State::Buffering => (),
-                State::TrackCaching(_) => (),
-                State::Muted => (),
-                State::Unmuted => (),
-                State::Quit => (),
-            }
-        }
-        Ok(())
-    }
-
-    pub(crate) async fn update(&mut self) -> zbus::Result<()> {
-        self.process_messages()
-            .await
-            .map_err(|e| zbus::Error::Failure(e.to_string()))?;
-        Ok(())
-    }
 }
 
 // mpris-server dbus interfaces
@@ -192,6 +120,7 @@ impl PlayerInterface for MprisInterface {
     }
 
     async fn stop(&self) -> zbus::fdo::Result<()> {
+        self.publish_zrequest(Request::Stop(StopReason::UserRequest))?;
         Ok(())
     }
 
@@ -213,7 +142,8 @@ impl PlayerInterface for MprisInterface {
     }
 
     async fn playback_status(&self) -> zbus::fdo::Result<PlaybackStatus> {
-        let status = match self.playing {
+        let guard = self.state.read().await;
+        let status = match &guard.playing {
             Some((_, _, false)) => PlaybackStatus::Playing,
             Some((_, _, true)) => PlaybackStatus::Paused,
             None => PlaybackStatus::Stopped,
@@ -246,7 +176,8 @@ impl PlayerInterface for MprisInterface {
     }
 
     async fn metadata(&self) -> zbus::fdo::Result<Metadata> {
-        if let Some((t, _, _)) = &self.playing {
+        let guard = self.state.read().await;
+        if let Some((t, _, _)) = &guard.playing {
             Ok(Metadata::from(t))
         } else {
             Ok(Metadata::default())
@@ -254,7 +185,8 @@ impl PlayerInterface for MprisInterface {
     }
 
     async fn volume(&self) -> zbus::fdo::Result<Volume> {
-        Ok(self.volume as f64)
+        let guard = self.state.read().await;
+        Ok(guard.volume as f64)
     }
 
     async fn set_volume(&self, volume: Volume) -> zbus::Result<()> {
@@ -263,7 +195,8 @@ impl PlayerInterface for MprisInterface {
     }
 
     async fn position(&self) -> zbus::fdo::Result<Time> {
-        if let Some((_, pos, _)) = self.playing {
+        let guard = self.state.read().await;
+        if let Some((_, pos, _)) = &guard.playing {
             Ok(Time::from_millis(pos.as_millis() as i64))
         } else {
             Ok(Time::ZERO)
@@ -308,19 +241,16 @@ impl TrackListInterface for MprisInterface {
         &self,
         track_ids: Vec<TrackId>,
     ) -> zbus::fdo::Result<Vec<Metadata>> {
-        let mut tracks_metadata = Vec::new();
+        let guard = self.state.read().await;
+        let mut tracks_metadata = Vec::with_capacity(track_ids.len());
         for track_id in track_ids {
-            if let Some(md) = self.tracklist.iter().find_map(|t| {
-                if t.track_token.as_str() == track_id.as_str() {
-                    Some(Metadata::from(t))
-                } else {
-                    None
-                }
-            }) {
-                tracks_metadata.push(md);
-            } else {
-                tracks_metadata.push(Metadata::default());
-            }
+            let md = guard
+                .tracklist
+                .iter()
+                .find(|t| t.track_token.as_str() == track_id.as_str())
+                .map(Metadata::from)
+                .unwrap_or_default();
+            tracks_metadata.push(md);
         }
         Ok(tracks_metadata)
     }
@@ -346,13 +276,11 @@ impl TrackListInterface for MprisInterface {
     }
 
     async fn tracks(&self) -> zbus::fdo::Result<Vec<TrackId>> {
-        let tracklist: Vec<TrackId> = self
+        let guard = self.state.read().await;
+        let tracklist: Vec<TrackId> = guard
             .tracklist
             .iter()
-            .map(|t| {
-                TrackId::try_from(t.track_token.as_str())
-                    .expect("Failed to convert track token to TrackId")
-            })
+            .filter_map(|t| TrackId::try_from(t.track_token.as_str()).ok())
             .collect();
         Ok(tracklist)
     }
@@ -375,22 +303,25 @@ impl PlaylistsInterface for MprisInterface {
         _order: PlaylistOrdering,
         _reverse_order: bool,
     ) -> zbus::fdo::Result<Vec<Playlist>> {
-        let mut playlists: Vec<Playlist> = self
+        let guard = self.state.read().await;
+        let playlists: Vec<Playlist> = guard
             .playlists
             .iter()
-            .map(|p| Playlist {
-                id: PlaylistId::try_from(p.0.as_str())
-                    .expect("Failed to convert playlist id to PlaylistId"),
-                name: p.1.to_string(),
-                icon: Uri::new(),
+            .filter_map(|(id, name)| {
+                Some(Playlist {
+                    id: PlaylistId::try_from(id.as_str()).ok()?,
+                    name: name.clone(),
+                    icon: Uri::new(),
+                })
             })
+            .take(max_count as usize)
             .collect();
-        playlists.truncate(max_count as usize);
         Ok(playlists)
     }
 
     async fn playlist_count(&self) -> zbus::fdo::Result<u32> {
-        Ok(self.playlists.len() as u32)
+        let guard = self.state.read().await;
+        Ok(guard.playlists.len() as u32)
     }
 
     async fn orderings(&self) -> zbus::fdo::Result<Vec<PlaylistOrdering>> {
@@ -398,11 +329,13 @@ impl PlaylistsInterface for MprisInterface {
     }
 
     async fn active_playlist(&self) -> zbus::fdo::Result<Option<Playlist>> {
-        Ok(self.active_playlist.as_ref().map(|(id, name)| Playlist {
-            id: PlaylistId::try_from(id.as_str())
-                .expect("Failed to convert station id to PlaylistId"),
-            name: name.to_string(),
-            icon: Uri::new(),
+        let guard = self.state.read().await;
+        Ok(guard.active_playlist.as_ref().and_then(|(id, name)| {
+            Some(Playlist {
+                id: PlaylistId::try_from(id.as_str()).ok()?,
+                name: name.clone(),
+                icon: Uri::new(),
+            })
         }))
     }
 }
diff --git a/src/player.rs b/src/player.rs
index 8dfef28..8d9bbc0 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -427,7 +427,7 @@ impl Player {
                 State::Muted => self.mute(),
                 State::Unmuted => self.unmute(),
                 State::Stopped(reason) => {
-                    info!("Stopping track playback: {:?}", reason);
+                    info!("Stopping track playback: {reason:?}");
                     self.stop()
                 }
                 State::Quit => self.stop(),
diff --git a/src/term_ui/callbacks.rs b/src/term_ui/callbacks.rs
index 73d2532..c2d46cf 100644
--- a/src/term_ui/callbacks.rs
+++ b/src/term_ui/callbacks.rs
@@ -107,7 +107,7 @@ pub(crate) fn connect_button(s: &mut Cursive) {
                 let _ = ctx.publish_request(Request::Connect);
             }
             Err(e) => {
-                error!("Failed while updating password: {:?}", e);
+                error!("Failed while updating password: {e:?}");
             }
         }
     });
diff --git a/src/term_ui/dialogs.rs b/src/term_ui/dialogs.rs
index 28c5b6f..e726b86 100644
--- a/src/term_ui/dialogs.rs
+++ b/src/term_ui/dialogs.rs
@@ -94,11 +94,7 @@ pub(crate) fn playing_view() -> LinearLayout {
                     SliderView::horizontal(11)
                         .on_change(|s, v| {
                             let new_volume: f32 = ((v as f32) / 10.0).clamp(0.0f32, 1.0f32);
-                            trace!(
-                                "Submitting updated volume from slider: {} ({:.2})",
-                                v,
-                                new_volume
-                            );
+                            trace!("Submitting updated volume from slider: {v} ({new_volume:.2})");
                             trace!("send request 'volume'");
                             s.with_user_data(|ctx: &mut TerminalContext| {
                                 let _ = ctx.publish_request(Request::Volume(new_volume));
diff --git a/src/term_ui/mod.rs b/src/term_ui/mod.rs
index 66c0094..6249042 100644
--- a/src/term_ui/mod.rs
+++ b/src/term_ui/mod.rs
@@ -117,7 +117,7 @@ impl Terminal {
     }
 
     fn added_station(&mut self, name: String, id: String) {
-        trace!("Adding station {}[{}] to list...", name, id);
+        trace!("Adding station {name}[{id}] to list...");
         self.siv
             .call_on_name("stations", |v: &mut SelectView<String>| {
                 // If we were disconnected, the station list contains one entry: "No Stations"
@@ -157,7 +157,7 @@ impl Terminal {
     }
 
     fn tuned_station(&mut self, id: String) {
-        trace!("Tuning station {}...", id);
+        trace!("Tuning station {id}...");
         self.siv
             .call_on_name("stations", |v: &mut SelectView<String>| {
                 let opt_idx = v
@@ -185,7 +185,7 @@ impl Terminal {
             ..
         } = track;
         self.siv.call_on_name("title", |v: &mut TextView| {
-            debug!("Playing title {} ({})", title, song_rating);
+            debug!("Playing title {title} ({song_rating})");
             let mut title = title.clone();
             if song_rating > 0 {
                 title.push(' ');
@@ -194,11 +194,11 @@ impl Terminal {
             v.set_content(title);
         });
         self.siv.call_on_name("artist", |v: &mut TextView| {
-            debug!("Playing artist {}", artist_name);
+            debug!("Playing artist {artist_name}");
             v.set_content(artist_name);
         });
         self.siv.call_on_name("album", |v: &mut TextView| {
-            debug!("Playing album {}", album_name);
+            debug!("Playing album {album_name}");
             v.set_content(album_name);
         });
         self.update_playing(Duration::default(), false);
@@ -221,7 +221,7 @@ impl Terminal {
         };
 
         self.siv.call_on_name("next_up", |v: &mut TextView| {
-            debug!("Next up: {:?}", track);
+            debug!("Next up: {track:?}");
             v.set_content(styled_text);
         });
         self.dirty |= true;
@@ -251,7 +251,7 @@ impl Terminal {
                         "{playpause:<6} [{elapsed_minutes:>2}:{elapsed_seconds:02}]"
                     )
                 };
-                trace!("Playing panel title: {}", text);
+                trace!("Playing panel title: {text}");
                 v.set_title(text);
             });
         self.dirty |= true;
@@ -322,11 +322,7 @@ impl Terminal {
         trace!("Updating volume...");
         self.siv.call_on_name("volume", |v: &mut SliderView| {
             let volume_adj = ((volume * 10.0).round() as usize).clamp(0, 10);
-            trace!(
-                "Converted model volume from {:.2} to {}",
-                volume,
-                volume_adj
-            );
+            trace!("Converted model volume from {volume:.2} to {volume_adj}");
             v.set_value(volume_adj);
         });
         self.dirty |= true;

From a0d3c042ec543e1e878148e0a7ba867435ed0022 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 11:06:55 -0800
Subject: [PATCH 07/13] Make terminal UI optional

---
 Cargo.lock  | 174 +++++++++++++++++++++++++++++-----------------------
 Cargo.toml  |   6 +-
 src/main.rs |  30 ++++++++-
 3 files changed, 128 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e1bfa5..68c028e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,7 +25,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
  "cipher",
- "cpufeatures 0.2.17",
+ "cpufeatures",
 ]
 
 [[package]]
@@ -480,6 +480,15 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
+[[package]]
+name = "castaway"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "cbc"
 version = "0.1.2"
@@ -528,17 +537,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
-[[package]]
-name = "chacha20"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
-dependencies = [
- "cfg-if",
- "cpufeatures 0.3.0",
- "rand_core 0.10.0",
-]
-
 [[package]]
 name = "chrono"
 version = "0.4.43"
@@ -623,6 +621,20 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "compact_str"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "rustversion",
+ "ryu",
+ "static_assertions",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -710,15 +722,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cpufeatures"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -736,15 +739,15 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crossterm"
-version = "0.25.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.10.0",
  "crossterm_winapi",
- "libc",
- "mio 0.8.11",
+ "mio",
  "parking_lot",
+ "rustix 0.38.44",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -771,9 +774,9 @@ dependencies = [
 
 [[package]]
 name = "cursive"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839"
+checksum = "386d5a36020bb856e9a34ecb8a4e6c9bd6b0262d1857bae4db7bc7e2fdaa532e"
 dependencies = [
  "ahash",
  "cfg-if",
@@ -788,22 +791,34 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "cursive-macros"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac7ac0eb0cede3dfdfebf4d5f22354e05a730b79c25fd03481fc69fcfba0a73e"
+dependencies = [
+ "proc-macro2",
+]
+
 [[package]]
 name = "cursive_core"
-version = "0.3.7"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d"
+checksum = "321ec774d27fafc66e812034d0025f8858bd7d9095304ff8fc200e0b9f9cc257"
 dependencies = [
  "ahash",
+ "compact_str",
  "crossbeam-channel",
+ "cursive-macros",
  "enum-map",
  "enumset",
  "lazy_static",
  "log",
  "num",
- "owning_ref",
+ "parking_lot",
+ "serde_json",
  "time",
- "toml 0.5.11",
+ "toml 0.8.23",
  "unicode-segmentation",
  "unicode-width",
  "xi-unicode",
@@ -1345,7 +1360,6 @@ dependencies = [
  "cfg-if",
  "libc",
  "r-efi",
- "rand_core 0.10.0",
  "wasip2",
  "wasip3",
 ]
@@ -1992,18 +2006,6 @@ dependencies = [
  "adler2",
 ]
 
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "mio"
 version = "1.1.1"
@@ -2011,6 +2013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
 dependencies = [
  "libc",
+ "log",
  "wasi",
  "windows-sys 0.61.2",
 ]
@@ -2376,15 +2379,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "owning_ref"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
-dependencies = [
- "stable_deref_trait",
-]
-
 [[package]]
 name = "pandora-api"
 version = "0.6.3"
@@ -2436,7 +2430,6 @@ dependencies = [
  "mp4ameta",
  "mpris-server",
  "pandora-api",
- "rand 0.10.0",
  "redlux",
  "reqwest 0.13.2",
  "serde",
@@ -2695,17 +2688,6 @@ dependencies = [
  "rand_core 0.9.5",
 ]
 
-[[package]]
-name = "rand"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8"
-dependencies = [
- "chacha20",
- "getrandom 0.4.1",
- "rand_core 0.10.0",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -2744,12 +2726,6 @@ dependencies = [
  "getrandom 0.3.4",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba"
-
 [[package]]
 name = "redlux"
 version = "0.7.0"
@@ -3195,6 +3171,15 @@ dependencies = [
  "syn 2.0.115",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_spanned"
 version = "1.0.4"
@@ -3223,7 +3208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.2.17",
+ "cpufeatures",
  "digest",
 ]
 
@@ -3234,7 +3219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.2.17",
+ "cpufeatures",
  "digest",
 ]
 
@@ -3261,7 +3246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
 dependencies = [
  "libc",
- "mio 0.8.11",
+ "mio",
  "signal-hook",
 ]
 
@@ -3527,7 +3512,7 @@ checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
 dependencies = [
  "bytes",
  "libc",
- "mio 1.1.1",
+ "mio",
  "pin-project-lite",
  "socket2 0.6.2",
  "tokio-macros",
@@ -3587,6 +3572,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_edit 0.22.27",
+]
+
 [[package]]
 name = "toml"
 version = "0.9.12+spec-1.1.0"
@@ -3594,7 +3591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
  "serde_core",
- "serde_spanned",
+ "serde_spanned 1.0.4",
  "toml_datetime 0.7.5+spec-1.1.0",
  "toml_writer",
 ]
@@ -3604,6 +3601,9 @@ name = "toml_datetime"
 version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_datetime"
@@ -3625,6 +3625,20 @@ dependencies = [
  "winnow 0.5.40",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
+ "toml_write",
+ "winnow 0.7.14",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.23.10+spec-1.0.0"
@@ -3646,6 +3660,12 @@ dependencies = [
  "winnow 0.7.14",
 ]
 
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
 [[package]]
 name = "toml_writer"
 version = "1.0.6+spec-1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0e3d119..f10efd5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,8 +8,9 @@ license = "Apache-2.0 AND MIT AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND
 repository = "https://github.com/compenguy/panharmonicon"
 
 [features]
-default = ["emoji_labels", "mpris_server"]
+default = ["emoji_labels", "mpris_server", "term_ui"]
 mpris_server = ["dep:mpris-server"]
+term_ui = ["dep:cursive"]
 emoji_labels = []
 
 [dependencies]
@@ -33,9 +34,8 @@ reqwest = { version = "0.13", features = ["stream"] }
 async-broadcast = "0.7"
 redlux = { version = "0.7", git = "https://github.com/compenguy/redlux.git" }
 mp4ameta = "0.13"
-cursive = { version = "0.20", default-features = false, features = ["crossterm-backend", "toml"] }
+cursive = { version = "0.21", optional = true, default-features = false, features = ["crossterm-backend", "toml"] }
 mpris-server = { version = "0.9", optional = true }
-rand = "0.10"
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
diff --git a/src/main.rs b/src/main.rs
index 7a670f6..5d7a88e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,6 +17,7 @@ mod model;
 mod mpris_ui;
 mod pandora;
 mod player;
+#[cfg(feature = "term_ui")]
 mod term_ui;
 mod track;
 
@@ -131,7 +132,9 @@ async fn main() -> Result<()> {
     let mut mpris_ui =
         mpris_ui::MprisUi::new(model.updates_channel(), model.request_channel()).await?;
 
+    #[cfg(feature = "term_ui")]
     trace!("Initializing terminal interface");
+    #[cfg(feature = "term_ui")]
     let mut term_ui =
         term_ui::Terminal::new(conf_ref, model.updates_channel(), model.request_channel());
 
@@ -176,7 +179,16 @@ async fn main() -> Result<()> {
         }
         */
 
-        #[cfg(not(feature = "mpris_server"))]
+        #[cfg(all(not(feature = "mpris_server"), not(feature = "term_ui")))]
+        {
+            let step_result = tokio::try_join!(model.update(), player.update(), fetcher.update());
+            match step_result {
+                Err(e) => error!("Error updating application state: {e:#}"),
+                Ok((false, false, false)) => std::thread::sleep(naptime),
+                Ok((_, _, _)) => (),
+            }
+        }
+        #[cfg(all(not(feature = "mpris_server"), feature = "term_ui"))]
         {
             let step_result = tokio::try_join!(
                 model.update(),
@@ -190,7 +202,21 @@ async fn main() -> Result<()> {
                 Ok((_, _, _, _)) => (),
             }
         }
-        #[cfg(feature = "mpris_server")]
+        #[cfg(all(feature = "mpris_server", not(feature = "term_ui")))]
+        {
+            let step_result = tokio::try_join!(
+                model.update(),
+                player.update(),
+                mpris_ui.update(),
+                fetcher.update()
+            );
+            match step_result {
+                Err(e) => error!("Error updating application state: {e:#}"),
+                Ok((false, false, false, false)) => std::thread::sleep(naptime),
+                Ok((_, _, _, _)) => (),
+            }
+        }
+        #[cfg(all(feature = "mpris_server", feature = "term_ui"))]
         {
             let step_result = tokio::try_join!(
                 model.update(),

From 2ac4814158f0fe8c8ffedcc90ba569c36769d676 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 11:16:52 -0800
Subject: [PATCH 08/13] Make terminal interface default to off when mpris is
 present and active

---
 src/main.rs | 75 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 59 insertions(+), 16 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 5d7a88e..2691212 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -29,7 +29,7 @@ async fn main() -> Result<()> {
         .ok_or(Error::AppDirNotFound)?
         .join(clap::crate_name!())
         .join("config.json");
-    let matches = clap::command!("")
+    let mut app = clap::command!("")
         .arg(
             clap::Arg::new("gen-config")
                 .short('c')
@@ -55,8 +55,18 @@ async fn main() -> Result<()> {
                 .action(clap::ArgAction::SetTrue)
                 .hide(true)
                 .help("Whether to write a debug log file."),
-        )
-        .get_matches();
+        );
+    #[cfg(feature = "term_ui")]
+    {
+        app = app.arg(
+            clap::Arg::new("terminal")
+                .short('t')
+                .long("terminal")
+                .action(clap::ArgAction::SetTrue)
+                .help("Run with the terminal UI (only applies when MPRIS is also available)."),
+        );
+    }
+    let matches = app.get_matches();
 
     let crate_log_level = match matches.get_count("debug") {
         0 => log::LevelFilter::Off,
@@ -132,12 +142,31 @@ async fn main() -> Result<()> {
     let mut mpris_ui =
         mpris_ui::MprisUi::new(model.updates_channel(), model.request_channel()).await?;
 
-    #[cfg(feature = "term_ui")]
+    // When both term_ui and mpris_server are enabled, only run the terminal UI if --terminal was passed.
+    #[cfg(all(feature = "term_ui", feature = "mpris_server"))]
+    let use_terminal_ui = matches.get_flag("terminal");
+    #[cfg(all(feature = "term_ui", not(feature = "mpris_server")))]
+    let use_terminal_ui = true;
+
+    #[cfg(all(feature = "term_ui", not(feature = "mpris_server")))]
     trace!("Initializing terminal interface");
-    #[cfg(feature = "term_ui")]
+    #[cfg(all(feature = "term_ui", not(feature = "mpris_server")))]
     let mut term_ui =
         term_ui::Terminal::new(conf_ref, model.updates_channel(), model.request_channel());
 
+    #[cfg(all(feature = "term_ui", feature = "mpris_server"))]
+    let mut term_ui_opt = if use_terminal_ui {
+        trace!("Initializing terminal interface");
+        Some(term_ui::Terminal::new(
+            conf_ref,
+            model.updates_channel(),
+            model.request_channel(),
+        ))
+    } else {
+        let _ = conf_ref;
+        None
+    };
+
     trace!("Initializing player interface");
     let mut player = player::Player::new(model.updates_channel(), model.request_channel());
 
@@ -218,17 +247,31 @@ async fn main() -> Result<()> {
         }
         #[cfg(all(feature = "mpris_server", feature = "term_ui"))]
         {
-            let step_result = tokio::try_join!(
-                model.update(),
-                player.update(),
-                term_ui.update(),
-                mpris_ui.update(),
-                fetcher.update()
-            );
-            match step_result {
-                Err(e) => error!("Error updating application state: {e:#}"),
-                Ok((false, false, false, false, false)) => std::thread::sleep(naptime),
-                Ok((_, _, _, _, _)) => (),
+            if use_terminal_ui {
+                let step_result = tokio::try_join!(
+                    model.update(),
+                    player.update(),
+                    term_ui_opt.as_mut().unwrap().update(),
+                    mpris_ui.update(),
+                    fetcher.update()
+                );
+                match step_result {
+                    Err(e) => error!("Error updating application state: {e:#}"),
+                    Ok((false, false, false, false, false)) => std::thread::sleep(naptime),
+                    Ok((_, _, _, _, _)) => (),
+                }
+            } else {
+                let step_result = tokio::try_join!(
+                    model.update(),
+                    player.update(),
+                    mpris_ui.update(),
+                    fetcher.update()
+                );
+                match step_result {
+                    Err(e) => error!("Error updating application state: {e:#}"),
+                    Ok((false, false, false, false)) => std::thread::sleep(naptime),
+                    Ok((_, _, _, _)) => (),
+                }
             }
         }
     }

From e17ddfd8d881fa14c6b3746935d4c6819d4d67b8 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 12:24:03 -0800
Subject: [PATCH 09/13] Major rework to make most of the components run in
 dedicated threads

This dramatically improves responsiveness while running pandora api
calls in the background, especially for refilling the track queue. It
also appears to reduce CPU utilization, probably due to not forcing all
components to check their event queues every conjoined iteration.
---
 Cargo.toml               |   2 +-
 src/config.rs            |   4 +
 src/main.rs              | 233 +++++++++++++++++----------------------
 src/model.rs             |  45 +++++---
 src/pandora.rs           |  21 +++-
 src/term_ui/callbacks.rs |  20 +++-
 src/term_ui/dialogs.rs   |  12 +-
 src/term_ui/mod.rs       |  10 +-
 8 files changed, 180 insertions(+), 167 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f10efd5..32b7334 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ serde_json = "1"
 keyring = "2"
 pandora-api = "0.6"
 futures = "0.3"
-tokio = { version = "1", default-features = false, features = ["fs", "io-util", "macros", "rt", "time"] }
+tokio = { version = "1", default-features = false, features = ["fs", "io-util", "macros", "rt-multi-thread", "sync", "time"] }
 reqwest = { version = "0.13", features = ["stream"] }
 async-broadcast = "0.7"
 redlux = { version = "0.7", git = "https://github.com/compenguy/redlux.git" }
diff --git a/src/config.rs b/src/config.rs
index dc596a0..ef75ed2 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,6 +1,7 @@
 use std::fs::{create_dir_all, File};
 use std::io::{BufReader, BufWriter};
 use std::path::{Path, PathBuf};
+use std::sync::{Arc, RwLock};
 
 use anyhow::{Context, Result};
 use clap::crate_name;
@@ -9,6 +10,9 @@ use serde_derive::{Deserialize, Serialize};
 
 use crate::errors::Error;
 
+/// Thread-safe shared config for use across model, term_ui, and pandora threads.
+pub(crate) type SharedConfig = Arc<RwLock<Config>>;
+
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq)]
 pub(crate) enum CachePolicy {
     // This entry is now superceded by, and behaves the same as, EvictCompleted
diff --git a/src/main.rs b/src/main.rs
index 2691212..fc0a1d9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,7 @@
-use std::{cell::RefCell, rc::Rc};
+use std::sync::{Arc, RwLock};
+use std::time::Duration;
+
+use crate::messages::State;
 
 use anyhow::{Context, Result};
 use flexi_logger::{detailed_format, Logger};
@@ -8,7 +11,7 @@ mod errors;
 use crate::errors::Error;
 
 mod config;
-use crate::config::Config;
+use crate::config::{Config, SharedConfig};
 
 mod caching;
 mod messages;
@@ -21,8 +24,7 @@ mod player;
 mod term_ui;
 mod track;
 
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> Result<()> {
+fn main() -> Result<()> {
     human_panic::setup_panic!();
 
     let config_file = dirs::config_dir()
@@ -128,156 +130,121 @@ async fn main() -> Result<()> {
         .unwrap_or(false);
     let conf = Config::get_config(config_file, gen_config)?;
     debug!("Configuration settings: {:?}", &conf);
-    let conf_ref = Rc::new(RefCell::new(conf));
+    let shared_config: SharedConfig = Arc::new(RwLock::new(conf));
 
     trace!("Initializing application core");
-    let mut model = model::Model::new(conf_ref.clone());
+    let model = model::Model::new(shared_config.clone());
 
     trace!("Initializing track fetcher");
     let mut fetcher = caching::TrackCacher::new(model.updates_channel(), model.request_channel());
 
-    #[cfg(feature = "mpris_server")]
-    trace!("Initializing mpris interface");
-    #[cfg(feature = "mpris_server")]
-    let mut mpris_ui =
-        mpris_ui::MprisUi::new(model.updates_channel(), model.request_channel()).await?;
-
-    // When both term_ui and mpris_server are enabled, only run the terminal UI if --terminal was passed.
     #[cfg(all(feature = "term_ui", feature = "mpris_server"))]
     let use_terminal_ui = matches.get_flag("terminal");
     #[cfg(all(feature = "term_ui", not(feature = "mpris_server")))]
     let use_terminal_ui = true;
 
-    #[cfg(all(feature = "term_ui", not(feature = "mpris_server")))]
-    trace!("Initializing terminal interface");
-    #[cfg(all(feature = "term_ui", not(feature = "mpris_server")))]
-    let mut term_ui =
-        term_ui::Terminal::new(conf_ref, model.updates_channel(), model.request_channel());
-
-    #[cfg(all(feature = "term_ui", feature = "mpris_server"))]
-    let mut term_ui_opt = if use_terminal_ui {
-        trace!("Initializing terminal interface");
-        Some(term_ui::Terminal::new(
-            conf_ref,
-            model.updates_channel(),
-            model.request_channel(),
-        ))
-    } else {
-        let _ = conf_ref;
-        None
-    };
-
     trace!("Initializing player interface");
     let mut player = player::Player::new(model.updates_channel(), model.request_channel());
 
-    trace!("Starting app");
-    let naptime = std::time::Duration::from_millis(100);
-
-    // TODO: spawn each subsystem, or at least the `Send` ones, as their own task?
-    while !model.quitting() {
-        trace!("Advancing application state...");
-        /*
-        let mut dirty = false;
-        trace!("Advancing model...");
-        match model.update().await {
-            Ok(d) => dirty |= d,
-            Err(e) => error!("Error updating model state: {e:#}"),
-        }
-
-        trace!("Advancing player...");
-        match player.update().await {
-            Ok(d) => dirty |= d,
-            Err(e) => error!("Error updating player state: {e:#}"),
-        }
-
-        trace!("Advancing ui...");
-        match ui.update().await {
-            Ok(d) => dirty |= d,
-            Err(e) => error!("Error updating ui state: {e:#}"),
-        }
-
-        trace!("Advancing fetcher...");
-        match fetcher.update().await {
-            Ok(d) => dirty |= d,
-            Err(e) => error!("Error updating fetcher state: {e:#}"),
-        }
-
-        if !dirty {
-            trace!("naptime");
-            std::thread::sleep(naptime);
-        }
-        */
-
-        #[cfg(all(not(feature = "mpris_server"), not(feature = "term_ui")))]
-        {
-            let step_result = tokio::try_join!(model.update(), player.update(), fetcher.update());
-            match step_result {
-                Err(e) => error!("Error updating application state: {e:#}"),
-                Ok((false, false, false)) => std::thread::sleep(naptime),
-                Ok((_, _, _)) => (),
-            }
-        }
-        #[cfg(all(not(feature = "mpris_server"), feature = "term_ui"))]
-        {
-            let step_result = tokio::try_join!(
-                model.update(),
-                player.update(),
-                term_ui.update(),
-                fetcher.update()
-            );
-            match step_result {
-                Err(e) => error!("Error updating application state: {e:#}"),
-                Ok((false, false, false, false)) => std::thread::sleep(naptime),
-                Ok((_, _, _, _)) => (),
+    let naptime = Duration::from_millis(100);
+
+    let rt = tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(4)
+        .enable_all()
+        .build()
+        .context("Failed to build tokio runtime")?;
+
+    rt.block_on(async move {
+        let mut state_receiver_main = model.updates_channel();
+        let mut state_receiver_fetcher = model.updates_channel();
+        #[cfg(feature = "mpris_server")]
+        let mut state_receiver_mpris = model.updates_channel();
+
+        #[cfg(feature = "mpris_server")]
+        let mut mpris_ui = mpris_ui::MprisUi::new(model.updates_channel(), model.request_channel())
+            .await
+            .expect("Failed to create MPRIS UI");
+
+        let mut term_ui_opt = if use_terminal_ui && cfg!(feature = "term_ui") {
+            Some(term_ui::Terminal::new(
+                shared_config.clone(),
+                model.updates_channel(),
+                model.request_channel(),
+            ))
+        } else {
+            None
+        };
+
+        // Model runs on its own thread (via tokio worker); exits when it processes Request::Quit.
+        let model_handle = tokio::spawn(async move {
+            let mut model = model;
+            while !model.quitting() {
+                if let Err(e) = model.update().await {
+                    error!("Error updating model state: {e:#}");
+                }
+                tokio::time::sleep(naptime).await;
             }
-        }
-        #[cfg(all(feature = "mpris_server", not(feature = "term_ui")))]
-        {
-            let step_result = tokio::try_join!(
-                model.update(),
-                player.update(),
-                mpris_ui.update(),
-                fetcher.update()
-            );
-            match step_result {
-                Err(e) => error!("Error updating application state: {e:#}"),
-                Ok((false, false, false, false)) => std::thread::sleep(naptime),
-                Ok((_, _, _, _)) => (),
+            drop(model);
+        });
+
+        // Fetcher runs on its own thread; exits when it receives State::Quit from the broadcast.
+        let fetcher_handle = tokio::spawn(async move {
+            loop {
+                while let Ok(msg) = state_receiver_fetcher.try_recv() {
+                    if matches!(msg, State::Quit) {
+                        return;
+                    }
+                }
+                if let Err(e) = fetcher.update().await {
+                    error!("Error updating fetcher state: {e:#}");
+                }
+                tokio::time::sleep(naptime).await;
             }
-        }
-        #[cfg(all(feature = "mpris_server", feature = "term_ui"))]
-        {
-            if use_terminal_ui {
-                let step_result = tokio::try_join!(
-                    model.update(),
-                    player.update(),
-                    term_ui_opt.as_mut().unwrap().update(),
-                    mpris_ui.update(),
-                    fetcher.update()
-                );
-                match step_result {
-                    Err(e) => error!("Error updating application state: {e:#}"),
-                    Ok((false, false, false, false, false)) => std::thread::sleep(naptime),
-                    Ok((_, _, _, _, _)) => (),
+        });
+
+        #[cfg(feature = "mpris_server")]
+        let mpris_handle = tokio::spawn(async move {
+            loop {
+                while let Ok(msg) = state_receiver_mpris.try_recv() {
+                    if matches!(msg, State::Quit) {
+                        return;
+                    }
                 }
-            } else {
-                let step_result = tokio::try_join!(
-                    model.update(),
-                    player.update(),
-                    mpris_ui.update(),
-                    fetcher.update()
-                );
-                match step_result {
-                    Err(e) => error!("Error updating application state: {e:#}"),
-                    Ok((false, false, false, false)) => std::thread::sleep(naptime),
-                    Ok((_, _, _, _)) => (),
+                if let Err(e) = mpris_ui.update().await {
+                    error!("Error updating mpris state: {e:#}");
+                }
+                tokio::time::sleep(naptime).await;
+            }
+        });
+
+        // Player and term_ui (cursive) are !Send, so they stay on the main thread. Exit on State::Quit.
+        trace!("Starting app (player and term_ui on main thread)");
+        let mut quitting = false;
+        while !quitting {
+            // pump the message queue to see if we've been told to quit
+            while let Ok(msg) = state_receiver_main.try_recv() {
+                if matches!(msg, State::Quit) {
+                    quitting = true;
                 }
             }
+            // now run the application state components that are running in this thread
+            if let Some(term_ui) = term_ui_opt.as_mut() {
+                let _ = tokio::try_join!(player.update(), term_ui.update())
+                    .map_err(|e| error!("Error updating application state: {e:#}"));
+            } else if let Err(e) = player.update().await {
+                error!("Error updating player state: {e:#}");
+            }
+            tokio::time::sleep(naptime).await;
         }
-    }
+        drop(player);
+
+        let _ = model_handle.await;
+        let _ = fetcher_handle.await;
+        #[cfg(feature = "mpris_server")]
+        let _ = mpris_handle.await;
+    });
+
     debug!("Application quit request acknowledged.");
-    // Explicitly drop the model to force it to write changed settings out
-    drop(model);
     debug!("Application interface terminated.");
 
     Ok(())
diff --git a/src/model.rs b/src/model.rs
index f1cd6db..95a793a 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -1,15 +1,14 @@
 use std::collections::{HashMap, VecDeque};
 use std::convert::TryFrom;
+use std::sync::mpsc;
 use std::time::Duration;
-use std::{cell::RefCell, rc::Rc};
 
 use anyhow::Result;
 //use cpal::traits::{DeviceTrait, HostTrait};
 use either::Either;
 use log::{debug, error, info, trace, warn};
-use std::sync::mpsc;
 
-use crate::config::{Config, PartialConfig};
+use crate::config::{PartialConfig, SharedConfig};
 use crate::errors::Error;
 use crate::messages::{Request, State, StopReason};
 use crate::pandora::PandoraSession;
@@ -57,15 +56,15 @@ pub(crate) struct Model {
     request_receiver: RequestReceiver,
     state_sender: StateSender,
     state_receiver: StateReceiver,
-    config: Rc<RefCell<Config>>,
+    config: SharedConfig,
     dirty: bool,
 }
 
 impl Model {
-    pub(crate) fn new(config: Rc<RefCell<Config>>) -> Self {
+    pub(crate) fn new(config: SharedConfig) -> Self {
         let (request_sender, request_receiver) = mpsc::channel();
         let (state_sender, state_receiver) = async_broadcast::broadcast(64);
-        let volume = config.borrow().volume();
+        let volume = config.read().expect("config read for volume").volume();
         Self {
             player_volume: volume,
             player_muted: false,
@@ -213,7 +212,8 @@ impl Model {
                     .await?;
                 trace!("Updating station in config");
                 self.config
-                    .borrow_mut()
+                    .write()
+                    .expect("config write for station")
                     .update_from(&PartialConfig::default().station(Some(station_id.to_string())));
                 self.stop(StopReason::Untuning).await?;
             } else {
@@ -229,7 +229,8 @@ impl Model {
         self.pandora_station = None;
         self.dirty |= true;
         self.config
-            .borrow_mut()
+            .write()
+            .expect("config write for untune")
             .update_from(&PartialConfig::default().station(None));
 
         self.clear_playlist();
@@ -525,7 +526,14 @@ impl Model {
         //   Notify UI of player progress
         //   Check if track is completed
         if !self.connected() {
-            if self.config.borrow().login_credentials().get().is_some() {
+            if self
+                .config
+                .read()
+                .expect("config read for login check")
+                .login_credentials()
+                .get()
+                .is_some()
+            {
                 self.connect().await?;
             } else {
                 self.disconnect().await?;
@@ -534,7 +542,11 @@ impl Model {
             if self.pandora_stations.is_empty() {
                 self.fill_station_list().await?;
             }
-            let opt_station_id = self.config.borrow().station_id();
+            let opt_station_id = self
+                .config
+                .read()
+                .expect("config read for station_id")
+                .station_id();
             if let Some(station_id) = opt_station_id {
                 // We're not tuned to a station, so if one is saved in the config, go ahead and start
                 // tuning to that
@@ -607,7 +619,13 @@ impl Model {
     async fn stop(&mut self, reason: StopReason) -> Result<()> {
         if self.get_playing().is_some() {
             info!("Stopping track: {reason}");
-            if self.config.borrow().cache_policy().evict_completed() {
+            if self
+                .config
+                .read()
+                .expect("config read for cache_policy")
+                .cache_policy()
+                .evict_completed()
+            {
                 debug!("Checking for track to evict...");
                 if let Some(track) = self.get_playing() {
                     trace!("Eviction policy requires evicting track");
@@ -708,7 +726,8 @@ impl Model {
             self.player_volume = new_volume;
             self.dirty |= true;
             self.config
-                .borrow_mut()
+                .write()
+                .expect("config write for volume")
                 .update_from(&PartialConfig::default().volume(new_volume));
             trace!("send notification 'volume'");
             self.publish_state(State::Volume(new_volume)).await?;
@@ -748,7 +767,7 @@ impl Drop for Model {
     fn drop(&mut self) {
         // If there have been any configuration changes, commit them to disk
         trace!("Flushing config file to disk...");
-        if let Err(e) = self.config.borrow_mut().flush() {
+        if let Err(e) = self.config.write().expect("config write for flush").flush() {
             error!("Failed commiting configuration changes to file: {e:?}");
         }
         trace!("Application data model has been dropped");
diff --git a/src/pandora.rs b/src/pandora.rs
index 33b6c16..ef210f4 100644
--- a/src/pandora.rs
+++ b/src/pandora.rs
@@ -1,5 +1,4 @@
 #![allow(dead_code)]
-use std::{cell::RefCell, rc::Rc};
 
 use anyhow::{Context, Result};
 use log::trace;
@@ -11,7 +10,7 @@ use pandora_api::json::track::*;
 use pandora_api::json::user::*;
 use pandora_api::json::{PandoraJsonApiRequest, ToEncryptionTokens};
 
-use crate::config::Config;
+use crate::config::SharedConfig;
 use crate::errors::Error;
 use crate::track::Track;
 
@@ -49,7 +48,7 @@ const ANDROID_ENDPOINT: &str = "https://tuner.pandora.com/services/json";
 /// pandora_api::json::PandoraSession, which we wrap here.
 #[derive(Debug, Clone)]
 pub(crate) struct PandoraSession {
-    config: Rc<RefCell<Config>>,
+    config: SharedConfig,
     inner: pandora_api::json::PandoraSession,
 }
 
@@ -57,7 +56,7 @@ pub(crate) struct PandoraSession {
 // no longer valid, re-create session and retry?
 impl PandoraSession {
     /// Instantiate a new PandoraSession.
-    pub fn new(config: Rc<RefCell<Config>>) -> Self {
+    pub fn new(config: SharedConfig) -> Self {
         let inner: pandora_api::json::PandoraSession = pandora_api::json::PandoraSession::new(
             None,
             &PartnerKeys::new_android(),
@@ -146,10 +145,20 @@ impl PandoraSession {
         }
 
         trace!("User login");
-        let username_opt = self.config.borrow().login.username();
+        let username_opt = self
+            .config
+            .read()
+            .expect("config read for user_login username")
+            .login
+            .username();
         let username = username_opt.ok_or(Error::PanharmoniconMissingAuthToken)?;
 
-        let password_opt = self.config.borrow().login.password()?;
+        let password_opt = self
+            .config
+            .read()
+            .expect("config read for user_login password")
+            .login
+            .password()?;
         let password = password_opt.ok_or(Error::PanharmoniconMissingAuthToken)?;
 
         UserLogin::new(&username, &password)
diff --git a/src/term_ui/callbacks.rs b/src/term_ui/callbacks.rs
index c2d46cf..9797d6f 100644
--- a/src/term_ui/callbacks.rs
+++ b/src/term_ui/callbacks.rs
@@ -85,12 +85,23 @@ pub(crate) fn connect_button(s: &mut Cursive) {
         let new_cred = match store.unwrap_or_default() {
             Store::Keyring => ctx
                 .config
-                .borrow()
+                .read()
+                .expect("config read for password store as_keyring")
                 .login_credentials()
                 .as_keyring()
                 .expect("Error updating keyring with password"),
-            Store::ConfigFile => ctx.config.borrow().login_credentials().as_configfile(),
-            Store::Session => ctx.config.borrow().login_credentials().as_session(),
+            Store::ConfigFile => ctx
+                .config
+                .read()
+                .expect("config read for password as_configfile")
+                .login_credentials()
+                .as_configfile(),
+            Store::Session => ctx
+                .config
+                .read()
+                .expect("config read for password as_session")
+                .login_credentials()
+                .as_session(),
         };
         let new_cred = username
             .map(|u| new_cred.update_username(&u))
@@ -101,7 +112,8 @@ pub(crate) fn connect_button(s: &mut Cursive) {
         match new_cred {
             Ok(c) => {
                 ctx.config
-                    .borrow_mut()
+                    .write()
+                    .expect("config write for password update")
                     .update_from(&PartialConfig::default().login(c));
                 trace!("send request 'connect'");
                 let _ = ctx.publish_request(Request::Connect);
diff --git a/src/term_ui/dialogs.rs b/src/term_ui/dialogs.rs
index e726b86..d3b87b5 100644
--- a/src/term_ui/dialogs.rs
+++ b/src/term_ui/dialogs.rs
@@ -1,5 +1,3 @@
-use std::{cell::RefCell, rc::Rc};
-
 use cursive::views::{
     Button, Dialog, DummyView, EditView, HideableView, LinearLayout, PaddedView, Panel, SelectView,
     SliderView, TextView,
@@ -12,7 +10,7 @@ use cursive::view::{Nameable, Resizable};
 
 use log::trace;
 
-use crate::config::{Config, Credentials};
+use crate::config::{Credentials, SharedConfig};
 use crate::messages::Request;
 use crate::term_ui::{callbacks, labels, TerminalContext};
 
@@ -174,8 +172,12 @@ pub(crate) fn playing_view() -> LinearLayout {
         .child(HideableView::new(station_row).with_name("stations_hideable"))
 }
 
-pub(crate) fn login_dialog(config: Rc<RefCell<Config>>, message: Option<String>) -> Option<Dialog> {
-    let credentials = config.borrow().login_credentials().clone();
+pub(crate) fn login_dialog(config: SharedConfig, message: Option<String>) -> Option<Dialog> {
+    let credentials = config
+        .read()
+        .expect("config read for login_dialog credentials")
+        .login_credentials()
+        .clone();
     let username = credentials.username().unwrap_or_default();
     let password = credentials.password().ok().flatten().unwrap_or_default();
     let index = match Store::from(credentials) {
diff --git a/src/term_ui/mod.rs b/src/term_ui/mod.rs
index 6249042..1322f95 100644
--- a/src/term_ui/mod.rs
+++ b/src/term_ui/mod.rs
@@ -1,5 +1,4 @@
 use std::time::Duration;
-use std::{cell::RefCell, rc::Rc};
 
 use anyhow::Result;
 use cursive::views::{EditView, LinearLayout, Panel, SelectView, SliderView, TextView};
@@ -7,7 +6,7 @@ use cursive::{theme::ColorStyle, utils::markup::StyledString};
 use cursive::{CursiveRunnable, CursiveRunner};
 use log::{debug, trace};
 
-use crate::config::Config;
+use crate::config::SharedConfig;
 use crate::messages::{Request, State, StopReason};
 use crate::model::{RequestSender, StateReceiver};
 use crate::track::Track;
@@ -32,7 +31,7 @@ mod labels {
 
 #[derive(Debug, Clone)]
 pub(crate) struct TerminalContext {
-    config: Rc<RefCell<Config>>,
+    config: SharedConfig,
     request_sender: RequestSender,
 }
 
@@ -53,7 +52,7 @@ pub(crate) struct Terminal {
 
 impl Terminal {
     pub(crate) fn new(
-        config: Rc<RefCell<Config>>,
+        config: SharedConfig,
         state_receiver: StateReceiver,
         request_sender: RequestSender,
     ) -> Self {
@@ -267,7 +266,8 @@ impl Terminal {
             && self
                 .context
                 .config
-                .borrow()
+                .read()
+                .expect("config read for login dialog check")
                 .login_credentials()
                 .get()
                 .is_none()

From d01b5ebc619430051f3c5eb387db6c493815d729 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 12:27:54 -0800
Subject: [PATCH 10/13] Make mpris server feature non-default, as it's
 linux-only

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 32b7334..1be067d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ license = "Apache-2.0 AND MIT AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND
 repository = "https://github.com/compenguy/panharmonicon"
 
 [features]
-default = ["emoji_labels", "mpris_server", "term_ui"]
+default = ["emoji_labels", "term_ui"]
 mpris_server = ["dep:mpris-server"]
 term_ui = ["dep:cursive"]
 emoji_labels = []

From a47297d7faf858969cc8a1e375716ac5325ca60b Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 14:23:14 -0800
Subject: [PATCH 11/13] Major rework to move pandora API requests into their
 own task/thread

Also includes some minor latency management tasks, for better
responsiveness and/or lower cpu utilization.
---
 src/caching.rs                     |   2 +-
 src/main.rs                        |  83 +++++--
 src/model.rs                       | 377 +++++++++++++++--------------
 src/mpris_ui/mpris_intf.rs         |   2 +-
 src/{pandora.rs => pandora/api.rs} |   0
 src/pandora/mod.rs                 | 200 +++++++++++++++
 src/player.rs                      |   4 +-
 src/term_ui/mod.rs                 |   6 +-
 8 files changed, 461 insertions(+), 213 deletions(-)
 rename src/{pandora.rs => pandora/api.rs} (100%)
 create mode 100644 src/pandora/mod.rs

diff --git a/src/caching.rs b/src/caching.rs
index 4f165e5..794bca4 100644
--- a/src/caching.rs
+++ b/src/caching.rs
@@ -190,7 +190,7 @@ impl TrackCacher {
 
     fn publish_request(&mut self, request: Request) -> Result<()> {
         self.request_sender
-            .send(request)
+            .try_send(request)
             .context("Failed sending application update request")?;
         Ok(())
     }
diff --git a/src/main.rs b/src/main.rs
index fc0a1d9..7cedf13 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -132,8 +132,12 @@ fn main() -> Result<()> {
     debug!("Configuration settings: {:?}", &conf);
     let shared_config: SharedConfig = Arc::new(RwLock::new(conf));
 
+    trace!("Initializing Pandora API task");
+    let (pandora_cmd_tx, pandora_cmd_rx) = tokio::sync::mpsc::channel(32);
+    let (pandora_result_tx, pandora_result_rx) = tokio::sync::mpsc::channel(32);
+
     trace!("Initializing application core");
-    let model = model::Model::new(shared_config.clone());
+    let model = model::Model::new(shared_config.clone(), pandora_cmd_tx, pandora_result_rx);
 
     trace!("Initializing track fetcher");
     let mut fetcher = caching::TrackCacher::new(model.updates_channel(), model.request_channel());
@@ -146,7 +150,8 @@ fn main() -> Result<()> {
     trace!("Initializing player interface");
     let mut player = player::Player::new(model.updates_channel(), model.request_channel());
 
-    let naptime = Duration::from_millis(100);
+    // Polling interval for main loop and worker tasks. ~50ms keeps UI/control latency low without extra CPU.
+    let naptime = Duration::from_millis(50);
 
     let rt = tokio::runtime::Builder::new_multi_thread()
         .worker_threads(4)
@@ -155,6 +160,12 @@ fn main() -> Result<()> {
         .context("Failed to build tokio runtime")?;
 
     rt.block_on(async move {
+        let pandora_handle = tokio::spawn(pandora::run_pandora_task(
+            shared_config.clone(),
+            pandora_cmd_rx,
+            pandora_result_tx,
+        ));
+
         let mut state_receiver_main = model.updates_channel();
         let mut state_receiver_fetcher = model.updates_channel();
         #[cfg(feature = "mpris_server")]
@@ -175,59 +186,78 @@ fn main() -> Result<()> {
             None
         };
 
-        // Model runs on its own thread (via tokio worker); exits when it processes Request::Quit.
+        // Model: event-driven; wake on request or on timer; exits when it processes Request::Quit.
         let model_handle = tokio::spawn(async move {
             let mut model = model;
-            while !model.quitting() {
-                if let Err(e) = model.update().await {
-                    error!("Error updating model state: {e:#}");
-                }
-                tokio::time::sleep(naptime).await;
+            if let Err(e) = model.run_until_quit(naptime).await {
+                error!("Error in model: {e:#}");
             }
             drop(model);
         });
 
-        // Fetcher runs on its own thread; exits when it receives State::Quit from the broadcast.
+        // Fetcher: event-driven; wake on state (Quit) or timer for update.
         let fetcher_handle = tokio::spawn(async move {
             loop {
-                while let Ok(msg) = state_receiver_fetcher.try_recv() {
-                    if matches!(msg, State::Quit) {
-                        return;
+                tokio::select! {
+                    biased;
+                    result = state_receiver_fetcher.recv() => {
+                        if let Ok(msg) = result {
+                            if matches!(msg, State::Quit) {
+                                return;
+                            }
+                        }
+                        while let Ok(msg) = state_receiver_fetcher.try_recv() {
+                            if matches!(msg, State::Quit) {
+                                return;
+                            }
+                        }
+                    }
+                    _ = tokio::time::sleep(naptime) => {
+                        if let Err(e) = fetcher.update().await {
+                            error!("Error updating fetcher state: {e:#}");
+                        }
                     }
                 }
-                if let Err(e) = fetcher.update().await {
-                    error!("Error updating fetcher state: {e:#}");
-                }
-                tokio::time::sleep(naptime).await;
             }
         });
 
         #[cfg(feature = "mpris_server")]
         let mpris_handle = tokio::spawn(async move {
             loop {
-                while let Ok(msg) = state_receiver_mpris.try_recv() {
-                    if matches!(msg, State::Quit) {
-                        return;
+                tokio::select! {
+                    biased;
+                    result = state_receiver_mpris.recv() => {
+                        if let Ok(msg) = result {
+                            if matches!(msg, State::Quit) {
+                                return;
+                            }
+                        }
+                        while let Ok(msg) = state_receiver_mpris.try_recv() {
+                            if matches!(msg, State::Quit) {
+                                return;
+                            }
+                        }
+                    }
+                    _ = tokio::time::sleep(naptime) => {
+                        if let Err(e) = mpris_ui.update().await {
+                            error!("Error updating mpris state: {e:#}");
+                        }
                     }
                 }
-                if let Err(e) = mpris_ui.update().await {
-                    error!("Error updating mpris state: {e:#}");
-                }
-                tokio::time::sleep(naptime).await;
             }
         });
 
-        // Player and term_ui (cursive) are !Send, so they stay on the main thread. Exit on State::Quit.
+        // Player and term_ui (cursive) stay on the main thread. Poll every naptime so the UI
+        // always gets to run and process input; drain state first to see Quit promptly.
         trace!("Starting app (player and term_ui on main thread)");
         let mut quitting = false;
         while !quitting {
-            // pump the message queue to see if we've been told to quit
             while let Ok(msg) = state_receiver_main.try_recv() {
                 if matches!(msg, State::Quit) {
                     quitting = true;
+                    continue;
                 }
             }
-            // now run the application state components that are running in this thread
             if let Some(term_ui) = term_ui_opt.as_mut() {
                 let _ = tokio::try_join!(player.update(), term_ui.update())
                     .map_err(|e| error!("Error updating application state: {e:#}"));
@@ -242,6 +272,7 @@ fn main() -> Result<()> {
         let _ = fetcher_handle.await;
         #[cfg(feature = "mpris_server")]
         let _ = mpris_handle.await;
+        let _ = pandora_handle.await;
     });
 
     debug!("Application quit request acknowledged.");
diff --git a/src/model.rs b/src/model.rs
index 95a793a..deb198a 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -1,17 +1,15 @@
 use std::collections::{HashMap, VecDeque};
-use std::convert::TryFrom;
-use std::sync::mpsc;
 use std::time::Duration;
 
 use anyhow::Result;
-//use cpal::traits::{DeviceTrait, HostTrait};
 use either::Either;
 use log::{debug, error, info, trace, warn};
+use tokio::sync::mpsc;
 
 use crate::config::{PartialConfig, SharedConfig};
 use crate::errors::Error;
 use crate::messages::{Request, State, StopReason};
-use crate::pandora::PandoraSession;
+use crate::pandora::{PandoraCommand, PandoraResult};
 use crate::track::Track;
 
 pub(crate) type StateSender = async_broadcast::Sender<State>;
@@ -19,6 +17,9 @@ pub(crate) type StateReceiver = async_broadcast::Receiver<State>;
 pub(crate) type RequestSender = mpsc::Sender<Request>;
 pub(crate) type RequestReceiver = mpsc::Receiver<Request>;
 
+/// Bounded request channel capacity; allows try_send() from sync contexts (UI, player).
+const REQUEST_CHANNEL_CAP: usize = 256;
+
 const FETCHLIST_MAX_LEN: usize = 8;
 const PLAYLIST_MAX_LEN: usize = 12;
 
@@ -42,11 +43,10 @@ pub(crate) struct Model {
     player_track: Either<StopReason, Track>,
     player_progress: Option<Duration>,
     player_length: Option<Duration>,
-    // TODO: Session operations are great candidates for spawning a task to complete
-    // I think they're what makes some message processing loops take up to 1s to complete
-    // Instead implement these operations in pandora.rs, and convert it to being a standalone
-    // subsystem?
-    pandora_session: Option<PandoraSession>,
+    session_connected: bool,
+    pending_connect: bool,
+    pending_station_list: bool,
+    pending_playlist: bool,
     pandora_station: Option<(String, String)>,
     pandora_stations: HashMap<String, String>,
     pandora_readylist: VecDeque<Track>,
@@ -56,13 +56,19 @@ pub(crate) struct Model {
     request_receiver: RequestReceiver,
     state_sender: StateSender,
     state_receiver: StateReceiver,
+    pandora_cmd_tx: mpsc::Sender<PandoraCommand>,
+    pandora_result_rx: mpsc::Receiver<PandoraResult>,
     config: SharedConfig,
     dirty: bool,
 }
 
 impl Model {
-    pub(crate) fn new(config: SharedConfig) -> Self {
-        let (request_sender, request_receiver) = mpsc::channel();
+    pub(crate) fn new(
+        config: SharedConfig,
+        pandora_cmd_tx: mpsc::Sender<PandoraCommand>,
+        pandora_result_rx: mpsc::Receiver<PandoraResult>,
+    ) -> Self {
+        let (request_sender, request_receiver) = mpsc::channel(REQUEST_CHANNEL_CAP);
         let (state_sender, state_receiver) = async_broadcast::broadcast(64);
         let volume = config.read().expect("config read for volume").volume();
         Self {
@@ -72,7 +78,10 @@ impl Model {
             player_track: Either::Left(StopReason::Initializing),
             player_progress: None,
             player_length: None,
-            pandora_session: None,
+            session_connected: false,
+            pending_connect: false,
+            pending_station_list: false,
+            pending_playlist: false,
             pandora_station: None,
             pandora_stations: HashMap::with_capacity(16),
             pandora_readylist: VecDeque::with_capacity(PLAYLIST_MAX_LEN),
@@ -82,6 +91,8 @@ impl Model {
             request_receiver,
             state_sender,
             state_receiver,
+            pandora_cmd_tx,
+            pandora_result_rx,
             config,
             dirty: true,
         }
@@ -97,85 +108,36 @@ impl Model {
         self.state_receiver.clone()
     }
 
-    // Internal method for sending state updates to the subsystems
     async fn publish_state(&mut self, state: State) -> Result<()> {
         debug!("State update: {state:?}");
         self.state_sender.broadcast(state).await?;
-        //log::debug!("state update channel pending message count: {}", self.state_sender.len());
-        Ok(())
-    }
-
-    async fn connect_internal(&mut self, mut session: PandoraSession) -> Result<()> {
-        if self.connected() {
-            debug!("Pandora session was already connected, but a new connection was requested");
-        }
-        trace!("Connecting to Pandora...");
-        session.partner_login().await?;
-        session.user_login().await?;
-        self.pandora_session = Some(session);
-        if self.connected() {
-            trace!("Connected to Pandora.");
-        } else {
-            error!("Just connected to Pandora, but the session reports that it is not connected!");
-        }
         Ok(())
     }
 
     pub(crate) async fn connect(&mut self) -> Result<()> {
         if self.connected() {
             info!("Connect request ignored. Already connected.");
-        } else {
-            trace!("Attempting pandora login...");
-            self.dirty |= true;
-            let session = PandoraSession::new(self.config.clone());
-            if let Err(e) = self.connect_internal(session).await {
-                let message: String = if e
-                    .downcast_ref::<Error>()
-                    .map(|e| e.missing_auth_token())
-                    .unwrap_or(false)
-                {
-                    String::from("Required authentication token is missing.")
-                } else if let Some(e) = e.downcast_ref::<pandora_api::errors::Error>() {
-                    format!("Pandora authentication failure: {e:#}").to_string()
-                } else {
-                    format!("Unknown error while logging in: {e:#}").to_string()
-                };
-                error!("{message}");
-                self.publish_state(State::AuthFailed(message)).await?;
-                self.disconnect().await?;
-                return Ok(());
-            }
-            trace!("Successfully logged into Pandora.");
+            return Ok(());
         }
-        trace!("send notification 'connected'");
-        self.publish_state(State::Connected).await?;
-
-        // If a station was saved, send a Tuned notification for it
-        if let Some(station_id) = self.tuned() {
-            trace!("send notification 'tuned'");
-            self.publish_state(State::Tuned(station_id)).await?;
+        if self.pending_connect {
+            trace!("Connect already in progress.");
+            return Ok(());
         }
-
-        // Notify request_senders what the last set volume was
-        self.publish_state(State::Volume(self.volume())).await?;
-
+        trace!("Attempting pandora login...");
+        self.dirty |= true;
+        self.pending_connect = true;
+        let _ = self.pandora_cmd_tx.send(PandoraCommand::Connect).await;
         Ok(())
     }
 
     pub(crate) fn connected(&self) -> bool {
-        self.pandora_session
-            .as_ref()
-            .map(|session| session.connected())
-            .unwrap_or(false)
+        self.session_connected
     }
 
     pub(crate) async fn disconnect(&mut self) -> Result<()> {
-        if let Some(session) = &mut self.pandora_session {
-            trace!("Disconnecting from Pandora...");
-            session.partner_logout().await;
-            trace!("Disconnected from Pandora.");
-        }
-        self.pandora_session = None;
+        self.session_connected = false;
+        self.pending_connect = false;
+        let _ = self.pandora_cmd_tx.send(PandoraCommand::Disconnect).await;
         self.clear_stations().await?;
         self.dirty |= true;
         self.publish_state(State::Disconnected).await?;
@@ -195,13 +157,7 @@ impl Model {
             )));
         }
 
-        // Only tune the requested station if we're not already tuned to it
-        if self
-            .pandora_station
-            .as_ref()
-            .map(|(id, _)| id != station_id)
-            .unwrap_or(true)
-        {
+        if self.tuned().as_deref() != Some(station_id) {
             if let Some(name) = self.pandora_stations.get(station_id).map(|s| s.to_string()) {
                 info!("Switched station to {name} ({station_id})");
                 self.untune().await?;
@@ -248,13 +204,7 @@ impl Model {
     }
 
     pub(crate) fn tuned(&self) -> Option<String> {
-        self.pandora_station
-            .as_ref()
-            .map(|(station_id, _)| station_id.to_string())
-    }
-
-    pub(crate) fn playing(&self) -> Option<&Track> {
-        self.player_track.as_ref().right()
+        self.pandora_station.as_ref().map(|(id, _)| id.clone())
     }
 
     pub(crate) fn ready_next_track(&mut self) -> Result<Option<Track>> {
@@ -301,6 +251,7 @@ impl Model {
         info!("Application request to quit");
         self.panharmonicon_quitting = true;
         self.dirty |= true;
+        let _ = self.pandora_cmd_tx.send(PandoraCommand::Quit).await;
         trace!("send notification 'quit'");
         self.publish_state(State::Quit).await?;
         Ok(())
@@ -334,27 +285,18 @@ impl Model {
         let track = self.get_playing().cloned().ok_or_else(|| {
             anyhow::anyhow!(Error::invalid_operation_for_state("rate_track", "Stopped"))
         })?;
-        let session = self.pandora_session.as_mut().ok_or_else(|| {
-            anyhow::anyhow!(Error::invalid_operation_for_state(
+        if !self.connected() {
+            return Err(anyhow::anyhow!(Error::invalid_operation_for_state(
                 "rate_track",
                 "Disconnected"
-            ))
-        })?;
-        let new_rating_value: u32 = if rating.unwrap_or(false) { 1 } else { 0 };
-        if let Some(rating) = rating {
-            session.add_feedback(&track, rating).await?;
-            trace!("Rated track {} with value {}", track.title, rating);
-        } else {
-            session.delete_feedback_for_track(&track).await?;
-            trace!("Successfully removed track rating.");
+            )));
         }
-        self.get_playing_mut()
-            .expect("Programming error: active track value disappeared mid-function")
-            .song_rating = new_rating_value;
+        let _ = self
+            .pandora_cmd_tx
+            .send(PandoraCommand::RateTrack(track, rating))
+            .await;
+        // Local state and notify_playing will be updated when we receive PandoraResult::Rated
         self.dirty |= true;
-
-        // track metadata changed, resend track info message
-        self.notify_playing().await?;
         Ok(())
     }
 
@@ -373,23 +315,20 @@ impl Model {
     }
 
     pub(crate) async fn fill_station_list(&mut self) -> Result<()> {
-        let session = self.pandora_session.as_mut().ok_or_else(|| {
-            anyhow::anyhow!(Error::invalid_operation_for_state(
+        if !self.connected() {
+            return Err(anyhow::anyhow!(Error::invalid_operation_for_state(
                 "fetch_station_list",
                 "Disconnected"
-            ))
-        })?;
-        for station in session.get_station_list().await?.stations.into_iter() {
-            self.add_station(station.station_id, station.station_name)
-                .await?;
+            )));
         }
-        if let Some(station_id) = self.tuned() {
-            // Check if we're tuned to a station that doesn't appear in the station list
-            if !self.pandora_stations.contains_key(&station_id) {
-                warn!("Tuned station {station_id} does not appear in station list");
-                self.untune().await?;
-            }
+        if self.pending_station_list {
+            return Ok(());
         }
+        self.pending_station_list = true;
+        let _ = self
+            .pandora_cmd_tx
+            .send(PandoraCommand::GetStationList)
+            .await;
         Ok(())
     }
 
@@ -408,34 +347,32 @@ impl Model {
                 "Untuned"
             ))
         })?;
-        let session = self.pandora_session.as_mut().ok_or_else(|| {
-            anyhow::anyhow!(Error::invalid_operation_for_state(
+        if !self.connected() {
+            return Err(anyhow::anyhow!(Error::invalid_operation_for_state(
                 "fetch_playlist",
                 "Disconnected"
-            ))
-        })?;
+            )));
+        }
+        if self.pending_playlist {
+            return Ok(());
+        }
+        self.pending_playlist = true;
         debug!("getting new tracks to refill playlist");
-        let playlist: Result<Vec<Track>> = session
-            .get_playlist(&station_id)
-            .await?
-            .into_iter()
-            .filter_map(|pe| pe.get_track().map(Track::try_from))
-            .collect();
-        let playlist = playlist?;
-        debug!("refilling playlist with new tracks");
-        self.extend_playlist(playlist).await?;
-        self.dirty |= true;
-        trace!("Successfully refilled playlist.");
+        let _ = self
+            .pandora_cmd_tx
+            .send(PandoraCommand::GetPlaylist(station_id))
+            .await;
         Ok(())
     }
 
     async fn update_track_progress(&mut self, elapsed: &Duration) -> Result<()> {
+        let prev_secs = self.player_progress.map(|p| p.as_secs());
         trace!(
             "Update track progress: last update {}s current update {}s",
-            self.player_progress.map(|p| p.as_secs()).unwrap_or(0),
+            prev_secs.unwrap_or(0),
             elapsed.as_secs()
         );
-        if self.player_progress.map(|p| p.as_secs()) != Some(elapsed.as_secs()) {
+        if prev_secs != Some(elapsed.as_secs()) {
             trace!("Track time elapsed updated: {elapsed:?}");
             self.player_progress = Some(*elapsed);
             self.dirty |= true;
@@ -481,21 +418,7 @@ impl Model {
             debug!("received request {req:?}");
             self.handle_request(&req).await?;
         }
-        // We have a copy of the broadcast state_receiver, and if we don't drain messages from our copy
-        // then everyone's copies will get backed up
         while self.state_receiver.try_recv().is_ok() {}
-
-        /*
-        // Check the health of the outgoing message channel, as well
-        info!(
-            "Pending messages in notification channel: {}",
-            self.state_sender.len()
-        );
-        info!(
-            "Number of state_receivers for notification channel: {}",
-            self.state_receiver.receiver_count()
-        );
-        */
         Ok(())
     }
 
@@ -542,18 +465,20 @@ impl Model {
             if self.pandora_stations.is_empty() {
                 self.fill_station_list().await?;
             }
-            let opt_station_id = self
-                .config
-                .read()
-                .expect("config read for station_id")
-                .station_id();
-            if let Some(station_id) = opt_station_id {
-                // We're not tuned to a station, so if one is saved in the config, go ahead and start
-                // tuning to that
-                info!("Station list is populated, and user config file indicates we should tune to a station");
-                self.tune(&station_id).await?;
+            // Only tune once we have received the station list (StationList result populates
+            // pandora_stations). Otherwise tune() would fail with "not in the station list".
+            if !self.pandora_stations.is_empty() {
+                let opt_station_id = self
+                    .config
+                    .read()
+                    .expect("config read for station_id")
+                    .station_id();
+                if let Some(station_id) = opt_station_id {
+                    info!("Station list is populated, and user config file indicates we should tune to a station");
+                    self.tune(&station_id).await?;
+                }
             }
-        } else if self.playing().is_none() {
+        } else if self.get_playing().is_none() {
             self.refill_playlist().await?;
             self.start().await?;
         } else {
@@ -562,6 +487,7 @@ impl Model {
         Ok(())
     }
 
+    #[allow(dead_code)] // kept for single-tick use (e.g. tests); normal run uses run_until_quit
     pub(crate) async fn update(&mut self) -> Result<bool> {
         self.process_messages().await?;
         self.ensure_connection().await?;
@@ -572,6 +498,98 @@ impl Model {
         Ok(old_dirty)
     }
 
+    async fn handle_pandora_result(&mut self, result: PandoraResult) -> Result<()> {
+        match result {
+            PandoraResult::Connected => {
+                self.session_connected = true;
+                self.pending_connect = false;
+                trace!("send notification 'connected'");
+                self.publish_state(State::Connected).await?;
+                if let Some(station_id) = self.tuned() {
+                    trace!("send notification 'tuned'");
+                    self.publish_state(State::Tuned(station_id)).await?;
+                }
+                self.publish_state(State::Volume(self.volume())).await?;
+            }
+            PandoraResult::AuthFailed(message) => {
+                self.session_connected = false;
+                self.pending_connect = false;
+                error!("{message}");
+                self.publish_state(State::AuthFailed(message)).await?;
+                self.clear_stations().await?;
+            }
+            PandoraResult::Disconnected => {
+                self.session_connected = false;
+                self.pending_connect = false;
+            }
+            PandoraResult::StationList(list) => {
+                self.pending_station_list = false;
+                for (station_id, station_name) in list {
+                    self.add_station(station_id, station_name).await?;
+                }
+                if let Some(station_id) = self.tuned() {
+                    if !self.pandora_stations.contains_key(&station_id) {
+                        warn!("Tuned station {station_id} does not appear in station list");
+                        self.untune().await?;
+                    }
+                }
+            }
+            PandoraResult::Playlist(tracks) => {
+                self.pending_playlist = false;
+                debug!("refilling playlist with new tracks");
+                self.extend_playlist(tracks).await?;
+                self.dirty |= true;
+                trace!("Successfully refilled playlist.");
+            }
+            PandoraResult::Rated(new_value) => {
+                if let Some(track) = self.get_playing_mut() {
+                    track.song_rating = new_value;
+                    self.dirty |= true;
+                    self.notify_playing().await?;
+                }
+            }
+            PandoraResult::Error(msg) => {
+                error!("Pandora task error: {msg}");
+                self.pending_station_list = false;
+                self.pending_playlist = false;
+            }
+            PandoraResult::QuitAck => {}
+        }
+        Ok(())
+    }
+
+    /// Event-driven loop: wake on request, pandora result, or on timer. Runs until quitting.
+    pub(crate) async fn run_until_quit(&mut self, naptime: Duration) -> Result<()> {
+        while !self.quitting() {
+            tokio::select! {
+                biased;
+                Some(req) = self.request_receiver.recv() => {
+                    debug!("received request {req:?}");
+                    self.handle_request(&req).await?;
+                    self.dirty |= true;
+                    while let Ok(req) = self.request_receiver.try_recv() {
+                        debug!("received request {req:?}");
+                        self.handle_request(&req).await?;
+                        self.dirty |= true;
+                    }
+                    while self.state_receiver.try_recv().is_ok() {}
+                }
+                Some(result) = self.pandora_result_rx.recv() => {
+                    self.handle_pandora_result(result).await?;
+                    while let Ok(result) = self.pandora_result_rx.try_recv() {
+                        self.handle_pandora_result(result).await?;
+                    }
+                }
+                _ = tokio::time::sleep(naptime) => {
+                    self.process_messages().await?;
+                    self.ensure_connection().await?;
+                    self.drive_state().await?;
+                }
+            }
+        }
+        Ok(())
+    }
+
     pub(crate) async fn extend_playlist(&mut self, new_playlist: Vec<Track>) -> Result<()> {
         self.dirty |= !new_playlist.is_empty();
         debug!("Extending playlist with {new_playlist:?}");
@@ -584,13 +602,10 @@ impl Model {
     }
 
     fn unfetch_track(&mut self, track: &Track) {
-        // Remove the enqueued track from the fetchlist
         if let Some(idx) = self
             .pandora_fetchlist
             .iter()
-            .enumerate()
-            .find(|(_, t)| t.track_token == track.track_token)
-            .map(|(idx, _)| idx)
+            .position(|t| t.track_token == track.track_token)
         {
             self.pandora_fetchlist.swap_remove(idx);
             self.dirty |= true;
@@ -658,26 +673,24 @@ impl Model {
     async fn start(&mut self) -> Result<()> {
         if self.started() {
             debug!("Track already started.");
+            return Ok(());
+        }
+        debug!(
+            "No tracks started yet. Starting next track. playlist: {} + {} pending",
+            self.playlist_len(),
+            self.pending_len()
+        );
+        if let Some(track) = self.ready_next_track()? {
+            trace!("send notification 'starting'");
+            self.player_track = Either::Right(track.clone());
+            self.player_progress = Some(Duration::from_secs(0));
+            self.player_length = Some(track.track_length);
+            self.dirty |= true;
+            self.notify_playing().await?;
+            self.notify_next().await?;
         } else {
-            debug!("No tracks started yet. Starting next track.");
-            debug!(
-                "playlist length: {} + {} pending",
-                self.playlist_len(),
-                self.pending_len()
-            );
-            if let Some(track) = self.ready_next_track()? {
-                trace!("send notification 'starting'");
-                self.player_track = Either::Right(track.clone());
-                self.player_progress = Some(Duration::from_secs(0));
-                self.player_length = Some(track.track_length);
-                self.dirty |= true;
-
-                self.notify_playing().await?;
-                self.notify_next().await?;
-            } else {
-                debug!("requested to start track, but no tracks are ready");
-                self.publish_state(State::Buffering).await?;
-            }
+            debug!("requested to start track, but no tracks are ready");
+            self.publish_state(State::Buffering).await?;
         }
         Ok(())
     }
diff --git a/src/mpris_ui/mpris_intf.rs b/src/mpris_ui/mpris_intf.rs
index 37d8b70..b1747e8 100644
--- a/src/mpris_ui/mpris_intf.rs
+++ b/src/mpris_ui/mpris_intf.rs
@@ -41,7 +41,7 @@ impl MprisInterface {
 
     fn publish_zrequest(&self, request: Request) -> zbus::Result<()> {
         self.request_sender
-            .send(request)
+            .try_send(request)
             .map_err(|e| zbus::Error::Failure(e.to_string()))?;
         Ok(())
     }
diff --git a/src/pandora.rs b/src/pandora/api.rs
similarity index 100%
rename from src/pandora.rs
rename to src/pandora/api.rs
diff --git a/src/pandora/mod.rs b/src/pandora/mod.rs
new file mode 100644
index 0000000..c642e5d
--- /dev/null
+++ b/src/pandora/mod.rs
@@ -0,0 +1,200 @@
+//! Dedicated subsystem and task for Pandora API requests.
+//! The model sends commands and receives results asynchronously so it can keep processing
+//! UI/player requests while network I/O runs here.
+
+use std::collections::HashMap;
+use std::convert::TryFrom;
+
+use anyhow::Result;
+use log::{debug, error, trace, warn};
+use tokio::sync::mpsc;
+
+use crate::config::SharedConfig;
+use crate::errors::Error;
+use crate::pandora::api::PandoraSession;
+use crate::track::Track;
+
+mod api;
+
+/// Commands the model sends to the Pandora task.
+#[derive(Debug)]
+pub(crate) enum PandoraCommand {
+    Connect,
+    Disconnect,
+    GetStationList,
+    GetPlaylist(String),
+    RateTrack(Track, Option<bool>),
+    Quit,
+}
+
+/// Results the Pandora task sends back to the model.
+#[derive(Debug)]
+pub(crate) enum PandoraResult {
+    Connected,
+    AuthFailed(String),
+    Disconnected,
+    StationList(HashMap<String, String>),
+    Playlist(Vec<Track>),
+    Rated(u32),
+    Error(String),
+    QuitAck,
+}
+
+/// Runs the Pandora API task. Receives commands, performs session/network work, sends results.
+pub(crate) async fn run_pandora_task(
+    config: SharedConfig,
+    mut command_rx: mpsc::Receiver<PandoraCommand>,
+    result_tx: mpsc::Sender<PandoraResult>,
+) {
+    let mut session: Option<PandoraSession> = None;
+
+    while let Some(cmd) = command_rx.recv().await {
+        match cmd {
+            PandoraCommand::Connect => {
+                if session.as_ref().is_some_and(|s| s.connected()) {
+                    debug!("Pandora task: already connected, ignoring Connect");
+                    continue;
+                }
+                let mut new_session = PandoraSession::new(config.clone());
+                match do_connect(&mut new_session).await {
+                    Ok(()) => {
+                        session = Some(new_session);
+                        trace!("Pandora task: connected");
+                        let _ = result_tx.send(PandoraResult::Connected).await;
+                    }
+                    Err(e) => {
+                        let message = if e
+                            .downcast_ref::<Error>()
+                            .is_some_and(|e| e.missing_auth_token())
+                        {
+                            String::from("Required authentication token is missing.")
+                        } else if let Some(e) = e.downcast_ref::<pandora_api::errors::Error>() {
+                            format!("Pandora authentication failure: {e:#}")
+                        } else {
+                            format!("Unknown error while logging in: {e:#}")
+                        };
+                        error!("Pandora task: connect failed: {message}");
+                        session = None;
+                        let _ = result_tx.send(PandoraResult::AuthFailed(message)).await;
+                    }
+                }
+            }
+            PandoraCommand::Disconnect => {
+                if let Some(mut s) = session.take() {
+                    trace!("Pandora task: disconnecting...");
+                    s.partner_logout().await;
+                    trace!("Pandora task: disconnected");
+                }
+                let _ = result_tx.send(PandoraResult::Disconnected).await;
+            }
+            PandoraCommand::GetStationList => {
+                let sess = match session.as_mut() {
+                    Some(s) if s.connected() => s,
+                    _ => {
+                        warn!("Pandora task: GetStationList while not connected");
+                        let _ = result_tx
+                            .send(PandoraResult::Error("Not connected".into()))
+                            .await;
+                        continue;
+                    }
+                };
+                match sess.get_station_list().await {
+                    Ok(resp) => {
+                        let list = resp
+                            .stations
+                            .into_iter()
+                            .map(|s| (s.station_id, s.station_name))
+                            .collect::<HashMap<_, _>>();
+                        let _ = result_tx.send(PandoraResult::StationList(list)).await;
+                    }
+                    Err(e) => {
+                        error!("Pandora task: get_station_list failed: {e:#}");
+                        let _ = result_tx.send(PandoraResult::Error(format!("{e:#}"))).await;
+                    }
+                }
+            }
+            PandoraCommand::GetPlaylist(station_id) => {
+                let sess = match session.as_mut() {
+                    Some(s) if s.connected() => s,
+                    _ => {
+                        warn!("Pandora task: GetPlaylist while not connected");
+                        let _ = result_tx
+                            .send(PandoraResult::Error("Not connected".into()))
+                            .await;
+                        continue;
+                    }
+                };
+                match sess.get_playlist(&station_id).await {
+                    Ok(entries) => {
+                        let playlist: Result<Vec<Track>> = entries
+                            .into_iter()
+                            .flat_map(|pe| pe.get_track().map(Track::try_from).into_iter())
+                            .collect();
+                        match playlist {
+                            Ok(tracks) => {
+                                debug!("Pandora task: got {} tracks", tracks.len());
+                                let _ = result_tx.send(PandoraResult::Playlist(tracks)).await;
+                            }
+                            Err(e) => {
+                                error!("Pandora task: playlist track conversion failed: {e:#}");
+                                let _ =
+                                    result_tx.send(PandoraResult::Error(format!("{e:#}"))).await;
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        error!("Pandora task: get_playlist failed: {e:#}");
+                        let _ = result_tx.send(PandoraResult::Error(format!("{e:#}"))).await;
+                    }
+                }
+            }
+            PandoraCommand::RateTrack(track, rating) => {
+                let sess = match session.as_mut() {
+                    Some(s) if s.connected() => s,
+                    _ => {
+                        warn!("Pandora task: RateTrack while not connected");
+                        let _ = result_tx
+                            .send(PandoraResult::Error("Not connected".into()))
+                            .await;
+                        continue;
+                    }
+                };
+                let new_rating_value = if rating.unwrap_or(false) { 1 } else { 0 };
+                let res = if let Some(r) = rating {
+                    sess.add_feedback(&track, r).await.map(|_| ())
+                } else {
+                    sess.delete_feedback_for_track(&track).await
+                };
+                match res {
+                    Ok(()) => {
+                        trace!("Pandora task: rated track");
+                        let _ = result_tx.send(PandoraResult::Rated(new_rating_value)).await;
+                    }
+                    Err(e) => {
+                        error!("Pandora task: rate failed: {e:#}");
+                        let _ = result_tx.send(PandoraResult::Error(format!("{e:#}"))).await;
+                    }
+                }
+            }
+            PandoraCommand::Quit => {
+                if let Some(mut s) = session.take() {
+                    s.partner_logout().await;
+                }
+                let _ = result_tx.send(PandoraResult::QuitAck).await;
+                return;
+            }
+        }
+    }
+}
+
+async fn do_connect(session: &mut PandoraSession) -> Result<()> {
+    trace!("Connecting to Pandora...");
+    session.partner_login().await?;
+    session.user_login().await?;
+    if session.connected() {
+        trace!("Connected to Pandora.");
+    } else {
+        error!("Pandora session reports not connected after login");
+    }
+    Ok(())
+}
diff --git a/src/player.rs b/src/player.rs
index 8d9bbc0..77d4d44 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -270,7 +270,9 @@ impl Player {
     }
 
     fn publish_request(&mut self, request: Request) -> Result<()> {
-        self.request_sender.send(request)?;
+        self.request_sender
+            .try_send(request)
+            .map_err(anyhow::Error::from)?;
         Ok(())
     }
 
diff --git a/src/term_ui/mod.rs b/src/term_ui/mod.rs
index 1322f95..01db2f4 100644
--- a/src/term_ui/mod.rs
+++ b/src/term_ui/mod.rs
@@ -37,7 +37,9 @@ pub(crate) struct TerminalContext {
 
 impl TerminalContext {
     fn publish_request(&mut self, request: Request) -> Result<()> {
-        self.request_sender.send(request)?;
+        self.request_sender
+            .try_send(request)
+            .map_err(anyhow::Error::from)?;
         Ok(())
     }
 }
@@ -62,7 +64,7 @@ impl Terminal {
             request_sender,
         };
         siv.set_user_data(context.clone());
-        siv.set_fps(5);
+        siv.set_fps(10);
         siv.set_window_title("panharmonicon");
         let mut term = Self {
             siv,

From ad2b0e29e8e9f28afd002aca4f23d682065497e7 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 15:14:59 -0800
Subject: [PATCH 12/13] Update allowed licenses

---
 about.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/about.toml b/about.toml
index 8a6e209..4b00b0b 100644
--- a/about.toml
+++ b/about.toml
@@ -3,8 +3,10 @@ accepted = [
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
+    "ISC",
     "MIT",
     "MPL-2.0",
+    "OpenSSL",
     "Unicode-3.0",
     "Unicode-DFS-2016",
     "WTFPL",

From 055f9c03d8cfa4f7fc4d611a1de74339c5331214 Mon Sep 17 00:00:00 2001
From: William Page <williamtpage@gmail.com>
Date: Fri, 13 Feb 2026 15:21:30 -0800
Subject: [PATCH 13/13] workflow fix to eliminate license update during PR

---
 .github/workflows/update_licenses.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/update_licenses.yml b/.github/workflows/update_licenses.yml
index bc93143..6df68ea 100644
--- a/.github/workflows/update_licenses.yml
+++ b/.github/workflows/update_licenses.yml
@@ -3,8 +3,6 @@ name: Update project licenses
 on:
   push:
     branches: [ master ]
-  pull_request:
-    branches: [ master ]
 
 jobs:
   build: