Bump h2 in /packages/backend in the cargo group across 1 directory

Bumps the cargo group with 1 update in the /packages/backend directory: [h2](https://github.com/hyperium/h2).


Updates `h2` from 0.3.24 to 0.3.26
- [Release notes](https://github.com/hyperium/h2/releases)
- [Changelog](https://github.com/hyperium/h2/blob/v0.3.26/CHANGELOG.md)
- [Commits](https://github.com/hyperium/h2/compare/v0.3.24...v0.3.26)

---
updated-dependencies:
- dependency-name: h2
  dependency-type: indirect
  dependency-group: cargo
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
 
       # Node
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v3
       - uses: actions/setup-node@v4
         with:
           cache: 'pnpm'
@@ -27,16 +27,13 @@ jobs:
 
       - name: Prepare
         run: |
-          pnpm install
+          pnpm install --frozen-lockfile
           pnpm exec playwright install --with-deps
           pnpm run test:prepare
 
       - name: Run your tests
         run: pnpm test
-
+      - uses: actions/upload-artifact@v3
-      - uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
         with:
-          name: playwright-report
+          name: test-results
-          path: test-results/
+          path: test-results
-          retention-days: 7

.gitignore

@@ -8,4 +8,3 @@ target
 
 # Testing
 test-results
-tmp

.nvmrc

@@ -1 +1 @@
-v22.7.0
+v20.11.1

Dockerfile

@@ -1,5 +1,5 @@
 # FRONTEND
-FROM node:22-alpine as client 
+FROM node:20-alpine as client 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
@@ -11,17 +11,17 @@ RUN pnpm run build
 
 
 # BACKEND
-FROM rust:1.80-alpine as backend
+FROM rust:1.76-alpine as backend
 WORKDIR /tmp
 RUN apk add --no-cache libc-dev openssl-dev alpine-sdk
 COPY ./packages/backend ./
-RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo build --release
+RUN cargo build --release
 
 
 # RUNNER
 FROM alpine:3.19
 WORKDIR /app
-RUN apk add --no-cache curl libgcc
+RUN apk add --no-cache curl 
 COPY --from=backend /tmp/target/release/cryptgeon .
 COPY --from=client /tmp/packages/frontend/build ./frontend
 ENV FRONTEND_PATH="./frontend"

README.md

@@ -14,7 +14,7 @@
 <a href=""><img src="./.github/lokalise.png" height="50">
 <br/><br/>
 
-EN | [简体中文](README_zh-CN.md) | [ES](README_ES.md)
+EN | [简体中文](README_zh-CN.md) | [ES](README_ES.md) 
 
 ## About?
 
@@ -141,16 +141,12 @@ There is a [guide](https://mariushosting.com/how-to-install-cryptgeon-on-your-sy
 - English by [DB Tech](https://www.youtube.com/watch?v=S0jx7wpOfNM) [Previous Video](https://www.youtube.com/watch?v=JhpIatD06vE)
 - German by [ApfelCast](https://www.youtube.com/watch?v=84ZMbE9AkHg)
 
-### Written Guides
-
-- French by [zarevskaya](https://belginux.com/installer-cryptgeon-avec-docker/)
-
 ## Development
 
 **Requirements**
 
-- `pnpm`: `>=9`
+- `pnpm`: `>=6`
-- `node`: `>=22`
+- `node`: `>=18`
 - `rust`: edition `2021`
 
 **Install**
@@ -178,7 +174,7 @@ Running `pnpm run dev` in the root folder will start the following things:
 - client
 - cli
 
-You can see the app under [localhost:3000](http://localhost:3000).
+You can see the app under [localhost:1234](http://localhost:1234).
 
 > There is a Postman collection with some example requests [available in the repo](./Cryptgeon.postman_collection.json)
 

README_ES.md

@@ -59,19 +59,19 @@ se usa para guardar y recuperar la nota. Después la nota es encriptada con la <
 
 ## Variables de entorno
 
-| Variable           | Default          | Descripción                                                                                                                                                                                                         |
+| Variable           | Default          | Descripción                                                                                                                                                                                                   |
-| ------------------ | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ------------------ | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `REDIS`            | `redis://redis/` | Redis URL a la que conectarse. [Según el formato](https://docs.rs/redis/latest/redis/#connection-parameters)                                                                                                        |
+| `REDIS`            | `redis://redis/` | Redis URL a la que conectarse. [Según el formato](https://docs.rs/redis/latest/redis/#connection-parameters)                                                                                                     |
 | `SIZE_LIMIT`       | `1 KiB`          | Tamaño máximo. Valores aceptados según la [unidad byte](https://docs.rs/byte-unit/). <br> `512 MiB` es el máximo permitido. <br> El frontend mostrará ese número, incluyendo el ~35% de sobrecarga de codificación. |
-| `MAX_VIEWS`        | `100`            | Número máximo de vistas.                                                                                                                                                                                            |
+| `MAX_VIEWS`        | `100`            | Número máximo de vistas.                                                                                                                                                                                      |
-| `MAX_EXPIRATION`   | `360`            | Tiempo máximo de expiración en minutos.                                                                                                                                                                             |
+| `MAX_EXPIRATION`   | `360`            | Tiempo máximo de expiración en minutos.                                                                                                                                                                                |
-| `ALLOW_ADVANCED`   | `true`           | Permitir configuración personalizada. Si se establece en `false` todas las notas serán de una sola vista.                                                                                                           |
+| `ALLOW_ADVANCED`   | `true`           | Permitir configuración personalizada. Si se establece en `false` todas las notas serán de una sola vista.                                                                                                                                |
-| `ID_LENGTH`        | `32`             | Establece el tamaño en bytes de la `id` de la nota. Por defecto es de `32` bytes. Esto es util para reducir el tamaño del link. _Esta configuración no afecta el nivel de encriptación_.                            |
+| `ID_LENGTH`        | `32`             | Establece el tamaño en bytes de la `id` de la nota. Por defecto es de `32` bytes. Esto es util para reducir el tamaño del link. _Esta configuración no afecta el nivel de encriptación_.                                             |
-| `VERBOSITY`        | `warn`           | Nivel de verbosidad del backend. [Posibles valores](https://docs.rs/env_logger/latest/env_logger/#enabling-logging): `error`, `warn`, `info`, `debug`, `trace`                                                      |
+| `VERBOSITY`        | `warn`           | Nivel de verbosidad del backend. [Posibles valores](https://docs.rs/env_logger/latest/env_logger/#enabling-logging): `error`, `warn`, `info`, `debug`, `trace`                                             |
-| `THEME_IMAGE`      | `""`             | Imagen personalizada para reemplazar el logo. Debe ser accesible públicamente.                                                                                                                                      |
+| `THEME_IMAGE`      | `""`             | Imagen personalizada para reemplazar el logo. Debe ser accesible públicamente.                                                                                                                                               |
-| `THEME_TEXT`       | `""`             | Texto personalizado para reemplazar la descripción bajo el logo.                                                                                                                                                    |
+| `THEME_TEXT`       | `""`             | Texto personalizado para reemplazar la descripción bajo el logo.                                                                                                                                                      |
-| `THEME_PAGE_TITLE` | `""`             | Texto personalizado para el título                                                                                                                                                                                  |
+| `THEME_PAGE_TITLE` | `""`             | Texto personalizado para el título                                                                                                                                                                                    |
-| `THEME_FAVICON`    | `""`             | Url personalizada para el favicon. Debe ser accesible públicamente.                                                                                                                                                 |
+| `THEME_FAVICON`    | `""`             | Url personalizada para el favicon. Debe ser accesible públicamente.                                                                                                                                                        |
 
 ## Despliegue
 
@@ -169,7 +169,7 @@ Ejecutando `pnpm run dev` en la carpeta raíz iniciará lo siguiente:
 - client
 - cli
 
-Puedes ver la app en [localhost:3000](http://localhost:3000).
+Puedes ver la app en [localhost:1234](http://localhost:1234).
 
 > Existe una colección de Postman con algunas peticiones de ejemplo [disponible en el repo](./Cryptgeon.postman_collection.json)
 

README_zh-CN.md

@@ -14,7 +14,7 @@
 <a href=""><img src="./.github/lokalise.png" height="50">
 <br/>
 
-[EN](README.md) | 简体中文 | [ES](README_ES.md)
+[EN](README.md) | 简体中文 | [ES](README_ES.md) 
 
 ## 关于本项目
 
@@ -158,7 +158,7 @@ pnpm run dev
 - 无热重载的 rust 后端
 - 可热重载的客户端
 
-你可以通过 3000 端口进入该应用，即 [localhost:3000](http://localhost:3000).
+你可以通过 1234 端口进入该应用，即 [localhost:1234](http://localhost:1234).
 
 ## 测试
 

docker-compose.dev.yaml

@@ -1,6 +1,8 @@
 # DEV Compose file.
 # For a production file see: README.md
 
+version: '3.8'
+
 services:
   redis:
     image: redis:7-alpine
@@ -9,12 +11,12 @@ services:
 
   app:
     build: .
-    env_file: .env.dev
+    env_file: .dev.env
     depends_on:
       - redis
     restart: unless-stopped
     ports:
-      - 3000:8000
+      - 1234:8000
 
     healthcheck:
       test: ['CMD', 'curl', '--fail', 'http://127.0.0.1:8000/api/live/']

docker-compose.yaml

@@ -1,3 +1,5 @@
+version: '3.8'
+
 services:
   redis:
     image: redis:7-alpine
@@ -14,7 +16,7 @@ services:
       SIZE_LIMIT: 4 MiB
     ports:
       - 80:8000
-
+    
     # Optional health checks
     # healthcheck:
     #   test: ["CMD", "curl", "--fail", "http://127.0.0.1:8000/api/live/"]

package.json

@@ -1,21 +1,21 @@
 {
   "scripts": {
-    "dev:docker": "docker compose -f docker-compose.dev.yaml up redis",
+    "dev:docker": "docker-compose -f docker-compose.dev.yaml up redis",
     "dev:packages": "pnpm --parallel run dev",
     "dev": "run-p dev:*",
     "docker:up": "docker compose -f docker-compose.dev.yaml up",
     "docker:build": "docker compose -f docker-compose.dev.yaml build",
-    "test": "playwright test --project=chrome --project=firefox --project=safari",
+    "test": "playwright test --project chrome firefox safari",
-    "test:local": "playwright test --project=chrome",
+    "test:local": "playwright test --project chrome",
     "test:server": "run-s docker:up",
     "test:prepare": "run-p build docker:build",
     "build": "pnpm run --recursive --filter=!@cryptgeon/backend build"
   },
   "devDependencies": {
-    "@playwright/test": "^1.46.1",
+    "@playwright/test": "^1.42.1",
-    "@types/node": "^22.5.0",
+    "@types/node": "^20.11.28",
     "npm-run-all": "^4.1.5",
     "shelljs": "^0.8.5"
   },
-  "packageManager": "pnpm@9.9.0"
+  "packageManager": "pnpm@8.15.4"
 }

packages/backend/Cargo.toml

@@ -1,27 +1,25 @@
 [package]
 name = "cryptgeon"
-version = "2.8.0"
+version = "2.6.0"
 authors = ["cupcakearmy <hi@nicco.io>"]
 edition = "2021"
-rust-version = "1.80"
+rust-version = "1.76"
 
 [[bin]]
 name = "cryptgeon"
 path = "src/main.rs"
 
 [dependencies]
-# Core
+actix-web = "4"
-axum = "0.7.5"
+actix-files = "0.6"
-serde = { version = "1.0.208", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.39.3", features = ["full"] }
-tower = "0.5.0"
-tower-http = { version = "0.5.2", features = ["full"] }
-redis = { version = "0.25.2", features = ["tls-native-tls"] }
-
-# Utility
 serde_json = "1"
 lazy_static = "1"
 ring = "0.16"
 bs62 = "0.1"
 byte-unit = "4"
 dotenv = "0.15"
+mime = "0.3"
+env_logger = "0.9"
+log = "0.4"
+redis = "0.23"

packages/backend/package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "dev": "cargo watch -x 'run --bin cryptgeon'",
     "build": "cargo build --release",
-    "test:server": "SIZE_LIMIT=10MiB LISTEN_ADDR=0.0.0.0:3000 cargo run",
+    "test:server": "SIZE_LIMIT=10MiB LISTEN_ADDR=0.0.0.0:1234 cargo run",
     "test:prepare": "cargo build"
   }
 }

packages/backend/src/api.rs

@@ -0,0 +1,14 @@
+use actix_web::web;
+
+use crate::health;
+use crate::note;
+use crate::status;
+
+pub fn init(cfg: &mut web::ServiceConfig) {
+    cfg.service(
+        web::scope("/api")
+            .service(note::init())
+            .service(status::init())
+            .service(health::init()),
+    );
+}

packages/backend/src/client.rs

@@ -0,0 +1,17 @@
+use actix_files::{Files, NamedFile};
+use actix_web::{web, Result};
+
+use crate::config;
+
+pub fn init(cfg: &mut web::ServiceConfig) {
+    cfg.service(
+        Files::new("/", config::FRONTEND_PATH.to_string())
+            .index_file("index.html")
+            .use_etag(true),
+    );
+}
+
+pub async fn index() -> Result<NamedFile> {
+    let index = format!("{}{}", config::FRONTEND_PATH.to_string(), "/index.html");
+    Ok(NamedFile::open(index)?)
+}

packages/backend/src/config.rs

@@ -38,6 +38,10 @@ pub static ref ALLOW_FILES: bool = std::env::var("ALLOW_FILES")
   .unwrap_or("true".to_string())
   .parse()
   .unwrap();
+pub static ref THEME_NEW_NOTE_NOTICE: bool = std::env::var("THEME_NEW_NOTE_NOTICE")
+  .unwrap_or("true".to_string())
+  .parse()
+  .unwrap();
 }
 
 // THEME
@@ -58,8 +62,4 @@ lazy_static! {
         .unwrap_or("".to_string())
         .parse()
         .unwrap();
-    pub static ref THEME_NEW_NOTE_NOTICE: bool = std::env::var("THEME_NEW_NOTE_NOTICE")
-        .unwrap_or("true".to_string())
-        .parse()
-        .unwrap();
 }

packages/backend/src/health/mod.rs

@@ -1,10 +1,3 @@
-use crate::store;
+mod routes;
-use axum::http::StatusCode;
 
-pub async fn report_health() -> (StatusCode,) {
+pub use routes::*;
-    if store::can_reach_redis() {
-        return (StatusCode::OK,);
-    } else {
-        return (StatusCode::SERVICE_UNAVAILABLE,);
-    }
-}

packages/backend/src/health/routes.rs

@@ -0,0 +1,16 @@
+use actix_web::{get, web, HttpResponse, Responder, Scope};
+
+use crate::store;
+
+#[get("/")]
+async fn get_live() -> impl Responder {
+    if store::can_reach_redis() {
+        return HttpResponse::Ok();
+    } else {
+        return HttpResponse::ServiceUnavailable();
+    }
+}
+
+pub fn init() -> Scope {
+    web::scope("/live").service(get_live)
+}

packages/backend/src/main.rs

@@ -1,67 +1,44 @@
-use axum::{
+use actix_web::{
-    extract::{DefaultBodyLimit, Request},
+    middleware::{self, Logger},
-    routing::{delete, get, post},
+    web::{self},
-    Router, ServiceExt,
+    App, HttpServer,
 };
 use dotenv::dotenv;
-use tower::Layer;
+use log::error;
-use tower_http::{
-    compression::CompressionLayer,
-    normalize_path::NormalizePathLayer,
-    services::{ServeDir, ServeFile},
-};
 
 #[macro_use]
 extern crate lazy_static;
 
+mod api;
+mod client;
 mod config;
 mod health;
 mod note;
+mod size;
 mod status;
 mod store;
 
-#[tokio::main]
+#[actix_web::main]
-async fn main() {
+async fn main() -> std::io::Result<()> {
     dotenv().ok();
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or(config::VERBOSITY.as_str()));
 
     if !store::can_reach_redis() {
-        println!("cannot reach redis");
+        error!("cannot reach redis");
         panic!("canont reach redis");
     }
 
-    let notes_routes = Router::new()
+    return HttpServer::new(|| {
-        .route("/", post(note::create))
+        App::new()
-        .route("/:id", delete(note::delete))
+            .wrap(Logger::new("\"%r\" %s %b %T"))
-        .route("/:id", get(note::preview));
+            .wrap(middleware::Compress::default())
-    let health_routes = Router::new().route("/live", get(health::report_health));
+            .wrap(middleware::DefaultHeaders::default())
-    let status_routes = Router::new().route("/status", get(status::get_status));
+            .configure(size::init)
-    let api_routes = Router::new()
+            .configure(api::init)
-        .nest("/notes", notes_routes)
+            .configure(client::init)
-        .nest("/", health_routes)
+            .default_service(web::to(client::index))
-        .nest("/", status_routes);
+    })
-
+    .bind(config::LISTEN_ADDR.to_string())?
-    let index = format!("{}{}", config::FRONTEND_PATH.to_string(), "/index.html");
+    .run()
-    let serve_dir =
+    .await;
-        ServeDir::new(config::FRONTEND_PATH.to_string()).not_found_service(ServeFile::new(index));
-    let app = Router::new()
-        .nest("/api", api_routes)
-        .fallback_service(serve_dir)
-        .layer(DefaultBodyLimit::max(*config::LIMIT))
-        .layer(
-            CompressionLayer::new()
-                .br(true)
-                .deflate(true)
-                .gzip(true)
-                .zstd(true),
-        );
-
-    let app = NormalizePathLayer::trim_trailing_slash().layer(app);
-
-    let listener = tokio::net::TcpListener::bind(config::LISTEN_ADDR.to_string())
-        .await
-        .unwrap();
-    println!("listening on {}", listener.local_addr().unwrap());
-    axum::serve(listener, ServiceExt::<Request>::into_make_service(app))
-        .await
-        .unwrap();
 }

packages/backend/src/note/model.rs

@@ -12,12 +12,12 @@ pub struct Note {
     pub expiration: Option<u32>,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct NoteInfo {
     pub meta: String,
 }
 
-#[derive(Serialize)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct NotePublic {
     pub meta: String,
     pub contents: String,

packages/backend/src/note/routes.rs

@@ -1,18 +1,11 @@
-use axum::{
+use actix_web::{delete, get, post, web, HttpResponse, Responder, Scope};
-    extract::Path,
-    http::StatusCode,
-    response::{IntoResponse, Response},
-    Json,
-};
 use serde::{Deserialize, Serialize};
 use std::time::SystemTime;
 
 use crate::config;
-use crate::note::{generate_id, Note, NoteInfo};
+use crate::note::{generate_id, Note, NoteInfo, NotePublic};
 use crate::store;
 
-use super::NotePublic;
-
 pub fn now() -> u32 {
     SystemTime::now()
         .duration_since(SystemTime::UNIX_EPOCH)
@@ -20,18 +13,20 @@ pub fn now() -> u32 {
         .as_secs() as u32
 }
 
-#[derive(Deserialize)]
+#[derive(Serialize, Deserialize)]
-pub struct OneNoteParams {
+struct NotePath {
     id: String,
 }
 
-pub async fn preview(Path(OneNoteParams { id }): Path<OneNoteParams>) -> Response {
+#[get("/{id}")]
-    let note = store::get(&id);
+async fn one(path: web::Path<NotePath>) -> impl Responder {
+    let p = path.into_inner();
+    let note = store::get(&p.id);
 
     match note {
-        Ok(Some(n)) => (StatusCode::OK, Json(NoteInfo { meta: n.meta })).into_response(),
+        Ok(Some(n)) => HttpResponse::Ok().json(NoteInfo { meta: n.meta }),
-        Ok(None) => (StatusCode::NOT_FOUND).into_response(),
+        Ok(None) => HttpResponse::NotFound().finish(),
-        Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
+        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
     }
 }
 
@@ -40,16 +35,13 @@ struct CreateResponse {
     id: String,
 }
 
-pub async fn create(Json(mut n): Json<Note>) -> Response {
+#[post("/")]
-    // let mut n = note.into_inner();
+async fn create(note: web::Json<Note>) -> impl Responder {
+    let mut n = note.into_inner();
     let id = generate_id();
-    // let bad_req = HttpResponse::BadRequest().finish();
+    let bad_req = HttpResponse::BadRequest().finish();
     if n.views == None && n.expiration == None {
-        return (
+        return bad_req;
-            StatusCode::BAD_REQUEST,
-            "At least views or expiration must be set",
-        )
-            .into_response();
     }
     if !*config::ALLOW_ADVANCED {
         n.views = Some(1);
@@ -58,7 +50,7 @@ pub async fn create(Json(mut n): Json<Note>) -> Response {
     match n.views {
         Some(v) => {
             if v > *config::MAX_VIEWS || v < 1 {
-                return (StatusCode::BAD_REQUEST, "Invalid views").into_response();
+                return bad_req;
             }
             n.expiration = None; // views overrides expiration
         }
@@ -66,8 +58,8 @@ pub async fn create(Json(mut n): Json<Note>) -> Response {
     }
     match n.expiration {
         Some(e) => {
-            if e > *config::MAX_EXPIRATION || e < 1 {
+            if e > *config::MAX_EXPIRATION {
-                return (StatusCode::BAD_REQUEST, "Invalid expiration").into_response();
+                return bad_req;
             }
             let expiration = now() + (e * 60);
             n.expiration = Some(expiration);
@@ -75,40 +67,38 @@ pub async fn create(Json(mut n): Json<Note>) -> Response {
         _ => {}
     }
     match store::set(&id.clone(), &n.clone()) {
-        Ok(_) => (StatusCode::OK, Json(CreateResponse { id })).into_response(),
+        Ok(_) => return HttpResponse::Ok().json(CreateResponse { id: id }),
-        Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
+        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
     }
 }
 
-pub async fn delete(Path(OneNoteParams { id }): Path<OneNoteParams>) -> Response {
+#[delete("/{id}")]
-    let note = store::get(&id);
+async fn delete(path: web::Path<NotePath>) -> impl Responder {
+    let p = path.into_inner();
+    let note = store::get(&p.id);
     match note {
-        // Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
+        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
-        // Ok(None) => return HttpResponse::NotFound().finish(),
+        Ok(None) => return HttpResponse::NotFound().finish(),
-        Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
-        Ok(None) => (StatusCode::NOT_FOUND).into_response(),
         Ok(Some(note)) => {
             let mut changed = note.clone();
             if changed.views == None && changed.expiration == None {
-                return (StatusCode::BAD_REQUEST).into_response();
+                return HttpResponse::BadRequest().finish();
             }
             match changed.views {
                 Some(v) => {
                     changed.views = Some(v - 1);
-                    let id = id.clone();
+                    let id = p.id.clone();
                     if v <= 1 {
                         match store::del(&id) {
                             Err(e) => {
-                                return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string())
+                                return HttpResponse::InternalServerError().body(e.to_string())
-                                    .into_response();
                             }
                             _ => {}
                         }
                     } else {
                         match store::set(&id, &changed.clone()) {
                             Err(e) => {
-                                return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string())
+                                return HttpResponse::InternalServerError().body(e.to_string())
-                                    .into_response();
                             }
                             _ => {}
                         }
@@ -121,26 +111,33 @@ pub async fn delete(Path(OneNoteParams { id }): Path<OneNoteParams>) -> Response
             match changed.expiration {
                 Some(e) => {
                     if e < n {
-                        match store::del(&id.clone()) {
+                        match store::del(&p.id.clone()) {
-                            Ok(_) => return (StatusCode::BAD_REQUEST).into_response(),
+                            Ok(_) => return HttpResponse::BadRequest().finish(),
                             Err(e) => {
-                                return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string())
+                                return HttpResponse::InternalServerError().body(e.to_string())
-                                    .into_response()
                             }
                         }
                     }
                 }
                 _ => {}
             }
-
+            return HttpResponse::Ok().json(NotePublic {
-            return (
+                contents: changed.contents,
-                StatusCode::OK,
+                meta: changed.meta,
-                Json(NotePublic {
+            });
-                    contents: changed.contents,
-                    meta: changed.meta,
-                }),
-            )
-                .into_response();
         }
     }
 }
+
+#[derive(Serialize, Deserialize)]
+struct Status {
+    version: String,
+    max_size: usize,
+}
+
+pub fn init() -> Scope {
+    web::scope("/notes")
+        .service(one)
+        .service(create)
+        .service(delete)
+}

packages/backend/src/size.rs

@@ -0,0 +1,12 @@
+use crate::config;
+use actix_web::web;
+use mime;
+
+pub fn init(cfg: &mut web::ServiceConfig) {
+    let json = web::JsonConfig::default().limit(*config::LIMIT);
+    let plain = web::PayloadConfig::default()
+        .limit(*config::LIMIT)
+        .mimetype(mime::STAR_STAR);
+    // cfg.app_data(plain);
+    cfg.app_data(json).app_data(plain);
+}

packages/backend/src/status/mod.rs

@@ -1,39 +1,5 @@
-use crate::config;
+mod model;
-use axum::{http::StatusCode, Json};
+mod routes;
-use serde::Serialize;
 
-#[derive(Serialize)]
+pub use model::*;
-pub struct Status {
+pub use routes::*;
-    // General
-    pub version: String,
-    // Config
-    pub max_size: u32,
-    pub max_views: u32,
-    pub max_expiration: u32,
-    pub allow_advanced: bool,
-    pub allow_files: bool,
-    // Theme
-    pub theme_image: String,
-    pub theme_text: String,
-    pub theme_page_title: String,
-    pub theme_favicon: String,
-    pub theme_new_note_notice: bool,
-}
-
-pub async fn get_status() -> (StatusCode, Json<Status>) {
-    let status = Status {
-        version: config::VERSION.to_string(),
-        max_size: *config::LIMIT as u32,
-        max_views: *config::MAX_VIEWS,
-        max_expiration: *config::MAX_EXPIRATION,
-        allow_advanced: *config::ALLOW_ADVANCED,
-        allow_files: *config::ALLOW_FILES,
-        theme_new_note_notice: *config::THEME_NEW_NOTE_NOTICE,
-        theme_image: config::THEME_IMAGE.to_string(),
-        theme_text: config::THEME_TEXT.to_string(),
-        theme_page_title: config::THEME_PAGE_TITLE.to_string(),
-        theme_favicon: config::THEME_FAVICON.to_string(),
-    };
-
-    (StatusCode::OK, Json(status))
-}

packages/backend/src/status/model.rs

@@ -0,0 +1,19 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Status {
+    // General
+    pub version: String,
+    // Config
+    pub max_size: u32,
+    pub max_views: u32,
+    pub max_expiration: u32,
+    pub allow_advanced: bool,
+    pub allow_files: bool,
+    pub theme_new_note_notice: bool,
+    // Theme
+    pub theme_image: String,
+    pub theme_text: String,
+    pub theme_page_title: String,
+    pub theme_favicon: String,
+}

packages/backend/src/status/routes.rs

@@ -0,0 +1,25 @@
+use actix_web::{get, web, HttpResponse, Responder, Scope};
+
+use crate::config;
+use crate::status::Status;
+
+#[get("/")]
+async fn get_status() -> impl Responder {
+    return HttpResponse::Ok().json(Status {
+        version: config::VERSION.to_string(),
+        max_size: *config::LIMIT as u32,
+        max_views: *config::MAX_VIEWS,
+        max_expiration: *config::MAX_EXPIRATION,
+        allow_advanced: *config::ALLOW_ADVANCED,
+        allow_files: *config::ALLOW_FILES,
+        theme_new_note_notice: *config::THEME_NEW_NOTE_NOTICE,
+        theme_image: config::THEME_IMAGE.to_string(),
+        theme_text: config::THEME_TEXT.to_string(),
+        theme_page_title: config::THEME_PAGE_TITLE.to_string(),
+        theme_favicon: config::THEME_FAVICON.to_string(),
+    });
+}
+
+pub fn init() -> Scope {
+    web::scope("/status").service(get_status)
+}

packages/backend/src/store.rs

@@ -36,7 +36,7 @@ pub fn set(id: &String, note: &Note) -> Result<(), &'static str> {
     match note.expiration {
         Some(e) => {
             let seconds = e - now();
-            conn.expire(id, seconds as i64)
+            conn.expire(id, seconds as usize)
                 .map_err(|_| "Unable to set expiration on notion")?
         }
         None => {}

packages/cli/build.js

@@ -1,14 +0,0 @@
-import pkg from './package.json' with { type: 'json' }
-import { build } from 'tsup'
-
-const watch = process.argv.slice(2)[0] === '--watch'
-
-await build({
-  entry: ['src/index.ts', 'src/cli.ts'],
-  dts: true,
-  minify: true,
-  format: ['esm', 'cjs'],
-  clean: true,
-  define: { VERSION: `"${pkg.version}"` },
-  watch,
-})

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cryptgeon",
-  "version": "2.8.0",
+  "version": "2.6.0",
   "homepage": "https://github.com/cupcakearmy/cryptgeon",
   "repository": {
     "type": "git",
@@ -9,7 +9,7 @@
   },
   "type": "module",
   "exports": {
-    ".": "./dist/index.js"
+    ".": "./dist/index.mjs"
   },
   "types": "./dist/index.d.ts",
   "bin": {
@@ -20,8 +20,8 @@
   ],
   "scripts": {
     "bin": "run-s build package",
-    "build": "tsc && node build.js",
+    "build": "rm -rf dist && tsc && ./scripts/build.js",
-    "dev": "node build.js --watch",
+    "dev": "./scripts/build.js --watch",
     "prepublishOnly": "run-s build"
   },
   "devDependencies": {
@@ -31,11 +31,11 @@
     "@types/mime": "^3.0.4",
     "@types/node": "^20.11.24",
     "commander": "^12.0.0",
+    "esbuild": "^0.20.1",
     "inquirer": "^9.2.15",
     "mime": "^4.0.1",
     "occulto": "^2.0.3",
     "pretty-bytes": "^6.1.1",
-    "tsup": "^8.2.4",
     "typescript": "^5.3.3"
   },
   "engines": {

packages/cli/scripts/build.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+
+import { build, context } from 'esbuild'
+import pkg from '../package.json' assert { type: 'json' }
+
+const common = {
+  bundle: true,
+  minify: true,
+  platform: 'node',
+  define: { VERSION: `"${pkg.version}"` },
+}
+
+const cliOptions = {
+  ...common,
+  entryPoints: ['./src/cli.ts'],
+  format: 'cjs',
+  outfile: './dist/cli.cjs',
+}
+
+const indexOptions = {
+  ...common,
+  entryPoints: ['./src/index.ts'],
+  outfile: './dist/index.mjs',
+  format: 'esm',
+}
+
+const watch = process.argv.slice(2)[0] === '--watch'
+if (watch) {
+  const ctx = await context(cliOptions)
+  ctx.watch()
+} else {
+  await build(cliOptions)
+  await build(indexOptions)
+}

packages/cli/src/cli.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { Argument, Option, program } from '@commander-js/extra-typings'
-import { setOptions, status } from '@cryptgeon/shared'
+import { setBase, status } from '@cryptgeon/shared'
 import prettyBytes from 'pretty-bytes'
 
 import { download } from './download.js'
@@ -33,7 +33,7 @@ program
   .description('show information about the server')
   .addOption(server)
   .action(async (options) => {
-    setOptions({ server: options.server })
+    setBase(options.server)
     const response = await status()
     const formatted = {
       ...response,
@@ -54,7 +54,7 @@ send
   .addOption(minutes)
   .addOption(password)
   .action(async (files, options) => {
-    setOptions({ server: options.server })
+    setBase(options.server!)
     await checkConstrains(options)
     options.password ||= await getStdin()
     try {
@@ -72,7 +72,7 @@ send
   .addOption(minutes)
   .addOption(password)
   .action(async (text, options) => {
-    setOptions({ server: options.server })
+    setBase(options.server!)
     await checkConstrains(options)
     options.password ||= await getStdin()
     try {

packages/cli/src/download.ts

@@ -1,4 +1,4 @@
-import { Adapters, get, info, setOptions } from '@cryptgeon/shared'
+import { Adapters, get, info, setBase } from '@cryptgeon/shared'
 import inquirer from 'inquirer'
 import { access, constants, writeFile } from 'node:fs/promises'
 import { basename, resolve } from 'node:path'
@@ -6,7 +6,7 @@ import { AES, Hex } from 'occulto'
 import pretty from 'pretty-bytes'
 
 export async function download(url: URL, all: boolean, suggestedPassword?: string) {
-  setOptions({ server: url.origin })
+  setBase(url.origin)
   const id = url.pathname.split('/')[2]
   const preview = await info(id).catch(() => {
     throw new Error('Note does not exist or is expired')

packages/cli/src/upload.ts

@@ -1,7 +1,7 @@
 import { readFile, stat } from 'node:fs/promises'
 import { basename } from 'node:path'
 
-import { Adapters, create, getOptions, FileDTO, Note, NoteMeta } from '@cryptgeon/shared'
+import { Adapters, BASE, create, FileDTO, Note, NoteMeta } from '@cryptgeon/shared'
 import mime from 'mime'
 import { AES, Hex } from 'occulto'
 
@@ -39,7 +39,7 @@ export async function upload(input: string | string[], options: UploadOptions):
   // Create the actual note and upload it.
   const note: Note = { ...noteOptions, contents, meta: { type, derivation: derived?.[1] } }
   const result = await create(note)
-  let url = `${getOptions().server}/note/${result.id}`
+  let url = `${BASE}/note/${result.id}`
   if (!derived) url += `#${Hex.encode(key)}`
   return url
 }

packages/frontend/locales/en.json

@@ -25,7 +25,7 @@
 		"new_note": "new note",
 		"new_note_notice": "<b>availability:</b><br />the note is not guaranteed to be stored as everything is kept in ram, if it fills up the oldest notes will be removed.<br />(you probably will be fine, just be warned.)",
 		"errors": {
-			"note_to_big": "could not create note. note is too big",
+			"note_to_big": "could not create note. note is to big",
 			"note_error": "could not create note. please try again.",
 			"max": "max: {n}",
 			"empty_content": "note is empty."
@@ -44,7 +44,7 @@
 			"decryption_failed": "wrong password. could not decipher. probably a broken link. note was destroyed.",
 			"unsupported_type": "unsupported note type."
 		},
-		"explanation": "click below to show and delete the note if the counter has reached its limit",
+		"explanation": "click below to show and delete the note if the counter has reached it's limit",
 		"show_note": "show note",
 		"warning_will_not_see_again": "you will <b>not</b> get the chance to see the note again.",
 		"download_all": "download all",

packages/frontend/locales/fr.json

@@ -23,7 +23,7 @@
 		"intro": "Envoyez facilement des notes ou des fichiers <i>entièrement chiffrés</i> et sécurisés en un seul clic. Il suffit de créer une note et de partager le lien.",
 		"explanation": "la note expirera et sera détruite après {type}.",
 		"new_note": "nouvelle note",
-		"new_note_notice": "<b>disponibilité :</b><br />il n'est pas garanti que la note reste stockée car tout est conservé dans la mémoire vive; si elle se remplit, les notes les plus anciennes seront supprimées.<br />(tout ira probablement bien, soyez juste averti.)",
+		"new_note_notice": "<b>disponibilité :</b><br />la note n'est pas garantie d'être stockée car tout est conservé dans la mémoire vive; si elle se remplit, les notes les plus anciennes seront supprimées.<br />(tout ira probablement bien, soyez juste averti.)",
 		"errors": {
 			"note_to_big": "Impossible de créer une note. La note est trop grande.",
 			"note_error": "n'a pas pu créer de note. Veuillez réessayer.",
@@ -45,9 +45,9 @@
 			"unsupported_type": "type de note non supporté."
 		},
 		"explanation": "Cliquez ci-dessous pour afficher et supprimer la note si le compteur a atteint sa limite.",
-		"show_note": "afficher la note",
+		"show_note": "note de présentation",
 		"warning_will_not_see_again": "vous <b>n'aurez pas</b> la chance de revoir la note.",
-		"download_all": "tout télécharger",
+		"download_all": "télécharger tout",
 		"links_found": "liens trouvés à l’intérieur de la note :"
 	},
 	"file_upload": {

packages/frontend/locales/pl.json

@@ -1,58 +0,0 @@
-{
-	"common": {
-		"note": "notatka",
-		"file": "plik",
-		"advanced": "zaawansowane",
-		"create": "utwórz",
-		"loading": "ładowanie",
-		"mode": "tryb",
-		"views": "{n, plural, =0 {wyświetleń} =1 {1 wyświetlenie} other {# wyświetleń}}",
-		"minutes": "{n, plural, =0 {minut} =1 {1 minuta} other {# minuty}}",
-		"max": "maks.",
-		"share_link": "link udostępniania",
-		"copy_clipboard": "kopiuj do schowka",
-		"copied_to_clipboard": "skopiowano do schowka",
-		"encrypting": "szyfrowanie",
-		"decrypting": "odszyfrowywanie",
-		"uploading": "wysyłanie",
-		"downloading": "pobieranie",
-		"qr_code": "kod QR",
-		"password": "hasło"
-	},
-	"home": {
-		"intro": "Łatwo wysyłaj <i>w pełni zaszyfrowane</i>, bezpieczne notatki lub pliki jednym kliknięciem. Po prostu utwórz notatkę i udostępnij link.",
-		"explanation": "notatka wygaśnie i zostanie zniszczona po {type}.",
-		"new_note": "nowa notatka",
-		"new_note_notice": "<b>dostępność:</b><br />nie ma gwarancji, że notatka będzie przechowywana, ponieważ wszystko jest przechowywane w pamięci RAM, jeśli się zapełni, najstarsze notatki zostaną usunięte.<br />(prawdopodobnie nic się nie stanie, ale warto ostrzec.)",
-		"errors": {
-			"note_to_big": "nie można utworzyć notatki. notatka jest za duża",
-			"note_error": "nie można utworzyć notatki. spróbuj ponownie.",
-			"max": "maks .: {n}",
-			"empty_content": "notatka jest pusta."
-		},
-		"messages": {
-			"note_created": "notatka utworzona."
-		},
-		"advanced": {
-			"explanation": "Domyślnie dla każdej notatki używane jest bezpiecznie wygenerowane hasło. Możesz jednak wybrać własne hasło, które nie jest uwzględnione w linku.",
-			"custom_password": "własne hasło"
-		}
-	},
-	"show": {
-		"errors": {
-			"not_found": "notatka nie została znaleziona lub została już usunięta.",
-			"decryption_failed": "błędne hasło. nie można odszyfrować. prawdopodobnie uszkodzony link. notatka została zniszczona.",
-			"unsupported_type": "nieobsługiwany typ notatki."
-		},
-		"explanation": "kliknij poniżej, aby wyświetlić i usunąć notatkę, jeśli licznik osiągnie swój limit",
-		"show_note": "pokaż notatkę",
-		"warning_will_not_see_again": "<b>nie będziesz mieć</b> możliwości ponownego zobaczenia notatki.",
-		"download_all": "pobierz wszystko",
-		"links_found": "linki znalezione w notatce:"
-	},
-	"file_upload": {
-		"selected_files": "Wybrane pliki",
-		"no_files_selected": "Nie wybrano plików",
-		"clear": "Wyczyść"
-	}
-}

packages/frontend/locales/ru.json

@@ -1,58 +1,58 @@
-{
+{
-  "common": {
+	"common": {
-    "note": "заметка",
+		"note": "заметка",
-    "file": "файл",
+		"file": "файл",
-    "advanced": "расширенные",
+		"advanced": "расширенные",
-    "create": "создать",
+		"create": "создать",
-    "loading": "загрузка",
+		"loading": "загрузка",
-    "mode": "режим",
+		"mode": "режим",
-    "views": "{n, plural, =0 {просмотры} =1 {1 просмотр} other {# просмотры}}",
+		"views": "{n, plural, =0 {просмотры} =1 {1 просмотр} other {# просмотры}}",
-    "minutes": "{n, plural, =0 {минут} =1 {1 минута} other {# минуты}}",
+		"minutes": "{n, plural, =0 {минут} =1 {1 минута} other {# минуты}}",
-    "max": "макс",
+		"max": "макс",
-    "share_link": "поделиться ссылкой",
+		"share_link": "поделиться ссылкой",
-    "copy_clipboard": "скопировать в буфер обмена",
+		"copy_clipboard": "скопировать в буфер обмена",
-    "copied_to_clipboard": "скопировано в буфер обмена",
+		"copied_to_clipboard": "скопировано в буфер обмена",
-    "encrypting": "шифрование",
+		"encrypting": "шифрование",
-    "decrypting": "расшифровка",
+		"decrypting": "расшифровка",
-    "uploading": "загрузка",
+		"uploading": "загрузка",
-    "downloading": "скачивание",
+		"downloading": "скачивание",
-    "qr_code": "qr код",
+		"qr_code": "qr код",
-    "password": "пароль"
+		"password": "пароль"
-  },
+	},
-  "home": {
+	"home": {
-    "intro": "Легко отправляйте <i>полностью зашифрованные</i> защищенные заметки или файлы одним щелчком мыши. Просто создайте заметку и поделитесь ссылкой.",
+		"intro": "Легко отправляйте <i>полностью зашифрованные</i> защищенные заметки или файлы одним щелчком мыши. Просто создайте заметку и поделитесь ссылкой.",
-    "explanation": "заметка истечет и будет уничтожена после {type}.",
+		"explanation": "заметка истечет и будет уничтожена после {type}.",
-    "new_note": "новая заметка",
+		"new_note": "новая заметка",
-    "new_note_notice": "<b>доступность:</b><br />сохранение заметки не гарантируется, поскольку все хранится в оперативной памяти; если она заполнится, самые старые заметки будут удалены.<br />( вероятно, все будет в порядке, просто будьте осторожны.)",
+		"new_note_notice": "<b>availability:</b><br />the note is not guaranteed to be stored as everything is kept in ram, if it fills up the oldest notes will be removed.<br />(you probably will be fine, just be warned.)",
-    "errors": {
+		"errors": {
-      "note_to_big": "нельзя создать новую заметку. заметка слишком большая",
+			"note_to_big": "нельзя создать новую заметку. заметка слишком большая",
-      "note_error": "нельзя создать новую заметку. пожалйста попробуйте позднее.",
+			"note_error": "нельзя создать новую заметку. пожалйста попробуйте позднее.",
-      "max": "макс: {n}",
+			"max": "макс: {n}",
-      "empty_content": "пустая заметка."
+			"empty_content": "пустая заметка."
-    },
+		},
-    "messages": {
+		"messages": {
-      "note_created": "заметка создана."
+			"note_created": "заметка создана."
-    },
+		},
-    "advanced": {
+		"advanced": {
-      "explanation": "По умолчанию для каждой заметки используется безопасно сгенерированный пароль. Однако вы также можете выбрать свой собственный пароль, который не включен в ссылку.",
+			"explanation": "По умолчанию для каждой заметки используется безопасно сгенерированный пароль. Однако вы также можете выбрать свой собственный пароль, который не включен в ссылку.",
-      "custom_password": "пользовательский пароль"
+			"custom_password": "пользовательский пароль"
-    }
+		}
-  },
+	},
-  "show": {
+	"show": {
-    "errors": {
+		"errors": {
-      "not_found": "заметка не найдена или была удалена.",
+			"not_found": "заметка не найдена или была удалена.",
-      "decryption_failed": "неправильный пароль. не смог расшифровать. возможно ссылка битая. записка уничтожена.",
+			"decryption_failed": "неправильный пароль. не смог расшифровать. возможно ссылка битая. записка уничтожена.",
-      "unsupported_type": "неподдерживаемый тип заметки."
+			"unsupported_type": "неподдерживаемый тип заметки."
-    },
+		},
-    "explanation": "щелкните ниже, чтобы показать и удалить примечание, если счетчик достиг предела",
+		"explanation": "щелкните ниже, чтобы показать и удалить примечание, если счетчик достиг предела",
-    "show_note": "показать заметку",
+		"show_note": "показать заметку",
-    "warning_will_not_see_again": "вы <b>не сможете</b> больше просмотреть заметку.",
+		"warning_will_not_see_again": "вы <b>не сможете</b> больше просмотреть заметку.",
-    "download_all": "скачать всё",
+		"download_all": "скачать всё",
-    "links_found": "ссылки внутри заметки:"
+		"links_found": "ссылки внутри заметки:"
-  },
+	},
-  "file_upload": {
+	"file_upload": {
-    "selected_files": "Выбранные файлы",
+		"selected_files": "Выбранные файлы",
-    "no_files_selected": "Файлы не выбраны",
+		"no_files_selected": "Файлы не выбраны",
-    "clear": "Сброс"
+		"clear": "Сброс"
-  }
+	}
-}
+}

packages/frontend/src/lib/ui/Icon.svelte

@@ -18,19 +18,19 @@
 	export let icon: keyof typeof map
 </script>
 
-<button on:click {...$$restProps}>
+<div on:click {...$$restProps}>
 	{#if map[icon]}
 		<svelte:component this={map[icon]} />
 	{/if}
-</button>
+</div>
 
 <style>
-	button {
+	div {
 		display: inline-block;
 		contain: strict;
 		box-sizing: content-box;
 	}
-	button > :global(svg) {
+	div > :global(svg) {
 		display: block;
 		fill: currentColor;
 	}

packages/frontend/src/lib/ui/NoteResult.svelte

@@ -37,7 +37,7 @@
 
 {#if $status?.theme_new_note_notice}
 	<p>
-		{@html $t('home.new_note_notice')}
+		{@html $t('home.theme_new_note_notice')}
 	</p>
 {/if}
 <br />

packages/frontend/src/lib/ui/TextInput.svelte

@@ -39,23 +39,13 @@
 	<input bind:value {...$$restProps} class:valid={valid === true} />
 	<div class="icons">
 		{#if isPassword}
-			<Icon
+			<Icon class="icon" icon={hidden ? 'eye' : 'eye-off'} on:click={toggle} />
-				disabled={$$restProps.disabled}
-				class="icon"
-				icon={hidden ? 'eye' : 'eye-off'}
-				on:click={toggle}
-			/>
 		{/if}
 		{#if random}
-			<Icon disabled={$$restProps.disabled} class="icon" icon="dice" on:click={randomFN} />
+			<Icon class="icon" icon="dice" on:click={randomFN} />
 		{/if}
 		{#if copy}
-			<Icon
+			<Icon class="icon" icon="copy" on:click={() => copyFN(value.toString())} />
-				disabled={$$restProps.disabled}
-				class="icon"
-				icon="copy"
-				on:click={() => copyFN(value.toString())}
-			/>
 		{/if}
 	</div>
 </label>

packages/proxy/proxy.js

@@ -12,5 +12,5 @@ const server = http.createServer(function (req, res) {
   const target = req.url.startsWith('/api/') ? 'http://127.0.0.1:8000' : 'http://localhost:8001'
   proxy.web(req, res, { target, proxyTimeout: 250, timeout: 250 })
 })
-server.listen(3000)
+server.listen(1234)
-console.log('Proxy on http://localhost:3000')
+console.log('Proxy on http://localhost:1234')

packages/shared/src/api.ts

@@ -23,10 +23,6 @@ export type EncryptedFileDTO = Omit<FileDTO, 'contents'> & {
   contents: string
 }
 
-type ClientOptions = {
-  server: string
-}
-
 type CallOptions = {
   url: string
   method: string
@@ -35,21 +31,14 @@ type CallOptions = {
 
 export class PayloadToLargeError extends Error {}
 
-export let client: ClientOptions = {
+export let BASE = ''
-  server: '',
-}
 
-export function setOptions(options: Partial<ClientOptions>) {
+export function setBase(url: string) {
-  client = { ...client, ...options }
+  BASE = url
-}
-
-export function getOptions(): ClientOptions {
-  return client
 }
 
 export async function call(options: CallOptions) {
-  const url = client.server + '/api/' + options.url
+  const response = await fetch(BASE + '/api/' + options.url, {
-  const response = await fetch(url, {
     method: options.method,
     body: options.body === undefined ? undefined : JSON.stringify(options.body),
     mode: 'cors',
@@ -116,7 +105,6 @@ export type Status = {
   theme_text: string
   theme_favicon: string
   theme_page_title: string
-  theme_new_note_notice: boolean
 }
 
 export async function status() {

playwright.config.ts

@@ -3,19 +3,17 @@ import { devices, type PlaywrightTestConfig } from '@playwright/test'
 const config: PlaywrightTestConfig = {
   use: {
     video: 'retain-on-failure',
-    baseURL: 'http://localhost:3000',
+    baseURL: 'http://localhost:1234',
-    actionTimeout: 30_000,
+    actionTimeout: 60_000,
   },
 
   outputDir: './test-results',
   testDir: './test',
-  timeout: 30_000,
+  timeout: 60_000,
-  fullyParallel: true,
-  retries: 2,
 
   webServer: {
-    command: 'pnpm run docker:up',
+    command: 'docker compose -f docker-compose.dev.yaml up',
-    port: 3000,
+    port: 1234,
     reuseExistingServer: true,
   },
 
@@ -23,6 +21,10 @@ const config: PlaywrightTestConfig = {
     { name: 'chrome', use: { ...devices['Desktop Chrome'] } },
     { name: 'firefox', use: { ...devices['Desktop Firefox'] } },
     { name: 'safari', use: { ...devices['Desktop Safari'] } },
+
+    { name: 'cli', use: { ...devices['Desktop Chrome'] }, grep: [/@cli/] },
+    { name: 'web', use: { ...devices['Desktop Chrome'] }, grep: [/@web/] },
+    { name: 'cross', use: { ...devices['Desktop Chrome'] }, grep: [/@cross/] },
   ],
 }
 

test/cli/file/simple.spec.ts

@@ -1,11 +1,10 @@
 import { test } from '@playwright/test'
 import { basename } from 'node:path'
-import { rm } from 'node:fs/promises'
+import { Files, getFileChecksum, rm, tmpFile } from '../../files'
-import { Files, getFileChecksum, tmpFile } from '../../files'
 import { CLI, getLinkFromCLI } from '../../utils'
 
 test.describe('file @cli', () => {
-  test('simple', async () => {
+  test('simple', async ({ page }) => {
     const file = await tmpFile(Files.Image)
     const checksum = await getFileChecksum(file)
     const note = await CLI('send', 'file', file)
@@ -18,7 +17,7 @@ test.describe('file @cli', () => {
     test.expect(checksum).toBe(c)
   })
 
-  test('simple with password', async () => {
+  test('simple with password', async ({ page }) => {
     const file = await tmpFile(Files.Image)
     const password = 'password'
     const checksum = await getFileChecksum(file)

test/cli/text/simple.spec.ts

@@ -2,7 +2,7 @@ import { test } from '@playwright/test'
 import { CLI, getLinkFromCLI } from '../../utils'
 
 test.describe('text @cli', () => {
-  test('simple', async () => {
+  test('simple', async ({ page }) => {
     const text = `Endless prejudice endless play derive joy eternal-return selfish burying. Of decieve play pinnacle faith disgust. Spirit reason salvation burying strong of joy ascetic selfish against merciful sea truth. Ubermensch moral prejudice derive chaos mountains ubermensch justice philosophy justice ultimate joy ultimate transvaluation. Virtues convictions war ascetic eternal-return spirit. Ubermensch transvaluation noble revaluation sexuality intentions salvation endless decrepit hope noble fearful. Justice ideal ultimate snare god joy evil sexuality insofar gains oneself ideal.`
     const note = await CLI('send', 'text', text)
     const link = getLinkFromCLI(note.stdout)
@@ -11,7 +11,7 @@ test.describe('text @cli', () => {
     test.expect(retrieved.stdout.trim()).toBe(text)
   })
 
-  test('simple with password', async () => {
+  test('simple with password', async ({ page }) => {
     const text = `Endless prejudice endless play derive joy eternal-return selfish burying.`
     const password = 'password'
     const note = await CLI('send', 'text', text, '--password', password)

test/cross/file/simple.spec.ts

@@ -1,8 +1,7 @@
 import { test } from '@playwright/test'
-import { rm } from 'node:fs/promises'
+import { CLI, checkLinkForDownload, checkLinkForText, createNote, getLinkFromCLI } from '../../utils'
-import { basename } from 'node:path'
+import { Files, getFileChecksum, rm, tmpFile } from '../../files'
-import { Files, getFileChecksum, tmpFile } from '../../files'
+import { basename } from 'path'
-import { CLI, checkLinkForDownload, createNoteSuccessfully, getLinkFromCLI } from '../../utils'
 
 const text = `Endless prejudice endless play derive joy eternal-return selfish burying. Of decieve play pinnacle faith disgust. Spirit reason salvation burying strong of joy ascetic selfish against merciful sea truth. Ubermensch moral prejudice derive chaos mountains ubermensch justice philosophy justice ultimate joy ultimate transvaluation. Virtues convictions war ascetic eternal-return spirit. Ubermensch transvaluation noble revaluation sexuality intentions salvation endless decrepit hope noble fearful. Justice ideal ultimate snare god joy evil sexuality insofar gains oneself ideal.`
 const password = 'password'
@@ -31,7 +30,7 @@ test.describe('text @cross', () => {
   test('web to cli', async ({ page }) => {
     const files = [Files.Image]
     const checksum = await getFileChecksum(files[0])
-    const link = await createNoteSuccessfully(page, { files })
+    const link = await createNote(page, { files })
 
     const filename = basename(files[0])
     await CLI('open', link, '--all')
@@ -43,7 +42,7 @@ test.describe('text @cross', () => {
   test('web to cli with password', async ({ page }) => {
     const files = [Files.Image]
     const checksum = await getFileChecksum(files[0])
-    const link = await createNoteSuccessfully(page, { files, password })
+    const link = await createNote(page, { files, password })
 
     const filename = basename(files[0])
     await CLI('open', link, '--all', '--password', password)

test/cross/text/simple.spec.ts

@@ -1,5 +1,5 @@
 import { test } from '@playwright/test'
-import { CLI, checkLinkForText, createNoteSuccessfully, getLinkFromCLI } from '../../utils'
+import { CLI, checkLinkForText, createNote, getLinkFromCLI } from '../../utils'
 
 const text = `Endless prejudice endless play derive joy eternal-return selfish burying. Of decieve play pinnacle faith disgust. Spirit reason salvation burying strong of joy ascetic selfish against merciful sea truth. Ubermensch moral prejudice derive chaos mountains ubermensch justice philosophy justice ultimate joy ultimate transvaluation. Virtues convictions war ascetic eternal-return spirit. Ubermensch transvaluation noble revaluation sexuality intentions salvation endless decrepit hope noble fearful. Justice ideal ultimate snare god joy evil sexuality insofar gains oneself ideal.`
 const password = 'password'
@@ -13,7 +13,7 @@ test.describe('text @cross', () => {
   })
 
   test('web to cli', async ({ page }) => {
-    const link = await createNoteSuccessfully(page, { text })
+    const link = await createNote(page, { text })
     const retrieved = await CLI('open', link)
     test.expect(retrieved.stdout.trim()).toBe(text)
   })
@@ -25,7 +25,7 @@ test.describe('text @cross', () => {
   })
 
   test('web to cli with password', async ({ page }) => {
-    const link = await createNoteSuccessfully(page, { text, password })
+    const link = await createNote(page, { text, password })
     const retrieved = await CLI('open', link, '--password', password)
     test.expect(retrieved.stdout.trim()).toBe(text)
   })

test/files.ts

@@ -1,5 +1,10 @@
-import { createHash } from 'node:crypto'
+import { createHash } from 'crypto'
-import { cp, readFile } from 'node:fs/promises'
+import { cp as cpFN, rm as rmFN } from 'fs'
+import { readFile } from 'fs/promises'
+import { promisify } from 'util'
+
+export const cp = promisify(cpFN)
+export const rm = promisify(rmFN)
 
 export const Files = {
   PDF: 'test/assets/AES.pdf',

test/utils.ts

@@ -6,22 +6,17 @@ import { getFileChecksum } from './files'
 const exec = promisify(execFile)
 
 type CreatePage = {
+  text?: string
+  files?: string[]
   views?: number
   expiration?: number
   error?: string
   password?: string
-} & (
+}
-  | {
+export async function createNote(page: Page, options: CreatePage): Promise<string> {
-      text: string
-    }
-  | {
-      files: string[]
-    }
-)
-async function createNote(page: Page, options: CreatePage): Promise<void> {
   await page.goto('/')
 
-  if ('text' in options) {
+  if (options.text) {
     await page.getByTestId('text-field').fill(options.text)
   } else if (options.files) {
     await page.getByTestId('switch-file').click()
@@ -36,8 +31,7 @@ async function createNote(page: Page, options: CreatePage): Promise<void> {
   if (options.views || options.expiration || options.password) await page.getByTestId('switch-advanced').click()
   if (options.views) {
     await page.getByTestId('field-views').fill(options.views.toString())
-  }
+  } else if (options.expiration) {
-  if (options.expiration) {
     await page.getByTestId('switch-advanced-toggle').click()
     await page.getByTestId('field-expiration').fill(options.expiration.toString())
   }
@@ -47,18 +41,15 @@ async function createNote(page: Page, options: CreatePage): Promise<void> {
   }
 
   await page.locator('button:has-text("create")').click()
-}
 
-export async function createNoteSuccessfully(page: Page, options: CreatePage): Promise<string> {
+  if (options.error) {
-  await createNote(page, options)
+    await expect(page.locator('.error-text')).toContainText(options.error, { timeout: 60_000 })
+  }
+
+  // Return share link
   return await page.getByTestId('share-link').inputValue()
 }
 
-export async function createNoteError(page: Page, options: CreatePage, error: string): Promise<void> {
-  await createNote(page, options)
-  await expect(page.locator('._toastContainer')).toContainText(error)
-}
-
 type CheckLinkBase = {
   link: string
   text: string
@@ -78,7 +69,7 @@ export async function checkLinkForDownload(page: Page, options: CheckLinkBase &
   const path = await download.path()
   if (!path) throw new Error('Download failed')
   const cs = await getFileChecksum(path)
-  expect(cs).toBe(options.checksum)
+  await expect(cs).toBe(options.checksum)
 }
 
 export async function checkLinkForText(page: Page, options: CheckLinkBase) {
@@ -87,7 +78,7 @@ export async function checkLinkForText(page: Page, options: CheckLinkBase) {
   if (options.password) await page.getByTestId('show-note-password').fill(options.password)
   await page.getByTestId('show-note-button').click()
   const text = await page.getByTestId('result').locator('.note').innerText()
-  expect(text).toContain(options.text)
+  await expect(text).toContain(options.text)
 }
 
 export async function checkLinkDoesNotExist(page: Page, link: string) {
@@ -100,7 +91,7 @@ export async function CLI(...args: string[]) {
   return await exec('./packages/cli/dist/cli.cjs', args, {
     env: {
       ...process.env,
-      CRYPTGEON_SERVER: 'http://localhost:3000',
+      CRYPTGEON_SERVER: 'http://localhost:1234',
     },
   })
 }

test/web/file/multiple.spec.ts

@@ -1,12 +1,12 @@
 import { test } from '@playwright/test'
 import { Files, getFileChecksum } from '../../files'
-import { checkLinkForDownload, createNoteSuccessfully } from '../../utils'
+import { checkLinkForDownload, createNote } from '../../utils'
 
 test.describe('@web', () => {
   test('multiple', async ({ page }) => {
     const files = [Files.PDF, Files.Image]
     const checksums = await Promise.all(files.map(getFileChecksum))
-    const link = await createNoteSuccessfully(page, { files, views: 2 })
+    const link = await createNote(page, { files, views: 2 })
     await checkLinkForDownload(page, { link, text: 'image.jpg', checksum: checksums[1] })
     await checkLinkForDownload(page, { link, text: 'AES.pdf', checksum: checksums[0] })
   })

test/web/file/simple.spec.ts

@@ -1,11 +1,11 @@
 import { test } from '@playwright/test'
 import { Files, getFileChecksum } from '../../files'
-import { checkLinkDoesNotExist, checkLinkForDownload, checkLinkForText, createNoteSuccessfully } from '../../utils'
+import { checkLinkDoesNotExist, checkLinkForDownload, checkLinkForText, createNote } from '../../utils'
 
 test.describe('@web', () => {
   test('simple pdf', async ({ page }) => {
     const files = [Files.PDF]
-    const link = await createNoteSuccessfully(page, { files })
+    const link = await createNote(page, { files })
     await checkLinkForText(page, { link, text: 'AES.pdf' })
     await checkLinkDoesNotExist(page, link)
   })
@@ -13,21 +13,21 @@ test.describe('@web', () => {
   test('pdf content', async ({ page }) => {
     const files = [Files.PDF]
     const checksum = await getFileChecksum(files[0])
-    const link = await createNoteSuccessfully(page, { files })
+    const link = await createNote(page, { files })
     await checkLinkForDownload(page, { link, text: 'AES.pdf', checksum })
   })
 
   test('image content', async ({ page }) => {
     const files = [Files.Image]
     const checksum = await getFileChecksum(files[0])
-    const link = await createNoteSuccessfully(page, { files })
+    const link = await createNote(page, { files })
     await checkLinkForDownload(page, { link, text: 'image.jpg', checksum })
   })
 
   test('simple pdf with password', async ({ page }) => {
     const files = [Files.PDF]
     const password = 'password'
-    const link = await createNoteSuccessfully(page, { files, password })
+    const link = await createNote(page, { files, password })
     await checkLinkForText(page, { link, text: 'AES.pdf', password })
     await checkLinkDoesNotExist(page, link)
   })

test/web/file/too-big.spec.ts

@@ -1,10 +1,10 @@
 import { test } from '@playwright/test'
+import { createNote } from '../../utils'
 import { Files } from '../../files'
-import { createNoteError } from '../../utils'
 
 test.describe('@web', () => {
   test.skip('to big zip', async ({ page }) => {
     const files = [Files.Zip]
-    await createNoteError(page, { files }, 'could not create note. note is too big')
+    const link = await createNote(page, { files, error: 'note is to big' })
   })
 })

test/web/text/expiration.spec.ts

@@ -1,14 +1,13 @@
 import { test } from '@playwright/test'
-import { checkLinkDoesNotExist, checkLinkForText, createNoteSuccessfully } from '../../utils'
+import { checkLinkDoesNotExist, checkLinkForText, createNote } from '../../utils'
 
 test.describe('@web', () => {
-  test('1 minute', async ({ page, browserName }) => {
+  test('1 minute', async ({ page }) => {
-    test.skip(browserName === 'webkit')
     const text = `Virtues value ascetic revaluation sea dead strong burying.`
     const minutes = 1
     const timeout = minutes * 60_000
     test.setTimeout(timeout * 2)
-    const link = await createNoteSuccessfully(page, { text, expiration: minutes })
+    const link = await createNote(page, { text, expiration: minutes })
     await checkLinkForText(page, { link, text })
     await checkLinkForText(page, { link, text })
     await page.waitForTimeout(timeout)

test/web/text/simple.spec.ts

@@ -1,17 +1,17 @@
 import { test } from '@playwright/test'
-import { checkLinkForText, createNoteSuccessfully } from '../../utils'
+import { checkLinkForText, createNote } from '../../utils'
 
 test.describe('@web', () => {
   test('simple', async ({ page }) => {
     const text = `Endless prejudice endless play derive joy eternal-return selfish burying. Of deceive play pinnacle faith disgust. Spirit reason salvation burying strong of joy ascetic selfish against merciful sea truth. Ubermensch moral prejudice derive chaos mountains ubermensch justice philosophy justice ultimate joy ultimate transvaluation. Virtues convictions war ascetic eternal-return spirit. Ubermensch transvaluation noble revaluation sexuality intentions salvation endless decrepit hope noble fearful. Justice ideal ultimate snare god joy evil sexuality insofar gains oneself ideal.`
-    const link = await createNoteSuccessfully(page, { text })
+    const link = await createNote(page, { text })
     await checkLinkForText(page, { link, text })
   })
 
   test('simple with password', async ({ page }) => {
     const text = 'Foo bar'
     const password = '123'
-    const shareLink = await createNoteSuccessfully(page, { text, password })
+    const shareLink = await createNote(page, { text, password })
     await checkLinkForText(page, { link: shareLink, text, password })
   })
 })

test/web/text/views.spec.ts

@@ -1,17 +1,17 @@
 import { test } from '@playwright/test'
-import { checkLinkDoesNotExist, checkLinkForText, createNoteSuccessfully } from '../../utils'
+import { checkLinkDoesNotExist, checkLinkForText, createNote } from '../../utils'
 
 test.describe('@web', () => {
   test('only shown once', async ({ page }) => {
     const text = `Christian victorious reason suicide dead. Right ultimate gains god hope truth burying selfish society joy. Ultimate.`
-    const link = await createNoteSuccessfully(page, { text })
+    const link = await createNote(page, { text })
     await checkLinkForText(page, { link, text })
     await checkLinkDoesNotExist(page, link)
   })
 
   test('view 3 times', async ({ page }) => {
     const text = `Justice holiest overcome fearful strong ultimate holiest christianity.`
-    const link = await createNoteSuccessfully(page, { text, views: 3 })
+    const link = await createNote(page, { text, views: 3 })
     await checkLinkForText(page, { link, text })
     await checkLinkForText(page, { link, text })
     await checkLinkForText(page, { link, text })