bump version

Added Option to set a custom HTML Imprint

.dockerignore

@@ -1,15 +1,15 @@
 *
 
-!/packages/backend/src
-!/packages/backend/Cargo.lock
-!/packages/backend/Cargo.toml
+!/packages
+!/package.json
+!/pnpm-lock.yaml
+!/pnpm-workspace.yaml
 
-!/packages/frontend/locales
-!/packages/frontend/src
-!/packages/frontend/static
-!/packages/frontend/.npmrc
-!/packages/frontend/package.json
-!/packages/frontend/pnpm-lock.yaml
-!/packages/frontend/svelte.config.js
-!/packages/frontend/tsconfig.json
-!/packages/frontend/vite.config.js
+**/target
+**/node_modules
+**/dist
+**/bin
+**/*.tsbuildinfo
+**/build
+**/.svelte
+**/.svelte-kit

.github/workflows/docker.yml

@@ -1,38 +0,0 @@
-name: Publish
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - "v*.*.*"
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-        with:
-          install: true
-      - name: Docker Labels
-        id: meta
-        uses: crazy-max/ghaction-docker-meta@v2
-        with:
-          images: cupcakearmy/cryptgeon
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/release.yml

@@ -0,0 +1,58 @@
+name: Publish
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  cli:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: pnpm/action-setup@v2
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'pnpm'
+          node-version-file: '.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+
+      - run: |
+          pnpm install --frozen-lockfile
+          pnpm run build
+
+      - run: npm publish
+        working-directory: ./packages/cli
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+      - name: Docker Labels
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: cupcakearmy/cryptgeon
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}

.github/workflows/test.yaml

@@ -10,27 +10,33 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "16"
+      - uses: actions/checkout@v4
 
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      # Node
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          cache: 'pnpm'
+          node-version-file: '.nvmrc'
+
+      # Docker
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
         with:
           install: true
-      - name: Build docker image
-        run: npm run test:prepare
 
       - name: Prepare
         run: |
-          npm install playwright
-          npx playwright install --with-deps
+          pnpm install
+          pnpm exec playwright install --with-deps
+          pnpm run test:prepare
 
       - name: Run your tests
-        run: npm test
-      - uses: actions/upload-artifact@v2
-        if: always()
+        run: pnpm test
+
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
         with:
-          name: test-results
-          path: test-results
+          name: playwright-report
+          path: test-results/
+          retention-days: 7

.gitignore

@@ -1,14 +1,11 @@
+.env
+*.tsbuildinfo
+node_modules
+dist
+bin
 
-# Backend
 target
 
-# Client
-.DS_Store
-node_modules
-/.svelte
-/build
-/functions
-.env
-
-General
+# Testing
 test-results
+tmp

.nvmrc

@@ -0,0 +1 @@
+v22.7.0

CHANGELOG.md

@@ -5,6 +5,44 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.0] - 2023-11-01
+
+### Changed
+
+- Removed HTML sanitation, display the original message as string
+- Links are now displayed under the note in a separate section
+
+## [2.3.1] - 2023-06-23
+
+### Added
+
+- #92: Endpoint (`/api/live/`) for checking health status.
+
+## [2.3.0] - 2023-05-30
+
+### Added
+
+- New CLI 🎉.
+- Russian language.
+- Option for reducing note id size (`ID_LENGTH`).
+
+### Changed
+
+- Moved to monorepo.
+
+### Changed
+
+- Default port is now 8000, not 5000.
+- Moved to generic encryption library `occulto`.
+
+### Fixed
+
+- Bad chinese language code.
+
+### Security
+
+- Updated dependencies.
+
 ## [2.1.0] - 2023-01-04
 
 ### Added

Cryptgeon.postman_collection.json

@@ -0,0 +1,614 @@
+{
+  "info": {
+    "_postman_id": "3aaeac19-4eac-4911-b3c8-912b17a48634",
+    "name": "Cryptgeon",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "Notes",
+      "item": [
+        {
+          "name": "Preview",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "url": {
+              "raw": "{{BASE}}/notes/:id",
+              "host": ["{{BASE}}"],
+              "path": ["notes", ":id"],
+              "variable": [
+                {
+                  "key": "id",
+                  "value": "{{NOTE_ID}}",
+                  "description": "Id of the Note"
+                }
+              ]
+            },
+            "description": "This endpoint is to query wether a note exists, without actually opening it. No view limits are used here, as contents of the note are not available, only the `meta` field is returned, which is public."
+          },
+          "response": [
+            {
+              "name": "200",
+              "originalRequest": {
+                "method": "GET",
+                "header": [],
+                "url": {
+                  "raw": "{{BASE}}/notes/:id",
+                  "host": ["{{BASE}}"],
+                  "path": ["notes", ":id"],
+                  "variable": [
+                    {
+                      "key": "id",
+                      "value": "{{NOTE_ID}}",
+                      "description": "Id of the Note"
+                    }
+                  ]
+                }
+              },
+              "status": "OK",
+              "code": 200,
+              "_postman_previewlanguage": "json",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "content-type",
+                  "value": "application/json"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:24:29 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": "{}"
+            },
+            {
+              "name": "404",
+              "originalRequest": {
+                "method": "GET",
+                "header": [],
+                "url": {
+                  "raw": "{{BASE}}/notes/:id",
+                  "host": ["{{BASE}}"],
+                  "path": ["notes", ":id"],
+                  "variable": [
+                    {
+                      "key": "id",
+                      "value": "{{NOTE_ID}}",
+                      "description": "Id of the Note"
+                    }
+                  ]
+                }
+              },
+              "status": "Not Found",
+              "code": 404,
+              "_postman_previewlanguage": "plain",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:25:26 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": ""
+            }
+          ]
+        },
+        {
+          "name": "Create",
+          "event": [
+            {
+              "listen": "test",
+              "script": {
+                "exec": [
+                  "const jsonData = pm.response.json();",
+                  "pm.collectionVariables.set('NOTE_ID', jsonData.id)",
+                  ""
+                ],
+                "type": "text/javascript"
+              }
+            }
+          ],
+          "request": {
+            "method": "POST",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": "{\n    \"contents\": \"Some encrypted content\",\n    \"views\": 1,\n    \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
+              "options": {
+                "raw": {
+                  "language": "json"
+                }
+              }
+            },
+            "url": {
+              "raw": "{{BASE}}/notes/",
+              "host": ["{{BASE}}"],
+              "path": ["notes", ""]
+            }
+          },
+          "response": [
+            {
+              "name": "Simple",
+              "originalRequest": {
+                "method": "POST",
+                "header": [],
+                "body": {
+                  "mode": "raw",
+                  "raw": "{\n    \"contents\": \"Some encrypted content\",\n    \"views\": 1,\n    \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
+                  "options": {
+                    "raw": {
+                      "language": "json"
+                    }
+                  }
+                },
+                "url": {
+                  "raw": "{{BASE}}/notes/",
+                  "host": ["{{BASE}}"],
+                  "path": ["notes", ""]
+                }
+              },
+              "status": "OK",
+              "code": 200,
+              "_postman_previewlanguage": "json",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "content-type",
+                  "value": "application/json"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:31:54 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": "{\n    \"id\": \"1QeEWDQbQY9dOo8cDDQjykaEjouqugTR6A78sjgn4VMv\"\n}"
+            },
+            {
+              "name": "5 Minutes",
+              "originalRequest": {
+                "method": "POST",
+                "header": [],
+                "body": {
+                  "mode": "raw",
+                  "raw": "{\n    \"contents\": \"Some encrypted content\",\n    \"expiration\": 5,\n    \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
+                  "options": {
+                    "raw": {
+                      "language": "json"
+                    }
+                  }
+                },
+                "url": {
+                  "raw": "{{BASE}}/notes/",
+                  "host": ["{{BASE}}"],
+                  "path": ["notes", ""]
+                }
+              },
+              "status": "OK",
+              "code": 200,
+              "_postman_previewlanguage": "json",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "content-type",
+                  "value": "application/json"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:31:54 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": "{\n    \"id\": \"1QeEWDQbQY9dOo8cDDQjykaEjouqugTR6A78sjgn4VMv\"\n}"
+            },
+            {
+              "name": "3 Views",
+              "originalRequest": {
+                "method": "POST",
+                "header": [],
+                "body": {
+                  "mode": "raw",
+                  "raw": "{\n    \"contents\": \"Some encrypted content\",\n    \"views\": 3,\n    \"meta\": \"{\\\"type\\\":\\\"text\\\"}\"\n}",
+                  "options": {
+                    "raw": {
+                      "language": "json"
+                    }
+                  }
+                },
+                "url": {
+                  "raw": "{{BASE}}/notes/",
+                  "host": ["{{BASE}}"],
+                  "path": ["notes", ""]
+                }
+              },
+              "status": "OK",
+              "code": 200,
+              "_postman_previewlanguage": "json",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "content-type",
+                  "value": "application/json"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:31:54 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": "{\n    \"id\": \"1QeEWDQbQY9dOo8cDDQjykaEjouqugTR6A78sjgn4VMv\"\n}"
+            }
+          ]
+        },
+        {
+          "name": "Read",
+          "request": {
+            "method": "DELETE",
+            "header": [],
+            "url": {
+              "raw": "{{BASE}}/notes/:id",
+              "host": ["{{BASE}}"],
+              "path": ["notes", ":id"],
+              "variable": [
+                {
+                  "key": "id",
+                  "value": "{{NOTE_ID}}"
+                }
+              ]
+            },
+            "description": "This endpoint gets the actual contents of a note. It's a `DELETE` endpoint, es it decreases the `view` counter, and deletes the note if `0` is reached."
+          },
+          "response": [
+            {
+              "name": "200",
+              "originalRequest": {
+                "method": "DELETE",
+                "header": [],
+                "url": {
+                  "raw": "{{BASE}}/notes/:id",
+                  "host": ["{{BASE}}"],
+                  "path": ["notes", ":id"],
+                  "variable": [
+                    {
+                      "key": "id",
+                      "value": "{{NOTE_ID}}"
+                    }
+                  ]
+                }
+              },
+              "status": "OK",
+              "code": 200,
+              "_postman_previewlanguage": "json",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "content-type",
+                  "value": "application/json"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:59:07 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": "{\n    \"meta\": \"{\\\"type\\\":\\\"text\\\"}\",\n    \"contents\": \"Some encrypted content\"\n}"
+            },
+            {
+              "name": "404",
+              "originalRequest": {
+                "method": "DELETE",
+                "header": [],
+                "url": {
+                  "raw": "{{BASE}}/notes/:id",
+                  "host": ["{{BASE}}"],
+                  "path": ["notes", ":id"],
+                  "variable": [
+                    {
+                      "key": "id",
+                      "value": "{{NOTE_ID}}"
+                    }
+                  ]
+                }
+              },
+              "status": "Not Found",
+              "code": 404,
+              "_postman_previewlanguage": "plain",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:59:15 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": ""
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Status",
+      "item": [
+        {
+          "name": "Get server status",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "url": {
+              "raw": "{{BASE}}/status/",
+              "host": ["{{BASE}}"],
+              "path": ["status", ""]
+            }
+          },
+          "response": [
+            {
+              "name": "200",
+              "originalRequest": {
+                "method": "GET",
+                "header": [],
+                "url": {
+                  "raw": "{{BASE}}/status/",
+                  "host": ["{{BASE}}"],
+                  "path": ["status", ""]
+                }
+              },
+              "status": "OK",
+              "code": 200,
+              "_postman_previewlanguage": "json",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "connection",
+                  "value": "close"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "content-type",
+                  "value": "application/json"
+                },
+                {
+                  "key": "date",
+                  "value": "Tue, 23 May 2023 05:56:45 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": "{\n    \"version\": \"2.3.0-beta.4\",\n    \"max_size\": 10485760,\n    \"max_views\": 100,\n    \"max_expiration\": 360,\n    \"allow_advanced\": true,\n    \"theme_image\": \"\",\n    \"theme_text\": \"\",\n    \"theme_page_title\": \"\",\n    \"theme_favicon\": \"\"\n}"
+            }
+          ]
+        },
+        {
+          "name": "Health Check",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "url": {
+              "raw": "{{BASE}}/live/",
+              "host": ["{{BASE}}"],
+              "path": ["live", ""]
+            },
+            "description": "Return `200` for healthy service. `503` if service is unavailable."
+          },
+          "response": [
+            {
+              "name": "Healthy",
+              "originalRequest": {
+                "method": "GET",
+                "header": [],
+                "url": {
+                  "raw": "{{BASE}}/live/",
+                  "host": ["{{BASE}}"],
+                  "path": ["live", ""]
+                }
+              },
+              "status": "OK",
+              "code": 200,
+              "_postman_previewlanguage": "plain",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "date",
+                  "value": "Thu, 22 Jun 2023 20:17:58 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": null
+            },
+            {
+              "name": "Service Unavilable",
+              "originalRequest": {
+                "method": "GET",
+                "header": [],
+                "url": {
+                  "raw": "{{BASE}}/live/",
+                  "host": ["{{BASE}}"],
+                  "path": ["live", ""]
+                }
+              },
+              "status": "Service Unavailable",
+              "code": 503,
+              "_postman_previewlanguage": "plain",
+              "header": [
+                {
+                  "key": "transfer-encoding",
+                  "value": "chunked"
+                },
+                {
+                  "key": "content-encoding",
+                  "value": "gzip"
+                },
+                {
+                  "key": "vary",
+                  "value": "accept-encoding"
+                },
+                {
+                  "key": "date",
+                  "value": "Thu, 22 Jun 2023 20:18:55 GMT"
+                }
+              ],
+              "cookie": [],
+              "body": null
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "event": [
+    {
+      "listen": "prerequest",
+      "script": {
+        "type": "text/javascript",
+        "exec": [""]
+      }
+    },
+    {
+      "listen": "test",
+      "script": {
+        "type": "text/javascript",
+        "exec": [""]
+      }
+    }
+  ],
+  "variable": [
+    {
+      "key": "BASE",
+      "value": "http://localhost:3000/api",
+      "type": "default"
+    },
+    {
+      "key": "NOTE_ID",
+      "value": "",
+      "type": "default"
+    }
+  ]
+}

Dockerfile

@@ -1,32 +1,30 @@
 # FRONTEND
-FROM node:16-alpine as client 
+FROM node:22-alpine as client 
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+
 WORKDIR /tmp
-RUN npm install -g pnpm@7
-COPY ./packages/frontend ./
-RUN pnpm install
-RUN pnpm exec svelte-kit sync
+COPY . .
+RUN pnpm install --frozen-lockfile
 RUN pnpm run build
 
 
 # BACKEND
-FROM rust:1.64-alpine as backend
+FROM rust:1.80-alpine as backend
 WORKDIR /tmp
-RUN apk add libc-dev openssl-dev alpine-sdk
-COPY ./packages/backend/Cargo.* ./
-# https://blog.rust-lang.org/2022/06/22/sparse-registry-testing.html
-RUN rustup update nightly
-ENV CARGO_UNSTABLE_SPARSE_REGISTRY=true
-RUN cargo +nightly fetch
+RUN apk add --no-cache libc-dev openssl-dev alpine-sdk
 COPY ./packages/backend ./
-RUN cargo +nightly build --release
+RUN RUSTFLAGS="-Ctarget-feature=-crt-static" cargo build --release
 
 
 # RUNNER
-FROM alpine
+FROM alpine:3.19
 WORKDIR /app
+RUN apk add --no-cache curl libgcc
 COPY --from=backend /tmp/target/release/cryptgeon .
-COPY --from=client /tmp/build ./frontend
+COPY --from=client /tmp/packages/frontend/build ./frontend
 ENV FRONTEND_PATH="./frontend"
 ENV REDIS="redis://redis/"
-EXPOSE 5000
+EXPOSE 8000
 ENTRYPOINT [ "/app/cryptgeon" ]

README.md

@@ -12,13 +12,15 @@
 <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)
+EN | [简体中文](README_zh-CN.md) | [ES](README_ES.md)
 
 ## About?
 
-_cryptgeon_ is a secure, open source sharing note or file service inspired by [_PrivNote_](https://privnote.com)
+_cryptgeon_ is a secure, open source sharing note or file service inspired by [_PrivNote_](https://privnote.com).
+It includes a server, a web page and a CLI client.
 
 > 🌍 If you want to translate the project feel free to reach out to me.
 >
@@ -26,10 +28,27 @@ _cryptgeon_ is a secure, open source sharing note or file service inspired by [_
 
 ## Live Service / Demo
 
+### Web
+
 Check out the live service / demo and see for yourself [cryptgeon.org](https://cryptgeon.org)
 
+### CLI
+
+```
+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
 - server cannot decrypt contents due to client side encryption
 - view or time constraints
 - in memory, no persistence
@@ -51,21 +70,27 @@ of the notes even if it tried to.
 ## Environment Variables
 
 | Variable                | Default          | Description                                                                                                                                                                                                   |
-| ------------------ | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ----------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `REDIS`                 | `redis://redis/` | Redis URL to connect to. [According to format](https://docs.rs/redis/latest/redis/#connection-parameters)                                                                                                     |
 | `SIZE_LIMIT`            | `1 KiB`          | Max size for body. Accepted values according to [byte-unit](https://docs.rs/byte-unit/). <br> `512 MiB` is the maximum allowed. <br> The frontend will show that number including the ~35% encoding overhead. |
 | `MAX_VIEWS`             | `100`            | Maximal number of views.                                                                                                                                                                                      |
 | `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.                                                                                                                    |
+| `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.
+> ℹ️ `https` is required otherwise browsers will not support the cryptographic functions.
+
+> ℹ️ There is a health endpoint available at `/api/health/`. It returns either 200 or 503.
 
 ### Docker
 
@@ -81,7 +106,7 @@ services:
     image: redis:7-alpine
     # Set a size limit. See link below on how to customise.
     # https://redis.io/docs/manual/eviction/
-    command: redis-server --maxmemory 1gb --maxmemory-policy allkeys-lru
+    # command: redis-server --maxmemory 1gb --maxmemory-policy allkeys-lru
 
   app:
     image: cupcakearmy/cryptgeon:latest
@@ -91,7 +116,15 @@ services:
       # Size limit for a single note.
       SIZE_LIMIT: 4 MiB
     ports:
-      - 80:5000
+      - 80:8000
+
+    # Optional health checks
+    # healthcheck:
+    #   test: ["CMD", "curl", "--fail", "http://127.0.0.1:8000/api/live/"]
+    #   interval: 1m
+    #   timeout: 3s
+    #   retries: 2
+    #   start_period: 5s
 ```
 
 ### NGINX Proxy
@@ -112,22 +145,28 @@ There is a [guide](https://mariushosting.com/how-to-install-cryptgeon-on-your-sy
 
 ### YouTube Guides
 
+- English by [Webnestify](https://www.youtube.com/watch?v=XAyD42I7wyI)
 - 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/)
+- Italian by [@nicfab](https://notes.nicfab.eu/it/posts/cryptgeon/)
+- English by [@nicfab](https://notes.nicfab.eu/en/posts/cryptgeon/)
+
 ## Development
 
 **Requirements**
 
-- `pnpm`: `>=6`
-- `node`: `>=16`
+- `pnpm`: `>=9`
+- `node`: `>=22`
 - `rust`: edition `2021`
 
 **Install**
 
 ```bash
 pnpm install
-pnpm --prefix frontend install
 
 # Also you need cargo watch if you don't already have it installed.
 # https://lib.rs/crates/cargo-watch
@@ -138,9 +177,6 @@ cargo install cargo-watch
 
 Make sure you have docker running.
 
-> If you are on `macOS` you might need to disable AirPlay Receiver as it uses port 5000 (So stupid...)
-> https://developer.apple.com/forums/thread/682332
-
 ```bash
 pnpm run dev
 ```
@@ -150,19 +186,19 @@ Running `pnpm run dev` in the root folder will start the following things:
 - redis docker container
 - rust backend
 - client
+- cli
 
-You can see the app under [localhost:1234](http://localhost:1234).
+You can see the app under [localhost:3000](http://localhost:3000).
 
-## Tests
+> There is a Postman collection with some example requests [available in the repo](./Cryptgeon.postman_collection.json)
+
+### Tests
 
 Tests are end to end tests written with Playwright.
 
 ```sh
 pnpm run test:prepare
-docker compose up redis -d
-pnpm run test:server
 
-# In another terminal.
 # Use the test or test:local script. The local version only runs in one browser for quicker development.
 pnpm run test:local
 ```
@@ -171,7 +207,9 @@ pnpm run test:local
 
 Please refer to the security section [here](./SECURITY.md).
 
-###### Attributions
+---
+
+_Attributions_
 
 - Test data:
   - Text for tests [Nietzsche Ipsum](https://nietzsche-ipsum.com/)

README_ES.md

@@ -0,0 +1,200 @@
+<p align="center">
+  <img src="./design/Github.png" alt="logo">
+</p>
+
+<a href="https://discord.gg/nuby6RnxZt">
+  <img alt="discord" src="https://img.shields.io/discord/252403122348097536?style=for-the-badge" />
+  <img alt="docker pulls" src="https://img.shields.io/docker/pulls/cupcakearmy/cryptgeon?style=for-the-badge" />
+  <img alt="Docker image size badge" src="https://img.shields.io/docker/image-size/cupcakearmy/cryptgeon?style=for-the-badge" />
+  <img alt="Latest version" src="https://img.shields.io/github/v/release/cupcakearmy/cryptgeon?style=for-the-badge" />
+</a>
+
+<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">
+<br/><br/>
+
+[EN](README.md) | [简体中文](README_zh-CN.md) | ES
+
+## Acerca de
+
+_cryptgeon_ es un servicio seguro y de código abierto para compartir notas o archivos inspirado en [_PrivNote_](https://privnote.com).
+Incluye un servidor, una página web y una interfaz de línea de comandos (CLI, por sus siglas en inglés).
+
+> 🌍 Si quieres traducir este proyecto no dudes en ponerte en contacto conmigo.
+>
+> Gracias a [Lokalise](https://lokalise.com/) por darnos acceso gratis a su plataforma.
+
+## Demo
+
+### Web
+
+Prueba la demo y experimenta por ti mismo [cryptgeon.org](https://cryptgeon.org)
+
+### CLI
+
+```
+npx cryptgeon send text "Esto es una nota secreta"
+```
+
+Puedes revisar la documentación sobre el CLI en este [readme](./packages/cli/README.md).
+
+## Características
+
+- enviar texto o archivos
+- el servidor no puede desencriptar el contenido debido a que la encriptación se hace del lado del cliente
+- restriccion de vistas o de tiempo
+- en memoria, sin persistencia
+- compatibilidad obligatoria con el modo oscuro
+
+## ¿Cómo funciona?
+
+Se genera una <code>id (256bit)</code> y una <code>llave 256(bit)</code> para cada nota. La
+<code>id</code>
+se usa para guardar y recuperar la nota. Después la nota es encriptada con la <code>llave</code> y con aes en modo gcm del lado del cliente y por último se envía al servidor. La información es almacenada en memoria y nunca persiste en el disco. El servidor nunca ve la llave de encriptación por lo que no puede desencriptar el contenido de las notas aunque lo intentara.
+
+## Capturas de pantalla
+
+![screenshot](./design/Screens.png)
+
+## 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)                                                                                                        |
+| `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.                                                                                                                                                 |
+
+## Despliegue
+
+> ℹ️ Se requiere `https` de lo contrario el navegador no soportará las funciones de encriptacón.
+
+> ℹ️ Hay un endpoint para verificar el estado, lo encontramos en `/api/health/`. Regresa un código 200 o 503.
+
+### Docker
+
+Docker es la manera más fácil. Aquí encontramos [la imágen oficial](https://hub.docker.com/r/cupcakearmy/cryptgeon).
+
+```yaml
+# docker-compose.yml
+
+version: '3.8'
+
+services:
+  redis:
+    image: redis:7-alpine
+    # Set a size limit. See link below on how to customise.
+    # https://redis.io/docs/manual/eviction/
+    # command: redis-server --maxmemory 1gb --maxmemory-policy allkeys-lru
+
+  app:
+    image: cupcakearmy/cryptgeon:latest
+    depends_on:
+      - redis
+    environment:
+      # Size limit for a single note.
+      SIZE_LIMIT: 4 MiB
+    ports:
+      - 80:8000
+
+    # Optional health checks
+    # healthcheck:
+    #   test: ["CMD", "curl", "--fail", "http://127.0.0.1:8000/api/live/"]
+    #   interval: 1m
+    #   timeout: 3s
+    #   retries: 2
+    #   start_period: 5s
+```
+
+### NGINX Proxy
+
+Ver la carpeta de [ejemplo/nginx](https://github.com/cupcakearmy/cryptgeon/tree/main/examples/nginx). Hay un ejemplo con un proxy simple y otro con https. Es necesario que especifiques el nombre del servidor y los certificados.
+
+### Traefik 2
+
+Ver la carpeta de [ejemplo/traefik](https://github.com/cupcakearmy/cryptgeon/tree/main/examples/traefik).
+
+### Scratch
+
+Ver la carpeta de [ejemplo/scratch](https://github.com/cupcakearmy/cryptgeon/tree/main/examples/scratch). Ahí encontrarás una guía de cómo configurar el servidor e instalar cryptgeon desde cero.
+
+### Synology
+
+Hay una [guía](https://mariushosting.com/how-to-install-cryptgeon-on-your-synology-nas/) (en inglés) que puedes seguir.
+
+### Guías en Youtube
+
+- En inglés, por [Webnestify](https://www.youtube.com/watch?v=XAyD42I7wyI)
+- En inglés, por [DB Tech](https://www.youtube.com/watch?v=S0jx7wpOfNM) [Previous Video](https://www.youtube.com/watch?v=JhpIatD06vE)
+- En alemán, por [ApfelCast](https://www.youtube.com/watch?v=84ZMbE9AkHg)
+
+## Desarrollo
+
+**Requisitos**
+
+- `pnpm`: `>=6`
+- `node`: `>=18`
+- `rust`: edition `2021`
+
+**Instalación**
+
+```bash
+pnpm install
+
+# También necesitas cargo-watch, si no lo tienes instalado.
+# https://lib.rs/crates/cargo-watch
+cargo install cargo-watch
+```
+
+**Ejecutar**
+
+Asegurate de que docker se esté ejecutando.
+
+```bash
+pnpm run dev
+```
+
+Ejecutando `pnpm run dev` en la carpeta raíz iniciará lo siguiente:
+
+- redis docker container
+- rust backend
+- client
+- cli
+
+Puedes ver la app en [localhost:3000](http://localhost:3000).
+
+> Existe una colección de Postman con algunas peticiones de ejemplo [disponible en el repo](./Cryptgeon.postman_collection.json)
+
+### Tests
+
+Los tests son end-to-end tests escritos con Playwright.
+
+```sh
+pnpm run test:prepare
+
+# Usa el script test o test:local. La versión local solo corre en el navegador para acelerar el desarrollo.
+pnpm run test:local
+```
+
+## Seguridad
+
+Por favor dirigite a la sección de seguridad [aquí](./SECURITY.md).
+
+---
+
+_Atribuciones_
+
+- Datos del Test:
+  - Texto para los tests [Nietzsche Ipsum](https://nietzsche-ipsum.com/)
+  - [AES Paper](https://www.cs.miami.edu/home/burt/learning/Csc688.012/rijndael/rijndael_doc_V2.pdf)
+  - [Unsplash Imágenes](https://unsplash.com/)
+- Animación de carga por [Nikhil Krishnan](https://codepen.io/nikhil8krishnan/pen/rVoXJa)
+- Iconos hechos por <a href="https://www.freepik.com" title="Freepik">freepik</a> de <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

README_zh-CN.md

@@ -14,7 +14,7 @@
 <a href=""><img src="./.github/lokalise.png" height="50">
 <br/>
 
-[EN](README.md) | 简体中文
+[EN](README.md) | 简体中文 | [ES](README_ES.md)
 
 ## 关于本项目
 
@@ -82,7 +82,7 @@ services:
     environment:
       SIZE_LIMIT: 4 MiB
     ports:
-      - 80:5000
+      - 80:8000
 ```
 
 ### NGINX 反向代理
@@ -148,9 +148,6 @@ cargo install cargo-watch
 
 确保你的 Docker 正在运行
 
-> 如果你用的是 `macOS` 的话你可能需要关闭 AirPlay 接收功能因为该功能需要占用 5000 端口...)
-> https://developer.apple.com/forums/thread/682332
-
 ```bash
 pnpm run dev
 ```
@@ -161,7 +158,7 @@ pnpm run dev
 - 无热重载的 rust 后端
 - 可热重载的客户端
 
-你可以通过 1234 端口进入该应用，即 [localhost:1234](http://localhost:1234).
+你可以通过 3000 端口进入该应用，即 [localhost:3000](http://localhost:3000).
 
 ## 测试
 

cryptgeon.code-workspace

@@ -5,12 +5,16 @@
     },
     {
       "path": "packages/backend"
+    },
+    {
+      "path": "packages/frontend"
+    },
+    {
+      "path": "packages/cli"
     }
   ],
   "settings": {
-    "cSpell.words": ["ciphertext", "cryptgeon"],
-    "i18n-ally.enabledFrameworks": ["svelte"],
-    "i18n-ally.keystyle": "nested",
-    "i18n-ally.localesPaths": ["packages/frontend/locales"]
+    "i18n-ally.localesPaths": ["locales"],
+    "cSpell.words": ["cryptgeon"]
   }
 }

docker-compose.dev.yaml

@@ -1,8 +1,6 @@
 # DEV Compose file.
 # For a production file see: README.md
 
-version: '3.8'
-
 services:
   redis:
     image: redis:7-alpine
@@ -10,10 +8,17 @@ services:
       - 6379:6379
 
   app:
-    image: cupcakearmy/cryptgeon:test
     build: .
-    env_file: .dev.env
+    env_file: .env.dev
     depends_on:
       - redis
+    restart: unless-stopped
     ports:
-      - 1234:5000
+      - 3000:8000
+
+    healthcheck:
+      test: ['CMD', 'curl', '--fail', 'http://127.0.0.1:8000/api/live/']
+      interval: 1m
+      timeout: 3s
+      retries: 2
+      start_period: 5s

docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   redis:
     image: redis:7-alpine
@@ -15,4 +13,12 @@ services:
       # Size limit for a single note.
       SIZE_LIMIT: 4 MiB
     ports:
-      - 80:5000
+      - 80:8000
+
+    # Optional health checks
+    # healthcheck:
+    #   test: ["CMD", "curl", "--fail", "http://127.0.0.1:8000/api/live/"]
+    #   interval: 1m
+    #   timeout: 3s
+    #   retries: 2
+    #   start_period: 5s

examples/nginx/nginx-plain.conf

@@ -4,7 +4,7 @@ server {
     server_name _;
 
     location / {
-      proxy_pass http://app:5000/;
+      proxy_pass http://app:8000/;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

examples/nginx/nginx-tls.conf

@@ -20,7 +20,7 @@ server {
     ssl_trusted_certificate /path/to/fullchain.pem;
 
     location / {
-      proxy_pass http://app:5000/;
+      proxy_pass http://app:8000/;
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

package.json

@@ -1,18 +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:proxy": "node proxy.mjs",
     "dev": "run-p dev:*",
-    "test": "playwright test --project chrome firefox safari",
-    "test:local": "playwright test --project local",
-    "test:server": "docker compose -f docker-compose.dev.yaml up",
-    "test:prepare": "docker compose -f docker-compose.dev.yaml build"
+    "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:server": "run-s docker:up",
+    "test:prepare": "run-p build docker:build",
+    "build": "pnpm run --recursive --filter=!@cryptgeon/backend build"
   },
   "devDependencies": {
-    "@playwright/test": "^1.29.1",
-    "@types/node": "^16.18.10",
-    "http-proxy": "^1.18.1",
-    "npm-run-all": "^4.1.5"
-  }
+    "@playwright/test": "^1.46.1",
+    "@types/node": "^22.5.0",
+    "npm-run-all": "^4.1.5",
+    "shelljs": "^0.8.5"
+  },
+  "packageManager": "pnpm@9.11.0"
 }

packages/backend/Cargo.toml

@@ -1,25 +1,27 @@
 [package]
 name = "cryptgeon"
-version = "2.1.0"
+version = "2.8.3"
 authors = ["cupcakearmy <hi@nicco.io>"]
 edition = "2021"
+rust-version = "1.80"
 
 [[bin]]
 name = "cryptgeon"
 path = "src/main.rs"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-actix-web = "4"
-actix-files = "0.6"
-serde = { version = "1.0", features = ["derive"] }
+# 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
 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"
-redis = "0.21.5"

packages/backend/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "backend",
   "private": true,
+  "name": "@cryptgeon/backend",
   "scripts": {
     "dev": "cargo watch -x 'run --bin cryptgeon'",
     "build": "cargo build --release",
-    "test:server": "SIZE_LIMIT=10MiB LISTEN_ADDR=0.0.0.0:1234 cargo run",
+    "test:server": "SIZE_LIMIT=10MiB LISTEN_ADDR=0.0.0.0:3000 cargo run",
     "test:prepare": "cargo build"
   }
 }

packages/backend/src/api.rs

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

packages/backend/src/client.rs

@@ -1,17 +0,0 @@
-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

@@ -8,28 +8,44 @@ lazy_static! {
     pub static ref FRONTEND_PATH: String =
         std::env::var("FRONTEND_PATH").unwrap_or("../frontend/build".to_string());
     pub static ref LISTEN_ADDR: String =
-        std::env::var("LISTEN_ADDR").unwrap_or("0.0.0.0:5000".to_string());
+        std::env::var("LISTEN_ADDR").unwrap_or("0.0.0.0:8000".to_string());
     pub static ref VERBOSITY: String = std::env::var("VERBOSITY").unwrap_or("warn".to_string());
 }
 
 // CONFIG
 lazy_static! {
-  pub static ref LIMIT: usize =
+pub static ref LIMIT: usize =
   Byte::from_str(std::env::var("SIZE_LIMIT").unwrap_or("1 KiB".to_string()))
     .unwrap()
     .get_bytes() as usize;
-  pub static ref MAX_VIEWS: u32 = std::env::var("MAX_VIEWS")
+pub static ref MAX_VIEWS: u32 = std::env::var("MAX_VIEWS")
   .unwrap_or("100".to_string())
   .parse()
   .unwrap();
-  pub static ref MAX_EXPIRATION: u32 = std::env::var("MAX_EXPIRATION")
+pub static ref MAX_EXPIRATION: u32 = std::env::var("MAX_EXPIRATION")
   .unwrap_or("360".to_string()) // 6 hours in minutes
   .parse()
   .unwrap();
-  pub static ref ALLOW_ADVANCED: bool = std::env::var("ALLOW_ADVANCED")
+pub static ref ALLOW_ADVANCED: bool = std::env::var("ALLOW_ADVANCED")
   .unwrap_or("true".to_string())
   .parse()
   .unwrap();
+pub static ref ID_LENGTH: u32 = std::env::var("ID_LENGTH")
+  .unwrap_or("32".to_string())
+  .parse()
+  .unwrap();
+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())
+  .parse()
+  .unwrap();
 }
 
 // THEME
@@ -50,4 +66,8 @@ 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

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

packages/backend/src/main.rs

@@ -1,36 +1,67 @@
-use actix_web::{
-    middleware::{self, Logger},
-    web, App, HttpServer,
+use axum::{
+    extract::{DefaultBodyLimit, Request},
+    routing::{delete, get, post},
+    Router, ServiceExt,
 };
 use dotenv::dotenv;
+use tower::Layer;
+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;
 
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
+#[tokio::main]
+async fn main() {
     dotenv().ok();
-    env_logger::init_from_env(env_logger::Env::new().default_filter_or(config::VERBOSITY.as_str()));
 
-    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;
+    if !store::can_reach_redis() {
+        println!("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();
 }

packages/backend/src/note/model.rs

@@ -2,6 +2,8 @@ use bs62;
 use ring::rand::SecureRandom;
 use serde::{Deserialize, Serialize};
 
+use crate::config;
+
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Note {
     pub meta: String,
@@ -10,18 +12,25 @@ pub struct Note {
     pub expiration: Option<u32>,
 }
 
-#[derive(Serialize, Deserialize, Clone)]
-pub struct NoteInfo {}
+#[derive(Serialize)]
+pub struct NoteInfo {
+    pub meta: String,
+}
 
-#[derive(Serialize, Deserialize, Clone)]
+#[derive(Serialize)]
 pub struct NotePublic {
     pub meta: String,
     pub contents: String,
 }
 
 pub fn generate_id() -> String {
-    let mut id: [u8; 32] = [0; 32];
+    let mut result = "".to_owned();
+    let mut id: [u8; 1] = [0; 1];
     let sr = ring::rand::SystemRandom::new();
+
+    for _ in 0..*config::ID_LENGTH {
         let _ = sr.fill(&mut id);
-    return bs62::encode_data(&id);
+        result.push_str(&bs62::encode_data(&id));
+    }
+    return result;
 }

packages/backend/src/note/routes.rs

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

@@ -1,12 +0,0 @@
-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,5 +1,43 @@
-mod model;
-mod routes;
+use crate::config;
+use axum::{http::StatusCode, Json};
+use serde::Serialize;
 
-pub use model::*;
-pub use 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))
+}

packages/backend/src/status/model.rs

@@ -1,17 +0,0 @@
-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,
-    // Theme
-    pub theme_image: String,
-    pub theme_text: String,
-    pub theme_page_title: String,
-    pub theme_favicon: String,
-}

packages/backend/src/status/routes.rs

@@ -1,23 +0,0 @@
-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,
-        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

@@ -19,6 +19,14 @@ fn get_connection() -> Result<redis::Connection, &'static str> {
         .map_err(|_| "Unable to connect to redis")
 }
 
+pub fn can_reach_redis() -> bool {
+    let conn = get_connection();
+    return match conn {
+        Ok(_) => true,
+        Err(_) => false,
+    };
+}
+
 pub fn set(id: &String, note: &Note) -> Result<(), &'static str> {
     let serialized = serde_json::to_string(&note.clone()).unwrap();
     let mut conn = get_connection()?;
@@ -28,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 usize)
+            conn.expire(id, seconds as i64)
                 .map_err(|_| "Unable to set expiration on notion")?
         }
         None => {}

packages/cli/README.md

@@ -0,0 +1,54 @@
+# Cryptgeon CLI
+
+The CLI is a functionally identical way to interact with cryptgeon notes.
+It supports text, files, expiration, password, etc.
+
+## Installation
+
+```bash
+npx cryptgeon
+
+# Or install globally
+npm -g install cryptgeon
+cryptgeon
+```
+
+## Examples
+
+```bash
+# Create simple note
+cryptgeon send text "Foo bar"
+
+# Send two files
+cryptgeon send file my.pdf picture.png
+
+# 3 views
+cryptgeon send text "My message" --views 3
+
+# 10 minutes
+cryptgeon send text "My message" --minutes 10
+
+# Custom password
+cryptgeon send text "My message" --password "1337"
+
+# Password from stdin
+echo "1337" | cryptgeon send text "My message"
+
+# Open a link
+cryptgeon open https://cryptgeon.org/note/16gOIkxWjCxYNuXM8tCqMUzl...
+```
+
+## Options
+
+### Custom server
+
+The default server is `cryptgeon.org`, however you can use any cryptgeon server by passing the `-s` or `--server` option, or by setting the `CRYPTGEON_SERVER` environment variable.
+
+### Password
+
+Optionally, just like in the web ui, you can choose to use a manual password. You can do that by passing the `-p` or `--password` options, or by piping it into stdin.
+
+```bash
+echo "my pw" | cryptgeon send text "my text"
+cat pass.txt | cryptgeon send text "my text"
+```

packages/cli/build.js

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

packages/cli/package.json

@@ -0,0 +1,47 @@
+{
+  "name": "cryptgeon",
+  "version": "2.8.3",
+  "homepage": "https://github.com/cupcakearmy/cryptgeon",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cupcakearmy/cryptgeon.git",
+    "directory": "packages/cli"
+  },
+  "type": "module",
+  "exports": {
+    ".": "./dist/index.js",
+    "./shared": {
+      "import": "./dist/shared/shared.js",
+      "types": "./dist/shared/shared.d.ts"
+    }
+  },
+  "types": "./dist/index.d.ts",
+  "bin": {
+    "cryptgeon": "./dist/cli.cjs"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "bin": "run-s build package",
+    "build": "tsc && node build.js",
+    "dev": "node build.js --watch",
+    "prepublishOnly": "run-s build"
+  },
+  "devDependencies": {
+    "@commander-js/extra-typings": "^12.1.0",
+    "@types/inquirer": "^9.0.7",
+    "@types/mime": "^4.0.0",
+    "@types/node": "^20.11.24",
+    "commander": "^12.1.0",
+    "inquirer": "^9.2.15",
+    "mime": "^4.0.1",
+    "occulto": "^2.0.6",
+    "pretty-bytes": "^6.1.1",
+    "tsup": "^8.2.4",
+    "typescript": "^5.3.3"
+  },
+  "engines": {
+    "node": ">=18"
+  }
+}

packages/cli/src/actions/download.ts

@@ -0,0 +1,90 @@
+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 })
+  const id = url.pathname.split('/')[2]
+  const preview = await API.info(id).catch(() => {
+    throw new Error('Note does not exist or is expired')
+  })
+
+  // Password
+  let password: string
+  const derivation = preview?.meta.derivation
+  if (derivation) {
+    if (suggestedPassword) {
+      password = suggestedPassword
+    } else {
+      const response = await inquirer.prompt([
+        {
+          type: 'password',
+          message: 'Note password',
+          name: 'password',
+        },
+      ])
+      password = response.password
+    }
+  } else {
+    password = url.hash.slice(1)
+  }
+
+  const key = derivation ? (await AES.derive(password, derivation))[0] : Hex.decode(password)
+  const note = await API.get(id)
+
+  const couldNotDecrypt = new Error('Could not decrypt note. Probably an invalid password')
+  switch (note.meta.type) {
+    case 'file':
+      const files = await Adapters.Files.decrypt(note.contents, key).catch(() => {
+        throw couldNotDecrypt
+      })
+      if (!files) {
+        throw new Error('No files found in note')
+      }
+
+      let selected: typeof files
+      if (all) {
+        selected = files
+      } else {
+        const { names } = await inquirer.prompt([
+          {
+            type: 'checkbox',
+            message: 'What files should be saved?',
+            name: 'names',
+            choices: files.map((file) => ({
+              value: file.name,
+              name: `${file.name} - ${file.type} - ${pretty(file.size, { binary: true })}`,
+              checked: true,
+            })),
+          },
+        ])
+        selected = files.filter((file) => names.includes(file.name))
+      }
+
+      if (!selected.length) throw new Error('No files selected')
+      await Promise.all(
+        selected.map(async (file) => {
+          let filename = resolve(file.name)
+          try {
+            // If exists -> prepend timestamp to not overwrite the current file
+            await access(filename, constants.R_OK)
+            filename = resolve(`${Date.now()}-${file.name}`)
+          } catch {}
+          await writeFile(filename, file.contents)
+          console.log(`Saved: ${basename(filename)}`)
+        })
+      )
+
+      break
+    case 'text':
+      const plaintext = await Adapters.Text.decrypt(note.contents, key).catch(() => {
+        throw couldNotDecrypt
+      })
+      console.log(plaintext)
+      break
+  }
+}

packages/cli/src/actions/upload.ts

@@ -0,0 +1,46 @@
+import { readFile, stat } from 'node:fs/promises'
+import { basename } from 'node:path'
+
+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 }
+
+export async function upload(input: string | string[], options: UploadOptions): Promise<string> {
+  const { password, ...noteOptions } = options
+  const derived = options.password ? await AES.derive(options.password) : undefined
+  const key = derived ? derived[0] : await AES.generateKey()
+
+  let contents: string
+  let type: NoteMeta['type']
+  if (typeof input === 'string') {
+    contents = await Adapters.Text.encrypt(input, key)
+    type = 'text'
+  } else {
+    const files: FileDTO[] = await Promise.all(
+      input.map(async (path) => {
+        const data = new Uint8Array(await readFile(path))
+        const stats = await stat(path)
+        const extension = path.substring(path.indexOf('.') + 1)
+        const type = mime.getType(extension) ?? 'application/octet-stream'
+        return {
+          name: basename(path),
+          size: stats.size,
+          contents: data,
+          type,
+        } satisfies FileDTO
+      })
+    )
+    contents = await Adapters.Files.encrypt(files, key)
+    type = 'file'
+  }
+
+  // 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}`
+  if (!derived) url += `#${Hex.encode(key)}`
+  return url
+}

packages/cli/src/cli.ts

@@ -0,0 +1,106 @@
+#!/usr/bin/env node
+
+import { Argument, Option, program } from '@commander-js/extra-typings'
+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'
+
+const defaultServer = process.env['CRYPTGEON_SERVER'] || 'https://cryptgeon.org'
+const server = new Option('-s --server <url>', 'the cryptgeon server to use').default(defaultServer)
+const files = new Argument('<file...>', 'Files to be sent').argParser(parseFile)
+const text = new Argument('<text>', 'Text content of the note')
+const password = new Option('-p --password <string>', 'manually set a password')
+const all = new Option('-a --all', 'Save all files without prompt').default(false)
+const url = new Argument('<url>', 'The url to open')
+const views = new Option('-v --views <number>', 'Amount of views before getting destroyed').argParser(parseNumber)
+const minutes = new Option('-m --minutes <number>', 'Minutes before the note expires').argParser(parseNumber)
+
+// Node 18 guard
+parseInt(process.version.slice(1).split(',')[0]) < 18 && exit('Node 18 or higher is required')
+
+// @ts-ignore
+const version: string = VERSION
+
+program.name('cryptgeon').version(version).configureHelp({ showGlobalOptions: true })
+
+program
+  .command('info')
+  .description('show information about the server')
+  .addOption(server)
+  .action(async (options) => {
+    API.setOptions({ server: options.server })
+    const response = await API.status()
+    const formatted = {
+      ...response,
+      max_size: prettyBytes(response.max_size),
+    }
+    for (const key of Object.keys(formatted)) {
+      if (key.startsWith('theme_')) delete formatted[key as keyof typeof formatted]
+    }
+    console.table(formatted)
+  })
+
+const send = program.command('send').description('send a note')
+send
+  .command('file')
+  .addArgument(files)
+  .addOption(server)
+  .addOption(views)
+  .addOption(minutes)
+  .addOption(password)
+  .action(async (files, options) => {
+    API.setOptions({ server: options.server })
+    await checkConstrains(options)
+    options.password ||= await getStdin()
+    try {
+      const url = await upload(files, { views: options.views, expiration: options.minutes, password: options.password })
+      console.log(`Note created:\n\n${url}`)
+    } catch {
+      exit('Could not create note')
+    }
+  })
+send
+  .command('text')
+  .addArgument(text)
+  .addOption(server)
+  .addOption(views)
+  .addOption(minutes)
+  .addOption(password)
+  .action(async (text, options) => {
+    API.setOptions({ server: options.server })
+    await checkConstrains(options)
+    options.password ||= await getStdin()
+    try {
+      const url = await upload(text, { views: options.views, expiration: options.minutes, password: options.password })
+      console.log(`Note created:\n\n${url}`)
+    } catch {
+      exit('Could not create note')
+    }
+  })
+
+program
+  .command('open')
+  .description('open a link with text or files inside')
+  .addArgument(url)
+  .addOption(password)
+  .addOption(all)
+  .action(async (note, options) => {
+    try {
+      const url = new URL(note)
+      options.password ||= await getStdin()
+      try {
+        await download(url, options.all, options.password)
+      } catch (e) {
+        exit(e instanceof Error ? e.message : 'Unknown error occurred')
+      }
+    } catch {
+      exit('Invalid URL')
+    }
+  })
+
+program.parse()

packages/cli/src/index.ts

@@ -0,0 +1,4 @@
+export * from './actions/download.js'
+export * from './actions/upload.js'
+export * from './shared/adapters.js'
+export * from './shared/api.js'

packages/cli/src/shared/adapters.ts

@@ -0,0 +1,61 @@
+import { AES, Bytes, type TypedArray } from 'occulto'
+import type { EncryptedFileDTO, FileDTO } from './api'
+
+abstract class CryptAdapter<T> {
+  abstract encrypt(plaintext: T, key: TypedArray): Promise<string>
+  abstract decrypt(ciphertext: string, key: TypedArray): Promise<T>
+}
+
+class CryptTextAdapter implements CryptAdapter<string> {
+  async encrypt(plaintext: string, key: TypedArray) {
+    return await AES.encrypt(Bytes.encode(plaintext), key)
+  }
+  async decrypt(ciphertext: string, key: TypedArray) {
+    return Bytes.decode(await AES.decrypt(ciphertext, key))
+  }
+}
+
+class CryptBlobAdapter implements CryptAdapter<TypedArray> {
+  async encrypt(plaintext: TypedArray, key: TypedArray) {
+    return await AES.encrypt(plaintext, key)
+  }
+
+  async decrypt(ciphertext: string, key: TypedArray) {
+    return await AES.decrypt(ciphertext, key)
+    // const plaintext = await AES.decrypt(ciphertext, key)
+    // return new Blob([plaintext], { type: 'application/octet-stream' })
+  }
+}
+
+class CryptFilesAdapter implements CryptAdapter<FileDTO[]> {
+  async encrypt(plaintext: FileDTO[], key: TypedArray) {
+    const adapter = new CryptBlobAdapter()
+    const data: Promise<EncryptedFileDTO>[] = plaintext.map(async (file) => ({
+      name: file.name,
+      size: file.size,
+      type: file.type,
+      contents: await adapter.encrypt(file.contents, key),
+    }))
+    return JSON.stringify(await Promise.all(data))
+  }
+
+  async decrypt(ciphertext: string, key: TypedArray) {
+    const adapter = new CryptBlobAdapter()
+    const data: EncryptedFileDTO[] = JSON.parse(ciphertext)
+    const files: FileDTO[] = await Promise.all(
+      data.map(async (file) => ({
+        name: file.name,
+        size: file.size,
+        type: file.type,
+        contents: await adapter.decrypt(file.contents, key),
+      }))
+    )
+    return files
+  }
+}
+
+export const Adapters = {
+  Text: new CryptTextAdapter(),
+  Blob: new CryptBlobAdapter(),
+  Files: new CryptFilesAdapter(),
+}

packages/cli/src/shared/api.ts

@@ -0,0 +1,140 @@
+import type { KeyData, TypedArray } from 'occulto'
+
+export type NoteMeta = {
+  type: 'text' | 'file'
+  derivation?: KeyData
+}
+
+export type Note = {
+  contents: string
+  meta: NoteMeta
+  views?: number
+  expiration?: number
+}
+export type NoteInfo = Pick<Note, 'meta'>
+export type NotePublic = Pick<Note, 'contents' | 'meta'>
+export type NoteCreate = Omit<Note, 'meta'> & { meta: string }
+
+export type FileDTO = Pick<File, 'name' | 'size' | 'type'> & {
+  contents: TypedArray
+}
+
+export type EncryptedFileDTO = Omit<FileDTO, 'contents'> & {
+  contents: string
+}
+
+type ClientOptions = {
+  server: string
+}
+
+type CallOptions = {
+  url: string
+  method: string
+  body?: any
+}
+
+export class PayloadToLargeError extends Error {}
+
+export let client: ClientOptions = {
+  server: '',
+}
+
+function setOptions(options: Partial<ClientOptions>) {
+  client = { ...client, ...options }
+}
+
+function getOptions(): ClientOptions {
+  return client
+}
+
+async function call(options: CallOptions) {
+  const url = client.server + '/api/' + options.url
+  const response = await fetch(url, {
+    method: options.method,
+    body: options.body === undefined ? undefined : JSON.stringify(options.body),
+    mode: 'cors',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  })
+
+  if (!response.ok) {
+    if (response.status === 413) throw new PayloadToLargeError()
+    else throw new Error('API call failed')
+  }
+  return response.json()
+}
+
+async function create(note: Note) {
+  const { meta, ...rest } = note
+  const body: NoteCreate = {
+    ...rest,
+    meta: JSON.stringify(meta),
+  }
+  const data = await call({
+    url: 'notes/',
+    method: 'post',
+    body,
+  })
+  return data as { id: string }
+}
+
+async function get(id: string): Promise<NotePublic> {
+  const data = await call({
+    url: `notes/${id}`,
+    method: 'delete',
+  })
+  const { contents, meta } = data
+  const note = {
+    contents,
+    meta: JSON.parse(meta),
+  } satisfies NotePublic
+  if (note.meta.derivation) note.meta.derivation.salt = new Uint8Array(Object.values(note.meta.derivation.salt))
+  return note
+}
+
+async function info(id: string): Promise<NoteInfo> {
+  const data = await call({
+    url: `notes/${id}`,
+    method: 'get',
+  })
+  const { meta } = data
+  const note = {
+    meta: JSON.parse(meta),
+  } satisfies NoteInfo
+  if (note.meta.derivation) note.meta.derivation.salt = new Uint8Array(Object.values(note.meta.derivation.salt))
+  return note
+}
+
+export type Status = {
+  version: string
+  max_size: number
+  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() {
+  const data = await call({
+    url: 'status/',
+    method: 'get',
+  })
+  return data as Status
+}
+
+export const API = {
+  setOptions,
+  getOptions,
+  create,
+  get,
+  info,
+  status,
+}

packages/cli/src/shared/shared.ts

@@ -0,0 +1,2 @@
+export * from './adapters.js'
+export * from './api.js'

packages/cli/src/utils/parsers.ts

@@ -0,0 +1,27 @@
+import { InvalidArgumentError, InvalidOptionArgumentError } from '@commander-js/extra-typings'
+import { accessSync, constants } from 'node:fs'
+import { resolve } from 'node:path'
+
+export function parseFile(value: string, before: string[] = []) {
+  try {
+    const file = resolve(value)
+    accessSync(file, constants.R_OK)
+    return [...before, file]
+  } catch {
+    throw new InvalidArgumentError('cannot access file')
+  }
+}
+
+export function parseURL(value: string, _: URL): URL {
+  try {
+    return new URL(value)
+  } catch {
+    throw new InvalidArgumentError('is not a valid url')
+  }
+}
+
+export function parseNumber(value: string, _: number): number {
+  const n = Number.parseInt(value, 10)
+  if (Number.isNaN(n)) throw new InvalidOptionArgumentError('invalid number')
+  return n
+}

packages/cli/src/utils/stdin.ts

@@ -0,0 +1,25 @@
+export function getStdin(timeout: number = 10): Promise<string> {
+  return new Promise<string>((resolve, reject) => {
+    // Store the data from stdin in a buffer
+    let buffer = ''
+    let t: NodeJS.Timeout
+
+    const dataHandler = (d: Buffer) => (buffer += d.toString())
+    const endHandler = () => {
+      clearTimeout(t)
+      resolve(buffer.trim())
+    }
+
+    // Stop listening for data after the timeout, otherwise hangs indefinitely
+    t = setTimeout(() => {
+      process.stdin.removeListener('data', dataHandler)
+      process.stdin.removeListener('end', endHandler)
+      process.stdin.pause()
+      resolve('')
+    }, timeout)
+
+    process.stdin.on('error', reject)
+    process.stdin.on('data', dataHandler)
+    process.stdin.on('end', endHandler)
+  })
+}

packages/cli/src/utils/utils.ts

@@ -0,0 +1,19 @@
+import { exit as exitNode } from 'node:process'
+import { API } from '../shared/api.js'
+
+export function exit(message: string) {
+  console.error(message)
+  exitNode(1)
+}
+
+export async function checkConstrains(constrains: { views?: number; minutes?: number }) {
+  const { views, minutes } = constrains
+  if (views && minutes) exit('cannot set view and minutes constrains simultaneously')
+  if (!views && !minutes) constrains.views = 1
+
+  const response = await API.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)
+    exit(`Only a maximum of ${response.max_expiration} minutes allowed. ${minutes} given.`)
+}

packages/cli/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "module": "es2022",
+    "moduleResolution": "Bundler",
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "strict": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "allowSyntheticDefaultImports": true
+  }
+}

packages/frontend/.npmrc

@@ -1 +0,0 @@
-engine-strict=true

packages/frontend/locales/de.json

@@ -1,51 +1,58 @@
 {
 	"common": {
-		"note": "Hinweis",
+		"note": "Notiz",
 		"file": "Datei",
-		"advanced": "erweitert",
-		"create": "erstellen",
-		"loading": "läd",
+		"advanced": "Erweiterte Optionen",
+		"create": "Erstellen",
+		"loading": "Lädt...",
 		"mode": "Modus",
 		"views": "{n, plural, =0 {Ansichten} =1 {1 Ansicht} other {# Ansichten}}",
 		"minutes": "{n, plural, =0 {Minuten} =1 {1 Minute} other {# Minuten}}",
 		"max": "max",
 		"share_link": "Link teilen",
-		"copy_clipboard": "in die Zwischenablage kopieren",
-		"copied_to_clipboard": "in die Zwischenablage kopiert",
-		"encrypting": "verschlüsseln",
-		"decrypting": "entschlüsselt",
-		"uploading": "hochladen",
-		"downloading": "wird heruntergeladen",
-		"qr_code": "qr-code"
+		"copy_clipboard": "In die Zwischenablage kopieren",
+		"copied_to_clipboard": "In die Zwischenablage kopiert.",
+		"encrypting": "Wird verschlüsselt...",
+		"decrypting": "Wird entschlüsselt...",
+		"uploading": "Hochladen",
+		"downloading": "Wird heruntergeladen",
+		"qr_code": "QR-Code",
+		"password": "Passwort"
 	},
 	"home": {
-		"intro": "Senden Sie ganz einfach <i>vollständig verschlüsselte</i>, sichere Notizen oder Dateien mit einem Klick. Erstellen Sie einfach eine Notiz und teilen Sie den Link.",
-		"explanation": "die Notiz verfällt und wird nach {type} zerstört.",
-		"new_note": "neue Note",
-		"new_note_notice": "<b>Verfügbarkeit:</b><br />es ist nicht garantiert, dass die Notiz gespeichert wird, da alles im Speicher gehalten wird. Wenn dieser voll ist, werden die ältesten Notizen entfernt.<br />(Sie werden wahrscheinlich keine Probleme haben, seien Sie nur gewarnt).",
+		"intro": "Erstellen Sie mit einem Klick <i>vollständig verschlüsselte</i>, sichere Notizen oder Dateien und teilen Sie diese über einen Link.",
+		"explanation": "Die Notiz verfällt nach {type}.",
+		"new_note": "Neue Notiz",
+		"new_note_notice": "<b>Wichtiger Hinweis zur Verfügbarkeit:</b><br />Es kann nicht garantiert werden, dass diese Notiz gespeichert wird, da diese <b>ausschließlich im Speicher</b> gehalten werden. Ist dieser voll, werden die ältesten Notizen entfernt.<br />(Wahrscheinlich gibt es keine derartigen Probleme, seien Sie nur vorgewarnt).",
 		"errors": {
-			"note_to_big": "Notiz konnte nicht erstellt werden. Notiz ist zu groß",
-			"note_error": "konnte keine Notiz erstellen. Bitte versuchen Sie es erneut.",
+			"note_to_big": "Notiz konnte nicht erstellt werden, da sie zu groß ist.",
+			"note_error": "Notiz konnte nicht erstellt werden. Bitte versuchen Sie es erneut.",
 			"max": "max: {n}",
 			"empty_content": "Notiz ist leer."
 		},
 		"messages": {
-			"note_created": "notiz erstellt."
+			"note_created": "Notiz wurde erstellt."
+		},
+		"advanced": {
+			"explanation": "Standardmäßig wird für jede Notiz ein generiertes, sicheres Passwort verwendet. Alternativ können Sie ein eigenes Kennwort festlegen, welches nicht im Link enthalten ist.",
+			"custom_password": "Benutzerdefiniertes Passwort"
 		}
 	},
 	"show": {
 		"errors": {
-			"not_found": "wurde nicht gefunden oder wurde bereits gelöscht.",
-			"decryption_failed": "falsches Passwort. konnte nicht entziffert werden. wahrscheinlich ein defekter Link. Notiz wurde zerstört.",
-			"unsupported_type": "nicht unterstützter Notiztyp."
+			"not_found": "Notiz konnte nicht gefunden werden oder wurde bereits gelöscht.",
+			"decryption_failed": "Notiz konnte nicht entschlüsselt werden. Vermutlich ist das Passwort falsch oder der Link defekt. Die Notiz wurde daher gelöscht.",
+			"unsupported_type": "Nicht unterstützter Notiztyp."
 		},
-		"explanation": "Klicken Sie unten, um die Notiz anzuzeigen und zu löschen, wenn der Zähler sein Limit erreicht hat",
+		"explanation": "Klicken Sie auf den Button, um die Notiz anzuzeigen und anschließend zu löschen, falls ein festgelegtes Limit erreicht wurde.",
 		"show_note": "Notiz anzeigen",
-		"warning_will_not_see_again": "haben Sie <b>keine</b> Gelegenheit, die Notiz noch einmal zu sehen.",
-		"download_all": "alle herunterladen"
+		"warning_will_not_see_again": "ACHTUNG! Sie werden anschließend <b>keine</b> Gelegenheit mehr haben, die Notiz erneut anzusehen.",
+		"download_all": "Alle Dateien herunterladen",
+		"links_found": "Gefundene Links in der Notiz:"
 	},
 	"file_upload": {
 		"selected_files": "Ausgewählte Dateien",
-		"no_files_selected": "Keine Dateien ausgewählt"
+		"no_files_selected": "Keine Dateien ausgewählt",
+		"clear": "Zurücksetzen"
 	}
 }

packages/frontend/locales/en.json

@@ -16,7 +16,8 @@
 		"decrypting": "decrypting",
 		"uploading": "uploading",
 		"downloading": "downloading",
-		"qr_code": "qr code"
+		"qr_code": "qr code",
+		"password": "password"
 	},
 	"home": {
 		"intro": "Easily send <i>fully encrypted</i>, secure notes or files with one click. Just create a note and share the link.",
@@ -24,13 +25,17 @@
 		"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 to big",
+			"note_to_big": "could not create note. note is too big",
 			"note_error": "could not create note. please try again.",
 			"max": "max: {n}",
 			"empty_content": "note is empty."
 		},
 		"messages": {
 			"note_created": "note created."
+		},
+		"advanced": {
+			"explanation": "By default, a securely generated password is used for each note. You can however also choose your own password, which is not included in the link.",
+			"custom_password": "custom password"
 		}
 	},
 	"show": {
@@ -39,13 +44,15 @@
 			"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 it's limit",
+		"explanation": "click below to show and delete the note if the counter has reached its 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"
+		"download_all": "download all",
+		"links_found": "links found inside the note:"
 	},
 	"file_upload": {
 		"selected_files": "Selected Files",
-		"no_files_selected": "No Files Selected"
+		"no_files_selected": "No Files Selected",
+		"clear": "Reset"
 	}
 }

packages/frontend/locales/es.json

@@ -16,13 +16,14 @@
 		"decrypting": "descifrando",
 		"uploading": "cargando",
 		"downloading": "descargando",
-		"qr_code": "código qr"
+		"qr_code": "código qr",
+		"password": "contraseña"
 	},
 	"home": {
 		"intro": "Envía fácilmente notas o archivos <i>totalmente encriptados</i> y seguros con un solo clic. Solo tienes que crear una nota y compartir el enlace.",
 		"explanation": "la nota expirará y se destruirá después de {type}.",
 		"new_note": "nueva nota",
-		"new_note_notice": "<b>disponibilidad:</b><br />no se garantiza que la nota se almacene, ya que todo se guarda en la memoria RAM, si se llena se eliminarán las notas más antiguas.<br />(probablemente estará bien, sólo está advertido.)",
+		"new_note_notice": "<b>disponibilidad:</b><br />no se garantiza que la nota se almacene, ya que todo se guarda en la memoria RAM, si se llena se eliminarán las notas más antiguas.<br />(probablemente estará bien, solo está advertido.)",
 		"errors": {
 			"note_to_big": "no se pudo crear la nota. la nota es demasiado grande",
 			"note_error": "No se ha podido crear la nota. Por favor, inténtelo de nuevo.",
@@ -31,6 +32,10 @@
 		},
 		"messages": {
 			"note_created": "nota creada."
+		},
+		"advanced": {
+			"explanation": "Por defecto, se utiliza una contraseña generada de forma segura para cada nota. No obstante, también puede elegir su propia contraseña, la cual no se incluye en el enlace.",
+			"custom_password": "contraseña personalizada"
 		}
 	},
 	"show": {
@@ -41,11 +46,13 @@
 		},
 		"explanation": "pulse abajo para mostrar y borrar la nota si el contador ha llegado a su límite",
 		"show_note": "mostrar nota",
-		"warning_will_not_see_again": " <b>no</b> tendrás la oportunidad de volver a ver la nota.",
-		"download_all": "descargar todo"
+		"warning_will_not_see_again": "<b>no</b> tendrás la oportunidad de volver a ver la nota.",
+		"download_all": "descargar todo",
+		"links_found": "enlaces que se encuentran dentro de la nota:"
 	},
 	"file_upload": {
 		"selected_files": "Archivos seleccionados",
-		"no_files_selected": "No hay archivos seleccionados"
+		"no_files_selected": "No hay archivos seleccionados",
+		"clear": "Restablecer"
 	}
 }

packages/frontend/locales/fr.json

@@ -12,25 +12,30 @@
 		"share_link": "partager le lien",
 		"copy_clipboard": "copier dans le presse-papiers",
 		"copied_to_clipboard": "copié dans le presse-papiers",
-		"encrypting": "cryptage",
+		"encrypting": "chiffrer",
 		"decrypting": "déchiffrer",
-		"uploading": "téléchargement",
+		"uploading": "téléversement",
 		"downloading": "téléchargement",
-		"qr_code": "code qr"
+		"qr_code": "code qr",
+		"password": "mot de passe"
 	},
 	"home": {
-		"intro": "Envoyez facilement des notes ou des fichiers <i>entièrement cryptés</i> et sécurisés en un seul clic. Il suffit de créer une note et de partager le lien.",
+		"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 />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 />(vous serez probablement bien, soyez juste averti.)",
+		"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.)",
 		"errors": {
-			"note_to_big": "Impossible de créer une note. La note est trop grande",
+			"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.",
 			"max": "max: {n}",
 			"empty_content": "La note est vide."
 		},
 		"messages": {
 			"note_created": "note créée."
+		},
+		"advanced": {
+			"explanation": "Par défaut, un mot de passe généré de manière sécurisée est utilisé pour chaque note. Vous pouvez toutefois choisir votre propre mot de passe, qui n'est pas inclus dans le lien.",
+			"custom_password": "mot de passe personnalisé"
 		}
 	},
 	"show": {
@@ -40,12 +45,14 @@
 			"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": "note de présentation",
+		"show_note": "afficher la note",
 		"warning_will_not_see_again": "vous <b>n'aurez pas</b> la chance de revoir la note.",
-		"download_all": "télécharger tout"
+		"download_all": "tout télécharger",
+		"links_found": "liens trouvés à l’intérieur de la note :"
 	},
 	"file_upload": {
 		"selected_files": "Fichiers sélectionnés",
-		"no_files_selected": "Aucun fichier sélectionné"
+		"no_files_selected": "Aucun fichier sélectionné",
+		"clear": "Réinitialiser"
 	}
 }

packages/frontend/locales/it.json

@@ -16,7 +16,8 @@
 		"decrypting": "decifrando",
 		"uploading": "caricamento",
 		"downloading": "scaricando",
-		"qr_code": "codice qr"
+		"qr_code": "codice qr",
+		"password": "password"
 	},
 	"home": {
 		"intro": "Invia facilmente note o file <i>completamente criptati</i> e sicuri con un solo clic. Basta creare una nota e condividere il link.",
@@ -31,6 +32,10 @@
 		},
 		"messages": {
 			"note_created": "nota creata."
+		},
+		"advanced": {
+			"explanation": "Per impostazione predefinita, per ogni nota viene utilizzata una password generata in modo sicuro. È tuttavia possibile scegliere la propria password, che non è inclusa nel link.",
+			"custom_password": "password personalizzata"
 		}
 	},
 	"show": {
@@ -41,11 +46,13 @@
 		},
 		"explanation": "clicca sotto per mostrare e cancellare la nota se il contatore ha raggiunto il suo limite",
 		"show_note": "mostra la nota",
-		"warning_will_not_see_again": " <b>non</b> avrete la possibilità di rivedere la nota.",
-		"download_all": "scarica tutti"
+		"warning_will_not_see_again": "<b>non</b> avrete la possibilità di rivedere la nota.",
+		"download_all": "scarica tutti",
+		"links_found": "link presenti all'interno della nota:"
 	},
 	"file_upload": {
 		"selected_files": "File selezionati",
-		"no_files_selected": "Nessun file selezionato"
+		"no_files_selected": "Nessun file selezionato",
+		"clear": "Reset"
 	}
 }

packages/frontend/locales/ja.json

@@ -0,0 +1,58 @@
+{
+	"common": {
+		"note": "新しいメモ",
+		"file": "ファイル",
+		"advanced": "アドバンスド",
+		"create": "作成",
+		"loading": "読み込み中",
+		"mode": "モード",
+		"views": "{n, plural, =0 {表示可能な時間} =1 { 1 ビュー} other {#ビュー}}",
+		"minutes": "{n, plural, =0 {有効期間(分)} =1 {1 分} other {# 分}}",
+		"max": "マックス",
+		"share_link": "共有リンク",
+		"copy_clipboard": "クリップボードにコピーする",
+		"copied_to_clipboard": "クリップボードにコピーされました",
+		"encrypting": "暗号化",
+		"decrypting": "復号化",
+		"uploading": "アップロード中",
+		"downloading": "ダウンロード中",
+		"qr_code": "QRコード",
+		"password": "暗号"
+	},
+	"home": {
+		"intro": "<i>完全に暗号化された</i> 、安全なメモやファイルをワンクリックで簡単に送信できます。メモを作成してリンクを共有するだけです。",
+		"explanation": "メモは{type}後に期限切れになり、破棄されます。",
+		"new_note": "新しいメモ",
+		"new_note_notice": "<b>可用性: </b> <br />すべてが RAM に保持されるため、メモが保存されるとは限りません。いっぱいになると、最も古いメモが削除されます。 <br /> (大丈夫だと思いますが、ご了承ください。)",
+		"errors": {
+			"note_to_big": "メモを作成できませんでした。メモが大きすぎる",
+			"note_error": "メモを作成できませんでした。もう一度お試しください。",
+			"max": "最大ファイルサイズ: {n}",
+			"empty_content": "メモは空です。"
+		},
+		"messages": {
+			"note_created": "メモが作成されました。"
+		},
+		"advanced": {
+			"explanation": "デフォルトでは、安全に生成されたパスワードが各ノートに使用されます。しかし、リンクに含まれない独自のパスワードを選択することもできます。",
+			"custom_password": "カスタムパスワード"
+		}
+	},
+	"show": {
+		"errors": {
+			"not_found": "メモが見つからないか、既に削除されています。",
+			"decryption_failed": "パスワードエラー！不完全なリンクを貼り付けたり、暗号を解読しようとしたりしている可能性があります！しかし、いずれにしても、この暗号は破棄されました！",
+			"unsupported_type": "サポートされていないメモ タイプです。"
+		},
+		"explanation": "カウンターが上限に達した場合、ノートの表示と削除を行うには、以下をクリックします。",
+		"show_note": "メモを表示",
+		"warning_will_not_see_again": "あなた <b>できません</b> このノートをもう一度見る",
+		"download_all": "すべてダウンロード",
+		"links_found": "メモ内にあるリンク:"
+	},
+	"file_upload": {
+		"selected_files": "選択したファイル",
+		"no_files_selected": "ファイルが選択されていません",
+		"clear": "リセット"
+	}
+}

packages/frontend/locales/pl.json

@@ -0,0 +1,58 @@
+{
+	"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

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

packages/frontend/locales/zh.json

@@ -0,0 +1,58 @@
+{
+	"common": {
+		"note": "密信",
+		"file": "上传文件",
+		"advanced": "高级设置",
+		"create": "创建",
+		"loading": "加载中",
+		"mode": "模式",
+		"views": "{n, plural, =0 {可读次数} =1 {1 次查看} other {# 次查看}}",
+		"minutes": "{n, plural, =0 {有效期（分钟）} =1 {1 分钟} other {# 分钟}}",
+		"max": "最大值",
+		"share_link": "分享链接",
+		"copy_clipboard": "复制到粘贴板",
+		"copied_to_clipboard": "已成功复制到粘贴板",
+		"encrypting": "加密",
+		"decrypting": "解密",
+		"uploading": "上传",
+		"downloading": "下载",
+		"qr_code": "二维码",
+		"password": "密码"
+	},
+	"home": {
+		"intro": "飞鸽传书，一键传输完全加密的密信或文件，阅后即焚。",
+		"explanation": "该密信会在{type}后失效。",
+		"new_note": "新建密信",
+		"new_note_notice": "<b>提醒：</b><br>密信保存在内存中，如果内存满了，则最早的密信将被删除以释放内存，因此不保证该密信的可用性。一般不会出现这种情况，无需担心。",
+		"errors": {
+			"note_to_big": "创建失败，密信过大。",
+			"note_error": "创建失败，请稍后重试。",
+			"max": "次数上限：{n}",
+			"empty_content": "密信不能为空。"
+		},
+		"messages": {
+			"note_created": "密信创建成功。"
+		},
+		"advanced": {
+			"explanation": "默认情况下，每个笔记都使用安全生成的密码。但是，您也可以选择您自己的密码，该密码未包含在链接中。",
+			"custom_password": "自定义密码"
+		}
+	},
+	"show": {
+		"errors": {
+			"not_found": "密信不存在，可能已被查看或删除。",
+			"decryption_failed": "密钥错误，无法查看。",
+			"unsupported_type": "不支持的类型。"
+		},
+		"explanation": "点击下方按钮即可查看密信，阅后即焚。",
+		"show_note": "查看密信",
+		"warning_will_not_see_again": "你将<b>无法</b>再次查看该密信，请尽快复制到粘贴板。",
+		"download_all": "下载全部",
+		"links_found": "注释中找到的链接："
+	},
+	"file_upload": {
+		"selected_files": "已选中的文件",
+		"no_files_selected": "没有文件被选中",
+		"clear": "重置"
+	}
+}

packages/frontend/locales/zh_CN.json

@@ -1,51 +0,0 @@
-{
-	"common": {
-		"note": "密信",
-		"file": "上传文件",
-		"advanced": "高级设置",
-		"create": "创建",
-		"loading": "加载中",
-		"mode": "模式",
-		"views": "{n, plural, =0 {可查看次数} =1 {1 次查看} other {# 次查看}}",
-		"minutes": "{n, plural, =0 {有效期(分钟)} =1 {1 分钟} other {# 分钟}}",
-		"max": "最大值",
-		"share_link": "分享链接",
-		"copy_clipboard": "复制到剪切版",
-		"copied_to_clipboard": "已复制到剪切板",
-		"encrypting": "加密",
-		"decrypting": "解密",
-		"uploading": "上传",
-		"downloading": "下载",
-		"qr_code": "二维码"
-	},
-	"home": {
-		"intro": "一键轻松发送 <i>完全加密的</i> 密信或者文件。只需创建一个密信然后分享链接。",
-		"explanation": "该密信会在{type}后失效。",
-		"new_note": "新建密信",
-		"new_note_notice": "<b>可用性警示：</b><br />由于加密鸽的所有数据是全部保存在内存中的，所以如果加密鸽的可用内存被用光了那么它将会删除最早的密信以释放内存，因此不保证该密信的可用性。<br />(一般情况下是您应该是不会遇到这个问题，只是警示一下。)",
-		"errors": {
-			"note_to_big": "无法创建密信，这个密信太大了！",
-			"note_error": "无法创建密信，请再试一遍。",
-			"max": "最大文件大小: {n}",
-			"empty_content": "密信为空！"
-		},
-		"messages": {
-			"note_created": "注释创建。"
-		}
-	},
-	"show": {
-		"errors": {
-			"not_found": "该密信无法被找到或者它已经被删除了！",
-			"decryption_failed": "密钥错误！您可能不小心粘贴了一个不完整的链接或者正在尝试破解该密信！但无论如何，该密信已被销毁！",
-			"unsupported_type": "不支持的票据类型。"
-		},
-		"explanation": "点击下方的按钮可以查看密信，如果它到达了限制将会被删除",
-		"show_note": "查看密信",
-		"warning_will_not_see_again": "您将<b>无法</b>再次查看该密信",
-		"download_all": "下载全部"
-	},
-	"file_upload": {
-		"selected_files": "已选中的文件",
-		"no_files_selected": "没有文件被选中"
-	}
-}

packages/frontend/package.json

@@ -1,9 +1,11 @@
 {
 	"private": true,
+	"name": "@cryptgeon/web",
 	"scripts": {
+		"postinstall": "svelte-kit sync",
 		"dev": "vite dev",
 		"build": "vite build",
-		"preview": "vite preview --port 3000",
+		"preview": "vite preview",
 		"check": "svelte-check --tsconfig tsconfig.json",
 		"licenses": "license-checker --summary > licenses.csv",
 		"locale:download": "node scripts/locale.js",
@@ -11,28 +13,25 @@
 	},
 	"type": "module",
 	"devDependencies": {
-		"@lokalise/node-api": "^9.3.0",
-		"@sveltejs/adapter-static": "^1.0.0",
-		"@sveltejs/kit": "^1.0.1",
-		"@types/dompurify": "^2.4.0",
-		"@types/file-saver": "^2.0.5",
-		"@zerodevx/svelte-toast": "^0.7.2",
+		"@lokalise/node-api": "^12.1.0",
+		"@sveltejs/adapter-static": "^3.0.1",
+		"@sveltejs/kit": "^2.5.2",
+		"@sveltejs/vite-plugin-svelte": "^3.0.2",
+		"@zerodevx/svelte-toast": "^0.9.5",
 		"adm-zip": "^0.5.10",
-		"dotenv": "^16.0.3",
-		"svelte": "^3.55.0",
-		"svelte-check": "^2.10.3",
-		"svelte-intl-precompile": "^0.10.1",
-		"svelte-preprocess": "^4.10.7",
-		"tslib": "^2.4.1",
-		"typescript": "^4.9.4",
-		"vite": "^4.0.3"
+		"dotenv": "^16.4.5",
+		"svelte": "^4.2.12",
+		"svelte-check": "^3.6.6",
+		"svelte-intl-precompile": "^0.12.3",
+		"tslib": "^2.6.2",
+		"typescript": "^5.3.3",
+		"vite": "^5.1.7"
 	},
 	"dependencies": {
-		"@fontsource/fira-mono": "^4.5.10",
-		"copy-to-clipboard": "^3.3.3",
-		"dompurify": "^2.4.1",
-		"file-saver": "^2.0.5",
-		"pretty-bytes": "^6.0.0",
+		"cryptgeon": "workspace:*",
+		"@fontsource/fira-mono": "^5.0.8",
+		"occulto": "^2.0.6",
+		"pretty-bytes": "^6.1.1",
 		"qrious": "^4.0.2"
 	}
 }

packages/frontend/scripts/locale.js

@@ -5,10 +5,15 @@ import https from 'https'
 
 dotenv.config()
 
+function exit(msg) {
+	console.error(msg)
+	process.exit(1)
+}
+
 const apiKey = process.env.LOKALISE_API_KEY
 const project_id = process.env.LOKALISE_PROJECT
-if (!apiKey) throw new Error('No API Key set for Lokalize! Set with "LOKALISE_API_KEY"')
-if (!project_id) throw new Error('No project id set for Lokalize! Set with "LOKALISE_PROJECT"')
+if (!apiKey) exit('No API Key set for Lokalize! Set with "LOKALISE_API_KEY"')
+if (!project_id) exit('No project id set for Lokalize! Set with "LOKALISE_PROJECT"')
 const client = new LokaliseApi({ apiKey })
 
 const WGet = (url) =>

packages/frontend/src/app.css

@@ -92,7 +92,7 @@ button {
 }
 
 *:disabled,
-*[disabled='true'] {
+.disabled {
 	opacity: 0.5;
 }
 
@@ -126,3 +126,13 @@ fieldset {
 .tr {
 	text-align: right;
 }
+
+hr {
+	border: none;
+	border-bottom: 2px solid var(--ui-bg-1);
+	margin: 1rem 0;
+}
+
+p {
+	margin: 0;
+}

packages/frontend/src/app.d.ts

@@ -0,0 +1,9 @@
+// See https://kit.svelte.dev/docs/types#app
+// for information about these interfaces
+// and what to do when importing types
+declare namespace App {
+	// interface Error {}
+	// interface Locals {}
+	// interface PageData {}
+	// interface Platform {}
+}

packages/frontend/src/global.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="@sveltejs/kit" />
-/// <reference types="svelte" />
-/// <reference types="vite/client" />

packages/frontend/src/lib/adapters.ts

@@ -1,61 +0,0 @@
-import type { EncryptedFileDTO, FileDTO } from './api'
-import { Crypto } from './crypto'
-
-abstract class CryptAdapter<T> {
-	abstract encrypt(plaintext: T, key: CryptoKey): Promise<string>
-	abstract decrypt(ciphertext: string, key: CryptoKey): Promise<T>
-}
-
-class CryptTextAdapter implements CryptAdapter<string> {
-	async encrypt(plaintext: string, key: CryptoKey) {
-		return await Crypto.encrypt(new TextEncoder().encode(plaintext), key)
-	}
-	async decrypt(ciphertext: string, key: CryptoKey) {
-		const plaintext = await Crypto.decrypt(ciphertext, key)
-		return new TextDecoder().decode(plaintext)
-	}
-}
-
-class CryptBlobAdapter implements CryptAdapter<Blob> {
-	async encrypt(plaintext: Blob, key: CryptoKey) {
-		return await Crypto.encrypt(await plaintext.arrayBuffer(), key)
-	}
-
-	async decrypt(ciphertext: string, key: CryptoKey) {
-		const plaintext = await Crypto.decrypt(ciphertext, key)
-		return new Blob([plaintext], { type: 'application/octet-stream' })
-	}
-}
-
-class CryptFilesAdapter implements CryptAdapter<FileDTO[]> {
-	async encrypt(plaintext: FileDTO[], key: CryptoKey) {
-		const adapter = new CryptBlobAdapter()
-		const data: Promise<EncryptedFileDTO>[] = plaintext.map(async (file) => ({
-			name: file.name,
-			size: file.size,
-			type: file.type,
-			contents: await adapter.encrypt(file.contents, key),
-		}))
-		return JSON.stringify(await Promise.all(data))
-	}
-
-	async decrypt(ciphertext: string, key: CryptoKey) {
-		const adapter = new CryptBlobAdapter()
-		const data: EncryptedFileDTO[] = JSON.parse(ciphertext)
-		const files: FileDTO[] = await Promise.all(
-			data.map(async (file) => ({
-				name: file.name,
-				size: file.size,
-				type: file.type,
-				contents: await adapter.decrypt(file.contents, key),
-			}))
-		)
-		return files
-	}
-}
-
-export const Adapters = {
-	Text: new CryptTextAdapter(),
-	Blob: new CryptBlobAdapter(),
-	Files: new CryptFilesAdapter(),
-}

packages/frontend/src/lib/api.ts

@@ -1,78 +0,0 @@
-export type NoteMeta = { type: 'text' | 'file' }
-
-export type Note = {
-	contents: string
-	meta: NoteMeta
-	views?: number
-	expiration?: number
-}
-export type NoteInfo = {}
-export type NotePublic = Pick<Note, 'contents' | 'meta'>
-export type NoteCreate = Omit<Note, 'meta'> & { meta: string }
-
-export type FileDTO = Pick<File, 'name' | 'size' | 'type'> & {
-	contents: Blob
-}
-
-export type EncryptedFileDTO = Omit<FileDTO, 'contents'> & {
-	contents: string
-}
-
-type CallOptions = {
-	url: string
-	method: string
-	body?: any
-}
-
-export class PayloadToLargeError extends Error {}
-
-export async function call(options: CallOptions) {
-	const response = await fetch('/api/' + options.url, {
-		method: options.method,
-		body: options.body === undefined ? undefined : JSON.stringify(options.body),
-		mode: 'cors',
-		headers: {
-			'Content-Type': 'application/json',
-		},
-	})
-
-	if (!response.ok) {
-		if (response.status === 413) throw new PayloadToLargeError()
-		else throw new Error('API call failed')
-	}
-	return response.json()
-}
-
-export async function create(note: Note) {
-	const { meta, ...rest } = note
-	const body: NoteCreate = {
-		...rest,
-		meta: JSON.stringify(meta),
-	}
-	const data = await call({
-		url: 'notes/',
-		method: 'post',
-		body,
-	})
-	return data as { id: string }
-}
-
-export async function get(id: string): Promise<NotePublic> {
-	const data = await call({
-		url: `notes/${id}`,
-		method: 'delete',
-	})
-	const { contents, meta } = data
-	return {
-		contents,
-		meta: JSON.parse(meta) as NoteMeta,
-	}
-}
-
-export async function info(id: string): Promise<NoteInfo> {
-	const data = await call({
-		url: `notes/${id}`,
-		method: 'get',
-	})
-	return data
-}

packages/frontend/src/lib/crypto.ts

@@ -1,89 +0,0 @@
-export class Hex {
-	static encode(buffer: ArrayBuffer): string {
-		let s = ''
-		for (const i of new Uint8Array(buffer)) {
-			s += i.toString(16).padStart(2, '0')
-		}
-		return s
-	}
-
-	static decode(s: string): ArrayBuffer {
-		const size = s.length / 2
-		const buffer = new Uint8Array(size)
-		for (let i = 0; i < size; i++) {
-			const idx = i * 2
-			const segment = s.slice(idx, idx + 2)
-			buffer[i] = parseInt(segment, 16)
-		}
-		return buffer
-	}
-}
-
-export class ArrayBufferUtils {
-	static async toString(buffer: ArrayBuffer): Promise<string> {
-		const reader = new window.FileReader()
-		reader.readAsDataURL(new Blob([buffer]))
-		return new Promise((resolve) => {
-			reader.onloadend = () => resolve(reader.result as string)
-		})
-	}
-
-	static async fromString(s: string): Promise<ArrayBuffer> {
-		return fetch(s)
-			.then((r) => r.blob())
-			.then((b) => b.arrayBuffer())
-	}
-}
-
-export class Keys {
-	public static async generateKey(size: 128 | 192 | 256 = 256): Promise<CryptoKey> {
-		const key = await window.crypto.subtle.generateKey(
-			{
-				name: 'AES-GCM',
-				length: size,
-			},
-			true,
-			['encrypt', 'decrypt']
-		)
-		return key
-	}
-
-	public static async export(key: CryptoKey): Promise<string> {
-		return Hex.encode(await window.crypto.subtle.exportKey('raw', key))
-	}
-
-	public static async import(key: string): Promise<CryptoKey> {
-		return window.crypto.subtle.importKey('raw', Hex.decode(key), { name: 'AES-GCM' }, true, [
-			'encrypt',
-			'decrypt',
-		])
-	}
-}
-
-export class Crypto {
-	private static ALG = 'AES-GCM'
-	private static DELIMITER = ':::'
-
-	public static getRandomBytes(size: number): Uint8Array {
-		return window.crypto.getRandomValues(new Uint8Array(size))
-	}
-
-	public static async encrypt(plaintext: ArrayBuffer, key: CryptoKey): Promise<string> {
-		const iv = this.getRandomBytes(12) // AES-GCM needs a 96bit IV
-		const encrypted: ArrayBuffer = await window.crypto.subtle.encrypt(
-			{ name: this.ALG, iv },
-			key,
-			plaintext
-		)
-		const data = [Hex.encode(iv), await ArrayBufferUtils.toString(encrypted)].join(this.DELIMITER)
-		return data
-	}
-
-	public static async decrypt(ciphertext: string, key: CryptoKey): Promise<ArrayBuffer> {
-		const splitted = ciphertext.split(this.DELIMITER)
-		const iv = Hex.decode(splitted[0])
-		const encrypted = await ArrayBufferUtils.fromString(splitted[1])
-		const plaintext = await window.crypto.subtle.decrypt({ name: this.ALG, iv }, key, encrypted)
-		return plaintext
-	}
-}

packages/frontend/src/lib/stores/status.ts

@@ -1,24 +1,8 @@
-import { call } from '$lib/api'
+import { API, type Status } from 'cryptgeon/shared'
 import { writable } from 'svelte/store'
 
-export type Status = {
-	version: string
-	max_size: number
-	max_views: number
-	max_expiration: number
-	allow_advanced: boolean
-	theme_image: string
-	theme_text: string
-	theme_favicon: string
-	theme_page_title: string
-}
-
 export const status = writable<null | Status>(null)
 
 export async function init() {
-	const data = await call({
-		url: 'status/',
-		method: 'get',
-	})
-	status.set(data)
+	status.set(await API.status())
 }

packages/frontend/src/lib/toast.ts

@@ -1,11 +1,11 @@
-import { toast, type SvelteToastOptions } from '@zerodevx/svelte-toast'
+import { toast } from '@zerodevx/svelte-toast'
 
 export enum NotifyType {
 	Success = 'success',
 	Error = 'error',
 }
 
-const themeMapping: Record<NotifyType, SvelteToastOptions['theme']> = {
+const themeMapping: Record<NotifyType, Record<string, string>> = {
 	[NotifyType.Success]: {
 		'--toastBackground': 'var(--ui-clr-primary)',
 		'--toastBarBackground': 'var(--ui-clr-primary-alt)',
@@ -17,7 +17,7 @@ const themeMapping: Record<NotifyType, SvelteToastOptions['theme']> = {
 }
 
 function notifyFN(message: string, type: NotifyType = NotifyType.Success) {
-	const options: SvelteToastOptions = {
+	const options = {
 		duration: 5_000,
 		theme: {
 			...themeMapping[type],

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

@@ -1,16 +1,22 @@
 <script lang="ts">
 	import { t } from 'svelte-intl-precompile'
 
-	import type { Note } from '$lib/api'
 	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'
 
 	export let note: Note
 	export let timeExpiration = false
+	export let customPassword: string | null = null
+
+	let hasCustomPassword = false
+
+	$: if (!hasCustomPassword) customPassword = null
 </script>
 
-<div class="fields">
+<div class="flex col">
+	<div class="flex">
 		<TextInput
 			data-testid="field-views"
 			type="number"
@@ -23,14 +29,12 @@
 				($status && v <= $status?.max_views && v > 0) ||
 				$t('home.errors.max', { values: { n: $status?.max_views ?? 0 } })}
 		/>
-	<div class="middle-switch">
 		<Switch
 			data-testid="switch-advanced-toggle"
 			label={$t('common.mode')}
 			bind:value={timeExpiration}
 			color={false}
 		/>
-	</div>
 		<TextInput
 			data-testid="field-expiration"
 			type="number"
@@ -42,14 +46,37 @@
 				($status && v < $status?.max_expiration) ||
 				$t('home.errors.max', { values: { n: $status?.max_expiration ?? 0 } })}
 		/>
+	</div>
+	<div class="flex">
+		<Switch
+			data-testid="custom-password"
+			bind:value={hasCustomPassword}
+			label={$t('home.advanced.custom_password')}
+		/>
+		<TextInput
+			data-testid="password"
+			type="password"
+			bind:value={customPassword}
+			label={$t('common.password')}
+			disabled={!hasCustomPassword}
+			random
+		/>
+	</div>
+	<div>
+		{$t('home.advanced.explanation')}
+	</div>
 </div>
 
 <style>
-	.middle-switch {
-		margin: 0 1rem;
+	.flex {
+		display: flex;
+		align-items: flex-end;
+		gap: 1rem;
+		width: 100%;
 	}
 
-	.fields {
-		display: flex;
+	.col {
+		gap: 1.5rem;
+		flex-direction: column;
 	}
 </style>

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

@@ -1,4 +1,5 @@
 <script lang="ts">
+	// @ts-ignore
 	import QR from 'qrious'
 	import { t } from 'svelte-intl-precompile'
 

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

@@ -1,26 +1,27 @@
 <script lang="ts">
 	import { t } from 'svelte-intl-precompile'
 
-	import type { FileDTO } from '$lib/api'
 	import Button from '$lib/ui/Button.svelte'
 	import MaxSize from '$lib/ui/MaxSize.svelte'
+	import type { FileDTO } from 'cryptgeon/shared'
 
 	export let label: string = ''
 	export let files: FileDTO[] = []
 
-	function fileToDTO(file: File): FileDTO {
+	async function fileToDTO(file: File): Promise<FileDTO> {
 		return {
 			name: file.name,
 			size: file.size,
 			type: file.type,
-			contents: file,
+			contents: new Uint8Array(await file.arrayBuffer()),
 		}
 	}
 
 	async function onInput(e: Event) {
 		const input = e.target as HTMLInputElement
 		if (input?.files?.length) {
-			files = [...files, ...Array.from(input.files).map(fileToDTO)]
+			const toAdd = await Promise.all(Array.from(input.files).map(fileToDTO))
+			files = [...files, ...toAdd]
 		}
 	}
 
@@ -45,7 +46,7 @@
 					</div>
 				{/each}
 				<div class="spacer" />
-				<Button on:click={clear}>Clear</Button>
+				<Button on:click={clear}>{$t('file_upload.clear')}</Button>
 			</div>
 		{:else}
 			<div>

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

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

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

@@ -1,20 +1,21 @@
 <script lang="ts" context="module">
 	export type NoteResult = {
-		password: string
 		id: string
+		password?: string
 	}
 </script>
 
 <script lang="ts">
 	import { t } from 'svelte-intl-precompile'
-
+	import { status } from '$lib/stores/status'
 	import Button from '$lib/ui/Button.svelte'
 	import TextInput from '$lib/ui/TextInput.svelte'
 	import Canvas from './Canvas.svelte'
 
 	export let result: NoteResult
 
-	$: url = `${window.location.origin}/note/${result.id}#${result.password}`
+	let url = `${window.location.origin}/note/${result.id}`
+	if (result.password) url += `#${result.password}`
 
 	function reset() {
 		window.location.reload()
@@ -34,9 +35,11 @@
 	<Canvas value={url} />
 </div>
 
-<p>
+{#if $status?.theme_new_note_notice}
+	<p>
 		{@html $t('home.new_note_notice')}
-</p>
+	</p>
+{/if}
 <br />
 <Button on:click={reset}>{$t('home.new_note')}</Button>
 

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

@@ -1,16 +1,26 @@
 <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 DOMPurify from 'dompurify'
-	import { saveAs } from 'file-saver'
 	import prettyBytes from 'pretty-bytes'
 	import { t } from 'svelte-intl-precompile'
 
-	import type { FileDTO, NotePublic } from '$lib/api'
 	import Button from '$lib/ui/Button.svelte'
 	import { copy } from '$lib/utils'
+	import type { FileDTO, NotePublic } from 'cryptgeon/shared'
 
 	export let note: DecryptedNote
 
@@ -34,22 +44,29 @@
 		saveAs(f)
 	}
 
-	function contentWithLinks(content: string): string {
-		const replaced = content.replace(
-			RE_URL,
-			(url) => `<a href="${url}" rel="noreferrer">${url}</a>`
-		)
-		return DOMPurify.sanitize(replaced, { USE_PROFILES: { html: true } })
-	}
+	$: links = typeof note.contents === 'string' ? note.contents.match(RE_URL) : []
 </script>
 
 <p class="error-text">{@html $t('show.warning_will_not_see_again')}</p>
 <div data-testid="result">
 	{#if note.meta.type === 'text'}
 		<div class="note">
-			{@html contentWithLinks(note.contents)}
+			{note.contents}
 		</div>
 		<Button on:click={() => copy(note.contents)}>{$t('common.copy_clipboard')}</Button>
+
+		{#if links && links.length}
+			<div class="links">
+				{$t('show.links_found')}
+				<ul>
+					{#each links as link}
+						<li>
+							<a href={link} target="_blank" rel="noopener noreferrer">{link}</a>
+						</li>
+					{/each}
+				</ul>
+			</div>
+		{/if}
 	{:else}
 		{#each files as file}
 			<div class="note file">
@@ -92,4 +109,20 @@
 	.note.file small {
 		padding-left: 1rem;
 	}
+
+	.links {
+		margin-top: 2rem;
+	}
+	.links ul {
+		margin: 0;
+		padding: 0;
+		margin-top: 0.5rem;
+		padding-left: 1rem;
+		list-style: square;
+	}
+
+	.links ul li {
+		margin-bottom: 0.5rem;
+		word-wrap: break-word;
+	}
 </style>

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

@@ -4,43 +4,35 @@
 	export let color = true
 </script>
 
-<div {...$$restProps}>
-	<label class="switch">
+<label {...$$restProps}>
 	<small>{label}</small>
 	<input type="checkbox" bind:checked={value} />
 	<span class:color class="slider" />
-	</label>
-</div>
+</label>
 
 <style>
-	div {
-		height: 3.75rem;
-	}
-
-	.switch {
+	label {
 		position: relative;
 		display: inline-block;
-		width: 4rem;
-		height: 2.5rem;
 	}
 
-	.switch input {
-		opacity: 0;
-		width: 0;
-		height: 0;
+	label input {
+		display: none;
+	}
+
+	small {
+		display: block;
+		width: max-content;
 	}
 
 	.slider {
-		position: absolute;
+		display: block;
+		width: 4rem;
+		height: 2.5rem;
+		position: relative;
 		cursor: pointer;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
 		border: 2px solid var(--ui-bg-1);
 		background-color: var(--ui-bg-0);
-		transition: var(--ui-anim);
-		transform: translateY(1.2rem);
 	}
 
 	.slider:before {

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

@@ -1,7 +1,7 @@
 <script lang="ts">
-	import { Crypto, Hex } from '$lib/crypto'
 	import Icon from '$lib/ui/Icon.svelte'
 	import { copy as copyFN } from '$lib/utils'
+	import { getRandomBytes, Hex } from 'occulto'
 
 	export let label: string = ''
 	export let value: any
@@ -23,13 +23,14 @@
 	function toggle() {
 		hidden = !hidden
 	}
-	function randomFN() {
-		value = Hex.encode(Crypto.getRandomBytes(32))
+
+	async function randomFN() {
+		value = Hex.encode(await getRandomBytes(32))
 	}
 </script>
 
 <label>
-	<small disabled={$$restProps.disabled}>
+	<small class:disabled={$$restProps.disabled}>
 		{label}
 		{#if valid !== true}
 			<span class="error-text">{valid}</span>
@@ -38,13 +39,23 @@
 	<input bind:value {...$$restProps} class:valid={valid === true} />
 	<div class="icons">
 		{#if isPassword}
-			<Icon class="icon" icon={hidden ? 'eye' : 'eye-off'} on:click={toggle} />
+			<Icon
+				disabled={$$restProps.disabled}
+				class="icon"
+				icon={hidden ? 'eye' : 'eye-off'}
+				on:click={toggle}
+			/>
 		{/if}
 		{#if random}
-			<Icon class="icon" icon="dice" on:click={randomFN} />
+			<Icon disabled={$$restProps.disabled} class="icon" icon="dice" on:click={randomFN} />
 		{/if}
 		{#if copy}
-			<Icon class="icon" icon="copy" on:click={() => copyFN(value.toString())} />
+			<Icon
+				disabled={$$restProps.disabled}
+				class="icon"
+				icon="copy"
+				on:click={() => copyFN(value.toString())}
+			/>
 		{/if}
 	</div>
 </label>
@@ -53,6 +64,7 @@
 	label {
 		position: relative;
 		display: block;
+		width: 100%;
 	}
 
 	label > small {

packages/frontend/src/lib/utils.ts

@@ -1,11 +1,10 @@
-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) {
-	copyToClipboard(value)
+	window.navigator.clipboard.writeText(value)
 	const msg = get(t)('common.copied_to_clipboard')
 	notify.success(msg)
 }

packages/frontend/src/lib/views/Create.svelte

@@ -1,11 +1,8 @@
 <script lang="ts">
+	import { AES, Hex } from 'occulto'
 	import { t } from 'svelte-intl-precompile'
 	import { blur } from 'svelte/transition'
 
-	import { Adapters } from '$lib/adapters'
-	import type { FileDTO, Note } from '$lib/api'
-	import { create, PayloadToLargeError } from '$lib/api'
-	import { Keys } from '$lib/crypto'
 	import { status } from '$lib/stores/status'
 	import { notify } from '$lib/toast'
 	import AdvancedParameters from '$lib/ui/AdvancedParameters.svelte'
@@ -16,6 +13,7 @@
 	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'
 
 	let note: Note = {
 		contents: '',
@@ -28,6 +26,7 @@
 	let advanced = false
 	let isFile = false
 	let timeExpiration = false
+	let customPassword: string | null = null
 	let description = ''
 	let loading: string | null = null
 
@@ -58,13 +57,14 @@
 		try {
 			loading = $t('common.encrypting')
 
-			const key = await Keys.generateKey()
-			const password = await Keys.export(key)
+			const derived = customPassword && (await AES.derive(customPassword))
+			const key = derived ? derived[0] : await AES.generateKey()
 
 			const data: Note = {
 				contents: '',
 				meta: note.meta,
 			}
+			if (derived) data.meta.derivation = derived[1]
 			if (isFile) {
 				if (files.length === 0) throw new EmptyContentError()
 				data.contents = await Adapters.Files.encrypt(files, key)
@@ -76,10 +76,10 @@
 			else data.views = parseInt(note.views as any)
 
 			loading = $t('common.uploading')
-			const response = await create(data)
+			const response = await API.create(data)
 			result = {
-				password: password,
 				id: response.id,
+				password: customPassword ? undefined : Hex.encode(key),
 			}
 			notify.success($t('home.messages.note_created'))
 		} catch (e) {
@@ -117,12 +117,14 @@
 			{/if}
 
 			<div class="bottom">
+				{#if $status?.allow_files}
 					<Switch
 						data-testid="switch-file"
 						class="file"
 						label={$t('common.file')}
 						bind:value={isFile}
 					/>
+				{/if}
 				{#if $status?.allow_advanced}
 					<Switch
 						data-testid="switch-advanced"
@@ -148,9 +150,9 @@
 			</p>
 
 			{#if advanced}
-				<div transition:blur={{ duration: 250 }}>
-					<br />
-					<AdvancedParameters bind:note bind:timeExpiration />
+				<div transition:blur|global={{ duration: 250 }}>
+					<hr />
+					<AdvancedParameters bind:note bind:timeExpiration bind:customPassword />
 				</div>
 			{/if}
 		</fieldset>

packages/frontend/src/lib/views/Footer.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
 	import ThemeToggle from '$lib/ui/ThemeToggle.svelte'
+        import { status } from '$lib/stores/status'
 </script>
 
 <footer>
@@ -7,6 +8,11 @@
 	<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>
@@ -23,6 +29,7 @@
 		right: 0;
 		width: 100%;
 		background-color: var(--ui-bg-0-85);
+		backdrop-filter: blur(2px);
 	}
 
 	a {

packages/frontend/src/lib/views/Header.svelte

@@ -1,9 +1,13 @@
 <script lang="ts">
 	import { status } from '$lib/stores/status'
+
+	function reset() {
+		window.location.reload()
+	}
 </script>
 
 <header>
-	<a href="/">
+	<a on:click={reset} href="/">
 		{#if $status?.theme_image}
 			<img alt="logo" src={$status.theme_image} />
 		{:else}

packages/frontend/src/routes/about/+page.svelte

@@ -40,8 +40,8 @@
 			<br />
 			you are welcomed to check & audit the
 			<a href="https://github.com/cupcakearmy/cryptgeon" target="_blank" rel="noopener noreferrer">
-				source code
-			</a>.
+				source code</a
+			>.
 		</span>
 	</AboutParagraph>
 
@@ -75,6 +75,9 @@
 <style>
 	section {
 		width: 100%;
+		display: flex;
+		flex-direction: column;
+		gap: 2rem;
 	}
 
 	ul {

packages/frontend/src/routes/imprint/+page.svelte

@@ -0,0 +1,35 @@
+<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>

packages/frontend/src/routes/note/[id]/+page.svelte

@@ -1,31 +1,35 @@
 <script lang="ts">
+	import { AES, Hex } from 'occulto'
 	import { onMount } from 'svelte'
 	import { t } from 'svelte-intl-precompile'
 
-	import { Adapters } from '$lib/adapters'
-	import { get, info } from '$lib/api'
-	import { Keys } from '$lib/crypto'
 	import Button from '$lib/ui/Button.svelte'
 	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 type { PageData } from './$types'
 
 	export let data: PageData
 
 	let id = data.id
-	let password: string
+	let password: string | null = null
 	let note: DecryptedNote | null = null
 	let exists = false
+	let meta: NoteMeta | null = null
 
 	let loading: string | null = null
 	let error: string | null = null
 
+	$: valid = !!password?.length
+
 	onMount(async () => {
 		// Check if note exists
 		try {
 			loading = $t('common.loading')
 			password = window.location.hash.slice(1)
-			await info(id)
+			const note = await API.info(id)
+			meta = note.meta
 			exists = true
 		} catch {
 			exists = false
@@ -39,11 +43,18 @@
 	 */
 	async function show() {
 		try {
+			if (!valid) {
+				error = $t('show.errors.no_password')
+				return
+			}
+
+			// Load note
 			error = null
 			loading = $t('common.downloading')
-			const data = await get(id)
+			const data = await API.get(id)
 			loading = $t('common.decrypting')
-			const key = await Keys.import(password)
+			const derived = meta?.derivation && (await AES.derive(password!, meta.derivation))
+			const key = derived ? derived[0] : Hex.decode(password!)
 			switch (data.meta.type) {
 				case 'text':
 					note = {
@@ -78,9 +89,18 @@
 		<form on:submit|preventDefault={show}>
 			<fieldset>
 				<p>{$t('show.explanation')}</p>
-				<Button data-testid="show-note-button" type="submit">{$t('show.show_note')}</Button>
+				{#if meta?.derivation}
+					<TextInput
+						data-testid="show-note-password"
+						type="password"
+						bind:value={password}
+						label={$t('common.password')}
+					/>
+				{/if}
+				<Button disabled={!valid} data-testid="show-note-button" type="submit"
+					>{$t('show.show_note')}</Button
+				>
 				{#if error}
-					<br />
 					<p class="error-text">
 						{error}
 						<br />
@@ -98,4 +118,10 @@
 	.loader {
 		text-align: center;
 	}
+
+	fieldset {
+		display: flex;
+		flex-direction: column;
+		gap: 1rem;
+	}
 </style>

packages/frontend/svelte.config.js

@@ -1,9 +1,9 @@
 import adapter from '@sveltejs/adapter-static'
-import preprocess from 'svelte-preprocess'
+import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin'
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
 
 export default {
-	preprocess: preprocess(),
-
+	preprocess: vitePreprocess([precompileIntl('locales')]),
 	kit: {
 		adapter: adapter({
 			fallback: 'index.html',

packages/frontend/vite.config.js

@@ -1,12 +1,13 @@
 import { sveltekit } from '@sveltejs/kit/vite'
 import precompileIntl from 'svelte-intl-precompile/sveltekit-plugin'
 
+const port = 8001
+
 /** @type {import('vite').UserConfig} */
 const config = {
 	clearScreen: false,
-	server: {
-		port: 3000,
-	},
+	server: { port },
+	preview: { port },
 	plugins: [sveltekit(), precompileIntl('locales')],
 }
 

packages/proxy/package.json

@@ -0,0 +1,12 @@
+{
+  "private": true,
+  "name": "@cryptgeon/proxy",
+  "type": "module",
+  "main": "./proxy.js",
+  "scripts": {
+    "dev": "node ."
+  },
+  "dependencies": {
+    "http-proxy": "^1.18.1"
+  }
+}

packages/proxy/proxy.js

@@ -9,8 +9,8 @@ proxy.on('error', function (err, req, res) {
 })
 
 const server = http.createServer(function (req, res) {
-  const target = req.url.startsWith('/api/') ? 'http://127.0.0.1:5000' : 'http://localhost:3000'
-  proxy.web(req, res, { target })
+  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(1234)
-console.log('Proxy on http://localhost:1234')
+server.listen(3000)
+console.log('Proxy on http://localhost:3000')

playwright.config.ts

@@ -3,18 +3,19 @@ import { devices, type PlaywrightTestConfig } from '@playwright/test'
 const config: PlaywrightTestConfig = {
   use: {
     video: 'retain-on-failure',
-    baseURL: 'http://localhost:1234',
-    actionTimeout: 60_000,
+    baseURL: 'http://localhost:3000',
+    actionTimeout: 30_000,
   },
 
   outputDir: './test-results',
   testDir: './test',
-  timeout: 60_000,
-  testIgnore: ['file/too-big.spec.ts'],
+  timeout: 30_000,
+  fullyParallel: true,
+  retries: 2,
 
   webServer: {
-    command: 'docker compose -f docker-compose.dev.yaml up',
-    port: 1234,
+    command: 'pnpm run docker:up',
+    port: 3000,
     reuseExistingServer: true,
   },
 
@@ -22,11 +23,6 @@ const config: PlaywrightTestConfig = {
     { name: 'chrome', use: { ...devices['Desktop Chrome'] } },
     { name: 'firefox', use: { ...devices['Desktop Firefox'] } },
     { name: 'safari', use: { ...devices['Desktop Safari'] } },
-    {
-      name: 'local',
-      use: { ...devices['Desktop Chrome'] },
-      // testMatch: 'file/too-big.spec.ts',
-    },
   ],
 }
 

test/cli/file/simple.spec.ts

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

test/cli/text/simple.spec.ts

@@ -0,0 +1,23 @@
+import { test } from '@playwright/test'
+import { CLI, getLinkFromCLI } from '../../utils'
+
+test.describe('text @cli', () => {
+  test('simple', async () => {
+    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)
+
+    const retrieved = await CLI('open', link)
+    test.expect(retrieved.stdout.trim()).toBe(text)
+  })
+
+  test('simple with password', async () => {
+    const text = `Endless prejudice endless play derive joy eternal-return selfish burying.`
+    const password = 'password'
+    const note = await CLI('send', 'text', text, '--password', password)
+    const link = getLinkFromCLI(note.stdout)
+
+    const retrieved = await CLI('open', link, '--password', password)
+    test.expect(retrieved.stdout.trim()).toBe(text)
+  })
+})

test/cross/file/simple.spec.ts

@@ -0,0 +1,54 @@
+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'
+
+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'
+
+test.describe('text @cross', () => {
+  test('cli to web', async ({ page }) => {
+    const file = await tmpFile(Files.Image)
+    const checksum = await getFileChecksum(file)
+    const note = await CLI('send', 'file', file)
+    const link = getLinkFromCLI(note.stdout)
+    await rm(file)
+
+    await checkLinkForDownload(page, { link, text: basename(file), checksum })
+  })
+
+  test('cli to web with password', async ({ page }) => {
+    const file = await tmpFile(Files.Image)
+    const checksum = await getFileChecksum(file)
+    const note = await CLI('send', 'file', file, '--password', password)
+    const link = getLinkFromCLI(note.stdout)
+    await rm(file)
+
+    await checkLinkForDownload(page, { link, text: basename(file), checksum, password })
+  })
+
+  test('web to cli', async ({ page }) => {
+    const files = [Files.Image]
+    const checksum = await getFileChecksum(files[0])
+    const link = await createNoteSuccessfully(page, { files })
+
+    const filename = basename(files[0])
+    await CLI('open', link, '--all')
+    const c = await getFileChecksum(filename)
+    await rm(basename(filename))
+    test.expect(checksum).toBe(c)
+  })
+
+  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 filename = basename(files[0])
+    await CLI('open', link, '--all', '--password', password)
+    const c = await getFileChecksum(filename)
+    await rm(basename(filename))
+    test.expect(checksum).toBe(c)
+  })
+})

test/cross/text/simple.spec.ts

@@ -0,0 +1,32 @@
+import { test } from '@playwright/test'
+import { CLI, checkLinkForText, 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'
+
+test.describe('text @cross', () => {
+  test('cli to web', async ({ page }) => {
+    const note = await CLI('send', 'text', text)
+    const link = getLinkFromCLI(note.stdout)
+
+    await checkLinkForText(page, { link, text })
+  })
+
+  test('web to cli', async ({ page }) => {
+    const link = await createNoteSuccessfully(page, { text })
+    const retrieved = await CLI('open', link)
+    test.expect(retrieved.stdout.trim()).toBe(text)
+  })
+
+  test('cli to web with password', async ({ page }) => {
+    const note = await CLI('send', 'text', text, '--password', password)
+    const link = getLinkFromCLI(note.stdout)
+    await checkLinkForText(page, { link, text, password })
+  })
+
+  test('web to cli with password', async ({ page }) => {
+    const link = await createNoteSuccessfully(page, { text, password })
+    const retrieved = await CLI('open', link, '--password', password)
+    test.expect(retrieved.stdout.trim()).toBe(text)
+  })
+})

test/file/files.ts

@@ -1,5 +0,0 @@
-export default {
-  PDF: 'test/assets/AES.pdf',
-  Image: 'test/assets/image.jpg',
-  Zip: 'test/assets/Pigeons.zip',
-}

test/file/multiple.spec.ts

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

test/file/simple.spec.ts

@@ -1,24 +0,0 @@
-import { test } from '@playwright/test'
-import { checkLinkDoesNotExist, checkLinkForDownload, checkLinkForText, createNote, getFileChecksum } from '../utils'
-import Files from './files'
-
-test('simple pdf', async ({ page }) => {
-  const files = [Files.PDF]
-  const link = await createNote(page, { files })
-  await checkLinkForText(page, link, 'AES.pdf')
-  await checkLinkDoesNotExist(page, link)
-})
-
-test('pdf content', async ({ page }) => {
-  const files = [Files.PDF]
-  const checksum = await getFileChecksum(files[0])
-  const link = await createNote(page, { files })
-  await checkLinkForDownload(page, link, 'AES.pdf', checksum)
-})
-
-test('image content', async ({ page }) => {
-  const files = [Files.Image]
-  const checksum = await getFileChecksum(files[0])
-  const link = await createNote(page, { files })
-  await checkLinkForDownload(page, link, 'image.jpg', checksum)
-})

test/file/too-big.spec.ts

@@ -1,8 +0,0 @@
-import { test } from '@playwright/test'
-import { createNote } from '../utils'
-import Files from './files'
-
-test('to big zip', async ({ page }) => {
-  const files = [Files.Zip]
-  const link = await createNote(page, { files, error: 'note is to big' })
-})

test/files.ts

@@ -0,0 +1,20 @@
+import { createHash } from 'node:crypto'
+import { cp, readFile } from 'node:fs/promises'
+
+export const Files = {
+  PDF: 'test/assets/AES.pdf',
+  Image: 'test/assets/image.jpg',
+  Zip: 'test/assets/Pigeons.zip',
+}
+
+export async function getFileChecksum(file: string) {
+  const buffer = await readFile(file)
+  const hash = createHash('sha3-256').update(buffer).digest('hex')
+  return hash
+}
+
+export async function tmpFile(file: string) {
+  const name = `./tmp/${Math.random().toString(36).substring(7)}`
+  await cp(file, name)
+  return name
+}

test/text.ts

@@ -1,37 +0,0 @@
-import { expect, test, type Page } from '@playwright/test'
-
-async function createNote(page: Page, text: string): Promise<string> {
-  await page.goto('/')
-  await page.locator('textarea').click()
-  await page.locator('textarea').fill(text)
-  await page.locator('button:has-text("create")').click()
-
-  await page.locator('[data-testid="share-link"]').click()
-  const shareLink = await page.locator('[data-testid="share-link"]').inputValue()
-  return shareLink
-}
-
-async function checkLinkForText(page: Page, link: string, text: string) {
-  await page.goto(link)
-  await page.locator('[data-testid="show-note-button"]').click()
-  expect(await page.locator('[data-testid="result"] >> .note').innerText()).toBe(text)
-}
-
-async function checkLinkDoesNotExist(page: Page, link: string) {
-  await page.goto('/') // Required due to firefox: https://github.com/microsoft/playwright/issues/15781
-  await page.goto(link)
-  await expect(page.locator('main')).toContainText('note was not found or was already deleted')
-}
-
-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 shareLink = await createNote(page, text)
-  await checkLinkForText(page, shareLink, text)
-})
-
-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 shareLink = await createNote(page, text)
-  await checkLinkForText(page, shareLink, text)
-  await checkLinkDoesNotExist(page, shareLink)
-})