0.3.0

Author: toddtreece

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "dlphn"
-version = "0.2.1"
+version = "0.3.0"
 authors = ["Todd Treece <[email protected]>"]
 description = "a humble data logger."
 homepage = "https://github.com/toddtreece/dlphn-rs"
@@ -9,12 +9,11 @@ keywords = ["data", "logger", "iot"]
 readme = "README.md"
 license = "MIT"
 edition = "2018"
-include = ["src/**/*", "Cargo.toml", "docs/**/*", "ui/build/**"]
+include = ["src/**/*", "Cargo.toml"]
 
 [dependencies]
 actix-rt = "1.0.0"
 actix-web = "2.0.0"
-actix-files = "0.2.1"
 failure = "0.1.1"
 futures = "0.3.1"
 r2d2 = "0.8.2"
@@ -24,6 +23,8 @@ serde_derive = "1.0"
 serde_json = "1.0.44"
 chrono = { version = "0.4.10", features = ["serde"] }
 local-ip = "0.1"
+rust-embed="5.2.0"
+mime_guess =  "2"
 
 [dependencies.rusqlite]
 version = "0.21.0"

Cargo.toml

@@ -1,15 +1,28 @@
-use actix_files as fs;
-use actix_web::{web, App, Error as WebError, HttpResponse, HttpServer};
+#[macro_use]
+extern crate rust_embed;
+
+use actix_web::body::Body;
+use actix_web::{web, App, Error as WebError, HttpRequest, HttpResponse, HttpServer};
 use futures::TryFutureExt;
 use local_ip;
+use mime_guess::from_path;
 use r2d2_sqlite::{self, SqliteConnectionManager};
 use serde_json;
+use std::borrow::Cow;
 use std::io;
 
 mod db;
 mod dolphin;
 use db::Pool;
 
+#[derive(RustEmbed)]
+#[folder = "ui/build/"]
+struct UIAsset;
+
+#[derive(RustEmbed)]
+#[folder = "docs/"]
+struct DocAsset;
+
 async fn list_streams(db: web::Data<Pool>) -> Result<HttpResponse, WebError> {
   let pool = db.clone();
 
@@ -47,38 +60,77 @@ async fn insert_data(
   Ok(HttpResponse::Ok().finish())
 }
 
-async fn p404() -> Result<fs::NamedFile, WebError> {
-  Ok(fs::NamedFile::open("ui/build/index.html")?.set_status_code(actix_web::http::StatusCode::OK))
+fn handle_ui_file(path: &str) -> HttpResponse {
+  match UIAsset::get(path) {
+    Some(content) => {
+      let body: Body = match content {
+        Cow::Borrowed(bytes) => bytes.into(),
+        Cow::Owned(bytes) => bytes.into(),
+      };
+      HttpResponse::Ok()
+        .content_type(from_path(path).first_or_octet_stream().as_ref())
+        .body(body)
+    }
+    None => handle_ui_file("index.html"),
+  }
+}
+
+fn handle_doc_file(path: &str) -> HttpResponse {
+  match DocAsset::get(path) {
+    Some(content) => {
+      let body: Body = match content {
+        Cow::Borrowed(bytes) => bytes.into(),
+        Cow::Owned(bytes) => bytes.into(),
+      };
+      HttpResponse::Ok()
+        .content_type(from_path(path).first_or_octet_stream().as_ref())
+        .body(body)
+    }
+    None => HttpResponse::NotFound().body("404 Not Found"),
+  }
+}
+
+fn ui(req: HttpRequest) -> HttpResponse {
+  let path = &req.path()["/".len()..];
+  handle_ui_file(path)
+}
+
+fn docs_index(_req: HttpRequest) -> HttpResponse {
+  handle_doc_file("index.html")
+}
+
+fn docs(req: HttpRequest) -> HttpResponse {
+  let path = &req.path()["/api/v1/docs/".len()..];
+  handle_doc_file(path)
 }
 
 #[actix_rt::main]
 async fn main() -> io::Result<()> {
   let manager = SqliteConnectionManager::file("dlphn.db");
   let pool = Pool::new(manager).unwrap();
 
-  // create the table if needed
   db::create_table(pool.get().unwrap()).unwrap();
-
-  // Start http server
   dolphin::logo();
+
   let ip = local_ip::get().unwrap();
   println!("[dlphn] UI available at http://{}:8080", ip.to_string());
   println!(
     "[dlphn] API docs available at: http://{}:8080/api/v1/docs",
     ip.to_string()
   );
+
   HttpServer::new(move || {
     App::new()
       .data(pool.clone())
-      .service(fs::Files::new("/api/v1/docs", "docs").index_file("index.html"))
+      .service(web::resource("/api/v1/docs").route(web::get().to(docs_index)))
+      .service(web::resource("/api/v1/docs/{_:.*}").route(web::get().to(docs)))
       .service(web::resource("/api/v1/streams").route(web::get().to(list_streams)))
       .service(
         web::resource("/api/v1/streams/{key}/data")
           .route(web::get().to(list_data))
           .route(web::post().to(insert_data)),
       )
-      .service(fs::Files::new("/", "ui/build").index_file("index.html"))
-      .default_service(web::resource("").route(web::get().to(p404)))
+      .service(web::resource("/{_:.*}").route(web::get().to(ui)))
   })
   .bind("0.0.0.0:8080")?
   .run()