From efc4bc9aa4675deb71473bcdb99db4634766ee59 Mon Sep 17 00:00:00 2001 From: Ben Markendorf Date: Thu, 19 Mar 2026 22:26:34 +0100 Subject: [PATCH] Migrated to TTP. --- Cargo.lock | 56 +++++++++---------- Cargo.toml | 4 +- src/communities/interactables/category.rs | 2 +- src/communities/interactables/interactable.rs | 2 +- src/communities/interactables/text_chat.rs | 2 +- src/gui/elements/console_card.rs | 2 +- src/omikron/omikron_connection.rs | 6 +- src/omikron/ping_pong_task.rs | 2 +- src/users/user_manager.rs | 2 +- src/util/logger.rs | 2 +- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb69592..b5661e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -979,32 +979,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "epsilon-core" -version = "0.1.0" -source = "git+https://github.com/Tensamin/Epsilon.git#d5edc693a91954834a38c39517b79092983eac5c" -dependencies = [ - "base64", - "byteorder", - "rand 0.8.5", - "strum 0.28.0", - "strum_macros 0.28.0", -] - -[[package]] -name = "epsilon-native" -version = "0.1.0" -source = "git+https://github.com/Tensamin/Epsilon.git#d5edc693a91954834a38c39517b79092983eac5c" -dependencies = [ - "epsilon-core", - "quinn", - "rustls", - "rustls-native-certs", - "thiserror 2.0.18", - "tokio", - "wtransport", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -1758,8 +1732,6 @@ dependencies = [ "chrono", "crossterm", "dashmap", - "epsilon-core", - "epsilon-native", "futures", "futures-util", "hex", @@ -1784,6 +1756,8 @@ dependencies = [ "sysinfo", "tokio", "tokio-tungstenite", + "ttp-core", + "ttp-native", "tungstenite", "uuid", "walkdir", @@ -3877,6 +3851,32 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "ttp-core" +version = "0.1.0" +source = "git+https://github.com/t3kkm0tt/TTP.git#8a3cd5cea756d62e7f85824ebfa1e64c7594c7de" +dependencies = [ + "base64", + "byteorder", + "rand 0.8.5", + "strum 0.28.0", + "strum_macros 0.28.0", +] + +[[package]] +name = "ttp-native" +version = "0.1.0" +source = "git+https://github.com/t3kkm0tt/TTP.git#8a3cd5cea756d62e7f85824ebfa1e64c7594c7de" +dependencies = [ + "quinn", + "rustls", + "rustls-native-certs", + "thiserror 2.0.18", + "tokio", + "ttp-core", + "wtransport", +] + [[package]] name = "tungstenite" version = "0.28.0" diff --git a/Cargo.toml b/Cargo.toml index b2fbe6d..d664f77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,8 +4,8 @@ version = "0.1.0" edition = "2024" [dependencies] -epsilon-core = { git = "https://github.com/Tensamin/Epsilon.git", package = "epsilon-core" } -epsilon-native = { git = "https://github.com/Tensamin/Epsilon.git", package = "epsilon-native" } +ttp-core = { git = "https://github.com/Tensamin/TTP.git", package = "ttp-core" } +ttp-native = { git = "https://github.com/Tensamin/TTP.git", package = "ttp-native" } actix-web = { version = "4", features = ["rustls-0_23"] } actix-web-actors = "4" diff --git a/src/communities/interactables/category.rs b/src/communities/interactables/category.rs index 232ee53..6b6415f 100644 --- a/src/communities/interactables/category.rs +++ b/src/communities/interactables/category.rs @@ -1,9 +1,9 @@ use crate::communities::{community::Community, interactables::interactable::Interactable}; use async_trait::async_trait; -use epsilon_core::CommunicationValue; use json::JsonValue; use std::any::Any; use std::sync::Arc; +use ttp_core::CommunicationValue; use uuid::Uuid; pub struct Category { diff --git a/src/communities/interactables/interactable.rs b/src/communities/interactables/interactable.rs index bd14b83..0521de6 100644 --- a/src/communities/interactables/interactable.rs +++ b/src/communities/interactables/interactable.rs @@ -1,9 +1,9 @@ use crate::communities::community::Community; use async_trait::async_trait; -use epsilon_core::CommunicationValue; use json::JsonValue; use std::any::Any; use std::sync::Arc; +use ttp_core::CommunicationValue; use uuid::Uuid; pub type InteractableFactory = fn() -> Box; diff --git a/src/communities/interactables/text_chat.rs b/src/communities/interactables/text_chat.rs index 16c04ae..88e1545 100644 --- a/src/communities/interactables/text_chat.rs +++ b/src/communities/interactables/text_chat.rs @@ -7,11 +7,11 @@ use crate::{ util::file_util::{get_children, load_file, save_file}, }; use async_trait::async_trait; -use epsilon_core::{CommunicationType, CommunicationValue, DataTypes}; use json::{JsonValue, array, object}; use std::fs; use std::sync::Arc; use std::{any::Any, collections::HashMap}; +use ttp_core::{CommunicationType, CommunicationValue, DataTypes}; use uuid::Uuid; pub struct TextChat { id: Uuid, diff --git a/src/gui/elements/console_card.rs b/src/gui/elements/console_card.rs index 8b1d6e3..a9c1d72 100644 --- a/src/gui/elements/console_card.rs +++ b/src/gui/elements/console_card.rs @@ -1,5 +1,4 @@ use crossterm::event::{KeyCode, KeyEvent}; -use epsilon_core::{CommunicationType, CommunicationValue}; use ratatui::{ Frame, layout::Rect, @@ -7,6 +6,7 @@ use ratatui::{ text::{Line, Span}, widgets::{Block, Borders, Paragraph}, }; +use ttp_core::{CommunicationType, CommunicationValue}; use uuid::Uuid; use crate::{ diff --git a/src/omikron/omikron_connection.rs b/src/omikron/omikron_connection.rs index ab2d1ca..af8ada4 100755 --- a/src/omikron/omikron_connection.rs +++ b/src/omikron/omikron_connection.rs @@ -8,8 +8,6 @@ use crate::util::{chat_files, chats_util}; use crate::util::{config_util::CONFIG, crypto_helper}; use crate::{ACTIVE_TASKS, SHUTDOWN, log, log_cv_in, log_cv_out, log_t}; use dashmap::DashMap; -use epsilon_core::{CommunicationType, CommunicationValue, DataTypes, DataValue}; -use epsilon_native::{Receiver, Sender}; use json::JsonValue; use std::collections::HashMap; use std::sync::{Arc, LazyLock}; @@ -17,6 +15,8 @@ use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH}; use tokio::sync::{Mutex, RwLock, mpsc, watch}; use tokio::task::JoinHandle; use tokio::time::sleep; +use ttp_core::{CommunicationType, CommunicationValue, DataTypes, DataValue}; +use ttp_native::{Receiver, Sender}; use uuid::Uuid; // ============================================================================ @@ -213,7 +213,7 @@ impl OmikronConnection { let addr_str = format!("https://{}:{}/ws/iota/", self.host, self.port); - let (sender, mut receiver) = epsilon_native::client::connect(&addr_str, None) + let (sender, mut receiver) = ttp_native::client::connect(&addr_str, None) .await .map_err(|e| format!("Connection failed: {}", e))?; diff --git a/src/omikron/ping_pong_task.rs b/src/omikron/ping_pong_task.rs index aca9302..4b757ba 100644 --- a/src/omikron/ping_pong_task.rs +++ b/src/omikron/ping_pong_task.rs @@ -1,10 +1,10 @@ use crate::APP_STATE; use crate::omikron::omikron_connection::OmikronConnection; use dashmap::DashMap; -use epsilon_core::{CommunicationType, CommunicationValue, DataTypes, DataValue, rand_u32}; use std::sync::LazyLock; use std::time::Instant; use tokio::time::Duration; +use ttp_core::{CommunicationType, CommunicationValue, DataTypes, DataValue, rand_u32}; // Dedicated lightweight ping tracking static PING_TIMES: LazyLock> = LazyLock::new(|| DashMap::new()); diff --git a/src/users/user_manager.rs b/src/users/user_manager.rs index 58e78b1..bcb5e26 100644 --- a/src/users/user_manager.rs +++ b/src/users/user_manager.rs @@ -6,7 +6,6 @@ use crate::util::logger::PrintType; use crate::{RELOAD, SHUTDOWN}; use crate::{log, log_cv}; use base64::{Engine as _, engine::general_purpose::STANDARD}; -use epsilon_core::{CommunicationType, CommunicationValue, DataTypes, DataValue}; use hex::{self}; use json::JsonValue; use once_cell::sync::Lazy; @@ -17,6 +16,7 @@ use sha2::{Digest, Sha256}; use std::io::{self}; use std::sync::Mutex; use std::time::Duration; +use ttp_core::{CommunicationType, CommunicationValue, DataTypes, DataValue}; use x448::{PublicKey, Secret}; static USERS: Lazy>> = Lazy::new(|| Mutex::new(Vec::new())); diff --git a/src/util/logger.rs b/src/util/logger.rs index 5e228a4..2c09c33 100755 --- a/src/util/logger.rs +++ b/src/util/logger.rs @@ -8,8 +8,8 @@ use std::{ time::{SystemTime, UNIX_EPOCH}, }; -use epsilon_core::{CommunicationValue, DataTypes, DataValue}; use ratatui::style::Color; +use ttp_core::{CommunicationValue, DataTypes, DataValue}; use crate::{ APP_STATE,