refactor: adjust embedded file for serve

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pingap"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Tree Xie <tree.xie@outlook.com>"]
 edition = "2021"
 categories = ["network-programming", "web-programming::http-server"]

src/cache/http_response.rs → src/http_extra/http_response.rs

@@ -118,7 +118,7 @@ impl HttpResponse {
 #[cfg(test)]
 mod tests {
     use super::HttpResponse;
-    use crate::cache::convert_headers;
+    use crate::http_extra::convert_headers;
     use bytes::Bytes;
     use http::StatusCode;
     use pretty_assertions::assert_eq;

src/lib.rs

@@ -1,5 +1,5 @@
-pub mod cache;
 pub mod config;
+pub mod http_extra;
 pub mod proxy;
 pub mod serve;
 pub mod state;

src/main.rs

@@ -9,8 +9,8 @@ use std::error::Error;
 use std::io::Write;
 use std::sync::Arc;
 
-mod cache;
 mod config;
+mod http_extra;
 mod proxy;
 mod serve;
 mod state;

src/proxy/location.rs

@@ -1,6 +1,6 @@
 use super::Upstream;
-use crate::cache::{convert_headers, HttpHeader};
 use crate::config::LocationConf;
+use crate::http_extra::{convert_headers, HttpHeader};
 use pingora::http::{RequestHeader, ResponseHeader};
 use regex::Regex;
 use snafu::{ResultExt, Snafu};

src/proxy/server.rs

@@ -1,7 +1,7 @@
 use super::logger::Parser;
 use super::{Location, Upstream};
-use crate::cache;
 use crate::config::{LocationConf, PingapConf, UpstreamConf};
+use crate::http_extra::{HttpResponse, HTTP_HEADER_CONTENT_JSON};
 use crate::serve::Serve;
 use crate::serve::ADMIN_SERVE;
 use crate::state::State;
@@ -276,10 +276,10 @@ impl Server {
         })
         .unwrap_or_default();
 
-        let size = cache::HttpResponse {
+        let size = HttpResponse {
             status: StatusCode::OK,
             body: Bytes::from(buf),
-            headers: Some(vec![cache::HTTP_HEADER_CONTENT_JSON.clone()]),
+            headers: Some(vec![HTTP_HEADER_CONTENT_JSON.clone()]),
             ..Default::default()
         }
         .send(session)

src/serve/admin.rs

@@ -1,9 +1,10 @@
-use super::static_file::StaticFile;
+use super::embedded_file::EmbeddedStaticFile;
 use super::Serve;
+use crate::config::PingapConf;
 use crate::config::{self, get_start_time, save_config, LocationConf, ServerConf, UpstreamConf};
+use crate::http_extra::HttpResponse;
 use crate::state::State;
 use crate::utils::get_pkg_version;
-use crate::{cache::HttpResponse, config::PingapConf};
 use async_trait::async_trait;
 use http::{Method, StatusCode};
 use log::error;
@@ -200,7 +201,7 @@ impl Serve for AdminServe {
             if file.is_empty() {
                 file = "index.html";
             }
-            StaticFile(AdminAsset::get(file)).into()
+            EmbeddedStaticFile(AdminAsset::get(file), 365 * 24 * 3600).into()
         };
         ctx.response_body_size = resp.send(session).await?;
         Ok(true)

src/serve/static_file.rs → src/serve/embedded_file.rs

@@ -1,14 +1,13 @@
+use crate::http_extra::HttpResponse;
 use bytes::Bytes;
 use hex::encode;
 use http::{header, HeaderValue, StatusCode};
 use rust_embed::EmbeddedFile;
 
-use crate::cache::HttpResponse;
+pub struct EmbeddedStaticFile(pub Option<EmbeddedFile>, pub u32);
 
-pub struct StaticFile(pub Option<EmbeddedFile>);
-
-impl From<StaticFile> for HttpResponse {
-    fn from(value: StaticFile) -> Self {
+impl From<EmbeddedStaticFile> for HttpResponse {
+    fn from(value: EmbeddedStaticFile) -> Self {
         if value.0.is_none() {
             return HttpResponse::not_found();
         }
@@ -25,7 +24,7 @@ impl From<StaticFile> for HttpResponse {
         let max_age = if mime_type.contains("text/html") {
             0
         } else {
-            24 * 3600
+            value.1
         };
 
         let mut headers = vec![];

src/serve/mod.rs

@@ -3,7 +3,7 @@ use async_trait::async_trait;
 use pingora::proxy::Session;
 
 mod admin;
-mod static_file;
+mod embedded_file;
 
 #[async_trait]
 pub trait Serve {