diff --git a/CHANGELOG.md b/CHANGELOG.md index 013a118..84e52ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Updated `dicom-rs` dependency to 0.10.0 + ## [0.3.1] - 2026-09-14 ### Added diff --git a/Cargo.lock b/Cargo.lock index 47bebdf..af6d549 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,6 +187,21 @@ dependencies = [ "equator", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.21" @@ -1038,6 +1053,16 @@ dependencies = [ "time", ] +[[package]] +name = "brotli-decompressor" +version = "5.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bs58" version = "0.5.1" @@ -1088,9 +1113,9 @@ dependencies = [ [[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 = "bytes-utils" @@ -1533,9 +1558,9 @@ dependencies = [ [[package]] name = "dicom" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6c7ae83d01a153857d93e45cee8e283e4183155504b06790304e9e441101b5" +checksum = "23ecf5e95d23500de7e76c97eb7f632d31218cb207b1ca49a7d5b1bc319f4aeb" dependencies = [ "dicom-core", "dicom-dictionary-std", @@ -1550,9 +1575,9 @@ dependencies = [ [[package]] name = "dicom-core" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f6e9f0a581bffa2630b1bd381d8114b09b3f66d1ed76ab924104ad153e0c59" +checksum = "9cc2f5e27e1395515510d3c71ad3d86f8f3c1597b23659f7df8cc933f94b92a2" dependencies = [ "chrono", "either", @@ -1560,14 +1585,14 @@ dependencies = [ "num-traits", "safe-transmute", "smallvec", - "snafu 0.8.9", + "snafu", ] [[package]] name = "dicom-dictionary-std" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057250ea38d2e716cfde2f0c211f07c53be307c98b2bc6bf0e4f330f8e506968" +checksum = "fd658dbe4102706148f924227cc5107677a9b0341c2efa2aa041b2c9c7d23d00" dependencies = [ "dicom-core", "once_cell", @@ -1575,9 +1600,9 @@ dependencies = [ [[package]] name = "dicom-dump" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20b0e3138fd3063c40f749b95c896884b0886c5461d154b7d8e1bc181ffe820" +checksum = "5e0f8ee96d49fb578eabc2057d8bb5f8bbf9113a87ab570b65a68857b944bb5f" dependencies = [ "dicom-core", "dicom-dictionary-std", @@ -1587,29 +1612,29 @@ dependencies = [ "dicom-transfer-syntax-registry", "owo-colors", "serde_json", - "snafu 0.8.9", + "snafu", "terminal_size", ] [[package]] name = "dicom-encoding" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6076f4ef3627291ab2b5beecd2fde1df7f8e0219b8d1fe4ec45a773416409f13" +checksum = "31c6ac3cbc66644aa0f4727130b34c548ac470ba8678202dbfc0be11f9169264" dependencies = [ "byteordered", "dicom-core", "dicom-dictionary-std", "encoding", "inventory", - "snafu 0.8.9", + "snafu", ] [[package]] name = "dicom-json" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc0aee5ff26ec43a9d6f8373030c733b27e6110f717d9fc98e4787dc0cbc569" +checksum = "e17a0468bd66f606d21d05773b86166302e192ab74dd2347b6895985f4b5d84e" dependencies = [ "base64 0.22.1", "dicom-core", @@ -1623,9 +1648,9 @@ dependencies = [ [[package]] name = "dicom-object" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e550fd9def08c12b64e0410e83cb491821767d62e59b74d8b960c12ebd51490" +checksum = "0504b87987f0e7624cf7ee063fe7ffdb438c66c092620817fb9bb0f130686b85" dependencies = [ "byteordered", "dicom-core", @@ -1635,29 +1660,29 @@ dependencies = [ "dicom-transfer-syntax-registry", "itertools 0.14.0", "smallvec", - "snafu 0.8.9", + "snafu", "tracing", ] [[package]] name = "dicom-parser" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73d8c380a0655e819adf06263b2144d0ac55120aa3a66f2f6848b15e3de93e8" +checksum = "6b35ad5a068e04a6e1c441982438e41d92b940a7c52998388b31197c7393a6ae" dependencies = [ "dicom-core", "dicom-dictionary-std", "dicom-encoding", "smallvec", - "snafu 0.8.9", + "snafu", "tracing", ] [[package]] name = "dicom-pixeldata" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae4400743debbc4a5433e4c581fe492b50c2e2a2adb0cbf1f1f246ef8d2037b8" +checksum = "c6362ed7417c2e431c4cb0f5bb8f45e6eefc8665f70354c8352287a64b176f3e" dependencies = [ "byteorder", "dicom-core", @@ -1668,7 +1693,7 @@ dependencies = [ "image", "num-traits", "rayon", - "snafu 0.8.9", + "snafu", "tracing", ] @@ -1726,9 +1751,9 @@ dependencies = [ [[package]] name = "dicom-transfer-syntax-registry" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b680acd7f349598f94f3291266196ed687150af5ff57691184a493e5cfce090d" +checksum = "f05c1eb0b59a2c2fdee65fc73105f8a4c346d91f7d74b5d560b1807acf802101" dependencies = [ "byteordered", "dicom-core", @@ -1743,35 +1768,36 @@ dependencies = [ [[package]] name = "dicom-ul" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ddedfa3a1d3667147dd1fa3dfef2bc496ae2951bffbf3e8504ab1e7d2db76e" +checksum = "6b8093ce06f08bd44788300d03fdf03dcfbe06418034b0de6a6a53c56b555917" dependencies = [ "byteordered", "bytes", + "cfg-if", "dicom-encoding", "dicom-transfer-syntax-registry", - "snafu 0.8.9", + "snafu", "tracing", ] [[package]] name = "dicom-web" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a9ff3f321dfdf99068826261a5cbefb07d62d943e93ae893d24ed25caf17be" +checksum = "ab9572f2669e24c7dc4ccec2a4b243ebe83248970f68dfd0f476c842f84f3d9b" dependencies = [ + "bytes", "dicom-core", "dicom-json", "dicom-object", "futures-util", - "mediatype 0.21.0", + "mediatype 0.23.0", "multipart-rs", - "rand 0.10.1", "reqwest 0.13.3", "serde", "serde_json", - "snafu 0.9.0", + "snafu", ] [[package]] @@ -1994,7 +2020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2675,7 +2701,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.1", "tokio", "tower-service", "tracing", @@ -3137,18 +3163,18 @@ dependencies = [ [[package]] name = "jxl-bitstream" -version = "0.5.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "116184a8c915e99b08c7a4abca038b05863980bbf9e433dc2883363853c99afe" +checksum = "b480e752277e29eb4054f69546887a9b84656fe78c08f54ba5850ced98a378fe" dependencies = [ "tracing", ] [[package]] name = "jxl-coding" -version = "0.5.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7ffdab0c48e989f23a8bd6113d88bd243ae45c7871e90cfdcb6997eacbfb2" +checksum = "cd972bcd125e776f1eb241ac50e39f956095a1c2770c64736c968f8946bd9a3c" dependencies = [ "jxl-bitstream", "tracing", @@ -3156,13 +3182,14 @@ dependencies = [ [[package]] name = "jxl-color" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4806c94be9e37c82e571684ad673af0a2e4049a74942c407034da6a087c4de7b" +checksum = "f316b1358c1711755b3ee8e8cb5c4a1dad12e796233088a7a513440782de80b2" dependencies = [ "jxl-bitstream", "jxl-coding", "jxl-grid", + "jxl-image", "jxl-oxide-common", "jxl-threadpool", "tracing", @@ -3170,9 +3197,9 @@ dependencies = [ [[package]] name = "jxl-frame" -version = "0.11.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1649956cb002031108e1fa44e0e483a770e2e95f4544137788c32265db0b8c71" +checksum = "2d967c6fd669c7c01060b5022d8835fa82fd46b06ffc98b549f17600a097c2b3" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -3187,31 +3214,48 @@ dependencies = [ [[package]] name = "jxl-grid" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5739f02add3d5c00320140bec6f5a80fac4baa630f88fe4c6a55a0d719718ce3" +checksum = "01671307879a033bfa52e6e8784b941aca770b3f3a7d33830b455b6844f793fb" dependencies = [ "tracing", ] [[package]] name = "jxl-image" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de3283303bb66b1742538f1a6947313596242598d6ddf325f301c2fbf01abd3" +checksum = "c5f752d62577c702a94dbbce4045caf08cb58639e8a4d56464b40ecf33ffe565" dependencies = [ "jxl-bitstream", - "jxl-color", "jxl-grid", "jxl-oxide-common", "tracing", ] +[[package]] +name = "jxl-jbr" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35d032bcec660647828527ff42c6f5776d2fd44b8357f9f6d9ac6dc07218e46" +dependencies = [ + "brotli-decompressor", + "jxl-bitstream", + "jxl-frame", + "jxl-grid", + "jxl-image", + "jxl-modular", + "jxl-oxide-common", + "jxl-threadpool", + "jxl-vardct", + "tracing", +] + [[package]] name = "jxl-modular" -version = "0.9.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3f2fd5a3346deda8169f6b26aa6c955c32bd275377b527415ef2e5f362e00ad" +checksum = "2a2f045b24c738dd91d482be385512b512721ae08a671bd4b27bf1c47f215235" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -3223,15 +3267,17 @@ dependencies = [ [[package]] name = "jxl-oxide" -version = "0.10.2" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a42a404a09f4704e60ad102eb995ac074cad467df48631c1a1269b97eef3c5" +checksum = "d36c662923f47586880211f3bc7c0d83fb3a9b410d278c7bde93450748abeef3" dependencies = [ + "brotli-decompressor", "jxl-bitstream", "jxl-color", "jxl-frame", "jxl-grid", "jxl-image", + "jxl-jbr", "jxl-oxide-common", "jxl-render", "jxl-threadpool", @@ -3240,19 +3286,20 @@ dependencies = [ [[package]] name = "jxl-oxide-common" -version = "0.1.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efb65a6ef812eae1083e5d2d1a4358bd74cf7e08d112f6e939a40003a6a9920" +checksum = "b62394c5021b3a9e7e0dbb2d639d555d019090c9946c39f6d3b09d390db4157b" dependencies = [ "jxl-bitstream", ] [[package]] name = "jxl-render" -version = "0.10.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b7162076893570cdeaced01086893df132ff8b2eaf22d63ed3b066d9b88739" +checksum = "d34386bfdb6a19b5a30cc9beb4d475d537422c31ae8c39bb69640fcce3fcaf19" dependencies = [ + "bytemuck", "jxl-bitstream", "jxl-coding", "jxl-color", @@ -3268,9 +3315,9 @@ dependencies = [ [[package]] name = "jxl-threadpool" -version = "0.1.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9c78eaf899cce165e266300f9963d8d376d4ed95cf4d12dd7066f05542cd88" +checksum = "25f15eb830aa77a7f21148d72e153562a26bfe570139bd4922eab1908dd499d3" dependencies = [ "rayon", "rayon-core", @@ -3279,9 +3326,9 @@ dependencies = [ [[package]] name = "jxl-vardct" -version = "0.9.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "737b4a65897907c644329c8a54e042cefdec2989e482698eea150d463e475fe5" +checksum = "ce72a18c6d3a47172ab6c479be2bdb56f22066b5d7092663f03b4490820b4511" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -3437,21 +3484,21 @@ dependencies = [ [[package]] name = "mediatype" -version = "0.19.20" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33746aadcb41349ec291e7f2f0a3aa6834d1d7c58066fb4b01f68efc4c4b7631" +checksum = "120fa187be19d9962f0926633453784691731018a2bf936ddb4e29101b79c4a7" [[package]] name = "mediatype" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120fa187be19d9962f0926633453784691731018a2bf936ddb4e29101b79c4a7" +checksum = "0695a693e38d35838dd34bc3ab19911395f6837ccf55c7271189cfb12cb8b57f" [[package]] name = "memchr" -version = "2.7.6" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "mime" @@ -3516,14 +3563,14 @@ dependencies = [ [[package]] name = "multipart-rs" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1653328875ea3613bd4725fc09707d7f3ae7f07a4f0f48443a0d058a17638b" +checksum = "7161f77c3118271d59b61f0f3b7e8cf0c97c6217b33b36f33b6b64a38c9e466a" dependencies = [ "bytes", "futures-core", "futures-util", - "mediatype 0.19.20", + "mediatype 0.21.0", "memchr", "uuid", ] @@ -3573,7 +3620,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4120,7 +4167,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls 0.23.34", - "socket2 0.5.10", + "socket2 0.6.1", "thiserror 2.0.17", "tokio", "tracing", @@ -4159,9 +4206,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.1", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4568,7 +4615,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4648,7 +4695,7 @@ dependencies = [ "security-framework 3.5.1", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5196,34 +5243,13 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -[[package]] -name = "snafu" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2" -dependencies = [ - "snafu-derive 0.8.9", -] - [[package]] name = "snafu" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1d4bced6a69f90b2056c03dcff2c4737f98d6fb9e0853493996e1d253ca29c6" dependencies = [ - "snafu-derive 0.9.0", -] - -[[package]] -name = "snafu-derive" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", + "snafu-derive", ] [[package]] @@ -5400,7 +5426,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5993,13 +6019,13 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.18.1" +version = "1.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" +checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.4.2", "js-sys", - "serde", + "serde_core", "wasm-bindgen", ] @@ -6255,7 +6281,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2200d43..814dc4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,9 +20,9 @@ s3 = ["dep:aws-config", "dep:aws-sdk-s3", "dep:aws-credential-types"] [dependencies] # DICOM processing -dicom = "0.9.0" -dicom-json = "0.9.0" -dicom-pixeldata = { version = "0.9.0", features = ["image"] } +dicom = "0.10.0" +dicom-json = "0.10.0" +dicom-pixeldata = { version = "0.10.0", features = ["image"] } sentry = { version = "0.45.0", features = ["tracing"] } # Serialization @@ -62,7 +62,7 @@ aws-credential-types = { version = "1.2.13", optional = true } [dev-dependencies] testcontainers = "0.27.3" dicom-test-files = "0.4.0" -dicom-web = "0.5.0" +dicom-web = "0.6.0" [lints.rust] unsafe_code = "forbid" diff --git a/src/backend/dimse/association/server.rs b/src/backend/dimse/association/server.rs index d971f4d..1460084 100644 --- a/src/backend/dimse/association/server.rs +++ b/src/backend/dimse/association/server.rs @@ -1,5 +1,6 @@ use super::{oneshot, AskPattern, Association, AssociationError, ChannelError, Command, Sender}; use dicom::transfer_syntax::TransferSyntaxRegistry; +use dicom::ul::association::Association as _; use dicom::ul::pdu::Pdu; use dicom::ul::pdu::PresentationContextNegotiated; use std::convert::identity; @@ -49,7 +50,7 @@ impl ServerAssociation { let mut association = match server_options.establish(options.tcp_stream) { Ok(mut association) => { info!( - calling_aet = association.client_ae_title(), + calling_aet = association.peer_ae_title(), called_aet = options.aet, "Established new server association" );