APIサーバーの追加と転送サーバーの削除、設定ファイルの更新

Author: 371tti

src/transfer/config.rs renamed to src/api/config.rs

@@ -4,4 +4,5 @@ use serde::Deserialize;
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct ServiceConfig {
+    pub path: String,
 }

src/transfer/loader.rs renamed to src/api/loader.rs

@@ -0,0 +1,69 @@
+use std::{sync::Arc, thread::sleep, time::Duration};
+use actix_files as fs;
+
+use actix_web::{dev::Server, middleware::{self, Logger}, web, App, HttpServer};
+use log::{error, info};
+
+use crate::{actix_middleware::status_page, config::ServerConfig, server::server_trait::WkServer, share::{self, collection::Collection}, utils};
+
+use super::config::ServiceConfig;
+
+pub struct APIServer {
+    pub config: ServerConfig<ServiceConfig>,
+    pub share: Arc<Collection>,
+}
+
+impl APIServer {
+    pub fn new(config: ServerConfig<ServiceConfig>, share: Arc<Collection>) -> Self {
+        Self {
+            config: config,
+            share: share,
+        }
+    }
+    
+    pub fn create_server(&self) -> Result<Server, std::io::Error> {
+        let path = match utils::fs::get_file_path(&self.share.config.path) {
+            Ok(p) => p.join(self.share.config.api_server.service_config.path.clone()),
+            Err(e) => return Err(std::io::Error::new(std::io::ErrorKind::Other, e.to_string())),
+        };
+
+        let server_name = self.server_name().to_string();
+        let path_clone = path.clone();
+        let share_clone = web::Data::new(Arc::clone(&self.share));
+        let server = HttpServer::new(move || {
+            let custom_logger = utils::logger::custom_actix_logger(&server_name);
+            App::new()
+                .app_data(share_clone.clone())
+                .wrap(custom_logger)
+                .wrap(middleware::ErrorHandlers::new().default_handler(status_page::middleware::Handler::err_handler))
+                // 他のミドルウェアやデータをここに追加可能
+                .service(fs::Files::new("/", path_clone.clone()).index_file("index.html"))
+        })
+        .bind(self.config.server_bind.clone())?
+        .workers(self.config.server_workers)
+        .backlog(self.config.server_backlog)
+        .run();
+
+        Ok(server)
+    }
+
+}
+
+impl WkServer<ServiceConfig> for APIServer {
+    fn config(&self) -> &ServerConfig<ServiceConfig> {
+        &self.config
+    }
+
+    fn create_server(&self) -> Result<Server, std::io::Error> {
+        APIServer::create_server(self)
+    }
+
+    fn server_name(&self) -> &str {
+        "APIServer"
+    }
+
+    fn failed_report(&mut self, e: std::io::Error, failure_count: u32, start_time: tokio::time::Instant) {
+        
+    }
+    
+}

src/transfer/mod.rs renamed to src/api/mod.rs

@@ -4,7 +4,7 @@ use actix_web::middleware::Logger;
 use serde::Deserialize;
 use log::{error, info};
 
-use crate::{actix_middleware::config::MiddlewareConfig, index::{self, loader, server::IndexServer}, transfer, utils};
+use crate::{actix_middleware::config::MiddlewareConfig, index::{self, loader, server::IndexServer}, api, utils};
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct ServerConfig<ServiceConfig> {
@@ -22,7 +22,7 @@ pub struct ServerConfig<ServiceConfig> {
 #[derive(Debug, Clone, Deserialize)]
 pub struct Configuration {
     pub index_server: ServerConfig<index::config::ServiceConfig>,
-    pub transfer_server: ServerConfig<transfer::config::ServiceConfig>,
+    pub api_server: ServerConfig<api::config::ServiceConfig>,
     pub path: String,
     pub logger_mode: String,
     pub middleware_config: MiddlewareConfig,

src/transfer/router.rs renamed to src/api/router.rs

@@ -18,12 +18,12 @@ mod config;
 mod share;
 mod actix_middleware;
 mod utils;
-mod transfer;
+mod api;
 mod server;
 
 async fn server_start(config: Configuration, collection: Arc<Collection>) -> Result<(), Error> {
     let index_server = index::server::IndexServer::new(config.index_server, Arc::clone(&collection)).run_with_restart();
-    let transfer_server = transfer::server::TransferServer::new(config.transfer_server, Arc::clone(&collection)).run_with_restart();
+    let transfer_server = api::server::APIServer::new(config.api_server, Arc::clone(&collection)).run_with_restart();
     // 追加していくの
 
     let result = tokio::join!(