forked from
me.webbeef.org/browser.html
Rewild Your Web
p2p: get rid of useless PeerStatus
+34
-26
+6
-2
crates/beaver_p2p/src/state.rs
+6
-2
crates/beaver_p2p/src/state.rs
···
14
14
15
15
pub(crate) type SharedState = Arc<Mutex<State>>;
16
16
17
-
#[derive(Clone, Debug, PartialEq)]
17
+
/// The status of a remote peer.
18
+
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
18
19
pub enum EndpointStatus {
20
+
/// Discovered but not paired.
21
+
Discovered,
22
+
/// Paired and currently connected.
19
23
PairedConnected,
24
+
/// Paired but currently disconnected.
20
25
PairedDisconnected,
21
-
Discovered,
22
26
}
23
27
24
28
#[derive(Debug)]
+5
-5
patches/components/constellation/pairing.rs.patch
+5
-5
patches/components/constellation/pairing.rs.patch
···
13
13
+use std::path::PathBuf;
14
14
+use std::sync::Arc;
15
15
+
16
-
+use beaver_p2p::{EndpointStatus, PairingManager, PeerEvent};
16
+
+use beaver_p2p::{PairingManager, PeerEvent};
17
17
+use iroh::EndpointId;
18
18
+use iroh::address_lookup::DiscoveryEvent;
19
19
+use log::{debug, error, info, warn};
20
20
+use serde::{Deserialize, Serialize};
21
21
+use servo_base::generic_channel::GenericCallback;
22
-
+use servo_constellation_traits::{LocalPeerInfo, PairingEvent, PeerInfo, PeerStatus};
22
+
+use servo_constellation_traits::{EndpointStatus, LocalPeerInfo, PairingEvent, PeerInfo};
23
23
+use tokio::sync::Mutex;
24
24
+
25
25
+/// Typed messages exchanged between paired P2P endpoints.
···
220
220
+ id: ep.id.to_string(),
221
221
+ name: ep.name,
222
222
+ status: match ep.status {
223
-
+ EndpointStatus::Discovered => PeerStatus::Discovered,
224
-
+ EndpointStatus::PairedConnected => PeerStatus::PairedConnected,
223
+
+ EndpointStatus::Discovered => EndpointStatus::Discovered,
224
+
+ EndpointStatus::PairedConnected => EndpointStatus::PairedConnected,
225
225
+ EndpointStatus::PairedDisconnected => {
226
-
+ PeerStatus::PairedDisconnected
226
+
+ EndpointStatus::PairedDisconnected
227
227
+ },
228
228
+ },
229
229
+ })
+4
-4
patches/components/script/dom/pairing.rs.patch
+4
-4
patches/components/script/dom/pairing.rs.patch
···
8
8
+use dom_struct::dom_struct;
9
9
+use script_bindings::error::Error;
10
10
+use servo_constellation_traits::{
11
-
+ LocalPeerInfo, PairingEvent, PeerInfo, PeerStatus, ScriptToConstellationMessage,
11
+
+ EndpointStatus, LocalPeerInfo, PairingEvent, PeerInfo, ScriptToConstellationMessage,
12
12
+};
13
13
+use stylo_atoms::Atom;
14
14
+
···
283
283
+ .into_iter()
284
284
+ .map(|info| {
285
285
+ let status = match info.status {
286
-
+ PeerStatus::Discovered => "discovered",
287
-
+ PeerStatus::PairedConnected => "paired-connected",
288
-
+ PeerStatus::PairedDisconnected => "paired-disconnected",
286
+
+ EndpointStatus::Discovered => "discovered",
287
+
+ EndpointStatus::PairedConnected => "paired-connected",
288
+
+ EndpointStatus::PairedDisconnected => "paired-disconnected",
289
289
+ };
290
290
+ Peer::new_with_status(
291
291
+ &global,