add: littleweb full

crates/app/src/routes/api/v1/domains.rs

@@ -3,15 +3,12 @@ use crate::{
     routes::api::v1::{CreateDomain, UpdateDomainData},
     State,
 };
-use axum::{
-    extract::{Path, Query},
-    response::IntoResponse,
-    http::StatusCode,
-    Extension, Json,
-};
+use axum::{extract::Path, response::IntoResponse, http::StatusCode, Extension, Json};
 use axum_extra::extract::CookieJar;
-use tetratto_core::model::{littleweb::Domain, oauth, ApiReturn, Error};
-use serde::Deserialize;
+use tetratto_core::model::{
+    littleweb::{Domain, ServiceFsMime},
+    oauth, ApiReturn, Error,
+};
 
 pub async fn get_request(
     Path(id): Path<usize>,
@@ -112,17 +109,12 @@ pub async fn delete_request(
     }
 }
 
-#[derive(Deserialize)]
-pub struct GetFileQuery {
-    pub addr: String,
-}
-
 pub async fn get_file_request(
+    Path(addr): Path<String>,
     Extension(data): Extension<State>,
-    Query(props): Query<GetFileQuery>,
 ) -> impl IntoResponse {
     let data = &(data.read().await).0;
-    let (subdomain, domain, tld, path) = Domain::from_str(&props.addr);
+    let (subdomain, domain, tld, path) = Domain::from_str(&addr);
 
     // resolve domain
     let domain = match data.get_domain_by_name_tld(&domain, &tld).await {
@@ -150,9 +142,19 @@ pub async fn get_file_request(
 
     // resolve file
     match service.file(&path) {
-        Some(f) => Ok((
+        Some((f, _)) => Ok((
             [("Content-Type".to_string(), f.mime.to_string())],
-            f.content,
+            if f.mime == ServiceFsMime::Html {
+                f.content.replace(
+                    "</body>",
+                    &format!(
+                        "<script src=\"{}/js/proto_links.js\" defer></script></body>",
+                        data.0.0.host
+                    ),
+                )
+            } else {
+                f.content
+            },
         )),
         None => {
             return Err((

crates/app/src/routes/api/v1/mod.rs

@@ -641,7 +641,12 @@ pub fn routes() -> Router {
         .route("/services", post(services::create_request))
         .route("/services/{id}", get(services::get_request))
         .route("/services/{id}", delete(services::delete_request))
+        .route("/services/{id}/name", post(services::update_name_request))
         .route("/services/{id}/files", post(services::update_files_request))
+        .route(
+            "/services/{id}/content",
+            post(services::update_content_request),
+        )
         // domains
         .route("/domains", get(domains::list_request))
         .route("/domains", post(domains::create_request))
@@ -651,7 +656,7 @@ pub fn routes() -> Router {
 }
 
 pub fn lw_routes() -> Router {
-    Router::new().route("/file", get(domains::get_file_request))
+    Router::new().route("/net/{*addr}", get(domains::get_file_request))
 }
 
 #[derive(Deserialize)]
@@ -1076,9 +1081,21 @@ pub struct CreateService {
     pub name: String,
 }
 
+#[derive(Deserialize)]
+pub struct UpdateServiceName {
+    pub name: String,
+}
+
 #[derive(Deserialize)]
 pub struct UpdateServiceFiles {
     pub files: Vec<ServiceFsEntry>,
+    pub id_path: Vec<String>,
+}
+
+#[derive(Deserialize)]
+pub struct UpdateServiceFileContent {
+    pub content: String,
+    pub id_path: Vec<String>,
 }
 
 #[derive(Deserialize)]

crates/app/src/routes/api/v1/services.rs

@@ -1,6 +1,8 @@
 use crate::{
     get_user_from_token,
-    routes::api::v1::{UpdateServiceFiles, CreateService},
+    routes::api::v1::{
+        CreateService, UpdateServiceFileContent, UpdateServiceFiles, UpdateServiceName,
+    },
     State,
 };
 use axum::{extract::Path, response::IntoResponse, Extension, Json};
@@ -60,6 +62,28 @@ pub async fn create_request(
     }
 }
 
+pub async fn update_name_request(
+    jar: CookieJar,
+    Extension(data): Extension<State>,
+    Path(id): Path<usize>,
+    Json(req): Json<UpdateServiceName>,
+) -> impl IntoResponse {
+    let data = &(data.read().await).0;
+    let user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageServices) {
+        Some(ua) => ua,
+        None => return Json(Error::NotAllowed.into()),
+    };
+
+    match data.update_service_name(id, &user, &req.name).await {
+        Ok(_) => Json(ApiReturn {
+            ok: true,
+            message: "Service updated".to_string(),
+            payload: (),
+        }),
+        Err(e) => Json(e.into()),
+    }
+}
+
 pub async fn update_files_request(
     jar: CookieJar,
     Extension(data): Extension<State>,
@@ -72,7 +96,57 @@ pub async fn update_files_request(
         None => return Json(Error::NotAllowed.into()),
     };
 
-    match data.update_service_files(id, &user, req.files).await {
+    let mut service = match data.get_service_by_id(id).await {
+        Ok(x) => x,
+        Err(e) => return Json(e.into()),
+    };
+
+    if req.id_path.is_empty() {
+        service.files = req.files;
+    } else {
+        match service.file_mut(req.id_path) {
+            Some(f) => f.children = req.files,
+            None => return Json(Error::GeneralNotFound("file".to_string()).into()),
+        }
+    }
+
+    match data.update_service_files(id, &user, service.files).await {
+        Ok(_) => Json(ApiReturn {
+            ok: true,
+            message: "Service updated".to_string(),
+            payload: (),
+        }),
+        Err(e) => Json(e.into()),
+    }
+}
+
+pub async fn update_content_request(
+    jar: CookieJar,
+    Extension(data): Extension<State>,
+    Path(id): Path<usize>,
+    Json(req): Json<UpdateServiceFileContent>,
+) -> impl IntoResponse {
+    let data = &(data.read().await).0;
+    let user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageServices) {
+        Some(ua) => ua,
+        None => return Json(Error::NotAllowed.into()),
+    };
+
+    let mut service = match data.get_service_by_id(id).await {
+        Ok(x) => x,
+        Err(e) => return Json(e.into()),
+    };
+
+    // update
+    let file = match service.file_mut(req.id_path) {
+        Some(f) => f,
+        None => return Json(Error::GeneralNotFound("file".to_string()).into()),
+    };
+
+    file.content = req.content;
+
+    // ...
+    match data.update_service_files(id, &user, service.files).await {
         Ok(_) => Json(ApiReturn {
             ok: true,
             message: "Service updated".to_string(),

crates/app/src/routes/assets.rs

@@ -20,3 +20,4 @@ serve_asset!(me_js_request: ME_JS("text/javascript"));
 serve_asset!(streams_js_request: STREAMS_JS("text/javascript"));
 serve_asset!(carp_js_request: CARP_JS("text/javascript"));
 serve_asset!(layout_editor_js_request: LAYOUT_EDITOR_JS("text/javascript"));
+serve_asset!(proto_links_request: PROTO_LINKS_JS("text/javascript"));

crates/app/src/routes/mod.rs

@@ -24,6 +24,7 @@ pub fn routes(config: &Config) -> Router {
             "/js/layout_editor.js",
             get(assets::layout_editor_js_request),
         )
+        .route("/js/proto_links.js", get(assets::proto_links_request))
         .nest_service(
             "/public",
             get_service(tower_http::services::ServeDir::new(&config.dirs.assets)),

crates/app/src/routes/pages/journals.rs

@@ -365,7 +365,7 @@ pub async fn global_view_request(
     Ok((
         [(
             "content-security-policy",
-            "default-src 'self' *.spotify.com musicbrainz.org; img-src * data:; media-src *; font-src *; style-src 'unsafe-inline' 'self' *; script-src 'self' 'unsafe-inline' *; object-src 'self' *; upgrade-insecure-requests; connect-src * localhost; frame-src 'self' *.cloudflare.com; frame-ancestors *",
+            "default-src 'self' *.spotify.com musicbrainz.org; img-src * data:; media-src *; font-src *; style-src 'unsafe-inline' 'self' *; script-src 'self' 'unsafe-inline' *; worker-src * blob:; object-src 'self' *; upgrade-insecure-requests; connect-src * localhost; frame-src 'self' *; frame-ancestors *",
         )],
         Html(data.1.render("journals/app.html", &context).unwrap()),
     ))

crates/app/src/routes/pages/littleweb.rs

@@ -0,0 +1,211 @@
+use super::render_error;
+use crate::{assets::initial_context, get_lang, get_user_from_token, State};
+use axum::{
+    response::{Html, IntoResponse},
+    extract::{Query, Path},
+    Extension,
+};
+use axum_extra::extract::CookieJar;
+use tetratto_core::model::{littleweb::TLDS_VEC, Error};
+use serde::Deserialize;
+
+/// `/services`
+pub async fn services_request(
+    jar: CookieJar,
+    Extension(data): Extension<State>,
+) -> impl IntoResponse {
+    let data = data.read().await;
+    let user = match get_user_from_token!(jar, data.0) {
+        Some(ua) => ua,
+        None => {
+            return Err(Html(
+                render_error(Error::NotAllowed, &jar, &data, &None).await,
+            ));
+        }
+    };
+
+    let list = match data.0.get_services_by_user(user.id).await {
+        Ok(x) => x,
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
+    };
+
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
+    context.insert("list", &list);
+
+    // return
+    Ok(Html(
+        data.1.render("littleweb/services.html", &context).unwrap(),
+    ))
+}
+
+/// `/domains`
+pub async fn domains_request(
+    jar: CookieJar,
+    Extension(data): Extension<State>,
+) -> impl IntoResponse {
+    let data = data.read().await;
+    let user = match get_user_from_token!(jar, data.0) {
+        Some(ua) => ua,
+        None => {
+            return Err(Html(
+                render_error(Error::NotAllowed, &jar, &data, &None).await,
+            ));
+        }
+    };
+
+    let list = match data.0.get_domains_by_user(user.id).await {
+        Ok(x) => x,
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
+    };
+
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
+
+    context.insert("list", &list);
+    context.insert("tlds", &*TLDS_VEC);
+
+    // return
+    Ok(Html(
+        data.1.render("littleweb/domains.html", &context).unwrap(),
+    ))
+}
+
+#[derive(Deserialize)]
+pub struct FileBrowserProps {
+    #[serde(default)]
+    path: String,
+}
+
+/// `/services/{id}`
+pub async fn service_request(
+    jar: CookieJar,
+    Path(id): Path<usize>,
+    Extension(data): Extension<State>,
+    Query(props): Query<FileBrowserProps>,
+) -> impl IntoResponse {
+    let data = data.read().await;
+    let user = match get_user_from_token!(jar, data.0) {
+        Some(ua) => ua,
+        None => {
+            return Err(Html(
+                render_error(Error::NotAllowed, &jar, &data, &None).await,
+            ));
+        }
+    };
+
+    let service = match data.0.get_service_by_id(id).await {
+        Ok(x) => x,
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
+    };
+
+    if user.id != service.owner {
+        return Err(Html(
+            render_error(Error::NotAllowed, &jar, &data, &None).await,
+        ));
+    }
+
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
+
+    context.insert("service", &service);
+
+    match service.file(&props.path.replacen("/", "", 1)) {
+        Some((x, p)) => {
+            context.insert("id_path", &p);
+            context.insert("file", &x);
+            context.insert("files", &x.children);
+        }
+        None => {
+            context.insert("id_path", &Vec::<()>::new());
+            context.insert("files", &service.files);
+        }
+    }
+
+    let path_segments: Vec<&str> = props.path.split("/").collect();
+    context.insert("path_segments", &path_segments);
+    context.insert("path", &props.path);
+
+    // return
+    Ok(Html(
+        data.1.render("littleweb/service.html", &context).unwrap(),
+    ))
+}
+
+/// `/domains/{id}`
+pub async fn domain_request(
+    jar: CookieJar,
+    Path(id): Path<usize>,
+    Extension(data): Extension<State>,
+) -> impl IntoResponse {
+    let data = data.read().await;
+    let user = match get_user_from_token!(jar, data.0) {
+        Some(ua) => ua,
+        None => {
+            return Err(Html(
+                render_error(Error::NotAllowed, &jar, &data, &None).await,
+            ));
+        }
+    };
+
+    let domain = match data.0.get_domain_by_id(id).await {
+        Ok(x) => x,
+        Err(e) => return Err(Html(render_error(e, &jar, &data, &Some(user)).await)),
+    };
+
+    if user.id != domain.owner {
+        return Err(Html(
+            render_error(Error::NotAllowed, &jar, &data, &None).await,
+        ));
+    }
+
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0.0, lang, &Some(user)).await;
+    context.insert("domain", &domain);
+
+    // return
+    Ok(Html(
+        data.1.render("littleweb/domain.html", &context).unwrap(),
+    ))
+}
+
+/// `/net`
+pub async fn browser_home_request(
+    jar: CookieJar,
+    Extension(data): Extension<State>,
+) -> impl IntoResponse {
+    let data = data.read().await;
+    let user = get_user_from_token!(jar, data.0);
+
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0.0, lang, &user).await;
+    context.insert("path", &"");
+
+    // return
+    Html(data.1.render("littleweb/browser.html", &context).unwrap())
+}
+
+/// `/net/{uri}`
+pub async fn browser_request(
+    jar: CookieJar,
+    Path(mut uri): Path<String>,
+    Extension(data): Extension<State>,
+) -> impl IntoResponse {
+    let data = data.read().await;
+    let user = get_user_from_token!(jar, data.0);
+
+    if !uri.contains("/") {
+        uri = format!("{uri}/index.html");
+    }
+
+    if !uri.starts_with("atto://") {
+        uri = format!("atto://{uri}");
+    }
+
+    let lang = get_lang!(jar, data.0);
+    let mut context = initial_context(&data.0.0.0, lang, &user).await;
+    context.insert("path", &uri);
+
+    // return
+    Html(data.1.render("littleweb/browser.html", &context).unwrap())
+}

crates/app/src/routes/pages/mod.rs

@@ -4,6 +4,7 @@ pub mod communities;
 pub mod developer;
 pub mod forge;
 pub mod journals;
+pub mod littleweb;
 pub mod misc;
 pub mod mod_panel;
 pub mod profile;
@@ -139,6 +140,13 @@ pub fn routes() -> Router {
         .route("/@{owner}/{journal}", get(journals::index_view_request))
         .route("/@{owner}/{journal}/{note}", get(journals::view_request))
         .route("/x/{note}", get(journals::global_view_request))
+        // littleweb
+        .route("/services", get(littleweb::services_request))
+        .route("/domains", get(littleweb::domains_request))
+        .route("/services/{id}", get(littleweb::service_request))
+        .route("/domains/{id}", get(littleweb::domain_request))
+        .route("/net", get(littleweb::browser_home_request))
+        .route("/net/{*uri}", get(littleweb::browser_request))
 }
 
 pub fn lw_routes() -> Router {