32ad93c57e
* Preserve information about original transmission lanes when buffering reply packets * Attempting to send partial data in 'handle_send_reply' if we don't have enough surbs immediately * Display logging of reply surb request target * promoted reply_controller to a directory * moved channels and messages to separate file * simplifications due to rust 1.66 * Using a shoarthand for obtaining connection_id * made TransmissionBuffer generic * Moved transmissaion buffer to a higher level directory + defined wasm helpers * Using transmission buffer in reply controller * Using the pending replies size in lane lenghts queries * fixed an out of bounds use of fragments * Fixed dropped channel in getting lane queue length * Fixed an edge case failure for reply retransmissions * measuring (and logging) time it takes to obtain lane lenghts * decreased logging level * Removed non-wasm lock on total_size
280 lines
10 KiB
Rust
280 lines
10 KiB
Rust
// Copyright 2021-2022 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
use std::error::Error;
|
|
|
|
use crate::client::config::Config;
|
|
use crate::error::ClientError;
|
|
use crate::websocket;
|
|
use client_connections::TransmissionLane;
|
|
use client_core::client::base_client::{
|
|
non_wasm_helpers, BaseClientBuilder, ClientInput, ClientOutput,
|
|
};
|
|
use client_core::client::inbound_messages::InputMessage;
|
|
use client_core::client::key_manager::KeyManager;
|
|
use client_core::client::received_buffer::{ReceivedBufferMessage, ReconstructedMessagesReceiver};
|
|
use client_core::client::replies::reply_controller::requests::ReplyControllerSender;
|
|
use client_core::config::persistence::key_pathfinder::ClientKeyPathfinder;
|
|
use futures::channel::mpsc;
|
|
use gateway_client::bandwidth::BandwidthController;
|
|
use log::*;
|
|
use nymsphinx::addressing::clients::Recipient;
|
|
use nymsphinx::anonymous_replies::requests::AnonymousSenderTag;
|
|
use nymsphinx::receiver::ReconstructedMessage;
|
|
use task::TaskManager;
|
|
|
|
pub(crate) mod config;
|
|
|
|
pub struct SocketClient {
|
|
/// Client configuration options, including, among other things, packet sending rates,
|
|
/// key filepaths, etc.
|
|
config: Config,
|
|
|
|
/// KeyManager object containing smart pointers to all relevant keys used by the client.
|
|
key_manager: KeyManager,
|
|
}
|
|
|
|
impl SocketClient {
|
|
pub fn new(config: Config) -> Self {
|
|
let pathfinder = ClientKeyPathfinder::new_from_config(config.get_base());
|
|
let key_manager = KeyManager::load_keys(&pathfinder).expect("failed to load stored keys");
|
|
|
|
SocketClient {
|
|
config,
|
|
key_manager,
|
|
}
|
|
}
|
|
|
|
async fn create_bandwidth_controller(config: &Config) -> BandwidthController {
|
|
#[cfg(feature = "coconut")]
|
|
let bandwidth_controller = {
|
|
let details = network_defaults::NymNetworkDetails::new_from_env();
|
|
let mut client_config =
|
|
validator_client::Config::try_from_nym_network_details(&details)
|
|
.expect("failed to construct validator client config");
|
|
let nymd_url = config
|
|
.get_base()
|
|
.get_validator_endpoints()
|
|
.pop()
|
|
.expect("No nymd validator endpoint provided");
|
|
let api_url = config
|
|
.get_base()
|
|
.get_nym_api_endpoints()
|
|
.pop()
|
|
.expect("No validator api endpoint provided");
|
|
// overwrite env configuration with config URLs
|
|
client_config = client_config.with_urls(nymd_url, api_url);
|
|
let client = validator_client::Client::new_query(client_config)
|
|
.expect("Could not construct query client");
|
|
let coconut_api_clients =
|
|
validator_client::CoconutApiClient::all_coconut_api_clients(&client)
|
|
.await
|
|
.expect("Could not query api clients");
|
|
BandwidthController::new(
|
|
credential_storage::initialise_storage(config.get_base().get_database_path()).await,
|
|
coconut_api_clients,
|
|
)
|
|
};
|
|
#[cfg(not(feature = "coconut"))]
|
|
let bandwidth_controller = BandwidthController::new(
|
|
credential_storage::initialise_storage(config.get_base().get_database_path()).await,
|
|
)
|
|
.expect("Could not create bandwidth controller");
|
|
bandwidth_controller
|
|
}
|
|
|
|
fn start_websocket_listener(
|
|
config: &Config,
|
|
client_input: ClientInput,
|
|
client_output: ClientOutput,
|
|
self_address: &Recipient,
|
|
reply_controller_sender: ReplyControllerSender,
|
|
shutdown: task::TaskClient,
|
|
) {
|
|
info!("Starting websocket listener...");
|
|
|
|
let ClientInput {
|
|
connection_command_sender,
|
|
input_sender,
|
|
} = client_input;
|
|
|
|
let ClientOutput {
|
|
shared_lane_queue_lengths,
|
|
received_buffer_request_sender,
|
|
} = client_output;
|
|
|
|
let websocket_handler = websocket::HandlerBuilder::new(
|
|
input_sender,
|
|
connection_command_sender,
|
|
received_buffer_request_sender,
|
|
self_address,
|
|
shared_lane_queue_lengths,
|
|
reply_controller_sender,
|
|
);
|
|
|
|
websocket::Listener::new(config.get_listening_port()).start(websocket_handler, shutdown);
|
|
}
|
|
|
|
/// blocking version of `start_socket` method. Will run forever (or until SIGINT is sent)
|
|
pub async fn run_socket_forever(self) -> Result<(), Box<dyn Error + Send + Sync>> {
|
|
let mut shutdown = self.start_socket().await?;
|
|
|
|
let res = task::wait_for_signal_and_error(&mut shutdown).await;
|
|
|
|
log::info!("Sending shutdown");
|
|
shutdown.signal_shutdown().ok();
|
|
|
|
log::info!("Waiting for tasks to finish... (Press ctrl-c to force)");
|
|
shutdown.wait_for_shutdown().await;
|
|
|
|
log::info!("Stopping nym-client");
|
|
res
|
|
}
|
|
|
|
pub async fn start_socket(self) -> Result<TaskManager, ClientError> {
|
|
if !self.config.get_socket_type().is_websocket() {
|
|
return Err(ClientError::InvalidSocketMode);
|
|
}
|
|
|
|
let base_builder = BaseClientBuilder::new_from_base_config(
|
|
self.config.get_base(),
|
|
self.key_manager,
|
|
Some(Self::create_bandwidth_controller(&self.config).await),
|
|
non_wasm_helpers::setup_fs_reply_surb_backend(
|
|
self.config.get_base().get_reply_surb_database_path(),
|
|
self.config.get_debug_settings(),
|
|
)
|
|
.await?,
|
|
);
|
|
|
|
let self_address = base_builder.as_mix_recipient();
|
|
let mut started_client = base_builder.start_base().await?;
|
|
let client_input = started_client.client_input.register_producer();
|
|
let client_output = started_client.client_output.register_consumer();
|
|
|
|
Self::start_websocket_listener(
|
|
&self.config,
|
|
client_input,
|
|
client_output,
|
|
&self_address,
|
|
started_client.reply_controller_sender,
|
|
started_client.task_manager.subscribe(),
|
|
);
|
|
|
|
info!("Client startup finished!");
|
|
info!("The address of this client is: {}", self_address);
|
|
|
|
Ok(started_client.task_manager)
|
|
}
|
|
|
|
pub async fn start_direct(self) -> Result<DirectClient, ClientError> {
|
|
if self.config.get_socket_type().is_websocket() {
|
|
return Err(ClientError::InvalidSocketMode);
|
|
}
|
|
|
|
let base_client = BaseClientBuilder::new_from_base_config(
|
|
self.config.get_base(),
|
|
self.key_manager,
|
|
Some(Self::create_bandwidth_controller(&self.config).await),
|
|
non_wasm_helpers::setup_fs_reply_surb_backend(
|
|
self.config.get_base().get_reply_surb_database_path(),
|
|
self.config.get_debug_settings(),
|
|
)
|
|
.await?,
|
|
);
|
|
|
|
let mut started_client = base_client.start_base().await?;
|
|
let client_input = started_client.client_input.register_producer();
|
|
let client_output = started_client.client_output.register_consumer();
|
|
|
|
// register our receiver
|
|
let (reconstructed_sender, reconstructed_receiver) = mpsc::unbounded();
|
|
|
|
// tell the buffer to start sending stuff to us
|
|
client_output
|
|
.received_buffer_request_sender
|
|
.unbounded_send(ReceivedBufferMessage::ReceiverAnnounce(
|
|
reconstructed_sender,
|
|
))
|
|
.expect("the buffer request failed!");
|
|
|
|
Ok(DirectClient {
|
|
client_input,
|
|
reconstructed_receiver,
|
|
_shutdown_notifier: started_client.task_manager,
|
|
})
|
|
}
|
|
}
|
|
|
|
pub struct DirectClient {
|
|
client_input: ClientInput,
|
|
reconstructed_receiver: ReconstructedMessagesReceiver,
|
|
|
|
// we need to keep reference to this guy otherwise things will start dropping
|
|
_shutdown_notifier: TaskManager,
|
|
}
|
|
|
|
impl DirectClient {
|
|
/// EXPERIMENTAL DIRECT RUST API
|
|
/// It's untested and there are absolutely no guarantees about it (but seems to have worked
|
|
/// well enough in local tests)
|
|
pub async fn send_regular_message(&mut self, recipient: Recipient, message: Vec<u8>) {
|
|
let lane = TransmissionLane::General;
|
|
let input_msg = InputMessage::new_regular(recipient, message, lane);
|
|
|
|
self.client_input
|
|
.input_sender
|
|
.send(input_msg)
|
|
.await
|
|
.expect("InputMessageReceiver has stopped receiving!");
|
|
}
|
|
|
|
/// EXPERIMENTAL DIRECT RUST API
|
|
/// It's untested and there are absolutely no guarantees about it (but seems to have worked
|
|
/// well enough in local tests)
|
|
pub async fn send_anonymous_message(
|
|
&mut self,
|
|
recipient: Recipient,
|
|
message: Vec<u8>,
|
|
reply_surbs: u32,
|
|
) {
|
|
let lane = TransmissionLane::General;
|
|
let input_msg = InputMessage::new_anonymous(recipient, message, reply_surbs, lane);
|
|
|
|
self.client_input
|
|
.input_sender
|
|
.send(input_msg)
|
|
.await
|
|
.expect("InputMessageReceiver has stopped receiving!");
|
|
}
|
|
|
|
/// EXPERIMENTAL DIRECT RUST API
|
|
/// It's untested and there are absolutely no guarantees about it (but seems to have worked
|
|
/// well enough in local tests)
|
|
pub async fn send_reply(&mut self, recipient_tag: AnonymousSenderTag, message: Vec<u8>) {
|
|
let lane = TransmissionLane::General;
|
|
let input_msg = InputMessage::new_reply(recipient_tag, message, lane);
|
|
|
|
self.client_input
|
|
.input_sender
|
|
.send(input_msg)
|
|
.await
|
|
.expect("InputMessageReceiver has stopped receiving!");
|
|
}
|
|
|
|
/// EXPERIMENTAL DIRECT RUST API
|
|
/// It's untested and there are absolutely no guarantees about it (but seems to have worked
|
|
/// well enough in local tests)
|
|
/// Note: it waits for the first occurrence of messages being sent to ourselves. If you expect multiple
|
|
/// messages, you might have to call this function repeatedly.
|
|
// TODO: I guess this should really return something that `impl Stream<Item=ReconstructedMessage>`
|
|
pub async fn wait_for_messages(&mut self) -> Vec<ReconstructedMessage> {
|
|
use futures::StreamExt;
|
|
|
|
self.reconstructed_receiver
|
|
.next()
|
|
.await
|
|
.expect("buffer controller seems to have somehow died!")
|
|
}
|
|
}
|