notedeck

commit 4fd62d94029b12e9f7610b4100c10a347a4067c5
parent 80fc623bed756c99624a76d49057979a2100add2
Author: kernelkind <kernelkind@gmail.com>
Date:   Sun,  1 Feb 2026 20:41:07 -0500

refactor(websocket): rename `Relay` -> `WebsocketConn`

Signed-off-by: kernelkind <kernelkind@gmail.com>

Diffstat:
M
crates/enostr/src/lib.rs
 | 
2
+-
M
crates/enostr/src/relay/mod.rs
 | 
2
+-
M
crates/enostr/src/relay/pool.rs
 | 
10
+++++-----
M
crates/enostr/src/relay/websocket.rs
 | 
12
++++++------

4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/crates/enostr/src/lib.rs b/crates/enostr/src/lib.rs
@@ -21,6 +21,6 @@ pub use pubkey::{Pubkey, PubkeyRef};
 pub use relay::message::{RelayEvent, RelayMessage};
 pub use relay::pool::{PoolEvent, PoolEventBuf, PoolRelay, RelayPool};
 pub use relay::subs_debug::{OwnedRelayEvent, RelayLogEvent, SubsDebug, TransferStats};
-pub use relay::{Relay, RelayStatus};
+pub use relay::{RelayStatus, WebsocketConn};
 
 pub type Result<T> = std::result::Result<T, error::Error>;
diff --git a/crates/enostr/src/relay/mod.rs b/crates/enostr/src/relay/mod.rs
@@ -4,7 +4,7 @@ pub mod pool;
 pub mod subs_debug;
 mod websocket;
 
-pub use websocket::Relay;
+pub use websocket::WebsocketConn;
 
 #[derive(Debug, Copy, Clone)]
 pub enum RelayStatus {
diff --git a/crates/enostr/src/relay/pool.rs b/crates/enostr/src/relay/pool.rs
@@ -1,5 +1,5 @@
 use crate::relay::multicast::{setup_multicast_relay, MulticastRelay};
-use crate::relay::{Relay, RelayStatus};
+use crate::relay::{RelayStatus, WebsocketConn};
 use crate::{ClientMessage, Error, Result};
 use nostrdb::Filter;
 
@@ -39,7 +39,7 @@ pub enum PoolRelay {
 }
 
 pub struct WebsocketRelay {
-    pub relay: Relay,
+    pub relay: WebsocketConn,
     pub last_ping: Instant,
     pub last_connect_attempt: Instant,
     pub retry_connect_after: Duration,
@@ -97,7 +97,7 @@ impl PoolRelay {
         self.send(&ClientMessage::req(subid, filter))
     }
 
-    pub fn websocket(relay: Relay) -> Self {
+    pub fn websocket(relay: WebsocketConn) -> Self {
         Self::Websocket(WebsocketRelay::new(relay))
     }
 
@@ -107,7 +107,7 @@ impl PoolRelay {
 }
 
 impl WebsocketRelay {
-    pub fn new(relay: Relay) -> Self {
+    pub fn new(relay: WebsocketConn) -> Self {
         Self {
             relay,
             last_ping: Instant::now(),
@@ -313,7 +313,7 @@ impl RelayPool {
         if self.has(&url) {
             return Ok(());
         }
-        let relay = Relay::new(
+        let relay = WebsocketConn::new(
             nostr::RelayUrl::parse(url).map_err(|_| Error::InvalidRelayUrl)?,
             wakeup,
         )?;
diff --git a/crates/enostr/src/relay/websocket.rs b/crates/enostr/src/relay/websocket.rs
@@ -8,14 +8,14 @@ use std::{
 use ewebsock::{Options, WsMessage, WsReceiver, WsSender};
 use tracing::{debug, error};
 
-pub struct Relay {
+pub struct WebsocketConn {
     pub url: nostr::RelayUrl,
     pub status: RelayStatus,
     pub sender: WsSender,
     pub receiver: WsReceiver,
 }
 
-impl fmt::Debug for Relay {
+impl fmt::Debug for WebsocketConn {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Relay")
             .field("url", &self.url)
@@ -24,22 +24,22 @@ impl fmt::Debug for Relay {
     }
 }
 
-impl Hash for Relay {
+impl Hash for WebsocketConn {
     fn hash<H: Hasher>(&self, state: &mut H) {
         // Hashes the Relay by hashing the URL
         self.url.hash(state);
     }
 }
 
-impl PartialEq for Relay {
+impl PartialEq for WebsocketConn {
     fn eq(&self, other: &Self) -> bool {
         self.url == other.url
     }
 }
 
-impl Eq for Relay {}
+impl Eq for WebsocketConn {}
 
-impl Relay {
+impl WebsocketConn {
     pub fn new(url: nostr::RelayUrl, wakeup: impl Fn() + Send + Sync + 'static) -> Result<Self> {
         let status = RelayStatus::Connecting;
         let (sender, receiver) =