YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ws protocol: remove glob exports; adjust dependent crates

Browse source
This commit is contained in:
Joakim Frostegård 2024-01-08 20:16:46 +01:00
parent 27ecccd984
commit 0dae7fd533
10 changed files with 46 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ws/src/common.rs
View file

@ -3,7 +3,7 @@ use std::{net::IpAddr, sync::Arc};
use aquatic_common::access_list::AccessListArcSwap;
pub use aquatic_common::ValidUntil;
use aquatic_ws_protocol::{InfoHash, PeerId};
use aquatic_ws_protocol::common::{InfoHash, PeerId};
#[derive(Copy, Clone, Debug)]
pub enum IpVersion {

8
crates/ws/src/workers/socket/connection.rs
View file

@ -9,7 +9,13 @@ use anyhow::Context;
use aquatic_common::access_list::{create_access_list_cache, AccessListArcSwap, AccessListCache};
use aquatic_common::rustls_config::RustlsConfig;
use aquatic_common::ServerStartInstant;
use aquatic_ws_protocol::*;
use aquatic_ws_protocol::common::{InfoHash, PeerId, ScrapeAction};
use aquatic_ws_protocol::incoming::{
AnnounceEvent, AnnounceRequest, InMessage, ScrapeRequest, ScrapeRequestInfoHashes,
};
use aquatic_ws_protocol::outgoing::{
ErrorResponse, ErrorResponseAction, OutMessage, ScrapeResponse, ScrapeStatistics,
};
use arc_swap::ArcSwap;
use async_tungstenite::WebSocketStream;
use futures::stream::{SplitSink, SplitStream};

4
crates/ws/src/workers/socket/mod.rs
View file

@ -8,7 +8,9 @@ use anyhow::Context;
use aquatic_common::privileges::PrivilegeDropper;
use aquatic_common::rustls_config::RustlsConfig;
use aquatic_common::{PanicSentinel, ServerStartInstant};
use aquatic_ws_protocol::*;
use aquatic_ws_protocol::common::InfoHash;
use aquatic_ws_protocol::incoming::InMessage;
use aquatic_ws_protocol::outgoing::OutMessage;
use arc_swap::ArcSwap;
use futures::StreamExt;
use glommio::channels::channel_mesh::{MeshBuilder, Partial, Role};

3
crates/ws/src/workers/swarm/mod.rs
View file

@ -4,6 +4,8 @@ use std::cell::RefCell;
use std::rc::Rc;
use std::time::Duration;
use aquatic_ws_protocol::incoming::InMessage;
use aquatic_ws_protocol::outgoing::OutMessage;
use futures::StreamExt;
use glommio::channels::channel_mesh::{MeshBuilder, Partial, Role, Senders};
use glommio::enclose;
@ -12,7 +14,6 @@ use glommio::timer::TimerActionRepeat;
use rand::{rngs::SmallRng, SeedableRng};
use aquatic_common::{PanicSentinel, ServerStartInstant};
use aquatic_ws_protocol::*;
use crate::common::*;
use crate::config::Config;

7
crates/ws/src/workers/swarm/storage.rs
View file

@ -1,6 +1,11 @@
use std::sync::Arc;
use aquatic_common::access_list::{create_access_list_cache, AccessListArcSwap, AccessListCache};
use aquatic_ws_protocol::incoming::{AnnounceEvent, AnnounceRequest, ScrapeRequest};
use aquatic_ws_protocol::outgoing::{
AnnounceResponse, AnswerOutMessage, ErrorResponse, ErrorResponseAction, OfferOutMessage,
OutMessage, ScrapeResponse, ScrapeStatistics,
};
use hashbrown::HashMap;
use metrics::Gauge;
use rand::rngs::SmallRng;
@ -8,7 +13,7 @@ use rand::rngs::SmallRng;
use aquatic_common::{
extract_response_peers, IndexMap, SecondsSinceServerStart, ServerStartInstant,
};
use aquatic_ws_protocol::*;
use aquatic_ws_protocol::common::*;
use crate::common::*;
use crate::config::Config;