change markdown

Author: timzaak

docs/develop/change-log.md

@@ -1,5 +1,7 @@
 # Change Log
-
+### Version 3.0.0
+- rewrite, remove warp and cors, openTelemetry.
+- bump deps.
 ### Version 2.4.1
 - conf: spa-server: `cors` value bool to array string.
 - improve: bump deps version.

docs/guide/break-changes.md

@@ -1,4 +1,6 @@
 # Break Changes
+## V3.0.0
+* spa-server: remove cors, acme, openTelemetry, cache config, remove hot reload.
 ## V2.4.1
 * spa-server: `cors` value bool to array string.
 ## V2.4.0(2024-08-04)

docs/guide/spa-client-command-line.md

@@ -38,8 +38,6 @@ spa-client -c $CONFIG_PATH release $DOMAIN $OPT_VERSION
 # get info of the specific domain or all domain, just like the admin server http api.
 spa-client -c $CONFIG_PATH info $OPT_DOMAIN
 
-# reload spa-server, this is used to reload https cert
-spa-client -c $CONFIG_PATH reload
 
 # delete deprecated domain files
 spa-client -c $CONFIG_PATH delete $OPT_DOMAIN $OPT_MAX_RESERVE

docs/guide/spa-server-configuration.md

@@ -12,7 +12,7 @@ The config default path is `./config.toml`, you can change it by environment `SP
 
 ```toml
 ## directory to store static web files. if you use docker, please mount a persistence volume for it.
-file_dir = "/data"
+file_dir = "./data"
 
 ## enable cors, default is none, if cors is [], then all cors is ok.
 ## Access-Control-Allow-Origin: $ORIGIN
@@ -32,51 +32,6 @@ addr = "0.0.0.0"
 ## it would the port would be https.external_port(https.external_port should be defined), otherwise is false
 # redirect_https = true
 
-# [https]
-# port = 443 # https bind address
-# addr = "0.0.0.0"
-## port when serving public network,default is https port. external_port should not be 0.
-# external_port = 443
-
-## if set true, http server(80) will send client
-## status code:301(Moved Permanently) to tell client redirect to https
-
-## default value for https ssl
-# [https.ssl]
-# private = "private.key path" # private ssl key
-# public = "public.cert path" # public ssl cert
-
-## acme config, it doest not support run with https.ssl config.
-# [https.acme]
-## emails to Let's Encrypt needs to interact.
-# emails = ["mailto:[email protected]"]
-
-## directory to store account and certificate
-## optional, default is ${file_dir}/acme
-# dir = "/data/acme"
-
-## ci / stage / prod, default is prod, ci is just for CI test with Pebble, don't use it.
-# type = prod
-
-## default cache config
-[cache]
-## if file size > max_size, it will not be cached. default is (10MB).
-# max_size = 10_000_000
-## gzip compression for js/json/icon/json, default is false,
-## only support gzip algo, and only compress cached files,
-## be careful to set it true
-# compression = false
-
-## http header Cache-Control config,
-## optional, if not set, won't sender this header to client
-# [[cache.client_cache]]
-## 30day
-# expire = '30d'
-# extension_names = ['icon', 'gif', 'jpg', 'jpeg', 'png', 'js']
-# [[cache.client_cache]]
-# expire = '0'
-# extension_names = ['html']
-
 ## admin server config
 ## admin server don't support hot reload. the config should not change.
 ## optional, and it's disabled by default.
@@ -109,18 +64,4 @@ addr = "0.0.0.0"
 ## it would the port would be https.external_port(https.external_port should be defined), otherwise is false
 # redirect_https = 443
 
-## this would be usefully when set https.acme
-# disable_acme = false
-# [domains.https.ssl]
-
-# [domains.cache]
-# max_size = 10_000_000
-# compression = false
-# [[domains.cache.client_cache]]
-# expire = '30d' # 30day
-# extension_names = ['icon', 'gif', 'jpg', 'jpeg', 'png', 'js']
-
-
-# [openTelemetry]
-# endpoint = "http://localhost:4317"
 ```

docs/guide/spa-server-https.md

@@ -25,13 +25,8 @@ SPA.
 
 ## Feature
 
-- Built with Hyper and Warp, fast and small!
-- SSL with Rustls.
-- Memory cache, client cache and compression(gzip).
+- Built with Hyper and Salvo, fast and small!
 - Static web version control, you can regress or release new version easily.
-- Hot reload support(Mac and Linux, by reused port).
-- CORS support.
-- Http auto redirect to https.
 - Docker support(compressed size: 32M).
 - Provide command line/npm package to deploy spa.
 - Multiple configs for different domain and Multiple SPA in on domain.

docs/index.md

@@ -2,9 +2,36 @@ use crate::config::{get_host_path_from_domain, AdminConfig};
 use crate::domain_storage::DomainStorage;
 use delay_timer::prelude::*;
 use salvo::prelude::*;
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::sync::Arc;
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+struct BearerValidator {
+    token: String,
+}
+
+#[async_trait]
+impl Handler for BearerValidator {
+    async fn handle(
+        &self,
+        req: &mut Request,
+        depot: &mut Depot,
+        res: &mut Response,
+        ctrl: &mut FlowCtrl,
+    ) {
+        match req.headers().get("Authorization") {
+            Some(value) if value == &self.token => {
+                ctrl.call_next(req, depot, res).await;
+            }
+            _ => {
+                res.status_code(StatusCode::UNAUTHORIZED);
+                ctrl.skip_rest();
+            }
+        }
+    }
+}
+
 pub struct AdminServer {
     conf: Arc<AdminConfig>,
     domain_storage: Arc<DomainStorage>,
@@ -28,7 +55,10 @@ impl AdminServer {
     }
 
     fn routes(&self) -> Router {
-        Router::with_hoop(
+        Router::with_hoop(BearerValidator {
+            token: format!("Bearer {}", self.conf.token),
+        })
+        .hoop(
             affix_state::inject(self.domain_storage.clone())
                 .inject(self.conf.clone())
                 .inject(self.host_alias.clone()),