feat(server)!: convert server.rs internals + on_disconnected to ServerError

crates/ironrdp-server/Cargo.toml

@@ -39,8 +39,9 @@ tokio-rustls = "0.26" # public
 async-trait = "0.1"
 ironrdp-async = { path = "../ironrdp-async", version = "0.9" }
 ironrdp-ainput = { path = "../ironrdp-ainput", version = "0.7" }
-ironrdp-core = { path = "../ironrdp-core", version = "0.2" }
+ironrdp-core = { path = "../ironrdp-core", version = "0.2" } # public
 ironrdp-egfx = { path = "../ironrdp-egfx", version = "0.2", optional = true }
+ironrdp-error = { path = "../ironrdp-error", version = "0.2", features = ["std"] } # public
 ironrdp-nscodec = { path = "../ironrdp-nscodec", version = "0.1", optional = true, features = ["encoder"] }
 ironrdp-pdu = { path = "../ironrdp-pdu", version = "0.8" } # public
 ironrdp-svc = { path = "../ironrdp-svc", version = "0.7" } # public

crates/ironrdp-server/src/echo.rs

@@ -3,13 +3,13 @@ use std::collections::{BTreeMap, VecDeque};
 use std::sync::{Arc, Mutex, MutexGuard};
 use std::time::Instant;
 
-use anyhow::{Context as _, Result, bail};
 use ironrdp_core::impl_as_any;
 use ironrdp_dvc::{DvcMessage, DvcProcessor, DvcServerProcessor};
 use ironrdp_echo::server::EchoServer;
 use ironrdp_pdu::PduResult;
 use tokio::sync::mpsc;
 
+use crate::error::{ServerError, ServerErrorExt as _, ServerResult};
 use crate::server::ServerEvent;
 
 #[derive(Debug, Clone)]
@@ -55,14 +55,14 @@ impl EchoServerHandle {
     /// Sends a runtime ECHO request.
     ///
     /// The payload must be at least one byte, as required by MS-RDPEECO section 3.1.5.1.
-    pub fn send_request(&self, payload: Vec<u8>) -> Result<()> {
+    pub fn send_request(&self, payload: Vec<u8>) -> ServerResult<()> {
         if payload.is_empty() {
-            bail!("echoRequest payload must be at least one byte");
+            return Err(ServerError::reason("echo request", "payload must be at least one byte"));
         }
 
         self.sender
             .send(ServerEvent::Echo(EchoServerMessage::SendRequest { payload }))
-            .map_err(|_error| anyhow::anyhow!("send ECHO request event"))
+            .map_err(|_error| ServerError::channel("send ECHO request event"))
     }
 
     /// Drains collected RTT measurements.
@@ -151,6 +151,6 @@ impl DvcProcessor for EchoDvcBridge {
 
 impl DvcServerProcessor for EchoDvcBridge {}
 
-pub(crate) fn build_echo_request(payload: Vec<u8>) -> Result<DvcMessage> {
-    EchoServer::request_message(payload).context("build ECHO request message")
+pub(crate) fn build_echo_request(payload: Vec<u8>) -> ServerResult<DvcMessage> {
+    EchoServer::request_message(payload).map_err(|e| ServerError::custom("build ECHO request message", e))
 }