ENH: Add POC async implementation, example using storescp

.github/workflows/rust.yml

@@ -33,6 +33,7 @@ jobs:
       - run: cargo test -p dicom-pixeldata --features gdcm
       # test dicom-pixeldata without default features
       - run: cargo test -p dicom-pixeldata --no-default-features
+      - run: cargo test -p dicom-ul --features async
       # run Clippy with stable toolchain
       - if: matrix.rust == 'stable'
         run: cargo clippy
@@ -60,4 +61,4 @@ jobs:
           toolchain: stable
           cache: true
       - run: cargo check
-
+

scpproxy/src/main.rs

@@ -1,7 +1,7 @@
 use clap::{crate_version, value_parser, Arg, ArgAction, Command};
-use dicom_ul::pdu::reader::read_pdu;
 use dicom_ul::pdu::writer::write_pdu;
 use dicom_ul::pdu::Pdu;
+use dicom_ul::association::client::get_client_pdu;
 use snafu::{Backtrace, OptionExt, Report, ResultExt, Snafu, Whatever};
 use std::io::Write;
 use std::net::{Shutdown, TcpListener, TcpStream};
@@ -63,11 +63,11 @@ pub enum ThreadMessage {
     },
     ReadErr {
         from: ProviderType,
-        err: dicom_ul::pdu::reader::Error,
+        err: dicom_ul::association::client::Error,
     },
     WriteErr {
         from: ProviderType,
-        err: dicom_ul::pdu::writer::Error,
+        err: dicom_ul::pdu::WriteError,
     },
     Shutdown {
         initiator: ProviderType,
@@ -96,7 +96,7 @@ fn run(
                 let message_tx = message_tx.clone();
                 scu_reader_thread = thread::spawn(move || {
                     loop {
-                        match read_pdu(&mut reader, max_pdu_length, strict) {
+                        match get_client_pdu(&mut reader, max_pdu_length, strict) {
                             Ok(pdu) => {
                                 message_tx
                                     .send(ThreadMessage::SendPdu {
@@ -105,7 +105,7 @@ fn run(
                                     })
                                     .context(SendMessageSnafu)?;
                             }
-                            Err(dicom_ul::pdu::reader::Error::NoPduAvailable { .. }) => {
+                            Err(dicom_ul::association::client::Error::ReceiveResponse{ .. }) => {
                                 message_tx
                                     .send(ThreadMessage::Shutdown {
                                         initiator: ProviderType::Scu,
@@ -133,7 +133,7 @@ fn run(
                 let mut reader = scp_stream.try_clone().context(CloneSocketSnafu)?;
                 scp_reader_thread = thread::spawn(move || {
                     loop {
-                        match read_pdu(&mut reader, max_pdu_length, strict) {
+                        match get_client_pdu(&mut reader, max_pdu_length, strict) {
                             Ok(pdu) => {
                                 message_tx
                                     .send(ThreadMessage::SendPdu {
@@ -142,7 +142,7 @@ fn run(
                                     })
                                     .context(SendMessageSnafu)?;
                             }
-                            Err(dicom_ul::pdu::reader::Error::NoPduAvailable { .. }) => {
+                            Err(dicom_ul::association::client::Error::ReceiveResponse{ .. }) => {
                                 message_tx
                                     .send(ThreadMessage::Shutdown {
                                         initiator: ProviderType::Scp,

storescp/Cargo.toml

@@ -13,11 +13,13 @@ readme = "README.md"
 [dependencies]
 clap = { version = "4.0.18", features = ["derive"] }
 dicom-core = { path = '../core', version = "0.7.0" }
-dicom-ul = { path = '../ul', version = "0.7.1" }
+dicom-ul = { path = '../ul', version = "0.7.1", features = ["async"] }
 dicom-object = { path = '../object', version = "0.7.1" }
 dicom-encoding = { path = "../encoding/", version = "0.7.1" }
 dicom-dictionary-std = { path = "../dictionary-std/", version = "0.7.0" }
 dicom-transfer-syntax-registry = { path = "../transfer-syntax-registry/", version = "0.7.1" }
 snafu = "0.8"
 tracing = "0.1.36"
 tracing-subscriber = "0.3.15"
+tokio = { version = "1.38.0", features = ["full"] }
+