dash map in muxer

core/src/proxy/connection/bridge.rs

@@ -5,6 +5,7 @@ use bytes::{Bytes, BytesMut};
 use netrunner_logger::{debug, error};
 use tokio::net::UdpSocket;
 use tokio::sync::mpsc;
+
 pub async fn run_proxy_bridge<R, W>(
     stream_id: u32,
     mut reader: R,
@@ -58,6 +59,7 @@ pub async fn run_proxy_bridge<R, W>(
         }
     }
 
+    // Отправляем Close фрейм перед выходом
     let _ = muxer
         .send_to_netwrok(MuxMessage {
             stream_id,
@@ -65,8 +67,12 @@ pub async fn run_proxy_bridge<R, W>(
             data: Bytes::new(),
         })
         .await;
+
+    // Небольшая пауза, чтобы Close фрейм успел уйти в сеть
     tokio::time::sleep(std::time::Duration::from_millis(500)).await;
-    muxer.remove_stream(stream_id).await;
+
+    // ИЗМЕНЕНИЕ: remove_stream теперь синхронный
+    muxer.remove_stream(stream_id);
 }
 
 pub async fn run_udp_bridge(
@@ -79,7 +85,6 @@ pub async fn run_udp_bridge(
 
     loop {
         tokio::select! {
-
             res = socket.recv(&mut buf) => {
                 match res {
                     Ok(0) => break,
@@ -98,7 +103,6 @@ pub async fn run_udp_bridge(
                 }
             }
 
-
             maybe_data = v_rx.recv() => {
                 match maybe_data {
                     Some(data) => {
@@ -124,6 +128,9 @@ pub async fn run_udp_bridge(
             data: Bytes::new(),
         })
         .await;
+
     tokio::time::sleep(std::time::Duration::from_millis(500)).await;
-    muxer.remove_stream(stream_id).await;
+
+    // ИЗМЕНЕНИЕ: remove_stream теперь синхронный
+    muxer.remove_stream(stream_id);
 }

core/src/proxy/connection/connection.rs

@@ -206,7 +206,7 @@ impl TunnelHandler for ClientHandler {
             } => {
                 let stream_id = self.muxer.next_id();
                 let (v_tx, mut v_rx) = mpsc::channel::<bytes::Bytes>(1024);
-                self.muxer.register_stream(stream_id, v_tx).await;
+                self.muxer.register_stream(stream_id, v_tx);
 
                 self.muxer
                     .send_to_netwrok(MuxMessage {

core/src/proxy/connection/handler.rs

@@ -42,7 +42,7 @@ impl StreamHandler {
             let muxer = self.muxer.clone();
 
             let (v_tx, v_rx) = tokio::sync::mpsc::channel(512);
-            muxer.register_stream(stream_id, v_tx).await;
+            muxer.register_stream(stream_id, v_tx);
 
             tokio::spawn(async move {
                 let start = std::time::Instant::now();
@@ -96,7 +96,7 @@ impl StreamHandler {
             let muxer = self.muxer.clone();
 
             let (v_tx, v_rx) = tokio::sync::mpsc::channel(512);
-            muxer.register_stream(stream_id, v_tx).await;
+            muxer.register_stream(stream_id, v_tx);
 
             tokio::spawn(async move {
                 info!(stream_id, target = %target_str, "Attempting remote UDP connection");
@@ -142,7 +142,7 @@ impl StreamHandler {
     }
 
     async fn send_error_reply(muxer: &Muxer, stream_id: u32, code: u8, frame_type: FrameType) {
-        muxer.remove_stream(stream_id).await;
+        muxer.remove_stream(stream_id);
         let mut reply_buf = BytesMut::with_capacity(10);
         let reply = SocksReply::ConnectResult {
             reply_code: code,
@@ -162,6 +162,6 @@ impl StreamHandler {
 
     async fn on_close(&self, stream_id: u32) {
         self.muxer.dispatch_to_local(stream_id, Bytes::new()).await;
-        self.muxer.remove_stream(stream_id).await;
+        self.muxer.remove_stream(stream_id);
     }
 }

core/src/proxy/connection/muxer.rs

@@ -1,11 +1,10 @@
 use crate::protocol::codec::frame::FrameType;
 use bytes::Bytes;
-use std::collections::HashMap;
+use dashmap::DashMap; // Добавь в Cargo.toml: dashmap = "6.0"
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
 use tokio::sync::mpsc::error::SendError;
 use tokio::sync::mpsc::Sender;
-use tokio::sync::RwLock;
 
 pub struct IdGenerator {
     counter: AtomicU32,
@@ -33,7 +32,7 @@ pub struct MuxMessage {
 #[derive(Clone)]
 pub struct Muxer {
     to_network: Sender<MuxMessage>,
-    streams: Arc<RwLock<HashMap<u32, Sender<Bytes>>>>,
+    streams: Arc<DashMap<u32, Sender<Bytes>>>,
     id_gen: Arc<IdGenerator>,
 }
 
@@ -41,7 +40,7 @@ impl Muxer {
     pub fn new(to_network: Sender<MuxMessage>, is_client: bool) -> Self {
         Self {
             to_network,
-            streams: Arc::new(RwLock::new(HashMap::new())),
+            streams: Arc::new(DashMap::new()),
             id_gen: Arc::new(IdGenerator::new(is_client)),
         }
     }
@@ -54,19 +53,17 @@ impl Muxer {
         self.to_network.send(message).await
     }
 
-    pub async fn register_stream(&self, stream_id: u32, tx: Sender<Bytes>) {
-        let mut lock = self.streams.write().await;
-        lock.insert(stream_id, tx);
+    pub fn register_stream(&self, stream_id: u32, tx: Sender<Bytes>) {
+        self.streams.insert(stream_id, tx);
         netrunner_logger::debug!(
             stream_id,
-            total_active = lock.len(),
+            total_active = self.streams.len(),
             "MUXER: [REGISTER] Stream added"
         );
     }
 
-    pub async fn remove_stream(&self, stream_id: u32) {
-        let mut lock = self.streams.write().await;
-        lock.remove(&stream_id);
+    pub fn remove_stream(&self, stream_id: u32) {
+        self.streams.remove(&stream_id);
     }
 
     pub async fn send_control(
@@ -86,10 +83,8 @@ impl Muxer {
     }
 
     pub async fn dispatch_to_local(&self, stream_id: u32, data: Bytes) {
-        let tx = {
-            let lock = self.streams.read().await;
-            lock.get(&stream_id).cloned()
-        };
+        // DashMap позволяет получить доступ к элементу без явного RwLock
+        let tx = self.streams.get(&stream_id).map(|r| r.value().clone());
 
         if let Some(tx) = tx {
             if data.is_empty() {
@@ -107,7 +102,7 @@ impl Muxer {
                     stream_id,
                     "MUXER: [WARN] Local channel closed, dropping packet"
                 );
-                self.remove_stream(stream_id).await;
+                self.remove_stream(stream_id);
             }
         } else {
             netrunner_logger::trace!(