merge multi_config

It's a big commit!
- fix: npm package error
- fix: wrong check when release new domain
- feat: support multiple config for different domain
- feat: support multiple ssl
- doc: add multile config doc
- doc: add break change doc

Author: timzaak

.github/workflows/spa-client-js-cd.yml

@@ -3,4 +3,6 @@
 /tmp
 config.conf
 /node_modules
-package-lock.json
+package-lock.json
+
+.DS_Store

.gitignore

@@ -13,6 +13,7 @@ It is to provide a static web http server with cache and hot reload.
 - Http auto redirect to https.
 - Docker support(compressed size: 32M).
 - Provide command line/npm package to deploy spa.
+- Multiple configs for different domain.
 
 ## Document
 There is a nice [document](https://timzaak.github.io/spa-server/) powered by VitePress and GitHub Pages,

Cargo.lock

@@ -12,6 +12,7 @@
 - http/https 同时服务（http 也可返回 redirect https）。
 - 支持 Docker 镜像(压缩后大小:32M)
 - 提供 命令行/npm包 客户端，一行命令部署
+- 每个域名可拥有独立的配置
 
 ## 文档
 目前将文档托管在 GitHub Pages，地址：https://timzaak.github.io/spa-server， 

README.md

@@ -46,7 +46,7 @@ indicatif = "0.16"
 
 md-5 = "0.10"
 # util
-anyhow = "1.0"
+anyhow = { version = "1.0", features = ["backtrace"] }
 walkdir = "2.3"
 if_chain = "1.0"
 

README_CN.md

@@ -10,7 +10,7 @@ use crate::api::API;
 use crate::commands::{CliCommand, Commands};
 use crate::config::Config;
 use crate::upload_files::upload_files;
-use anyhow::{anyhow, Context};
+use anyhow::anyhow;
 
 use clap::Parser;
 use console::style;
@@ -42,10 +42,10 @@ fn success(message: &str) {
 
 fn run_with_commands(commands: CliCommand) -> anyhow::Result<()> {
     let config = Config::load(commands.config_dir).map_err(|e| {
-        Err(anyhow!(
+        anyhow!(
             "Please set config file path or environment variable correctly, {}",
             e
-        ));
+        )
     })?;
     println!(
         "spa-client connect to admin server({})",
@@ -108,11 +108,11 @@ mod test {
     #[test]
     fn test_release() {
         init_config();
-        run_with_commands(CliCommand::parse_from(&[
+        let result = run_with_commands(CliCommand::parse_from(&[
             "test",
             "release",
             "self.noti.link",
-        ]))
-        .unwrap();
+        ]));
+        result.unwrap();
     }
 }

client/Cargo.toml

@@ -1,40 +1,47 @@
-# http bind, if set port <= 0, will disable http server.
+# http bind, if set port <= 0, will disable http server(need set https config)
 port = 80
 addr = "0.0.0.0"
 
-# directory to store static files.
+# directory to store static web files. if you use docker, please mount a persistence volume for it.
 file_dir = "/data"
 
 # enable cors, default is false, its implementation is simple now.
-# Access-Control-Allow-Origin: *
+# Access-Control-Allow-Origin: $ORIGIN
 # Access-Control-Allow-Methods: OPTION,GET,HEAD
 # Access-Control-Max-Age: 3600
 // cors = true
 
 # https config, optional
 //https {
-//  # private ssl key
-//  private = "private.key path",
-//  # public ssl cert
-//  public = "public.cert path"
+//  # default value for https ssl
+//  ssl {
+//    # private ssl key
+//    private = "private.key path",
+//    # public ssl cert
+//    public = "public.cert path"
+//  }
+
+//  # https bind address
 //  port = 443
 //  addr = "0.0.0.0"
-//  # if set true, http server(80) will send client 301(Moved Permanently) to https.
+
+//  # if set true, http server(80) will send client
+//  # status code:301(Moved Permanently) to tell client redirect to https
 //  # optional, default is false
 //  http_redirect_to_https = false
-//  # gzip compression for js/json/icon/json, default is false,
-//  # only support gzip algo, only compress cached files,
-//  # will occur error when client don't support gzip
-//  # be careful to set it true
-//  compression = false
 //}
 
-# cache config
+
+
+# default cache config
 //cache {
 //  # if file size > max_size, it will not be cached. default is 10485760 (10MB).
-//  # do not use size unit format like 50m! It's blocked by [hocon #62](https://github.com/mockersf/hocon.rs/issues/62)
+//  # do not use size unit format like 50MB!
+//  # It's blocked by [hocon #62](https://github.com/mockersf/hocon.rs/issues/62)
 //  max_size = 10485760  //10MB 10*1024*1024
-//  # Cache-Control config, optional
+
+//  # http header Cache-Control config,
+//  # optional, if not set, won't sender this header to client
 //  client_cache = [{
 //    expire = 30d
 //    extension_names = [icon,gif,jpg,jpeg,png,js]
@@ -43,14 +50,48 @@ file_dir = "/data"
 //    expire = 0
 //    extension_names = [html]
 //  }]
+
+//  # 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
+
 //}
 
-# admin server config, optional, and it's disabled by default. hot reload don't support admin server reload. the config should not change.
+//# admin server config
+//# admin server don't support hot reload. the config should not change.
+//# optional, and it's disabled by default.
+//# if you use spa-client to upload files, control version. Need to open it
 //admin_config {
+//# bind host
 //  port = 9000
 //  addr = "127.0.0.1"
-//  # this is used as auth check. In Header:  Authorization: Bearer token
+
+//  # this is used to check client request
+//  # put it in http header,  Authorization: Bearer $token
 //  token = "token"
-//  # max file size allowed to be uploaded, default is 30MB(30*1024*1024)
+
+//  # max file size allowed to be uploaded,
+//  # default is 30MB(30*1024*1024)
 //  max_upload_size = 31457280
 //}
+
+
+# optional, domains specfic config, it will use the default config if not set
+//domains = [{
+//  # domain name
+//  domain: "www.example.com",
+//  // optional, same with cache config, if not set, will use default cache config.
+//  cache: {
+//    client_cache:${cache.client_cache}
+//    max_size: ${cache.max_size}
+//    client_cache = ${cache.client_cache}
+//  },
+//  # cors
+//  cors: ${cors},
+//  # domain https config, if not set, will use default https config.
+//  https: {
+//    ssl: ${https.ssl}
+//    http_redirect_to_https: ${https.http_redirect_to_https}
+//  }
+//}]

client/src/lib.rs

@@ -7,4 +7,7 @@ VERSION=1.2.1
 
 DOCKER_BUILDKIT=1 docker build . -t="timzaak/spa-server:$VERSION"
 
-```
+```
+
+## SSL self sign
+you can go here to sign: http://cookcode.cc/selfsign