@browsersync/bslive 0.0.9 → 0.0.14

package/crates/bsnext_input/src/input_test/snapshots/bsnext_input__input_test__deserialize_3_headers_control.snap

@@ -0,0 +1,25 @@
+---
+source: crates/bsnext_input/src/input_test/mod.rs
+expression: c
+---
+Config {
+    items: [
+        Route {
+            path: "/api",
+            cors_opts: None,
+            delay_opts: None,
+            watch_opts: Bool(
+                true,
+            ),
+            kind: Json {
+                json: JsonWrapper(
+                    Array [
+                        Number(1),
+                        Number(2),
+                    ],
+                ),
+            },
+            headers: None,
+        },
+    ],
+}

package/crates/bsnext_input/src/route.rs

@@ -1,3 +1,4 @@
+use std::collections::BTreeMap;
 use std::fmt::{Display, Formatter};
 use std::hash::{Hash, Hasher};
 use std::ops::Deref;
@@ -16,6 +17,7 @@ pub struct Route {
     pub watch_opts: WatchOpts,
     #[serde(flatten)]
     pub kind: RouteKind,
+    pub headers: Option<BTreeMap<String, String>>,
 }
 
 impl Default for Route {
@@ -28,6 +30,7 @@ impl Default for Route {
             delay_opts: None,
             cors_opts: None,
             watch_opts: Default::default(),
+            headers: None,
         }
     }
 }
@@ -137,6 +140,7 @@ pub enum FilterKind {
     StringGlob(String),
     Extension { ext: String },
     Glob { glob: String },
+    List(Vec<FilterKind>),
 }
 
 #[derive(

package/crates/bsnext_output/src/pretty.rs

@@ -38,7 +38,7 @@ pub fn print_file_changed<W: Write>(w: &mut W, evt: &FileChanged) -> anyhow::Res
 
 pub fn print_files_changed<W: Write>(w: &mut W, evt: &FilesChangedDTO) -> anyhow::Result<()> {
     match evt.paths.len() {
-        0 | 1 | 2 => {
+        0..=2 => {
             writeln!(w, "[multi-change] {}", short_file_list(&evt.paths))?;
         }
         3.. => {

package/crates/bsnext_system/Cargo.toml

@@ -26,4 +26,4 @@ random_word = { workspace = true }
 tempfile = { workspace = true }
 
 [dev-dependencies]
-insta = { version = "1.38.0", features = ["yaml"] }
+insta = { workspace = true }

package/crates/bsnext_system/src/args.rs

@@ -7,6 +7,10 @@ pub struct Args {
     #[arg(short, long, value_enum)]
     pub log_level: Option<LogLevel>,
 
+    /// output internal logs to bslive.log in the current directory
+    #[arg(long, name = "write-log")]
+    pub write_log: bool,
+
     #[arg(short, long, value_enum)]
     pub format: Option<OutputFormat>,
 
@@ -37,7 +41,6 @@ pub struct Args {
     #[arg(short, long)]
     pub port: Option<u16>,
 
-    /// Paths to watch, incompatible with `-i` option
-    #[arg(trailing_var_arg = true, allow_hyphen_values = true, long)]
+    /// Paths to serve + possibly watch, incompatible with `-i` option
     pub paths: Vec<String>,
 }

package/crates/bsnext_system/src/monitor_any_watchables.rs

@@ -54,20 +54,11 @@ impl actix::Handler<MonitorAnyWatchables> for BsSystem {
             };
 
             if let Some(opts) = &watchable.spec_opts() {
-                // todo: handle the specs here!
-                if let Some(filter) = &opts.filter {
-                    let f = match filter {
-                        FilterKind::Extension { ext } => Filter::Extension {
-                            ext: ext.to_string(),
-                        },
-                        FilterKind::StringGlob(glob) => Filter::Glob {
-                            glob: glob.to_owned(),
-                        },
-                        FilterKind::Glob { glob } => Filter::Glob {
-                            glob: glob.to_owned(),
-                        },
-                    };
-                    input_watcher.with_filter(f);
+                if let Some(filter_kind) = &opts.filter {
+                    let filters = convert(&filter_kind);
+                    for filter in filters {
+                        input_watcher.with_filter(filter);
+                    }
                 }
             }
 
@@ -98,6 +89,21 @@ impl actix::Handler<MonitorAnyWatchables> for BsSystem {
     }
 }
 
+fn convert(fk: &FilterKind) -> Vec<Filter> {
+    match fk {
+        FilterKind::StringGlob(sg) => vec![Filter::Glob {
+            glob: sg.to_string(),
+        }],
+        FilterKind::Extension { ext } => vec![Filter::Extension {
+            ext: ext.to_string(),
+        }],
+        FilterKind::Glob { glob } => vec![Filter::Glob {
+            glob: glob.to_string(),
+        }],
+        FilterKind::List(items) => items.into_iter().flat_map(convert).collect::<Vec<_>>(),
+    }
+}
+
 #[derive(actix::Message)]
 #[rtype(result = "()")]
 struct DropMonitor(AnyWatchable);

package/crates/bsnext_system/src/start_kind/snapshots/bsnext_system__start_kind__start_from_paths__test__test-2.snap

@@ -1,5 +1,5 @@
 ---
-source: bsnext_system/src/start_kind/start_from_paths.rs
+source: crates/bsnext_system/src/start_kind/start_from_paths.rs
 expression: input
 ---
 servers:
@@ -8,4 +8,5 @@ servers:
       - path: /
         watch: true
         dir: "."
+        headers: ~
     watchers: []

package/crates/bsnext_system/src/start_kind/snapshots/bsnext_system__start_kind__start_from_paths__test__test.snap

@@ -1,5 +1,5 @@
 ---
-source: bsnext_system/src/start_kind/start_from_paths.rs
+source: crates/bsnext_system/src/start_kind/start_from_paths.rs
 expression: input
 ---
 Input {
@@ -21,6 +21,7 @@ Input {
                             dir: ".",
                         },
                     ),
+                    headers: None,
                 },
             ],
             watchers: [],

package/crates/bsnext_tracing/src/lib.rs

@@ -1,4 +1,5 @@
 use std::fmt::{Display, Formatter};
+use std::fs::File;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 
@@ -33,6 +34,12 @@ pub enum OutputFormat {
     Normal,
 }
 
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, clap::ValueEnum)]
+pub enum WriteOption {
+    File,
+    None,
+}
+
 impl Display for OutputFormat {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -47,7 +54,11 @@ impl Default for OutputFormat {
         Self::Normal
     }
 }
-pub fn init_tracing(log_level: Option<LogLevel>, format: Option<OutputFormat>) {
+pub fn init_tracing(
+    log_level: Option<LogLevel>,
+    format: Option<OutputFormat>,
+    write_option: WriteOption,
+) {
     let log_level = log_level.unwrap_or(LogLevel::Error);
     let level = log_level.to_string();
     let lines = [
@@ -59,8 +70,8 @@ pub fn init_tracing(log_level: Option<LogLevel>, format: Option<OutputFormat>) {
     ];
     let debug_str = lines.join(",");
 
-    match format.unwrap_or_default() {
-        OutputFormat::Json => {
+    match (format.unwrap_or_default(), write_option) {
+        (OutputFormat::Json, WriteOption::None) => {
             let fmt_layer = tracing_subscriber::fmt::layer()
                 .without_time()
                 .json()
@@ -73,7 +84,21 @@ pub fn init_tracing(log_level: Option<LogLevel>, format: Option<OutputFormat>) {
                 .with(fmt_layer)
                 .init();
         }
-        OutputFormat::Normal => {
+        (OutputFormat::Json, WriteOption::File) => {
+            let file = File::create("bslive.log").expect("create bslive.log");
+            let fmt_layer = tracing_subscriber::fmt::layer()
+                .json()
+                .with_ansi(false)
+                .with_writer(file);
+            tracing_subscriber::registry()
+                .with(
+                    tracing_subscriber::EnvFilter::try_from_default_env()
+                        .unwrap_or_else(|_| debug_str.into()),
+                )
+                .with(fmt_layer)
+                .init();
+        }
+        (OutputFormat::Normal, WriteOption::None) => {
             let fmt_layer = tracing_subscriber::fmt::layer()
                 .without_time()
                 .with_file(false);
@@ -85,5 +110,18 @@ pub fn init_tracing(log_level: Option<LogLevel>, format: Option<OutputFormat>) {
                 .with(fmt_layer)
                 .init();
         }
+        (OutputFormat::Normal, WriteOption::File) => {
+            let file = File::create("bslive.log").expect("create bslive.log");
+            let fmt_layer = tracing_subscriber::fmt::layer()
+                .with_ansi(false)
+                .with_writer(file);
+            tracing_subscriber::registry()
+                .with(
+                    tracing_subscriber::EnvFilter::try_from_default_env()
+                        .unwrap_or_else(|_| debug_str.into()),
+                )
+                .with(fmt_layer)
+                .init();
+        }
     };
 }

package/examples/kitchen-sink/input.yml

@@ -35,7 +35,7 @@ servers:
       - path: /other
         dir: ./examples
       - path: /index.html
-        dir: ./index.html
+        dir: examples/kitchen-sink/input.html
       - path: /start
         html: <p>helldsosss wosrld</p>
       - path: /ws.js

package/input.yml

@@ -0,0 +1,8 @@
+servers:
+- bind_address: 0.0.0.0:3000
+  routes:
+  - path: /
+    watch: true
+    dir: .
+    headers: null
+  watchers: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browsersync/bslive",
-  "version": "0.0.9",
+  "version": "0.0.14",
   "main": "index.js",
   "types": "index.d.ts",
   "bin": {
@@ -47,21 +47,21 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@browsersync/bslive-win32-x64-msvc": "0.0.9",
-    "@browsersync/bslive-darwin-x64": "0.0.9",
-    "@browsersync/bslive-linux-x64-gnu": "0.0.9",
-    "@browsersync/bslive-darwin-arm64": "0.0.9",
-    "@browsersync/bslive-android-arm64": "0.0.9",
-    "@browsersync/bslive-linux-arm64-gnu": "0.0.9",
-    "@browsersync/bslive-linux-arm64-musl": "0.0.9",
-    "@browsersync/bslive-win32-arm64-msvc": "0.0.9",
-    "@browsersync/bslive-linux-arm-gnueabihf": "0.0.9",
-    "@browsersync/bslive-linux-arm-musleabihf": "0.0.9",
-    "@browsersync/bslive-linux-x64-musl": "0.0.9",
-    "@browsersync/bslive-freebsd-x64": "0.0.9",
-    "@browsersync/bslive-win32-ia32-msvc": "0.0.9",
-    "@browsersync/bslive-android-arm-eabi": "0.0.9",
-    "@browsersync/bslive-darwin-universal": "0.0.9",
-    "@browsersync/bslive-linux-riscv64-gnu": "0.0.9"
+    "@browsersync/bslive-win32-x64-msvc": "0.0.14",
+    "@browsersync/bslive-darwin-x64": "0.0.14",
+    "@browsersync/bslive-linux-x64-gnu": "0.0.14",
+    "@browsersync/bslive-darwin-arm64": "0.0.14",
+    "@browsersync/bslive-android-arm64": "0.0.14",
+    "@browsersync/bslive-linux-arm64-gnu": "0.0.14",
+    "@browsersync/bslive-linux-arm64-musl": "0.0.14",
+    "@browsersync/bslive-win32-arm64-msvc": "0.0.14",
+    "@browsersync/bslive-linux-arm-gnueabihf": "0.0.14",
+    "@browsersync/bslive-linux-arm-musleabihf": "0.0.14",
+    "@browsersync/bslive-linux-x64-musl": "0.0.14",
+    "@browsersync/bslive-freebsd-x64": "0.0.14",
+    "@browsersync/bslive-win32-ia32-msvc": "0.0.14",
+    "@browsersync/bslive-android-arm-eabi": "0.0.14",
+    "@browsersync/bslive-darwin-universal": "0.0.14",
+    "@browsersync/bslive-linux-riscv64-gnu": "0.0.14"
   }
 }

package/crates/bsnext_client/style.css

@@ -1,3 +0,0 @@
-body {
-    background: green;
-}

package/crates/bsnext_core/src/not_found/not_found.html

@@ -1,20 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport"
-          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>BSNEXT</title>
-    <style>
-        pre {
-            width: 100%;
-            overflow-x: auto;
-        }
-    </style>
-</head>
-<body>
-<h2>No routes were matched - here's what's available on this address:</h2>
-{{route_list}}
-</body>
-</html>

package/crates/bsnext_core/src/not_found/route_list.rs

@@ -1,49 +0,0 @@
-use bsnext_input::route::{DirRoute, ProxyRoute, Route, RouteKind};
-use htmlescape::encode_minimal;
-
-pub fn create_route_list_html(routes: &[Route]) -> String {
-    let wrapper = include_str!("not_found.html");
-    let mut markup = String::from("<table>");
-    markup.push_str(
-        r##"
-    <thead>
-        <tr>
-            <td>Path</td>
-            <td>Kind</td>
-        </tr>
-    </thead>
-    "##,
-    );
-    for x in routes.iter() {
-        let mut item = String::from("<tr>");
-        let kind = match &x.kind {
-            RouteKind::Html { .. } => String::from("RouteKind::Html"),
-            RouteKind::Json { .. } => String::from("RouteKind::Json"),
-            RouteKind::Raw { .. } => String::from("RouteKind::Raw"),
-            RouteKind::Sse { .. } => String::from("RouteKind::Sse"),
-            RouteKind::Proxy(ProxyRoute { proxy }) => {
-                format!("RouteKind::Proxy('{}')", proxy)
-            }
-            RouteKind::Dir(DirRoute { dir }) => {
-                format!("RouteKind::Dir('{}')", dir.clone())
-            }
-        };
-        item.push_str(
-            format!(
-                "<td><a href='{}'><code>{}</code></a></td>\
-                \
-                <td><small>{}</small></td>",
-                x.path, x.path, kind
-            )
-            .as_str(),
-        );
-        item.push_str("</tr>");
-        markup.push_str(item.as_str());
-    }
-    markup.push_str("</table>");
-    markup.push_str("<pre><code>");
-    let json = serde_json::to_string_pretty(routes).expect("serde");
-    markup.push_str(&encode_minimal(&json));
-    markup.push_str("</pre></code>");
-    wrapper.replace("{{route_list}}", markup.as_str())
-}