Compare commits
3 Commits
512a406f43
...
6bf609c162
Author | SHA1 | Date | |
---|---|---|---|
6bf609c162 | |||
5d5ed9da8e | |||
06b32db707 |
34
src/main.rs
34
src/main.rs
@ -10,7 +10,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use colored::*;
|
||||
use tokio_socks::tcp::Socks5Stream;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
#[derive(Deserialize, Clone)]
|
||||
struct Config {
|
||||
server: String,
|
||||
port: u16,
|
||||
@ -22,6 +22,9 @@ struct Config {
|
||||
sasl_password: Option<String>,
|
||||
capabilities: Option<Vec<String>>,
|
||||
|
||||
reconnect_delay: u64,
|
||||
reconnect_attempts: u64,
|
||||
|
||||
// Proxy
|
||||
use_proxy: bool,
|
||||
proxy_type: Option<String>,
|
||||
@ -45,13 +48,18 @@ use mods::ascii::handle_ascii_command;
|
||||
|
||||
#[tokio::main(flavor = "multi_thread", worker_threads = 12)]
|
||||
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
tokio::spawn(async move {
|
||||
//tokio::spawn(async move {
|
||||
println!("Loading Config...");
|
||||
let config = loaded_config().expect("Error parsing config.toml");
|
||||
println!("Config loaded!");
|
||||
let mut reconnect_attempts = 0;
|
||||
|
||||
let server = format!("{}:{}", config.server, config.port);
|
||||
while reconnect_attempts < config.reconnect_attempts {
|
||||
let configc = config.clone();
|
||||
|
||||
let server = format!("{}:{}", configc.server, configc.port);
|
||||
let connection_result = tokio::spawn(async move {
|
||||
let config = configc.clone();
|
||||
if config.use_ssl {
|
||||
if config.use_proxy {
|
||||
let tcp_stream = proxy_exec(&config).await;
|
||||
@ -81,7 +89,21 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
} else {
|
||||
println!("Non-SSL connection not implemented.");
|
||||
}
|
||||
Ok::<(), Box<dyn std::error::Error + Send>>(())
|
||||
}).await.unwrap();
|
||||
match connection_result {
|
||||
Ok(_) => {
|
||||
println!("Connection established successfully!");
|
||||
reconnect_attempts = 0;
|
||||
},
|
||||
Err(e) => {
|
||||
println!("Error handling connection: {}", e);
|
||||
reconnect_attempts += 1;
|
||||
tokio::time::sleep(tokio::time::Duration::from_secs(config.reconnect_delay)).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
println!("Reconnect attempts exceeded. Exiting...");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -217,9 +239,9 @@ async fn writemsg(mut writer: tokio::io::WriteHalf<tokio_native_tls::TlsStream<T
|
||||
}
|
||||
}
|
||||
if *cmd == "KICK" {
|
||||
let channel = parts[2];
|
||||
let userme = parts[3];
|
||||
if userme == nickname {
|
||||
let channel = parts.get(2).unwrap_or(&"");
|
||||
let userme = parts.get(3).unwrap_or(&"");
|
||||
if *userme == nickname {
|
||||
writer.write_all(format!("JOIN {}\r\n", channel).as_bytes()).await.unwrap();
|
||||
writer.flush().await.unwrap();
|
||||
}
|
||||
|
@ -27,7 +27,6 @@ async fn send_ansi_art<W: AsyncWriteExt + Unpin>(writer: &mut W, file_path: &str
|
||||
let reader = BufReader::new(file);
|
||||
let mut lines = reader.lines();
|
||||
|
||||
|
||||
while let Some(line) = lines.next_line().await? {
|
||||
|
||||
if line.len() > CHUNK_SIZE {
|
||||
@ -77,7 +76,7 @@ pub async fn handle_ascii_command<W: AsyncWriteExt + Unpin>(
|
||||
if *command_type == "random" && parts.len() == 2 {
|
||||
handle_random(writer, config, channel).await?;
|
||||
} else if *command_type == "list"{
|
||||
handle_list(writer, config, channel, Some(parts.get(3).unwrap_or(&""))).await?;
|
||||
handle_list(writer, config, channel, Some(parts.get(2).unwrap_or(&""))).await?;
|
||||
} else {
|
||||
handle_specific_file(writer, config, channel, &parts).await?;
|
||||
}
|
||||
@ -104,10 +103,11 @@ async fn handle_list<W: AsyncWriteExt + Unpin>(
|
||||
writer: &mut W,
|
||||
config: &Config,
|
||||
channel: &str,
|
||||
subdirectory: Option<&str>,
|
||||
parts: Option<&str>
|
||||
) -> Result<(), Box<dyn Error>> {
|
||||
let base_dir = config.ascii_art.clone().unwrap_or_else(|| "ascii_art".to_string());
|
||||
let dir = if let Some(subdir) = subdirectory {
|
||||
|
||||
let dir = if let Some(subdir) = parts {
|
||||
format!("{}/{}", base_dir, subdir)
|
||||
} else {
|
||||
base_dir
|
||||
|
Loading…
Reference in New Issue
Block a user