gitdata.ai/imks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(tests): reformat code and update dependency management

Browse Source 
- Reorganized import statements in adapter tests for better readability
- Replaced or_insert_with(Vec::new) with or_default() in test closures
- Updated Cargo.lock with new dependency versions and checksums
- Added TLS features to tonic dependency configuration
- Included sqlx, chrono, and uuid dependencies with specific features
- Added jsonwebtoken and arc-swap as project dependencies
- Reformatted assertion statements to comply with line length limits
- Adjusted base64 import order in engine codec module
- Updated protobuf include statement formatting
This commit is contained in:
zhenyi
2026-06-11 12:11:05 +08:00
parent 06e8ee96a5
commit 821537186e
111 changed files with 10458 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
socket/adapter/redis.rs
+107 -34
View File
@@ -7,7 +7,9 @@ use fred::clients::Client;
use fred::interfaces::{KeysInterface, SetsInterface};
use tokio::sync::mpsc;
use crate::socket::adapter::{Adapter, AdapterError, BroadcastOptions, BusMessage, SocketInfo};
use crate::socket::adapter::{
Adapter, AdapterError, BroadcastOptions, BusMessage, LocalBroadcastFn, SocketInfo,
};
use crate::socket::message_bus::MessageBus;
use crate::socket::packet::Packet;
use crate::socket::parser;
@@ -28,11 +30,16 @@ fn socket_rooms_key(ns: &str, sid: &str) -> String {
/// Only performs local state updates — the remote server already wrote to Redis.
async fn handle_bus_message(
msg: BusMessage,
on_local_broadcast: &Arc<dyn Fn(&Packet, &BroadcastOptions) + Send + Sync + 'static>,
on_local_broadcast: &LocalBroadcastFn,
server_id: &str,
) {
match msg {
BusMessage::Broadcast { namespace: _, packet, opts, server_id: sender_id } => {
BusMessage::Broadcast {
namespace: _,
packet,
opts,
server_id: sender_id,
} => {
if sender_id == server_id {
return;
}
@@ -40,13 +47,20 @@ async fn handle_bus_message(
on_local_broadcast(&decoded_packet, &opts);
}
}
BusMessage::SocketJoin { server_id: sender_id, .. }
| BusMessage::SocketLeave { server_id: sender_id, .. }
| BusMessage::SocketDisconnect { server_id: sender_id, .. } => {
BusMessage::SocketJoin {
server_id: sender_id,
..
}
| BusMessage::SocketLeave {
server_id: sender_id,
..
}
| BusMessage::SocketDisconnect {
server_id: sender_id,
..
} => {
// Skip messages from this server; remote server already updated Redis
if sender_id == server_id {
return;
}
if sender_id == server_id {}
// No duplicate Redis writes — the sender already persisted the state change
}
}
@@ -58,10 +72,12 @@ pub struct RedisAdapter {
room_subscribers: DashMap<String, mpsc::Receiver<Vec<u8>>>,
socket_rooms: DashMap<String, HashSet<String>>,
rooms: DashMap<String, HashSet<String>>,
/// socket_sid → engine_sid mapping for local inspection.
socket_sids: DashMap<String, String>,
sockets: DashMap<String, Arc<Socket>>,
server_id: String,
namespace: String,
on_local_broadcast: Arc<dyn Fn(&Packet, &BroadcastOptions) + Send + Sync + 'static>,
on_local_broadcast: LocalBroadcastFn,
}
impl RedisAdapter {
@@ -70,7 +86,7 @@ impl RedisAdapter {
redis_client: Client,
server_id: String,
namespace: String,
on_local_broadcast: Arc<dyn Fn(&Packet, &BroadcastOptions) + Send + Sync + 'static>,
on_local_broadcast: LocalBroadcastFn,
) -> Self {
Self {
message_bus,
@@ -81,6 +97,7 @@ impl RedisAdapter {
room_subscribers: DashMap::new(),
socket_rooms: DashMap::new(),
rooms: DashMap::new(),
socket_sids: DashMap::new(),
sockets: DashMap::new(),
}
}
@@ -144,7 +161,11 @@ impl RedisAdapter {
#[async_trait]
impl Adapter for RedisAdapter {
async fn broadcast(&self, packet: &Packet, opts: &BroadcastOptions) -> Result<(), AdapterError> {
async fn broadcast(
&self,
packet: &Packet,
opts: &BroadcastOptions,
) -> Result<(), AdapterError> {
if opts.flags.local_only {
(self.on_local_broadcast)(packet, opts);
return Ok(());
@@ -157,11 +178,11 @@ impl Adapter for RedisAdapter {
server_id: self.server_id.clone(),
};
let payload = serde_json::to_vec(&msg)
.map_err(|e| AdapterError::Serialization(e.to_string()))?;
let payload =
serde_json::to_vec(&msg).map_err(|e| AdapterError::Serialization(e.to_string()))?;
self.message_bus
.publish(&format!("socket.io:{}:broadcast", packet.namespace), &payload)
.publish(&format!("socket.io:{}:broadcast", self.namespace), &payload)
.await
.map_err(|e| AdapterError::MessageBus(e.to_string()))?;
@@ -185,12 +206,16 @@ impl Adapter for RedisAdapter {
self.socket_rooms
.entry(sid.to_string())
.and_modify(|set| { set.insert(room.to_string()); })
.and_modify(|set| {
set.insert(room.to_string());
})
.or_insert_with(|| HashSet::from([room.to_string()]));
self.rooms
.entry(room.to_string())
.and_modify(|set| { set.insert(sid.to_string()); })
.and_modify(|set| {
set.insert(sid.to_string());
})
.or_insert_with(|| HashSet::from([sid.to_string()]));
let msg = BusMessage::SocketJoin {
@@ -200,11 +225,11 @@ impl Adapter for RedisAdapter {
server_id: self.server_id.clone(),
};
let payload = serde_json::to_vec(&msg)
.map_err(|e| AdapterError::Serialization(e.to_string()))?;
let payload =
serde_json::to_vec(&msg).map_err(|e| AdapterError::Serialization(e.to_string()))?;
self.message_bus
.publish(&format!("socket.io:{}:join", ns), &payload)
.publish(&format!("socket.io:{}:join", self.namespace), &payload)
.await
.map_err(|e| AdapterError::MessageBus(e.to_string()))?;
@@ -228,14 +253,24 @@ impl Adapter for RedisAdapter {
if let Some(mut entry) = self.socket_rooms.get_mut(sid) {
entry.value_mut().remove(room);
}
if self.socket_rooms.get(sid).map(|e| e.value().is_empty()).unwrap_or(true) {
if self
.socket_rooms
.get(sid)
.map(|e| e.value().is_empty())
.unwrap_or(true)
{
self.socket_rooms.remove(sid);
}
if let Some(mut entry) = self.rooms.get_mut(room) {
entry.value_mut().remove(sid);
}
if self.rooms.get(room).map(|e| e.value().is_empty()).unwrap_or(true) {
if self
.rooms
.get(room)
.map(|e| e.value().is_empty())
.unwrap_or(true)
{
self.rooms.remove(room);
}
@@ -246,11 +281,11 @@ impl Adapter for RedisAdapter {
server_id: self.server_id.clone(),
};
let payload = serde_json::to_vec(&msg)
.map_err(|e| AdapterError::Serialization(e.to_string()))?;
let payload =
serde_json::to_vec(&msg).map_err(|e| AdapterError::Serialization(e.to_string()))?;
self.message_bus
.publish(&format!("socket.io:{}:leave", ns), &payload)
.publish(&format!("socket.io:{}:leave", self.namespace), &payload)
.await
.map_err(|e| AdapterError::MessageBus(e.to_string()))?;
@@ -263,7 +298,12 @@ impl Adapter for RedisAdapter {
if let Some(mut entry) = self.rooms.get_mut(room) {
entry.value_mut().remove(sid);
}
if self.rooms.get(room).map(|e| e.value().is_empty()).unwrap_or(true) {
if self
.rooms
.get(room)
.map(|e| e.value().is_empty())
.unwrap_or(true)
{
self.rooms.remove(room);
}
@@ -280,6 +320,7 @@ impl Adapter for RedisAdapter {
.await
.map_err(|e| AdapterError::Redis(e.to_string()))?;
self.socket_sids.remove(sid);
self.sockets.remove(sid);
let msg = BusMessage::SocketDisconnect {
@@ -288,22 +329,43 @@ impl Adapter for RedisAdapter {
server_id: self.server_id.clone(),
};
let payload = serde_json::to_vec(&msg)
.map_err(|e| AdapterError::Serialization(e.to_string()))?;
let payload =
serde_json::to_vec(&msg).map_err(|e| AdapterError::Serialization(e.to_string()))?;
self.message_bus
.publish(&format!("socket.io:{}:disconnect", ns), &payload)
.publish(
&format!("socket.io:{}:disconnect", self.namespace),
&payload,
)
.await
.map_err(|e| AdapterError::MessageBus(e.to_string()))?;
Ok(())
}
async fn fetch_sockets(&self, opts: &BroadcastOptions) -> Result<Vec<SocketInfo>, AdapterError> {
async fn register(
&self,
socket_sid: &str,
engine_sid: &str,
_ns: &str,
) -> Result<(), AdapterError> {
self.socket_sids
.insert(socket_sid.to_string(), engine_sid.to_string());
Ok(())
}
async fn unregister(&self, socket_sid: &str, ns: &str) -> Result<(), AdapterError> {
self.del_all(socket_sid, ns).await
}
async fn fetch_sockets(
&self,
opts: &BroadcastOptions,
) -> Result<Vec<SocketInfo>, AdapterError> {
let mut result = Vec::new();
let target_sids: HashSet<String> = if opts.rooms.is_empty() {
self.sockets.iter().map(|e| e.key().clone()).collect()
self.socket_sids.iter().map(|e| e.key().clone()).collect()
} else {
let mut sids = HashSet::new();
for room in &opts.rooms {
@@ -318,7 +380,11 @@ impl Adapter for RedisAdapter {
if opts.except.contains(&sid) {
continue;
}
let rooms = self.socket_rooms.get(&sid).map(|e| e.value().clone()).unwrap_or_default();
let rooms = self
.socket_rooms
.get(&sid)
.map(|e| e.value().clone())
.unwrap_or_default();
result.push(SocketInfo {
sid: sid.clone(),
namespace: self.namespace.clone(),
@@ -330,7 +396,11 @@ impl Adapter for RedisAdapter {
}
async fn socket_rooms(&self, sid: &str) -> Result<HashSet<String>, AdapterError> {
Ok(self.socket_rooms.get(sid).map(|e| e.value().clone()).unwrap_or_default())
Ok(self
.socket_rooms
.get(sid)
.map(|e| e.value().clone())
.unwrap_or_default())
}
fn server_id(&self) -> &str {
@@ -338,7 +408,10 @@ impl Adapter for RedisAdapter {
}
async fn close(&self) -> Result<(), AdapterError> {
self.message_bus.close().await.map_err(|e| AdapterError::MessageBus(e.to_string()))?;
self.message_bus
.close()
.await
.map_err(|e| AdapterError::MessageBus(e.to_string()))?;
Ok(())
}
}