From f615d8dfbbccfdd9f841a3eb42f702c3794fc676 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Sat, 25 Jul 2026 04:30:58 +0200 Subject: [PATCH] typed Syntax and improved formatting --- pulse-wire/src/general.rs | 18 +++---- pulse-wire/src/lib.rs | 9 +++- pulse-wire/src/terminal.rs | 7 +-- pulse-wire/src/units.rs | 98 ++++++++++++++++++++++++++++++++++++++ src/engine/engine.rs | 13 +++-- src/engine/fetch.rs | 11 +++-- src/terminal/formatting.rs | 78 +++++------------------------- 7 files changed, 147 insertions(+), 87 deletions(-) create mode 100644 pulse-wire/src/units.rs diff --git a/pulse-wire/src/general.rs b/pulse-wire/src/general.rs index d7e88d9..7f286a4 100644 --- a/pulse-wire/src/general.rs +++ b/pulse-wire/src/general.rs @@ -1,6 +1,9 @@ use pulse_macros::pwp; -use crate::PulseWire; +use crate::{ + PulseWire, + units::{Symbol, USD}, +}; #[pwp] pub enum MarketTrend { @@ -28,9 +31,9 @@ pub struct Signal { pub kind: Direction, pub confidence: f32, pub size: f64, - pub price: f64, - pub take_profit: f64, - pub take_stop_loss: f64, + pub price: USD, + pub take_profit: USD, + pub stop_loss: USD, } #[pwp] @@ -50,10 +53,10 @@ pub struct EventLog { #[pwp] pub struct Position { - pub symbol: String, + pub symbol: Symbol, pub size: f64, - pub entry_price: f64, - pub profit: f64, + pub entry_price: USD, + pub profit: USD, } impl std::fmt::Display for Direction { @@ -65,7 +68,6 @@ impl std::fmt::Display for Direction { } } - impl std::fmt::Display for MarketTrend { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { diff --git a/pulse-wire/src/lib.rs b/pulse-wire/src/lib.rs index 168b737..fba6f5d 100644 --- a/pulse-wire/src/lib.rs +++ b/pulse-wire/src/lib.rs @@ -1,8 +1,15 @@ #[cfg(target_os = "macos")] use std::path::PathBuf; -pub mod terminal; pub mod general; +pub mod terminal; +pub mod units; + +pub mod prelude { + pub use crate::general::*; + pub use crate::terminal::*; + pub use crate::units::*; +} pub fn server_path() -> PathBuf { PathBuf::from("/tmp/pulse-engine.sock") diff --git a/pulse-wire/src/terminal.rs b/pulse-wire/src/terminal.rs index 4a4f1ff..79d901b 100644 --- a/pulse-wire/src/terminal.rs +++ b/pulse-wire/src/terminal.rs @@ -1,6 +1,7 @@ use crate::{ PulseWire, general::{EventLog, MarketTrend, Position, Signal, Volatility}, + units::{Symbol, USD}, }; use pulse_macros::pwp; @@ -36,10 +37,10 @@ pub enum TerminalClientMessage { #[pwp] pub struct MarketItem { - pub symbol: String, - pub price: f64, + pub symbol: Symbol, + pub price: USD, pub trend: f64, - pub volume_24h: f64, + pub volume_24h: USD, } #[pwp] diff --git a/pulse-wire/src/units.rs b/pulse-wire/src/units.rs new file mode 100644 index 0000000..b43000a --- /dev/null +++ b/pulse-wire/src/units.rs @@ -0,0 +1,98 @@ +use crate::PulseWire; + +#[derive(Debug, Clone)] +pub struct Symbol(pub String); + +#[derive(Debug, Clone, Copy)] +pub struct USD(pub f64); + +impl std::fmt::Display for Symbol { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "\x1b[35m{}\x1b[0m", self.0) + } +} + +impl std::fmt::Display for USD { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + if self.0 > 0.0 { + write!(f, "\x1b[32m${}\x1b[0m", format_f64(self.0)) + } else { + write!(f, "\x1b[31m${}\x1b[0m", format_f64(self.0)) + } + } +} + +impl PulseWire for Symbol { + fn from_com(com: &mut Vec) -> Self { + Self(String::from_com(com)) + } + + fn to_com(&self) -> Vec { + self.0.to_com() + } +} + +impl PulseWire for USD { + fn from_com(com: &mut Vec) -> Self { + Self(f64::from_com(com)) + } + + fn to_com(&self) -> Vec { + self.0.to_com() + } +} + +pub fn format_f64(value: f64) -> String { + let abs = value.abs(); + + let (divisor, suffix) = if abs >= 1_000_000_000.0 { + (1_000_000_000.0, "B") + } else if abs >= 1_000_000.0 { + (1_000_000.0, "M") + } else if abs >= 1_000.0 { + (1_000.0, "K") + } else { + (1.0, "") + }; + + if divisor != 1.0 { + let formatted = value / divisor; + + // Remove unnecessary trailing zeros + let s = format!("{:.2}", formatted) + .trim_end_matches('0') + .trim_end_matches('.') + .to_string(); + + return format!("{}{}", s, suffix); + } + + let val = format!("{:.3}", value); + let parts: Vec<&str> = val.split('.').collect(); + + let int = parts[0].to_string(); + let negative = int.starts_with('-'); + + let start = if negative { 1 } else { 0 }; + let mut result = String::new(); + + for (i, c) in int[start..].chars().rev().enumerate() { + if i > 0 && i % 3 == 0 { + result.push(','); + } + result.push(c); + } + + let mut formatted: String = result.chars().rev().collect(); + + if negative { + formatted.insert(0, '-'); + } + + if parts.len() > 1 { + formatted.push('.'); + formatted.push_str(parts[1]); + } + + formatted +} diff --git a/src/engine/engine.rs b/src/engine/engine.rs index 04f9a8d..9b3dfe7 100644 --- a/src/engine/engine.rs +++ b/src/engine/engine.rs @@ -1,6 +1,9 @@ use std::sync::Arc; -use pulse_wire::general::Position; +use pulse_wire::{ + general::Position, + units::{Symbol, USD}, +}; use tokio::{sync::Mutex, task::JoinHandle}; use crate::{ @@ -91,14 +94,14 @@ impl Engine { .asset_positions .into_iter() .map(|position| Position { - symbol: position.position.coin, + symbol: Symbol(position.position.coin), size: position.position.szi.as_f64(), - entry_price: position + entry_price: USD(position .position .entry_px .map(|px| px.as_f64()) - .unwrap_or(0.0), - profit: position.position.unrealized_pnl.as_f64(), + .unwrap_or(0.0)), + profit: USD(position.position.unrealized_pnl.as_f64()), }) .collect(), ), diff --git a/src/engine/fetch.rs b/src/engine/fetch.rs index 8179732..d09be91 100644 --- a/src/engine/fetch.rs +++ b/src/engine/fetch.rs @@ -1,6 +1,9 @@ use std::collections::HashMap; -use pulse_wire::terminal::MarketItem; +use pulse_wire::{ + terminal::MarketItem, + units::{Symbol, USD}, +}; use serde_json::Value; fn number(value: &Value, field: &str) -> Result { @@ -64,10 +67,10 @@ pub async fn fetch_watch_list( by_symbol.insert( symbol, MarketItem { - symbol: symbol.to_owned(), - price, + symbol: Symbol(symbol.to_owned()), + price: USD(price), + volume_24h: USD(volume_24h), trend: ((price / previous_day_price) - 1.0) * 100.0, - volume_24h, }, ); } diff --git a/src/terminal/formatting.rs b/src/terminal/formatting.rs index 3495220..6a21e0a 100644 --- a/src/terminal/formatting.rs +++ b/src/terminal/formatting.rs @@ -3,6 +3,7 @@ use pulse_wire::terminal::{ }; use pulse_wire::general::{Direction, EventLog, LogKind, Position, Signal}; +use pulse_wire::units::format_f64; pub trait Formatted { fn get_formatted(&self) -> Vec; @@ -71,7 +72,7 @@ impl Formatted for Signal { format!("\x1b[31m{}\x1b[0m", self.kind) }, format!("\x1b[35m{}\x1b[0m", self.symbol), - format_f64(self.price), + self.price.to_string(), ] } } @@ -79,9 +80,9 @@ impl Formatted for Signal { impl Formatted for MarketItem { fn get_formatted(&self) -> Vec { vec![ - format!("\x1b[35m{}\x1b[0m", self.symbol), - format!("${}", format_f64(self.price)), - format!("${}", format_f64(self.volume_24h)), + self.symbol.to_string(), + self.price.to_string(), + self.volume_24h.to_string(), format!( "{} {}", if self.trend.is_sign_positive() { @@ -98,17 +99,17 @@ impl Formatted for MarketItem { impl Formatted for Position { fn get_formatted(&self) -> Vec { vec![ - format!("\x1b[35m{}\x1b[0m", self.symbol), + self.symbol.to_string(), format_f64(self.size), - format_f64(self.entry_price), + self.entry_price.to_string(), format!( - "{} {}", - if self.profit.is_sign_positive() { - "\x1b[32m▲\x1b[0m" + "{}{}\x1b[0m", + if self.profit.0.is_sign_positive() { + "\x1b[32m" } else { - "\x1b[31m▼\x1b[0m" + "\x1b[31m" }, - format_f64(self.profit.abs()) + self.profit, ), ] } @@ -206,58 +207,3 @@ pub fn apply_padding(mut items: Vec) -> Vec { items } - -pub fn format_f64(value: f64) -> String { - let abs = value.abs(); - - let (divisor, suffix) = if abs >= 1_000_000_000.0 { - (1_000_000_000.0, "B") - } else if abs >= 1_000_000.0 { - (1_000_000.0, "M") - } else if abs >= 1_000.0 { - (1_000.0, "K") - } else { - (1.0, "") - }; - - if divisor != 1.0 { - let formatted = value / divisor; - - // Remove unnecessary trailing zeros - let s = format!("{:.2}", formatted) - .trim_end_matches('0') - .trim_end_matches('.') - .to_string(); - - return format!("{}{}", s, suffix); - } - - let val = format!("{:.3}", value); - let parts: Vec<&str> = val.split('.').collect(); - - let int = parts[0].to_string(); - let negative = int.starts_with('-'); - - let start = if negative { 1 } else { 0 }; - let mut result = String::new(); - - for (i, c) in int[start..].chars().rev().enumerate() { - if i > 0 && i % 3 == 0 { - result.push(','); - } - result.push(c); - } - - let mut formatted: String = result.chars().rev().collect(); - - if negative { - formatted.insert(0, '-'); - } - - if parts.len() > 1 { - formatted.push('.'); - formatted.push_str(parts[1]); - } - - formatted -}