Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

wasm downloader part 2: use kiban (#594)

Aleksandr Golokozf202a29be676
diff --git a/Cargo.lock b/Cargo.lock
index d879c4ab5..7c9ef7865 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -192,7 +192,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -203,9 +203,9 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
-version = "0.7.6"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
[[package]]
name = "as-slice"
@@ -240,10 +240,10 @@ dependencies = [
"memchr",
"proc-macro2",
"quote",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"serde",
"serde_derive",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -318,7 +318,7 @@ checksum = "81872a8e595e8ceceab71c6ba1f9078e313b452a1e31934e6763ef5d308705e4"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -340,7 +340,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -351,7 +351,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -426,9 +426,9 @@ dependencies = [
[[package]]
name = "aws-lc-rs"
-version = "1.17.0"
+version = "1.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00"
+checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
dependencies = [
"aws-lc-sys",
"zeroize",
@@ -436,14 +436,15 @@ dependencies = [
[[package]]
name = "aws-lc-sys"
-version = "0.41.0"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4"
+checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
dependencies = [
"cc",
"cmake",
"dunce",
"fs_extra",
+ "pkg-config",
]
[[package]]
@@ -502,7 +503,7 @@ dependencies = [
"proc-macros",
"proptest",
"quote",
- "rand 0.10.1",
+ "rand 0.10.2",
"rand_distr",
"rangemap",
"regex",
@@ -513,7 +514,7 @@ dependencies = [
"serde",
"serde_json",
"shoji",
- "syn 2.0.117",
+ "syn 2.0.118",
"sysinfo",
"tempfile",
"test-runner",
@@ -590,9 +591,9 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"shlex 1.3.0",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -602,7 +603,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -730,13 +731,13 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.12.1"
+version = "1.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
+checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
dependencies = [
"memchr",
"regex-automata",
- "serde",
+ "serde_core",
]
[[package]]
@@ -780,7 +781,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -791,21 +792,21 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
-version = "1.11.1"
+version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
[[package]]
name = "bytesize"
-version = "2.3.1"
+version = "2.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd91ee7b2422bcb158d90ef4d14f75ef67f340943fc4149891dcce8f8b972a3"
+checksum = "3d7c8918969267b2932ffd5655509bbbea0833823058c378876953217f5fc50e"
[[package]]
name = "camino"
-version = "1.2.2"
+version = "1.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"
+checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0"
dependencies = [
"serde_core",
]
@@ -850,9 +851,9 @@ dependencies = [
[[package]]
name = "cbindgen"
-version = "0.29.3"
+version = "0.29.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c95537b45400390270fae69ac098d057c8f5399001cde9d04f700c105ddfff2d"
+checksum = "2ecb53484c9c167ba674026b656d8a27d7657a58e6066aa902bfb1a4aa00ae20"
dependencies = [
"clap",
"heck",
@@ -862,16 +863,16 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.117",
+ "syn 2.0.118",
"tempfile",
"toml 0.9.12+spec-1.1.0",
]
[[package]]
name = "cc"
-version = "1.2.63"
+version = "1.2.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
+checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -908,9 +909,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "chacha20"
-version = "0.10.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
dependencies = [
"cfg-if",
"cpufeatures 0.3.0",
@@ -919,9 +920,9 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.44"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
dependencies = [
"iana-time-zone",
"js-sys",
@@ -964,7 +965,7 @@ version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d76fac0a007075fa8d38a6ec08df340bea2035cc0a6e9b0f6594bff1627692b"
dependencies = [
- "foldhash 0.2.0",
+ "foldhash",
"serde_core",
]
@@ -1010,7 +1011,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1072,7 +1073,7 @@ dependencies = [
"regex",
"serde",
"serde_json",
- "syn 2.0.117",
+ "syn 2.0.118",
"toml 1.1.2+spec-1.1.0",
"toml_edit 0.25.12+spec-1.1.0",
]
@@ -1168,9 +1169,9 @@ dependencies = [
[[package]]
name = "console"
-version = "0.16.3"
+version = "0.16.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87"
+checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c"
dependencies = [
"encode_unicode",
"libc",
@@ -1392,18 +1393,18 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
[[package]]
name = "crossbeam-channel"
-version = "0.5.15"
+version = "0.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
dependencies = [
"crossbeam-epoch",
"crossbeam-utils",
@@ -1420,9 +1421,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
[[package]]
name = "crossterm"
@@ -1480,27 +1481,27 @@ dependencies = [
[[package]]
name = "ctor"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01334b89b69ff726750c5ce5073fc8bd860e99aa9a8fc5ca11b04730e3aee97a"
+checksum = "fb22e947478ccf9dc44d8922042c677a63fbb88f2cb468521d1145816e5087cb"
[[package]]
name = "cxx"
version = "1.0.194"
-source = "git+https://github.com/trymirai/cxx.git?branch=master#654cece461ed00cc8aaf86e80aed4eb24cd6ae0f"
+source = "git+https://github.com/trymirai/cxx.git?branch=master#b616fe260d36353919d9f7e13754cd88064118a3"
dependencies = [
"cxx-build",
"cxx-cc",
"cxxbridge-cmd",
"cxxbridge-macro",
- "foldhash 0.2.0",
+ "foldhash",
"link-cplusplus",
]
[[package]]
name = "cxx-build"
version = "1.0.194"
-source = "git+https://github.com/trymirai/cxx.git?branch=master#654cece461ed00cc8aaf86e80aed4eb24cd6ae0f"
+source = "git+https://github.com/trymirai/cxx.git?branch=master#b616fe260d36353919d9f7e13754cd88064118a3"
dependencies = [
"cc",
"codespan-reporting",
@@ -1509,13 +1510,13 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "cxx-cc"
version = "1.0.194"
-source = "git+https://github.com/trymirai/cxx.git?branch=master#654cece461ed00cc8aaf86e80aed4eb24cd6ae0f"
+source = "git+https://github.com/trymirai/cxx.git?branch=master#b616fe260d36353919d9f7e13754cd88064118a3"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1524,30 +1525,30 @@ dependencies = [
[[package]]
name = "cxxbridge-cmd"
version = "1.0.194"
-source = "git+https://github.com/trymirai/cxx.git?branch=master#654cece461ed00cc8aaf86e80aed4eb24cd6ae0f"
+source = "git+https://github.com/trymirai/cxx.git?branch=master#b616fe260d36353919d9f7e13754cd88064118a3"
dependencies = [
"clap",
"codespan-reporting",
"indexmap 2.14.0",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "cxxbridge-flags"
version = "1.0.194"
-source = "git+https://github.com/trymirai/cxx.git?branch=master#654cece461ed00cc8aaf86e80aed4eb24cd6ae0f"
+source = "git+https://github.com/trymirai/cxx.git?branch=master#b616fe260d36353919d9f7e13754cd88064118a3"
[[package]]
name = "cxxbridge-macro"
version = "1.0.194"
-source = "git+https://github.com/trymirai/cxx.git?branch=master#654cece461ed00cc8aaf86e80aed4eb24cd6ae0f"
+source = "git+https://github.com/trymirai/cxx.git?branch=master#b616fe260d36353919d9f7e13754cd88064118a3"
dependencies = [
"indexmap 2.14.0",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1581,7 +1582,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1594,7 +1595,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1605,7 +1606,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
dependencies = [
"darling_core 0.20.11",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1616,7 +1617,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
dependencies = [
"darling_core 0.23.0",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1679,7 +1680,6 @@ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
dependencies = [
- "powerfmt",
"serde_core",
]
@@ -1701,7 +1701,7 @@ dependencies = [
"darling 0.20.11",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1711,7 +1711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
dependencies = [
"derive_builder_core",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1733,7 +1733,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.117",
+ "syn 2.0.118",
"unicode-xid",
]
@@ -1767,7 +1767,7 @@ dependencies = [
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1821,7 +1821,7 @@ checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1849,6 +1849,7 @@ dependencies = [
"chrono",
"crc32c",
"futures-util",
+ "kiban",
"libc",
"mock-registry",
"objc-sys",
@@ -1864,6 +1865,7 @@ dependencies = [
"tokio-stream",
"tracing",
"uuid",
+ "web-sys",
"wiremock",
]
@@ -1926,7 +1928,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -1987,14 +1989,16 @@ dependencies = [
[[package]]
name = "exr"
-version = "1.74.0"
+version = "1.74.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be"
+checksum = "6be87932f10230a4339ab394edd8e4611fcb72553d8295b4d52ea55249b3daa5"
dependencies = [
"bit_field",
"half",
"lebe",
"miniz_oxide",
+ "num-complex",
+ "pulp",
"rayon-core",
"smallvec",
"zune-inflate",
@@ -2157,12 +2161,6 @@ 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 = "foldhash"
version = "0.2.0"
@@ -2259,7 +2257,7 @@ checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -2367,16 +2365,16 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"r-efi 6.0.0",
"rand_core 0.10.1",
- "wasip2",
- "wasip3",
+ "wasm-bindgen",
]
[[package]]
@@ -2459,16 +2457,16 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.4.14"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733"
+checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155"
dependencies = [
"atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
- "http 1.4.1",
+ "http 1.4.2",
"indexmap 2.14.0",
"slab",
"tokio",
@@ -2515,15 +2513,6 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash 0.1.5",
-]
-
[[package]]
name = "hashbrown"
version = "0.16.1"
@@ -2532,7 +2521,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
dependencies = [
"allocator-api2",
"equivalent",
- "foldhash 0.2.0",
+ "foldhash",
]
[[package]]
@@ -2543,7 +2532,7 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
dependencies = [
"allocator-api2",
"equivalent",
- "foldhash 0.2.0",
+ "foldhash",
]
[[package]]
@@ -2592,9 +2581,9 @@ dependencies = [
[[package]]
name = "http"
-version = "1.4.1"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
dependencies = [
"bytes",
"itoa",
@@ -2618,7 +2607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
- "http 1.4.1",
+ "http 1.4.2",
]
[[package]]
@@ -2629,7 +2618,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
dependencies = [
"bytes",
"futures-core",
- "http 1.4.1",
+ "http 1.4.2",
"http-body 1.0.1",
"pin-project-lite",
]
@@ -2680,8 +2669,8 @@ dependencies = [
"bytes",
"futures-channel",
"futures-core",
- "h2 0.4.14",
- "http 1.4.1",
+ "h2 0.4.15",
+ "http 1.4.2",
"http-body 1.0.1",
"httparse",
"httpdate",
@@ -2698,7 +2687,7 @@ version = "0.27.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f"
dependencies = [
- "http 1.4.1",
+ "http 1.4.2",
"hyper 1.10.1",
"hyper-util",
"rustls",
@@ -2719,7 +2708,7 @@ dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "http 1.4.1",
+ "http 1.4.2",
"http-body 1.0.1",
"hyper 1.10.1",
"ipnet",
@@ -2840,12 +2829,6 @@ dependencies = [
"zerovec",
]
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -2875,9 +2858,9 @@ dependencies = [
[[package]]
name = "ignore"
-version = "0.4.25"
+version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a"
+checksum = "2adf14691c72bcfc1058740436a35bdd3ae9c07d1a941ef00b749e9ea16aefa7"
dependencies = [
"crossbeam-deque",
"globset",
@@ -2925,9 +2908,9 @@ dependencies = [
[[package]]
name = "imgref"
-version = "1.12.1"
+version = "1.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fac9d56ed6437b198fddba683305e8e2d651aa42647f00f5ae542e7f5c94a2"
+checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7"
[[package]]
name = "indexmap"
@@ -2954,9 +2937,9 @@ dependencies = [
[[package]]
name = "indicatif"
-version = "0.18.4"
+version = "0.18.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb"
+checksum = "9433806cd6b4ec1aba79c021c7e4c58fb4c3b9977c085062e611ac929998fb0c"
dependencies = [
"console",
"portable-atomic",
@@ -2990,7 +2973,7 @@ dependencies = [
"indoc",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -3010,7 +2993,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -3046,7 +3029,7 @@ checksum = "5e8c51048da5618a10af1135e9e474700f19946f456c857ae0b12ebff2a91b4d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -3064,7 +3047,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -3169,7 +3152,7 @@ dependencies = [
"quote",
"rustc_version",
"simd_cesu8",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -3197,28 +3180,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
dependencies = [
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "jobserver"
-version = "0.1.34"
+version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
"libc",
]
[[package]]
name = "js-sys"
-version = "0.3.99"
+version = "0.3.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
dependencies = [
"cfg-if",
"futures-util",
- "once_cell",
"wasm-bindgen",
]
@@ -3240,9 +3222,9 @@ dependencies = [
[[package]]
name = "jsonschema"
-version = "0.46.5"
+version = "0.46.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a5fe5206f06e589caf25e79fc05ccdf91fca745685fe9fe1a13bbdfb479a631"
+checksum = "f0a699d3e77675e6aa4bfffe3b907c8b5f7ed3241f9965bffb25475ad4b08d05"
dependencies = [
"ahash",
"bytecount",
@@ -3253,12 +3235,12 @@ dependencies = [
"getrandom 0.3.4",
"idna",
"itoa",
+ "jsonschema-regex",
"num-cmp",
"num-traits",
"percent-encoding",
"referencing",
"regex",
- "regex-syntax",
"reqwest 0.13.4",
"rustls",
"serde",
@@ -3267,6 +3249,15 @@ dependencies = [
"uuid-simd",
]
+[[package]]
+name = "jsonschema-regex"
+version = "0.46.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbd1086b01b9349fd4ef9a07433965af64c8ce8159abe633a189e4ff817bd13"
+dependencies = [
+ "regex-syntax",
+]
+
[[package]]
name = "kanka"
version = "0.5.12"
@@ -3343,12 +3334,6 @@ 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 = "lebe"
version = "0.5.3"
@@ -3363,9 +3348,9 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
[[package]]
name = "libfuzzer-sys"
-version = "0.4.12"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12a681b7dd8ce12bff52488013ba614b869148d54dd79836ab85aafdd53f08d"
+checksum = "a9fd2f41a1cba099f79a0b6b6c35656cf7c03351a7bae8ff0f28f25270f929d2"
dependencies = [
"arbitrary",
"cc",
@@ -3399,9 +3384,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
[[package]]
name = "libredox"
-version = "0.1.17"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
dependencies = [
"libc",
]
@@ -3464,9 +3449,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.30"
+version = "0.4.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
[[package]]
name = "logos"
@@ -3490,7 +3475,7 @@ dependencies = [
"quote",
"regex-syntax",
"rustc_version",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -3528,9 +3513,9 @@ dependencies = [
[[package]]
name = "lru"
-version = "0.18.0"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6"
dependencies = [
"hashbrown 0.17.1",
]
@@ -3613,9 +3598,9 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.8.1"
+version = "2.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
[[package]]
name = "memmap2"
@@ -3671,9 +3656,9 @@ dependencies = [
[[package]]
name = "minijinja"
-version = "2.20.0"
+version = "2.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2929e494b2280e1e18959bb2e121da03347ae896896fdfaceaab43c88a02803f"
+checksum = "cb3d648e68cea56d9858d535ee28f9538404e2dd8cb08ed0bd05dca379477f39"
dependencies = [
"indexmap 2.14.0",
"memo-map",
@@ -3683,9 +3668,9 @@ dependencies = [
[[package]]
name = "minijinja-contrib"
-version = "2.20.0"
+version = "2.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99df5123c54391e2a228014c1dbbd85a3dab08a25e776c810526f2f47542b3de"
+checksum = "85342f6fac0be8ccd5bd00d9066be538f34f393f577b75d81b17c8398a6b43bb"
dependencies = [
"minijinja",
"serde",
@@ -3727,7 +3712,7 @@ dependencies = [
"bitflags 2.13.0",
"bytesize",
"crc32c",
- "http 1.4.1",
+ "http 1.4.2",
"httparse",
"serde_json",
"shoji",
@@ -3757,7 +3742,7 @@ checksum = "e4db6d5580af57bf992f59068d4ea26fd518574ff48d7639b255a36f9de6e7e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -3772,9 +3757,9 @@ dependencies = [
[[package]]
name = "mtl-rs"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5da07ba3cea3adad7b479c3d1b097875e8c56e9711830b72c8c2b5f5cf0ce8f"
+checksum = "eb19a6103808f1af363f96d845bd734c49df73eda4ada4177d118560cd4cf0ba"
dependencies = [
"bitflags 2.13.0",
"block2",
@@ -3794,7 +3779,7 @@ dependencies = [
"bytes",
"encoding_rs",
"futures-util",
- "http 1.4.1",
+ "http 1.4.2",
"httparse",
"memchr",
"mime",
@@ -3841,9 +3826,9 @@ dependencies = [
[[package]]
name = "napi"
-version = "3.9.0"
+version = "3.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1d395473824516f38dd1071a1a37bc57daa7be65b293ebba4ead5f7abb017a2"
+checksum = "0c71997d6f7ad4a756966e452426848ac27d3b37a295302d63afbbcce0270f93"
dependencies = [
"bitflags 2.13.0",
"ctor",
@@ -3852,7 +3837,7 @@ dependencies = [
"napi-build",
"napi-sys",
"nohash-hasher",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"tokio",
]
@@ -3864,36 +3849,36 @@ checksum = "c9c366d2c8c60b86fa632df75f745509b52f9128f91a6bad4c796e44abb505e1"
[[package]]
name = "napi-derive"
-version = "3.5.6"
+version = "3.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b3f766e04667e6da0e181e2da4f85475d5a6513b7cf6a80bea184e224a5b42"
+checksum = "d4ba572deef53e2c386759a8c2014175a62679d74ff83adc205c8bc0e0285727"
dependencies = [
"convert_case 0.11.0",
"ctor",
"napi-derive-backend",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "napi-derive-backend"
-version = "5.0.4"
+version = "5.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d5af30503edf933ce7377cf6d4c877a62b0f1107ea05585f1b5e430e88d5baf"
+checksum = "ddd961eb2aa8965e3f29722d754f3a86907eb1984e2fbcbe3fe87b9a02d6bfba"
dependencies = [
"convert_case 0.11.0",
"proc-macro2",
"quote",
"semver",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "napi-sys"
-version = "3.2.1"
+version = "3.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb602b84d7c1edae45e50bbf1374696548f36ae179dfa667f577e384bb90c2b"
+checksum = "1f5bcdf71abd3a50d00b49c1c2c75251cb3c913777d6139cd37dabc093a5e400"
dependencies = [
"libloading 0.9.0",
]
@@ -4035,9 +4020,9 @@ dependencies = [
[[package]]
name = "num-bigint"
-version = "0.4.6"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
dependencies = [
"num-integer",
"num-traits",
@@ -4055,6 +4040,7 @@ version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
dependencies = [
+ "bytemuck",
"num-traits",
]
@@ -4072,7 +4058,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4086,11 +4072,10 @@ dependencies = [
[[package]]
name = "num-iter"
-version = "0.1.45"
+version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
dependencies = [
- "autocfg",
"num-integer",
"num-traits",
]
@@ -4145,7 +4130,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4170,14 +4155,14 @@ dependencies = [
"num-traits",
"pyo3",
"pyo3-build-config",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
]
[[package]]
name = "obfstr"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0d354e9a302760d07e025701d40534f17dd1fe4c4db955b4e3bd2907c63bdee"
+checksum = "fac6bb46461d099d52dbd345e021b92d21d1be9be967ef2bb4430b23af439a4f"
[[package]]
name = "objc-sys"
@@ -4444,7 +4429,7 @@ dependencies = [
"by_address",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4502,7 +4487,7 @@ dependencies = [
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4513,9 +4498,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]]
name = "pest"
-version = "2.8.6"
+version = "2.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662"
+checksum = "47627dd7305c6a2d6c8c6bcd24c5a4c17dbbf425f4f9c5313e724b38fc9782e9"
dependencies = [
"memchr",
"ucd-trie",
@@ -4523,9 +4508,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.8.6"
+version = "2.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77"
+checksum = "4b4254325ecad416ab689e27ba51da03ba01a9632bc6e108f5fe7c3c4ad29d58"
dependencies = [
"pest",
"pest_generator",
@@ -4533,25 +4518,24 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.8.6"
+version = "2.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f"
+checksum = "6c4c0e91ead7a8f7acecbca6f003fc2e8282b1dbe2dd9c9d2f16aba42995e0a7"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "pest_meta"
-version = "2.8.6"
+version = "2.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220"
+checksum = "f9744bc48116fee06334924bb5f2bad41eed5e89bd26e29b0b799f9a3f82c210"
dependencies = [
"pest",
- "sha2",
]
[[package]]
@@ -4594,7 +4578,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4717,7 +4701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
dependencies = [
"proc-macro2",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4746,7 +4730,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
"version_check",
"yansi",
]
@@ -4757,7 +4741,7 @@ version = "0.5.12"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4776,7 +4760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"
dependencies = [
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4798,11 +4782,34 @@ dependencies = [
"unarray",
]
+[[package]]
+name = "pulp"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046aa45b989642ec2e4717c8e72d677b13edd831a4d3b6cf37d9a3e54912496a"
+dependencies = [
+ "bytemuck",
+ "cfg-if",
+ "libm",
+ "num-complex",
+ "paste",
+ "pulp-wasm-simd-flag",
+ "raw-cpuid",
+ "reborrow",
+ "version_check",
+]
+
+[[package]]
+name = "pulp-wasm-simd-flag"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d8f70e07b9c3962945a74e59ca1c511bba65b6419468acc217c457d93f3c740"
+
[[package]]
name = "pxfm"
-version = "0.1.29"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
+checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
[[package]]
name = "pyo3"
@@ -4861,7 +4868,7 @@ dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4874,14 +4881,14 @@ dependencies = [
"proc-macro2",
"pyo3-build-config",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "pyo3-stub-gen"
-version = "0.22.3"
+version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1242a6080f45edcfaf3be3b9968914dd47a408c5590aea22770b978f7c36ffa7"
+checksum = "fea98776c32736ebba63cc6dc3d4b5c67933446e39aa378a49b1652fb1e9a6cc"
dependencies = [
"anyhow",
"chrono",
@@ -4905,16 +4912,16 @@ dependencies = [
[[package]]
name = "pyo3-stub-gen-derive"
-version = "0.22.3"
+version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9a73abe6f57890e657c265b86805637138f83203e1a56bc156078abf215e36"
+checksum = "643db6033267fd2f875fc8970d76bef247bbcdfcffe3ea5c6cd40424024f6c89"
dependencies = [
"heck",
"indexmap 2.14.0",
"proc-macro2",
"quote",
"rustpython-parser",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -4940,16 +4947,16 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quinn"
-version = "0.11.9"
+version = "0.11.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8"
dependencies = [
"bytes",
"cfg_aliases",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"rustls",
"socket2 0.6.4",
"thiserror 2.0.18",
@@ -4960,17 +4967,18 @@ dependencies = [
[[package]]
name = "quinn-proto"
-version = "0.11.14"
+version = "0.11.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
dependencies = [
"aws-lc-rs",
"bytes",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
"lru-slab",
- "rand 0.9.4",
+ "rand 0.10.2",
+ "rand_pcg",
"ring",
- "rustc-hash 2.1.2",
+ "rustc-hash 2.1.3",
"rustls",
"rustls-pki-types",
"slab",
@@ -4982,23 +4990,23 @@ dependencies = [
[[package]]
name = "quinn-udp"
-version = "0.5.14"
+version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
dependencies = [
"cfg_aliases",
"libc",
"once_cell",
"socket2 0.6.4",
"tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
[[package]]
name = "quote"
-version = "1.0.45"
+version = "1.0.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
dependencies = [
"proc-macro2",
]
@@ -5038,12 +5046,12 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
+checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
dependencies = [
"chacha20",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
"rand_core 0.10.1",
]
@@ -5098,7 +5106,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d431c2703ccf129de4d45253c03f49ebb22b97d6ad79ee3ecfc7e3f4862c1d8"
dependencies = [
"num-traits",
- "rand 0.10.1",
+ "rand 0.10.2",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
+dependencies = [
+ "rand_core 0.10.1",
]
[[package]]
@@ -5267,6 +5284,15 @@ dependencies = [
"rgb",
]
+[[package]]
+name = "raw-cpuid"
+version = "11.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
+dependencies = [
+ "bitflags 2.13.0",
+]
+
[[package]]
name = "rawpointer"
version = "0.2.1"
@@ -5304,6 +5330,12 @@ dependencies = [
"crossbeam-utils",
]
+[[package]]
+name = "reborrow"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430"
+
[[package]]
name = "redox_syscall"
version = "0.5.18"
@@ -5341,14 +5373,14 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "referencing"
-version = "0.46.5"
+version = "0.46.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e4e17ef386c5383591d07623d3de49cbc601156e7582973e6db98d66a57de2"
+checksum = "0fbf332a2f81899f6836f22c03da73dae8a664c32e3016b84692c23cddadc95d"
dependencies = [
"ahash",
"fluent-uri",
@@ -5363,9 +5395,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.12.3"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2"
dependencies = [
"aho-corasick",
"memchr",
@@ -5375,9 +5407,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.14"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db"
dependencies = [
"aho-corasick",
"memchr",
@@ -5386,9 +5418,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.10"
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
[[package]]
name = "relative-path"
@@ -5407,7 +5439,7 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
- "http 1.4.1",
+ "http 1.4.2",
"http-body 1.0.1",
"http-body-util",
"hyper 1.10.1",
@@ -5452,8 +5484,8 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
- "h2 0.4.14",
- "http 1.4.1",
+ "h2 0.4.15",
+ "http 1.4.2",
"http-body 1.0.1",
"http-body-util",
"hyper 1.10.1",
@@ -5532,7 +5564,7 @@ checksum = "3cd3a7535e50bf36857e7be7bec276d334e8c2dfa469c2201226fd01638ea5ca"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -5599,7 +5631,7 @@ dependencies = [
"proc-macro2",
"quote",
"rocket_http",
- "syn 2.0.117",
+ "syn 2.0.118",
"unicode-xid",
"version_check",
]
@@ -5669,7 +5701,7 @@ dependencies = [
"regex",
"relative-path",
"rustc_version",
- "syn 2.0.117",
+ "syn 2.0.118",
"unicode-ident",
]
@@ -5681,9 +5713,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc-hash"
-version = "2.1.2"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
[[package]]
name = "rustc_version"
@@ -5709,9 +5741,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.40"
+version = "0.23.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
+checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f"
dependencies = [
"aws-lc-rs",
"once_cell",
@@ -5724,9 +5756,9 @@ dependencies = [
[[package]]
name = "rustls-native-certs"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
+checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d"
dependencies = [
"openssl-probe",
"rustls-pki-types",
@@ -5736,9 +5768,9 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.14.1"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
dependencies = [
"web-time",
"zeroize",
@@ -5842,9 +5874,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
[[package]]
name = "rusty-fork"
@@ -5916,7 +5948,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -5954,7 +5986,7 @@ checksum = "1783eabc414609e28a5ba76aee5ddd52199f7107a0b24c2e9746a1ecc34a683d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6038,7 +6070,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6049,7 +6081,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6098,9 +6130,9 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.20.0"
+version = "3.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
dependencies = [
"base64 0.22.1",
"bs58",
@@ -6118,14 +6150,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.20.0"
+version = "3.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
dependencies = [
"darling 0.23.0",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6291,9 +6323,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
[[package]]
name = "smartstring"
@@ -6308,9 +6340,9 @@ dependencies = [
[[package]]
name = "smawk"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+checksum = "e8e2fb0f499abb4d162f2bedad68f5ef91a1682b5a03596ddb67efd37768d100"
[[package]]
name = "socket2"
@@ -6416,7 +6448,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6504,9 +6536,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.117"
+version = "2.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
dependencies = [
"proc-macro2",
"quote",
@@ -6530,7 +6562,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6594,7 +6626,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
"fastrand",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
"once_cell",
"rustix",
"windows-sys 0.61.2",
@@ -6703,7 +6735,7 @@ checksum = "e5a2455608f6a56fc2ce66c89dd005501c169688f29165468e65f0b47e060333"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6747,7 +6779,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6758,7 +6790,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -6786,12 +6818,11 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.47"
+version = "0.3.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
dependencies = [
"deranged",
- "itoa",
"libc",
"num-conv",
"num_threads",
@@ -6803,15 +6834,15 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
[[package]]
name = "time-macros"
-version = "0.2.27"
+version = "0.2.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
+checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
dependencies = [
"num-conv",
"time-core",
@@ -6937,7 +6968,7 @@ checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -7117,7 +7148,7 @@ dependencies = [
"bitflags 2.13.0",
"bytes",
"futures-util",
- "http 1.4.1",
+ "http 1.4.2",
"http-body 1.0.1",
"pin-project-lite",
"tower",
@@ -7170,7 +7201,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -7253,7 +7284,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -7374,9 +7405,9 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
-version = "1.13.2"
+version = "1.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
[[package]]
name = "unicode-truncate"
@@ -7437,9 +7468,9 @@ dependencies = [
[[package]]
name = "uniffi"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5f2297ee5b893405bed1a6929faec4713a061df158ecf5198089f23910d470"
+checksum = "46eefd5468602930da46b1f49d3448c6dfc2e81295f93120f23f8174fd70267f"
dependencies = [
"anyhow",
"cargo_metadata",
@@ -7451,9 +7482,9 @@ dependencies = [
[[package]]
name = "uniffi_bindgen"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bc0c60a9607e7ab77a2ad47ec5530178015014839db25af7512447d2238016c"
+checksum = "c4a0c9b375d32e1365cdb2bdd7cb495eecf6fac851ddbad077412b4ee1888514"
dependencies = [
"anyhow",
"askama",
@@ -7477,9 +7508,9 @@ dependencies = [
[[package]]
name = "uniffi_core"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77baf5d539fe2e1ad6805e942dbc5dbdeb2b83eb5f2b3a6535d422ca4b02a12f"
+checksum = "eec017b112701681f6fbbe5d92014b5c468eb0b177a94389de03ceec40665095"
dependencies = [
"anyhow",
"async-compat",
@@ -7490,22 +7521,22 @@ dependencies = [
[[package]]
name = "uniffi_internal_macros"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b42137524f4be6400fcaca9d02c1d4ecb6ad917e4013c0b93235526d8396e5"
+checksum = "4641669b48fefbc5e80ff08c5004d9c7617fb91232131a6734ab6712779cb04c"
dependencies = [
"anyhow",
"indexmap 2.14.0",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
name = "uniffi_macros"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9273ec45330d8fe9a3701b7b983cea7a4e218503359831967cb95d26b873561"
+checksum = "eeb8617ee814de22caf7417bf514715ba0b3f46bd9d5a5d794413fd8282cb737"
dependencies = [
"camino",
"fs-err",
@@ -7513,16 +7544,16 @@ dependencies = [
"proc-macro2",
"quote",
"serde",
- "syn 2.0.117",
+ "syn 2.0.118",
"toml 0.9.12+spec-1.1.0",
"uniffi_meta",
]
[[package]]
name = "uniffi_meta"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "431d2f443e7828a6c29d188de98b6771a6491ee98bba2d4372643bf93f988a18"
+checksum = "58d5b94fc92803d21b2928bd15c6f06e57609b95caf98ea561c99cda1b6d2a25"
dependencies = [
"anyhow",
"siphasher",
@@ -7532,9 +7563,9 @@ dependencies = [
[[package]]
name = "uniffi_pipeline"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761ef74f6175e15603d0424cc5f98854c5baccfe7bf4ccb08e5816f9ab8af689"
+checksum = "032739b3ec725576914c15899dedaf080163ced86b6934566c20ec2b20ce90ca"
dependencies = [
"anyhow",
"heck",
@@ -7545,9 +7576,9 @@ dependencies = [
[[package]]
name = "uniffi_udl"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68773ec0e1c067b6505a73bbf6a5782f31a7f9209333a0df97b87565c46bf370"
+checksum = "fc0a1d0a0252ce1af9e8ce78ba67ac0d8937fb2bedaf10cbddd43d3614d06ec6"
dependencies = [
"anyhow",
"textwrap",
@@ -7593,12 +7624,12 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
-version = "1.23.2"
+version = "1.23.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
+checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
dependencies = [
"atomic 0.6.1",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
"js-sys",
"serde_core",
"sha1_smol",
@@ -7641,6 +7672,7 @@ dependencies = [
"inventory",
"iocraft",
"keyring-core",
+ "kiban",
"mock-registry",
"nagare",
"napi",
@@ -7752,27 +7784,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasip2"
-version = "1.0.3+wasi-0.2.9"
+version = "1.0.4+wasi-0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
dependencies = [
- "wit-bindgen 0.57.1",
-]
-
-[[package]]
-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 = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen 0.51.0",
+ "wit-bindgen",
]
[[package]]
name = "wasm-bindgen"
-version = "0.2.122"
+version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
dependencies = [
"cfg-if",
"once_cell",
@@ -7785,9 +7808,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.72"
+version = "0.4.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -7795,9 +7818,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.122"
+version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -7805,48 +7828,26 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.122"
+version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
dependencies = [
"bumpalo",
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.122"
+version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
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 = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap 2.14.0",
- "wasm-encoder",
- "wasmparser",
-]
-
[[package]]
name = "wasm-streams"
version = "0.4.2"
@@ -7873,23 +7874,11 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags 2.13.0",
- "hashbrown 0.15.5",
- "indexmap 2.14.0",
- "semver",
-]
-
[[package]]
name = "web-sys"
-version = "0.3.99"
+version = "0.3.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -7907,18 +7896,18 @@ dependencies = [
[[package]]
name = "webpki-root-certs"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
+checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267"
dependencies = [
"rustls-pki-types",
]
[[package]]
name = "webpki-roots"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d"
+checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf"
dependencies = [
"rustls-pki-types",
]
@@ -8103,7 +8092,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -8114,7 +8103,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -8189,15 +8178,6 @@ 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"
@@ -8246,30 +8226,13 @@ dependencies = [
"windows_aarch64_gnullvm 0.52.6",
"windows_aarch64_msvc 0.52.6",
"windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
"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",
- "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.2.1"
@@ -8297,12 +8260,6 @@ 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"
@@ -8321,12 +8278,6 @@ 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"
@@ -8345,24 +8296,12 @@ 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"
@@ -8381,12 +8320,6 @@ 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"
@@ -8405,12 +8338,6 @@ 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"
@@ -8429,12 +8356,6 @@ 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"
@@ -8453,12 +8374,6 @@ 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.7.15"
@@ -8487,7 +8402,7 @@ dependencies = [
"base64 0.22.1",
"deadpool",
"futures",
- "http 1.4.1",
+ "http 1.4.2",
"http-body-util",
"hyper 1.10.1",
"hyper-util",
@@ -8500,100 +8415,12 @@ dependencies = [
"url",
]
-[[package]]
-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"
version = "0.57.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
-[[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 2.14.0",
- "prettyplease",
- "syn 2.0.117",
- "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.117",
- "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.13.0",
- "indexmap 2.14.0",
- "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 = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap 2.14.0",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
[[package]]
name = "writeable"
version = "0.6.3"
@@ -8615,9 +8442,9 @@ dependencies = [
[[package]]
name = "xxhash-rust"
-version = "0.8.15"
+version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+checksum = "4d93c89cdc2d3a63c3ec48ffe926931bdc069eafa8e4402fe6d8f790c9d1e576"
[[package]]
name = "y4m"
@@ -8636,9 +8463,9 @@ dependencies = [
[[package]]
name = "yoke"
-version = "0.8.2"
+version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
dependencies = [
"stable_deref_trait",
"yoke-derive",
@@ -8653,28 +8480,28 @@ checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
"synstructure",
]
[[package]]
name = "zerocopy"
-version = "0.8.50"
+version = "0.8.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
+checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.8.50"
+version = "0.8.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
+checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
@@ -8694,15 +8521,15 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
"synstructure",
]
[[package]]
name = "zeroize"
-version = "1.8.2"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
[[package]]
name = "zerotrie"
@@ -8734,7 +8561,7 @@ checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.117",
+ "syn 2.0.118",
]
[[package]]
diff --git a/crates/download-manager/Cargo.toml b/crates/download-manager/Cargo.toml
index dc63bca03..12d78a82b 100644
--- a/crates/download-manager/Cargo.toml
+++ b/crates/download-manager/Cargo.toml
@@ -9,22 +9,18 @@ repository.workspace = true
license.workspace = true
[dependencies]
-tokio = { workspace = true, features = ["full"] }
-tokio-stream.workspace = true
+kiban.workspace = true
futures-util.workspace = true
serde.workspace = true
serde_json.workspace = true
async-trait.workspace = true
thiserror.workspace = true
-uuid.workspace = true
crc32c.workspace = true
base64.workspace = true
tracing.workspace = true
chrono.workspace = true
reqwest.workspace = true
-
-[target.'cfg(unix)'.dependencies]
-libc.workspace = true
+tokio = { workspace = true, features = ["macros", "sync"] }
[target.'cfg(target_vendor = "apple")'.dependencies]
objc2.workspace = true
@@ -32,7 +28,20 @@ objc2-foundation.workspace = true
block2.workspace = true
objc-sys.workspace = true
+[target.'cfg(unix)'.dependencies]
+libc.workspace = true
+
+[target.'cfg(target_family = "wasm")'.dependencies]
+tokio-stream = { workspace = true, features = ["sync"] }
+uuid = { workspace = true, features = ["js"] }
+web-sys = { workspace = true, features = ["console"] }
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+tokio-stream.workspace = true
+uuid.workspace = true
+
[dev-dependencies]
+tokio = { workspace = true, features = ["full"] }
tempfile.workspace = true
rstest.workspace = true
mock-registry.workspace = true
diff --git a/crates/download-manager/examples/cross_platform_download.rs b/crates/download-manager/examples/cross_platform_download.rs
index 0a22f6b6b..0f8b81dcb 100644
--- a/crates/download-manager/examples/cross_platform_download.rs
+++ b/crates/download-manager/examples/cross_platform_download.rs
@@ -4,13 +4,13 @@ use std::path::PathBuf;
/// This example shows how to use FileDownloadManager trait
/// which works on both Apple and non-Apple platforms
use download_manager::{FileCheck, FileDownloadManager};
-use tokio::runtime::Handle;
+use kiban::rt::RuntimeHandle;
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
- let tokio_handle = Handle::current();
+ let runtime_handle = RuntimeHandle::current();
- let manager = <dyn FileDownloadManager>::system_default(tokio_handle).await?;
+ let manager = <dyn FileDownloadManager>::system_default(runtime_handle).await?;
let url = "https://huggingface.co/Qwen/Qwen3.5-0.8B/resolve/main/tokenizer.json".to_string();
diff --git a/crates/download-manager/src/backends/apple/backend.rs b/crates/download-manager/src/backends/apple/backend.rs
index a52d1cbc1..63d9db66b 100644
--- a/crates/download-manager/src/backends/apple/backend.rs
+++ b/crates/download-manager/src/backends/apple/backend.rs
@@ -1,5 +1,6 @@
use std::{path::Path, sync::Arc};
+use kiban::rt::RuntimeHandle;
use objc2_foundation::NSURLSessionTaskState;
use crate::{
@@ -22,7 +23,7 @@ impl DownloadBackend for AppleBackend {
type ActiveTask = AppleActiveTask;
type Error = AppleBackendError;
- fn read_resume_progress(part_path: &Path) -> Option<u64> {
+ async fn read_resume_progress(part_path: &Path) -> Option<u64> {
resume_data_parser::read_resume_progress(part_path)
}
}
@@ -36,8 +37,8 @@ impl common::Backend for AppleBackend {
"apple"
}
- fn create_context(tokio_handle: tokio::runtime::Handle) -> Result<Self::Context, DownloadError> {
- Ok(AppleBackendContext::new(tokio_handle))
+ fn create_context(runtime_handle: RuntimeHandle) -> Result<Self::Context, DownloadError> {
+ Ok(AppleBackendContext::new(runtime_handle))
}
async fn initial_task_attachment(
diff --git a/crates/download-manager/src/backends/apple/context.rs b/crates/download-manager/src/backends/apple/context.rs
index cd1a02e59..4d59921ff 100644
--- a/crates/download-manager/src/backends/apple/context.rs
+++ b/crates/download-manager/src/backends/apple/context.rs
@@ -4,12 +4,13 @@ use std::{
sync::{Arc, Mutex},
};
+use kiban::rt::RuntimeHandle;
use objc2::{rc::Retained, runtime::ProtocolObject};
use objc2_foundation::{
NSBundle, NSData, NSString, NSURL, NSURLSession, NSURLSessionConfiguration, NSURLSessionDelegate,
NSURLSessionDownloadTask, NSURLSessionTaskState,
};
-use tokio::{runtime::Handle as TokioHandle, sync::oneshot::channel as tokio_oneshot_channel};
+use tokio::sync::oneshot::channel as tokio_oneshot_channel;
use crate::{
DownloadInfo, FileCheck,
@@ -26,7 +27,7 @@ pub struct AppleBackendContext {
_delegate: Retained<AppleSessionDelegate>,
_delegate_protocol_object: Retained<ProtocolObject<dyn NSURLSessionDelegate>>,
event_registry: AppleEventRegistry,
- tokio_handle: TokioHandle,
+ runtime_handle: RuntimeHandle,
}
impl std::fmt::Debug for AppleBackendContext {
@@ -39,7 +40,7 @@ impl std::fmt::Debug for AppleBackendContext {
}
impl AppleBackendContext {
- pub fn new(tokio_handle: TokioHandle) -> Self {
+ pub fn new(runtime_handle: RuntimeHandle) -> Self {
let event_registry = Arc::new(Mutex::new(HashMap::new()));
let delegate = AppleSessionDelegate::new(Arc::clone(&event_registry));
let delegate_protocol_object = AppleSessionDelegate::protocol_object(delegate.clone());
@@ -56,7 +57,7 @@ impl AppleBackendContext {
_delegate: delegate,
_delegate_protocol_object: delegate_protocol_object,
event_registry,
- tokio_handle,
+ runtime_handle,
}
}
@@ -273,7 +274,7 @@ impl AppleBackendContext {
generation,
destination: config.destination.clone(),
backend_event_sender,
- tokio_handle: self.tokio_handle.clone(),
+ runtime_handle: self.runtime_handle.clone(),
},
);
}
diff --git a/crates/download-manager/src/backends/apple/delegate.rs b/crates/download-manager/src/backends/apple/delegate.rs
index d6b26120c..2f272c8e7 100644
--- a/crates/download-manager/src/backends/apple/delegate.rs
+++ b/crates/download-manager/src/backends/apple/delegate.rs
@@ -4,6 +4,7 @@ use std::{
sync::{Arc, Mutex},
};
+use kiban::rt::RuntimeHandle;
use objc2::{
ClassType, DefinedClass, define_class, msg_send,
rc::{Allocated, Retained},
@@ -13,7 +14,6 @@ use objc2_foundation::{
NSError, NSObject, NSObjectProtocol, NSURL, NSURLSession, NSURLSessionDelegate, NSURLSessionDownloadDelegate,
NSURLSessionDownloadTask, NSURLSessionTask, NSURLSessionTaskDelegate,
};
-use tokio::runtime::Handle as TokioHandle;
use crate::{
DownloadId,
@@ -27,7 +27,7 @@ pub struct AppleEventSink {
pub generation: ActiveDownloadGeneration,
pub destination: PathBuf,
pub backend_event_sender: BackendEventSender,
- pub tokio_handle: TokioHandle,
+ pub runtime_handle: RuntimeHandle,
}
pub type AppleSinkKey = (DownloadId, u64);
@@ -80,7 +80,7 @@ define_class!(
return;
};
let message = error.localizedDescription().to_string();
- sink.tokio_handle.clone().spawn(async move {
+ sink.runtime_handle.clone().spawn(async move {
let _ = sink.backend_event_sender.send_terminal(BackendEvent::error(sink.generation, message)).await;
});
}
@@ -121,7 +121,7 @@ define_class!(
Ok(()) => BackendEvent::completed(sink.generation),
Err(error) => BackendEvent::error(sink.generation, format!("move into destination failed: {error}")),
};
- sink.tokio_handle.clone().spawn(async move {
+ sink.runtime_handle.clone().spawn(async move {
let _ = sink.backend_event_sender.send_terminal(terminal_event).await;
});
}
@@ -147,7 +147,7 @@ define_class!(
let downloaded_bytes = cumulative_bytes_written.max(0) as u64;
let total_bytes = (total_expected_bytes_to_write > 0).then_some(total_expected_bytes_to_write as u64);
- sink.tokio_handle.clone().spawn(async move {
+ sink.runtime_handle.clone().spawn(async move {
sink.backend_event_sender.send_progress(sink.generation, downloaded_bytes, total_bytes).await;
});
}
diff --git a/crates/download-manager/src/backends/common/action_executor.rs b/crates/download-manager/src/backends/common/action_executor.rs
index fb98fef56..19f836b01 100644
--- a/crates/download-manager/src/backends/common/action_executor.rs
+++ b/crates/download-manager/src/backends/common/action_executor.rs
@@ -1,5 +1,7 @@
use std::path::Path;
+use kiban::fs;
+
use crate::{
DownloadError,
crc_utils::save_crc_file,
@@ -28,7 +30,7 @@ pub async fn apply_actions(
destination,
crc,
} => {
- save_crc_file(destination, crc)?;
+ save_crc_file(destination, crc).await?;
},
}
}
@@ -37,7 +39,7 @@ pub async fn apply_actions(
}
async fn remove_file_if_present(path: &Path) -> Result<(), DownloadError> {
- match tokio::fs::remove_file(path).await {
+ match fs::asyn::remove_file(path).await {
Ok(()) => Ok(()),
Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(()),
Err(error) => Err(DownloadError::from(error)),
diff --git a/crates/download-manager/src/backends/common/backend.rs b/crates/download-manager/src/backends/common/backend.rs
index ded3e9ea5..b79d4d0d3 100644
--- a/crates/download-manager/src/backends/common/backend.rs
+++ b/crates/download-manager/src/backends/common/backend.rs
@@ -1,6 +1,6 @@
use std::{fmt::Debug, sync::Arc};
-use tokio::runtime::Handle as TokioHandle;
+use kiban::rt::RuntimeHandle;
use crate::{
DownloadError,
@@ -18,14 +18,15 @@ pub enum InitialTaskAttachment<B: Backend> {
},
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
pub trait Backend: DownloadBackend + Debug + Clone + Send + Sync + Sized + 'static {
const RESUME_ARTIFACT_EXTENSION: &'static str;
const SUPPORTS_INITIAL_TASK_ATTACHMENT: bool = false;
fn manager_suffix() -> &'static str;
- fn create_context(tokio_handle: TokioHandle) -> Result<Self::Context, DownloadError>;
+ fn create_context(runtime_handle: RuntimeHandle) -> Result<Self::Context, DownloadError>;
async fn initial_task_attachment(
_context: &Self::Context,
diff --git a/crates/download-manager/src/backends/common/manager.rs b/crates/download-manager/src/backends/common/manager.rs
index a1a0657fa..423a9d668 100644
--- a/crates/download-manager/src/backends/common/manager.rs
+++ b/crates/download-manager/src/backends/common/manager.rs
@@ -1,6 +1,6 @@
use std::sync::Arc;
-use tokio::runtime::Handle as TokioHandle;
+use kiban::rt::RuntimeHandle;
use tokio_stream::wrappers::BroadcastStream as TokioBroadcastStream;
use crate::{
@@ -21,8 +21,8 @@ pub struct DownloadManager<B: Backend> {
}
impl<B: Backend> DownloadManager<B> {
- pub fn from_tokio_handle(tokio_handle: TokioHandle) -> Result<Self, DownloadError> {
- let context = B::create_context(tokio_handle.clone())?;
+ pub fn from_runtime_handle(runtime_handle: RuntimeHandle) -> Result<Self, DownloadError> {
+ let context = B::create_context(runtime_handle)?;
let state = DownloadManagerState::new(B::manager_suffix());
log(DownloadLogEvent::ManagerCreated {
manager_id: state.manager_id.clone(),
@@ -34,7 +34,8 @@ impl<B: Backend> DownloadManager<B> {
}
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
impl<B: Backend> FileDownloadManager for DownloadManager<B> {
fn manager_id(&self) -> &str {
&self.state.manager_id
@@ -166,7 +167,7 @@ impl<B: Backend> FileDownloadManager for DownloadManager<B> {
destination_path: &std::path::Path,
) -> Option<String> {
let lock_path = lock_path_for_destination(destination_path);
- match check_lock_file(&lock_path, &self.state.manager_id, self.state.instance_id, std::process::id()).await {
+ match check_lock_file(&lock_path, &self.state.manager_id, self.state.instance_id, kiban::process::id()).await {
LockFileState::OwnedByOtherApp(info) => Some(info.manager_id),
_ => None,
}
diff --git a/crates/download-manager/src/backends/common/startup.rs b/crates/download-manager/src/backends/common/startup.rs
index 34b2983ad..f8629828e 100644
--- a/crates/download-manager/src/backends/common/startup.rs
+++ b/crates/download-manager/src/backends/common/startup.rs
@@ -1,5 +1,7 @@
use std::{path::Path, sync::Arc};
+use kiban::fs;
+
use crate::{
DownloadError, DownloadId, FileCheck, FileState, LockFileState,
backends::common::{Backend, action_executor::apply_actions},
@@ -37,16 +39,16 @@ impl Startup {
FileCheck::None => None,
};
let crc_path = crc_path_for_file(destination_path);
- let resume_state = file_state(&resume_artifact_path);
+ let resume_state = file_state(&resume_artifact_path).await;
let resume_size = match resume_state {
- FileState::Exists => B::read_resume_progress(&resume_artifact_path),
+ FileState::Exists => B::read_resume_progress(&resume_artifact_path).await,
FileState::Missing => None,
};
let observation = DiskObservation {
- destination_state: file_state(destination_path),
- crc_state: file_state(&crc_path),
+ destination_state: file_state(destination_path).await,
+ crc_state: file_state(&crc_path).await,
resume_state,
- destination_size: file_size(destination_path),
+ destination_size: fs::asyn::file_length(destination_path).await.ok(),
resume_size,
expected_crc,
expected_bytes,
@@ -58,7 +60,7 @@ impl Startup {
&lock_path_for_destination(destination_path),
manager_id,
manager_instance_id,
- std::process::id(),
+ kiban::process::id(),
)
.await;
let lock_observation = LockObservation {
@@ -94,14 +96,10 @@ impl Startup {
}
}
-fn file_state(path: &Path) -> FileState {
- if path.exists() && path.is_file() {
+async fn file_state(path: &Path) -> FileState {
+ if fs::asyn::try_exists(path).await.is_ok() && fs::asyn::is_file(path).await {
FileState::Exists
} else {
FileState::Missing
}
}
-
-fn file_size(path: &Path) -> Option<u64> {
- path.metadata().ok().map(|metadata| metadata.len())
-}
diff --git a/crates/download-manager/src/backends/universal/active_task.rs b/crates/download-manager/src/backends/universal/active_task.rs
index a0e544352..7bd4cd323 100644
--- a/crates/download-manager/src/backends/universal/active_task.rs
+++ b/crates/download-manager/src/backends/universal/active_task.rs
@@ -1,6 +1,7 @@
use std::path::{Path, PathBuf};
-use tokio::task::JoinHandle as TokioJoinHandle;
+use kiban::rt::TaskJoinHandle;
+use tokio::sync::{oneshot::Receiver as TokioOneshotReceiver, watch::Sender as TokioWatchSender};
use crate::{
backends::universal::UniversalBackend,
@@ -8,7 +9,9 @@ use crate::{
};
pub struct UniversalActiveTask {
- task_handles: Box<[TokioJoinHandle<()>]>,
+ task_handles: Box<[Box<dyn TaskJoinHandle<()>>]>,
+ pause_sender: Option<TokioWatchSender<bool>>,
+ completion_receiver: Option<TokioOneshotReceiver<()>>,
resume_artifact_path: PathBuf,
}
@@ -26,11 +29,15 @@ impl std::fmt::Debug for UniversalActiveTask {
impl UniversalActiveTask {
pub fn new(
- task_handles: Box<[TokioJoinHandle<()>]>,
+ task_handles: Box<[Box<dyn TaskJoinHandle<()>>]>,
+ pause_sender: TokioWatchSender<bool>,
+ completion_receiver: TokioOneshotReceiver<()>,
resume_artifact_path: PathBuf,
) -> Self {
Self {
task_handles,
+ pause_sender: Some(pause_sender),
+ completion_receiver: Some(completion_receiver),
resume_artifact_path,
}
}
@@ -44,7 +51,8 @@ impl Drop for UniversalActiveTask {
}
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
impl ActiveTask for UniversalActiveTask {
type Backend = UniversalBackend;
@@ -52,9 +60,21 @@ impl ActiveTask for UniversalActiveTask {
mut self,
_destination: &Path,
) -> Result<PathBuf, <Self::Backend as DownloadBackend>::Error> {
- for task_handle in std::mem::take(&mut self.task_handles) {
- task_handle.abort();
- let _ = task_handle.await;
+ if let Some(pause_sender) = self.pause_sender.take() {
+ let _ = pause_sender.send(true);
+ }
+
+ let completed = match self.completion_receiver.take() {
+ Some(completion_receiver) => completion_receiver.await.is_ok(),
+ None => false,
+ };
+
+ if completed {
+ let _ = std::mem::take(&mut self.task_handles);
+ } else {
+ for task_handle in std::mem::take(&mut self.task_handles) {
+ task_handle.abort_and_join().await;
+ }
}
Ok(std::mem::take(&mut self.resume_artifact_path))
}
@@ -64,8 +84,7 @@ impl ActiveTask for UniversalActiveTask {
_destination: &Path,
) -> CancelOutcome {
for task_handle in std::mem::take(&mut self.task_handles) {
- task_handle.abort();
- let _ = task_handle.await;
+ task_handle.abort_and_join().await;
}
CancelOutcome::BestEffort
}
diff --git a/crates/download-manager/src/backends/universal/backend.rs b/crates/download-manager/src/backends/universal/backend.rs
index ca2d771c1..117cf6092 100644
--- a/crates/download-manager/src/backends/universal/backend.rs
+++ b/crates/download-manager/src/backends/universal/backend.rs
@@ -1,3 +1,5 @@
+use kiban::rt::RuntimeHandle;
+
use crate::{
DownloadError,
backends::{
@@ -23,7 +25,7 @@ impl common::Backend for UniversalBackend {
"universal"
}
- fn create_context(tokio_handle: tokio::runtime::Handle) -> Result<Self::Context, DownloadError> {
- Ok(UniversalBackendContext::new(tokio_handle))
+ fn create_context(runtime_handle: RuntimeHandle) -> Result<Self::Context, DownloadError> {
+ Ok(UniversalBackendContext::new(runtime_handle))
}
}
diff --git a/crates/download-manager/src/backends/universal/context.rs b/crates/download-manager/src/backends/universal/context.rs
index bd9e43b84..361b62e38 100644
--- a/crates/download-manager/src/backends/universal/context.rs
+++ b/crates/download-manager/src/backends/universal/context.rs
@@ -5,14 +5,14 @@ use std::{
};
use futures_util::StreamExt;
+use kiban::{fs, fs::PartFile, rt::RuntimeHandle, time::Instant};
use reqwest::{
StatusCode,
header::{CONTENT_LENGTH, CONTENT_RANGE, RANGE},
};
-use tokio::{
- fs::{File as TokioFile, OpenOptions as TokioOpenOptions},
- io::AsyncWriteExt,
- runtime::Handle as TokioHandle,
+use tokio::sync::{
+ oneshot::channel as tokio_oneshot_channel,
+ watch::{Receiver as TokioWatchReceiver, channel as tokio_watch_channel},
};
use crate::{
@@ -24,22 +24,23 @@ use crate::{
#[derive(Clone, Debug)]
pub struct UniversalBackendContext {
- tokio_handle: TokioHandle,
+ runtime_handle: RuntimeHandle,
pub retries: u16,
pub progress_interval_ms: u64,
}
impl UniversalBackendContext {
- pub fn new(tokio_handle: TokioHandle) -> Self {
+ pub fn new(runtime_handle: RuntimeHandle) -> Self {
Self {
- tokio_handle,
+ runtime_handle,
retries: 3,
progress_interval_ms: 500,
}
}
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
impl BackendContext for UniversalBackendContext {
type Backend = UniversalBackend;
@@ -75,24 +76,34 @@ impl UniversalBackendContext {
backend_event_sender: BackendEventSender,
) -> Result<UniversalActiveTask, UniversalBackendError> {
if let Some(parent) = config.destination.parent() {
- tokio::fs::create_dir_all(parent).await.map_err(|error| UniversalBackendError::Io(error.to_string()))?;
+ fs::asyn::create_dir_all(parent).await.map_err(|error| UniversalBackendError::Io(error.to_string()))?;
}
let retry_count = self.retries;
let progress_interval = Duration::from_millis(self.progress_interval_ms);
- let task_handle = self.tokio_handle.spawn(download_streaming(
+ let (pause_sender, pause_receiver) = tokio_watch_channel(false);
+ let (completion_sender, completion_receiver) = tokio_oneshot_channel();
+ let task_handle = self.runtime_handle.spawn(download_streaming(
config,
generation,
resume_artifact_path.clone(),
backend_event_sender,
retry_count,
progress_interval,
+ pause_receiver,
+ completion_sender,
));
- Ok(UniversalActiveTask::new(Box::from([task_handle]), resume_artifact_path))
+ Ok(UniversalActiveTask::new(Box::from([task_handle]), pause_sender, completion_receiver, resume_artifact_path))
}
}
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+enum DownloadStreamCompletion {
+ Completed,
+ Paused,
+}
+
async fn download_streaming(
config: Arc<DownloadConfig>,
generation: ActiveDownloadGeneration,
@@ -100,7 +111,10 @@ async fn download_streaming(
backend_event_sender: BackendEventSender,
retry_count: u16,
progress_interval: Duration,
+ pause_receiver: TokioWatchReceiver<bool>,
+ completion_sender: tokio::sync::oneshot::Sender<()>,
) {
+ let mut pause_receiver = pause_receiver;
let result = download_streaming_with_retries(
Arc::clone(&config),
generation,
@@ -108,14 +122,20 @@ async fn download_streaming(
&backend_event_sender,
retry_count,
progress_interval,
+ &mut pause_receiver,
)
.await;
- let terminal_event = match result {
- Ok(()) => BackendEvent::completed(generation),
- Err(error) => BackendEvent::error(generation, error),
- };
- let _ = backend_event_sender.send_terminal(terminal_event).await;
+ match result {
+ Ok(DownloadStreamCompletion::Completed) => {
+ let _ = backend_event_sender.send_terminal(BackendEvent::completed(generation)).await;
+ },
+ Ok(DownloadStreamCompletion::Paused) => {},
+ Err(error) => {
+ let _ = backend_event_sender.send_terminal(BackendEvent::error(generation, error)).await;
+ },
+ }
+ let _ = completion_sender.send(());
}
async fn download_streaming_with_retries(
@@ -125,7 +145,8 @@ async fn download_streaming_with_retries(
backend_event_sender: &BackendEventSender,
retry_count: u16,
progress_interval: Duration,
-) -> Result<(), String> {
+ pause_receiver: &mut TokioWatchReceiver<bool>,
+) -> Result<DownloadStreamCompletion, String> {
let mut attempt = 0_u16;
loop {
match download_once(
@@ -134,13 +155,14 @@ async fn download_streaming_with_retries(
resume_artifact_path,
backend_event_sender,
progress_interval,
+ pause_receiver,
)
.await
{
- Ok(()) => return Ok(()),
+ Ok(completion) => return Ok(completion),
Err(error) if attempt < retry_count => {
attempt = attempt.saturating_add(1);
- tokio::time::sleep(Duration::from_millis(250)).await;
+ kiban::time::sleep(Duration::from_millis(250)).await;
tracing::debug!("retrying universal download after error: {error}");
},
Err(error) => return Err(error),
@@ -154,16 +176,19 @@ async fn download_once(
resume_artifact_path: &Path,
backend_event_sender: &BackendEventSender,
progress_interval: Duration,
-) -> Result<(), String> {
+ pause_receiver: &mut TokioWatchReceiver<bool>,
+) -> Result<DownloadStreamCompletion, String> {
let client = reqwest::Client::new();
- let resume_from_bytes =
- tokio::fs::metadata(resume_artifact_path).await.ok().map(|metadata| metadata.len()).unwrap_or(0);
+ let resume_from_bytes = fs::asyn::file_length(resume_artifact_path).await.unwrap_or(0);
let mut request = client.get(&config.source_url);
if resume_from_bytes > 0 {
request = request.header(RANGE, format!("bytes={resume_from_bytes}-"));
}
- let response = request.send().await.map_err(|error| error.to_string())?;
+ let response = tokio::select! {
+ _ = wait_for_pause(pause_receiver) => return Ok(DownloadStreamCompletion::Paused),
+ response = request.send() => response.map_err(|error| error.to_string())?,
+ };
let status = response.status();
let content_range = response.headers().get(CONTENT_RANGE).cloned();
let resume_from_bytes = if resume_from_bytes > 0 {
@@ -189,11 +214,12 @@ async fn download_once(
content_range.as_ref().and_then(|header| header.to_str().ok()).and_then(parse_content_range_total);
if advertised_total == Some(resume_from_bytes) {
backend_event_sender.send_progress(generation, resume_from_bytes, Some(resume_from_bytes)).await;
- return tokio::fs::rename(resume_artifact_path, &config.destination)
+ return fs::asyn::rename(resume_artifact_path, &config.destination)
.await
+ .map(|()| DownloadStreamCompletion::Completed)
.map_err(|error| error.to_string());
}
- let _ = tokio::fs::remove_file(resume_artifact_path).await;
+ let _ = fs::asyn::remove_file(resume_artifact_path).await;
return Err(format!("server did not honor range request: status {status}"));
},
_ => return Err(format!("server did not honor range request: status {status}")),
@@ -211,37 +237,48 @@ async fn download_once(
.map(|remaining_bytes| remaining_bytes.saturating_add(resume_from_bytes))
.or(config.expected_bytes);
- let mut file = open_part_file(resume_artifact_path, resume_from_bytes).await.map_err(|error| error.to_string())?;
+ let mut file =
+ <dyn PartFile>::new(resume_artifact_path, resume_from_bytes).await.map_err(|error| error.to_string())?;
let mut downloaded_bytes = resume_from_bytes;
- let mut last_progress_emit =
- std::time::Instant::now().checked_sub(progress_interval).unwrap_or_else(std::time::Instant::now);
+ let mut last_progress_emit = Instant::now().checked_sub(progress_interval).unwrap_or_else(Instant::now);
let mut stream = response.bytes_stream();
- while let Some(chunk) = stream.next().await {
+ loop {
+ let chunk = tokio::select! {
+ _ = wait_for_pause(pause_receiver) => {
+ file.flush().await.map_err(|error| error.to_string())?;
+ backend_event_sender.send_progress(generation, downloaded_bytes, total_bytes).await;
+ return Ok(DownloadStreamCompletion::Paused);
+ },
+ chunk = stream.next() => chunk,
+ };
+
+ let Some(chunk) = chunk else {
+ break;
+ };
let chunk = chunk.map_err(|error| error.to_string())?;
file.write_all(&chunk).await.map_err(|error| error.to_string())?;
downloaded_bytes = downloaded_bytes.saturating_add(chunk.len() as u64);
if last_progress_emit.elapsed() >= progress_interval {
backend_event_sender.send_progress(generation, downloaded_bytes, total_bytes).await;
- last_progress_emit = std::time::Instant::now();
+ last_progress_emit = Instant::now();
}
}
file.flush().await.map_err(|error| error.to_string())?;
backend_event_sender.send_progress(generation, downloaded_bytes, total_bytes.or(Some(downloaded_bytes))).await;
- tokio::fs::rename(resume_artifact_path, &config.destination).await.map_err(|error| error.to_string())
+ fs::asyn::rename(resume_artifact_path, &config.destination)
+ .await
+ .map(|()| DownloadStreamCompletion::Completed)
+ .map_err(|error| error.to_string())
}
-async fn open_part_file(
- resume_artifact_path: &Path,
- resume_from_bytes: u64,
-) -> Result<TokioFile, std::io::Error> {
- if resume_from_bytes > 0 {
- TokioOpenOptions::new().create(true).append(true).open(resume_artifact_path).await
- } else {
- TokioOpenOptions::new().create(true).write(true).truncate(true).open(resume_artifact_path).await
+async fn wait_for_pause(pause_receiver: &mut TokioWatchReceiver<bool>) {
+ if *pause_receiver.borrow() {
+ return;
}
+ let _ = pause_receiver.changed().await;
}
fn parse_content_range_start(header_value: &str) -> Option<u64> {
diff --git a/crates/download-manager/src/crc_utils.rs b/crates/download-manager/src/crc_utils.rs
index 911dba474..12583efbd 100644
--- a/crates/download-manager/src/crc_utils.rs
+++ b/crates/download-manager/src/crc_utils.rs
@@ -1,15 +1,14 @@
use std::{
- fs::{self, File},
- io::{Error as IoError, Read},
+ io::{Error as IoError, ErrorKind},
path::{Path, PathBuf},
- time::UNIX_EPOCH,
};
use base64::Engine;
+use kiban::{fs, time::SystemTime};
use serde::{Deserialize, Serialize};
-const CHUNK_SIZE: usize = 8 * 1024 * 1024;
const CRC_CACHE_VERSION: u8 = 1;
+const CRC_READ_CHUNK_SIZE: u64 = 8 * 1024 * 1024;
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Hash)]
struct CrcCacheReceipt {
@@ -20,7 +19,7 @@ struct CrcCacheReceipt {
modified_nanos: u32,
}
-pub fn calculate_and_verify_crc(
+pub async fn calculate_and_verify_crc(
file_path: &Path,
expected_crc32c_base64: &str,
) -> Result<bool, IoError> {
@@ -28,22 +27,23 @@ pub fn calculate_and_verify_crc(
return Ok(false);
};
- let mut file = File::open(file_path)?;
- let mut buffer = vec![0_u8; CHUNK_SIZE];
- let mut crc = 0_u32;
-
- loop {
- let bytes_read = file.read(&mut buffer)?;
- if bytes_read == 0 {
- break;
+ let file_len = kiban::fs::asyn::file_length(file_path).await?;
+ let mut offset = 0;
+ let mut actual_crc = 0;
+ while offset < file_len {
+ let end = offset.saturating_add(CRC_READ_CHUNK_SIZE).min(file_len);
+ let chunk = kiban::fs::asyn::read_range(file_path, offset..end).await?;
+ if chunk.len() != (end - offset) as usize {
+ return Err(IoError::new(ErrorKind::UnexpectedEof, "file changed during CRC verification"));
}
- crc = crc32c::crc32c_append(crc, &buffer[..bytes_read]);
+ actual_crc = crc32c::crc32c_append(actual_crc, &chunk);
+ offset = end;
}
- Ok(crc == expected_crc)
+ Ok(actual_crc == expected_crc)
}
-pub fn crc_cache_matches(
+pub async fn crc_cache_matches(
file_path: &Path,
expected_crc32c_base64: &str,
) -> bool {
@@ -51,28 +51,28 @@ pub fn crc_cache_matches(
return false;
}
- let Ok(cache_contents) = fs::read_to_string(crc_path_for_file(file_path)) else {
+ let Ok(cache_contents) = kiban::fs::asyn::read_to_string(crc_path_for_file(file_path)).await else {
return false;
};
let Ok(cached_receipt) = serde_json::from_str::<CrcCacheReceipt>(&cache_contents) else {
return false;
};
- let Some(current_receipt) = CrcCacheReceipt::from_file(file_path, expected_crc32c_base64) else {
+ let Some(current_receipt) = CrcCacheReceipt::from_file(file_path, expected_crc32c_base64).await else {
return false;
};
cached_receipt == current_receipt
}
-pub fn save_crc_file(
+pub async fn save_crc_file(
file_path: &Path,
crc_value: &str,
) -> Result<(), IoError> {
- let Some(receipt) = CrcCacheReceipt::from_file(file_path, crc_value) else {
+ let Some(receipt) = CrcCacheReceipt::from_file(file_path, crc_value).await else {
return Ok(());
};
let receipt_json = serde_json::to_vec(&receipt).map_err(IoError::other)?;
- std::fs::write(crc_path_for_file(file_path), receipt_json)
+ fs::asyn::write(crc_path_for_file(file_path), receipt_json).await
}
pub fn crc_path_for_file(file_path: &Path) -> PathBuf {
@@ -80,20 +80,20 @@ pub fn crc_path_for_file(file_path: &Path) -> PathBuf {
}
impl CrcCacheReceipt {
- fn from_file(
+ async fn from_file(
file_path: &Path,
crc: &str,
) -> Option<Self> {
- let metadata = fs::metadata(file_path).ok()?;
- if !metadata.is_file() {
+ if !fs::asyn::is_file(file_path).await {
return None;
}
- let modified = metadata.modified().ok()?.duration_since(UNIX_EPOCH).ok()?;
+ let file_size = fs::asyn::file_length(file_path).await.ok()?;
+ let modified = fs::asyn::file_modified(file_path).await.ok()?.duration_since(SystemTime::UNIX_EPOCH).ok()?;
Some(Self {
version: CRC_CACHE_VERSION,
crc: crc.to_string(),
- file_size: metadata.len(),
+ file_size,
modified_unix_seconds: modified.as_secs(),
modified_nanos: modified.subsec_nanos(),
})
diff --git a/crates/download-manager/src/file_download_manager.rs b/crates/download-manager/src/file_download_manager.rs
index 1fdcc9c7d..db5554aa4 100644
--- a/crates/download-manager/src/file_download_manager.rs
+++ b/crates/download-manager/src/file_download_manager.rs
@@ -1,6 +1,7 @@
use std::{path::Path, sync::Arc};
-use tokio::{runtime::Handle as TokioHandle, sync::broadcast::Sender as TokioBroadcastSender};
+use kiban::rt::RuntimeHandle;
+use tokio::sync::broadcast::Sender as TokioBroadcastSender;
use tokio_stream::wrappers::BroadcastStream as TokioBroadcastStream;
#[cfg(target_vendor = "apple")]
@@ -31,7 +32,8 @@ impl Default for FileDownloadManagerType {
}
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
pub trait FileDownloadManager: Send + Sync + 'static {
fn manager_id(&self) -> &str;
fn subscribe_to_all_downloads(&self) -> TokioBroadcastStream<DownloadEvent>;
@@ -63,24 +65,24 @@ pub trait FileDownloadManager: Send + Sync + 'static {
impl dyn FileDownloadManager {
pub async fn new(
file_download_manager_type: FileDownloadManagerType,
- tokio_handle: TokioHandle,
+ runtime_handle: RuntimeHandle,
) -> Result<Box<dyn FileDownloadManager>, DownloadError> {
match file_download_manager_type {
FileDownloadManagerType::Universal => {
let manager: Box<dyn FileDownloadManager> =
- Box::new(UniversalDownloadManager::from_tokio_handle(tokio_handle)?);
+ Box::new(UniversalDownloadManager::from_runtime_handle(runtime_handle)?);
Ok(manager)
},
#[cfg(target_vendor = "apple")]
FileDownloadManagerType::Apple => {
let manager: Box<dyn FileDownloadManager> =
- Box::new(AppleDownloadManager::from_tokio_handle(tokio_handle)?);
+ Box::new(AppleDownloadManager::from_runtime_handle(runtime_handle)?);
Ok(manager)
},
}
}
- pub async fn system_default(tokio_handle: TokioHandle) -> Result<Box<dyn FileDownloadManager>, DownloadError> {
- Self::new(FileDownloadManagerType::default(), tokio_handle).await
+ pub async fn system_default(runtime_handle: RuntimeHandle) -> Result<Box<dyn FileDownloadManager>, DownloadError> {
+ Self::new(FileDownloadManagerType::default(), runtime_handle).await
}
}
diff --git a/crates/download-manager/src/file_download_task.rs b/crates/download-manager/src/file_download_task.rs
index dff86b675..b699588f9 100644
--- a/crates/download-manager/src/file_download_task.rs
+++ b/crates/download-manager/src/file_download_task.rs
@@ -5,7 +5,8 @@ use tokio_stream::wrappers::BroadcastStream as TokioBroadcastStream;
use crate::{DownloadError, DownloadEventSender, DownloadId, FileCheck, FileDownloadState};
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
pub trait FileDownloadTask: Send + Sync + Debug {
fn download_id(&self) -> DownloadId;
fn source_url(&self) -> &str;
@@ -29,7 +30,8 @@ pub trait FileDownloadTask: Send + Sync + Debug {
fn broadcast_sender(&self) -> TokioBroadcastSender<FileDownloadState>;
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
pub(crate) trait ManagedFileDownloadTask: FileDownloadTask {
async fn shutdown_for_removal(&self) -> Result<(), DownloadError>;
fn is_stopped(&self) -> bool;
diff --git a/crates/download-manager/src/file_download_task_actor/download_task_actor.rs b/crates/download-manager/src/file_download_task_actor/download_task_actor.rs
index d2c0f389a..f83822e0c 100644
--- a/crates/download-manager/src/file_download_task_actor/download_task_actor.rs
+++ b/crates/download-manager/src/file_download_task_actor/download_task_actor.rs
@@ -1,8 +1,11 @@
use std::{
+ io::ErrorKind,
path::{Path, PathBuf},
sync::Arc,
+ time::Duration,
};
+use kiban::fs;
use tokio::sync::{
Mutex as TokioMutex,
broadcast::Sender as TokioBroadcastSender,
@@ -138,7 +141,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
..
} => match active_task.pause(&self.config.destination).await {
Ok(part_path) => {
- let downloaded_bytes = B::read_resume_progress(&part_path).unwrap_or(0);
+ let downloaded_bytes = B::read_resume_progress(&part_path).await.unwrap_or(0);
self.progress_counters = ProgressCounters {
downloaded_bytes,
total_bytes: self.config.expected_bytes.unwrap_or(downloaded_bytes),
@@ -237,7 +240,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
release_destination_lease(destination_lease).await;
match pause_result {
Ok(part_path) => {
- let downloaded_bytes = B::read_resume_progress(&part_path).unwrap_or(0);
+ let downloaded_bytes = B::read_resume_progress(&part_path).await.unwrap_or(0);
self.progress_counters = ProgressCounters {
downloaded_bytes,
total_bytes: self.config.expected_bytes.unwrap_or(downloaded_bytes),
@@ -283,7 +286,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
..
} => {
let _ = active_task.cancel(&self.config.destination).await;
- remove_resume_artifact(&self.config.destination);
+ remove_resume_artifact(&self.config.destination).await;
self.progress_counters = ProgressCounters::default();
self.projection = PublicProjection::None;
release_destination_lease(destination_lease).await;
@@ -293,7 +296,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
DownloadActorState::Paused {
part_path,
} => {
- remove_file(&part_path);
+ remove_file(&part_path).await;
self.progress_counters = ProgressCounters::default();
self.projection = PublicProjection::None;
self.finish_transition(from_state, DownloadActorState::NotDownloaded);
@@ -349,7 +352,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
{
match validate_completed_file(&self.config).await {
Ok(total_bytes) => {
- remove_resume_artifact(&self.config.destination);
+ remove_resume_artifact(&self.config.destination).await;
self.progress_counters = ProgressCounters {
downloaded_bytes: total_bytes,
total_bytes,
@@ -360,9 +363,9 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
self.pending_terminal_outcome = Some(TerminalOutcome::Downloaded);
},
Err(message) => {
- remove_file(&self.config.destination);
- remove_resume_artifact(&self.config.destination);
- remove_file(&crc_path_for_file(&self.config.destination));
+ remove_file(&self.config.destination).await;
+ remove_resume_artifact(&self.config.destination).await;
+ remove_file(&crc_path_for_file(&self.config.destination)).await;
self.progress_counters = ProgressCounters::default();
self.projection = PublicProjection::StickyError(message.clone());
release_destination_lease(destination_lease).await;
@@ -398,7 +401,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
} = current_state
{
let _ = active_task.cancel(&self.config.destination).await;
- remove_resume_artifact(&self.config.destination);
+ remove_resume_artifact(&self.config.destination).await;
self.projection = PublicProjection::StickyError(message.clone());
self.progress_counters = ProgressCounters::default();
release_destination_lease(destination_lease).await;
@@ -458,14 +461,14 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
&mut self,
part_path: PathBuf,
) -> Result<(), DownloadError> {
- if !part_path.exists() {
- remove_file(&part_path);
+ if !fs::asyn::try_exists(&part_path).await.unwrap_or(false) {
+ remove_file(&part_path).await;
return self.start_fresh_download().await;
}
let lease = self.acquire_destination_lease().await?;
let generation = self.generation_counter.allocate_next();
- let resume_bytes = B::read_resume_progress(&part_path).unwrap_or(0);
+ let resume_bytes = B::read_resume_progress(&part_path).await.unwrap_or(0);
let active_task = match self
.context
.resume(Arc::clone(&self.config), generation, &part_path, self.backend_event_sender.clone(), &lease)
@@ -474,7 +477,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
Ok(active_task) => active_task,
Err(error) => {
release_destination_lease(lease).await;
- remove_file(&part_path);
+ remove_file(&part_path).await;
let message = error.to_string();
self.projection = PublicProjection::StickyError(message.clone());
self.progress_counters = ProgressCounters::default();
@@ -499,8 +502,13 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
async fn acquire_destination_lease(&mut self) -> Result<DestinationLockLease, DownloadError> {
let lock_path = lock_path_for_destination(&self.config.destination);
- match check_lock_file(&lock_path, &self.config.manager_id, self.config.manager_instance_id, std::process::id())
- .await
+ match check_lock_file(
+ &lock_path,
+ &self.config.manager_id,
+ self.config.manager_instance_id,
+ kiban::process::id(),
+ )
+ .await
{
LockFileState::OwnedByOtherApp(lock_file_info) => {
self.projection = PublicProjection::LockedByOther(lock_file_info.manager_id.clone());
@@ -524,7 +532,7 @@ impl<B: DownloadBackend> DownloadTaskActor<B> {
&lock_path,
&self.config.manager_id,
self.config.manager_instance_id,
- std::process::id(),
+ kiban::process::id(),
)
.await
{
@@ -590,13 +598,13 @@ async fn release_destination_lease(destination_lease: DestinationLockLease) {
let _ = destination_lease.release().await;
}
-fn remove_file(path: &Path) {
- let _ = std::fs::remove_file(path);
+async fn remove_file(path: &Path) {
+ let _ = fs::asyn::remove_file(path).await;
}
-fn remove_resume_artifact(destination: &Path) {
- remove_file(&destination.with_extension("part"));
- remove_file(&destination.with_extension("resume_data"));
+async fn remove_resume_artifact(destination: &Path) {
+ remove_file(&destination.with_extension("part")).await;
+ remove_file(&destination.with_extension("resume_data")).await;
}
async fn validate_completed_file(config: &DownloadConfig) -> Result<u64, String> {
@@ -606,22 +614,23 @@ async fn validate_completed_file(config: &DownloadConfig) -> Result<u64, String>
// present with the expected size (or the budget runs out) so a transient
// mismatch is not mistaken for a corrupt download. A genuinely truncated file
// has a stable size and still fails once the retries are exhausted.
- let mut metadata = config.destination.metadata().ok();
- for _attempt in 0..10 {
- let is_ready = match (&metadata, config.expected_bytes) {
- (Some(metadata), Some(expected_bytes)) => metadata.len() == expected_bytes,
- (Some(_), None) => true,
- (None, _) => false,
+ for _ in 0..10 {
+ let is_ready = match fs::asyn::file_length(config.destination.as_path()).await {
+ Ok(dst_len) => match config.expected_bytes {
+ Some(expected_bytes) => dst_len == expected_bytes,
+ None => true,
+ },
+ Err(err) if err.kind() == ErrorKind::NotFound => false,
+ Err(err) => return Err(err.to_string()),
};
if is_ready {
break;
}
- tokio::time::sleep(std::time::Duration::from_millis(50)).await;
- metadata = config.destination.metadata().ok();
+
+ kiban::time::sleep(Duration::from_millis(50)).await;
}
- let metadata = metadata.ok_or_else(|| "download completed but destination is missing".to_string())?;
- let actual_bytes = metadata.len();
+ let actual_bytes = fs::asyn::file_length(config.destination.as_path()).await.map_err(|err| err.to_string())?;
if let Some(expected_bytes) = config.expected_bytes
&& expected_bytes != actual_bytes
{
@@ -633,16 +642,12 @@ async fn validate_completed_file(config: &DownloadConfig) -> Result<u64, String>
match &config.file_check {
FileCheck::None => Ok(total_bytes),
FileCheck::CRC(expected_crc) => {
- let destination = config.destination.clone();
- let expected = expected_crc.clone();
- let crc_result = tokio::task::spawn_blocking(move || calculate_and_verify_crc(&destination, &expected))
- .await
- .map_err(|error| format!("CRC verification error: {error}"))?;
+ let crc_result = calculate_and_verify_crc(&config.destination, expected_crc).await;
match crc_result {
Ok(true) => {
let destination = config.destination.clone();
let expected = expected_crc.clone();
- let _ = tokio::task::spawn_blocking(move || save_crc_file(&destination, &expected)).await;
+ let _ = save_crc_file(&destination, &expected).await;
Ok(total_bytes)
},
Ok(false) => Err("CRC verification failed".to_string()),
diff --git a/crates/download-manager/src/file_download_task_actor/generic_file_download_task.rs b/crates/download-manager/src/file_download_task_actor/generic_file_download_task.rs
index a84c0bbbd..44b53aafb 100644
--- a/crates/download-manager/src/file_download_task_actor/generic_file_download_task.rs
+++ b/crates/download-manager/src/file_download_task_actor/generic_file_download_task.rs
@@ -8,15 +8,13 @@ use std::{
},
};
-use tokio::{
- sync::{
- Mutex as TokioMutex,
- broadcast::{Sender as TokioBroadcastSender, channel as tokio_broadcast_channel},
- mpsc::{Sender as TokioMpscSender, channel as tokio_mpsc_channel},
- oneshot::channel as tokio_oneshot_channel,
- watch::{Receiver as TokioWatchReceiver, channel as tokio_watch_channel},
- },
- task::JoinHandle as TokioJoinHandle,
+use kiban::{rt, rt::TaskJoinHandle};
+use tokio::sync::{
+ Mutex as TokioMutex,
+ broadcast::{Sender as TokioBroadcastSender, channel as tokio_broadcast_channel},
+ mpsc::{Sender as TokioMpscSender, channel as tokio_mpsc_channel},
+ oneshot::channel as tokio_oneshot_channel,
+ watch::{Receiver as TokioWatchReceiver, channel as tokio_watch_channel},
};
use tokio_stream::{StreamExt as TokioStreamExt, wrappers::BroadcastStream as TokioBroadcastStream};
@@ -40,7 +38,7 @@ pub struct GenericFileDownloadTask<B: DownloadBackend> {
public_state_receiver: TokioWatchReceiver<FileDownloadState>,
progress_sender: TokioBroadcastSender<FileDownloadState>,
terminal_receiver: TokioWatchReceiver<TerminalOutcome>,
- listener_task: Arc<TokioMutex<Option<TokioJoinHandle<()>>>>,
+ listener_task: Arc<TokioMutex<Option<Box<dyn TaskJoinHandle<()>>>>>,
is_stopped: AtomicBool,
backend: PhantomData<B>,
}
@@ -152,7 +150,7 @@ impl<B: DownloadBackend> GenericFileDownloadTask<B> {
progress_sender.clone(),
terminal_sender,
);
- tokio::spawn(actor.run());
+ rt::spawn(actor.run());
Ok(Self {
config,
@@ -206,7 +204,8 @@ impl<B: DownloadBackend> fmt::Debug for GenericFileDownloadTask<B> {
}
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
impl<B: DownloadBackend> crate::FileDownloadTask for GenericFileDownloadTask<B> {
fn download_id(&self) -> DownloadId {
self.config.download_id
@@ -269,7 +268,7 @@ impl<B: DownloadBackend> crate::FileDownloadTask for GenericFileDownloadTask<B>
let download_id = self.config.download_id;
let destination = self.config.destination.clone();
let mut local_stream = TokioBroadcastStream::new(self.progress_sender.subscribe());
- *listener_task = Some(tokio::spawn(async move {
+ *listener_task = Some(rt::spawn(async move {
let mut last_downloaded_bytes = 0u64;
while let Some(result) = local_stream.next().await {
@@ -325,8 +324,7 @@ impl<B: DownloadBackend> crate::FileDownloadTask for GenericFileDownloadTask<B>
async fn stop_listening(&self) {
if let Some(listener_task) = self.listener_task.lock().await.take() {
- listener_task.abort();
- let _ = listener_task.await;
+ listener_task.abort_and_join().await;
}
}
@@ -349,7 +347,8 @@ impl<B: DownloadBackend> crate::FileDownloadTask for GenericFileDownloadTask<B>
}
}
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
impl<B: DownloadBackend> ManagedFileDownloadTask for GenericFileDownloadTask<B> {
async fn shutdown_for_removal(&self) -> Result<(), DownloadError> {
if self.is_stopped.swap(true, Ordering::SeqCst) {
diff --git a/crates/download-manager/src/lock_manager.rs b/crates/download-manager/src/lock_manager.rs
index 88b4de036..dc1f0b52e 100644
--- a/crates/download-manager/src/lock_manager.rs
+++ b/crates/download-manager/src/lock_manager.rs
@@ -1,6 +1,13 @@
-use std::path::{Path, PathBuf};
-
-use tokio::io::AsyncWriteExt;
+use std::{
+ path::{Path, PathBuf},
+ time::Duration,
+};
+
+use kiban::{
+ fs,
+ process::{is_process_alive, proc_supported},
+ time::SystemTime,
+};
use uuid::Uuid;
use crate::{LockFileInfo, LockFileState};
@@ -51,27 +58,31 @@ pub async fn check_lock_file(
our_instance_id: Uuid,
our_process_id: u32,
) -> LockFileState {
- let bytes = match std::fs::read(lock_path) {
+ let bytes = match fs::asyn::read(lock_path).await {
Ok(bytes) => bytes,
Err(error) if error.kind() == std::io::ErrorKind::NotFound => return LockFileState::Missing,
- Err(_) => return classify_unparseable_lock(lock_path, Vec::new()),
+ Err(_) => return classify_unparseable_lock(lock_path, Vec::new()).await,
};
let lock_info = match serde_json::from_slice::<LockFileInfo>(&bytes) {
Ok(lock_info) => lock_info,
- Err(_) => return classify_unparseable_lock(lock_path, bytes),
+ Err(_) => return classify_unparseable_lock(lock_path, bytes).await,
};
if lock_info.manager_id == our_manager_id {
- if lock_info.process_id == our_process_id {
- if lock_info.instance_id == our_instance_id {
- return LockFileState::OwnedByUs(lock_info);
+ if proc_supported() {
+ if lock_info.process_id == our_process_id {
+ if lock_info.instance_id == our_instance_id {
+ return LockFileState::OwnedByUs(lock_info);
+ }
+ return LockFileState::OwnedByOtherApp(lock_info);
}
- return LockFileState::OwnedByOtherApp(lock_info);
- }
- if is_process_alive(lock_info.process_id).await {
- return LockFileState::OwnedByOtherApp(lock_info);
+ if is_process_alive(lock_info.process_id).await {
+ return LockFileState::OwnedByOtherApp(lock_info);
+ }
+ } else {
+ return classify_same_manager_lock_without_process(lock_info, our_instance_id);
}
return LockFileState::OwnedBySameAppOldProcess(lock_info);
@@ -93,17 +104,17 @@ pub async fn acquire_lock(
manager_id: &str,
instance_id: Uuid,
) -> Result<(), std::io::Error> {
- let lock_info = LockFileInfo::new(manager_id.to_string(), instance_id, std::process::id());
+ let lock_info = LockFileInfo::new(manager_id.to_string(), instance_id, kiban::process::id());
let lock_contents = serde_json::to_string_pretty(&lock_info).map_err(std::io::Error::other)?;
if let Some(parent) = lock_path.parent() {
- tokio::fs::create_dir_all(parent).await?;
+ fs::asyn::create_dir_all(parent).await?;
}
match write_new_lock_file(lock_path, lock_contents.as_bytes()).await {
Ok(()) => Ok(()),
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {
- match check_lock_file(lock_path, manager_id, instance_id, std::process::id()).await {
+ match check_lock_file(lock_path, manager_id, instance_id, kiban::process::id()).await {
LockFileState::OwnedByUs(_) => Ok(()),
LockFileState::OwnedBySameAppOldProcess(observed) | LockFileState::Stale(observed) => {
match reclaim_stale_lock(lock_path, ReclaimExpectation::Matching(observed)).await? {
@@ -142,30 +153,29 @@ async fn write_new_lock_file(
lock_path: &Path,
lock_contents: &[u8],
) -> Result<(), std::io::Error> {
- let temporary_lock_path = lock_path.with_extension(format!("lock-tmp-{}", Uuid::new_v4()));
- let temporary_result = async {
- let mut file = tokio::fs::OpenOptions::new().write(true).create_new(true).open(&temporary_lock_path).await?;
- file.write_all(lock_contents).await?;
- file.sync_all().await
+ if !proc_supported() {
+ return write_new_lock_file_direct(lock_path, lock_contents).await;
}
- .await;
+
+ let temporary_lock_path = lock_path.with_extension(format!("lock-tmp-{}", Uuid::new_v4()));
+ let temporary_result = fs::asyn::write_with_sync_all(&temporary_lock_path, &lock_contents).await;
if let Err(error) = temporary_result {
- let _ = tokio::fs::remove_file(&temporary_lock_path).await;
+ let _ = fs::asyn::remove_file(&temporary_lock_path).await;
return Err(error);
}
- match tokio::fs::hard_link(&temporary_lock_path, lock_path).await {
+ match fs::asyn::hard_link(&temporary_lock_path, lock_path).await {
Ok(()) => {
- let _ = tokio::fs::remove_file(&temporary_lock_path).await;
+ let _ = fs::asyn::remove_file(&temporary_lock_path).await;
Ok(())
},
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {
- let _ = tokio::fs::remove_file(&temporary_lock_path).await;
+ let _ = fs::asyn::remove_file(&temporary_lock_path).await;
Err(error)
},
Err(_) => {
let result = write_new_lock_file_direct(lock_path, lock_contents).await;
- let _ = tokio::fs::remove_file(&temporary_lock_path).await;
+ let _ = fs::asyn::remove_file(&temporary_lock_path).await;
result
},
}
@@ -175,14 +185,11 @@ async fn write_new_lock_file_direct(
lock_path: &Path,
lock_contents: &[u8],
) -> Result<(), std::io::Error> {
- let mut file = tokio::fs::OpenOptions::new().write(true).create_new(true).open(lock_path).await?;
- if let Err(error) = file.write_all(lock_contents).await {
- let _ = tokio::fs::remove_file(lock_path).await;
- return Err(error);
- }
- if let Err(error) = file.sync_all().await {
- let _ = tokio::fs::remove_file(lock_path).await;
- return Err(error);
+ if let Err(err) = fs::asyn::write_with_sync_all(&lock_path, &lock_contents).await {
+ if err.kind() != std::io::ErrorKind::AlreadyExists {
+ let _ = fs::asyn::remove_file(&lock_path).await;
+ }
+ return Err(err);
}
Ok(())
}
@@ -211,21 +218,21 @@ pub(crate) async fn reclaim_stale_lock(
expectation: ReclaimExpectation,
) -> Result<ReclaimOutcome, std::io::Error> {
let quarantine_path = lock_path.with_extension(format!("reclaim-{}", Uuid::new_v4()));
- match tokio::fs::rename(lock_path, &quarantine_path).await {
+ match fs::asyn::rename(lock_path, &quarantine_path).await {
Ok(()) => {},
Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(ReclaimOutcome::Missing),
Err(error) => return Err(error),
}
let confirmed = match &expectation {
ReclaimExpectation::Matching(observed) => {
- matches!(read_lock_file(&quarantine_path).ok(), Some(actual) if &actual == observed)
+ matches!(read_lock_file(&quarantine_path).await.ok(), Some(actual) if &actual == observed)
},
ReclaimExpectation::UnparseableSnapshot(snapshot) => {
- matches!(tokio::fs::read(&quarantine_path).await.ok(), Some(bytes) if &bytes == snapshot)
+ matches!(fs::asyn::read(&quarantine_path).await.ok(), Some(bytes) if &bytes == snapshot)
},
};
if confirmed {
- let _ = tokio::fs::remove_file(&quarantine_path).await;
+ let _ = fs::asyn::remove_file(&quarantine_path).await;
return Ok(ReclaimOutcome::Reclaimed);
}
let _ = try_restore_quarantine(&quarantine_path, lock_path).await?;
@@ -237,20 +244,20 @@ pub async fn release_lock_if_owned(
manager_id: &str,
instance_id: Uuid,
) -> Result<bool, std::io::Error> {
- let observed = match check_lock_file(lock_path, manager_id, instance_id, std::process::id()).await {
+ let observed = match check_lock_file(lock_path, manager_id, instance_id, kiban::process::id()).await {
LockFileState::OwnedByUs(info) => info,
_ => return Ok(false),
};
let quarantine_path = lock_path.with_extension(format!("release-{}", Uuid::new_v4()));
- match tokio::fs::rename(lock_path, &quarantine_path).await {
+ match fs::asyn::rename(lock_path, &quarantine_path).await {
Ok(()) => {},
Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(false),
Err(error) => return Err(error),
}
- let parsed = read_lock_file(&quarantine_path).ok();
+ let parsed = read_lock_file(&quarantine_path).await.ok();
let confirmed = matches!(parsed.as_ref(), Some(actual) if actual == &observed);
if confirmed {
- let _ = tokio::fs::remove_file(&quarantine_path).await;
+ let _ = fs::asyn::remove_file(&quarantine_path).await;
return Ok(true);
}
let _ = try_restore_quarantine(&quarantine_path, lock_path).await?;
@@ -263,47 +270,42 @@ pub(crate) async fn try_restore_quarantine(
) -> Result<RestoreOutcome, std::io::Error> {
// Use atomic create-or-fail (hard_link, then create_new fallback) so a fresh lock
// installed by another owner during our quarantine isn't clobbered by `rename`.
- match tokio::fs::hard_link(quarantine_path, lock_path).await {
+ match fs::asyn::hard_link(quarantine_path, lock_path).await {
Ok(()) => {
- let _ = tokio::fs::remove_file(quarantine_path).await;
+ let _ = fs::asyn::remove_file(quarantine_path).await;
return Ok(RestoreOutcome::Restored);
},
Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {
- let _ = tokio::fs::remove_file(quarantine_path).await;
+ let _ = fs::asyn::remove_file(quarantine_path).await;
return Ok(RestoreOutcome::DestinationAlreadyExists);
},
Err(_) => {},
}
- let bytes = match tokio::fs::read(quarantine_path).await {
+ let bytes = match fs::asyn::read(quarantine_path).await {
Ok(bytes) => bytes,
Err(error) => {
- let _ = tokio::fs::remove_file(quarantine_path).await;
+ let _ = fs::asyn::remove_file(quarantine_path).await;
return Err(error);
},
};
- let mut file = match tokio::fs::OpenOptions::new().write(true).create_new(true).open(lock_path).await {
- Ok(file) => file,
- Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {
- let _ = tokio::fs::remove_file(quarantine_path).await;
- return Ok(RestoreOutcome::DestinationAlreadyExists);
- },
- Err(error) => {
- let _ = tokio::fs::remove_file(quarantine_path).await;
- return Err(error);
- },
- };
- if let Err(error) = file.write_all(&bytes).await {
- let _ = tokio::fs::remove_file(lock_path).await;
- let _ = tokio::fs::remove_file(quarantine_path).await;
- return Err(error);
+
+ let lock_file_exists = matches!(fs::asyn::try_exists(lock_path).await, Ok(true));
+ if lock_file_exists {
+ let _ = fs::asyn::remove_file(quarantine_path).await;
+ return Ok(RestoreOutcome::DestinationAlreadyExists);
}
- if let Err(error) = file.sync_all().await {
- let _ = tokio::fs::remove_file(lock_path).await;
- let _ = tokio::fs::remove_file(quarantine_path).await;
- return Err(error);
+
+ if let Err(err) = fs::asyn::write_with_sync_all(&lock_path, &bytes).await {
+ let _ = fs::asyn::remove_file(quarantine_path).await;
+ if err.kind() == std::io::ErrorKind::AlreadyExists {
+ return Ok(RestoreOutcome::DestinationAlreadyExists);
+ }
+ let _ = fs::asyn::remove_file(lock_path).await;
+ return Err(err);
}
- let _ = tokio::fs::remove_file(quarantine_path).await;
+ let _ = fs::asyn::remove_file(quarantine_path).await;
+
Ok(RestoreOutcome::Restored)
}
@@ -312,7 +314,7 @@ pub async fn try_acquire_lock(
manager_id: &str,
instance_id: Uuid,
) -> Result<bool, std::io::Error> {
- if check_lock_file(lock_path, manager_id, instance_id, std::process::id()).await.is_conflict() {
+ if check_lock_file(lock_path, manager_id, instance_id, kiban::process::id()).await.is_conflict() {
return Ok(false);
}
@@ -320,16 +322,32 @@ pub async fn try_acquire_lock(
Ok(true)
}
-fn read_lock_file(lock_path: &Path) -> Result<LockFileInfo, Box<dyn std::error::Error>> {
- Ok(serde_json::from_str(&std::fs::read_to_string(lock_path)?)?)
+async fn read_lock_file(lock_path: &Path) -> Result<LockFileInfo, Box<dyn std::error::Error>> {
+ let file_content = fs::asyn::read_to_string(&lock_path).await?;
+ Ok(serde_json::from_str(&file_content)?)
+}
+
+pub(crate) fn classify_same_manager_lock_without_process(
+ lock_info: LockFileInfo,
+ our_instance_id: Uuid,
+) -> LockFileState {
+ if lock_info.instance_id == our_instance_id {
+ return LockFileState::OwnedByUs(lock_info);
+ }
+
+ if is_lock_stale(&lock_info) {
+ LockFileState::Stale(lock_info)
+ } else {
+ LockFileState::OwnedByOtherApp(lock_info)
+ }
}
-fn classify_unparseable_lock(
+async fn classify_unparseable_lock(
lock_path: &Path,
snapshot: Vec<u8>,
) -> LockFileState {
- let stale_duration = std::time::Duration::from_secs((LOCK_TIMEOUT_MINUTES * 60) as u64);
- let mtime = match std::fs::metadata(lock_path).and_then(|metadata| metadata.modified()) {
+ let stale_duration = Duration::from_secs((LOCK_TIMEOUT_MINUTES * 60) as u64);
+ let mtime = match fs::asyn::file_modified(lock_path).await {
Ok(mtime) => mtime,
Err(error) if error.kind() == std::io::ErrorKind::NotFound => return LockFileState::Missing,
Err(_) => {
@@ -341,7 +359,7 @@ fn classify_unparseable_lock(
});
},
};
- let age = std::time::SystemTime::now().duration_since(mtime).ok();
+ let age = SystemTime::now().duration_since(mtime).ok();
if matches!(age, Some(age) if age >= stale_duration) {
LockFileState::StaleUnparseable(snapshot)
} else {
@@ -357,28 +375,3 @@ fn classify_unparseable_lock(
fn is_lock_stale(lock_info: &LockFileInfo) -> bool {
chrono::Utc::now() - lock_info.acquired_at > chrono::Duration::minutes(LOCK_TIMEOUT_MINUTES)
}
-
-#[cfg(unix)]
-async fn is_process_alive(process_id: u32) -> bool {
- // SAFETY: `kill(pid, 0)` is a probe with no signal delivery. Direct syscall is required
- // because sandboxed macOS apps can't exec `/bin/kill`.
- let result = unsafe { libc::kill(process_id as libc::pid_t, 0) };
- if result == 0 {
- return true;
- }
- // EPERM = exists but we can't signal it; ESRCH = gone.
- std::io::Error::last_os_error().raw_os_error() == Some(libc::EPERM)
-}
-
-#[cfg(windows)]
-async fn is_process_alive(process_id: u32) -> bool {
- tokio::task::spawn_blocking(move || {
- std::process::Command::new("tasklist")
- .args(["/FI", &format!("PID eq {process_id}")])
- .output()
- .map(|output| String::from_utf8_lossy(&output.stdout).contains(&process_id.to_string()))
- .unwrap_or(false)
- })
- .await
- .unwrap_or(false)
-}
diff --git a/crates/download-manager/src/reducer/validation_outcome.rs b/crates/download-manager/src/reducer/validation_outcome.rs
index 6760dd45b..fba6749ab 100644
--- a/crates/download-manager/src/reducer/validation_outcome.rs
+++ b/crates/download-manager/src/reducer/validation_outcome.rs
@@ -44,16 +44,13 @@ async fn validate_crc_with_cache(
observation: &DiskObservation,
expected_crc: &str,
) -> (CheckedFileState, Vec<Action>) {
- if observation.crc_state == FileState::Exists && crc_cache_matches(&observation.destination_path, expected_crc) {
+ if observation.crc_state == FileState::Exists
+ && crc_cache_matches(&observation.destination_path, expected_crc).await
+ {
return (CheckedFileState::Valid, Vec::new());
}
- let destination = observation.destination_path.clone();
- let expected = expected_crc.to_string();
- let crc_check = tokio::task::spawn_blocking(move || calculate_and_verify_crc(&destination, &expected))
- .await
- .ok()
- .and_then(|inner| inner.ok());
+ let crc_check = calculate_and_verify_crc(&observation.destination_path, expected_crc).await.ok();
match crc_check {
Some(true) => (
diff --git a/crates/download-manager/src/traits/active_task.rs b/crates/download-manager/src/traits/active_task.rs
index 9692eba8c..c2c52e54e 100644
--- a/crates/download-manager/src/traits/active_task.rs
+++ b/crates/download-manager/src/traits/active_task.rs
@@ -2,7 +2,8 @@ use std::path::{Path, PathBuf};
use crate::traits::{CancelOutcome, DownloadBackend};
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
pub trait ActiveTask: Send + Sync + Sized {
type Backend: DownloadBackend<ActiveTask = Self>;
diff --git a/crates/download-manager/src/traits/backend_context.rs b/crates/download-manager/src/traits/backend_context.rs
index 78e002e00..dc0732f7e 100644
--- a/crates/download-manager/src/traits/backend_context.rs
+++ b/crates/download-manager/src/traits/backend_context.rs
@@ -5,7 +5,8 @@ use crate::{
traits::{ActiveDownloadGeneration, BackendEventSender, DownloadBackend, DownloadConfig},
};
-#[async_trait::async_trait]
+#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
+#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
pub trait BackendContext: Send + Sync + Sized {
type Backend: DownloadBackend<Context = Self>;
diff --git a/crates/download-manager/src/traits/download_backend.rs b/crates/download-manager/src/traits/download_backend.rs
index b8adc9d0b..35de4e90c 100644
--- a/crates/download-manager/src/traits/download_backend.rs
+++ b/crates/download-manager/src/traits/download_backend.rs
@@ -1,4 +1,6 @@
-use std::{fmt::Debug, path::Path};
+use std::{fmt::Debug, future::Future, path::Path};
+
+use kiban::{fs, maybe::MaybeSend};
use crate::traits::{ActiveTask, BackendContext};
@@ -9,7 +11,7 @@ pub trait DownloadBackend: Debug + Clone + Send + Sync + 'static {
// Default = file size (correct for `.part`-style artifacts). Apple must override:
// `.resume_data` is a small metadata blob, not the downloaded bytes.
- fn read_resume_progress(part_path: &Path) -> Option<u64> {
- std::fs::metadata(part_path).ok().map(|metadata| metadata.len())
+ fn read_resume_progress(part_path: &Path) -> impl Future<Output = Option<u64>> + MaybeSend {
+ async move { fs::asyn::file_length(part_path).await.ok() }
}
}
diff --git a/crates/download-manager/tests/unit/backends/apple/test_context.rs b/crates/download-manager/tests/unit/backends/apple/test_context.rs
index c4174956a..47ecbc516 100644
--- a/crates/download-manager/tests/unit/backends/apple/test_context.rs
+++ b/crates/download-manager/tests/unit/backends/apple/test_context.rs
@@ -1,13 +1,11 @@
use std::sync::Arc;
+use kiban::rt::RuntimeHandle;
use mock_registry::{Behavior, MockRegistry};
-use tokio::{
- runtime::Handle as TokioHandle,
- sync::{
- Mutex as TokioMutex,
- mpsc::{Receiver as TokioMpscReceiver, channel as tokio_mpsc_channel},
- watch::channel as tokio_watch_channel,
- },
+use tokio::sync::{
+ Mutex as TokioMutex,
+ mpsc::{Receiver as TokioMpscReceiver, channel as tokio_mpsc_channel},
+ watch::channel as tokio_watch_channel,
};
use uuid::Uuid;
@@ -39,7 +37,7 @@ async fn test_apple_resume_empty_resume_data_starts_fresh_download() -> Result<(
let resume_artifact_path = destination.with_extension("resume_data");
tokio::fs::write(&resume_artifact_path, b"").await?;
- let context = AppleBackendContext::new(TokioHandle::current());
+ let context = AppleBackendContext::new(RuntimeHandle::current());
let config = Arc::new(DownloadConfig {
download_id: compute_download_id(&destination),
source_url: served_file.file.url.clone(),
@@ -85,7 +83,7 @@ async fn dropping_apple_active_task_unregisters_event_sink() -> Result<(), Box<d
let temporary_directory = tempfile::tempdir()?;
let destination = temporary_directory.path().join(&served_file.file.name);
- let context = AppleBackendContext::new(TokioHandle::current());
+ let context = AppleBackendContext::new(RuntimeHandle::current());
let download_id = compute_download_id(&destination);
let config = Arc::new(DownloadConfig {
download_id,
@@ -132,7 +130,7 @@ async fn registry_distinguishes_generations_for_same_download_id() -> Result<(),
let destination = temporary_directory.path().join(&served_file.file.name);
let download_id = compute_download_id(&destination);
- let context = AppleBackendContext::new(TokioHandle::current());
+ let context = AppleBackendContext::new(RuntimeHandle::current());
let config = Arc::new(DownloadConfig {
download_id,
source_url: served_file.file.url.clone(),
@@ -151,12 +149,7 @@ async fn registry_distinguishes_generations_for_same_download_id() -> Result<(),
let (backend_event_sender_first, _backend_event_receiver_first) = backend_event_sender();
let first_task = context
- .download(
- Arc::clone(&config),
- ActiveDownloadGeneration::new(0),
- backend_event_sender_first,
- &destination_lease,
- )
+ .download(Arc::clone(&config), ActiveDownloadGeneration::new(0), backend_event_sender_first, &destination_lease)
.await?;
assert_eq!(
context.event_sink_task_identifiers_for_download(download_id).len(),
@@ -192,7 +185,7 @@ async fn claim_cancels_mismatched_task() -> Result<(), Box<dyn std::error::Error
let destination = temporary_directory.path().join(&served_file.file.name);
let download_id = compute_download_id(&destination);
- let context = AppleBackendContext::new(TokioHandle::current());
+ let context = AppleBackendContext::new(RuntimeHandle::current());
let original_config = Arc::new(DownloadConfig {
download_id,
source_url: served_file.file.url.clone(),
diff --git a/crates/download-manager/tests/unit/backends/common/test_actor_task_drop.rs b/crates/download-manager/tests/unit/backends/common/test_actor_task_drop.rs
index b5334e23a..ef2deb6a3 100644
--- a/crates/download-manager/tests/unit/backends/common/test_actor_task_drop.rs
+++ b/crates/download-manager/tests/unit/backends/common/test_actor_task_drop.rs
@@ -1,10 +1,8 @@
use std::{path::PathBuf, sync::Arc};
-use download_manager::{
- DownloadError, FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase,
-};
+use download_manager::{DownloadError, FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use rstest::rstest;
-use tokio::runtime::Handle as TokioHandle;
use crate::common::{Behavior, MockRegistry, wait_for_phase};
@@ -21,7 +19,7 @@ async fn remove_paused_task_deletes_resume_artifact(
let resume_artifact = destination.with_extension(resume_artifact_extension);
tokio::fs::write(&resume_artifact, b"partial").await?;
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await?;
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await?;
let task = manager
.file_download_task("http://example.invalid/model.bin", &destination, FileCheck::None, Some(100))
.await?;
@@ -49,7 +47,7 @@ async fn dropping_active_download_cancels_backend_before_releasing_lock(
let destination = temp_dir.path().join(&tokenizer.file.name);
let lock_path = PathBuf::from(format!("{}.lock", destination.display()));
let resume_artifact = destination.with_extension(resume_artifact_extension);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let task = manager
.file_download_task(
&tokenizer.file.url,
diff --git a/crates/download-manager/tests/unit/backends/common/test_corrupt_body.rs b/crates/download-manager/tests/unit/backends/common/test_corrupt_body.rs
index 1f08c9bbc..a036eb5ab 100644
--- a/crates/download-manager/tests/unit/backends/common/test_corrupt_body.rs
+++ b/crates/download-manager/tests/unit/backends/common/test_corrupt_body.rs
@@ -1,6 +1,6 @@
use download_manager::{FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use rstest::rstest;
-use tokio::runtime::Handle as TokioHandle;
use crate::common::{Behavior, MockRegistry, error_message, wait_for_phase};
@@ -15,7 +15,7 @@ async fn test_corrupt_body_fails_crc(
let tokenizer = registry.file("tokenizer.json")?;
let temp_dir = tempfile::tempdir().unwrap();
let destination = temp_dir.path().join(&tokenizer.file.name);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let task = manager
.file_download_task(
&tokenizer.file.url,
@@ -30,10 +30,7 @@ async fn test_corrupt_body_fails_crc(
task.download().await.unwrap();
let state = wait_for_phase(&task, &mut progress, |phase| matches!(phase, FileDownloadPhase::Error(_))).await;
let message = error_message(state);
- assert!(
- message.contains("CRC") || message.contains("checksum"),
- "unexpected error: {message}"
- );
+ assert!(message.contains("CRC") || message.contains("checksum"), "unexpected error: {message}");
Ok(())
}
@@ -42,13 +39,13 @@ async fn test_corrupt_body_fails_crc(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_corrupt_body_cancel_resets_error_state(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
let registry = MockRegistry::start_with(Behavior::CORRUPT_BODY).await?;
let tokenizer = registry.file("tokenizer.json")?;
let temporary_directory = tempfile::tempdir()?;
let destination = temporary_directory.path().join(&tokenizer.file.name);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await?;
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await?;
let task = manager
.file_download_task(
&tokenizer.file.url,
diff --git a/crates/download-manager/tests/unit/backends/common/test_lifecycle.rs b/crates/download-manager/tests/unit/backends/common/test_lifecycle.rs
index 758e2e35a..8edeff37c 100644
--- a/crates/download-manager/tests/unit/backends/common/test_lifecycle.rs
+++ b/crates/download-manager/tests/unit/backends/common/test_lifecycle.rs
@@ -1,6 +1,6 @@
use download_manager::{FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use rstest::rstest;
-use tokio::runtime::Handle as TokioHandle;
use crate::common::{MockRegistry, wait_for_phase};
@@ -9,14 +9,14 @@ use crate::common::{MockRegistry, wait_for_phase};
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_download_fresh_completes(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
let registry = MockRegistry::start().await?;
let tokenizer = registry.file("tokenizer.json")?;
let temp_dir = tempfile::tempdir().unwrap();
let destination = temp_dir.path().join(&tokenizer.file.name);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let task = manager
.file_download_task(
&tokenizer.file.url,
diff --git a/crates/download-manager/tests/unit/backends/common/test_manager_startup.rs b/crates/download-manager/tests/unit/backends/common/test_manager_startup.rs
index f28b68502..ae2c29040 100644
--- a/crates/download-manager/tests/unit/backends/common/test_manager_startup.rs
+++ b/crates/download-manager/tests/unit/backends/common/test_manager_startup.rs
@@ -1,7 +1,7 @@
use chrono::Utc;
use download_manager::{FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use tempfile::tempdir;
-use tokio::runtime::Handle as TokioHandle;
use crate::common::MockRegistry;
@@ -17,7 +17,13 @@ async fn test_manager_startup_valid_existing_file_is_downloaded() -> Result<(),
tokio::fs::write(&destination, served_file.bytes.as_ref()).await?;
tokio::fs::write(&resume_artifact, b"partial").await?;
- let task = manager_task(&served_file.file.url, &destination, FileCheck::CRC(expected_crc.clone()), Some(served_file.file.size as u64)).await?;
+ let task = manager_task(
+ &served_file.file.url,
+ &destination,
+ FileCheck::CRC(expected_crc.clone()),
+ Some(served_file.file.size as u64),
+ )
+ .await?;
assert_eq!(task.state().await.phase, FileDownloadPhase::Downloaded);
assert!(!resume_artifact.exists());
@@ -79,7 +85,13 @@ async fn test_manager_startup_revalidates_stale_metadata_crc_cache() -> Result<(
)
.await?;
- let task = manager_task(&served_file.file.url, &destination, FileCheck::CRC(expected_crc), Some(served_file.file.size as u64)).await?;
+ let task = manager_task(
+ &served_file.file.url,
+ &destination,
+ FileCheck::CRC(expected_crc),
+ Some(served_file.file.size as u64),
+ )
+ .await?;
assert_eq!(task.state().await.phase, FileDownloadPhase::NotDownloaded);
assert!(!destination.exists());
@@ -143,6 +155,6 @@ async fn manager_task(
file_check: FileCheck,
expected_bytes: Option<u64>,
) -> Result<std::sync::Arc<dyn download_manager::FileDownloadTask>, download_manager::DownloadError> {
- let manager = <dyn FileDownloadManager>::new(FileDownloadManagerType::Universal, TokioHandle::current()).await?;
+ let manager = <dyn FileDownloadManager>::new(FileDownloadManagerType::Universal, RuntimeHandle::current()).await?;
manager.file_download_task(source_url, destination, file_check, expected_bytes).await
}
diff --git a/crates/download-manager/tests/unit/backends/common/test_state_and_lock_regression.rs b/crates/download-manager/tests/unit/backends/common/test_state_and_lock_regression.rs
index 1013676be..d5d486054 100644
--- a/crates/download-manager/tests/unit/backends/common/test_state_and_lock_regression.rs
+++ b/crates/download-manager/tests/unit/backends/common/test_state_and_lock_regression.rs
@@ -1,8 +1,8 @@
use std::sync::Arc;
use download_manager::{DownloadError, FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use rstest::rstest;
-use tokio::runtime::Handle as TokioHandle;
use crate::common::{Behavior, MockRegistry, wait_for_phase};
@@ -17,9 +17,7 @@ async fn test_concurrent_task_creation_returns_same_task(
let tokenizer = registry.file("tokenizer.json")?;
let temp_dir = tempfile::tempdir().unwrap();
let destination = temp_dir.path().join(&tokenizer.file.name);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current())
- .await
- .unwrap();
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let (first, second) = tokio::join!(
manager.file_download_task(
@@ -47,13 +45,13 @@ async fn test_concurrent_task_creation_returns_same_task(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn different_urls_targeting_same_destination_are_rejected(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
let registry = MockRegistry::start().await?;
let tokenizer = registry.file("tokenizer.json")?;
let temp_dir = tempfile::tempdir().unwrap();
let destination = temp_dir.path().join(&tokenizer.file.name);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let _first = manager
.file_download_task(
@@ -82,13 +80,13 @@ async fn different_urls_targeting_same_destination_are_rejected(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn different_expected_bytes_targeting_same_destination_are_rejected(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
let registry = MockRegistry::start().await?;
let tokenizer = registry.file("tokenizer.json")?;
let temp_dir = tempfile::tempdir().unwrap();
let destination = temp_dir.path().join(&tokenizer.file.name);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let _first = manager
.file_download_task(
@@ -117,14 +115,14 @@ async fn different_expected_bytes_targeting_same_destination_are_rejected(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn separate_managers_in_same_process_cannot_share_destination_lock(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
let registry = MockRegistry::start_with(Behavior::THROTTLED).await?;
let tokenizer = registry.file("tokenizer.json")?;
let temp_dir = tempfile::tempdir().unwrap();
let destination = temp_dir.path().join(&tokenizer.file.name);
- let manager_a = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager_a = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let task_a = manager_a
.file_download_task(
&tokenizer.file.url,
@@ -138,7 +136,7 @@ async fn separate_managers_in_same_process_cannot_share_destination_lock(
task_a.download().await.unwrap();
wait_for_phase(&task_a, &mut progress_a, |phase| matches!(phase, FileDownloadPhase::Downloading)).await;
- let manager_b = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager_b = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let task_b = manager_b
.file_download_task(
&tokenizer.file.url,
diff --git a/crates/download-manager/tests/unit/backends/common/test_truncated_body.rs b/crates/download-manager/tests/unit/backends/common/test_truncated_body.rs
index 0c1f6abc2..a33df50cf 100644
--- a/crates/download-manager/tests/unit/backends/common/test_truncated_body.rs
+++ b/crates/download-manager/tests/unit/backends/common/test_truncated_body.rs
@@ -1,6 +1,6 @@
use download_manager::{FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use rstest::rstest;
-use tokio::runtime::Handle as TokioHandle;
use crate::common::{Behavior, MockRegistry, wait_for_phase};
@@ -9,21 +9,16 @@ use crate::common::{Behavior, MockRegistry, wait_for_phase};
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn truncated_body_without_crc_fails_length_check(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
let registry = MockRegistry::start_with(Behavior::TRUNCATE_BODY).await?;
let served_file = registry.file("config.json")?;
let temp_dir = tempfile::tempdir().unwrap();
let destination = temp_dir.path().join(&served_file.file.name);
- let manager = <dyn FileDownloadManager>::new(download_manager_type, TokioHandle::current()).await.unwrap();
+ let manager = <dyn FileDownloadManager>::new(download_manager_type, RuntimeHandle::current()).await.unwrap();
let task = manager
- .file_download_task(
- &served_file.file.url,
- &destination,
- FileCheck::None,
- Some(served_file.file.size as u64),
- )
+ .file_download_task(&served_file.file.url, &destination, FileCheck::None, Some(served_file.file.size as u64))
.await
.unwrap();
let mut progress = task.progress().await.unwrap();
diff --git a/crates/download-manager/tests/unit/backends/universal/test_resume.rs b/crates/download-manager/tests/unit/backends/universal/test_resume.rs
index 02a2a6033..6a47c2f51 100644
--- a/crates/download-manager/tests/unit/backends/universal/test_resume.rs
+++ b/crates/download-manager/tests/unit/backends/universal/test_resume.rs
@@ -1,6 +1,7 @@
use std::time::Duration;
use download_manager::{FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use tempfile::tempdir;
use tokio::time::timeout;
use wiremock::{
@@ -23,10 +24,14 @@ async fn test_universal_resume_restarts_when_server_ignores_range() -> Result<()
let part_path = destination.with_extension("part");
tokio::fs::write(&part_path, b"partial").await?;
- let manager =
- <dyn FileDownloadManager>::new(FileDownloadManagerType::Universal, tokio::runtime::Handle::current()).await?;
+ let manager = <dyn FileDownloadManager>::new(FileDownloadManagerType::Universal, RuntimeHandle::current()).await?;
let task = manager
- .file_download_task(&format!("{}/model.bin", server.uri()), &destination, FileCheck::None, Some(bytes.len() as u64))
+ .file_download_task(
+ &format!("{}/model.bin", server.uri()),
+ &destination,
+ FileCheck::None,
+ Some(bytes.len() as u64),
+ )
.await?;
assert_eq!(task.state().await.phase, FileDownloadPhase::Paused);
diff --git a/crates/download-manager/tests/unit/backends/universal/test_resume_content_range_validation.rs b/crates/download-manager/tests/unit/backends/universal/test_resume_content_range_validation.rs
index 76024c45e..b5de0614f 100644
--- a/crates/download-manager/tests/unit/backends/universal/test_resume_content_range_validation.rs
+++ b/crates/download-manager/tests/unit/backends/universal/test_resume_content_range_validation.rs
@@ -1,6 +1,7 @@
use std::time::Duration;
use download_manager::{FileCheck, FileDownloadManager, FileDownloadManagerType, FileDownloadPhase};
+use kiban::rt::RuntimeHandle;
use tempfile::tempdir;
use tokio::time::timeout;
use wiremock::{
@@ -9,8 +10,7 @@ use wiremock::{
};
#[tokio::test(flavor = "multi_thread")]
-async fn resume_rejects_206_when_content_range_offset_mismatches_request()
--> Result<(), Box<dyn std::error::Error>> {
+async fn resume_rejects_206_when_content_range_offset_mismatches_request() -> Result<(), Box<dyn std::error::Error>> {
let full_bytes: &[u8] = b"abcdefghij";
let partial_bytes: &[u8] = b"abcde";
let total = full_bytes.len();
@@ -31,15 +31,9 @@ async fn resume_rejects_206_when_content_range_offset_mismatches_request()
let part_path = destination.with_extension("part");
tokio::fs::write(&part_path, partial_bytes).await?;
- let manager =
- <dyn FileDownloadManager>::new(FileDownloadManagerType::Universal, tokio::runtime::Handle::current()).await?;
+ let manager = <dyn FileDownloadManager>::new(FileDownloadManagerType::Universal, RuntimeHandle::current()).await?;
let task = manager
- .file_download_task(
- &format!("{}/model.bin", server.uri()),
- &destination,
- FileCheck::None,
- Some(total as u64),
- )
+ .file_download_task(&format!("{}/model.bin", server.uri()), &destination, FileCheck::None, Some(total as u64))
.await?;
assert_eq!(task.state().await.phase, FileDownloadPhase::Paused);
diff --git a/crates/download-manager/tests/unit/test_lock_manager.rs b/crates/download-manager/tests/unit/test_lock_manager.rs
index fd0c6516f..a71d0f5ff 100644
--- a/crates/download-manager/tests/unit/test_lock_manager.rs
+++ b/crates/download-manager/tests/unit/test_lock_manager.rs
@@ -1,11 +1,12 @@
use std::path::PathBuf;
use chrono::{Duration as ChronoDuration, Utc};
-use download_manager::{LockFileInfo, acquire_lock, release_lock_if_owned};
+use download_manager::{LockFileInfo, LockFileState, acquire_lock, release_lock_if_owned};
use uuid::Uuid;
use crate::lock_manager::{
- ReclaimExpectation, ReclaimOutcome, RestoreOutcome, reclaim_stale_lock, try_restore_quarantine,
+ ReclaimExpectation, ReclaimOutcome, RestoreOutcome, classify_same_manager_lock_without_process, reclaim_stale_lock,
+ try_restore_quarantine,
};
fn lock_path(temp: &tempfile::TempDir) -> PathBuf {
@@ -106,6 +107,36 @@ async fn acquire_lock_blocks_same_manager_id_with_different_instance_id() -> Res
Ok(())
}
+#[test]
+fn same_manager_lock_without_process_blocks_different_recent_instance() {
+ let other_instance_id = Uuid::new_v4();
+ let lock_info = LockFileInfo {
+ manager_id: "manager-a".to_string(),
+ instance_id: other_instance_id,
+ acquired_at: Utc::now(),
+ process_id: 0,
+ };
+
+ let state = classify_same_manager_lock_without_process(lock_info, Uuid::new_v4());
+
+ assert!(matches!(state, LockFileState::OwnedByOtherApp(info) if info.instance_id == other_instance_id));
+}
+
+#[test]
+fn same_manager_lock_without_process_reclaims_only_after_stale() {
+ let other_instance_id = Uuid::new_v4();
+ let lock_info = LockFileInfo {
+ manager_id: "manager-a".to_string(),
+ instance_id: other_instance_id,
+ acquired_at: Utc::now() - ChronoDuration::hours(2),
+ process_id: 0,
+ };
+
+ let state = classify_same_manager_lock_without_process(lock_info, Uuid::new_v4());
+
+ assert!(matches!(state, LockFileState::Stale(info) if info.instance_id == other_instance_id));
+}
+
#[tokio::test(flavor = "multi_thread")]
async fn check_lock_file_treats_disappearing_lock_as_missing() -> Result<(), Box<dyn std::error::Error>> {
let temp = tempfile::tempdir()?;
@@ -203,8 +234,8 @@ async fn reclaim_unparseable_snapshot_succeeds_when_bytes_match() -> Result<(),
}
#[tokio::test(flavor = "multi_thread")]
-async fn try_restore_quarantine_does_not_overwrite_a_new_lock_at_destination()
--> Result<(), Box<dyn std::error::Error>> {
+async fn try_restore_quarantine_does_not_overwrite_a_new_lock_at_destination() -> Result<(), Box<dyn std::error::Error>>
+{
let temp = tempfile::tempdir()?;
let lock_target = lock_path(&temp);
let quarantine = lock_target.with_extension("reclaim-test");
diff --git a/crates/kiban/src/fs/asyn.rs b/crates/kiban/src/fs/asyn.rs
index 2df60c97f..862f74651 100644
--- a/crates/kiban/src/fs/asyn.rs
+++ b/crates/kiban/src/fs/asyn.rs
@@ -1,4 +1,4 @@
-use std::{io, path::Path};
+use std::{io, ops::Range, path::Path};
use crate::time::SystemTime;
@@ -58,6 +58,26 @@ pub async fn read(path: impl AsRef<Path>) -> Result<Vec<u8>, io::Error> {
tokio::fs::read(path.as_ref()).await
}
+pub async fn read_range(
+ path: impl AsRef<Path>,
+ range: Range<u64>,
+) -> Result<Vec<u8>, io::Error> {
+ #[cfg(target_family = "wasm")]
+ return super::asyn_opfs::file_read_range(path.as_ref().to_str().unwrap(), range).await;
+
+ #[cfg(not(target_family = "wasm"))]
+ {
+ use tokio::io::{AsyncReadExt, AsyncSeekExt, SeekFrom};
+
+ let mut file = tokio::fs::File::open(path).await?;
+ file.seek(SeekFrom::Start(range.start)).await?;
+ let buffer_len = (range.end - range.start) as usize;
+ let mut buffer = vec![0; buffer_len];
+ file.read_exact(&mut buffer).await?;
+ Ok(buffer)
+ }
+}
+
pub async fn read_to_string(path: impl AsRef<Path>) -> Result<String, io::Error> {
#[cfg(target_family = "wasm")]
{
diff --git a/crates/kiban/src/fs/asyn_opfs.rs b/crates/kiban/src/fs/asyn_opfs.rs
index 42a708ba1..4a7b4e433 100644
--- a/crates/kiban/src/fs/asyn_opfs.rs
+++ b/crates/kiban/src/fs/asyn_opfs.rs
@@ -1,6 +1,7 @@
use std::{
io,
io::ErrorKind,
+ ops::RangeBounds,
path::{Component, Path},
sync::OnceLock,
};
@@ -117,6 +118,15 @@ pub(crate) async fn file_read(path: &str) -> Result<Vec<u8>, io::Error> {
Ok(result)
}
+pub(crate) async fn file_read_range(
+ path: &str,
+ range: impl RangeBounds<u64>,
+) -> Result<Vec<u8>, io::Error> {
+ let file = get_file_handle_root(path, false).await?;
+ let result = file.read_range(range).await.map_err(|err| js_value_to_io_error(&err, ErrorKind::Other))?;
+ Ok(result)
+}
+
pub(crate) async fn file_remove(path: &str) -> Result<(), io::Error> {
let root = get_root_dir().await?;
let (parent, name) = resolve_parent(&root, path).await?;
diff --git a/crates/uzu/Cargo.toml b/crates/uzu/Cargo.toml
index 1b5b6d99e..69025af8f 100644
--- a/crates/uzu/Cargo.toml
+++ b/crates/uzu/Cargo.toml
@@ -61,6 +61,7 @@ bindings-wasm = [
bindings-types.workspace = true
bindings.workspace = true
backend-uzu.workspace = true
+kiban.workspace = true
shoji.workspace = true
anyhow.workspace = true
bitflags.workspace = true
@@ -90,7 +91,7 @@ serde_json.workspace = true
thiserror.workspace = true
futures.workspace = true
tokio = { workspace = true, features = ["full"] }
-tokio-stream.workspace = true
+tokio-stream = { workspace = true, features = ["full"] }
dirs.workspace = true
sysinfo.workspace = true
reqwest.workspace = true
diff --git a/crates/uzu/src/engine/mod.rs b/crates/uzu/src/engine/mod.rs
index 697054462..12b224f0e 100644
--- a/crates/uzu/src/engine/mod.rs
+++ b/crates/uzu/src/engine/mod.rs
@@ -21,6 +21,7 @@ pub use download_manager::DownloadManagerType;
pub use downloader::{Downloader, DownloaderStream, DownloaderStreamUpdate};
pub use error::EngineError;
use indexmap::{IndexMap, IndexSet};
+use kiban::rt::RuntimeHandle;
use nagare::{
api::Config as ClientConfig,
chat::ChatSession,
@@ -35,7 +36,6 @@ use shoji::{
session::chat::ChatConfig,
},
};
-use tokio::runtime::Handle;
use tokio_stream::{StreamExt, wrappers::BroadcastStream};
use crate::{
@@ -72,7 +72,7 @@ pub struct Engine {
impl Engine {
pub async fn new(config: EngineConfig) -> Result<Self, EngineError> {
- let tokio_handle = Handle::try_current().map_err(|error| EngineError::TokioError {
+ let runtime_handle = RuntimeHandle::try_current().map_err(|error| EngineError::TokioError {
message: error.to_string(),
})?;
@@ -113,7 +113,7 @@ impl Engine {
let storage_cache_path = storage_config.cache_path();
logs::start(storage_config.cache_path(), &storage_config.log_name(), false);
- let storage = SharedAccess::new(Storage::new(tokio_handle, storage_config).await?);
+ let storage = SharedAccess::new(Storage::new(runtime_handle, storage_config).await?);
let engine = Self {
settings: SharedAccess::new(settings),
diff --git a/crates/uzu/src/storage/mod.rs b/crates/uzu/src/storage/mod.rs
index 22dbdba1a..121686e36 100644
--- a/crates/uzu/src/storage/mod.rs
+++ b/crates/uzu/src/storage/mod.rs
@@ -14,11 +14,12 @@ pub use download_contents::DownloadContents;
use download_manager::{FileCheck, FileDownloadManager, FileDownloadPhase};
pub use error::StorageError;
use futures_util::future::join_all;
+use kiban::rt::RuntimeHandle;
use shoji::types::{
basic::File,
model::{Model, ModelAccessibility, ModelReference},
};
-use tokio::{runtime::Handle as TokioHandle, sync::broadcast::channel as tokio_broadcast_channel};
+use tokio::sync::broadcast::channel as tokio_broadcast_channel;
use crate::{
helpers::SharedAccess,
@@ -31,12 +32,12 @@ pub struct Storage {
download_manager: SharedAccess<Arc<dyn FileDownloadManager>>,
items: SharedAccess<HashMap<String, Item>>,
items_broadcast_sender: StorageDownloadEventSender,
- handle: TokioHandle,
+ handle: RuntimeHandle,
}
impl Storage {
pub async fn new(
- tokio_handle: TokioHandle,
+ runtime_handle: RuntimeHandle,
config: Config,
) -> Result<Self, StorageError> {
create_dir_all(config.cache_path()).map_err(|_| StorageError::UnableToCreateDirectory {
@@ -44,7 +45,7 @@ impl Storage {
})?;
let download_manager = SharedAccess::new(Arc::from(
- <dyn FileDownloadManager>::new(config.download_manager_type, tokio_handle.clone()).await.map_err(
+ <dyn FileDownloadManager>::new(config.download_manager_type, runtime_handle.clone()).await.map_err(
|error| StorageError::DownloadManager {
message: error.to_string(),
},
@@ -60,7 +61,7 @@ impl Storage {
download_manager,
items,
items_broadcast_sender,
- handle: tokio_handle,
+ handle: runtime_handle,
};
Ok(storage)
}
diff --git a/crates/uzu/src/storage/types/item.rs b/crates/uzu/src/storage/types/item.rs
index 9133a308f..619ee4060 100644
--- a/crates/uzu/src/storage/types/item.rs
+++ b/crates/uzu/src/storage/types/item.rs
@@ -6,14 +6,11 @@ use std::{
use download_manager::{DownloadError, FileDownloadManager, FileDownloadPhase, FileDownloadState, FileDownloadTask};
use futures_util::future::join_all;
+use kiban::rt::{RuntimeHandle, TaskJoinHandle};
use shoji::types::basic::File;
-use tokio::{
- runtime::Handle as TokioHandle,
- sync::{
- broadcast::{Sender as TokioBroadcastSender, channel as tokio_broadcast_channel},
- mpsc::channel as tokio_mpsc_channel,
- },
- task::JoinHandle as TokioJoinHandle,
+use tokio::sync::{
+ broadcast::{Sender as TokioBroadcastSender, channel as tokio_broadcast_channel},
+ mpsc::channel as tokio_mpsc_channel,
};
use tokio_stream::wrappers::BroadcastStream;
@@ -35,10 +32,10 @@ pub struct Item {
file_download_tasks: SharedAccess<Vec<Arc<dyn FileDownloadTask>>>,
file_download_states: SharedAccess<Vec<FileDownloadState>>,
- handle: TokioHandle,
+ runtime_handle: RuntimeHandle,
broadcast_sender: TokioBroadcastSender<DownloadState>,
storage_broadcast_sender: StorageDownloadEventSender,
- listener_task: SharedAccess<Option<TokioJoinHandle<()>>>,
+ listener_task: SharedAccess<Option<Box<dyn TaskJoinHandle<()>>>>,
}
impl std::fmt::Debug for Item {
@@ -60,7 +57,7 @@ impl Clone for Item {
file_download_manager: self.file_download_manager.clone(),
file_download_tasks: self.file_download_tasks.clone(),
file_download_states: self.file_download_states.clone(),
- handle: self.handle.clone(),
+ runtime_handle: self.runtime_handle.clone(),
broadcast_sender: self.broadcast_sender.clone(),
storage_broadcast_sender: self.storage_broadcast_sender.clone(),
listener_task: self.listener_task.clone(),
@@ -76,7 +73,7 @@ impl Item {
download_state: DownloadState,
file_download_manager: Arc<dyn FileDownloadManager>,
file_download_tasks: Vec<Arc<dyn FileDownloadTask>>,
- handle: TokioHandle,
+ runtime_handle: RuntimeHandle,
storage_broadcast_sender: StorageDownloadEventSender,
) -> Self {
let (broadcast_sender, _) = tokio_broadcast_channel(64);
@@ -89,7 +86,7 @@ impl Item {
file_download_manager,
file_download_tasks: SharedAccess::new(file_download_tasks),
file_download_states,
- handle,
+ runtime_handle,
broadcast_sender,
storage_broadcast_sender,
listener_task: SharedAccess::new(None),
@@ -571,7 +568,7 @@ impl Item {
let model = self.clone();
tracing::debug!("[MODEL] Spawning listener task for model: {}", self.identifier);
- let handle = self.handle.spawn(async move {
+ let handle = self.runtime_handle.spawn(async move {
tracing::debug!("[MODEL] Listener task started for model: {}", model.identifier);
use tokio_stream::StreamExt as TokioStreamExt;
@@ -582,7 +579,7 @@ impl Item {
for (idx, mut stream) in streams {
let tx = tx.clone();
- let forwarder_handle = model.handle.spawn(async move {
+ let forwarder_handle = model.runtime_handle.spawn(async move {
while let Some(item) = stream.next().await {
match item {
Ok(state) => {
@@ -654,8 +651,7 @@ impl Item {
pub async fn stop_listening(&self) {
let mut listener_guard = self.listener_task.lock().await;
if let Some(handle) = listener_guard.take() {
- handle.abort();
- let _ = handle.await;
+ handle.abort_and_join().await;
}
}
@@ -671,7 +667,7 @@ impl Item {
}
struct ListenerForwarderHandles {
- handles: Vec<TokioJoinHandle<()>>,
+ handles: Vec<Box<dyn TaskJoinHandle<()>>>,
}
impl Drop for ListenerForwarderHandles {
diff --git a/crates/uzu/tests/common/test_storage.rs b/crates/uzu/tests/common/test_storage.rs
index b8d148cb9..56a958be3 100644
--- a/crates/uzu/tests/common/test_storage.rs
+++ b/crates/uzu/tests/common/test_storage.rs
@@ -3,8 +3,8 @@
use std::path::PathBuf;
use download_manager::FileDownloadManagerType;
+use kiban::rt::RuntimeHandle;
use shoji::types::model::Model;
-use tokio::runtime::Handle as TokioHandle;
use uzu::{
device::Device,
registry::FixedRegistry,
@@ -21,14 +21,14 @@ pub struct TestStorage {
impl TestStorage {
pub async fn with_models(
- tokio_handle: TokioHandle,
+ tokio_handle: RuntimeHandle,
models: Vec<Model>,
) -> Result<Self, Box<dyn std::error::Error>> {
Self::with_models_and_manager(tokio_handle, models, FileDownloadManagerType::default()).await
}
pub async fn with_models_and_manager(
- tokio_handle: TokioHandle,
+ tokio_handle: RuntimeHandle,
models: Vec<Model>,
download_manager_type: FileDownloadManagerType,
) -> Result<Self, Box<dyn std::error::Error>> {
diff --git a/crates/uzu/tests/unit/storage/lifecycle_mock_registry_model_test.rs b/crates/uzu/tests/unit/storage/lifecycle_mock_registry_model_test.rs
index 1232d9ee1..b3f9d7fc3 100644
--- a/crates/uzu/tests/unit/storage/lifecycle_mock_registry_model_test.rs
+++ b/crates/uzu/tests/unit/storage/lifecycle_mock_registry_model_test.rs
@@ -2,9 +2,9 @@ use std::sync::Arc;
use chrono::Utc;
use download_manager::FileDownloadManagerType;
+use kiban::rt::RuntimeHandle;
use mock_registry::{Behavior, MockRegistry};
use rstest::rstest;
-use tokio::runtime::Handle as TokioHandle;
use tokio::time::{Duration, timeout};
use tokio_stream::{StreamExt, wrappers::BroadcastStream};
use uzu::{
@@ -20,7 +20,7 @@ use crate::common::{test_storage::TestStorage, tracing_setup::init_test_tracing}
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_storage_mock_registry_model_download_lifecycle(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
init_test_tracing();
tracing::info!("starting storage mock registry lifecycle test");
@@ -28,7 +28,7 @@ async fn test_storage_mock_registry_model_download_lifecycle(
let model = registry.models.first().ok_or_else(|| std::io::Error::other("mock registry must include a model"))?;
tracing::info!(model_identifier = %model.identifier, "loaded mock registry model");
let test_storage =
- TestStorage::with_models_and_manager(TokioHandle::current(), vec![model.clone()], download_manager_type)
+ TestStorage::with_models_and_manager(RuntimeHandle::current(), vec![model.clone()], download_manager_type)
.await?;
let model_identifier = model.identifier.clone();
let item = Arc::new(
@@ -64,11 +64,10 @@ async fn test_storage_mock_registry_model_download_lifecycle(
tracing::info!("resuming storage item");
item.download().await?;
- let post_resume_state =
- wait_for_item_state(&item, &mut progress, "resumed download reaches 50%", |state| {
- has_reached_fraction(state, 1, 2) || matches!(state.phase, DownloadPhase::Downloaded {})
- })
- .await;
+ let post_resume_state = wait_for_item_state(&item, &mut progress, "resumed download reaches 50%", |state| {
+ has_reached_fraction(state, 1, 2) || matches!(state.phase, DownloadPhase::Downloaded {})
+ })
+ .await;
assert!(
matches!(post_resume_state.phase, DownloadPhase::Downloading {} | DownloadPhase::Downloaded {}),
"resumed model must transition through Downloading and reach Downloaded; got {:?}",
@@ -106,20 +105,21 @@ async fn test_storage_mock_registry_model_download_lifecycle(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_storage_cancel_does_not_delete_locked_files(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
init_test_tracing();
let registry = MockRegistry::start().await?;
let model = registry.models.first().ok_or_else(|| std::io::Error::other("mock registry must include a model"))?;
let test_storage =
- TestStorage::with_models_and_manager(TokioHandle::current(), vec![model.clone()], download_manager_type)
+ TestStorage::with_models_and_manager(RuntimeHandle::current(), vec![model.clone()], download_manager_type)
.await?;
let item = test_storage
.storage
.get(&model.identifier)
.await
.ok_or_else(|| format!("model not found: {}", model.identifier))?;
- let served_file = registry.files.first().ok_or_else(|| std::io::Error::other("mock registry must include files"))?;
+ let served_file =
+ registry.files.first().ok_or_else(|| std::io::Error::other("mock registry must include files"))?;
let destination = item.cache_path.join(&served_file.file.name);
if let Some(parent) = destination.parent() {
tokio::fs::create_dir_all(parent).await?;
@@ -147,13 +147,13 @@ async fn test_storage_cancel_does_not_delete_locked_files(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_downloader_progress_stream_closes_after_pause(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
init_test_tracing();
let registry = MockRegistry::start_with(Behavior::THROTTLED).await?;
let model = registry.models.first().ok_or_else(|| std::io::Error::other("mock registry must include a model"))?;
let test_storage =
- TestStorage::with_models_and_manager(TokioHandle::current(), vec![model.clone()], download_manager_type)
+ TestStorage::with_models_and_manager(RuntimeHandle::current(), vec![model.clone()], download_manager_type)
.await?;
let downloader = Downloader::new(model.identifier.clone(), SharedAccess::new(test_storage.storage));
@@ -171,10 +171,7 @@ async fn test_downloader_progress_stream_closes_after_pause(
.await?;
downloader.pause().await?;
- timeout(Duration::from_secs(10), async {
- while progress.next().await.is_some() {}
- })
- .await?;
+ timeout(Duration::from_secs(10), async { while progress.next().await.is_some() {} }).await?;
Ok(())
}
@@ -184,13 +181,13 @@ async fn test_downloader_progress_stream_closes_after_pause(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_downloader_pause_updates_public_state(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
init_test_tracing();
let registry = MockRegistry::start_with(Behavior::THROTTLED).await?;
let model = registry.models.first().ok_or_else(|| std::io::Error::other("mock registry must include a model"))?;
let test_storage =
- TestStorage::with_models_and_manager(TokioHandle::current(), vec![model.clone()], download_manager_type)
+ TestStorage::with_models_and_manager(RuntimeHandle::current(), vec![model.clone()], download_manager_type)
.await?;
let downloader = Downloader::new(model.identifier.clone(), SharedAccess::new(test_storage.storage));
@@ -216,13 +213,13 @@ async fn test_downloader_pause_updates_public_state(
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_downloader_progress_after_resuming_paused_model_reaches_downloaded(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
init_test_tracing();
let registry = MockRegistry::start_with(Behavior::THROTTLED).await?;
let model = registry.models.first().ok_or_else(|| std::io::Error::other("mock registry must include a model"))?;
let test_storage =
- TestStorage::with_models_and_manager(TokioHandle::current(), vec![model.clone()], download_manager_type)
+ TestStorage::with_models_and_manager(RuntimeHandle::current(), vec![model.clone()], download_manager_type)
.await?;
let downloader = Downloader::new(model.identifier.clone(), SharedAccess::new(test_storage.storage));
@@ -257,13 +254,13 @@ async fn test_downloader_progress_after_resuming_paused_model_reaches_downloaded
#[cfg_attr(target_vendor = "apple", case::apple(FileDownloadManagerType::Apple))]
#[tokio::test(flavor = "multi_thread")]
async fn test_downloader_progress_for_downloaded_model_is_empty(
- #[case] download_manager_type: FileDownloadManagerType,
+ #[case] download_manager_type: FileDownloadManagerType
) -> Result<(), Box<dyn std::error::Error>> {
init_test_tracing();
let registry = MockRegistry::start().await?;
let model = registry.models.first().ok_or_else(|| std::io::Error::other("mock registry must include a model"))?;
let test_storage =
- TestStorage::with_models_and_manager(TokioHandle::current(), vec![model.clone()], download_manager_type)
+ TestStorage::with_models_and_manager(RuntimeHandle::current(), vec![model.clone()], download_manager_type)
.await?;
let downloader = Downloader::new(model.identifier.clone(), SharedAccess::new(test_storage.storage));