Jon Häggblad
d34c829174
* Create UserAgent that can be passed from the binary to the nym api client * TryFrom for UserAgent to HeaderValue * Add user agent for getting the list of gateways * Fix wasm client * Move clap behind feature flag in bin-common * Implement conversion to UserAgent * Set user_agent on base client in native and socks5 clients * Set user agent in socks5-listener lib * wip * wip * Deserialize cargo_triple to unknown by default * Abbreviate git hash * Remove unused import * Add missing dep, and remove dbg statements * Reorder string representation * Remove commented out code * Revert temporary log level change
113 lines
3.2 KiB
Rust
113 lines
3.2 KiB
Rust
// Copyright 2023 - Nym Technologies SA <contact@nymtech.net>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
use crate::cli::CliNetworkRequesterClient;
|
|
use crate::config::{default_config_directory, default_config_filepath, default_data_directory};
|
|
use crate::{
|
|
cli::{override_config, OverrideConfig},
|
|
config::Config,
|
|
error::NetworkRequesterError,
|
|
};
|
|
use clap::Args;
|
|
use nym_bin_common::output_format::OutputFormat;
|
|
use nym_client_core::cli_helpers::client_init::{
|
|
initialise_client, CommonClientInitArgs, InitResultsWithConfig, InitialisableClient,
|
|
};
|
|
use serde::Serialize;
|
|
use std::fmt::Display;
|
|
use std::fs;
|
|
use std::path::PathBuf;
|
|
|
|
impl InitialisableClient for CliNetworkRequesterClient {
|
|
type InitArgs = Init;
|
|
|
|
fn initialise_storage_paths(id: &str) -> Result<(), Self::Error> {
|
|
fs::create_dir_all(default_data_directory(id))?;
|
|
fs::create_dir_all(default_config_directory(id))?;
|
|
Ok(())
|
|
}
|
|
|
|
fn default_config_path(id: &str) -> PathBuf {
|
|
default_config_filepath(id)
|
|
}
|
|
|
|
fn construct_config(init_args: &Self::InitArgs) -> Self::Config {
|
|
override_config(
|
|
Config::new(&init_args.common_args.id),
|
|
OverrideConfig::from(init_args.clone()),
|
|
)
|
|
}
|
|
}
|
|
|
|
#[derive(Args, Clone, Debug)]
|
|
pub(crate) struct Init {
|
|
#[command(flatten)]
|
|
common_args: CommonClientInitArgs,
|
|
|
|
/// Specifies whether this network requester should run in 'open-proxy' mode
|
|
#[clap(long)]
|
|
open_proxy: Option<bool>,
|
|
|
|
#[clap(short, long, default_value_t = OutputFormat::default())]
|
|
output: OutputFormat,
|
|
}
|
|
|
|
impl From<Init> for OverrideConfig {
|
|
fn from(init_config: Init) -> Self {
|
|
OverrideConfig {
|
|
nym_apis: init_config.common_args.nym_apis,
|
|
fastmode: init_config.common_args.fastmode,
|
|
no_cover: init_config.common_args.no_cover,
|
|
medium_toggle: false,
|
|
nyxd_urls: init_config.common_args.nyxd_urls,
|
|
enabled_credentials_mode: init_config.common_args.enabled_credentials_mode,
|
|
open_proxy: init_config.open_proxy,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl AsRef<CommonClientInitArgs> for Init {
|
|
fn as_ref(&self) -> &CommonClientInitArgs {
|
|
&self.common_args
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Serialize)]
|
|
pub struct InitResults {
|
|
#[serde(flatten)]
|
|
client_core: nym_client_core::init::types::InitResults,
|
|
client_address: String,
|
|
}
|
|
|
|
impl InitResults {
|
|
fn new(res: InitResultsWithConfig<Config>) -> Self {
|
|
Self {
|
|
client_address: res.init_results.address.to_string(),
|
|
client_core: res.init_results,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Display for InitResults {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
writeln!(f, "{}", self.client_core)?;
|
|
write!(
|
|
f,
|
|
"Address of this network-requester: {}",
|
|
self.client_address
|
|
)
|
|
}
|
|
}
|
|
|
|
pub(crate) async fn execute(args: Init) -> Result<(), NetworkRequesterError> {
|
|
eprintln!("Initialising client...");
|
|
|
|
let output = args.output;
|
|
let res = initialise_client::<CliNetworkRequesterClient>(args, None).await?;
|
|
|
|
let init_results = InitResults::new(res);
|
|
println!("{}", output.format(&init_results));
|
|
|
|
Ok(())
|
|
}
|