[Fix] API

src/main.rs

@@ -1,10 +1,11 @@
 mod server;
 mod sql;
+mod transport;
 mod util;
 
-use crate::server::omikron_connection;
 use crate::sql::sql::initialize_db;
 use crate::sql::sql::print_users;
+use crate::transport::omikron_connection;
 use crate::util::crypto_helper::load_public_key;
 use crate::util::crypto_helper::load_secret_key;
 use crate::util::logger::PrintType;

src/server/api.rs

@@ -1,7 +1,7 @@
 use crate::get_public_key;
-use crate::server::omikron_manager::get_random_omikron;
 use crate::sql::sql;
 use crate::sql::user_online_tracker::get_iota_primary_omikron_connection;
+use crate::transport::omikron_manager::get_random_omikron;
 use crate::{
     sql::sql::{get_by_user_id, get_omikron_by_id},
     util::crypto_helper::public_key_to_base64,
@@ -272,10 +272,3 @@ pub async fn handle(path: &str, body_string: Option<String>) -> HttpResponse {
         .insert_header((header::ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, OPTIONS"))
         .body(body_bytes)
 }
-
-pub fn bad_request() -> (StatusCode, String) {
-    (StatusCode::BAD_REQUEST, "400 Bad Request".to_string())
-}
-pub fn not_found() -> (StatusCode, String) {
-    (StatusCode::NOT_FOUND, "404 Not Found".to_string())
-}

src/server/mod.rs

@@ -1,5 +1,3 @@
 pub mod api;
-pub mod omikron_connection;
-pub mod omikron_manager;
 pub mod server;
 pub mod short_link;

src/server/server.rs

@@ -1,7 +1,7 @@
 use crate::{
     log,
     server::{api, short_link::get_short_link},
-    util::file_util::get_directory,
+    util::file_util::load_file_buf,
 };
 
 use actix_web::{App, HttpRequest, HttpResponse, HttpServer, Responder, http::header, web};
@@ -10,14 +10,10 @@ use rustls::ServerConfig;
 use rustls::pki_types::{CertificateDer, PrivateKeyDer};
 use rustls_pemfile::{certs, pkcs8_private_keys};
 
-use std::fs::File;
-use std::io::BufReader;
-
 pub async fn start(port: u16) -> anyhow::Result<()> {
-    let mut cert_reader =
-        BufReader::new(File::open(format!("{}/certs/cert.pem", get_directory()))?);
+    let mut cert_reader = load_file_buf("certs", "server_cert.pem")?;
 
-    let mut key_reader = BufReader::new(File::open(format!("{}/certs/key.pem", get_directory()))?);
+    let mut key_reader = load_file_buf("certs", "server_key.pem")?;
 
     let cert_chain: Vec<CertificateDer<'static>> =
         certs(&mut cert_reader).collect::<Result<_, _>>()?;

src/transport/mod.rs

@@ -0,0 +1,2 @@
+pub mod omikron_connection;
+pub mod omikron_manager;

src/transport/omikron_connection.rs

@@ -1,11 +1,12 @@
 use crate::{
     get_private_key, get_public_key, log, log_cv_in, log_cv_out, log_err, log_in,
-    server::{omikron_manager, short_link::add_short_link},
+    server::short_link::add_short_link,
     sql::{
         connection_status::UserStatus,
         sql::{self, get_by_user_id, get_by_username, get_iota_by_id, get_omikron_by_id},
         user_online_tracker::{self},
     },
+    transport::omikron_manager,
     util::{crypto_helper::encrypt, file_util::load_file_vec, logger::PrintType},
 };
 use base64::{Engine as _, engine::general_purpose::STANDARD};
@@ -1120,9 +1121,9 @@ impl OmikronConnection {
 // ============================================================================
 
 pub async fn start(port: u16) -> Result<(), Box<dyn std::error::Error>> {
-    let cert_pem = load_file_vec("certs", "cert.pem").expect("Error loading Pemfile");
+    let cert_pem = load_file_vec("certs", "transport_cert.pem").expect("Error loading Pemfile");
 
-    let key_pem = load_file_vec("certs", "key.pem").expect("Error loading Keyfile");
+    let key_pem = load_file_vec("certs", "transport_key.pem").expect("Error loading Keyfile");
 
     let mut host: Host = epsilon_native::host(port, cert_pem, key_pem).await?;
     log!("OmikronServer listening on port {}", port);

src/transport/omikron_manager.rs

@@ -1,4 +1,4 @@
-use crate::server::omikron_connection::OmikronConnection;
+use crate::transport::omikron_connection::OmikronConnection;
 use dashmap::DashMap;
 use once_cell::sync::Lazy;
 use rand::prelude::IteratorRandom;