Merge 8ccfdd6e2e into 2006be0434

2025-09-07 09:50:39 +00:00 · 2024-08-23 11:28:28 +02:00
67 changed files with 1814 additions and 1381 deletions
--- a/.dev.env
+++ b/.dev.env
--- a/.github/workflows/test.yaml
+++ b/.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@v4
-        if: ${{ !cancelled() }}
+      - uses: actions/upload-artifact@v3
        with:
-          name: playwright-report
-          path: test-results/
-          retention-days: 7
+          name: test-results
+          path: test-results
--- a/Cryptgeon.postman_collection.json
+++ b/Cryptgeon.postman_collection.json
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@
 <br/><br/>
 <a href="https://www.producthunt.com/posts/cryptgeon?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cryptgeon" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=295189&theme=light" alt="Cryptgeon - Securely share self-destructing notes | Product Hunt" height="50" /></a>
 <a href=""><img src="./.github/lokalise.png" height="50">
-<a title="Install cryptgeon Raycast Extension" href="https://www.raycast.com/cupcakearmy/cryptgeon"><img src="https://www.raycast.com/cupcakearmy/cryptgeon/install_button@2x.png?v=1.1" height="64" alt="" style="height: 64px;"></a>
 <br/><br/>

 EN | [简体中文](README_zh-CN.md) | [ES](README_ES.md)
@@ -40,12 +39,6 @@ npx cryptgeon send text "This is a secret note"

 For more documentation about the CLI see the [readme](./packages/cli/README.md).

-### Raycast Extension
-
-There is an [official Raycast extension](https://www.raycast.com/cupcakearmy/cryptgeon).
-
-<a title="Install cryptgeon Raycast Extension" href="https://www.raycast.com/cupcakearmy/cryptgeon"><img src="https://www.raycast.com/cupcakearmy/cryptgeon/install_button@2x.png?v=1.1" height="64" alt="" style="height: 64px;"></a>
-
 ## Features

 - send text or files
@@ -77,15 +70,14 @@ of the notes even if it tried to.
 | `MAX_EXPIRATION`        | `360`            | Maximal expiration in minutes.                                                                                                                                                                                |
 | `ALLOW_ADVANCED`        | `true`           | Allow custom configuration. If set to `false` all notes will be one view only.                                                                                                                                |
 | `ALLOW_FILES`           | `true`           | Allow uploading files. If set to `false`, users will only be allowed to create text notes.                                                                                                                    |
+| `THEME_NEW_NOTE_NOTICE` | `true`           | Show the message about how notes are stored in the memory and may be evicted after creating a new note. Defaults to `true`.                                                                                   |
 | `ID_LENGTH`             | `32`             | Set the size of the note `id` in bytes. By default this is `32` bytes. This is useful for reducing link size. _This setting does not affect encryption strength_.                                             |
 | `VERBOSITY`             | `warn`           | Verbosity level for the backend. [Possible values](https://docs.rs/env_logger/latest/env_logger/#enabling-logging) are: `error`, `warn`, `info`, `debug`, `trace`                                             |
 | `THEME_IMAGE`           | `""`             | Custom image for replacing the logo. Must be publicly reachable                                                                                                                                               |
 | `THEME_TEXT`            | `""`             | Custom text for replacing the description below the logo                                                                                                                                                      |
 | `THEME_PAGE_TITLE`      | `""`             | Custom text the page title                                                                                                                                                                                    |
 | `THEME_FAVICON`         | `""`             | Custom url for the favicon. Must be publicly reachable                                                                                                                                                        |
-| `THEME_NEW_NOTE_NOTICE` | `true`           | Show the message about how notes are stored in the memory and may be evicted after creating a new note. Defaults to `true`.                                                                                   |
-| `IMPRINT_URL`           | `""`             | Custom url for an Imprint hosted somewhere else. Must be publicly reachable. Takes precedence above `IMPRINT_HTML`.                                                                                                       |
-| `IMPRINT_HTML`          | `""`             | Alternative to `IMPRINT_URL`, this can be used to specify the HTML code to show on `/imprint`. Only `IMPRINT_HTML` or `IMPRINT_URL` should be specified, not both.|
+
 ## Deployment

 > ℹ️ `https` is required otherwise browsers will not support the cryptographic functions.
@@ -152,8 +144,6 @@ There is a [guide](https://mariushosting.com/how-to-install-cryptgeon-on-your-sy
 ### Written Guides

 - French by [zarevskaya](https://belginux.com/installer-cryptgeon-avec-docker/)
- Italian by [@nicfab](https://notes.nicfab.eu/it/posts/cryptgeon/)
- English by [@nicfab](https://notes.nicfab.eu/en/posts/cryptgeon/)

 ## Development

@@ -188,7 +178,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)

--- a/README_ES.md
+++ b/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                                                                                                                                                                                                         |
-| ------------------ | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `REDIS`            | `redis://redis/` | Redis URL a la que conectarse. [Según el formato](https://docs.rs/redis/latest/redis/#connection-parameters)                                                                                                        |
+| 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)                                                                                                     |
 | `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_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.                                                                                                           |
-| `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`                                                      |
-| `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_PAGE_TITLE` | `""`             | Texto personalizado para el título                                                                                                                                                                                  |
-| `THEME_FAVICON`    | `""`             | Url personalizada para el favicon. Debe ser accesible públicamente.                                                                                                                                                 |
+| `MAX_VIEWS`        | `100`            | Número máximo de vistas.                                                                                                                                                                                      |
+| `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.                                                                                                                                |
+| `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`                                             |
+| `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_PAGE_TITLE` | `""`             | Texto personalizado para el título                                                                                                                                                                                    |
+| `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)

--- a/README_zh-CN.md
+++ b/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).

 ## 测试

--- a/cryptgeon.code-workspace
+++ b/cryptgeon.code-workspace
@@ -11,6 +11,9 @@
    },
    {
      "path": "packages/cli"
+    },
+    {
+      "path": "packages/shared"
    }
  ],
  "settings": {
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -9,12 +9,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/']
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
    "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:local": "playwright test --project=chrome",
+    "test": "playwright test --project chrome firefox safari",
+    "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"
@@ -17,5 +17,5 @@
    "npm-run-all": "^4.1.5",
    "shelljs": "^0.8.5"
  },
-  "packageManager": "pnpm@9.11.0"
+  "packageManager": "pnpm@9.8.0"
 }
--- a/packages/backend/Cargo.lock
+++ b/packages/backend/Cargo.lock
--- a/packages/backend/Cargo.toml
+++ b/packages/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cryptgeon"
-version = "2.8.3"
+version = "2.7.0"
 authors = ["cupcakearmy <hi@nicco.io>"]
 edition = "2021"
 rust-version = "1.80"
@@ -10,18 +10,16 @@ name = "cryptgeon"
 path = "src/main.rs"

 [dependencies]
-# Core
-axum = "0.7.5"
-serde = { version = "1.0.208", 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
+actix-web = "4"
+actix-files = "0.6"
+serde = { version = "1.0", features = ["derive"] }
 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 = { version = "0.25.2", features = ["tls-native-tls"] }
--- a/packages/backend/package.json
+++ b/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"
  }
 }
--- a/packages/backend/src/api.rs
+++ b/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()),
+    );
+}
--- a/packages/backend/src/client.rs
+++ b/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)?)
+}
--- a/packages/backend/src/config.rs
+++ b/packages/backend/src/config.rs
@@ -38,12 +38,8 @@ pub static ref ALLOW_FILES: bool = std::env::var("ALLOW_FILES")
  .unwrap_or("true".to_string())
  .parse()
  .unwrap();
-pub static ref IMPRINT_URL: String = std::env::var("IMPRINT_URL")
-  .unwrap_or("".to_string())
-  .parse()
-  .unwrap();
-pub static ref IMPRINT_HTML: String = std::env::var("IMPRINT_HTML")
-  .unwrap_or("".to_string())
+pub static ref THEME_NEW_NOTE_NOTICE: bool = std::env::var("THEME_NEW_NOTE_NOTICE")
+  .unwrap_or("true".to_string())
  .parse()
  .unwrap();
 }
@@ -66,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();
 }
--- a/packages/backend/src/health/mod.rs
+++ b/packages/backend/src/health/mod.rs
@@ -1,10 +1,3 @@
-use crate::store;
-use axum::http::StatusCode;
+mod routes;

-pub async fn report_health() -> (StatusCode,) {
-    if store::can_reach_redis() {
-        return (StatusCode::OK,);
-    } else {
-        return (StatusCode::SERVICE_UNAVAILABLE,);
-    }
-}
+pub use routes::*;
--- a/packages/backend/src/health/routes.rs
+++ b/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)
+}
--- a/packages/backend/src/main.rs
+++ b/packages/backend/src/main.rs
@@ -1,67 +1,44 @@
-use axum::{
-    extract::{DefaultBodyLimit, Request},
-    routing::{delete, get, post},
-    Router, ServiceExt,
+use actix_web::{
+    middleware::{self, Logger},
+    web::{self},
+    App, HttpServer,
 };
 use dotenv::dotenv;
-use tower::Layer;
-use tower_http::{
-    compression::CompressionLayer,
-    normalize_path::NormalizePathLayer,
-    services::{ServeDir, ServeFile},
-};
+use log::error;

 #[macro_use]
 extern crate lazy_static;

+mod api;
+mod client;
 mod config;
 mod health;
 mod note;
+mod size;
 mod status;
 mod store;

-#[tokio::main]
-async fn main() {
+#[actix_web::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()
-        .route("/", post(note::create))
-        .route("/:id", delete(note::delete))
-        .route("/:id", get(note::preview));
-    let health_routes = Router::new().route("/live", get(health::report_health));
-    let status_routes = Router::new().route("/status", get(status::get_status));
-    let api_routes = Router::new()
-        .nest("/notes", notes_routes)
-        .nest("/", health_routes)
-        .nest("/", status_routes);
-
-    let index = format!("{}{}", config::FRONTEND_PATH.to_string(), "/index.html");
-    let serve_dir =
-        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();
+    return HttpServer::new(|| {
+        App::new()
+            .wrap(Logger::new("\"%r\" %s %b %T"))
+            .wrap(middleware::Compress::default())
+            .wrap(middleware::DefaultHeaders::default())
+            .configure(size::init)
+            .configure(api::init)
+            .configure(client::init)
+            .default_service(web::to(client::index))
+    })
+    .bind(config::LISTEN_ADDR.to_string())?
+    .run()
+    .await;
 }
--- a/packages/backend/src/note/model.rs
+++ b/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,
--- a/packages/backend/src/note/routes.rs
+++ b/packages/backend/src/note/routes.rs
@@ -1,18 +1,11 @@
-use axum::{
-    extract::Path,
-    http::StatusCode,
-    response::{IntoResponse, Response},
-    Json,
-};
+use actix_web::{delete, get, post, web, HttpResponse, Responder, Scope};
 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)]
-pub struct OneNoteParams {
+#[derive(Serialize, Deserialize)]
+struct NotePath {
    id: String,
 }

-pub async fn preview(Path(OneNoteParams { id }): Path<OneNoteParams>) -> Response {
-    let note = store::get(&id);
+#[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(None) => (StatusCode::NOT_FOUND).into_response(),
-        Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
+        Ok(Some(n)) => HttpResponse::Ok().json(NoteInfo { meta: n.meta }),
+        Ok(None) => HttpResponse::NotFound().finish(),
+        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 {
-    // let mut n = note.into_inner();
+#[post("/")]
+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 (
-            StatusCode::BAD_REQUEST,
-            "At least views or expiration must be set",
-        )
-            .into_response();
+        return bad_req;
    }
    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 {
-                return (StatusCode::BAD_REQUEST, "Invalid expiration").into_response();
+            if e > *config::MAX_EXPIRATION {
+                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(),
-        Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
+        Ok(_) => return HttpResponse::Ok().json(CreateResponse { id: id }),
+        Err(e) => return HttpResponse::InternalServerError().body(e.to_string()),
    }
 }

-pub async fn delete(Path(OneNoteParams { id }): Path<OneNoteParams>) -> Response {
-    let note = store::get(&id);
+#[delete("/{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()),
-        // Ok(None) => return HttpResponse::NotFound().finish(),
-        Err(e) => (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()).into_response(),
-        Ok(None) => (StatusCode::NOT_FOUND).into_response(),
+        Err(e) => HttpResponse::InternalServerError().body(e.to_string()),
+        Ok(None) => return HttpResponse::NotFound().finish(),
        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())
-                                    .into_response();
+                                return HttpResponse::InternalServerError().body(e.to_string())
                            }
                            _ => {}
                        }
                    } else {
                        match store::set(&id, &changed.clone()) {
                            Err(e) => {
-                                return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string())
-                                    .into_response();
+                                return HttpResponse::InternalServerError().body(e.to_string())
                            }
                            _ => {}
                        }
@@ -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()) {
-                            Ok(_) => return (StatusCode::BAD_REQUEST).into_response(),
+                        match store::del(&p.id.clone()) {
+                            Ok(_) => return HttpResponse::BadRequest().finish(),
                            Err(e) => {
-                                return (StatusCode::INTERNAL_SERVER_ERROR, e.to_string())
-                                    .into_response()
+                                return HttpResponse::InternalServerError().body(e.to_string())
                            }
                        }
                    }
                }
                _ => {}
            }
-
-            return (
-                StatusCode::OK,
-                Json(NotePublic {
-                    contents: changed.contents,
-                    meta: changed.meta,
-                }),
-            )
-                .into_response();
+            return HttpResponse::Ok().json(NotePublic {
+                contents: changed.contents,
+                meta: changed.meta,
+            });
        }
    }
 }
+
+#[derive(Serialize, Deserialize)]
+struct Status {
+    version: String,
+    max_size: usize,
+}
+
+pub fn init() -> Scope {
+    web::scope("/notes")
+        .service(one)
+        .service(create)
+        .service(delete)
+}
--- a/packages/backend/src/size.rs
+++ b/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);
+}
--- a/packages/backend/src/status/mod.rs
+++ b/packages/backend/src/status/mod.rs
@@ -1,43 +1,5 @@
-use crate::config;
-use axum::{http::StatusCode, Json};
-use serde::Serialize;
+mod model;
+mod routes;

-#[derive(Serialize)]
-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 imprint_url: String,
-    pub imprint_html: String,
-    // 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,
-        imprint_url: config::IMPRINT_URL.to_string(),
-        imprint_html: config::IMPRINT_HTML.to_string(),
-        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))
-}
+pub use model::*;
+pub use routes::*;
--- a/packages/backend/src/status/model.rs
+++ b/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,
+}
--- a/packages/backend/src/status/routes.rs
+++ b/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)
+}
--- a/packages/cli/build.js
+++ b/packages/cli/build.js
@@ -1,14 +1,13 @@
-import { build } from 'tsup'
 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', 'src/shared/shared.ts'],
+  entry: ['src/index.ts', 'src/cli.ts'],
  dts: true,
  minify: true,
  format: ['esm', 'cjs'],
-  target: 'es2020',
  clean: true,
  define: { VERSION: `"${pkg.version}"` },
  watch,
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cryptgeon",
-  "version": "2.8.3",
+  "version": "2.7.0",
  "homepage": "https://github.com/cupcakearmy/cryptgeon",
  "repository": {
    "type": "git",
@@ -9,11 +9,7 @@
  },
  "type": "module",
  "exports": {
-    ".": "./dist/index.js",
-    "./shared": {
-      "import": "./dist/shared/shared.js",
-      "types": "./dist/shared/shared.d.ts"
-    }
+    ".": "./dist/index.js"
  },
  "types": "./dist/index.d.ts",
  "bin": {
@@ -29,14 +25,15 @@
    "prepublishOnly": "run-s build"
  },
  "devDependencies": {
-    "@commander-js/extra-typings": "^12.1.0",
+    "@commander-js/extra-typings": "^12.0.1",
+    "@cryptgeon/shared": "workspace:*",
    "@types/inquirer": "^9.0.7",
-    "@types/mime": "^4.0.0",
+    "@types/mime": "^3.0.4",
    "@types/node": "^20.11.24",
-    "commander": "^12.1.0",
+    "commander": "^12.0.0",
    "inquirer": "^9.2.15",
    "mime": "^4.0.1",
-    "occulto": "^2.0.6",
+    "occulto": "^2.0.3",
    "pretty-bytes": "^6.1.1",
    "tsup": "^8.2.4",
    "typescript": "^5.3.3"
--- a/packages/cli/src/cli.ts
+++ b/packages/cli/src/cli.ts
@@ -1,14 +1,14 @@
 #!/usr/bin/env node

 import { Argument, Option, program } from '@commander-js/extra-typings'
+import { setOptions, status } from '@cryptgeon/shared'
 import prettyBytes from 'pretty-bytes'

-import { download } from './actions/download.js'
-import { upload } from './actions/upload.js'
-import { API } from './shared/api.js'
-import { parseFile, parseNumber } from './utils/parsers.js'
-import { getStdin } from './utils/stdin.js'
-import { checkConstrains, exit } from './utils/utils.js'
+import { download } from './download.js'
+import { parseFile, parseNumber } from './parsers.js'
+import { getStdin } from './stdin.js'
+import { upload } from './upload.js'
+import { checkConstrains, exit } from './utils.js'

 const defaultServer = process.env['CRYPTGEON_SERVER'] || 'https://cryptgeon.org'
 const server = new Option('-s --server <url>', 'the cryptgeon server to use').default(defaultServer)
@@ -33,8 +33,8 @@ program
  .description('show information about the server')
  .addOption(server)
  .action(async (options) => {
-    API.setOptions({ server: options.server })
-    const response = await API.status()
+    setOptions({ server: options.server })
+    const response = await status()
    const formatted = {
      ...response,
      max_size: prettyBytes(response.max_size),
@@ -54,7 +54,7 @@ send
  .addOption(minutes)
  .addOption(password)
  .action(async (files, options) => {
-    API.setOptions({ server: options.server })
+    setOptions({ server: options.server })
    await checkConstrains(options)
    options.password ||= await getStdin()
    try {
@@ -72,7 +72,7 @@ send
  .addOption(minutes)
  .addOption(password)
  .action(async (text, options) => {
-    API.setOptions({ server: options.server })
+    setOptions({ server: options.server })
    await checkConstrains(options)
    options.password ||= await getStdin()
    try {
--- a/packages/cli/src/actions/download.ts
+++ b/packages/cli/src/actions/download.ts
@@ -1,15 +1,14 @@
+import { Adapters, get, info, setOptions } from '@cryptgeon/shared'
 import inquirer from 'inquirer'
 import { access, constants, writeFile } from 'node:fs/promises'
 import { basename, resolve } from 'node:path'
 import { AES, Hex } from 'occulto'
 import pretty from 'pretty-bytes'
-import { Adapters } from '../shared/adapters.js'
-import { API } from '../shared/api.js'

 export async function download(url: URL, all: boolean, suggestedPassword?: string) {
-  API.setOptions({ server: url.origin })
+  setOptions({ server: url.origin })
  const id = url.pathname.split('/')[2]
-  const preview = await API.info(id).catch(() => {
+  const preview = await info(id).catch(() => {
    throw new Error('Note does not exist or is expired')
  })

@@ -34,7 +33,7 @@ export async function download(url: URL, all: boolean, suggestedPassword?: strin
  }

  const key = derivation ? (await AES.derive(password, derivation))[0] : Hex.decode(password)
-  const note = await API.get(id)
+  const note = await get(id)

  const couldNotDecrypt = new Error('Could not decrypt note. Probably an invalid password')
  switch (note.meta.type) {
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -1,4 +1,4 @@
-export * from './actions/download.js'
-export * from './actions/upload.js'
-export * from './shared/adapters.js'
-export * from './shared/api.js'
+export * from '@cryptgeon/shared'
+export * from './download.js'
+export * from './upload.js'
+export * from './utils.js'
--- a/packages/cli/src/utils/parsers.ts
+++ b/packages/cli/src/utils/parsers.ts
@@ -21,7 +21,7 @@ export function parseURL(value: string, _: URL): URL {
 }

 export function parseNumber(value: string, _: number): number {
-  const n = Number.parseInt(value, 10)
-  if (Number.isNaN(n)) throw new InvalidOptionArgumentError('invalid number')
+  const n = parseInt(value, 10)
+  if (isNaN(n)) throw new InvalidOptionArgumentError('invalid number')
  return n
 }
--- a/packages/cli/src/utils/stdin.ts
+++ b/packages/cli/src/utils/stdin.ts
@@ -18,7 +18,6 @@ export function getStdin(timeout: number = 10): Promise<string> {
      resolve('')
    }, timeout)

-    process.stdin.on('error', reject)
    process.stdin.on('data', dataHandler)
    process.stdin.on('end', endHandler)
  })
--- a/packages/cli/src/actions/upload.ts
+++ b/packages/cli/src/actions/upload.ts
@@ -1,10 +1,9 @@
 import { readFile, stat } from 'node:fs/promises'
 import { basename } from 'node:path'

+import { Adapters, create, getOptions, FileDTO, Note, NoteMeta } from '@cryptgeon/shared'
 import mime from 'mime'
 import { AES, Hex } from 'occulto'
-import { Adapters } from '../shared/adapters.js'
-import { API, FileDTO, Note, NoteMeta } from '../shared/api.js'

 export type UploadOptions = Pick<Note, 'views' | 'expiration'> & { password?: string }

@@ -39,8 +38,8 @@ 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 API.create(note)
-  let url = `${API.getOptions().server}/note/${result.id}`
+  const result = await create(note)
+  let url = `${getOptions().server}/note/${result.id}`
  if (!derived) url += `#${Hex.encode(key)}`
  return url
 }
--- a/packages/cli/src/utils/utils.ts
+++ b/packages/cli/src/utils/utils.ts
@@ -1,5 +1,5 @@
+import { status } from '@cryptgeon/shared'
 import { exit as exitNode } from 'node:process'
-import { API } from '../shared/api.js'

 export function exit(message: string) {
  console.error(message)
@@ -11,7 +11,7 @@ export async function checkConstrains(constrains: { views?: number; minutes?: nu
  if (views && minutes) exit('cannot set view and minutes constrains simultaneously')
  if (!views && !minutes) constrains.views = 1

-  const response = await API.status()
+  const response = await status()
  if (views && views > response.max_views)
    exit(`Only a maximum of ${response.max_views} views allowed. ${views} given.`)
  if (minutes && minutes > response.max_expiration)
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -2,7 +2,7 @@
  "compilerOptions": {
    "target": "es2022",
    "module": "es2022",
-    "moduleResolution": "Bundler",
+    "moduleResolution": "node",
    "declaration": true,
    "emitDeclarationOnly": true,
    "strict": true,
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -17,6 +17,7 @@
 		"@sveltejs/adapter-static": "^3.0.1",
 		"@sveltejs/kit": "^2.5.2",
 		"@sveltejs/vite-plugin-svelte": "^3.0.2",
+		"@types/file-saver": "^2.0.7",
 		"@zerodevx/svelte-toast": "^0.9.5",
 		"adm-zip": "^0.5.10",
 		"dotenv": "^16.4.5",
@@ -28,9 +29,11 @@
 		"vite": "^5.1.7"
 	},
 	"dependencies": {
-		"cryptgeon": "workspace:*",
+		"@cryptgeon/shared": "workspace:*",
 		"@fontsource/fira-mono": "^5.0.8",
-		"occulto": "^2.0.6",
+		"copy-to-clipboard": "^3.3.3",
+		"file-saver": "^2.0.5",
+		"occulto": "^2.0.3",
 		"pretty-bytes": "^6.1.1",
 		"qrious": "^4.0.2"
 	}
--- a/packages/frontend/src/lib/stores/status.ts
+++ b/packages/frontend/src/lib/stores/status.ts
@@ -1,8 +1,8 @@
-import { API, type Status } from 'cryptgeon/shared'
+import { status as getStatus, type Status } from '@cryptgeon/shared'
 import { writable } from 'svelte/store'

 export const status = writable<null | Status>(null)

 export async function init() {
-	status.set(await API.status())
+	status.set(await getStatus())
 }
--- a/packages/frontend/src/lib/toast.ts
+++ b/packages/frontend/src/lib/toast.ts
@@ -1,11 +1,11 @@
-import { toast } from '@zerodevx/svelte-toast'
+import { toast, type SvelteToastOptions } from '@zerodevx/svelte-toast'

 export enum NotifyType {
 	Success = 'success',
 	Error = 'error',
 }

-const themeMapping: Record<NotifyType, Record<string, string>> = {
+const themeMapping: Record<NotifyType, SvelteToastOptions['theme']> = {
 	[NotifyType.Success]: {
 		'--toastBackground': 'var(--ui-clr-primary)',
 		'--toastBarBackground': 'var(--ui-clr-primary-alt)',
@@ -17,7 +17,7 @@ const themeMapping: Record<NotifyType, Record<string, string>> = {
 }

 function notifyFN(message: string, type: NotifyType = NotifyType.Success) {
-	const options = {
+	const options: SvelteToastOptions = {
 		duration: 5_000,
 		theme: {
 			...themeMapping[type],
--- a/packages/frontend/src/lib/ui/AdvancedParameters.svelte
+++ b/packages/frontend/src/lib/ui/AdvancedParameters.svelte
@@ -4,7 +4,7 @@
 	import { status } from '$lib/stores/status'
 	import Switch from '$lib/ui/Switch.svelte'
 	import TextInput from '$lib/ui/TextInput.svelte'
-	import type { Note } from 'cryptgeon/shared'
+	import type { Note } from '@cryptgeon/shared'

 	export let note: Note
 	export let timeExpiration = false
--- a/packages/frontend/src/lib/ui/FileUpload.svelte
+++ b/packages/frontend/src/lib/ui/FileUpload.svelte
@@ -3,7 +3,7 @@

 	import Button from '$lib/ui/Button.svelte'
 	import MaxSize from '$lib/ui/MaxSize.svelte'
-	import type { FileDTO } from 'cryptgeon/shared'
+	import type { FileDTO } from '@cryptgeon/shared'

 	export let label: string = ''
 	export let files: FileDTO[] = []
--- a/packages/frontend/src/lib/ui/Icon.svelte
+++ b/packages/frontend/src/lib/ui/Icon.svelte
@@ -18,19 +18,19 @@
 	export let icon: keyof typeof map
 </script>

-<button type="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;
 	}
--- a/packages/frontend/src/lib/ui/ShowNote.svelte
+++ b/packages/frontend/src/lib/ui/ShowNote.svelte
@@ -1,26 +1,16 @@
 <script lang="ts" context="module">
 	export type DecryptedNote = Omit<NotePublic, 'contents'> & { contents: any }
-
-	function saveAs(file: File) {
-		const url = window.URL.createObjectURL(file)
-		const a = document.createElement('a')
-		a.style.display = 'none'
-		a.href = url
-		a.download = file.name
-		document.body.appendChild(a)
-		a.click()
-		window.URL.revokeObjectURL(url)
-		a.remove()
-	}
 </script>

 <script lang="ts">
+	import pkg from 'file-saver'
+	const { saveAs } = pkg
 	import prettyBytes from 'pretty-bytes'
 	import { t } from 'svelte-intl-precompile'

 	import Button from '$lib/ui/Button.svelte'
 	import { copy } from '$lib/utils'
-	import type { FileDTO, NotePublic } from 'cryptgeon/shared'
+	import type { FileDTO, NotePublic } from '@cryptgeon/shared'

 	export let note: DecryptedNote

--- a/packages/frontend/src/lib/ui/TextInput.svelte
+++ b/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
-				disabled={$$restProps.disabled}
-				class="icon"
-				icon={hidden ? 'eye' : 'eye-off'}
-				on:click={toggle}
-			/>
+			<Icon 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
-				disabled={$$restProps.disabled}
-				class="icon"
-				icon="copy"
-				on:click={() => copyFN(value.toString())}
-			/>
+			<Icon class="icon" icon="copy" on:click={() => copyFN(value.toString())} />
 		{/if}
 	</div>
 </label>
--- a/packages/frontend/src/lib/utils.ts
+++ b/packages/frontend/src/lib/utils.ts
@@ -1,10 +1,11 @@
+import copyToClipboard from 'copy-to-clipboard'
 import { t } from 'svelte-intl-precompile'
 import { get } from 'svelte/store'

 import { notify } from './toast'

 export function copy(value: string) {
-	window.navigator.clipboard.writeText(value)
+	copyToClipboard(value)
 	const msg = get(t)('common.copied_to_clipboard')
 	notify.success(msg)
 }
--- a/packages/frontend/src/lib/views/Create.svelte
+++ b/packages/frontend/src/lib/views/Create.svelte
@@ -13,7 +13,8 @@
 	import Result, { type NoteResult } from '$lib/ui/NoteResult.svelte'
 	import Switch from '$lib/ui/Switch.svelte'
 	import TextArea from '$lib/ui/TextArea.svelte'
-	import { Adapters, API, PayloadToLargeError, type FileDTO, type Note } from 'cryptgeon/shared'
+	import type { FileDTO, Note } from '@cryptgeon/shared'
+	import { Adapters, PayloadToLargeError, create } from '@cryptgeon/shared'

 	let note: Note = {
 		contents: '',
@@ -76,7 +77,7 @@
 			else data.views = parseInt(note.views as any)

 			loading = $t('common.uploading')
-			const response = await API.create(data)
+			const response = await create(data)
 			result = {
 				id: response.id,
 				password: customPassword ? undefined : Hex.encode(key),
--- a/packages/frontend/src/lib/views/Footer.svelte
+++ b/packages/frontend/src/lib/views/Footer.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import ThemeToggle from '$lib/ui/ThemeToggle.svelte'
-        import { status } from '$lib/stores/status'
 </script>

 <footer>
@@ -8,11 +7,6 @@
 	<nav>
 		<a href="/">/home</a>
 		<a href="/about">/about</a>
-		{#if $status?.imprint_url}
-			<a href={$status.imprint_url} target="_blank" rel="noopener noreferrer">/imprint</a>
-		{:else if $status?.imprint_html}
-			<a href="/imprint">/imprint</a>
-		{/if}
 		<a href="https://github.com/cupcakearmy/cryptgeon" target="_blank" rel="noopener noreferrer">
 			code
 		</a>
--- a/packages/frontend/src/routes/imprint/+page.svelte
+++ b/packages/frontend/src/routes/imprint/+page.svelte
@@ -1,35 +0,0 @@
-<script lang="ts">
-	import { get } from 'svelte/store';
-	import { goto } from '$app/navigation';
-	import { status } from '$lib/stores/status'
-	
-	status.subscribe((config) => {
-		if (config != null) {
-			if (config.imprint_url) {
-				window.location = config.imprint_url;
-			}
-			else if (config.imprint_html == "") {
-				goto("/about");
-			}
-		}
-	});
-</script>
-
-<svelte:head>
-	<title>Imprint</title>
-</svelte:head>
-
-<section class="content">
-{#if $status?.imprint_html}
-	{@html $status.imprint_html}
-{/if}
-</section>
-
-<style>
-	section {
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		gap: 2rem;
-	}
-</style>
--- a/packages/frontend/src/routes/note/[id]/+page.svelte
+++ b/packages/frontend/src/routes/note/[id]/+page.svelte
@@ -7,7 +7,7 @@
 	import Loader from '$lib/ui/Loader.svelte'
 	import ShowNote, { type DecryptedNote } from '$lib/ui/ShowNote.svelte'
 	import TextInput from '$lib/ui/TextInput.svelte'
-	import { Adapters, API, type NoteMeta } from 'cryptgeon/shared'
+	import { Adapters, get, info, type NoteMeta } from '@cryptgeon/shared'
 	import type { PageData } from './$types'

 	export let data: PageData
@@ -28,7 +28,7 @@
 		try {
 			loading = $t('common.loading')
 			password = window.location.hash.slice(1)
-			const note = await API.info(id)
+			const note = await info(id)
 			meta = note.meta
 			exists = true
 		} catch {
@@ -51,7 +51,7 @@
 			// Load note
 			error = null
 			loading = $t('common.downloading')
-			const data = await API.get(id)
+			const data = await get(id)
 			loading = $t('common.decrypting')
 			const derived = meta?.derivation && (await AES.derive(password!, meta.derivation))
 			const key = derived ? derived[0] : Hex.decode(password!)
--- a/packages/proxy/proxy.js
+++ b/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)
-console.log('Proxy on http://localhost:3000')
+server.listen(1234)
+console.log('Proxy on http://localhost:1234')
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -0,0 +1,22 @@
+{
+  "private": true,
+  "name": "@cryptgeon/shared",
+  "type": "module",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "dev": "tsc -w",
+    "build": "tsc"
+  },
+  "devDependencies": {
+    "typescript": "^5.3.3"
+  },
+  "dependencies": {
+    "occulto": "^2.0.3"
+  }
+}
--- a/packages/cli/src/shared/adapters.ts
+++ b/packages/cli/src/shared/adapters.ts
--- a/packages/cli/src/shared/api.ts
+++ b/packages/cli/src/shared/api.ts
@@ -39,15 +39,15 @@ export let client: ClientOptions = {
  server: '',
 }

-function setOptions(options: Partial<ClientOptions>) {
+export function setOptions(options: Partial<ClientOptions>) {
  client = { ...client, ...options }
 }

-function getOptions(): ClientOptions {
+export function getOptions(): ClientOptions {
  return client
 }

-async function call(options: CallOptions) {
+export async function call(options: CallOptions) {
  const url = client.server + '/api/' + options.url
  const response = await fetch(url, {
    method: options.method,
@@ -65,7 +65,7 @@ async function call(options: CallOptions) {
  return response.json()
 }

-async function create(note: Note) {
+export async function create(note: Note) {
  const { meta, ...rest } = note
  const body: NoteCreate = {
    ...rest,
@@ -79,7 +79,7 @@ async function create(note: Note) {
  return data as { id: string }
 }

-async function get(id: string): Promise<NotePublic> {
+export async function get(id: string): Promise<NotePublic> {
  const data = await call({
    url: `notes/${id}`,
    method: 'delete',
@@ -93,7 +93,7 @@ async function get(id: string): Promise<NotePublic> {
  return note
 }

-async function info(id: string): Promise<NoteInfo> {
+export async function info(id: string): Promise<NoteInfo> {
  const data = await call({
    url: `notes/${id}`,
    method: 'get',
@@ -112,29 +112,16 @@ export type Status = {
  max_views: number
  max_expiration: number
  allow_advanced: boolean
-  allow_files: boolean
-  imprint_url: string
-  imprint_html: string
  theme_image: string
  theme_text: string
  theme_favicon: string
  theme_page_title: string
-  theme_new_note_notice: boolean
 }

-async function status() {
+export async function status() {
  const data = await call({
    url: 'status/',
    method: 'get',
  })
  return data as Status
 }
-
-export const API = {
-  setOptions,
-  getOptions,
-  create,
-  get,
-  info,
-  status,
-}
--- a/packages/cli/src/shared/shared.ts
+++ b/packages/cli/src/shared/shared.ts
--- a/packages/shared/tsconfig.json
+++ b/packages/shared/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "incremental": true,
+    "composite": true,
+    "target": "es2022",
+    "module": "es2022",
+    "rootDir": "./src",
+    "moduleResolution": "node",
+    "outDir": "./dist",
+    "strict": true
+  }
+}
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -3,19 +3,18 @@ import { devices, type PlaywrightTestConfig } from '@playwright/test'
 const config: PlaywrightTestConfig = {
  use: {
    video: 'retain-on-failure',
-    baseURL: 'http://localhost:3000',
-    actionTimeout: 30_000,
+    baseURL: 'http://localhost:1234',
+    actionTimeout: 10_000,
  },

  outputDir: './test-results',
  testDir: './test',
-  timeout: 30_000,
+  timeout: 10_000,
  fullyParallel: true,
-  retries: 2,

  webServer: {
-    command: 'pnpm run docker:up',
-    port: 3000,
+    command: 'docker compose -f docker-compose.dev.yaml up',
+    port: 1234,
    reuseExistingServer: true,
  },

@@ -23,6 +22,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/] },
  ],
 }

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,20 +26,23 @@ importers:
  packages/cli:
    devDependencies:
      '@commander-js/extra-typings':
-        specifier: ^12.1.0
-        version: 12.1.0(commander@12.1.0)
+        specifier: ^12.0.1
+        version: 12.0.1(commander@12.0.0)
+      '@cryptgeon/shared':
+        specifier: workspace:*
+        version: link:../shared
      '@types/inquirer':
        specifier: ^9.0.7
        version: 9.0.7
      '@types/mime':
-        specifier: ^4.0.0
-        version: 4.0.0
+        specifier: ^3.0.4
+        version: 3.0.4
      '@types/node':
        specifier: ^20.11.24
        version: 20.11.24
      commander:
-        specifier: ^12.1.0
-        version: 12.1.0
+        specifier: ^12.0.0
+        version: 12.0.0
      inquirer:
        specifier: ^9.2.15
        version: 9.2.15
@@ -47,8 +50,8 @@ importers:
        specifier: ^4.0.1
        version: 4.0.1
      occulto:
-        specifier: ^2.0.6
-        version: 2.0.6
+        specifier: ^2.0.3
+        version: 2.0.3
      pretty-bytes:
        specifier: ^6.1.1
        version: 6.1.1
@@ -61,15 +64,21 @@ importers:

  packages/frontend:
    dependencies:
+      '@cryptgeon/shared':
+        specifier: workspace:*
+        version: link:../shared
      '@fontsource/fira-mono':
        specifier: ^5.0.8
        version: 5.0.8
-      cryptgeon:
-        specifier: workspace:*
-        version: link:../cli
+      copy-to-clipboard:
+        specifier: ^3.3.3
+        version: 3.3.3
+      file-saver:
+        specifier: ^2.0.5
+        version: 2.0.5
      occulto:
-        specifier: ^2.0.6
-        version: 2.0.6
+        specifier: ^2.0.3
+        version: 2.0.3
      pretty-bytes:
        specifier: ^6.1.1
        version: 6.1.1
@@ -89,6 +98,9 @@ importers:
      '@sveltejs/vite-plugin-svelte':
        specifier: ^3.0.2
        version: 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0))
+      '@types/file-saver':
+        specifier: ^2.0.7
+        version: 2.0.7
      '@zerodevx/svelte-toast':
        specifier: ^0.9.5
        version: 0.9.5(svelte@4.2.12)
@@ -123,6 +135,16 @@ importers:
        specifier: ^1.18.1
        version: 1.18.1

+  packages/shared:
+    dependencies:
+      occulto:
+        specifier: ^2.0.3
+        version: 2.0.3
+    devDependencies:
+      typescript:
+        specifier: ^5.3.3
+        version: 5.3.3
+
 packages:

  '@ampproject/remapping@2.3.0':
@@ -220,10 +242,10 @@ packages:
    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
    engines: {node: '>=6.9.0'}

-  '@commander-js/extra-typings@12.1.0':
-    resolution: {integrity: sha512-wf/lwQvWAA0goIghcb91dQYpkLBcyhOhQNqG/VgWhnKzgt+UOMvra7EX/2fv70arm5RW+PUHoQHHDa6/p77Eqg==}
+  '@commander-js/extra-typings@12.0.1':
+    resolution: {integrity: sha512-OvkMobb1eMqOCuJdbuSin/KJkkZr7n24/UNV+Lcz/0Dhepf3r2p9PaGwpRpAWej7A+gQnny4h8mGhpFl4giKkg==}
    peerDependencies:
-      commander: ~12.1.0
+      commander: ~12.0.0

  '@esbuild/aix-ppc64@0.19.12':
    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
@@ -756,12 +778,14 @@ packages:
  '@types/estree@1.0.5':
    resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}

+  '@types/file-saver@2.0.7':
+    resolution: {integrity: sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==}
+
  '@types/inquirer@9.0.7':
    resolution: {integrity: sha512-Q0zyBupO6NxGRZut/JdmqYKOnN95Eg5V8Csg3PGKkP+FnvsUZx1jAyK7fztIszxxMuoBA6E3KXWvdZVXIpx60g==}

-  '@types/mime@4.0.0':
-    resolution: {integrity: sha512-5eEkJZ/BLvTE3vXGKkWlyTSUVZuzj23Wj8PoyOq2lt5I3CYbiLBOPb3XmCW6QcuOibIUE6emHXHt9E/F/rCa6w==}
-    deprecated: This is a stub types definition. mime provides its own type definitions, so you do not need this installed.
+  '@types/mime@3.0.4':
+    resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==}

  '@types/node@20.11.24':
    resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==}
@@ -956,8 +980,8 @@ packages:
  color-name@1.1.4:
    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}

-  commander@12.1.0:
-    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+  commander@12.0.0:
+    resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==}
    engines: {node: '>=18'}

  commander@4.1.1:
@@ -978,6 +1002,9 @@ packages:
    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
    engines: {node: '>= 0.6'}

+  copy-to-clipboard@3.3.3:
+    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
+
  cross-spawn@6.0.5:
    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
    engines: {node: '>=4.8'}
@@ -1126,6 +1153,9 @@ packages:
    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
    engines: {node: '>=8'}

+  file-saver@2.0.5:
+    resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
+
  fill-range@7.0.1:
    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
    engines: {node: '>=8'}
@@ -1588,9 +1618,9 @@ packages:
    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
    engines: {node: '>= 0.4'}

-  occulto@2.0.6:
-    resolution: {integrity: sha512-oaCwtnQjr+fTfFVfSPEDC5rh+L13OcEJ6uQzhmG8PlLxxYn2MxTDPmoCUVHKD7rUxwxCpH7/N4hbTu5U4mqZag==}
-    engines: {node: '>=18'}
+  occulto@2.0.3:
+    resolution: {integrity: sha512-rLXDNqsxM3Gusp4cn8QsveeKsmX36SbnIUcUc3mSeM88pGsNY5Tn6VnWItw/7zST01z9gtaZWQFk0F1L53jMCQ==}
+    engines: {node: '>=16', npm: please-use-pnpm, pnpm: '>=8', yarn: please-use-pnpm}

  once@1.4.0:
    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
@@ -2049,6 +2079,9 @@ packages:
    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
    engines: {node: '>=8.0'}

+  toggle-selection@1.0.6:
+    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
+
  totalist@3.0.1:
    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
    engines: {node: '>=6'}
@@ -2344,9 +2377,9 @@ snapshots:
      '@babel/helper-validator-identifier': 7.22.20
      to-fast-properties: 2.0.0

-  '@commander-js/extra-typings@12.1.0(commander@12.1.0)':
+  '@commander-js/extra-typings@12.0.1(commander@12.0.0)':
    dependencies:
-      commander: 12.1.0
+      commander: 12.0.0

  '@esbuild/aix-ppc64@0.19.12':
    optional: true
@@ -2700,14 +2733,14 @@ snapshots:

  '@types/estree@1.0.5': {}

+  '@types/file-saver@2.0.7': {}
+
  '@types/inquirer@9.0.7':
    dependencies:
      '@types/through': 0.0.33
      rxjs: 7.8.1

-  '@types/mime@4.0.0':
-    dependencies:
-      mime: 4.0.1
+  '@types/mime@3.0.4': {}

  '@types/node@20.11.24':
    dependencies:
@@ -2909,7 +2942,7 @@ snapshots:

  color-name@1.1.4: {}

-  commander@12.1.0: {}
+  commander@12.0.0: {}

  commander@4.1.1: {}

@@ -2921,6 +2954,10 @@ snapshots:

  cookie@0.6.0: {}

+  copy-to-clipboard@3.3.3:
+    dependencies:
+      toggle-selection: 1.0.6
+
  cross-spawn@6.0.5:
    dependencies:
      nice-try: 1.0.5
@@ -3153,6 +3190,8 @@ snapshots:
    dependencies:
      escape-string-regexp: 1.0.5

+  file-saver@2.0.5: {}
+
  fill-range@7.0.1:
    dependencies:
      to-regex-range: 5.0.1
@@ -3584,7 +3623,7 @@ snapshots:
      has-symbols: 1.0.3
      object-keys: 1.1.1

-  occulto@2.0.6: {}
+  occulto@2.0.3: {}

  once@1.4.0:
    dependencies:
@@ -4078,6 +4117,8 @@ snapshots:
    dependencies:
      is-number: 7.0.0

+  toggle-selection@1.0.6: {}
+
  totalist@3.0.1: {}

  tr46@1.0.1:
--- a/test/cli/file/simple.spec.ts
+++ b/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, tmpFile } from '../../files'
+import { Files, getFileChecksum, rm, 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)
--- a/test/cli/text/simple.spec.ts
+++ b/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)
--- a/test/cross/file/simple.spec.ts
+++ b/test/cross/file/simple.spec.ts
@@ -1,8 +1,7 @@
 import { test } from '@playwright/test'
-import { rm } from 'node:fs/promises'
-import { basename } from 'node:path'
-import { Files, getFileChecksum, tmpFile } from '../../files'
-import { CLI, checkLinkForDownload, createNoteSuccessfully, getLinkFromCLI } from '../../utils'
+import { CLI, checkLinkForDownload, checkLinkForText, createNote, getLinkFromCLI } from '../../utils'
+import { Files, getFileChecksum, rm, tmpFile } from '../../files'
+import { basename } from 'path'

 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)
--- a/test/cross/text/simple.spec.ts
+++ b/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)
  })
--- a/test/files.ts
+++ b/test/files.ts
@@ -1,5 +1,10 @@
-import { createHash } from 'node:crypto'
-import { cp, readFile } from 'node:fs/promises'
+import { createHash } from 'crypto'
+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',
--- a/test/utils.ts
+++ b/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
-} & (
-  | {
-      text: string
-    }
-  | {
-      files: string[]
-    }
-)
-async function createNote(page: Page, options: CreatePage): Promise<void> {
+}
+export async function createNote(page: Page, options: CreatePage): Promise<string> {
  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())
-  }
-  if (options.expiration) {
+  } else 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> {
-  await createNote(page, options)
+  if (options.error) {
+    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',
    },
  })
 }
--- a/test/web/file/multiple.spec.ts
+++ b/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] })
  })
--- a/test/web/file/simple.spec.ts
+++ b/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)
  })
--- a/test/web/file/too-big.spec.ts
+++ b/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' })
  })
 })
--- a/test/web/text/expiration.spec.ts
+++ b/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.skip(browserName === 'webkit')
+  test('1 minute', async ({ page }) => {
    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)
--- a/test/web/text/simple.spec.ts
+++ b/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 })
  })
 })
--- a/test/web/text/views.spec.ts
+++ b/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 })