encapsulation of net logic in core

client/src/lib.rs

@@ -9,7 +9,7 @@ use crate::{
     net::engine::{EngineBuilder, EngineConfig},
     tun::routing::reset_platform_routing,
 };
-use netrunner_core::net::connection::connection::ConnectionRole;
+use netrunner_core::net::ConnectionRole;
 use netrunner_core::net::network::Network;
 use netrunner_logger::{error, info};
 use std::sync::{Arc, OnceLock};

client/src/main.rs

@@ -7,7 +7,7 @@ use crate::tun::{routing::reset_platform_routing, tun::Tun};
 use net::engine::{EngineBuilder, EngineConfig};
 
 // Импортируем компоненты локального прокси
-use netrunner_core::net::connection::connection::ConnectionRole;
+use netrunner_core::net::ConnectionRole;
 use netrunner_core::net::network::Network;
 use tokio_util::sync::CancellationToken;
 

client/src/net/engine.rs

@@ -1,5 +1,4 @@
-use netrunner_core::net::connection::connection::ClientHandler;
+use netrunner_core::net::ClientHandler;
-use netrunner_core::net::connection::muxer::Muxer;
 use smoltcp::iface::PollResult;
 use smoltcp::time::Instant;
 use smoltcp::wire::{IpAddress, IpCidr};

core/src/net/connection/bridge.rs

@@ -6,7 +6,7 @@ use netrunner_logger::{debug, error};
 use tokio::net::UdpSocket;
 use tokio::sync::mpsc;
 
-pub async fn run_tcp_bridge<R, W>(
+pub(crate) async fn run_tcp_bridge<R, W>(
     stream_id: u32,
     mut reader: R,
     mut writer: W,
@@ -72,7 +72,7 @@ pub async fn run_tcp_bridge<R, W>(
     muxer.remove_stream(stream_id);
 }
 
-pub async fn run_udp_bridge(
+pub(crate) async fn run_udp_bridge(
     stream_id: u32,
     socket: UdpSocket,
     muxer: Muxer,

core/src/net/connection/connection.rs

@@ -38,10 +38,10 @@ pub trait TunnelHandler {
 }
 
 pub struct Connection {
-    pub inbound: OwnedReadHalf,
+    pub(crate) inbound: OwnedReadHalf,
-    pub outbound: OwnedWriteHalf,
+    pub(crate) outbound: OwnedWriteHalf,
-    pub read_buf: BytesMut,
+    pub(crate) read_buf: BytesMut,
-    pub codec: Codec,
+    pub(crate) codec: Codec,
 }
 
 impl Connection {

core/src/net/connection/engine.rs

@@ -14,7 +14,7 @@ use crate::{
     nrxp::{codec::Codec, errors::ErrorAction, frame::FrameType},
 };
 
-pub struct TunnelEngine {
+pub(crate) struct TunnelEngine {
     pub inbound: OwnedReadHalf,
     pub outbound: OwnedWriteHalf,
     pub codec: Codec,

core/src/net/connection/handler.rs

@@ -16,17 +16,17 @@ use crate::{
     },
 };
 
-pub struct StreamHandler {
+pub(crate) struct StreamHandler {
     muxer: Muxer,
     role: ConnectionRole,
 }
 
 impl StreamHandler {
-    pub fn new(muxer: Muxer, role: ConnectionRole) -> Self {
+    pub(crate) fn new(muxer: Muxer, role: ConnectionRole) -> Self {
         Self { muxer, role }
     }
 
-    pub async fn handle(&self, frame: Frame) {
+    pub(crate) async fn handle(&self, frame: Frame) {
         let stream_id = frame.header.stream_id;
 
         match frame.header.frame_type {

core/src/net/connection/mod.rs

@@ -1,5 +1,7 @@
-mod bridge;
+mod bridge; // Все модули делаем приватными
-pub mod connection;
+mod connection;
-pub mod engine;
+mod engine;
-pub mod handler;
+mod handler;
-pub mod muxer;
+mod muxer;
+
+pub use connection::{ClientHandler, Connection, ConnectionRole, ServerHandler, TunnelHandler};

core/src/net/connection/muxer.rs

@@ -6,7 +6,7 @@ use tokio::sync::mpsc::{error::SendError, Sender};
 
 use crate::nrxp::frame::FrameType;
 
-pub struct IdGenerator {
+struct IdGenerator {
     counter: AtomicU32,
 }
 

core/src/net/mod.rs

@@ -1,2 +1,4 @@
-pub mod connection;
+mod connection;
 pub mod network;
+
+pub use connection::{ClientHandler, ConnectionRole, ServerHandler, TunnelHandler};

core/src/net/network.rs

@@ -1,9 +1,7 @@
 use std::sync::OnceLock;
 
 use crate::{
-    net::connection::connection::{
+    net::connection::{ClientHandler, Connection, ConnectionRole, ServerHandler, TunnelHandler},
-        ClientHandler, Connection, ConnectionRole, ServerHandler, TunnelHandler,
-    },
     nrxp::frame::{FRAME_HEADER_SIZE, MAX_PADDING_SIZE},
 };
 use netrunner_logger::{error, info};

server/src/main.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use netrunner_core::net::{connection::connection::ConnectionRole, network::Network};
+use netrunner_core::net::{network::Network, ConnectionRole};
 use netrunner_logger::Logger;
 use tokio_util::sync::CancellationToken;
 #[derive(Parser, Debug)]