logos-messaging/libchat
1
0
Fork 0
mirror of https://github.com/logos-messaging/libchat.git synced 2026-08-03 21:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use random port for Logos-Delivery (#180)

Browse Source 
* Cleanup logging

* Randomize port to avoid conlicts
This commit is contained in:
Jazz Turner-Baggs 2026-07-14 14:04:31 -07:00 committed by GitHub
parent 225b0fab14
commit f5e877b6e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/logos-delivery-rust/src/threaded.rs
View File

@ -5,7 +5,7 @@ use std::time::Duration;
use base64::Engine; use base64::Engine;
use base64::engine::general_purpose::STANDARD as BASE64; use base64::engine::general_purpose::STANDARD as BASE64;
use crossbeam_channel::{Receiver, Sender}; use crossbeam_channel::{Receiver, Sender};
use tracing::{error, info}; use tracing::{debug, error, info};
use crate::wrapper::LogosNodeCtx; use crate::wrapper::LogosNodeCtx;
@ -45,12 +45,6 @@ type SubscriberList<T> = Arc<Mutex<Vec<Sender<T>>>>;
// ── P2pConfig ─────────────────────────────────────────────────────────────────── // ── P2pConfig ───────────────────────────────────────────────────────────────────
/// The logos-delivery network preset joined by default.
pub const DEFAULT_NETWORK_PRESET: &str = "logos.dev";
/// Default TCP port for the embedded logos-delivery node.
pub const DEFAULT_PORT: u16 = 60000;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct P2pConfig { pub struct P2pConfig {
pub preset: String, pub preset: String,
@ -59,7 +53,14 @@ pub struct P2pConfig {
} }
impl Default for P2pConfig { impl Default for P2pConfig {
// Generate a P2pConfig that connects to the `logos.dev` network and uses a randomly assigned port.
// Random port avoids conflicts with other services on the machine, and allows multiple instances
// to run in parallel.
fn default() -> Self { fn default() -> Self {
/// The logos-delivery network preset joined by default.
const DEFAULT_NETWORK_PRESET: &str = "logos.dev";
/// Default to an OS assigned port, that is available
const DEFAULT_PORT: u16 = 0;
Self { Self {
preset: DEFAULT_NETWORK_PRESET.into(), preset: DEFAULT_NETWORK_PRESET.into(),
port: DEFAULT_PORT, port: DEFAULT_PORT,
@ -236,11 +237,13 @@ impl<T> ThreadedDeliveryWrapper<T> {
/// Start delivering messages on `content_topic`. Blocks until acknowledged. /// Start delivering messages on `content_topic`. Blocks until acknowledged.
pub fn subscribe(&self, content_topic: &str) -> Result<(), DeliveryError> { pub fn subscribe(&self, content_topic: &str) -> Result<(), DeliveryError> {
debug!(?content_topic, "Subscribe");
self.send_cmd(NodeOp::Subscribe(content_topic.to_string())) self.send_cmd(NodeOp::Subscribe(content_topic.to_string()))
} }
/// Stop delivering messages on `content_topic`. Blocks until acknowledged. /// Stop delivering messages on `content_topic`. Blocks until acknowledged.
pub fn unsubscribe(&self, content_topic: &str) -> Result<(), DeliveryError> { pub fn unsubscribe(&self, content_topic: &str) -> Result<(), DeliveryError> {
debug!(?content_topic, "Unsubscribe");
self.send_cmd(NodeOp::Unsubscribe(content_topic.to_string())) self.send_cmd(NodeOp::Unsubscribe(content_topic.to_string()))
} }
@ -251,6 +254,9 @@ impl<T> ThreadedDeliveryWrapper<T> {
payload: BASE64.encode(payload), payload: BASE64.encode(payload),
ephemeral: false, ephemeral: false,
}; };
debug!(content_topic = ?msg.content_topic, payload = ?msg.payload, ephemeral = ?msg.ephemeral, "Publish");
let message_json = let message_json =
serde_json::to_string(&msg).map_err(|e| DeliveryError::PublishFailed(e.to_string()))?; serde_json::to_string(&msg).map_err(|e| DeliveryError::PublishFailed(e.to_string()))?;
self.send_cmd(NodeOp::Publish(message_json)) self.send_cmd(NodeOp::Publish(message_json))
@ -339,7 +345,6 @@ impl<T> ThreadedDeliveryWrapper<T> {
let _ = ready_tx.send(Ok(())); let _ = ready_tx.send(Ok(()));
while let Ok(cmd) = out_rx.recv() { while let Ok(cmd) = out_rx.recv() {
info!(">>>>> {:?} ", cmd);
let result = match cmd.op { let result = match cmd.op {
NodeOp::Publish(msg) => node NodeOp::Publish(msg) => node
.send(&msg) .send(&msg)