tensamin/omikron
Watch
6
0
Fork
You've already forked omikron
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

[Fix] shorter message send lock

Browse source
This commit is contained in:
Alex Emmet 2026-02-20 16:12:14 +01:00
commit 3b520c3665
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2024"
[dependencies] [dependencies]
ansi_term = "*" ansi_term = "*"
async-tungstenite = { version = "0.32.0", features = [ async-tungstenite = { version = "0.32.1", features = [
"futures-03-sink", "futures-03-sink",
"futures-util", "futures-util",
"handshake", "handshake",

16
src/rho/client_connection.rs
View file

@ -8,7 +8,8 @@ use rand::Rng;
use rand::distributions::Alphanumeric; use rand::distributions::Alphanumeric;
use std::str::FromStr; use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::{Duration, SystemTime, UNIX_EPOCH};
use sysinfo::System;
use tokio::sync::RwLock; use tokio::sync::RwLock;
use tokio_util::compat::Compat; use tokio_util::compat::Compat;
use tungstenite::Utf8Bytes; use tungstenite::Utf8Bytes;
@ -370,7 +371,8 @@ impl ClientConnection {
|| cv.is_type(CommunicationType::get_iota_data) || cv.is_type(CommunicationType::get_iota_data)
|| cv.is_type(CommunicationType::delete_user) || cv.is_type(CommunicationType::delete_user)
{ {
self.handle_omega_forward(cv).await; let sender = self.get_user_id().await;
self.handle_omega_forward(cv.with_sender(sender)).await;
return; return;
} }
// Forward other messages to Iota // Forward other messages to Iota
@ -396,10 +398,12 @@ impl ClientConnection {
async fn handle_ping(self: Arc<Self>, cv: CommunicationValue) { async fn handle_ping(self: Arc<Self>, cv: CommunicationValue) {
// Update our ping if provided // Update our ping if provided
if let Some(last_ping) = cv.get_data(DataTypes::last_ping) { if let Some(last_ping) = cv.get_data(DataTypes::last_ping) {
if let Ok(ping_val) = last_ping.to_string().parse::<i64>() { let current = SystemTime::now()
let mut ping_guard = self.ping.write().await; .duration_since(UNIX_EPOCH)
*ping_guard = ping_val; .unwrap()
} .as_millis();
let mut ping_guard = self.ping.write().await;
*ping_guard = current as i64 - last_ping.as_i64().unwrap();
} }
// Get Iota ping from RhoConnection // Get Iota ping from RhoConnection

3
src/rho/iota_connection.rs
View file

@ -440,7 +440,8 @@ impl IotaConnection {
|| cv.is_type(CommunicationType::complete_register_user) || cv.is_type(CommunicationType::complete_register_user)
|| cv.is_type(CommunicationType::delete_iota) || cv.is_type(CommunicationType::delete_iota)
{ {
self.handle_omega_forward(cv).await; let sender = self.get_iota_id().await;
self.handle_omega_forward(cv.with_sender(sender)).await;
return; return;
} }
// Forward to client // Forward to client