Merge branch 'main' into feat/tree/new_window

Currently translated at 100.0% (152 of 152 strings)

Translation: Trilium Notes/Website
Translate-URL: https://hosted.weblate.org/projects/trilium/website/es/

.github/workflows/deploy-app.yml

@@ -1,65 +0,0 @@
-name: Deploy Standalone App
-
-on:
-  # Trigger on push to main branch
-  push:
-    branches:
-      - main
-    # Only run when docs files change
-    paths:
-      - 'apps/client/**'
-      - 'apps/client-standalone/**'
-      - 'packages/trilium-core/**'
-
-  # Allow manual triggering from Actions tab
-  workflow_dispatch:
-
-  # Run on pull requests for preview deployments
-  pull_request:
-    paths:
-      - 'apps/client/**'
-      - 'apps/client-standalone/**'
-      - 'packages/trilium-core/**'
-jobs:
-  build-and-deploy:
-    name: Build and Deploy App
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    # Required permissions for deployment
-    permissions:
-      contents: read
-      deployments: write
-      pull-requests: write # For PR preview comments
-      id-token: write # For OIDC authentication (if needed)
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v6
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: '24'
-          cache: 'pnpm'
-
-      - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Trigger build of app
-        run: pnpm --filter=client-standalone build
-
-      - name: Deploy
-        uses: ./.github/actions/deploy-to-cloudflare-pages
-        if: github.repository == ${{ vars.REPO_MAIN }}
-        with:
-          project_name: "trilium-app"
-          comment_body: "🖥️ App preview is ready"
-          production_url: "https://app.triliumnotes.org"
-          deploy_dir: "apps/client-standalone/dist"
-          cloudflare_api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          cloudflare_account_id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -11,6 +11,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  sanity-check:
+    name: Sanity Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Check version consistency
+        run: pnpm tsx ${{ github.workspace }}/scripts/check-version-consistency.ts ${{ github.ref_name }}
   make-electron:
     name: Make Electron
     strategy:

apps/client-standalone/package.json

@@ -1,86 +0,0 @@
-{
-  "name": "@triliumnext/client-standalone",
-  "version": "1.0.0",
-  "description": "Standalone client for TriliumNext with SQLite WASM backend",
-  "private": true,
-  "license": "AGPL-3.0-only",
-  "scripts": {
-    "build": "cross-env NODE_OPTIONS=--max-old-space-size=4096 vite build",
-    "dev": "vite dev",
-    "test": "vitest",
-    "start-prod": "pnpm build && pnpm http-server dist -p 8888",
-    "coverage": "vitest --coverage"
-  },
-  "dependencies": {
-    "@excalidraw/excalidraw": "0.18.0",
-    "@fullcalendar/core": "6.1.20",
-    "@fullcalendar/daygrid": "6.1.20",
-    "@fullcalendar/interaction": "6.1.20",
-    "@fullcalendar/list": "6.1.20",
-    "@fullcalendar/multimonth": "6.1.20",
-    "@fullcalendar/timegrid": "6.1.20",
-    "@maplibre/maplibre-gl-leaflet": "0.1.3",
-    "@mermaid-js/layout-elk": "0.2.0",
-    "@mind-elixir/node-menu": "5.0.1",
-    "@popperjs/core": "2.11.8",
-    "@preact/signals": "2.5.1",
-    "@sqlite.org/sqlite-wasm": "3.51.1-build2",
-    "@triliumnext/ckeditor5": "workspace:*",
-    "@triliumnext/codemirror": "workspace:*",
-    "@triliumnext/commons": "workspace:*",
-    "@triliumnext/core": "workspace:*",
-    "@triliumnext/highlightjs": "workspace:*",
-    "@triliumnext/share-theme": "workspace:*",
-    "@triliumnext/split.js": "workspace:*",
-    "@zumer/snapdom": "2.0.1",
-    "autocomplete.js": "0.38.1",
-    "bootstrap": "5.3.8",
-    "boxicons": "2.1.4",
-    "clsx": "2.1.1",
-    "color": "5.0.3",
-    "debounce": "3.0.0",
-    "draggabilly": "3.0.0",
-    "force-graph": "1.51.0",
-    "globals": "17.0.0",
-    "i18next": "25.7.3",
-    "i18next-http-backend": "3.0.2",
-    "jquery": "3.7.1",
-    "jquery.fancytree": "2.38.5",
-    "js-sha1": "0.7.0",
-    "js-sha512": "0.9.0",
-    "jsplumb": "2.15.6",
-    "katex": "0.16.27",
-    "knockout": "3.5.1",
-    "leaflet": "1.9.4",
-    "leaflet-gpx": "2.2.0",
-    "mark.js": "8.11.1",
-    "marked": "17.0.1",
-    "mermaid": "11.12.2",
-    "mind-elixir": "5.4.0",
-    "normalize.css": "8.0.1",
-    "panzoom": "9.4.3",
-    "preact": "10.28.1",
-    "react-i18next": "16.5.1",
-    "react-window": "2.2.3",
-    "reveal.js": "5.2.1",
-    "svg-pan-zoom": "3.6.2",
-    "tabulator-tables": "6.3.1",
-    "vanilla-js-wheel-zoom": "9.0.4"
-  },
-  "devDependencies": {
-    "@ckeditor/ckeditor5-inspector": "5.0.0",
-    "@preact/preset-vite": "2.10.2",
-    "@types/bootstrap": "5.2.10",
-    "@types/jquery": "3.5.33",
-    "@types/leaflet": "1.9.21",
-    "@types/leaflet-gpx": "1.3.8",
-    "@types/mark.js": "8.11.12",
-    "@types/reveal.js": "5.2.2",
-    "@types/tabulator-tables": "6.3.1",
-    "copy-webpack-plugin": "13.0.1",
-    "cross-env": "7.0.3",
-    "happy-dom": "20.0.11",
-    "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "3.1.4"
-  }
-}

apps/client-standalone/public/_headers

@@ -1,3 +0,0 @@
-/*
-  Cross-Origin-Opener-Policy: same-origin
-  Cross-Origin-Embedder-Policy: require-corp

apps/client-standalone/src/desktop.ts

@@ -1,2 +0,0 @@
-// Re-export desktop from client
-export * from "../../client/src/desktop";

apps/client-standalone/src/index.html

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <link rel="shortcut icon" href="favicon.ico">
-        <meta name="mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover" />
-        <!-- <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest"> -->
-        <title>Trilium Notes</title>
-    </head>
-
-    <body id="trilium-app">
-        <noscript><%= t("javascript-required") %></noscript>
-
-        <script>
-            // hide body to reduce flickering on the startup. This is done through JS and not CSS to not hide <noscript>
-            document.getElementsByTagName("body")[0].style.display = "none";
-        </script>
-
-        <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>
-
-        <!-- Required for match the PWA's top bar color with the theme -->
-        <!-- This works even when the user directly changes --root-background in CSS -->
-        <div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>
-
-        <!-- Bootstrap (request server for required information) -->
-        <script src="./main.ts" type="module"></script>
-
-        <!-- Required for correct loading of scripts in Electron -->
-        <script>
-            if (typeof module === 'object') {window.module = module; module = undefined;}
-        </script>
-    </body>
-</html>

apps/client-standalone/src/lightweight/browser_router.ts

@@ -1,254 +0,0 @@
-/**
- * Browser-compatible router that mimics Express routing patterns.
- * Supports path parameters (e.g., /api/notes/:noteId) and query strings.
- */
-
-import { getContext, routes } from "@triliumnext/core";
-
-export interface BrowserRequest {
-    method: string;
-    url: string;
-    path: string;
-    params: Record<string, string>;
-    query: Record<string, string | undefined>;
-    body?: unknown;
-}
-
-export interface BrowserResponse {
-    status: number;
-    headers: Record<string, string>;
-    body: ArrayBuffer | null;
-}
-
-export type RouteHandler = (req: BrowserRequest) => unknown | Promise<unknown>;
-
-interface Route {
-    method: string;
-    pattern: RegExp;
-    paramNames: string[];
-    handler: RouteHandler;
-}
-
-const encoder = new TextEncoder();
-
-/**
- * Convert an Express-style path pattern to a RegExp.
- * Supports :param syntax for path parameters.
- *
- * Examples:
- *   /api/notes/:noteId -> /^\/api\/notes\/([^\/]+)$/
- *   /api/notes/:noteId/revisions -> /^\/api\/notes\/([^\/]+)\/revisions$/
- */
-function pathToRegex(path: string): { pattern: RegExp; paramNames: string[] } {
-    const paramNames: string[] = [];
-
-    // Escape special regex characters except for :param patterns
-    const regexPattern = path
-        .replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // Escape special chars
-        .replace(/:([a-zA-Z_][a-zA-Z0-9_]*)/g, (_, paramName) => {
-            paramNames.push(paramName);
-            return '([^/]+)';
-        });
-
-    return {
-        pattern: new RegExp(`^${regexPattern}$`),
-        paramNames
-    };
-}
-
-/**
- * Parse query string into an object.
- */
-function parseQuery(search: string): Record<string, string | undefined> {
-    const query: Record<string, string | undefined> = {};
-    if (!search || search === '?') return query;
-
-    const params = new URLSearchParams(search);
-    for (const [key, value] of params) {
-        query[key] = value;
-    }
-    return query;
-}
-
-/**
- * Convert a result to a JSON response.
- */
-function jsonResponse(obj: unknown, status = 200, extraHeaders: Record<string, string> = {}): BrowserResponse {
-    const parsedObj = routes.convertEntitiesToPojo(obj);
-    const body = encoder.encode(JSON.stringify(parsedObj)).buffer as ArrayBuffer;
-    return {
-        status,
-        headers: { "content-type": "application/json; charset=utf-8", ...extraHeaders },
-        body
-    };
-}
-
-/**
- * Convert a string to a text response.
- */
-function textResponse(text: string, status = 200, extraHeaders: Record<string, string> = {}): BrowserResponse {
-    const body = encoder.encode(text).buffer as ArrayBuffer;
-    return {
-        status,
-        headers: { "content-type": "text/plain; charset=utf-8", ...extraHeaders },
-        body
-    };
-}
-
-/**
- * Browser router class that handles route registration and dispatching.
- */
-export class BrowserRouter {
-    private routes: Route[] = [];
-
-    /**
-     * Register a route handler.
-     */
-    register(method: string, path: string, handler: RouteHandler): void {
-        const { pattern, paramNames } = pathToRegex(path);
-        this.routes.push({
-            method: method.toUpperCase(),
-            pattern,
-            paramNames,
-            handler
-        });
-    }
-
-    /**
-     * Convenience methods for common HTTP methods.
-     */
-    get(path: string, handler: RouteHandler): void {
-        this.register('GET', path, handler);
-    }
-
-    post(path: string, handler: RouteHandler): void {
-        this.register('POST', path, handler);
-    }
-
-    put(path: string, handler: RouteHandler): void {
-        this.register('PUT', path, handler);
-    }
-
-    patch(path: string, handler: RouteHandler): void {
-        this.register('PATCH', path, handler);
-    }
-
-    delete(path: string, handler: RouteHandler): void {
-        this.register('DELETE', path, handler);
-    }
-
-    /**
-     * Dispatch a request to the appropriate handler.
-     */
-    async dispatch(method: string, urlString: string, body?: unknown, headers?: Record<string, string>): Promise<BrowserResponse> {
-        const url = new URL(urlString);
-        const path = url.pathname;
-        const query = parseQuery(url.search);
-        const upperMethod = method.toUpperCase();
-
-        // Parse JSON body if it's an ArrayBuffer and content-type suggests JSON
-        let parsedBody = body;
-        if (body instanceof ArrayBuffer && headers) {
-            const contentType = headers['content-type'] || headers['Content-Type'] || '';
-            if (contentType.includes('application/json')) {
-                try {
-                    const text = new TextDecoder().decode(body);
-                    if (text.trim()) {
-                        parsedBody = JSON.parse(text);
-                    }
-                } catch (e) {
-                    console.warn('[Router] Failed to parse JSON body:', e);
-                    // Keep original body if JSON parsing fails
-                    parsedBody = body;
-                }
-            }
-        }
-        // Find matching route
-        for (const route of this.routes) {
-            if (route.method !== upperMethod) continue;
-
-            const match = path.match(route.pattern);
-            if (!match) continue;
-
-            // Extract path parameters
-            const params: Record<string, string> = {};
-            for (let i = 0; i < route.paramNames.length; i++) {
-                params[route.paramNames[i]] = decodeURIComponent(match[i + 1]);
-            }
-
-            const request: BrowserRequest = {
-                method: upperMethod,
-                url: urlString,
-                path,
-                params,
-                query,
-                body: parsedBody
-            };
-
-            try {
-                const result = await getContext().init(async () => await route.handler(request));
-                return this.formatResult(result);
-            } catch (error) {
-                return this.formatError(error, `Error handling ${method} ${path}`);
-            }
-        }
-
-        // No route matched
-        return textResponse(`Not found: ${method} ${path}`, 404);
-    }
-
-    /**
-     * Format a handler result into a response.
-     * Follows the same patterns as the server's apiResultHandler.
-     */
-    private formatResult(result: unknown): BrowserResponse {
-        // Handle [statusCode, response] format
-        if (Array.isArray(result) && result.length > 0 && Number.isInteger(result[0])) {
-            const [statusCode, response] = result;
-            return jsonResponse(response, statusCode);
-        }
-
-        // Handle undefined (no content) - 204 should have no body
-        if (result === undefined) {
-            return {
-                status: 204,
-                headers: {},
-                body: null
-            };
-        }
-
-        // Default: JSON response with 200
-        return jsonResponse(result, 200);
-    }
-
-    /**
-     * Format an error into a response.
-     */
-    private formatError(error: unknown, context: string): BrowserResponse {
-        console.error('[Router] Handler error:', context, error);
-
-        // Check for known error types
-        if (error && typeof error === 'object') {
-            const err = error as { constructor?: { name?: string }; message?: string };
-
-            if (err.constructor?.name === 'NotFoundError') {
-                return jsonResponse({ message: err.message || 'Not found' }, 404);
-            }
-
-            if (err.constructor?.name === 'ValidationError') {
-                return jsonResponse({ message: err.message || 'Validation error' }, 400);
-            }
-        }
-
-        // Generic error
-        const message = error instanceof Error ? error.message : String(error);
-        return jsonResponse({ message }, 500);
-    }
-}
-
-/**
- * Create a new router instance.
- */
-export function createRouter(): BrowserRouter {
-    return new BrowserRouter();
-}

apps/client-standalone/src/lightweight/browser_routes.ts

@@ -1,92 +0,0 @@
-/**
- * Browser route definitions.
- * This integrates with the shared route builder from @triliumnext/core.
- */
-
-import { routes, icon_packs as iconPackService } from '@triliumnext/core';
-import { BrowserRouter, type BrowserRequest } from './browser_router';
-
-type HttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete';
-
-/**
- * Wraps a core route handler to work with the BrowserRouter.
- * Core handlers expect an Express-like request object with params, query, and body.
- */
-function wrapHandler(handler: (req: any) => unknown) {
-    return (req: BrowserRequest) => {
-        // Create an Express-like request object
-        const expressLikeReq = {
-            params: req.params,
-            query: req.query,
-            body: req.body
-        };
-        return handler(expressLikeReq);
-    };
-}
-
-/**
- * Creates an apiRoute function compatible with buildSharedApiRoutes.
- * This bridges the core's route registration to the BrowserRouter.
- */
-function createApiRoute(router: BrowserRouter) {
-    return (method: HttpMethod, path: string, handler: (req: any) => unknown) => {
-        router.register(method, path, wrapHandler(handler));
-    };
-}
-
-/**
- * Register all API routes on the browser router using the shared builder.
- *
- * @param router - The browser router instance
- */
-export function registerRoutes(router: BrowserRouter): void {
-    const apiRoute = createApiRoute(router);
-    routes.buildSharedApiRoutes(apiRoute);
-    apiRoute('get', '/bootstrap', bootstrapRoute);
-
-    // Dummy routes for compatibility.
-    apiRoute("get", "/api/script/widgets", () => []);
-    apiRoute("get", "/api/script/startup", () => []);
-    apiRoute("get", "/api/system-checks", () => ({ isCpuArchMismatch: false }))
-    apiRoute("get", "/api/search/:searchString", () => []);
-    apiRoute("get", "/api/search-templates", () => []);
-    apiRoute("get", "/api/autocomplete", () => []);
-}
-
-function bootstrapRoute() {
-   const iconPacks = iconPackService.getIconPacks();
-   const assetPath = ".";
-
-   return {
-        triliumVersion: "1.2.3",
-        assetPath,
-        baseApiUrl: "../api/",
-        themeCssUrl: null,
-        themeUseNextAsBase: "next",
-        device: "desktop",
-        headingStyle: "default",
-        layoutOrientation: "vertical",
-        platform: "web",
-        isElectron: false,
-        isStandalone: true,
-        hasNativeTitleBar: false,
-        hasBackgroundEffects: true,
-        currentLocale: { id: "en", rtl: false },
-        iconPackCss: iconPacks
-            .map(p => iconPackService.generateCss(p, p.builtin
-                ? `${assetPath}/fonts/${p.fontAttachmentId}.${iconPackService.MIME_TO_EXTENSION_MAPPINGS[p.fontMime]}`
-                : `api/attachments/download/${p.fontAttachmentId}`))
-            .filter(Boolean)
-            .join("\n\n"),
-        iconRegistry: iconPackService.generateIconRegistry(iconPacks),
-    };
-}
-
-/**
- * Create and configure a router with all routes registered.
- */
-export function createConfiguredRouter(): BrowserRouter {
-    const router = new BrowserRouter();
-    registerRoutes(router);
-    return router;
-}

apps/client-standalone/src/lightweight/cls_provider.ts

@@ -1,46 +0,0 @@
-import { ExecutionContext } from "@triliumnext/core";
-
-export default class BrowserExecutionContext implements ExecutionContext {
-    private store: Map<string, any> | null = null;
-
-    get<T = any>(key: string): T | undefined {
-        return this.store?.get(key);
-    }
-
-    set(key: string, value: any): void {
-        if (!this.store) {
-            throw new Error("ExecutionContext not initialized");
-        }
-        this.store.set(key, value);
-    }
-
-    reset(): void {
-        this.store = null;
-    }
-
-    init<T>(callback: () => T): T {
-        // Create a fresh context for this request
-        const prev = this.store;
-        this.store = new Map();
-
-        try {
-            const result = callback();
-            
-            // If the result is a Promise, we need to handle cleanup after it resolves
-            if (result && typeof result === 'object' && 'then' in result && 'catch' in result) {
-                const promise = result as unknown as Promise<any>;
-                return promise.finally(() => {
-                    this.store = prev;
-                }) as T;
-            } else {
-                // Synchronous result, clean up immediately
-                this.store = prev;
-                return result;
-            }
-        } catch (error) {
-            // Always clean up on error (for synchronous errors)
-            this.store = prev;
-            throw error;
-        }
-    }
-}

apps/client-standalone/src/lightweight/crypto_provider.ts

@@ -1,145 +0,0 @@
-import type { CryptoProvider } from "@triliumnext/core";
-import { sha1 } from "js-sha1";
-import { sha512 } from "js-sha512";
-
-interface Cipher {
-    update(data: Uint8Array): Uint8Array;
-    final(): Uint8Array;
-}
-
-const CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-/**
- * Crypto provider for browser environments using the Web Crypto API.
- */
-export default class BrowserCryptoProvider implements CryptoProvider {
-
-    createHash(algorithm: "sha1" | "sha512", content: string | Uint8Array): Uint8Array {
-        const data = typeof content === "string" ? content :
-                new TextDecoder().decode(content);
-
-        const hexHash = algorithm === "sha1" ? sha1(data) : sha512(data);
-
-        // Convert hex string to Uint8Array
-        const bytes = new Uint8Array(hexHash.length / 2);
-        for (let i = 0; i < hexHash.length; i += 2) {
-            bytes[i / 2] = parseInt(hexHash.substr(i, 2), 16);
-        }
-        return bytes;
-    }
-
-    createCipheriv(algorithm: "aes-128-cbc", key: Uint8Array, iv: Uint8Array): Cipher {
-        // Web Crypto API doesn't support streaming cipher like Node.js
-        // We need to implement a wrapper that collects data and encrypts on final()
-        return new WebCryptoCipher(algorithm, key, iv, "encrypt");
-    }
-
-    createDecipheriv(algorithm: "aes-128-cbc", key: Uint8Array, iv: Uint8Array): Cipher {
-        return new WebCryptoCipher(algorithm, key, iv, "decrypt");
-    }
-
-    randomBytes(size: number): Uint8Array {
-        const bytes = new Uint8Array(size);
-        crypto.getRandomValues(bytes);
-        return bytes;
-    }
-
-    randomString(length: number): string {
-        const bytes = this.randomBytes(length);
-        let result = "";
-        for (let i = 0; i < length; i++) {
-            result += CHARS[bytes[i] % CHARS.length];
-        }
-        return result;
-    }
-}
-
-/**
- * A cipher implementation that wraps Web Crypto API.
- * Note: This buffers all data until final() is called, which differs from
- * Node.js's streaming cipher behavior.
- */
-class WebCryptoCipher implements Cipher {
-    private chunks: Uint8Array[] = [];
-    private algorithm: string;
-    private key: Uint8Array;
-    private iv: Uint8Array;
-    private mode: "encrypt" | "decrypt";
-    private finalized = false;
-
-    constructor(
-        algorithm: "aes-128-cbc",
-        key: Uint8Array,
-        iv: Uint8Array,
-        mode: "encrypt" | "decrypt"
-    ) {
-        this.algorithm = algorithm;
-        this.key = key;
-        this.iv = iv;
-        this.mode = mode;
-    }
-
-    update(data: Uint8Array): Uint8Array {
-        if (this.finalized) {
-            throw new Error("Cipher has already been finalized");
-        }
-        // Buffer the data - Web Crypto doesn't support streaming
-        this.chunks.push(data);
-        // Return empty array since we process everything in final()
-        return new Uint8Array(0);
-    }
-
-    final(): Uint8Array {
-        if (this.finalized) {
-            throw new Error("Cipher has already been finalized");
-        }
-        this.finalized = true;
-
-        // Web Crypto API is async, but we need sync behavior
-        // This is a fundamental limitation that requires architectural changes
-        // For now, throw an error directing users to use async methods
-        throw new Error(
-            "Synchronous cipher finalization not available in browser. " +
-            "The Web Crypto API is async-only. Use finalizeAsync() instead."
-        );
-    }
-
-    /**
-     * Async version that actually performs the encryption/decryption.
-     */
-    async finalizeAsync(): Promise<Uint8Array> {
-        if (this.finalized) {
-            throw new Error("Cipher has already been finalized");
-        }
-        this.finalized = true;
-
-        // Concatenate all chunks
-        const totalLength = this.chunks.reduce((sum, chunk) => sum + chunk.length, 0);
-        const data = new Uint8Array(totalLength);
-        let offset = 0;
-        for (const chunk of this.chunks) {
-            data.set(chunk, offset);
-            offset += chunk.length;
-        }
-
-        // Copy key and iv to ensure they're plain ArrayBuffer-backed
-        const keyBuffer = new Uint8Array(this.key);
-        const ivBuffer = new Uint8Array(this.iv);
-
-        // Import the key
-        const cryptoKey = await crypto.subtle.importKey(
-            "raw",
-            keyBuffer,
-            { name: "AES-CBC" },
-            false,
-            [this.mode]
-        );
-
-        // Perform encryption/decryption
-        const result = this.mode === "encrypt"
-            ? await crypto.subtle.encrypt({ name: "AES-CBC", iv: ivBuffer }, cryptoKey, data)
-            : await crypto.subtle.decrypt({ name: "AES-CBC", iv: ivBuffer }, cryptoKey, data);
-
-        return new Uint8Array(result);
-    }
-}

apps/client-standalone/src/lightweight/messaging_provider.ts

@@ -1,92 +0,0 @@
-import type { WebSocketMessage } from "@triliumnext/commons";
-import type { MessagingProvider, MessageHandler } from "@triliumnext/core";
-
-/**
- * Messaging provider for browser Worker environments.
- *
- * This provider uses the Worker's postMessage API to communicate
- * with the main thread. It's designed to be used inside a Web Worker
- * that runs the core services.
- *
- * Message flow:
- * - Outbound (worker → main): Uses self.postMessage() with type: "WS_MESSAGE"
- * - Inbound (main → worker): Listens to onmessage for type: "WS_MESSAGE"
- */
-export default class WorkerMessagingProvider implements MessagingProvider {
-    private messageHandlers: MessageHandler[] = [];
-    private isDisposed = false;
-
-    constructor() {
-        // Listen for incoming messages from the main thread
-        self.addEventListener("message", this.handleIncomingMessage);
-        console.log("[WorkerMessagingProvider] Initialized");
-    }
-
-    private handleIncomingMessage = (event: MessageEvent) => {
-        if (this.isDisposed) return;
-
-        const { type, message } = event.data || {};
-
-        if (type === "WS_MESSAGE" && message) {
-            // Dispatch to all registered handlers
-            for (const handler of this.messageHandlers) {
-                try {
-                    handler(message as WebSocketMessage);
-                } catch (e) {
-                    console.error("[WorkerMessagingProvider] Error in message handler:", e);
-                }
-            }
-        }
-    };
-
-    /**
-     * Send a message to all clients (in this case, the main thread).
-     * The main thread is responsible for further distribution if needed.
-     */
-    sendMessageToAllClients(message: WebSocketMessage): void {
-        if (this.isDisposed) {
-            console.warn("[WorkerMessagingProvider] Cannot send message - provider is disposed");
-            return;
-        }
-
-        try {
-            self.postMessage({
-                type: "WS_MESSAGE",
-                message
-            });
-        } catch (e) {
-            console.error("[WorkerMessagingProvider] Error sending message:", e);
-        }
-    }
-
-    /**
-     * Subscribe to incoming messages from the main thread.
-     */
-    onMessage(handler: MessageHandler): () => void {
-        this.messageHandlers.push(handler);
-
-        return () => {
-            this.messageHandlers = this.messageHandlers.filter(h => h !== handler);
-        };
-    }
-
-    /**
-     * Get the number of connected "clients".
-     * In worker context, there's always exactly 1 client (the main thread).
-     */
-    getClientCount(): number {
-        return this.isDisposed ? 0 : 1;
-    }
-
-    /**
-     * Clean up resources.
-     */
-    dispose(): void {
-        if (this.isDisposed) return;
-
-        this.isDisposed = true;
-        self.removeEventListener("message", this.handleIncomingMessage);
-        this.messageHandlers = [];
-        console.log("[WorkerMessagingProvider] Disposed");
-    }
-}

apps/client-standalone/src/lightweight/sql_provider.ts

@@ -1,615 +0,0 @@
-import type { DatabaseProvider, RunResult, Statement, Transaction } from "@triliumnext/core";
-import sqlite3InitModule from "@sqlite.org/sqlite-wasm";
-import type { BindableValue } from "@sqlite.org/sqlite-wasm";
-import demoDbSql from "./db.sql?raw";
-
-// Type definitions for SQLite WASM (the library doesn't export these directly)
-type Sqlite3Module = Awaited<ReturnType<typeof sqlite3InitModule>>;
-type Sqlite3Database = InstanceType<Sqlite3Module["oo1"]["DB"]>;
-type Sqlite3PreparedStatement = ReturnType<Sqlite3Database["prepare"]>;
-
-/**
- * Wraps an SQLite WASM PreparedStatement to match the Statement interface
- * expected by trilium-core.
- */
-class WasmStatement implements Statement {
-    private isRawMode = false;
-    private isPluckMode = false;
-    private isFinalized = false;
-
-    constructor(
-        private stmt: Sqlite3PreparedStatement,
-        private db: Sqlite3Database
-    ) {}
-
-    run(...params: unknown[]): RunResult {
-        if (this.isFinalized) {
-            throw new Error("Cannot call run() on finalized statement");
-        }
-
-        this.bindParams(params);
-        try {
-            // Use step() and then reset instead of stepFinalize()
-            // This allows the statement to be reused
-            this.stmt.step();
-            const changes = this.db.changes();
-            this.stmt.reset();
-            return {
-                changes,
-                lastInsertRowid: 0 // Would need sqlite3_last_insert_rowid for this
-            };
-        } catch (e) {
-            // Reset on error to allow reuse
-            this.stmt.reset();
-            throw e;
-        }
-    }
-
-    get(params: unknown): unknown {
-        if (this.isFinalized) {
-            throw new Error("Cannot call get() on finalized statement");
-        }
-
-        this.bindParams(Array.isArray(params) ? params : params !== undefined ? [params] : []);
-        try {
-            if (this.stmt.step()) {
-                if (this.isPluckMode) {
-                    // In pluck mode, return only the first column value
-                    const row = this.stmt.get([]);
-                    return Array.isArray(row) && row.length > 0 ? row[0] : undefined;
-                }
-                return this.isRawMode ? this.stmt.get([]) : this.stmt.get({});
-            }
-            return undefined;
-        } finally {
-            this.stmt.reset();
-        }
-    }
-
-    all(...params: unknown[]): unknown[] {
-        if (this.isFinalized) {
-            throw new Error("Cannot call all() on finalized statement");
-        }
-
-        this.bindParams(params);
-        const results: unknown[] = [];
-        try {
-            while (this.stmt.step()) {
-                if (this.isPluckMode) {
-                    // In pluck mode, return only the first column value for each row
-                    const row = this.stmt.get([]);
-                    if (Array.isArray(row) && row.length > 0) {
-                        results.push(row[0]);
-                    }
-                } else {
-                    results.push(this.isRawMode ? this.stmt.get([]) : this.stmt.get({}));
-                }
-            }
-            return results;
-        } finally {
-            this.stmt.reset();
-        }
-    }
-
-    iterate(...params: unknown[]): IterableIterator<unknown> {
-        if (this.isFinalized) {
-            throw new Error("Cannot call iterate() on finalized statement");
-        }
-
-        this.bindParams(params);
-        const stmt = this.stmt;
-        const isRaw = this.isRawMode;
-        const isPluck = this.isPluckMode;
-
-        return {
-            [Symbol.iterator]() {
-                return this;
-            },
-            next(): IteratorResult<unknown> {
-                if (stmt.step()) {
-                    if (isPluck) {
-                        const row = stmt.get([]);
-                        const value = Array.isArray(row) && row.length > 0 ? row[0] : undefined;
-                        return { value, done: false };
-                    }
-                    return { value: isRaw ? stmt.get([]) : stmt.get({}), done: false };
-                }
-                stmt.reset();
-                return { value: undefined, done: true };
-            }
-        };
-    }
-
-    raw(toggleState?: boolean): this {
-        // In raw mode, rows are returned as arrays instead of objects
-        // If toggleState is undefined, enable raw mode (better-sqlite3 behavior)
-        this.isRawMode = toggleState !== undefined ? toggleState : true;
-        return this;
-    }
-
-    pluck(toggleState?: boolean): this {
-        // In pluck mode, only the first column of each row is returned
-        // If toggleState is undefined, enable pluck mode (better-sqlite3 behavior)
-        this.isPluckMode = toggleState !== undefined ? toggleState : true;
-        return this;
-    }
-
-    private bindParams(params: unknown[]): void {
-        this.stmt.clearBindings();
-        if (params.length === 0) {
-            return;
-        }
-
-        // Handle single object with named parameters
-        if (params.length === 1 && typeof params[0] === "object" && params[0] !== null && !Array.isArray(params[0])) {
-            const inputBindings = params[0] as { [paramName: string]: BindableValue };
-
-            // SQLite WASM expects parameter names to include the prefix (@ : or $)
-            // better-sqlite3 automatically maps unprefixed names to @name
-            // We need to add the @ prefix for compatibility
-            const bindings: { [paramName: string]: BindableValue } = {};
-            for (const [key, value] of Object.entries(inputBindings)) {
-                // If the key already has a prefix, use it as-is
-                if (key.startsWith('@') || key.startsWith(':') || key.startsWith('$')) {
-                    bindings[key] = value;
-                } else {
-                    // Add @ prefix to match better-sqlite3 behavior
-                    bindings[`@${key}`] = value;
-                }
-            }
-
-            this.stmt.bind(bindings);
-        } else {
-            // Handle positional parameters - flatten and cast to BindableValue[]
-            const flatParams = params.flat() as BindableValue[];
-            if (flatParams.length > 0) {
-                this.stmt.bind(flatParams);
-            }
-        }
-    }
-
-    finalize(): void {
-        if (!this.isFinalized) {
-            try {
-                this.stmt.finalize();
-            } catch (e) {
-                console.warn("Error finalizing SQLite statement:", e);
-            } finally {
-                this.isFinalized = true;
-            }
-        }
-    }
-}
-
-/**
- * SQLite database provider for browser environments using SQLite WASM.
- *
- * This provider wraps the official @sqlite.org/sqlite-wasm package to provide
- * a DatabaseProvider implementation compatible with trilium-core.
- *
- * @example
- * ```typescript
- * const provider = new BrowserSqlProvider();
- * await provider.initWasm(); // Initialize SQLite WASM module
- * provider.loadFromMemory(); // Open an in-memory database
- * // or
- * provider.loadFromBuffer(existingDbBuffer); // Load from existing data
- * ```
- */
-export default class BrowserSqlProvider implements DatabaseProvider {
-    private db?: Sqlite3Database;
-    private sqlite3?: Sqlite3Module;
-    private _inTransaction = false;
-    private initPromise?: Promise<void>;
-    private initError?: Error;
-    private statementCache: Map<string, WasmStatement> = new Map();
-
-    // OPFS state tracking
-    private opfsDbPath?: string;
-
-    /**
-     * Get the SQLite WASM module version info.
-     * Returns undefined if the module hasn't been initialized yet.
-     */
-    get version(): { libVersion: string; sourceId: string } | undefined {
-        return this.sqlite3?.version;
-    }
-
-    /**
-     * Initialize the SQLite WASM module.
-     * This must be called before using any database operations.
-     * Safe to call multiple times - subsequent calls return the same promise.
-     *
-     * @returns A promise that resolves when the module is initialized
-     * @throws Error if initialization fails
-     */
-    async initWasm(): Promise<void> {
-        // Return existing promise if already initializing/initialized
-        if (this.initPromise) {
-            return this.initPromise;
-        }
-
-        // Fail fast if we already tried and failed
-        if (this.initError) {
-            throw this.initError;
-        }
-
-        this.initPromise = this.doInitWasm();
-        return this.initPromise;
-    }
-
-    private async doInitWasm(): Promise<void> {
-        try {
-            console.log("[BrowserSqlProvider] Initializing SQLite WASM...");
-            const startTime = performance.now();
-
-            this.sqlite3 = await sqlite3InitModule({
-                print: console.log,
-                printErr: console.error,
-            });
-
-            const initTime = performance.now() - startTime;
-            console.log(
-                `[BrowserSqlProvider] SQLite WASM initialized in ${initTime.toFixed(2)}ms:`,
-                this.sqlite3.version.libVersion
-            );
-        } catch (e) {
-            this.initError = e instanceof Error ? e : new Error(String(e));
-            console.error("[BrowserSqlProvider] SQLite WASM initialization failed:", this.initError);
-            throw this.initError;
-        }
-    }
-
-    /**
-     * Check if the SQLite WASM module has been initialized.
-     */
-    get isInitialized(): boolean {
-        return this.sqlite3 !== undefined;
-    }
-
-    // ==================== OPFS Support ====================
-
-    /**
-     * Check if the OPFS VFS is available.
-     * This requires:
-     * - Running in a Worker context
-     * - Browser support for OPFS APIs
-     * - COOP/COEP headers sent by the server (for SharedArrayBuffer)
-     *
-     * @returns true if OPFS VFS is available for use
-     */
-    isOpfsAvailable(): boolean {
-        this.ensureSqlite3();
-        // SQLite WASM automatically installs the OPFS VFS if the environment supports it
-        // We can check for its presence via sqlite3_vfs_find or the OpfsDb class
-        return this.sqlite3!.oo1.OpfsDb !== undefined;
-    }
-
-    /**
-     * Load or create a database stored in OPFS for persistent storage.
-     * The database will persist across browser sessions.
-     *
-     * Requires COOP/COEP headers to be set by the server:
-     * - Cross-Origin-Opener-Policy: same-origin
-     * - Cross-Origin-Embedder-Policy: require-corp
-     *
-     * @param path - The path for the database file in OPFS (e.g., "/trilium.db")
-     *               Paths without a leading slash are treated as relative to OPFS root.
-     *               Leading directories are created automatically.
-     * @param options - Additional options
-     * @throws Error if OPFS VFS is not available
-     *
-     * @example
-     * ```typescript
-     * const provider = new BrowserSqlProvider();
-     * await provider.initWasm();
-     * if (provider.isOpfsAvailable()) {
-     *     provider.loadFromOpfs("/my-database.db");
-     * } else {
-     *     console.warn("OPFS not available, using in-memory database");
-     *     provider.loadFromMemory();
-     * }
-     * ```
-     */
-    loadFromOpfs(path: string, options: { createIfNotExists?: boolean } = {}): void {
-        this.ensureSqlite3();
-
-        if (!this.isOpfsAvailable()) {
-            throw new Error(
-                "OPFS VFS is not available. This requires:\n" +
-                "1. Running in a Worker context\n" +
-                "2. Browser support for OPFS (Chrome 102+, Firefox 111+, Safari 17+)\n" +
-                "3. COOP/COEP headers from the server:\n" +
-                "   Cross-Origin-Opener-Policy: same-origin\n" +
-                "   Cross-Origin-Embedder-Policy: require-corp"
-            );
-        }
-
-        console.log(`[BrowserSqlProvider] Loading database from OPFS: ${path}`);
-        const startTime = performance.now();
-
-        try {
-            // OpfsDb automatically creates directories in the path
-            // Mode 'c' = create if not exists
-            const mode = options.createIfNotExists !== false ? 'c' : '';
-            this.db = new this.sqlite3!.oo1.OpfsDb(path, mode);
-            this.opfsDbPath = path;
-
-            // Configure the database for OPFS
-            // Note: WAL mode requires exclusive locking in OPFS environment
-            this.db.exec("PRAGMA journal_mode = DELETE");
-            this.db.exec("PRAGMA synchronous = NORMAL");
-
-            const loadTime = performance.now() - startTime;
-            console.log(`[BrowserSqlProvider] OPFS database loaded in ${loadTime.toFixed(2)}ms`);
-        } catch (e) {
-            const error = e instanceof Error ? e : new Error(String(e));
-            console.error(`[BrowserSqlProvider] Failed to load OPFS database: ${error.message}`);
-            throw error;
-        }
-    }
-
-    /**
-     * Check if the currently open database is stored in OPFS.
-     */
-    get isUsingOpfs(): boolean {
-        return this.opfsDbPath !== undefined;
-    }
-
-    /**
-     * Get the OPFS path of the currently open database.
-     * Returns undefined if not using OPFS.
-     */
-    get currentOpfsPath(): string | undefined {
-        return this.opfsDbPath;
-    }
-
-    /**
-     * Check if the database has been initialized with a schema.
-     * This is a simple sanity check that looks for the existence of core tables.
-     *
-     * @returns true if the database appears to be initialized
-     */
-    isDbInitialized(): boolean {
-        this.ensureDb();
-
-        // Check if the 'notes' table exists (a core table that must exist in an initialized DB)
-        const tableExists = this.db!.selectValue(
-            "SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'notes'"
-        );
-
-        return tableExists !== undefined;
-    }
-
-    // ==================== End OPFS Support ====================
-
-    loadFromFile(_path: string, _isReadOnly: boolean): void {
-        // Browser environment doesn't have direct file system access.
-        // Use OPFS for persistent storage.
-        throw new Error(
-            "loadFromFile is not supported in browser environment. " +
-            "Use loadFromMemory() for temporary databases, loadFromBuffer() to load from data, " +
-            "or loadFromOpfs() for persistent storage."
-        );
-    }
-
-    /**
-     * Create an empty in-memory database.
-     * Data will be lost when the page is closed.
-     *
-     * For persistent storage, use loadFromOpfs() instead.
-     * To load demo data, call initializeDemoDatabase() after this.
-     */
-    loadFromMemory(): void {
-        this.ensureSqlite3();
-        console.log("[BrowserSqlProvider] Creating in-memory database...");
-        const startTime = performance.now();
-
-        this.db = new this.sqlite3!.oo1.DB(":memory:", "c");
-        this.opfsDbPath = undefined; // Not using OPFS
-        this.db.exec("PRAGMA journal_mode = WAL");
-
-        // Initialize with demo data for in-memory databases
-        // (since they won't persist anyway)
-        this.initializeDemoDatabase();
-
-        const loadTime = performance.now() - startTime;
-        console.log(`[BrowserSqlProvider] In-memory database created in ${loadTime.toFixed(2)}ms`);
-    }
-
-    /**
-     * Initialize the database with demo/starter data.
-     * This should only be called once when creating a new database.
-     *
-     * For OPFS databases, this is called automatically only if the database
-     * doesn't already exist.
-     */
-    initializeDemoDatabase(): void {
-        this.ensureDb();
-        console.log("[BrowserSqlProvider] Initializing database with demo data...");
-        const startTime = performance.now();
-
-        this.db!.exec(demoDbSql);
-
-        const loadTime = performance.now() - startTime;
-        console.log(`[BrowserSqlProvider] Demo data loaded in ${loadTime.toFixed(2)}ms`);
-    }
-
-    loadFromBuffer(buffer: Uint8Array): void {
-        this.ensureSqlite3();
-        // SQLite WASM can deserialize a database from a byte array
-        const p = this.sqlite3!.wasm.allocFromTypedArray(buffer);
-        try {
-            this.db = new this.sqlite3!.oo1.DB({ filename: ":memory:", flags: "c" });
-            this.opfsDbPath = undefined; // Not using OPFS
-
-            const rc = this.sqlite3!.capi.sqlite3_deserialize(
-                this.db.pointer!,
-                "main",
-                p,
-                buffer.byteLength,
-                buffer.byteLength,
-                this.sqlite3!.capi.SQLITE_DESERIALIZE_FREEONCLOSE |
-                this.sqlite3!.capi.SQLITE_DESERIALIZE_RESIZEABLE
-            );
-            if (rc !== 0) {
-                throw new Error(`Failed to deserialize database: ${rc}`);
-            }
-        } catch (e) {
-            this.sqlite3!.wasm.dealloc(p);
-            throw e;
-        }
-    }
-
-    backup(_destinationFile: string): void {
-        // In browser, we can serialize the database to a byte array
-        // For actual file backup, we'd need to use File System Access API or download
-        throw new Error(
-            "backup to file is not supported in browser environment. " +
-            "Use serialize() to get the database as a Uint8Array instead."
-        );
-    }
-
-    /**
-     * Serialize the database to a byte array.
-     * This can be used to save the database to IndexedDB, download it, etc.
-     */
-    serialize(): Uint8Array {
-        this.ensureDb();
-        // Use the convenience wrapper which handles all the memory management
-        return this.sqlite3!.capi.sqlite3_js_db_export(this.db!);
-    }
-
-    prepare(query: string): Statement {
-        this.ensureDb();
-
-        // Check if we already have this statement cached
-        if (this.statementCache.has(query)) {
-            return this.statementCache.get(query)!;
-        }
-
-        // Create new statement and cache it
-        const stmt = this.db!.prepare(query);
-        const wasmStatement = new WasmStatement(stmt, this.db!);
-        this.statementCache.set(query, wasmStatement);
-        return wasmStatement;
-    }
-
-    transaction<T>(func: (statement: Statement) => T): Transaction {
-        this.ensureDb();
-
-        const self = this;
-        let savepointCounter = 0;
-
-        // Helper function to execute within a transaction
-        const executeTransaction = (beginStatement: string, ...args: unknown[]): T => {
-            // If we're already in a transaction, use SAVEPOINTs for nesting
-            // This mimics better-sqlite3's behavior
-            if (self._inTransaction) {
-                const savepointName = `sp_${++savepointCounter}_${Date.now()}`;
-                self.db!.exec(`SAVEPOINT ${savepointName}`);
-                try {
-                    const result = func.apply(null, args as [Statement]);
-                    self.db!.exec(`RELEASE SAVEPOINT ${savepointName}`);
-                    return result;
-                } catch (e) {
-                    self.db!.exec(`ROLLBACK TO SAVEPOINT ${savepointName}`);
-                    throw e;
-                }
-            }
-
-            // Not in a transaction, start a new one
-            self._inTransaction = true;
-            self.db!.exec(beginStatement);
-            try {
-                const result = func.apply(null, args as [Statement]);
-                self.db!.exec("COMMIT");
-                return result;
-            } catch (e) {
-                self.db!.exec("ROLLBACK");
-                throw e;
-            } finally {
-                self._inTransaction = false;
-            }
-        };
-
-        // Create the transaction function that acts like better-sqlite3's Transaction interface
-        // In better-sqlite3, the transaction function is callable and has .deferred(), .immediate(), etc.
-        const transactionWrapper = Object.assign(
-            // Default call executes with BEGIN (same as immediate)
-            (...args: unknown[]): T => executeTransaction("BEGIN", ...args),
-            {
-                // Deferred transaction - locks acquired on first data access
-                deferred: (...args: unknown[]): T => executeTransaction("BEGIN DEFERRED", ...args),
-                // Immediate transaction - acquires write lock immediately
-                immediate: (...args: unknown[]): T => executeTransaction("BEGIN IMMEDIATE", ...args),
-                // Exclusive transaction - exclusive lock
-                exclusive: (...args: unknown[]): T => executeTransaction("BEGIN EXCLUSIVE", ...args),
-                // Default is same as calling directly
-                default: (...args: unknown[]): T => executeTransaction("BEGIN", ...args)
-            }
-        );
-
-        return transactionWrapper as unknown as Transaction;
-    }
-
-    get inTransaction(): boolean {
-        return this._inTransaction;
-    }
-
-    exec(query: string): void {
-        this.ensureDb();
-        this.db!.exec(query);
-    }
-
-    close(): void {
-        // Clean up all cached statements first
-        for (const statement of this.statementCache.values()) {
-            try {
-                statement.finalize();
-            } catch (e) {
-                // Ignore errors during cleanup
-                console.warn("Error finalizing statement during cleanup:", e);
-            }
-        }
-        this.statementCache.clear();
-
-        if (this.db) {
-            this.db.close();
-            this.db = undefined;
-        }
-
-        // Reset OPFS state
-        this.opfsDbPath = undefined;
-    }
-
-    /**
-     * Get the number of rows changed by the last INSERT, UPDATE, or DELETE statement.
-     */
-    changes(): number {
-        this.ensureDb();
-        return this.db!.changes();
-    }
-
-    /**
-     * Check if the database is currently open.
-     */
-    isOpen(): boolean {
-        return this.db !== undefined && this.db.isOpen();
-    }
-
-    private ensureSqlite3(): void {
-        if (!this.sqlite3) {
-            throw new Error(
-                "SQLite WASM module not initialized. Call initialize() first with the sqlite3 module."
-            );
-        }
-    }
-
-    private ensureDb(): void {
-        this.ensureSqlite3();
-        if (!this.db) {
-            throw new Error("Database not opened. Call loadFromMemory(), loadFromBuffer(), or loadFromOpfs() first.");
-        }
-    }
-}

apps/client-standalone/src/local-bridge.ts

@@ -1,89 +0,0 @@
-// public/local-bridge.js
-let localWorker: Worker | null = null;
-const pending = new Map();
-
-export function startLocalServerWorker() {
-    if (localWorker) return localWorker;
-
-    localWorker = new Worker(new URL("./local-server-worker.js", import.meta.url), { type: "module" });
-
-    // Handle worker errors during initialization
-    localWorker.onerror = (event) => {
-        console.error("[LocalBridge] Worker error:", event);
-        // Reject all pending requests
-        for (const [id, resolver] of pending) {
-            resolver.reject(new Error(`Worker error: ${event.message}`));
-        }
-        pending.clear();
-    };
-
-    localWorker.onmessage = (event) => {
-        const msg = event.data;
-        
-        // Handle worker error reports
-        if (msg?.type === "WORKER_ERROR") {
-            console.error("[LocalBridge] Worker reported error:", msg.error);
-            // Reject all pending requests with the error
-            for (const [id, resolver] of pending) {
-                resolver.reject(new Error(msg.error?.message || "Unknown worker error"));
-            }
-            pending.clear();
-            return;
-        }
-        
-        if (!msg || msg.type !== "LOCAL_RESPONSE") return;
-
-        const { id, response, error } = msg;
-        const resolver = pending.get(id);
-        if (!resolver) return;
-        pending.delete(id);
-
-        if (error) resolver.reject(new Error(error));
-        else resolver.resolve(response);
-    };
-
-    return localWorker;
-}
-
-export function attachServiceWorkerBridge() {
-    navigator.serviceWorker.addEventListener("message", async (event) => {
-        const msg = event.data;
-        if (!msg || msg.type !== "LOCAL_FETCH") return;
-
-        const port = event.ports && event.ports[0];
-        if (!port) return;
-
-        try {
-            startLocalServerWorker();
-
-            const id = msg.id;
-            const req = msg.request;
-
-            const response = await new Promise((resolve, reject) => {
-                pending.set(id, { resolve, reject });
-                // Transfer body to worker for efficiency (if present)
-                localWorker.postMessage({
-                    type: "LOCAL_REQUEST",
-                    id,
-                    request: req
-                }, req.body ? [req.body] : []);
-            });
-
-            port.postMessage({
-                type: "LOCAL_FETCH_RESPONSE",
-                id,
-                response
-            }, response.body ? [response.body] : []);
-        } catch (e) {
-            port.postMessage({
-                type: "LOCAL_FETCH_RESPONSE",
-                id: msg.id,
-                response: {
-                    status: 500,
-                    headers: { "content-type": "text/plain; charset=utf-8" },
-                    body: new TextEncoder().encode(String(e?.message || e)).buffer
-                }
-            });
-        }
-    });
-}

apps/client-standalone/src/local-server-worker.ts

@@ -1,222 +0,0 @@
-// public/local-server-worker.js
-// This will eventually import your core server and DB provider.
-// import { createCoreServer } from "@trilium/core"; (bundled)
-
-import BrowserExecutionContext from './lightweight/cls_provider';
-import BrowserCryptoProvider from './lightweight/crypto_provider';
-import BrowserSqlProvider from './lightweight/sql_provider';
-import WorkerMessagingProvider from './lightweight/messaging_provider';
-import { BrowserRouter } from './lightweight/browser_router';
-import { createConfiguredRouter } from './lightweight/browser_routes';
-
-// Global error handlers - MUST be set up before any async imports
-self.onerror = (message, source, lineno, colno, error) => {
-    console.error("[Worker] Uncaught error:", message, source, lineno, colno, error);
-    // Try to notify the main thread about the error
-    try {
-        self.postMessage({
-            type: "WORKER_ERROR",
-            error: {
-                message: String(message),
-                source,
-                lineno,
-                colno,
-                stack: error?.stack
-            }
-        });
-    } catch (e) {
-        // Can't even post message, just log
-        console.error("[Worker] Failed to report error:", e);
-    }
-    return false; // Don't suppress the error
-};
-
-self.onunhandledrejection = (event) => {
-    console.error("[Worker] Unhandled rejection:", event.reason);
-    try {
-        self.postMessage({
-            type: "WORKER_ERROR",
-            error: {
-                message: String(event.reason?.message || event.reason),
-                stack: event.reason?.stack
-            }
-        });
-    } catch (e) {
-        console.error("[Worker] Failed to report rejection:", e);
-    }
-};
-
-console.log("[Worker] Error handlers installed");
-
-// Shared SQL provider instance
-const sqlProvider = new BrowserSqlProvider();
-
-// Messaging provider for worker-to-main-thread communication
-const messagingProvider = new WorkerMessagingProvider();
-
-// Core module, router, and initialization state
-let coreModule: typeof import("@triliumnext/core") | null = null;
-let router: BrowserRouter | null = null;
-let initPromise: Promise<void> | null = null;
-let initError: Error | null = null;
-
-/**
- * Initialize SQLite WASM and load the core module.
- * This happens once at worker startup.
- */
-async function initialize(): Promise<void> {
-    if (initPromise) {
-        return initPromise; // Already initializing
-    }
-    if (initError) {
-        throw initError; // Failed before, don't retry
-    }
-
-    initPromise = (async () => {
-        try {
-            console.log("[Worker] Initializing SQLite WASM...");
-            await sqlProvider.initWasm();
-
-            // Try to use OPFS for persistent storage
-            if (sqlProvider.isOpfsAvailable()) {
-                console.log("[Worker] OPFS available, loading persistent database...");
-                sqlProvider.loadFromOpfs("/trilium.db");
-
-                // Check if database is initialized (schema exists)
-                if (!sqlProvider.isDbInitialized()) {
-                    console.log("[Worker] Database not initialized, loading demo data...");
-                    sqlProvider.initializeDemoDatabase();
-                    console.log("[Worker] Demo data loaded");
-                } else {
-                    console.log("[Worker] Existing initialized database loaded");
-                }
-            } else {
-                // Fall back to in-memory database (non-persistent)
-                console.warn("[Worker] OPFS not available, using in-memory database (data will not persist)");
-                console.warn("[Worker] To enable persistence, ensure COOP/COEP headers are set by the server");
-                sqlProvider.loadFromMemory();
-            }
-
-            console.log("[Worker] Database loaded");
-
-            console.log("[Worker] Loading @triliumnext/core...");
-            coreModule = await import("@triliumnext/core");
-            coreModule.initializeCore({
-                executionContext: new BrowserExecutionContext(),
-                crypto: new BrowserCryptoProvider(),
-                messaging: messagingProvider,
-                dbConfig: {
-                    provider: sqlProvider,
-                    isReadOnly: false,
-                    onTransactionCommit: () => {
-                        // No-op for now
-                    },
-                    onTransactionRollback: () => {
-                        // No-op for now
-                    }
-                }
-            });
-
-            console.log("[Worker] Supported routes", Object.keys(coreModule.routes));
-
-            // Create and configure the router
-            router = createConfiguredRouter();
-            console.log("[Worker] Router configured");
-
-            console.log("[Worker] Initializing becca...");
-            await coreModule.becca_loader.beccaLoaded;
-
-            console.log("[Worker] Initialization complete");
-        } catch (error) {
-            initError = error instanceof Error ? error : new Error(String(error));
-            console.error("[Worker] Initialization failed:", initError);
-            throw initError;
-        }
-    })();
-
-    return initPromise;
-}
-
-/**
- * Ensure the worker is initialized before processing requests.
- * Returns the router if initialization was successful.
- */
-async function ensureInitialized() {
-    await initialize();
-    if (!router) {
-        throw new Error("Router not initialized");
-    }
-    return router;
-}
-
-const encoder = new TextEncoder();
-
-function jsonResponse(obj: unknown, status = 200, extraHeaders = {}) {
-    const body = encoder.encode(JSON.stringify(obj)).buffer;
-    return {
-        status,
-        headers: { "content-type": "application/json; charset=utf-8", ...extraHeaders },
-        body
-    };
-}
-
-interface LocalRequest {
-    method: string;
-    url: string;
-    body?: unknown;
-    headers?: Record<string, string>;
-}
-
-// Main dispatch
-async function dispatch(request: LocalRequest) {
-    const url = new URL(request.url);
-
-    console.log("[Worker] Dispatch:", url.pathname);
-
-    // Ensure initialization is complete and get the router
-    const appRouter = await ensureInitialized();
-
-    // Dispatch to the router
-    return appRouter.dispatch(request.method, request.url, request.body, request.headers);
-}
-
-// Start initialization immediately when the worker loads
-console.log("[Worker] Starting initialization...");
-initialize().catch(err => {
-    console.error("[Worker] Initialization failed:", err);
-    // Post error to main thread
-    self.postMessage({
-        type: "WORKER_ERROR",
-        error: {
-            message: String(err?.message || err),
-            stack: err?.stack
-        }
-    });
-});
-
-self.onmessage = async (event) => {
-    const msg = event.data;
-    if (!msg || msg.type !== "LOCAL_REQUEST") return;
-
-    const { id, request } = msg;
-    console.log("[Worker] Received LOCAL_REQUEST:", id, request.method, request.url);
-
-    try {
-        const response = await dispatch(request);
-        console.log("[Worker] Dispatch completed, sending response:", id);
-
-        // Transfer body back (if any) - use options object for proper typing
-        (self as unknown as Worker).postMessage({
-            type: "LOCAL_RESPONSE",
-            id,
-            response
-        }, { transfer: response.body ? [response.body] : [] });
-    } catch (e) {
-        console.error("[Worker] Dispatch error:", e);
-        (self as unknown as Worker).postMessage({
-            type: "LOCAL_RESPONSE",
-            id,
-            error: String((e as Error)?.message || e)
-        });
-    }
-};

apps/client-standalone/src/main.ts

@@ -1,189 +0,0 @@
-import { attachServiceWorkerBridge, startLocalServerWorker } from "./local-bridge.js";
-
-async function waitForServiceWorkerControl(): Promise<void> {
-    if (!("serviceWorker" in navigator)) {
-        throw new Error("Service Worker not supported in this browser");
-    }
-
-    // If already controlling, we're good
-    if (navigator.serviceWorker.controller) {
-        console.log("[Bootstrap] Service worker already controlling");
-        return;
-    }
-
-    console.log("[Bootstrap] Waiting for service worker to take control...");
-
-    // Register service worker
-    const registration = await navigator.serviceWorker.register("./sw.js", { scope: "/" });
-    
-    // Wait for it to be ready (installed + activated)
-    await navigator.serviceWorker.ready;
-
-    // Check if we're now controlling
-    if (navigator.serviceWorker.controller) {
-        console.log("[Bootstrap] Service worker now controlling");
-        return;
-    }
-
-    // If not controlling yet, we need to reload the page for SW to take control
-    // This is standard PWA behavior on first install
-    console.log("[Bootstrap] Service worker installed but not controlling yet - reloading page");
-    
-    // Wait a tiny bit for SW to fully activate
-    await new Promise(resolve => setTimeout(resolve, 100));
-    
-    // Reload to let SW take control
-    window.location.reload();
-    
-    // Throw to stop execution (page will reload)
-    throw new Error("Reloading for service worker activation");
-}
-
-async function fetchWithRetry(url: string, maxRetries = 3, delayMs = 500): Promise<Response> {
-    let lastError: Error | null = null;
-    
-    for (let attempt = 0; attempt < maxRetries; attempt++) {
-        try {
-            console.log(`[Bootstrap] Fetching ${url} (attempt ${attempt + 1}/${maxRetries})`);
-            const response = await fetch(url);
-            
-            if (!response.ok) {
-                throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-            }
-            
-            // Check if response has content
-            const contentType = response.headers.get("content-type");
-            if (!contentType || !contentType.includes("application/json")) {
-                throw new Error(`Invalid content-type: ${contentType || "none"}`);
-            }
-            
-            return response;
-        } catch (err) {
-            lastError = err as Error;
-            console.warn(`[Bootstrap] Fetch attempt ${attempt + 1} failed:`, err);
-            
-            if (attempt < maxRetries - 1) {
-                // Exponential backoff
-                const delay = delayMs * Math.pow(2, attempt);
-                console.log(`[Bootstrap] Retrying in ${delay}ms...`);
-                await new Promise(resolve => setTimeout(resolve, delay));
-            }
-        }
-    }
-    
-    throw new Error(`Failed to fetch ${url} after ${maxRetries} attempts: ${lastError?.message}`);
-}
-
-async function bootstrap() {
-    /* fixes https://github.com/webpack/webpack/issues/10035 */
-    window.global = globalThis;
-
-    try {
-        // 1) Start local worker ASAP (so /bootstrap is fast)
-        startLocalServerWorker();
-
-        // 2) Bridge SW -> local worker
-        attachServiceWorkerBridge();
-
-        // 3) Wait for service worker to control the page (may reload on first install)
-        await waitForServiceWorkerControl();
-
-        // 4) Now fetch bootstrap - SW is guaranteed to intercept this
-        await setupGlob();
-        
-        loadStylesheets();
-        loadIcons();
-        setBodyAttributes();
-        await loadScripts();
-    } catch (err) {
-        // If error is from reload, it will stop here (page reloads)
-        // Otherwise, show error to user
-        if (err instanceof Error && err.message.includes("Reloading")) {
-            // Page is reloading, do nothing
-            return;
-        }
-        
-        console.error("[Bootstrap] Fatal error:", err);
-        document.body.innerHTML = `
-            <div style="padding: 40px; max-width: 600px; margin: 0 auto; font-family: system-ui, sans-serif;">
-                <h1 style="color: #d32f2f;">Failed to Initialize</h1>
-                <p>The application failed to start. Please check the browser console for details.</p>
-                <pre style="background: #f5f5f5; padding: 16px; border-radius: 4px; overflow: auto;">${err instanceof Error ? err.message : String(err)}</pre>
-                <button onclick="location.reload()" style="padding: 12px 24px; background: #1976d2; color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 16px;">
-                    Reload Page
-                </button>
-            </div>
-        `;
-        document.body.style.display = "block";
-    }
-}
-
-async function setupGlob() {
-    const response = await fetchWithRetry("/bootstrap");
-    console.log("Service worker state", navigator.serviceWorker.controller);
-    console.log("Resp", response);
-    const json = await response.json();
-    console.log("Bootstrap", json);
-
-    window.glob = {
-        ...json,
-        activeDialog: null
-    };
-}
-
-function loadStylesheets() {
-    const { assetPath, themeCssUrl, themeUseNextAsBase } = window.glob;
-    const cssToLoad = [];
-    cssToLoad.push(`${assetPath}/stylesheets/theme-light.css`);
-    if (themeCssUrl) {
-        cssToLoad.push(themeCssUrl);
-    }
-    if (themeUseNextAsBase === "next") {
-        cssToLoad.push(`${assetPath}/stylesheets/theme-next.css`)
-    } else if (themeUseNextAsBase === "next-dark") {
-        cssToLoad.push(`${assetPath}/stylesheets/theme-next-dark.css`)
-    } else if (themeUseNextAsBase === "next-light") {
-        cssToLoad.push(`${assetPath}/stylesheets/theme-next-light.css`)
-    }
-    cssToLoad.push(`${assetPath}/stylesheets/style.css`);
-
-    for (const href of cssToLoad) {
-        const linkEl = document.createElement("link");
-        linkEl.href = href;
-        linkEl.rel = "stylesheet";
-        document.body.appendChild(linkEl);
-    }
-}
-
-function loadIcons() {
-    const styleEl = document.createElement("style");
-    styleEl.innerText = window.glob.iconPackCss;
-    document.head.appendChild(styleEl);
-}
-
-function setBodyAttributes() {
-    const { device, headingStyle, layoutOrientation, platform, isElectron, hasNativeTitleBar, hasBackgroundEffects, currentLocale } = window.glob;
-    const classesToSet = [
-        device,
-        `heading-style-${headingStyle}`,
-        `layout-${layoutOrientation}`,
-        `platform-${platform}`,
-        isElectron && "isElectron",
-        hasNativeTitleBar && "native-titlebar",
-        hasBackgroundEffects && "background-effects"
-    ].filter(Boolean);
-
-    for (const classToSet of classesToSet) {
-        document.body.classList.add(classToSet);
-    }
-
-    document.body.lang = currentLocale.id;
-    document.body.dir = currentLocale.rtl ? "rtl" : "ltr";
-}
-
-async function loadScripts() {
-    await import("./runtime.js");
-    await import("./desktop.js");
-}
-
-bootstrap();

apps/client-standalone/src/runtime.ts

@@ -1,2 +0,0 @@
-// Re-export runtime from client
-export * from "../../client/src/runtime";

apps/client-standalone/src/sw.ts

@@ -1,185 +0,0 @@
-// public/sw.js
-const VERSION = "localserver-v1.4";
-const STATIC_CACHE = `static-${VERSION}`;
-
-// Check if running in dev mode (passed via URL parameter)
-const isDev = true;
-
-if (isDev) {
-    console.log('[Service Worker] Running in DEV mode - caching disabled');
-}
-
-// Adjust these to your routes:
-const LOCAL_FIRST_PREFIXES = [
-    "/bootstrap",
-    "/api/",
-    "/sync/",
-    "/search/"
-];
-
-// Optional: basic precache list (keep small; you can expand later)
-const PRECACHE_URLS = [
-    // "/",
-    // "/index.html",
-    // "/manifest.webmanifest",
-    // "/favicon.ico",
-];
-
-self.addEventListener("install", (event) => {
-    event.waitUntil((async () => {
-        // Skip precaching in dev mode
-        if (!isDev) {
-            const cache = await caches.open(STATIC_CACHE);
-            await cache.addAll(PRECACHE_URLS);
-        }
-        self.skipWaiting();
-    })());
-});
-
-self.addEventListener("activate", (event) => {
-    event.waitUntil((async () => {
-    // Cleanup old caches
-        const keys = await caches.keys();
-        await Promise.all(keys.map((k) => (k === STATIC_CACHE ? Promise.resolve() : caches.delete(k))));
-        await self.clients.claim();
-    })());
-});
-
-function isLocalFirst(url) {
-    return LOCAL_FIRST_PREFIXES.some((p) => url.pathname.startsWith(p));
-}
-
-async function cacheFirst(request) {
-    // In dev mode, always bypass cache
-    if (isDev) {
-        return fetch(request);
-    }
-
-    const cache = await caches.open(STATIC_CACHE);
-    const cached = await cache.match(request);
-    if (cached) return cached;
-
-    const fresh = await fetch(request);
-    // Cache only successful GETs
-    if (request.method === "GET" && fresh.ok) cache.put(request, fresh.clone());
-    return fresh;
-}
-
-async function networkFirst(request) {
-    // In dev mode, always bypass cache
-    if (isDev) {
-        return fetch(request);
-    }
-
-    const cache = await caches.open(STATIC_CACHE);
-    try {
-        const fresh = await fetch(request);
-        // Cache only successful GETs
-        if (request.method === "GET" && fresh.ok) cache.put(request, fresh.clone());
-        return fresh;
-    } catch (error) {
-        // Fallback to cache if network fails
-        const cached = await cache.match(request);
-        if (cached) return cached;
-        throw error;
-    }
-}
-
-async function forwardToClientLocalServer(request, clientId) {
-    // Find a client to handle the request (prefer the initiating client if available)
-    let client = clientId ? await self.clients.get(clientId) : null;
-
-    if (!client) {
-        const all = await self.clients.matchAll({ type: "window", includeUncontrolled: true });
-        client = all[0] || null;
-    }
-
-    // If no page is available, fall back to network
-    if (!client) return fetch(request);
-
-    const reqUrl = request.url;
-    const headersObj = {};
-    for (const [k, v] of request.headers.entries()) headersObj[k] = v;
-
-    const body = (request.method === "GET" || request.method === "HEAD")
-        ? null
-        : await request.arrayBuffer();
-
-    const id = crypto.randomUUID();
-    const channel = new MessageChannel();
-
-    const responsePromise = new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-            reject(new Error("Local server timeout"));
-        }, 30_000);
-
-        channel.port1.onmessage = (event) => {
-            clearTimeout(timeout);
-            resolve(event.data);
-        };
-        channel.port1.onmessageerror = () => {
-            clearTimeout(timeout);
-            reject(new Error("Local server message error"));
-        };
-    });
-
-    // Send to the client with a reply port
-    client.postMessage({
-        type: "LOCAL_FETCH",
-        id,
-        request: {
-            url: reqUrl,
-            method: request.method,
-            headers: headersObj,
-            body // ArrayBuffer or null
-        }
-    }, [channel.port2]);
-
-    const localResp = await responsePromise;
-
-    if (!localResp || localResp.type !== "LOCAL_FETCH_RESPONSE" || localResp.id !== id) {
-    // Protocol mismatch; fall back
-        return fetch(request);
-    }
-
-    // localResp.response: { status, headers, body }
-    const { status, headers, body: respBody } = localResp.response;
-
-    const respHeaders = new Headers();
-    if (headers) {
-        for (const [k, v] of Object.entries(headers)) respHeaders.set(k, String(v));
-    }
-
-    return new Response(respBody ? respBody : null, {
-        status: status || 200,
-        headers: respHeaders
-    });
-}
-
-self.addEventListener("fetch", (event) => {
-    const url = new URL(event.request.url);
-
-    // Only handle same-origin
-    if (url.origin !== self.location.origin) return;
-
-    // HTML files: network-first to ensure updates are reflected immediately
-    if (event.request.mode === "navigate" || url.pathname.endsWith(".html")) {
-        event.respondWith(networkFirst(event.request));
-        return;
-    }
-
-    // Static assets: cache-first for performance
-    if (event.request.method === "GET" && !isLocalFirst(url)) {
-        event.respondWith(cacheFirst(event.request));
-        return;
-    }
-
-    // API-ish: local-first via bridge
-    if (isLocalFirst(url)) {
-        event.respondWith(forwardToClientLocalServer(event.request, event.clientId));
-        return;
-    }
-
-    // Default
-    event.respondWith(fetch(event.request));
-});

apps/client-standalone/src/vite-env.d.ts

@@ -1,31 +0,0 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TITLE: string
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv
-}
-
-interface Window {
-  glob: {
-    assetPath: string;
-    themeCssUrl?: string;
-    themeUseNextAsBase?: string;
-    iconPackCss: string;
-    device: string;
-    headingStyle: string;
-    layoutOrientation: string;
-    platform: string;
-    isElectron: boolean;
-    hasNativeTitleBar: boolean;
-    hasBackgroundEffects: boolean;
-    currentLocale: {
-      id: string;
-      rtl: boolean;
-    };
-    activeDialog: any;
-  };
-  global: typeof globalThis;
-}

apps/client-standalone/tsconfig.app.json

@@ -1,26 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": [
-      "ES2022",
-      "dom",
-      "dom.iterable"
-    ],
-    "skipLibCheck": true,
-    "types": [
-      "vite/client"
-    ],
-    "jsx": "react-jsx",
-    "jsxImportSource": "preact"
-  },
-  "include": [
-    "src/**/*",
-    "../client/src/**/*"
-  ],
-  "exclude": [
-    "src/**/*.spec.ts",
-    "src/**/*.test.ts",
-    "../client/src/**/*.spec.ts",
-    "../client/src/**/*.test.ts"
-  ]
-}

apps/client-standalone/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "references": [
-    { "path": "./tsconfig.app.json" },
-    { "path": "./tsconfig.spec.json" }
-  ]
-}

apps/client-standalone/tsconfig.spec.json

@@ -1,18 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": [
-      "ES2022",
-      "dom",
-      "dom.iterable"
-    ],
-    "types": [
-      "vitest/globals",
-      "happy-dom"
-    ]
-  },
-  "include": [
-    "src/**/*.spec.ts",
-    "src/**/*.test.ts"
-  ]
-}

apps/client-standalone/vite.config.mts

@@ -1,173 +0,0 @@
-import preact from "@preact/preset-vite";
-import { defineConfig } from 'vite';
-import { join } from 'path';
-import { viteStaticCopy } from 'vite-plugin-static-copy';
-
-const assets = ["assets", "stylesheets", "fonts", "translations"];
-
-const isDev = process.env.NODE_ENV === "development";
-
-// Watch client files and trigger reload in development
-const clientWatchPlugin = () => ({
-    name: 'client-watch',
-    configureServer(server: any) {
-        if (isDev) {
-            // Watch client source files (adjusted for new root)
-            server.watcher.add('../../client/src/**/*');
-            server.watcher.on('change', (file: string) => {
-                if (file.includes('../../client/src/')) {
-                    server.ws.send({
-                        type: 'full-reload'
-                    });
-                }
-            });
-        }
-    }
-});
-
-// Always copy SQLite WASM files so they're available to the module
-const sqliteWasmPlugin = viteStaticCopy({
-    targets: [
-        {
-            src: "../../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3.wasm",
-            dest: "assets"
-        },
-        {
-            src: "../../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/sqlite3-opfs-async-proxy.js",
-            dest: "assets"
-        }
-    ]
-});
-
-let plugins: any = [
-    preact({
-        babel: {
-            compact: !isDev
-        }
-    }),
-    sqliteWasmPlugin,  // Always include SQLite WASM files
-    viteStaticCopy({
-        targets: assets.map((asset) => ({
-            src: `../../client/src/${asset}/*`,
-            dest: asset
-        })),
-        // Enable watching in development
-        ...(isDev && {
-            watch: {
-                reloadPageOnChange: true
-            }
-        })
-    }),
-    // Watch client files for changes in development
-    ...(isDev ? [clientWatchPlugin()] : [])
-];
-
-if (!isDev) {
-    plugins = [
-        ...plugins,
-        viteStaticCopy({
-            structured: true,
-            targets: [
-                {
-                    src: "../../../node_modules/@excalidraw/excalidraw/dist/prod/fonts/*",
-                    dest: "",
-                }
-            ]
-        })
-    ]
-}
-
-export default defineConfig(() => ({
-    root: join(__dirname, 'src'),  // Set src as root so index.html is served from /
-    cacheDir: '../../../node_modules/.vite/apps/client-standalone',
-    base: "",
-    plugins,
-    publicDir: join(__dirname, 'public'),
-    resolve: {
-        alias: [
-            {
-                find: "react",
-                replacement: "preact/compat"
-            },
-            {
-                find: "react-dom",
-                replacement: "preact/compat"
-            },
-            {
-                find: "@client",
-                replacement: join(__dirname, "../client/src")
-            }
-        ],
-        dedupe: [
-            "react",
-            "react-dom",
-            "preact",
-            "preact/compat",
-            "preact/hooks"
-        ]
-    },
-    server: {
-        watch: {
-            // Watch workspace packages
-            ignored: ['!**/node_modules/@triliumnext/**'],
-            // Also watch client assets for live reload
-            usePolling: false,
-            interval: 100,
-            binaryInterval: 300
-        },
-        // Watch additional directories for changes
-        fs: {
-            allow: [
-                // Allow access to workspace root
-                '../../../',
-                // Explicitly allow client directory
-                '../../client/src/'
-            ]
-        },
-        headers: {
-            // Required for SharedArrayBuffer which is needed by SQLite WASM OPFS VFS
-            // See: https://sqlite.org/wasm/doc/trunk/persistence.md#coop-coep
-            "Cross-Origin-Opener-Policy": "same-origin",
-            "Cross-Origin-Embedder-Policy": "require-corp"
-        }
-    },
-    optimizeDeps: {
-        exclude: ['@sqlite.org/sqlite-wasm', '@triliumnext/core']
-    },
-    worker: {
-        format: "es" as const
-    },
-    commonjsOptions: {
-        transformMixedEsModules: true,
-    },
-    build: {
-        target: "esnext",
-        outDir: join(__dirname, 'dist'),
-        emptyOutDir: true,
-        rollupOptions: {
-            input: {
-                main: join(__dirname, 'src', 'index.html'),
-                sw: join(__dirname, 'src', 'sw.ts'),
-                'local-bridge': join(__dirname, 'src', 'local-bridge.ts'),
-                'local-server-worker': join(__dirname, 'src', 'local-server-worker.ts')
-            },
-            output: {
-                entryFileNames: (chunkInfo) => {
-                    // Service worker and other workers should be at root level
-                    if (chunkInfo.name === 'sw' || chunkInfo.name === 'local-server-worker') {
-                        return '[name].js';
-                    }
-                    return 'src/[name].js';
-                },
-                chunkFileNames: "src/[name].js",
-                assetFileNames: "src/[name].[ext]"
-            }
-        }
-    },
-    test: {
-        environment: "happy-dom"
-    },
-    define: {
-        "process.env.IS_PREACT": JSON.stringify("true"),
-    }
-}));

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triliumnext/client",
-  "version": "0.101.1",
+  "version": "0.101.3",
   "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
   "private": true,
   "license": "AGPL-3.0-only",
@@ -47,7 +47,7 @@
     "i18next": "25.7.3",
     "i18next-http-backend": "3.0.2",
     "jquery": "3.7.1",
-    "jquery.fancytree": "2.38.5",    
+    "jquery.fancytree": "2.38.5",
     "jsplumb": "2.15.6",
     "katex": "0.16.27",
     "knockout": "3.5.1",

apps/client/src/components/app_context.ts

@@ -154,6 +154,7 @@ export type CommandMappings = {
     };
     openInTab: ContextMenuCommandData;
     openNoteInSplit: ContextMenuCommandData;
+    openNoteInWindow: ContextMenuCommandData;
     openNoteInPopup: ContextMenuCommandData;
     toggleNoteHoisting: ContextMenuCommandData;
     insertNoteAfter: ContextMenuCommandData;

apps/client/src/desktop.html

@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <link rel="shortcut icon" href="favicon.ico">
-        <meta name="mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover" />
-        <!-- <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest"> -->
-        <title>Trilium Notes</title>
-    </head>
-
-    <body id="trilium-app">
-        <noscript><%= t("javascript-required") %></noscript>
-
-        <script>
-            // hide body to reduce flickering on the startup. This is done through JS and not CSS to not hide <noscript>
-            document.getElementsByTagName("body")[0].style.display = "none";
-        </script>
-
-        <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>
-
-        <!-- Required for match the PWA's top bar color with the theme -->
-        <!-- This works even when the user directly changes --root-background in CSS -->
-        <div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>
-
-        <!-- Bootstrap (request server for required information) -->
-        <script>
-            async function bootstrap() {
-                await setupGlob();
-                loadStylesheets();
-                loadIcons();
-                setBodyAttributes();
-                await loadScripts();
-            }
-
-            async function setupGlob() {
-                const response = await fetch("/bootstrap");
-                console.log("Service worker state", navigator.serviceWorker.controller);
-                console.log("Resp", response);
-                const json = await response.json();
-                console.log("Bootstrap", json);
-                
-                global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
-                window.glob = {
-                    ...json,
-                    activeDialog: null
-                };
-            }
-
-            function loadStylesheets() {
-                const { assetPath, themeCssUrl, themeUseNextAsBase } = window.glob;
-                const cssToLoad = [];
-                cssToLoad.push(`${assetPath}/stylesheets/theme-light.css`);
-                if (themeCssUrl) {
-                    cssToLoad.push(themeCssUrl);
-                }
-                if (themeUseNextAsBase === "next") {
-                    cssToLoad.push(`${assetPath}/stylesheets/theme-next.css`)
-                } else if (themeUseNextAsBase === "next-dark") {
-                    cssToLoad.push(`${assetPath}/stylesheets/theme-next-dark.css`)
-                } else if (themeUseNextAsBase === "next-light") {
-                    cssToLoad.push(`${assetPath}/stylesheets/theme-next-light.css`)
-                }
-                cssToLoad.push(`${assetPath}/stylesheets/style.css`);
-
-                for (const href of cssToLoad) {
-                    const linkEl = document.createElement("link");
-                    linkEl.href = href;
-                    linkEl.rel = "stylesheet";
-                    document.body.appendChild(linkEl);
-                }
-            }
-
-            function loadIcons() {
-                const styleEl = document.createElement("style");
-                styleEl.innerText = window.glob.iconPackCss;
-                document.head.appendChild(styleEl);
-            }
-
-            function setBodyAttributes() {
-                const { device, headingStyle, layoutOrientation, platform, isElectron, hasNativeTitleBar, hasBackgroundEffects, currentLocale } = window.glob;
-                const classesToSet = [
-                    device,
-                    `heading-style-${headingStyle}`,
-                    `layout-${layoutOrientation}`,
-                    `platform-${platform}`,
-                    isElectron && "isElectron",
-                    hasNativeTitleBar && "native-titlebar",
-                    hasBackgroundEffects && "background-effects"
-                ].filter(Boolean);
-
-                for (const classToSet of classesToSet) {
-                    document.body.classList.add(classToSet);
-                }
-
-                document.body.lang = currentLocale.id;
-                document.body.dir = currentLocale.rtl ? "rtl" : "ltr";
-            }
-
-            async function loadScripts() {
-                const assetPath = glob.assetPath;
-                await import(`./${assetPath}/runtime.js`);
-                await import(`./${assetPath}/desktop.js`);
-            }
-            
-            bootstrap();
-        </script>
-
-        <!-- Required for correct loading of scripts in Electron -->
-        <script>
-            if (typeof module === 'object') {window.module = module; module = undefined;}
-        </script>
-    </body>
-</html>

apps/client/src/menus/tree_context_menu.ts

@@ -79,6 +79,7 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
         const items: (MenuItem<TreeCommandNames> | null)[] = [
             { title: t("tree-context-menu.open-in-a-new-tab"), command: "openInTab", shortcut: "Ctrl+Click", uiIcon: "bx bx-link-external", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-a-new-split"), command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
+            { title: t("tree-context-menu.open-in-a-new-window"), command: "openNoteInWindow", uiIcon: "bx bx-window-open", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-popup"), command: "openNoteInPopup", uiIcon: "bx bx-edit", enabled: noSelectedNotes },
 
             isHoisted
@@ -309,6 +310,11 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
             const { ntxId } = subContexts?.[subContexts.length - 1] ?? {};
 
             this.treeWidget.triggerCommand("openNewNoteSplit", { ntxId, notePath });
+        } else if (command === "openNoteInWindow") {
+            appContext.triggerCommand("openInWindow", {
+                notePath,
+                hoistedNoteId: appContext.tabManager.getActiveContext()?.hoistedNoteId
+            });
         } else if (command === "openNoteInPopup") {
             appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
         } else if (command === "convertNoteToAttachment") {

apps/client/src/services/content_renderer.ts

@@ -23,6 +23,12 @@ export interface RenderOptions {
     imageHasZoom?: boolean;
     /** If enabled, it will prevent the default behavior in which an empty note would display a list of children. */
     noChildrenList?: boolean;
+    /** If enabled, it will prevent rendering of included notes. */
+    noIncludedNotes?: boolean;
+    /** If enabled, it will include archived notes when rendering children list. */
+    includeArchivedNotes?: boolean;
+    /** Set of note IDs that have already been seen during rendering to prevent infinite recursion. */
+    seenNoteIds?: Set<string>;
 }
 
 const CODE_MIME_TYPES = new Set(["application/json"]);

apps/client/src/services/content_renderer_text.spec.ts

@@ -0,0 +1,132 @@
+import { trimIndentation } from "@triliumnext/commons";
+import { describe, expect, it } from "vitest";
+
+import { buildNote } from "../test/easy-froca";
+import renderText from "./content_renderer_text";
+
+describe("Text content renderer", () => {
+    it("renders included note", async () => {
+        const contentEl = document.createElement("div");
+        const includedNote = buildNote({
+            title: "Included note",
+            content: "<p>This is the included note.</p>"
+        });
+        const note = buildNote({
+            title: "New note",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="${includedNote.noteId}" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl));
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(1);
+        expect(contentEl.querySelectorAll("section.include-note p").length).toBe(1);
+    });
+
+    it("skips rendering included note", async () => {
+        const contentEl = document.createElement("div");
+        const includedNote = buildNote({
+            title: "Included note",
+            content: "<p>This is the included note.</p>"
+        });
+        const note = buildNote({
+            title: "New note",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="${includedNote.noteId}" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl), { noIncludedNotes: true });
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(0);
+    });
+
+    it("doesn't enter infinite loop on direct recursion", async () => {
+        const contentEl = document.createElement("div");
+        const note = buildNote({
+            title: "New note",
+            id: "Y7mBwmRjQyb4",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="Y7mBwmRjQyb4" data-box-size="medium">
+                    &nbsp;
+                </section>
+                <section class="include-note" data-note-id="Y7mBwmRjQyb4" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl));
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(0);
+    });
+
+    it("doesn't enter infinite loop on indirect recursion", async () => {
+        const contentEl = document.createElement("div");
+        buildNote({
+            id: "first",
+            title: "Included note",
+            content: trimIndentation`\
+                <p>This is the included note.</p>
+                <section class="include-note" data-note-id="second" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        const note = buildNote({
+            id: "second",
+            title: "New note",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="first" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl));
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(1);
+    });
+
+    it("renders children list when note is empty", async () => {
+        const contentEl = document.createElement("div");
+        const parentNote = buildNote({
+            title: "Parent note",
+            children: [
+                { title: "Child note 1" },
+                { title: "Child note 2" }
+            ]
+        });
+        await renderText(parentNote, $(contentEl));
+        const items = contentEl.querySelectorAll("a");
+        expect(items.length).toBe(2);
+        expect(items[0].textContent).toBe("Child note 1");
+        expect(items[1].textContent).toBe("Child note 2");
+    });
+
+    it("skips archived notes in children list", async () => {
+        const contentEl = document.createElement("div");
+        const parentNote = buildNote({
+            title: "Parent note",
+            children: [
+                { title: "Child note 1" },
+                { title: "Child note 2", "#archived": "" },
+                { title: "Child note 3" }
+            ]
+        });
+        await renderText(parentNote, $(contentEl));
+        const items = contentEl.querySelectorAll("a");
+        expect(items.length).toBe(2);
+        expect(items[0].textContent).toBe("Child note 1");
+        expect(items[1].textContent).toBe("Child note 3");
+    });
+});

apps/client/src/services/content_renderer_text.ts

@@ -15,7 +15,14 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
 
     if (blob && !isHtmlEmpty(blob.content)) {
         $renderedContent.append($('<div class="ck-content">').html(blob.content));
-        await renderIncludedNotes($renderedContent[0]);
+
+        const seenNoteIds = options.seenNoteIds ?? new Set<string>();
+        seenNoteIds.add("noteId" in note ? note.noteId : note.attachmentId);
+        if (!options.noIncludedNotes) {
+            await renderIncludedNotes($renderedContent[0], seenNoteIds);
+        } else {
+            $renderedContent.find("section.include-note").remove();
+        }
 
         if ($renderedContent.find("span.math-tex").length > 0) {
             renderMathInElement($renderedContent[0], { trust: true });
@@ -35,11 +42,11 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
         await rewriteMermaidDiagramsInContainer($renderedContent[0] as HTMLDivElement);
         await formatCodeBlocks($renderedContent);
     } else if (note instanceof FNote && !options.noChildrenList) {
-        await renderChildrenList($renderedContent, note);
+        await renderChildrenList($renderedContent, note, options.includeArchivedNotes ?? false);
     }
 }
 
-async function renderIncludedNotes(contentEl: HTMLElement) {
+async function renderIncludedNotes(contentEl: HTMLElement, seenNoteIds: Set<string>) {
     // TODO: Consider duplicating with server's share/content_renderer.ts.
     const includeNoteEls = contentEl.querySelectorAll("section.include-note");
 
@@ -66,8 +73,18 @@ async function renderIncludedNotes(contentEl: HTMLElement) {
             continue;
         }
 
-        const renderedContent = (await content_renderer.getRenderedContent(note)).$renderedContent;
+        if (seenNoteIds.has(noteId)) {
+            console.warn(`Skipping inclusion of ${noteId} to avoid circular reference.`);
+            includeNoteEl.remove();
+            continue;
+        }
+
+        const renderedContent = (await content_renderer.getRenderedContent(note, {
+            seenNoteIds
+        })).$renderedContent;
         includeNoteEl.replaceChildren(...renderedContent);
+
+        seenNoteIds.add(noteId);
     }
 }
 
@@ -98,7 +115,7 @@ export async function applyInlineMermaid(container: HTMLDivElement) {
     }
 }
 
-async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote) {
+async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote, includeArchivedNotes: boolean) {
     let childNoteIds = note.getChildNoteIds();
 
     if (!childNoteIds.length) {
@@ -108,14 +125,16 @@ async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: F
     $renderedContent.css("padding", "10px");
     $renderedContent.addClass("text-with-ellipsis");
 
+    // just load the first 10 child notes
     if (childNoteIds.length > 10) {
         childNoteIds = childNoteIds.slice(0, 10);
     }
 
-    // just load the first 10 child notes
     const childNotes = await froca.getNotes(childNoteIds);
 
     for (const childNote of childNotes) {
+        if (childNote.isArchived && !includeArchivedNotes) continue;
+
         $renderedContent.append(
             await link.createLink(`${note.noteId}/${childNote.noteId}`, {
                 showTooltip: false,

apps/client/src/services/note_autocomplete.ts

@@ -12,7 +12,7 @@ const SELECTED_NOTE_PATH_KEY = "data-note-path";
 const SELECTED_EXTERNAL_LINK_KEY = "data-external-link";
 
 // To prevent search lag when there are a large number of notes, set a delay based on the number of notes to avoid jitter.
-const notesCount = 10000; // TODO: Replace with dynamic count from becca once available.
+const notesCount = await server.get<number>(`autocomplete/notesCount`);
 let debounceTimeoutId: ReturnType<typeof setTimeout>;
 
 function getSearchDelay(notesCount: number): number {

apps/client/src/services/promoted_attribute_definition_parser.ts

@@ -1,4 +1,14 @@
-import { DefinitionObject, LabelType, Multiplicity } from "@triliumnext/commons";
+export type LabelType = "text" | "number" | "boolean" | "date" | "datetime" | "time" | "url" | "color";
+type Multiplicity = "single" | "multi";
+
+export interface DefinitionObject {
+    isPromoted?: boolean;
+    labelType?: LabelType;
+    multiplicity?: Multiplicity;
+    numberPrecision?: number;
+    promotedAlias?: string;
+    inverseRelation?: string;
+}
 
 function parse(value: string) {
     const tokens = value.split(",").map((t) => t.trim());

apps/client/src/services/utils.ts

@@ -133,8 +133,6 @@ export function isElectron() {
     return !!(window && window.process && window.process.type);
 }
 
-export const isStandalone = window.glob.isStandalone;
-
 /**
  * Returns `true` if the client is running as a PWA, otherwise `false`.
  */
@@ -816,7 +814,7 @@ function compareVersions(v1: string, v2: string): number {
 /**
  * Compares two semantic version strings and returns `true` if the latest version is greater than the current version.
  */
-export function isUpdateAvailable(latestVersion: string | null | undefined, currentVersion: string): boolean {
+function isUpdateAvailable(latestVersion: string | null | undefined, currentVersion: string): boolean {
     if (!latestVersion) {
         return false;
     }

apps/client/src/translations/de/translation.json

@@ -25,7 +25,8 @@
     },
     "widget-list-error": {
       "title": "Abruf der Liste von Widgets vom Server ist fehlgeschlagen"
-    }
+    },
+    "open-script-note": "Script-Notiz öffnen"
   },
   "add_link": {
     "add_link": "Link hinzufügen",
@@ -208,7 +209,8 @@
   "info": {
     "modalTitle": "Infonachricht",
     "closeButton": "Schließen",
-    "okButton": "OK"
+    "okButton": "OK",
+    "copy_to_clipboard": "In die Zwischenablage kopieren"
   },
   "jump_to_note": {
     "search_button": "Suche im Volltext",
@@ -695,7 +697,9 @@
     "export_as_image": "Als Bild exportieren",
     "export_as_image_png": "PNG (Raster)",
     "export_as_image_svg": "SVG (Vektor)",
-    "note_map": "Notizen Karte"
+    "note_map": "Notizen Karte",
+    "view_revisions": "Notizrevisionen",
+    "advanced": "Erweitert"
   },
   "onclick_button": {
     "no_click_handler": "Das Schaltflächen-Widget „{{componentId}}“ hat keinen definierten Klick-Handler"

apps/client/src/translations/en/translation.json

@@ -1643,6 +1643,7 @@
   "tree-context-menu": {
     "open-in-a-new-tab": "Open in a new tab",
     "open-in-a-new-split": "Open in a new split",
+    "open-in-a-new-window": "Open in a new window",
     "insert-note-after": "Insert note after",
     "insert-child-note": "Insert child note",
     "archive": "Archive",

apps/client/src/translations/es/translation.json

@@ -21,7 +21,13 @@
     },
     "bundle-error": {
       "title": "Hubo un fallo al cargar un script personalizado",
-      "message": "El script de la nota con ID \"{{id}}\", titulado \"{{title}}\" no pudo ser ejecutado debido a:\n\n{{message}}"
+      "message": "El script no pudo ser ejecutado debido a:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Hubo un fallo al obtener la lista de widgets del servidor"
+    },
+    "widget-render-error": {
+      "title": "Hubo un fallo al renderizar un widget personalizado de React"
     }
   },
   "add_link": {
@@ -162,7 +168,8 @@
     "other": "Otro",
     "quickSearch": "centrarse en la entrada de búsqueda rápida",
     "inPageSearch": "búsqueda en la página",
-    "title": "Hoja de ayuda"
+    "title": "Hoja de ayuda",
+    "editShortcuts": "Editar atajos de teclado"
   },
   "import": {
     "importIntoNote": "Importar a nota",
@@ -690,7 +697,7 @@
     "convert_into_attachment_successful": "La nota '{{title}}' ha sido convertida a un archivo adjunto.",
     "convert_into_attachment_prompt": "¿Está seguro que desea convertir la nota '{{title}}' en un archivo adjunto de la nota padre?",
     "print_pdf": "Exportar como PDF...",
-    "open_note_on_server": "Abrir nota en el servidor"
+    "open_note_on_server": "Abrir nota en servidor"
   },
   "onclick_button": {
     "no_click_handler": "El widget de botón '{{componentId}}' no tiene un controlador de clics definido"
@@ -736,7 +743,7 @@
   "zpetne_odkazy": {
     "relation": "relación",
     "backlink_one": "{{count}} Vínculo de retroceso",
-    "backlink_many": "",
+    "backlink_many": "{{count}} Vínculos de retroceso",
     "backlink_other": "{{count}} vínculos de retroceso"
   },
   "mobile_detail_menu": {
@@ -749,7 +756,10 @@
   "note_icon": {
     "change_note_icon": "Cambiar icono de nota",
     "search": "Búsqueda:",
-    "reset-default": "Restablecer a icono por defecto"
+    "reset-default": "Restablecer a icono por defecto",
+    "search_placeholder_one": "Buscar {{number}} icono a través de {{count}} paquetes",
+    "search_placeholder_many": "Buscar {{number}} iconos a través de {{count}} paquetes",
+    "search_placeholder_other": "Buscar {{number}} iconos a través de {{count}} paquetes"
   },
   "basic_properties": {
     "note_type": "Tipo de nota",
@@ -789,7 +799,7 @@
     "file_type": "Tipo de archivo",
     "file_size": "Tamaño del archivo",
     "download": "Descargar",
-    "open": "Abrir",
+    "open": "Abrir externamente",
     "upload_new_revision": "Subir nueva revisión",
     "upload_success": "Se ha subido una nueva revisión de archivo.",
     "upload_failed": "Error al cargar una nueva revisión de archivo.",
@@ -1302,11 +1312,11 @@
   "code_mime_types": {
     "title": "Tipos MIME disponibles en el menú desplegable",
     "tooltip_syntax_highlighting": "Resaltado de sintaxis",
-    "tooltip_code_block_syntax": "Bloques de código en notas de texto",
-    "tooltip_code_note_syntax": "Notas de código"
+    "tooltip_code_block_syntax": "Bloques de Código en notas de Texto",
+    "tooltip_code_note_syntax": "Notas de Código"
   },
   "vim_key_bindings": {
-    "use_vim_keybindings_in_code_notes": "Atajos de teclas de Vim",
+    "use_vim_keybindings_in_code_notes": "Combinaciones de teclas Vim",
     "enable_vim_keybindings": "Habilitar los atajos de teclas de Vim en la notas de código (no es modo ex)"
   },
   "wrap_lines": {
@@ -1571,7 +1581,7 @@
     "will_be_deleted_in": "Este archivo adjunto se eliminará automáticamente en {{time}}",
     "will_be_deleted_soon": "Este archivo adjunto se eliminará automáticamente pronto",
     "deletion_reason": ", porque el archivo adjunto no está vinculado en el contenido de la nota. Para evitar la eliminación, vuelva a agregar el enlace del archivo adjunto al contenido o convierta el archivo adjunto en una nota.",
-    "role_and_size": "Rol: {{role}}, Tamaño: {{size}}",
+    "role_and_size": "Rol: {{role}}, tamaño: {{size}}, MIME: {{- mimeType}}",
     "link_copied": "Enlace del archivo adjunto copiado al portapapeles.",
     "unrecognized_role": "Rol de archivo adjunto no reconocido '{{role}}'."
   },
@@ -1622,7 +1632,7 @@
     "import-into-note": "Importar a nota",
     "apply-bulk-actions": "Aplicar acciones en lote",
     "converted-to-attachments": "{{count}} notas han sido convertidas en archivos adjuntos.",
-    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres?",
+    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres? Esta operación solo aplica a notas de Imagen, otras notas serán omitidas.",
     "open-in-popup": "Edición rápida",
     "archive": "Archivar",
     "unarchive": "Desarchivar"
@@ -1717,7 +1727,10 @@
   "note_detail": {
     "could_not_find_typewidget": "No se pudo encontrar typeWidget para el tipo '{{type}}'",
     "printing": "Impresión en curso...",
-    "printing_pdf": "Exportando a PDF en curso.."
+    "printing_pdf": "Exportando a PDF en curso..",
+    "print_report_collection_content_one": "{{count}} nota en la colección no se puede imprimir porque no son compatibles o está protegida.",
+    "print_report_collection_content_many": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
+    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas."
   },
   "note_title": {
     "placeholder": "escriba el título de la nota aquí..."
@@ -1929,7 +1942,7 @@
     "unknown_widget": "Widget desconocido para \"{{id}}\"."
   },
   "note_language": {
-    "not_set": "No establecido",
+    "not_set": "Idioma no establecido",
     "configure-languages": "Configurar idiomas..."
   },
   "content_language": {
@@ -1968,7 +1981,7 @@
     "hide-weekends": "Ocultar fines de semana",
     "show-scale": "Mostrar escala",
     "display-week-numbers": "Mostrar números de semana",
-    "map-style": "Estilo de mapa:",
+    "map-style": "Estilo de mapa",
     "max-nesting-depth": "Máxima profundidad de anidamiento:",
     "vector_light": "Vector (claro)",
     "vector_dark": "Vector (oscuro)",
@@ -2097,5 +2110,36 @@
     "clear-color": "Borrar color de nota",
     "set-color": "Asignar color de nota",
     "set-custom-color": "Asignar color de nota personalizado"
+  },
+  "status_bar": {
+    "backlinks_one": "{{count}} vínculo de retroceso",
+    "backlinks_many": "{{count}} vínculos de retroceso",
+    "backlinks_other": "{{count}} vínculos de retroceso",
+    "backlinks_title_one": "Ver vínculo de retroceso",
+    "backlinks_title_many": "Ver vínculos de retroceso",
+    "backlinks_title_other": "Ver vínculos de retroceso",
+    "attachments_one": "{{count}} adjunto",
+    "attachments_many": "{{count}} adjuntos",
+    "attachments_other": "{{count}} adjuntos",
+    "attachments_title_one": "Ver adjunto en una nueva pestaña",
+    "attachments_title_many": "Ver adjuntos en una nueva pestaña",
+    "attachments_title_other": "Ver adjuntos en una nueva pestaña",
+    "attributes_one": "{{count}} atributo",
+    "attributes_many": "{{count}} atributos",
+    "attributes_other": "{{count}} atributos",
+    "note_paths_one": "{{count}} ruta",
+    "note_paths_many": "{{count}} rutas",
+    "note_paths_other": "{{count}} rutas"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} adjunto",
+    "attachments_many": "{{count}} adjuntos",
+    "attachments_other": "{{count}} adjuntos",
+    "layers_one": "{{count}} capa",
+    "layers_many": "{{count}} capas",
+    "layers_other": "{{count}} capas",
+    "pages_one": "{{count}} página",
+    "pages_many": "{{count}} páginas",
+    "pages_other": "{{count}} páginas"
   }
 }

apps/client/src/translations/fr/translation.json

@@ -21,7 +21,7 @@
     },
     "bundle-error": {
       "title": "Echec du chargement d'un script personnalisé",
-      "message": "Le script de la note avec l'ID \"{{id}}\", intitulé \"{{title}}\" n'a pas pu être exécuté à cause de\n\n{{message}}"
+      "message": "Le script n'a pas pu être exécuté à cause de\n\n{{message}}"
     },
     "widget-list-error": {
       "title": "Impossible d'obtenir la liste des widgets depuis le serveur"

apps/client/src/translations/hi/translation.json

@@ -31,5 +31,17 @@
   },
   "add_link": {
     "note": "नोट"
+  },
+  "bulk_actions": {
+    "other": "अन्य"
+  },
+  "clone_to": {
+    "search_for_note_by_its_name": "नोट क नाम से नोट खोजें"
+  },
+  "confirm": {
+    "also_delete_note": "नोट भी डिलीट करें"
+  },
+  "delete_notes": {
+    "delete_notes_preview": "नोट्स प्रिव्यू डिलीट करें"
   }
 }

apps/client/src/translations/it/translation.json

@@ -1895,7 +1895,11 @@
     "create-child-note": "Crea nota figlio",
     "unhoist": "Sganciare",
     "toggle-sidebar": "Attiva/disattiva la barra laterale",
-    "dropping-not-allowed": "Non è consentito lasciare appunti in questa posizione."
+    "dropping-not-allowed": "Non è consentito lasciare appunti in questa posizione.",
+    "clone-indicator-tooltip": "Questa nota ha {{- count}} genitori: {{- parents}}",
+    "clone-indicator-tooltip-single": "Questa nota è stata clonata (1 genitore aggiuntivo: {{- parent}})",
+    "shared-indicator-tooltip": "Questa nota è condivisa pubblicamente",
+    "shared-indicator-tooltip-with-url": "Questa nota è condivisa pubblicamente all'indirizzo: {{- url}}"
   },
   "title_bar_buttons": {
     "window-on-top": "Mantieni la finestra in primo piano"
@@ -2200,7 +2204,14 @@
     "execute_sql_description": "Questa nota è una nota SQL. Clicca per eseguire la query SQL.",
     "shared_copy_to_clipboard": "Copia link negli appunti",
     "shared_open_in_browser": "Apri il link nel browser",
-    "shared_unshare": "Rimuovi condivisione"
+    "shared_unshare": "Rimuovi condivisione",
+    "save_status_saved": "Salvato",
+    "save_status_saving": "Salvataggio in corso...",
+    "save_status_unsaved": "Non salvato",
+    "save_status_error": "Salvataggio non riuscito",
+    "save_status_saving_tooltip": "Le modifiche sono state salvate.",
+    "save_status_unsaved_tooltip": "Ci sono modifiche non salvate. Verranno salvate automaticamente tra un attimo.",
+    "save_status_error_tooltip": "Si è verificato un errore durante il salvataggio della nota. Se possibile, prova a copiare il contenuto della nota altrove e a ricaricare l'applicazione."
   },
   "breadcrumb": {
     "workspace_badge": "Area di lavoro",
@@ -2243,5 +2254,18 @@
     "empty_button": "Nascondi il pannello",
     "toggle": "Attiva/disattiva pannello destro",
     "custom_widget_go_to_source": "Vai al codice sorgente"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} allegato",
+    "attachments_many": "{{count}} allegati",
+    "attachments_other": "{{count}} allegati",
+    "layers_one": "{{count}} livello",
+    "layers_many": "{{count}} livelli",
+    "layers_other": "{{count}} livelli",
+    "pages_one": "{{count}} pagina",
+    "pages_many": "{{count}} pagine",
+    "pages_other": "{{count}} pagine",
+    "pages_alt": "Pagina {{pageNumber}}",
+    "pages_loading": "Caricamento in corso..."
   }
 }

apps/client/src/types.d.ts

@@ -36,7 +36,6 @@ interface CustomGlobals {
     isProtectedSessionAvailable: boolean;
     isDev: boolean;
     isMainWindow: boolean;
-    isStandalone?: boolean;
     maxEntityChangeIdAtLoad: number;
     maxEntityChangeSyncIdAtLoad: number;
     assetPath: string;

apps/client/src/widgets/NoteDetail.tsx

@@ -215,7 +215,7 @@ export default function NoteDetail() {
     return (
         <div
             ref={containerRef}
-            class={`note-detail ${isFullHeight ? "full-height" : ""}`}
+            class={`component note-detail ${isFullHeight ? "full-height" : ""}`}
         >
             {Object.entries(noteTypesToRender).map(([ itemType, Element ]) => {
                 return <NoteDetailWrapper

apps/client/src/widgets/attribute_widgets/UserAttributesList.tsx

@@ -1,16 +1,14 @@
-import "./UserAttributesList.css";
-
-import type { DefinitionObject } from "@triliumnext/commons";
-import { ComponentChildren, CSSProperties } from "preact";
 import { useState } from "preact/hooks";
-
 import FNote from "../../entities/fnote";
-import attributes from "../../services/attributes";
-import { getReadableTextColor } from "../../services/css_class_manager";
-import { formatDateTime } from "../../utils/formatters";
+import "./UserAttributesList.css";
 import { useTriliumEvent } from "../react/hooks";
+import attributes from "../../services/attributes";
+import { DefinitionObject } from "../../services/promoted_attribute_definition_parser";
+import { formatDateTime } from "../../utils/formatters";
+import { ComponentChildren, CSSProperties } from "preact";
 import Icon from "../react/Icon";
 import NoteLink from "../react/NoteLink";
+import { getReadableTextColor } from "../../services/css_class_manager";
 
 interface UserAttributesListProps {
     note: FNote;
@@ -31,7 +29,7 @@ export default function UserAttributesDisplay({ note, ignoredAttributes }: UserA
         <div className="user-attributes">
             {userAttributes?.map(attr => buildUserAttribute(attr))}
         </div>
-    );
+    )
 
 }
 
@@ -48,13 +46,13 @@ function useNoteAttributesWithDefinitions(note: FNote, attributesToIgnore:  stri
 }
 
 function UserAttribute({ attr, children, style }: { attr: AttributeWithDefinitions, children: ComponentChildren, style?: CSSProperties }) {
-    const className = `${attr.type === "label" ? `label` + ` ${  attr.def.labelType}` : "relation"}`;
+    const className = `${attr.type === "label" ? "label" + " " + attr.def.labelType : "relation"}`;
 
     return (
         <span key={attr.friendlyName} className={`user-attribute type-${className}`} style={style}>
             {children}
         </span>
-    );
+    )
 }
 
 function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
@@ -63,7 +61,7 @@ function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
     let style: CSSProperties | undefined;
 
     if (attr.type === "label") {
-        const value = attr.value;
+        let value = attr.value;
         switch (attr.def.labelType) {
             case "number":
                 let formattedValue = value;
@@ -104,7 +102,7 @@ function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
         content = <>{defaultLabel}<NoteLink notePath={attr.value} showNoteIcon /></>;
     }
 
-    return <UserAttribute attr={attr} style={style}>{content}</UserAttribute>;
+    return <UserAttribute attr={attr} style={style}>{content}</UserAttribute>
 }
 
 function getAttributesWithDefinitions(note: FNote, attributesToIgnore: string[] = []): AttributeWithDefinitions[] {

apps/client/src/widgets/buttons/global_menu.tsx

@@ -8,7 +8,7 @@ import { CommandNames } from "../../components/app_context";
 import Component from "../../components/component";
 import { ExperimentalFeature, ExperimentalFeatureId, experimentalFeatures, isExperimentalFeatureEnabled, toggleExperimentalFeature } from "../../services/experimental_features";
 import { t } from "../../services/i18n";
-import utils, { dynamicRequire, isElectron, isMobile, isStandalone, reloadFrontendApp } from "../../services/utils";
+import utils, { dynamicRequire, isElectron, isMobile, reloadFrontendApp } from "../../services/utils";
 import Dropdown from "../react/Dropdown";
 import { FormDropdownDivider, FormDropdownSubmenu, FormListHeader, FormListItem } from "../react/FormList";
 import { useStaticTooltip, useStaticTooltipWithKeyboardShortcut, useTriliumOption, useTriliumOptionBool, useTriliumOptionInt } from "../react/hooks";
@@ -249,7 +249,7 @@ function ToggleWindowOnTop() {
 function useTriliumUpdateStatus() {
     const [ latestVersion, setLatestVersion ] = useState<string>();
     const [ checkForUpdates ] = useTriliumOptionBool("checkForUpdates");
-    const isUpdateAvailable = utils.isUpdateAvailable(latestVersion, window.glob.triliumVersion);
+    const isUpdateAvailable = utils.isUpdateAvailable(latestVersion, glob.triliumVersion);
 
     async function updateVersionStatus() {
         const RELEASES_API_URL = "https://api.github.com/repos/TriliumNext/Trilium/releases/latest";
@@ -267,7 +267,7 @@ function useTriliumUpdateStatus() {
     }
 
     useEffect(() => {
-        if (!checkForUpdates || !isStandalone) {
+        if (!checkForUpdates) {
             setLatestVersion(undefined);
             return;
         }

apps/client/src/widgets/collections/legacy/ListOrGridView.tsx

@@ -44,6 +44,7 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
 export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) {
     const noteIds = useFilteredNoteIds(note, unfilteredNoteIds);
     const { pageNotes, ...pagination } = usePagination(note, noteIds);
+    const [ includeArchived ] = useNoteLabelBoolean(note, "includeArchived");
 
     return (
         <div class="note-list grid-view">
@@ -52,7 +53,7 @@ export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
 
                 <div class="note-list-container use-tn-links">
                     {pageNotes?.map(childNote => (
-                        <GridNoteCard note={childNote} parentNote={note} highlightedTokens={highlightedTokens} />
+                        <GridNoteCard note={childNote} parentNote={note} highlightedTokens={highlightedTokens} includeArchived={includeArchived} />
                     ))}
                 </div>
 
@@ -94,14 +95,16 @@ function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expan
             </h5>
 
             {isExpanded && <>
-                <NoteContent note={note} highlightedTokens={highlightedTokens} noChildrenList />
+                <NoteContent note={note} highlightedTokens={highlightedTokens} noChildrenList includeArchivedNotes={includeArchived} />
                 <NoteChildren note={note} parentNote={parentNote} highlightedTokens={highlightedTokens} currentLevel={currentLevel} expandDepth={expandDepth} includeArchived={includeArchived} />
             </>}
         </div>
     );
 }
 
-function GridNoteCard({ note, parentNote, highlightedTokens }: { note: FNote, parentNote: FNote, highlightedTokens: string[] | null | undefined }) {
+function GridNoteCard({ note, parentNote, highlightedTokens, includeArchived }: { note: FNote, parentNote: FNote, highlightedTokens: string[] | null | undefined, includeArchived: boolean }) {
+    const titleRef = useRef<HTMLSpanElement>(null);
+    const [ noteTitle, setNoteTitle ] = useState<string>();
     const notePath = getNotePath(parentNote, note);
 
     return (
@@ -120,6 +123,7 @@ function GridNoteCard({ note, parentNote, highlightedTokens }: { note: FNote, pa
                 note={note}
                 trim
                 highlightedTokens={highlightedTokens}
+                includeArchivedNotes={includeArchived}
             />
         </div>
     );
@@ -136,14 +140,22 @@ function NoteAttributes({ note }: { note: FNote }) {
     return <span className="note-list-attributes" ref={ref} />;
 }
 
-function NoteContent({ note, trim, noChildrenList, highlightedTokens }: { note: FNote, trim?: boolean, noChildrenList?: boolean, highlightedTokens: string[] | null | undefined }) {
+function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArchivedNotes }: {
+    note: FNote;
+    trim?: boolean;
+    noChildrenList?: boolean;
+    highlightedTokens: string[] | null | undefined;
+    includeArchivedNotes: boolean;
+}) {
     const contentRef = useRef<HTMLDivElement>(null);
     const highlightSearch = useImperativeSearchHighlighlighting(highlightedTokens);
 
     useEffect(() => {
         content_renderer.getRenderedContent(note, {
             trim,
-            noChildrenList
+            noChildrenList,
+            noIncludedNotes: true,
+            includeArchivedNotes
         })
             .then(({ $renderedContent, type }) => {
                 if (!contentRef.current) return;

apps/client/src/widgets/collections/table/columns.tsx

@@ -1,12 +1,11 @@
-import { LabelType } from "@triliumnext/commons";
-import { JSX } from "preact";
-import { useEffect, useRef, useState } from "preact/hooks";
 import type { CellComponent, ColumnDefinition, EmptyCallback, FormatterParams, ValueBooleanCallback, ValueVoidCallback } from "tabulator-tables";
-
-import froca from "../../../services/froca.js";
-import Icon from "../../react/Icon.jsx";
-import NoteAutocomplete from "../../react/NoteAutocomplete.jsx";
+import { LabelType } from "../../../services/promoted_attribute_definition_parser.js";
+import { JSX } from "preact";
 import { renderReactWidget } from "../../react/react_utils.jsx";
+import Icon from "../../react/Icon.jsx";
+import { useEffect, useRef, useState } from "preact/hooks";
+import froca from "../../../services/froca.js";
+import NoteAutocomplete from "../../react/NoteAutocomplete.jsx";
 
 type ColumnType = LabelType | "relation";
 
@@ -79,7 +78,7 @@ export function buildColumnDefinitions({ info, movableRows, existingColumnData,
             rowHandle: movableRows,
             width: calculateIndexColumnWidth(rowNumberHint, movableRows),
             formatter: wrapFormatter(({ cell, formatterParams }) => <div>
-                {(formatterParams as RowNumberFormatterParams).movableRows && <><span class="bx bx-dots-vertical-rounded" />{" "}</>}
+                {(formatterParams as RowNumberFormatterParams).movableRows && <><span class="bx bx-dots-vertical-rounded"></span>{" "}</>}
                 {cell.getRow().getPosition(true)}
             </div>),
             formatterParams: { movableRows } satisfies RowNumberFormatterParams
@@ -201,14 +200,14 @@ function wrapEditor(Component: (opts: EditorOpts) => JSX.Element): ((
     editorParams: {},
 ) => HTMLElement | false) {
     return (cell, _, success, cancel, editorParams) => {
-        const elWithParams = <Component cell={cell} success={success} cancel={cancel} editorParams={editorParams} />;
+        const elWithParams = <Component cell={cell} success={success} cancel={cancel} editorParams={editorParams} />
         return renderReactWidget(null, elWithParams)[0];
     };
 }
 
 function NoteFormatter({ cell }: FormatterOpts) {
     const noteId = cell.getValue();
-    const [ note, setNote ] = useState(noteId ? froca.getNoteFromCache(noteId) : null);
+    const [ note, setNote ] = useState(noteId ? froca.getNoteFromCache(noteId) : null)
 
     useEffect(() => {
         if (!noteId || note?.noteId === noteId) return;
@@ -232,5 +231,5 @@ function RelationEditor({ cell, success }: EditorOpts) {
             hideAllButtons: true
         }}
         noteIdChanged={success}
-    />;
+    />
 }

apps/client/src/widgets/dialogs/recent_changes.tsx

@@ -27,7 +27,6 @@ export default function RecentChangesDialog() {
     });
 
     useEffect(() => {
-        if (!ancestorNoteId) return;
         server.get<RecentChangeRow[]>(`recent-changes/${ancestorNoteId}`)
             .then(async (recentChanges) => {
                 // preload all notes into cache

apps/client/src/widgets/launch_bar/LauncherContainer.tsx

@@ -1,17 +1,18 @@
 import { useCallback, useLayoutEffect, useState } from "preact/hooks";
+
 import FNote from "../../entities/fnote";
 import froca from "../../services/froca";
 import { isDesktop, isMobile } from "../../services/utils";
-import CalendarWidget from "./CalendarWidget";
-import SpacerWidget from "./SpacerWidget";
-import BookmarkButtons from "./BookmarkButtons";
-import ProtectedSessionStatusWidget from "./ProtectedSessionStatusWidget";
-import SyncStatus from "./SyncStatus";
-import HistoryNavigationButton from "./HistoryNavigation";
-import { AiChatButton, CommandButton, CustomWidget, NoteLauncher, QuickSearchLauncherWidget, ScriptLauncher, TodayLauncher } from "./LauncherDefinitions";
 import { useTriliumEvent } from "../react/hooks";
 import { onWheelHorizontalScroll } from "../widget_utils";
+import BookmarkButtons from "./BookmarkButtons";
+import CalendarWidget from "./CalendarWidget";
+import HistoryNavigationButton from "./HistoryNavigation";
 import { LaunchBarContext } from "./launch_bar_widgets";
+import { AiChatButton, CommandButton, CustomWidget, NoteLauncher, QuickSearchLauncherWidget, ScriptLauncher, TodayLauncher } from "./LauncherDefinitions";
+import ProtectedSessionStatusWidget from "./ProtectedSessionStatusWidget";
+import SpacerWidget from "./SpacerWidget";
+import SyncStatus from "./SyncStatus";
 
 export default function LauncherContainer({ isHorizontalLayout }: { isHorizontalLayout: boolean }) {
     const childNotes = useLauncherChildNotes();
@@ -34,18 +35,19 @@ export default function LauncherContainer({ isHorizontalLayout }: { isHorizontal
             }}>
                 {childNotes?.map(childNote => {
                     if (childNote.type !== "launcher") {
-                        throw new Error(`Note '${childNote.noteId}' '${childNote.title}' is not a launcher even though it's in the launcher subtree`);
+                        console.warn(`Note '${childNote.noteId}' '${childNote.title}' is not a launcher even though it's in the launcher subtree`);
+                        return false;
                     }
 
                     if (!isDesktop() && childNote.isLabelTruthy("desktopOnly")) {
                         return false;
                     }
 
-                    return <Launcher key={childNote.noteId} note={childNote} isHorizontalLayout={isHorizontalLayout} />
+                    return <Launcher key={childNote.noteId} note={childNote} isHorizontalLayout={isHorizontalLayout} />;
                 })}
             </LaunchBarContext.Provider>
         </div>
-    )
+    );
 }
 
 function Launcher({ note, isHorizontalLayout }: { note: FNote, isHorizontalLayout: boolean }) {
@@ -72,7 +74,7 @@ function initBuiltinWidget(note: FNote, isHorizontalLayout: boolean) {
     const builtinWidget = note.getLabelValue("builtinWidget");
     switch (builtinWidget) {
         case "calendar":
-            return <CalendarWidget launcherNote={note} />
+            return <CalendarWidget launcherNote={note} />;
         case "spacer":
             // || has to be inside since 0 is a valid value
             const baseSize = parseInt(note.getLabelValue("baseSize") || "40");
@@ -86,15 +88,15 @@ function initBuiltinWidget(note: FNote, isHorizontalLayout: boolean) {
         case "syncStatus":
             return <SyncStatus />;
         case "backInHistoryButton":
-            return <HistoryNavigationButton launcherNote={note} command="backInNoteHistory" />
+            return <HistoryNavigationButton launcherNote={note} command="backInNoteHistory" />;
         case "forwardInHistoryButton":
-            return <HistoryNavigationButton launcherNote={note} command="forwardInNoteHistory" />
+            return <HistoryNavigationButton launcherNote={note} command="forwardInNoteHistory" />;
         case "todayInJournal":
-            return <TodayLauncher launcherNote={note} />
+            return <TodayLauncher launcherNote={note} />;
         case "quickSearch":
-            return <QuickSearchLauncherWidget />
+            return <QuickSearchLauncherWidget />;
         case "aiChatLauncher":
-            return <AiChatButton launcherNote={note} />
+            return <AiChatButton launcherNote={note} />;
         default:
             throw new Error(`Unrecognized builtin widget ${builtinWidget} for launcher ${note.noteId} "${note.title}"`);
     }

apps/client/src/widgets/layout/StatusBar.tsx

@@ -338,19 +338,19 @@ interface AttributesProps extends StatusBarContext {
 function AttributesButton({ note, attributesShown, setAttributesShown }: AttributesProps) {
     const [ count, setCount ] = useState(note.attributes.length);
 
-    const getAttributeCount = useCallback((note: FNote) => {
+    const refreshCount = useCallback((note: FNote) => {
         return note.getAttributes().filter(a => !a.isAutoLink).length;
     }, []);
 
     // React to note changes.
     useEffect(() => {
-        setCount(getAttributeCount(note));
-    }, [ note, getAttributeCount ]);
+        setCount(refreshCount(note));
+    }, [ note, refreshCount ]);
 
     // React to changes in count.
     useTriliumEvent("entitiesReloaded", (({loadResults}) => {
         if (loadResults.getAttributeRows().some(attr => attributes.isAffecting(attr, note))) {
-            setCount(getAttributeCount(note));
+            setCount(refreshCount(note));
         }
     }));
 

apps/client/src/widgets/sidebar/TableOfContents.tsx

@@ -2,12 +2,14 @@ import "./TableOfContents.css";
 
 import { CKTextEditor, ModelElement } from "@triliumnext/ckeditor5";
 import clsx from "clsx";
-import { useCallback, useEffect, useState } from "preact/hooks";
+import { useCallback, useEffect, useRef, useState } from "preact/hooks";
 
 import { t } from "../../services/i18n";
+import math from "../../services/math";
 import { randomString } from "../../services/utils";
 import { useActiveNoteContext, useContentElement, useGetContextData, useIsNoteReadOnly, useNoteProperty, useTextEditor } from "../react/hooks";
 import Icon from "../react/Icon";
+import RawHtml from "../react/RawHtml";
 import RightPanelWidget from "./RightPanelWidget";
 
 //#region Generic impl.
@@ -80,6 +82,22 @@ function TableOfContentsHeading({ heading, scrollToHeading, activeHeadingId }: {
 }) {
     const [ collapsed, setCollapsed ] = useState(false);
     const isActive = heading.id === activeHeadingId;
+    const contentRef = useRef<HTMLElement>(null);
+
+    // Render math equations after component mounts/updates
+    useEffect(() => {
+        if (!contentRef.current) return;
+        const mathElements = contentRef.current.querySelectorAll(".ck-math-tex");
+
+        for (const mathEl of mathElements ?? []) {
+            try {
+                math.render(mathEl.textContent || "", mathEl as HTMLElement);
+            } catch (e) {
+                console.warn("Failed to render math in TOC:", e);
+            }
+        }
+    }, [heading.text]);
+
     return (
         <>
             <li className={clsx(collapsed && "collapsed", isActive && "active")}>
@@ -90,12 +108,14 @@ function TableOfContentsHeading({ heading, scrollToHeading, activeHeadingId }: {
                         onClick={() => setCollapsed(!collapsed)}
                     />
                 )}
-                <span
+                <RawHtml
+                    containerRef={contentRef}
                     className="item-content"
                     onClick={() => scrollToHeading(heading)}
-                >{heading.text}</span>
+                    html={heading.text}
+                />
             </li>
-            {heading.children && (
+            {heading.children.length > 0 && (
                 <ol>
                     {heading.children.map(heading => <TableOfContentsHeading key={heading.id} heading={heading} scrollToHeading={scrollToHeading} activeHeadingId={activeHeadingId} />)}
                 </ol>
@@ -189,9 +209,23 @@ function extractTocFromTextEditor(editor: CKTextEditor) {
             if (type !== "elementStart" || !item.is('element') || !item.name.startsWith('heading')) continue;
 
             const level = Number(item.name.replace( 'heading', '' ));
-            const text = Array.from( item.getChildren() )
-                .map( c => c.is( '$text' ) ? c.data : '' )
-                .join( '' );
+
+            // Convert model element to view, then to DOM to get HTML
+            const viewEl = editor.editing.mapper.toViewElement(item);
+            let text = '';
+            if (viewEl) {
+                const domEl = editor.editing.view.domConverter.mapViewToDom(viewEl);
+                if (domEl instanceof HTMLElement) {
+                    text = domEl.innerHTML;
+                }
+            }
+
+            // Fallback to plain text if conversion fails
+            if (!text) {
+                text = Array.from( item.getChildren() )
+                    .map( c => c.is( '$text' ) ? c.data : '' )
+                    .join( '' );
+            }
 
             // Assign a unique ID
             let tocId = item.getAttribute(TOC_ID) as string | undefined;

apps/client/src/widgets/sql_table_schemas.tsx

@@ -8,44 +8,39 @@ import Dropdown from "./react/Dropdown";
 
 export default function SqlTableSchemas() {
     const { note } = useNoteContext();
-
-    const isEnabled = note?.mime === "text/x-sqlite;schema=trilium";
-    return (
-        <div className={`sql-table-schemas-widget ${!isEnabled ? "hidden-ext" : ""}`}>
-            {isEnabled && <SqlTableSchemasContent />}
-        </div>
-    )
-}
-
-function SqlTableSchemasContent() {
     const [ schemas, setSchemas ] = useState<SchemaResponse[]>();
 
     useEffect(() => {
         server.get<SchemaResponse[]>("sql/schema").then(setSchemas);
     }, []);
 
-    return schemas && (
-        <>
-            {t("sql_table_schemas.tables")}{": "}
+    const isEnabled = note?.mime === "text/x-sqlite;schema=trilium" && schemas;
+    return (
+        <div className={`sql-table-schemas-widget ${!isEnabled ? "hidden-ext" : ""}`}>
+            {isEnabled && (
+                <>
+                    {t("sql_table_schemas.tables")}{": "}
 
-            <span className="sql-table-schemas">
-                {schemas.map(({ name, columns }) => (
-                    <>
-                        <Dropdown text={name} noSelectButtonStyle hideToggleArrow
-                        >
-                            <table className="table-schema">
-                                {columns.map(column => (
-                                    <tr>
-                                        <td>{column.name}</td>
-                                        <td>{column.type}</td>
-                                    </tr>
-                                ))}
-                            </table>
-                        </Dropdown>
-                        {" "}
-                    </>
-                ))}
-            </span>
-        </>
+                    <span class="sql-table-schemas">
+                        {schemas.map(({ name, columns }) => (
+                            <>
+                                <Dropdown text={name} noSelectButtonStyle hideToggleArrow
+                                >
+                                    <table className="table-schema">
+                                        {columns.map(column => (
+                                            <tr>
+                                                <td>{column.name}</td>
+                                                <td>{column.type}</td>
+                                            </tr>
+                                        ))}
+                                    </table>
+                                </Dropdown>
+                                {" "}
+                            </>
+                        ))}
+                    </span>
+                </>
+            )}
+        </div>
     )
-}
+}

apps/client/src/widgets/type_widgets/helpers/SplitEditor.css

@@ -15,6 +15,8 @@
 .note-detail-split .note-detail-split-editor {
     width: 100%;
     flex-grow: 1;
+    min-width: 0;
+    min-height: 0;
 }
 
 .note-detail-split .note-detail-split-editor .note-detail-code {
@@ -30,6 +32,7 @@
     margin: 5px;
     white-space: pre-wrap;
     font-size: 0.85em;
+    overflow: auto;
 }
 
 .note-detail-split .note-detail-split-preview {

apps/client/src/widgets/type_widgets/text/EditableText.tsx

@@ -286,7 +286,7 @@ function useWatchdogCrashHandling() {
         const currentState = watchdog.state;
         logInfo(`CKEditor state changed to ${currentState}`);
 
-        if (currentState === "ready") {
+        if (currentState === "ready" && hasCrashed.current) {
             hasCrashed.current = false;
             watchdog.editor?.focus();
         }

apps/client/src/widgets/type_widgets/text/config.ts

@@ -134,12 +134,11 @@ export async function buildConfig(opts: BuildEditorOptions): Promise<EditorConfi
             defaultProtocol: "https://",
             allowedProtocols: ALLOWED_PROTOCOLS
         },
-        // TODO: Disabled for now
-        // emoji: {
-        //     definitionsUrl: window.glob.isDev
-        //         ? new URL(import.meta.url).origin + emojiDefinitionsUrl
-        //         : emojiDefinitionsUrl
-        // },
+        emoji: {
+            definitionsUrl: window.glob.isDev
+                ? new URL(import.meta.url).origin + emojiDefinitionsUrl
+                : emojiDefinitionsUrl
+        },
         syntaxHighlighting: {
             loadHighlightJs: async () => {
                 await ensureMimeTypesForHighlighting();

apps/client/src/widgets/type_widgets/text/snippets.ts

@@ -3,6 +3,7 @@ import froca from "../../../services/froca.js";
 import type LoadResults from "../../../services/load_results.js";
 import search from "../../../services/search.js";
 import type { TemplateDefinition } from "@triliumnext/ckeditor5";
+import appContext from "../../../components/app_context.js";
 import type FNote from "../../../entities/fnote.js";
 
 interface TemplateData {
@@ -20,25 +21,20 @@ const debouncedHandleContentUpdate = debounce(handleContentUpdate, 1000);
  * @returns the list of templates.
  */
 export default async function getTemplates() {
-    try {
-        // Build the definitions and populate the cache.
-        const snippets = await search.searchForNotes("#textSnippet");
-        const definitions: TemplateDefinition[] = [];
-        for (const snippet of snippets) {
-            const { description } = await invalidateCacheFor(snippet);
+    // Build the definitions and populate the cache.
+    const snippets = await search.searchForNotes("#textSnippet");
+    const definitions: TemplateDefinition[] = [];
+    for (const snippet of snippets) {
+        const { description } = await invalidateCacheFor(snippet);
 
-            definitions.push({
-                title: snippet.title,
-                data: () => templateCache.get(snippet.noteId)?.content ?? "",
-                icon: buildIcon(snippet),
-                description
-            });
-        }
-        return definitions;
-    } catch (e) {
-        logError("Error while building text snippet templates: ", e);
-        return [];
+        definitions.push({
+            title: snippet.title,
+            data: () => templateCache.get(snippet.noteId)?.content ?? "",
+            icon: buildIcon(snippet),
+            description
+        });
     }
+    return definitions;
 }
 
 async function invalidateCacheFor(snippet: FNote) {

apps/client/vite.config.mts

@@ -1,32 +1,19 @@
 /// <reference types='vitest' />
-import preact from "@preact/preset-vite";
-import { join } from 'path';
-import webpackStatsPlugin from 'rollup-plugin-webpack-stats';
-import { defineConfig } from 'vite';
+import { join, resolve } from 'path';
+import { defineConfig, type Plugin } from 'vite';
 import { viteStaticCopy } from 'vite-plugin-static-copy'
+import webpackStatsPlugin from 'rollup-plugin-webpack-stats';
+import preact from "@preact/preset-vite";
 
 const assets = [ "assets", "stylesheets", "fonts", "translations" ];
 
 const isDev = process.env.NODE_ENV === "development";
-
-// Always copy SQLite WASM files so they're available to the module
-const sqliteWasmPlugin = viteStaticCopy({
-    targets: [
-        {
-            // Copy the entire jswasm directory to maintain the module's expected structure
-            src: "../../node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm/*",
-            dest: "node_modules/@sqlite.org/sqlite-wasm/sqlite-wasm/jswasm"
-        }
-    ]
-});
-
 let plugins: any = [
     preact({
         babel: {
             compact: !isDev
         }
-    }),
-    sqliteWasmPlugin  // Always include SQLite WASM files
+    })
 ];
 
 if (!isDev) {
@@ -83,7 +70,7 @@ export default defineConfig(() => ({
         sourcemap: false,
         rollupOptions: {
             input: {
-                desktop: join(__dirname, "src", "desktop.html"),
+                desktop: join(__dirname, "src", "desktop.ts"),
                 mobile: join(__dirname, "src", "mobile.ts"),
                 login: join(__dirname, "src", "login.ts"),
                 setup: join(__dirname, "src", "setup.ts"),

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triliumnext/desktop",
-  "version": "0.101.1",
+  "version": "0.101.3",
   "description": "Build your personal knowledge base with Trilium Notes",
   "private": true,
   "main": "src/main.ts",

apps/server-e2e/src/layout/tab_bar.spec.ts

@@ -1,4 +1,5 @@
-import { test, expect } from "@playwright/test";
+import { expect,test } from "@playwright/test";
+
 import App from "../support/app";
 
 const NOTE_TITLE = "Trilium Integration Test DB";
@@ -65,21 +66,21 @@ test("Tabs are restored in right order", async ({ page, context }) => {
     // Open three tabs.
     await app.closeAllTabs();
     await app.goToNoteInNewTab("Code notes");
+    await expect(app.getActiveTab()).toContainText("Code notes");
     await app.addNewTab();
     await app.goToNoteInNewTab("Text notes");
+    await expect(app.getActiveTab()).toContainText("Text notes");
     await app.addNewTab();
     await app.goToNoteInNewTab("Mermaid");
+    await expect(app.getActiveTab()).toContainText("Mermaid");
 
     // Select the mid one.
     await app.getTab(1).click();
     await expect(app.noteTreeActiveNote).toContainText("Text notes");
-    await expect(app.getTab(0)).toContainText("Code notes");
-    await expect(app.getTab(1)).toContainText("Text notes");
-    await expect(app.getTab(2)).toContainText("Mermaid");
 
     // Refresh the page and check the order.
     await app.goto( { preserveTabs: true });
-    await expect(app.getTab(0)).toContainText("Code notes", { timeout: 15_000 });
+    await expect(app.getTab(0)).toContainText("Code notes");
     await expect(app.getTab(1)).toContainText("Text notes");
     await expect(app.getTab(2)).toContainText("Mermaid");
 
@@ -128,8 +129,8 @@ test("New tab displays workspaces", async ({ page, context }) => {
 
     const workspaceNotesEl = app.currentNoteSplitContent.locator(".workspace-notes");
     await expect(workspaceNotesEl).toBeVisible();
-    expect(workspaceNotesEl).toContainText("Personal");
-    expect(workspaceNotesEl).toContainText("Work");
+    await expect(workspaceNotesEl).toContainText("Personal");
+    await expect(workspaceNotesEl).toContainText("Work");
     await expect(workspaceNotesEl.locator(".bx.bxs-user")).toBeVisible();
     await expect(workspaceNotesEl.locator(".bx.bx-briefcase-alt")).toBeVisible();
 

apps/server-e2e/src/note_types/pdf.spec.ts

@@ -1,12 +1,12 @@
-import test, { BrowserContext, expect, Page } from "@playwright/test";
+import test, { expect, Page } from "@playwright/test";
 
 import App from "../support/app";
 
 test.beforeEach(async ({ page, context }) => {
-    const app = await setLayout({ page, context }, true);
+    const app = new App(page, context);
+    await app.goto();
     await app.setOption("rightPaneCollapsedItems", "[]");
 });
-test.afterEach(async ({ page, context }) => await setLayout({ page, context }, false));
 
 test("Table of contents works", async ({ page, context }) => {
     const app = new App(page, context);
@@ -73,13 +73,15 @@ test("Attachments listing works", async ({ page, context }) => {
 test("Download original PDF works", async ({ page, context }) => {
     const app = new App(page, context);
     await app.goto();
-    await app.goToNoteInNewTab("Dacia Logan.pdf");
+    await app.goToNoteInNewTab("Layers test.pdf");
     const pdfHelper = new PdfHelper(app);
     await pdfHelper.toBeInitialized();
 
+    const downloadButton = app.currentNoteSplit.locator(".icon-action.bx.bx-download");
+    await expect(downloadButton).toBeVisible();
     const [ download ] = await Promise.all([
         page.waitForEvent("download"),
-        app.currentNoteSplit.locator(".icon-action.bx.bx-download").click()
+        downloadButton.click()
     ]);
     expect(download).toBeDefined();
 });
@@ -105,13 +107,6 @@ test("Layers listing works", async ({ page, context }) => {
     await expect(layersList.locator(".pdf-layer-item")).toHaveCount(0);
 });
 
-async function setLayout({ page, context}: { page: Page; context: BrowserContext }, newLayout: boolean) {
-    const app = new App(page, context);
-    await app.goto();
-    await app.setOption("newLayout", newLayout ? "true" : "false");
-    return app;
-}
-
 class PdfHelper {
     private contentFrame: ReturnType<Page["frameLocator"]>;
 
@@ -125,5 +120,6 @@ class PdfHelper {
 
     async toBeInitialized() {
         await expect(this.contentFrame.locator("#pageNumber")).toBeVisible();
+        await expect(this.contentFrame.locator(".page")).toBeVisible();
     }
 }

apps/server-e2e/src/note_types/text.spec.ts

@@ -1,4 +1,5 @@
-import { test, expect, Page } from "@playwright/test";
+import { expect, test } from "@playwright/test";
+
 import App from "../support/app";
 
 test("Table of contents is displayed", async ({ page, context }) => {
@@ -8,7 +9,7 @@ test("Table of contents is displayed", async ({ page, context }) => {
     await app.goToNoteInNewTab("Table of contents");
 
     await expect(app.sidebar).toContainText("Table of Contents");
-    const rootList = app.sidebar.locator(".toc-widget > span > ol");
+    const rootList = app.sidebar.locator(".toc > ol");
 
     // Heading 1.1
     //  Heading 1.1
@@ -42,7 +43,7 @@ test("Highlights list is displayed", async ({ page, context }) => {
     await app.closeAllTabs();
     await app.goToNoteInNewTab("Highlights list");
 
-    await expect(app.sidebar).toContainText("Highlights List");
+    await expect(app.sidebar).toContainText("10 highlights");
     const rootList = app.sidebar.locator(".highlights-list ol");
     let index = 0;
     for (const highlightedEl of ["Bold 1", "Italic 1", "Underline 1", "Colored text 1", "Background text 1", "Bold 2", "Italic 2", "Underline 2", "Colored text 2", "Background text 2"]) {
@@ -64,6 +65,8 @@ test("Displays math popup", async ({ page, context }) => {
     await expect(mathForm).toBeVisible();
 
     const input = mathForm.locator(".ck-input").first();
+    await expect(input).toBeVisible();
+    await expect(input).toBeEnabled();
     await input.click();
     await input.fill("e=mc^2");
     await page.waitForTimeout(100);

apps/server-e2e/src/support/app.ts

@@ -37,7 +37,7 @@ export default class App {
         this.noteTreeHoistedNote = this.noteTree.locator(".fancytree-node", { has: page.locator(".unhoist-button") });
         this.launcherBar = page.locator("#launcher-container");
         this.currentNoteSplit = page.locator(".note-split:not(.hidden-ext)");
-        this.currentNoteSplitTitle = this.currentNoteSplit.locator(".note-title");
+        this.currentNoteSplitTitle = this.currentNoteSplit.locator(".note-title").first();
         this.currentNoteSplitContent = this.currentNoteSplit.locator(".note-detail-printable.visible");
         this.sidebar = page.locator("#right-pane");
     }
@@ -68,13 +68,15 @@ export default class App {
 
     async goToNoteInNewTab(noteTitle: string) {
         const autocomplete = this.currentNoteSplit.locator(".note-autocomplete");
+        await expect(autocomplete).toBeVisible();
         await autocomplete.fill(noteTitle);
 
         const resultsSelector = this.currentNoteSplit.locator(".note-detail-empty-results");
         await expect(resultsSelector).toContainText(noteTitle);
-        await resultsSelector.locator(".aa-suggestion", { hasText: noteTitle })
-            .nth(1) // Select the second one, as the first one is "Create a new note"
-            .click();
+        const suggestionSelector = resultsSelector.locator(".aa-suggestion")
+            .nth(1); // Select the second one (best candidate), as the first one is "Create a new note"
+        await expect(suggestionSelector).toContainText(noteTitle);
+        suggestionSelector.click();
     }
 
     async goToSettings() {

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triliumnext/server",
-  "version": "0.101.1",
+  "version": "0.101.3",
   "description": "The server-side component of TriliumNext, which exposes the client via the web, allows for sync and provides a REST API for both internal and external use.",
   "private": true,
   "main": "./src/main.ts",
@@ -35,11 +35,11 @@
     "sucrase": "3.35.1"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.71.2",    
+    "@anthropic-ai/sdk": "0.71.2",
+    "@braintree/sanitize-url": "7.1.1",
     "@electron/remote": "2.1.3",
     "@preact/preset-vite": "2.10.2",
     "@triliumnext/commons": "workspace:*",
-    "@triliumnext/core": "workspace:*",
     "@triliumnext/express-partial-content": "workspace:*",
     "@triliumnext/highlightjs": "workspace:*",
     "@triliumnext/turndown-plugin-gfm": "workspace:*",
@@ -49,14 +49,17 @@
     "@types/compression": "1.8.1",
     "@types/cookie-parser": "1.4.10",
     "@types/debounce": "1.2.4",
-    "@types/ejs": "3.1.5",    
+    "@types/ejs": "3.1.5",
+    "@types/escape-html": "1.0.4",
     "@types/express-http-proxy": "1.6.7",
     "@types/express-session": "1.18.2",
     "@types/fs-extra": "11.0.4",
     "@types/html": "1.0.4",
-    "@types/ini": "4.1.1",    
+    "@types/ini": "4.1.1",
+    "@types/mime-types": "3.0.1",
     "@types/multer": "2.0.0",
-    "@types/safe-compare": "1.1.2",    
+    "@types/safe-compare": "1.1.2",
+    "@types/sanitize-html": "2.16.0",
     "@types/sax": "1.2.7",
     "@types/serve-favicon": "2.5.7",
     "@types/serve-static": "2.2.0",
@@ -83,7 +86,8 @@
     "ejs": "3.1.10",
     "electron": "39.2.7",
     "electron-debug": "4.1.0",
-    "electron-window-state": "5.0.3",    
+    "electron-window-state": "5.0.3",
+    "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-http-proxy": "2.1.2",
     "express-openid-connect": "2.19.3",
@@ -105,12 +109,15 @@
     "jimp": "1.6.0",
     "lorem-ipsum": "2.0.8",
     "marked": "17.0.1",
+    "mime-types": "3.0.2",
     "multer": "2.0.2",
     "normalize-strings": "1.1.1",
     "ollama": "0.6.3",
     "openai": "6.15.0",
     "rand-token": "1.0.1",
-    "safe-compare": "1.1.4",    
+    "safe-compare": "1.1.4",
+    "sanitize-filename": "1.6.3",
+    "sanitize-html": "2.17.0",
     "sax": "1.4.3",
     "serve-favicon": "2.5.1",
     "stream-throttle": "0.1.3",
@@ -121,6 +128,7 @@
     "time2fa": "1.4.2",
     "tmp": "0.2.5",
     "turndown": "7.2.2",
+    "unescape": "1.0.1",
     "vite": "7.3.0",
     "ws": "8.18.3",
     "xml2js": "0.6.2",

apps/server/src/anonymize.ts

@@ -1,6 +1,6 @@
 import anonymizationService from "./services/anonymization.js";
 import sqlInit from "./services/sql_init.js";
-await import("@triliumnext/core");
+await import("./becca/entity_constructor.js");
 
 sqlInit.dbReady.then(async () => {
     try {

apps/server/src/app.ts

@@ -1,25 +1,25 @@
-import("@triliumnext/core");
-
-import { erase } from "@triliumnext/core";
-import compression from "compression";
-import cookieParser from "cookie-parser";
 import express from "express";
-import { auth } from "express-openid-connect";
-import helmet from "helmet";
-import { t } from "i18next";
 import path from "path";
 import favicon from "serve-favicon";
-
+import cookieParser from "cookie-parser";
+import helmet from "helmet";
+import compression from "compression";
+import config from "./services/config.js";
+import utils, { getResourceDir, isDev } from "./services/utils.js";
 import assets from "./routes/assets.js";
+import routes from "./routes/routes.js";
 import custom from "./routes/custom.js";
 import error_handlers from "./routes/error_handlers.js";
-import routes from "./routes/routes.js";
-import config from "./services/config.js";
-import log from "./services/log.js";
-import openID from "./services/open_id.js";
-import { RESOURCE_DIR } from "./services/resource_dir.js";
+import { startScheduledCleanup } from "./services/erase.js";
 import sql_init from "./services/sql_init.js";
-import utils, { getResourceDir, isDev } from "./services/utils.js";
+import { auth } from "express-openid-connect";
+import openID from "./services/open_id.js";
+import { t } from "i18next";
+import eventService from "./services/events.js";
+import log from "./services/log.js";
+import "./services/handlers.js";
+import "./becca/becca_loader.js";
+import { RESOURCE_DIR } from "./services/resource_dir.js";
 
 export default async function buildApp() {
     const app = express();
@@ -107,7 +107,7 @@ export default async function buildApp() {
 
     await import("./services/scheduler.js");
 
-    erase.startScheduledCleanup();
+    startScheduledCleanup();
 
     if (utils.isElectron) {
         (await import("@electron/remote/main/index.js")).initialize();

apps/server/src/assets/translations/hi/server.json

@@ -11,6 +11,17 @@
     "move-note-up": "नोट को ऊपर ले जाएं",
     "move-note-down": "नोट को नीचे ले जाएं",
     "note-clipboard": "नोट क्लिपबोर्ड",
-    "duplicate-subtree": "डुप्लिकेट सबट्री"
+    "duplicate-subtree": "डुप्लिकेट सबट्री",
+    "open-new-tab": "नया टैब खोलें",
+    "second-tab": "लिस्ट में दूसरी टैब एक्टिवेट करें",
+    "third-tab": "लिस्ट में तीसरी टैब एक्टिवेट करें",
+    "fourth-tab": "लिस्ट में चौथी टैब एक्टिवेट करें",
+    "sixth-tab": "लिस्ट में छठी टैब एक्टिवेट करें",
+    "seventh-tab": "लिस्ट में सातवीं टैब एक्टिवेट करें",
+    "eight-tab": "लिस्ट में आठवीं टैब एक्टिवेट करें",
+    "ninth-tab": "लिस्ट में नौवीं टैब एक्टिवेट करें",
+    "last-tab": "लिस्ट में आखिरी टैब एक्टिवेट करें",
+    "show-sql-console": "\"SQL कंसोल\" पेज खोलें",
+    "show-backend-log": "\"बैकेंड लॉग\" पेज खोलें"
   }
 }

apps/server/src/assets/views/desktop.ejs

@@ -1,10 +1,58 @@
 <!DOCTYPE html>
 <html lang="en">
+<head>
+    <meta charset="utf-8">
+    <link rel="shortcut icon" href="favicon.ico">
+    <meta name="mobile-web-app-capable" content="yes">
+	  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+	  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover" />
+    <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest">
+    <title>Trilium Notes</title>
+    <style id="trilium-icon-packs">
+      <%- iconPackCss %>
+    </style>
+    <script src="<%= appPath %>/runtime.js" crossorigin type="module"></script>
+</head>
 <body
+  id="trilium-app"
+  class="desktop heading-style-<%= headingStyle %> layout-<%= layoutOrientation %> platform-<%= platform %> <%= isElectron ? 'electron' : '' %> <%= hasNativeTitleBar ? 'native-titlebar' : '' %> <%= hasBackgroundEffects ? 'background-effects' : '' %>"
+  lang="<%= currentLocale.id %>" dir="<%= currentLocale.rtl ? 'rtl' : 'ltr' %>"
 >
+<noscript><%= t("javascript-required") %></noscript>
+
+<script>
+    // hide body to reduce flickering on the startup. This is done through JS and not CSS to not hide <noscript>
+    document.getElementsByTagName("body")[0].style.display = "none";
+</script>
+
+<div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>
+
+<%- include("./partials/windowGlobal.ejs", locals) %>
+
+<!-- Required for match the PWA's top bar color with the theme -->
+<!-- This works even when the user directly changes --root-background in CSS -->
+<div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>
+
+<!-- Required for correct loading of scripts in Electron -->
+<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
 
 <link href="<%= assetPath %>/stylesheets/ckeditor-theme.css" rel="stylesheet">
 <link href="api/fonts" rel="stylesheet">
+<link href="<%= assetPath %>/stylesheets/theme-light.css" rel="stylesheet">
+
+<% if (themeCssUrl) { %>
+<link href="<%= themeCssUrl %>" rel="stylesheet">
+<% } %>
+
+<% if (themeUseNextAsBase === "next") { %>
+  <link href="<%= assetPath %>/stylesheets/theme-next.css" rel="stylesheet">
+<% } else if (themeUseNextAsBase === "next-dark") { %>
+  <link href="<%= assetPath %>/stylesheets/theme-next-dark.css" rel="stylesheet">
+<% } else if (themeUseNextAsBase === "next-light") { %>
+  <link href="<%= assetPath %>/stylesheets/theme-next-light.css" rel="stylesheet">
+<% } %>
+
+<link href="<%= assetPath %>/stylesheets/style.css" rel="stylesheet">
 
 <script src="<%= appPath %>/desktop.js" crossorigin type="module"></script>
 

apps/server/src/assets/views/partials/windowGlobal.ejs

@@ -0,0 +1,25 @@
+<script type="text/javascript">
+    global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+
+    window.glob = {
+        device: "<%= device %>",
+        baseApiUrl: "<%= baseApiUrl %>",
+        activeDialog: null,
+        maxEntityChangeIdAtLoad: <%= maxEntityChangeIdAtLoad %>,
+        maxEntityChangeSyncIdAtLoad: <%= maxEntityChangeSyncIdAtLoad %>,
+        instanceName: '<%= instanceName %>',
+        csrfToken: '<%= csrfToken %>',
+        isDev: <%= isDev %>,
+        appCssNoteIds: <%- JSON.stringify(appCssNoteIds) %>,
+        isMainWindow: <%= isMainWindow %>,
+        isProtectedSessionAvailable: <%= isProtectedSessionAvailable %>,
+        triliumVersion: "<%= triliumVersion %>",
+        assetPath: "<%= assetPath %>",
+        appPath: "<%= appPath %>",
+        platform: "<%= platform %>",
+        hasNativeTitleBar: <%= hasNativeTitleBar %>,
+        TRILIUM_SAFE_MODE: <%= !!process.env.TRILIUM_SAFE_MODE %>,
+        isRtl: <%= !!currentLocale.rtl %>,
+        iconRegistry: <%- JSON.stringify(iconRegistry) %>
+    };
+</script>

apps/server/src/becca/becca-interface.ts

@@ -1,4 +1,6 @@
-import { NotFoundError } from "../errors.js";
+import sql from "../services/sql.js";
+import NoteSet from "../services/search/note_set.js";
+import NotFoundError from "../errors/not_found_error.js";
 import type BOption from "./entities/boption.js";
 import type BNote from "./entities/bnote.js";
 import type BEtapiToken from "./entities/betapi_token.js";
@@ -10,8 +12,6 @@ import type { AttachmentRow, BlobRow, RevisionRow } from "@triliumnext/commons";
 import BBlob from "./entities/bblob.js";
 import BRecentNote from "./entities/brecent_note.js";
 import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
-import { getSql } from "../services/sql/index.js";
-import NoteSet from "../services/search/note_set.js";
 
 /**
  * Becca is a backend cache of all notes, branches, and attributes.
@@ -151,7 +151,7 @@ export default class Becca {
     }
 
     getRevision(revisionId: string): BRevision | null {
-        const row = getSql().getRow<RevisionRow | null>("SELECT * FROM revisions WHERE revisionId = ?", [revisionId]);
+        const row = sql.getRow<RevisionRow | null>("SELECT * FROM revisions WHERE revisionId = ?", [revisionId]);
         return row ? new BRevision(row) : null;
     }
 
@@ -170,7 +170,7 @@ export default class Becca {
             JOIN blobs USING (blobId)
             WHERE attachmentId = ? AND isDeleted = 0`;
 
-        return getSql().getRows<AttachmentRow>(query, [attachmentId]).map((row) => new BAttachment(row))[0];
+        return sql.getRows<AttachmentRow>(query, [attachmentId]).map((row) => new BAttachment(row))[0];
     }
 
     getAttachmentOrThrow(attachmentId: string): BAttachment {
@@ -182,7 +182,7 @@ export default class Becca {
     }
 
     getAttachments(attachmentIds: string[]): BAttachment[] {
-        return getSql().getManyRows<AttachmentRow>("SELECT * FROM attachments WHERE attachmentId IN (???) AND isDeleted = 0", attachmentIds).map((row) => new BAttachment(row));
+        return sql.getManyRows<AttachmentRow>("SELECT * FROM attachments WHERE attachmentId IN (???) AND isDeleted = 0", attachmentIds).map((row) => new BAttachment(row));
     }
 
     getBlob(entity: { blobId?: string }): BBlob | null {
@@ -190,7 +190,7 @@ export default class Becca {
             return null;
         }
 
-        const row = getSql().getRow<BlobRow | null>("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
+        const row = sql.getRow<BlobRow | null>("SELECT *, LENGTH(content) AS contentLength FROM blobs WHERE blobId = ?", [entity.blobId]);
         return row ? new BBlob(row) : null;
     }
 
@@ -227,12 +227,12 @@ export default class Becca {
     }
 
     getRecentNotesFromQuery(query: string, params: string[] = []): BRecentNote[] {
-        const rows = getSql().getRows<BRecentNote>(query, params);
+        const rows = sql.getRows<BRecentNote>(query, params);
         return rows.map((row) => new BRecentNote(row));
     }
 
     getRevisionsFromQuery(query: string, params: string[] = []): BRevision[] {
-        const rows = getSql().getRows<RevisionRow>(query, params);
+        const rows = sql.getRows<RevisionRow>(query, params);
         return rows.map((row) => new BRevision(row));
     }
 

apps/server/src/becca/becca.ts

@@ -1,2 +1,7 @@
-import { becca } from "@triliumnext/core";
+"use strict";
+
+import Becca from "./becca-interface.js";
+
+const becca = new Becca();
+
 export default becca;

apps/server/src/becca/becca_loader.ts

@@ -1,26 +1,27 @@
-import type { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from "@triliumnext/commons";
-import eventService from "../services/events";
+"use strict";
 
-import entityConstructor from "../becca/entity_constructor.js";
-import { getLog } from "../services/log.js";
-import { dbReady } from "../services/sql_init.js";
-import ws from "../services/ws.js";
+import sql from "../services/sql.js";
+import eventService from "../services/events.js";
 import becca from "./becca.js";
-import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
-import BAttribute from "./entities/battribute.js";
-import BBranch from "./entities/bbranch.js";
-import BEtapiToken from "./entities/betapi_token.js";
+import log from "../services/log.js";
 import BNote from "./entities/bnote.js";
+import BBranch from "./entities/bbranch.js";
+import BAttribute from "./entities/battribute.js";
 import BOption from "./entities/boption.js";
-import { getSql } from "../services/sql";
-import { getContext } from "../services/context.js";
+import BEtapiToken from "./entities/betapi_token.js";
+import cls from "../services/cls.js";
+import entityConstructor from "../becca/entity_constructor.js";
+import type { AttributeRow, BranchRow, EtapiTokenRow, NoteRow, OptionRow } from "@triliumnext/commons";
+import type AbstractBeccaEntity from "./entities/abstract_becca_entity.js";
+import ws from "../services/ws.js";
+import { dbReady } from "../services/sql_init.js";
 
 export const beccaLoaded = new Promise<void>(async (res, rej) => {
     // We have to import async since options init requires keyboard actions which require translations.
     const options_init = (await import("../services/options_init.js")).default;
 
     dbReady.then(() => {
-        getContext().init(() => {
+        cls.init(() => {
             load();
 
             options_init.initStartupOptions();
@@ -35,7 +36,6 @@ function load() {
     becca.reset();
 
     // we know this is slow and the total becca load time is logged
-    const sql = getSql();
     sql.disableSlowQueryLogging(() => {
         // using a raw query and passing arrays to avoid allocating new objects,
         // this is worth it for the becca load since it happens every run and blocks the app until finished
@@ -72,7 +72,7 @@ function load() {
 
     becca.loaded = true;
 
-    getLog().info(`Becca (note cache) load took ${Date.now() - start}ms`);
+    log.info(`Becca (note cache) load took ${Date.now() - start}ms`);
 }
 
 function reload(reason: string) {
@@ -284,7 +284,7 @@ eventService.subscribeBeccaLoader(eventService.ENTER_PROTECTED_SESSION, () => {
     try {
         becca.decryptProtectedNotes();
     } catch (e: any) {
-        getLog().error(`Could not decrypt protected notes: ${e.message} ${e.stack}`);
+        log.error(`Could not decrypt protected notes: ${e.message} ${e.stack}`);
     }
 });
 

apps/server/src/becca/becca_service.ts

@@ -1,8 +1,8 @@
 "use strict";
 
 import becca from "./becca.js";
-import { getLog } from "../services/log.js";
-import { getHoistedNoteId } from "../services/context.js";
+import cls from "../services/cls.js";
+import log from "../services/log.js";
 
 function isNotePathArchived(notePath: string[]) {
     const noteId = notePath[notePath.length - 1];
@@ -29,7 +29,7 @@ function getNoteTitle(childNoteId: string, parentNoteId?: string) {
     const parentNote = parentNoteId ? becca.notes[parentNoteId] : null;
 
     if (!childNote) {
-        getLog().info(`Cannot find note '${childNoteId}'`);
+        log.info(`Cannot find note '${childNoteId}'`);
         return "[error fetching title]";
     }
 
@@ -50,7 +50,7 @@ function getNoteTitleAndIcon(childNoteId: string, parentNoteId?: string) {
     const parentNote = parentNoteId ? becca.notes[parentNoteId] : null;
 
     if (!childNote) {
-        getLog().info(`Cannot find note '${childNoteId}'`);
+        log.info(`Cannot find note '${childNoteId}'`);
         return {
             title: "[error fetching title]"
         }
@@ -82,7 +82,7 @@ function getNoteTitleArrayForPath(notePathArray: string[]) {
     let hoistedNotePassed = false;
 
     // this is a notePath from outside of hoisted subtree, so the full title path needs to be returned
-    const hoistedNoteId = getHoistedNoteId();
+    const hoistedNoteId = cls.getHoistedNoteId();
     const outsideOfHoistedSubtree = !notePathArray.includes(hoistedNoteId);
 
     for (const noteId of notePathArray) {

apps/server/src/becca/entities/abstract_becca_entity.ts

@@ -1,16 +1,16 @@
-import eventService from "../../services/events";
+"use strict";
 
-import blobService from "../../services/blob.js";
-import * as cls from "../../services/context";
-import dateUtils from "../../services/utils/date";
+import utils from "../../services/utils.js";
+import sql from "../../services/sql.js";
 import entityChangesService from "../../services/entity_changes.js";
-import { getLog } from "../../services/log.js";
+import eventService from "../../services/events.js";
+import dateUtils from "../../services/date_utils.js";
+import cls from "../../services/cls.js";
+import log from "../../services/log.js";
 import protectedSessionService from "../../services/protected_session.js";
+import blobService from "../../services/blob.js";
+import type { default as Becca, ConstructorData } from "../becca-interface.js";
 import becca from "../becca.js";
-import type { ConstructorData,default as Becca } from "../becca-interface.js";
-import { getSql } from "../../services/sql";
-import { concat2, encodeUtf8, unwrapStringOrBuffer, wrapStringOrBuffer } from "../../services/utils/binary";
-import { hash, hashedBlobId, newEntityId, randomString } from "../../services/utils";
 
 interface ContentOpts {
     forceSave?: boolean;
@@ -36,7 +36,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
     protected beforeSaving(opts?: {}) {
         const constructorData = this.constructor as unknown as ConstructorData<T>;
         if (!(this as any)[constructorData.primaryKeyName]) {
-            (this as any)[constructorData.primaryKeyName] = newEntityId();
+            (this as any)[constructorData.primaryKeyName] = utils.newEntityId();
         }
     }
 
@@ -72,7 +72,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
             contentToHash += "|deleted";
         }
 
-        return hash(contentToHash).substr(0, 10);
+        return utils.hash(contentToHash).substr(0, 10);
     }
 
     protected getPojoToSave() {
@@ -111,7 +111,6 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
 
         const pojo = this.getPojoToSave();
 
-        const sql = getSql();
         sql.transactional(() => {
             sql.upsert(entityName, primaryKeyName, pojo);
 
@@ -138,7 +137,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
         return this;
     }
 
-    protected _setContent(content: string | Uint8Array, opts: ContentOpts = {}) {
+    protected _setContent(content: string | Buffer, opts: ContentOpts = {}) {
         // client code asks to save entity even if blobId didn't change (something else was changed)
         opts.forceSave = !!opts.forceSave;
         opts.forceFrontendReload = !!opts.forceFrontendReload;
@@ -149,9 +148,9 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
         }
 
         if (this.hasStringContent()) {
-            content = unwrapStringOrBuffer(content);
+            content = content.toString();
         } else {
-            content = wrapStringOrBuffer(content);
+            content = Buffer.isBuffer(content) ? content : Buffer.from(content);
         }
 
         const unencryptedContentForHashCalculation = this.getUnencryptedContentForHashCalculation(content);
@@ -168,7 +167,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
             }
         }
 
-        getSql().transactional(() => {
+        sql.transactional(() => {
             const newBlobId = this.saveBlob(content, unencryptedContentForHashCalculation, opts);
             const oldBlobId = this.blobId;
 
@@ -184,7 +183,6 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
     }
 
     private deleteBlobIfNotUsed(oldBlobId: string) {
-        const sql = getSql();
         if (sql.getValue("SELECT 1 FROM notes WHERE blobId = ? LIMIT 1", [oldBlobId])) {
             return;
         }
@@ -203,29 +201,24 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
         sql.execute("DELETE FROM entity_changes WHERE entityName = 'blobs' AND entityId = ?", [oldBlobId]);
     }
 
-    private getUnencryptedContentForHashCalculation(unencryptedContent: Uint8Array | string) {
+    private getUnencryptedContentForHashCalculation(unencryptedContent: Buffer | string) {
         if (this.isProtected) {
             // a "random" prefix makes sure that the calculated hash/blobId is different for a decrypted/encrypted content
             const encryptedPrefixSuffix = "t$[nvQg7q)&_ENCRYPTED_?M:Bf&j3jr_";
-            if (typeof unencryptedContent === "string") {
-                return `${encryptedPrefixSuffix}${unencryptedContent}`;
-            } else {
-                return concat2(encodeUtf8(encryptedPrefixSuffix), unencryptedContent)
-            }
+            return Buffer.isBuffer(unencryptedContent) ? Buffer.concat([Buffer.from(encryptedPrefixSuffix), unencryptedContent]) : `${encryptedPrefixSuffix}${unencryptedContent}`;
+        } else {
+            return unencryptedContent;
         }
-        return unencryptedContent;
-
     }
 
-    private saveBlob(content: string | Uint8Array, unencryptedContentForHashCalculation: string | Uint8Array, opts: ContentOpts = {}) {
+    private saveBlob(content: string | Buffer, unencryptedContentForHashCalculation: string | Buffer, opts: ContentOpts = {}) {
         /*
          * We're using the unencrypted blob for the hash calculation, because otherwise the random IV would
          * cause every content blob to be unique which would balloon the database size (esp. with revisioning).
          * This has minor security implications (it's easy to infer that given content is shared between different
          * notes/attachments), but the trade-off comes out clearly positive.
          */
-        const newBlobId = hashedBlobId(unencryptedContentForHashCalculation);
-        const sql = getSql();
+        const newBlobId = utils.hashedBlobId(unencryptedContentForHashCalculation);
         const blobNeedsInsert = !sql.getValue("SELECT 1 FROM blobs WHERE blobId = ?", [newBlobId]);
 
         if (!blobNeedsInsert) {
@@ -234,7 +227,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
 
         const pojo = {
             blobId: newBlobId,
-            content,
+            content: content,
             dateModified: dateUtils.localNowDateTime(),
             utcDateModified: dateUtils.utcNowDateTime()
         };
@@ -248,13 +241,13 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
         entityChangesService.putEntityChange({
             entityName: "blobs",
             entityId: newBlobId,
-            hash,
+            hash: hash,
             isErased: false,
             utcDateChanged: pojo.utcDateModified,
             isSynced: true,
             // overriding componentId will cause the frontend to think the change is coming from a different component
             // and thus reload
-            componentId: opts.forceFrontendReload ? randomString(10) : null
+            componentId: opts.forceFrontendReload ? utils.randomString(10) : null
         });
 
         eventService.emit(eventService.ENTITY_CHANGED, {
@@ -265,16 +258,15 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
         return newBlobId;
     }
 
-    protected _getContent(): string | Uint8Array {
-        const sql = getSql();
-        const row = sql.getRow<{ content: string | Uint8Array }>(/*sql*/`SELECT content FROM blobs WHERE blobId = ?`, [this.blobId]);
+    protected _getContent(): string | Buffer {
+        const row = sql.getRow<{ content: string | Buffer }>(/*sql*/`SELECT content FROM blobs WHERE blobId = ?`, [this.blobId]);
 
         if (!row) {
             const constructorData = this.constructor as unknown as ConstructorData<T>;
             throw new Error(`Cannot find content for ${constructorData.primaryKeyName} '${(this as any)[constructorData.primaryKeyName]}', blobId '${this.blobId}'`);
         }
 
-        return blobService.processContent(row.content, this.isProtected || false, this.hasStringContent()) as string | Uint8Array;
+        return blobService.processContent(row.content, this.isProtected || false, this.hasStringContent());
     }
 
     /**
@@ -289,7 +281,6 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
 
         this.utcDateModified = dateUtils.utcNowDateTime();
 
-        const sql = getSql();
         sql.execute(
             /*sql*/`UPDATE ${entityName} SET isDeleted = 1, deleteId = ?, utcDateModified = ?
                             WHERE ${constructorData.primaryKeyName} = ?`,
@@ -302,7 +293,7 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
             sql.execute(/*sql*/`UPDATE ${entityName} SET dateModified = ? WHERE ${constructorData.primaryKeyName} = ?`, [this.dateModified, entityId]);
         }
 
-        getLog().info(`Marking ${entityName} ${entityId} as deleted`);
+        log.info(`Marking ${entityName} ${entityId} as deleted`);
 
         this.putEntityChange(true);
 
@@ -316,14 +307,13 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
 
         this.utcDateModified = dateUtils.utcNowDateTime();
 
-        const sql = getSql();
         sql.execute(
             /*sql*/`UPDATE ${entityName} SET isDeleted = 1, utcDateModified = ?
                             WHERE ${constructorData.primaryKeyName} = ?`,
             [this.utcDateModified, entityId]
         );
 
-        getLog().info(`Marking ${entityName} ${entityId} as deleted`);
+        log.info(`Marking ${entityName} ${entityId} as deleted`);
 
         this.putEntityChange(true);
 

apps/server/src/becca/entities/battachment.ts

@@ -1,2 +1,260 @@
-import { BAttachment } from "@triliumnext/core";
+
+
+import type { AttachmentRow } from "@triliumnext/commons";
+
+import dateUtils from "../../services/date_utils.js";
+import log from "../../services/log.js";
+import noteService from "../../services/notes.js";
+import protectedSessionService from "../../services/protected_session.js";
+import sql from "../../services/sql.js";
+import utils from "../../services/utils.js";
+import AbstractBeccaEntity from "./abstract_becca_entity.js";
+import type BBranch from "./bbranch.js";
+import type BNote from "./bnote.js";
+
+const attachmentRoleToNoteTypeMapping = {
+    image: "image",
+    file: "file"
+};
+
+interface ContentOpts {
+    // TODO: Found in bnote.ts, to check if it's actually used and not a typo.
+    forceSave?: boolean;
+
+    /** will also save this BAttachment entity */
+    forceFullSave?: boolean;
+    /** override frontend heuristics on when to reload, instruct to reload */
+    forceFrontendReload?: boolean;
+}
+
+/**
+ * Attachment represent data related/attached to the note. Conceptually similar to attributes, but intended for
+ * larger amounts of data and generally not accessible to the user.
+ */
+class BAttachment extends AbstractBeccaEntity<BAttachment> {
+    static get entityName() {
+        return "attachments";
+    }
+    static get primaryKeyName() {
+        return "attachmentId";
+    }
+    static get hashedProperties() {
+        return ["attachmentId", "ownerId", "role", "mime", "title", "blobId", "utcDateScheduledForErasureSince"];
+    }
+
+    noteId?: number;
+    attachmentId?: string;
+    /** either noteId or revisionId to which this attachment belongs */
+    ownerId!: string;
+    role!: string;
+    mime!: string;
+    title!: string;
+    type?: keyof typeof attachmentRoleToNoteTypeMapping;
+    position?: number;
+    utcDateScheduledForErasureSince?: string | null;
+    /** optionally added to the entity */
+    contentLength?: number;
+    isDecrypted?: boolean;
+
+    constructor(row: AttachmentRow) {
+        super();
+
+        this.updateFromRow(row);
+        this.decrypt();
+    }
+
+    updateFromRow(row: AttachmentRow): void {
+        if (!row.ownerId?.trim()) {
+            throw new Error("'ownerId' must be given to initialize a Attachment entity");
+        } else if (!row.role?.trim()) {
+            throw new Error("'role' must be given to initialize a Attachment entity");
+        } else if (!row.mime?.trim()) {
+            throw new Error("'mime' must be given to initialize a Attachment entity");
+        } else if (!row.title?.trim()) {
+            throw new Error("'title' must be given to initialize a Attachment entity");
+        }
+
+        this.attachmentId = row.attachmentId;
+        this.ownerId = row.ownerId;
+        this.role = row.role;
+        this.mime = row.mime;
+        this.title = row.title;
+        this.position = row.position;
+        this.blobId = row.blobId;
+        this.isProtected = !!row.isProtected;
+        this.dateModified = row.dateModified;
+        this.utcDateModified = row.utcDateModified;
+        this.utcDateScheduledForErasureSince = row.utcDateScheduledForErasureSince;
+        this.contentLength = row.contentLength;
+    }
+
+    copy(): BAttachment {
+        return new BAttachment({
+            ownerId: this.ownerId,
+            role: this.role,
+            mime: this.mime,
+            title: this.title,
+            blobId: this.blobId,
+            isProtected: this.isProtected
+        });
+    }
+
+    getNote(): BNote {
+        return this.becca.notes[this.ownerId];
+    }
+
+    /** @returns true if the note has string content (not binary) */
+    override hasStringContent(): boolean {
+        return utils.isStringNote(this.type, this.mime); // here was !== undefined && utils.isStringNote(this.type, this.mime); I dont know why we need !=undefined. But it filters out canvas libary items
+    }
+
+    isContentAvailable() {
+        return (
+            !this.attachmentId || // new attachment which was not encrypted yet
+            !this.isProtected ||
+            protectedSessionService.isProtectedSessionAvailable()
+        );
+    }
+
+    getTitleOrProtected() {
+        return this.isContentAvailable() ? this.title : "[protected]";
+    }
+
+    decrypt() {
+        if (!this.isProtected || !this.attachmentId) {
+            this.isDecrypted = true;
+            return;
+        }
+
+        if (!this.isDecrypted && protectedSessionService.isProtectedSessionAvailable()) {
+            try {
+                this.title = protectedSessionService.decryptString(this.title) || "";
+                this.isDecrypted = true;
+            } catch (e: any) {
+                log.error(`Could not decrypt attachment ${this.attachmentId}: ${e.message} ${e.stack}`);
+            }
+        }
+    }
+
+    getContent(): Buffer {
+        return this._getContent() as Buffer;
+    }
+
+    setContent(content: string | Buffer, opts?: ContentOpts) {
+        this._setContent(content, opts);
+    }
+
+    convertToNote(): { note: BNote; branch: BBranch } {
+        // TODO: can this ever be "search"?
+        if ((this.type as string) === "search") {
+            throw new Error(`Note of type search cannot have child notes`);
+        }
+
+        if (!this.getNote()) {
+            throw new Error("Cannot find note of this attachment. It is possible that this is note revision's attachment. " + "Converting note revision's attachments to note is not (yet) supported.");
+        }
+
+        if (!(this.role in attachmentRoleToNoteTypeMapping)) {
+            throw new Error(`Mapping from attachment role '${this.role}' to note's type is not defined`);
+        }
+
+        if (!this.isContentAvailable()) {
+            // isProtected is the same for attachment
+            throw new Error(`Cannot convert protected attachment outside of protected session`);
+        }
+
+        const { note, branch } = noteService.createNewNote({
+            parentNoteId: this.ownerId,
+            title: this.title,
+            type: (attachmentRoleToNoteTypeMapping as any)[this.role],
+            mime: this.mime,
+            content: this.getContent(),
+            isProtected: this.isProtected
+        });
+
+        this.markAsDeleted();
+
+        const parentNote = this.getNote();
+
+        if (this.role === "image" && parentNote.type === "text") {
+            const origContent = parentNote.getContent();
+
+            if (typeof origContent !== "string") {
+                throw new Error(`Note with ID '${note.noteId} has a text type but non-string content.`);
+            }
+
+            const oldAttachmentUrl = `api/attachments/${this.attachmentId}/image/`;
+            const newNoteUrl = `api/images/${note.noteId}/`;
+
+            const fixedContent = utils.replaceAll(origContent, oldAttachmentUrl, newNoteUrl);
+
+            if (fixedContent !== origContent) {
+                parentNote.setContent(fixedContent);
+            }
+
+            noteService.asyncPostProcessContent(note, fixedContent);
+        }
+
+        return { note, branch };
+    }
+
+    getFileName() {
+        const type = this.role === "image" ? "image" : "file";
+
+        return utils.formatDownloadTitle(this.title, type, this.mime);
+    }
+
+    override beforeSaving() {
+        super.beforeSaving();
+
+        if (this.position === undefined || this.position === null) {
+            this.position =
+                10 +
+                sql.getValue<number>(
+                    /*sql*/`SELECT COALESCE(MAX(position), 0)
+                                                        FROM attachments
+                                                        WHERE ownerId = ?`,
+                    [this.noteId]
+                );
+        }
+
+        this.dateModified = dateUtils.localNowDateTime();
+        this.utcDateModified = dateUtils.utcNowDateTime();
+    }
+
+    getPojo() {
+        return {
+            attachmentId: this.attachmentId,
+            ownerId: this.ownerId,
+            role: this.role,
+            mime: this.mime,
+            title: this.title || undefined,
+            position: this.position,
+            blobId: this.blobId,
+            isProtected: !!this.isProtected,
+            isDeleted: false,
+            dateModified: this.dateModified,
+            utcDateModified: this.utcDateModified,
+            utcDateScheduledForErasureSince: this.utcDateScheduledForErasureSince,
+            contentLength: this.contentLength
+        };
+    }
+
+    override getPojoToSave() {
+        const pojo = this.getPojo();
+        delete pojo.contentLength;
+
+        if (pojo.isProtected) {
+            if (this.isDecrypted) {
+                pojo.title = protectedSessionService.encrypt(pojo.title || "") || undefined;
+            } else {
+                // updating protected note outside of protected session means we will keep original ciphertexts
+                delete pojo.title;
+            }
+        }
+
+        return pojo;
+    }
+}
+
 export default BAttachment;

apps/server/src/becca/entities/battribute.ts

@@ -1,2 +1,227 @@
-import { BAttribute } from "@triliumnext/core";
+"use strict";
+
+import BNote from "./bnote.js";
+import AbstractBeccaEntity from "./abstract_becca_entity.js";
+import dateUtils from "../../services/date_utils.js";
+import promotedAttributeDefinitionParser from "../../services/promoted_attribute_definition_parser.js";
+import sanitizeAttributeName from "../../services/sanitize_attribute_name.js";
+import type { AttributeRow, AttributeType } from "@triliumnext/commons";
+
+interface SavingOpts {
+    skipValidation?: boolean;
+}
+
+/**
+ * Attribute is an abstract concept which has two real uses - label (key - value pair)
+ * and relation (representing named relationship between source and target note)
+ */
+class BAttribute extends AbstractBeccaEntity<BAttribute> {
+    static get entityName() {
+        return "attributes";
+    }
+    static get primaryKeyName() {
+        return "attributeId";
+    }
+    static get hashedProperties() {
+        return ["attributeId", "noteId", "type", "name", "value", "isInheritable"];
+    }
+
+    attributeId!: string;
+    noteId!: string;
+    type!: AttributeType;
+    name!: string;
+    position!: number;
+    value!: string;
+    isInheritable!: boolean;
+
+    constructor(row?: AttributeRow) {
+        super();
+
+        if (!row) {
+            return;
+        }
+
+        this.updateFromRow(row);
+        this.init();
+    }
+
+    updateFromRow(row: AttributeRow) {
+        this.update([row.attributeId, row.noteId, row.type, row.name, row.value, row.isInheritable, row.position, row.utcDateModified]);
+    }
+
+    update([attributeId, noteId, type, name, value, isInheritable, position, utcDateModified]: any) {
+        this.attributeId = attributeId;
+        this.noteId = noteId;
+        this.type = type;
+        this.name = name;
+        this.position = position;
+        this.value = value || "";
+        this.isInheritable = !!isInheritable;
+        this.utcDateModified = utcDateModified;
+
+        return this;
+    }
+
+    override init() {
+        if (this.attributeId) {
+            this.becca.attributes[this.attributeId] = this;
+        }
+
+        if (!(this.noteId in this.becca.notes)) {
+            // entities can come out of order in sync, create skeleton which will be filled later
+            this.becca.addNote(this.noteId, new BNote({ noteId: this.noteId }));
+        }
+
+        this.becca.notes[this.noteId].ownedAttributes.push(this);
+
+        const key = `${this.type}-${this.name.toLowerCase()}`;
+        this.becca.attributeIndex[key] = this.becca.attributeIndex[key] || [];
+        this.becca.attributeIndex[key].push(this);
+
+        const targetNote = this.targetNote;
+
+        if (targetNote) {
+            targetNote.targetRelations.push(this);
+        }
+    }
+
+    validate() {
+        if (!["label", "relation"].includes(this.type)) {
+            throw new Error(`Invalid attribute type '${this.type}' in attribute '${this.attributeId}' of note '${this.noteId}'`);
+        }
+
+        if (!this.name?.trim()) {
+            throw new Error(`Invalid empty name in attribute '${this.attributeId}' of note '${this.noteId}'`);
+        }
+
+        if (this.type === "relation" && !(this.value in this.becca.notes)) {
+            throw new Error(`Cannot save relation '${this.name}' of note '${this.noteId}' since it targets not existing note '${this.value}'.`);
+        }
+    }
+
+    get isAffectingSubtree() {
+        return this.isInheritable || (this.type === "relation" && ["template", "inherit"].includes(this.name));
+    }
+
+    get targetNoteId() {
+        // alias
+        return this.type === "relation" ? this.value : undefined;
+    }
+
+    isAutoLink() {
+        return this.type === "relation" && ["internalLink", "imageLink", "relationMapLink", "includeNoteLink"].includes(this.name);
+    }
+
+    get note() {
+        return this.becca.notes[this.noteId];
+    }
+
+    get targetNote() {
+        if (this.type === "relation") {
+            return this.becca.notes[this.value];
+        }
+    }
+
+    getNote() {
+        const note = this.becca.getNote(this.noteId);
+
+        if (!note) {
+            throw new Error(`Note '${this.noteId}' of attribute '${this.attributeId}', type '${this.type}', name '${this.name}' does not exist.`);
+        }
+
+        return note;
+    }
+
+    getTargetNote() {
+        if (this.type !== "relation") {
+            throw new Error(`Attribute '${this.attributeId}' is not a relation.`);
+        }
+
+        if (!this.value) {
+            return null;
+        }
+
+        return this.becca.getNote(this.value);
+    }
+
+    isDefinition() {
+        return this.type === "label" && (this.name.startsWith("label:") || this.name.startsWith("relation:"));
+    }
+
+    getDefinition() {
+        return promotedAttributeDefinitionParser.parse(this.value);
+    }
+
+    getDefinedName() {
+        if (this.type === "label" && this.name.startsWith("label:")) {
+            return this.name.substr(6);
+        } else if (this.type === "label" && this.name.startsWith("relation:")) {
+            return this.name.substr(9);
+        } else {
+            return this.name;
+        }
+    }
+
+    override get isDeleted() {
+        return !(this.attributeId in this.becca.attributes);
+    }
+
+    override beforeSaving(opts: SavingOpts = {}) {
+        if (!opts.skipValidation) {
+            this.validate();
+        }
+
+        this.name = sanitizeAttributeName(this.name);
+
+        if (!this.value) {
+            // null value isn't allowed
+            this.value = "";
+        }
+
+        if (this.position === undefined || this.position === null) {
+            const maxExistingPosition = this.getNote()
+                .getAttributes()
+                .reduce((maxPosition, attr) => Math.max(maxPosition, attr.position || 0), 0);
+
+            this.position = maxExistingPosition + 10;
+        }
+
+        if (!this.isInheritable) {
+            this.isInheritable = false;
+        }
+
+        this.utcDateModified = dateUtils.utcNowDateTime();
+
+        super.beforeSaving();
+
+        this.becca.attributes[this.attributeId] = this;
+    }
+
+    getPojo() {
+        return {
+            attributeId: this.attributeId,
+            noteId: this.noteId,
+            type: this.type,
+            name: this.name,
+            position: this.position,
+            value: this.value,
+            isInheritable: this.isInheritable,
+            utcDateModified: this.utcDateModified,
+            isDeleted: false
+        };
+    }
+
+    createClone(type: AttributeType, name: string, value: string, isInheritable?: boolean) {
+        return new BAttribute({
+            noteId: this.noteId,
+            type: type,
+            name: name,
+            value: value,
+            position: this.position,
+            isInheritable: isInheritable,
+            utcDateModified: this.utcDateModified
+        });
+    }
+}
+
 export default BAttribute;

apps/server/src/becca/entities/bblob.ts

@@ -13,7 +13,7 @@ class BBlob extends AbstractBeccaEntity<BBlob> {
         return ["blobId", "content"];
     }
 
-    content!: string | Uint8Array;
+    content!: string | Buffer;
     contentLength!: number;
 
     constructor(row: BlobRow) {

apps/server/src/becca/entities/bbranch.ts

@@ -1,2 +1,288 @@
-import { BBranch } from "@triliumnext/core";
+"use strict";
+
+import BNote from "./bnote.js";
+import AbstractBeccaEntity from "./abstract_becca_entity.js";
+import dateUtils from "../../services/date_utils.js";
+import utils from "../../services/utils.js";
+import TaskContext from "../../services/task_context.js";
+import cls from "../../services/cls.js";
+import log from "../../services/log.js";
+import type { BranchRow } from "@triliumnext/commons";
+import handlers from "../../services/handlers.js";
+
+/**
+ * Branch represents a relationship between a child note and its parent note. Trilium allows a note to have multiple
+ * parents.
+ *
+ * Note that you should not rely on the branch's identity, since it can change easily with a note's move.
+ * Always check noteId instead.
+ */
+class BBranch extends AbstractBeccaEntity<BBranch> {
+    static get entityName() {
+        return "branches";
+    }
+    static get primaryKeyName() {
+        return "branchId";
+    }
+    // notePosition is not part of hash because it would produce a lot of updates in case of reordering
+    static get hashedProperties() {
+        return ["branchId", "noteId", "parentNoteId", "prefix"];
+    }
+
+    branchId?: string;
+    noteId!: string;
+    parentNoteId!: string;
+    prefix!: string | null;
+    notePosition!: number;
+    isExpanded!: boolean;
+
+    constructor(row?: BranchRow) {
+        super();
+
+        if (!row) {
+            return;
+        }
+
+        this.updateFromRow(row);
+        this.init();
+    }
+
+    updateFromRow(row: BranchRow) {
+        this.update([row.branchId, row.noteId, row.parentNoteId, row.prefix, row.notePosition, row.isExpanded, row.utcDateModified]);
+    }
+
+    update([branchId, noteId, parentNoteId, prefix, notePosition, isExpanded, utcDateModified]: any) {
+        this.branchId = branchId;
+        this.noteId = noteId;
+        this.parentNoteId = parentNoteId;
+        this.prefix = prefix;
+        this.notePosition = notePosition;
+        this.isExpanded = !!isExpanded;
+        this.utcDateModified = utcDateModified;
+
+        return this;
+    }
+
+    override init() {
+        if (this.branchId) {
+            this.becca.branches[this.branchId] = this;
+        }
+
+        this.becca.childParentToBranch[`${this.noteId}-${this.parentNoteId}`] = this;
+
+        const childNote = this.childNote;
+
+        if (!childNote.parentBranches.includes(this)) {
+            childNote.parentBranches.push(this);
+        }
+
+        if (this.noteId === "root") {
+            return;
+        }
+
+        const parentNote = this.parentNote;
+        if (parentNote) {
+            if (!childNote.parents.includes(parentNote)) {
+                childNote.parents.push(parentNote);
+            }
+
+            if (!parentNote.children.includes(childNote)) {
+                parentNote.children.push(childNote);
+            }
+        }
+    }
+
+    get childNote(): BNote {
+        if (!(this.noteId in this.becca.notes)) {
+            // entities can come out of order in sync/import, create skeleton which will be filled later
+            this.becca.addNote(this.noteId, new BNote({ noteId: this.noteId }));
+        }
+
+        return this.becca.notes[this.noteId];
+    }
+
+    getNote(): BNote {
+        return this.childNote;
+    }
+
+    /** @returns root branch will have undefined parent, all other branches have to have a parent note */
+    get parentNote(): BNote | undefined {
+        if (!(this.parentNoteId in this.becca.notes) && this.parentNoteId !== "none") {
+            // entities can come out of order in sync/import, create skeleton which will be filled later
+            this.becca.addNote(this.parentNoteId, new BNote({ noteId: this.parentNoteId }));
+        }
+
+        return this.becca.notes[this.parentNoteId];
+    }
+
+    override get isDeleted() {
+        return this.branchId == undefined || !(this.branchId in this.becca.branches);
+    }
+
+    /**
+     * Branch is weak when its existence should not hinder deletion of its note.
+     * As a result, note with only weak branches should be immediately deleted.
+     * An example is shared or bookmarked clones - they are created automatically and exist for technical reasons,
+     * not as user-intended actions. From user perspective, they don't count as real clones and for the purpose
+     * of deletion should not act as a clone.
+     */
+    get isWeak() {
+        return ["_share", "_lbBookmarks"].includes(this.parentNoteId);
+    }
+
+    /**
+     * Delete a branch. If this is a last note's branch, delete the note as well.
+     *
+     * @param deleteId - optional delete identified
+     *
+     * @returns true if note has been deleted, false otherwise
+     */
+    deleteBranch(deleteId?: string, taskContext?: TaskContext<"deleteNotes">): boolean {
+        if (!deleteId) {
+            deleteId = utils.randomString(10);
+        }
+
+        if (!taskContext) {
+            taskContext = new TaskContext("no-progress-reporting", "deleteNotes", null);
+        }
+
+        taskContext.increaseProgressCount();
+
+        const note = this.getNote();
+
+        if (!taskContext.noteDeletionHandlerTriggered) {
+            const parentBranches = note.getParentBranches();
+
+            if (parentBranches.length === 1 && parentBranches[0] === this) {
+                // needs to be run before branches and attributes are deleted and thus attached relations disappear
+                handlers.runAttachedRelations(note, "runOnNoteDeletion", note);
+            }
+        }
+
+        if ((this.noteId === "root" || this.noteId === cls.getHoistedNoteId()) && !this.isWeak) {
+            throw new Error("Can't delete root or hoisted branch/note");
+        }
+
+        this.markAsDeleted(deleteId);
+
+        const notDeletedBranches = note.getStrongParentBranches();
+
+        if (notDeletedBranches.length === 0) {
+            for (const weakBranch of note.getParentBranches()) {
+                weakBranch.markAsDeleted(deleteId);
+            }
+
+            for (const childBranch of note.getChildBranches()) {
+                if (childBranch) {
+                    childBranch.deleteBranch(deleteId, taskContext);
+                }
+            }
+
+            // first delete children and then parent - this will show up better in recent changes
+
+            log.info(`Deleting note '${note.noteId}'`);
+
+            this.becca.notes[note.noteId].isBeingDeleted = true;
+
+            for (const attribute of note.getOwnedAttributes().slice()) {
+                attribute.markAsDeleted(deleteId);
+            }
+
+            for (const relation of note.getTargetRelations()) {
+                relation.markAsDeleted(deleteId);
+            }
+
+            for (const attachment of note.getAttachments()) {
+                attachment.markAsDeleted(deleteId);
+            }
+
+            note.markAsDeleted(deleteId);
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    override beforeSaving() {
+        if (!this.noteId || !this.parentNoteId) {
+            throw new Error(`noteId and parentNoteId are mandatory properties for Branch`);
+        }
+
+        this.branchId = `${this.parentNoteId}_${this.noteId}`;
+
+        if (this.notePosition === undefined || this.notePosition === null) {
+            let maxNotePos = 0;
+
+            if (this.parentNote) {
+                for (const childBranch of this.parentNote.getChildBranches()) {
+                    if (!childBranch) {
+                        continue;
+                    }
+
+                    if (
+                        maxNotePos < childBranch.notePosition &&
+                        childBranch.noteId !== "_hidden" // hidden has a very large notePosition to always stay last
+                    ) {
+                        maxNotePos = childBranch.notePosition;
+                    }
+                }
+            }
+
+            this.notePosition = maxNotePos + 10;
+        }
+
+        if (!this.isExpanded) {
+            this.isExpanded = false;
+        }
+
+        if (!this.prefix?.trim()) {
+            this.prefix = null;
+        }
+
+        this.utcDateModified = dateUtils.utcNowDateTime();
+
+        super.beforeSaving();
+
+        this.becca.branches[this.branchId] = this;
+    }
+
+    getPojo() {
+        return {
+            branchId: this.branchId,
+            noteId: this.noteId,
+            parentNoteId: this.parentNoteId,
+            prefix: this.prefix,
+            notePosition: this.notePosition,
+            isExpanded: this.isExpanded,
+            isDeleted: false,
+            utcDateModified: this.utcDateModified
+        };
+    }
+
+    createClone(parentNoteId: string, notePosition?: number) {
+        const existingBranch = this.becca.getBranchFromChildAndParent(this.noteId, parentNoteId);
+
+        if (existingBranch) {
+            if (notePosition) {
+                existingBranch.notePosition = notePosition;
+            }
+            return existingBranch;
+        } else {
+            return new BBranch({
+                noteId: this.noteId,
+                parentNoteId: parentNoteId,
+                notePosition: notePosition || null,
+                prefix: this.prefix,
+                isExpanded: this.isExpanded
+            });
+        }
+    }
+
+    getParentNote() {
+        return this.parentNote;
+    }
+
+}
+
 export default BBranch;

apps/server/src/becca/entities/betapi_token.ts

@@ -1,2 +1,89 @@
-import { BEtapiToken } from "@triliumnext/core";
+"use strict";
+
+import type { EtapiTokenRow } from "@triliumnext/commons";
+
+import dateUtils from "../../services/date_utils.js";
+import AbstractBeccaEntity from "./abstract_becca_entity.js";
+
+/**
+ * EtapiToken is an entity representing token used to authenticate against Trilium REST API from client applications.
+ * Used by:
+ * - Trilium Sender
+ * - ETAPI clients
+ *
+ * The format user is presented with is "<etapiTokenId>_<tokenHash>". This is also called "authToken" to distinguish it
+ * from tokenHash and token.
+ */
+class BEtapiToken extends AbstractBeccaEntity<BEtapiToken> {
+    static get entityName() {
+        return "etapi_tokens";
+    }
+    static get primaryKeyName() {
+        return "etapiTokenId";
+    }
+    static get hashedProperties() {
+        return ["etapiTokenId", "name", "tokenHash", "utcDateCreated", "utcDateModified", "isDeleted"];
+    }
+
+    etapiTokenId?: string;
+    name!: string;
+    tokenHash!: string;
+    private _isDeleted?: boolean;
+
+    constructor(row?: EtapiTokenRow) {
+        super();
+
+        if (!row) {
+            return;
+        }
+
+        this.updateFromRow(row);
+        this.init();
+    }
+
+    override get isDeleted() {
+        return !!this._isDeleted;
+    }
+
+    updateFromRow(row: EtapiTokenRow) {
+        this.etapiTokenId = row.etapiTokenId;
+        this.name = row.name;
+        this.tokenHash = row.tokenHash;
+        this.utcDateCreated = row.utcDateCreated || dateUtils.utcNowDateTime();
+        this.utcDateModified = row.utcDateModified || this.utcDateCreated;
+        this._isDeleted = !!row.isDeleted;
+
+        if (this.etapiTokenId) {
+            this.becca.etapiTokens[this.etapiTokenId] = this;
+        }
+    }
+
+    override init() {
+        if (this.etapiTokenId) {
+            this.becca.etapiTokens[this.etapiTokenId] = this;
+        }
+    }
+
+    getPojo() {
+        return {
+            etapiTokenId: this.etapiTokenId,
+            name: this.name,
+            tokenHash: this.tokenHash,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified,
+            isDeleted: this.isDeleted
+        };
+    }
+
+    override beforeSaving() {
+        this.utcDateModified = dateUtils.utcNowDateTime();
+
+        super.beforeSaving();
+
+        if (this.etapiTokenId) {
+            this.becca.etapiTokens[this.etapiTokenId] = this;
+        }
+    }
+}
+
 export default BEtapiToken;

apps/server/src/becca/entities/boption.ts

@@ -1,2 +1,56 @@
-import { BOption } from "@triliumnext/core";
+"use strict";
+
+import dateUtils from "../../services/date_utils.js";
+import AbstractBeccaEntity from "./abstract_becca_entity.js";
+import type { OptionRow } from "@triliumnext/commons";
+
+/**
+ * Option represents a name-value pair, either directly configurable by the user or some system property.
+ */
+class BOption extends AbstractBeccaEntity<BOption> {
+    static get entityName() {
+        return "options";
+    }
+    static get primaryKeyName() {
+        return "name";
+    }
+    static get hashedProperties() {
+        return ["name", "value"];
+    }
+
+    name!: string;
+    value!: string;
+
+    constructor(row?: OptionRow) {
+        super();
+
+        if (row) {
+            this.updateFromRow(row);
+        }
+        this.becca.options[this.name] = this;
+    }
+
+    updateFromRow(row: OptionRow) {
+        this.name = row.name;
+        this.value = row.value;
+        this.isSynced = !!row.isSynced;
+        this.utcDateModified = row.utcDateModified;
+    }
+
+    override beforeSaving() {
+        super.beforeSaving();
+
+        this.utcDateModified = dateUtils.utcNowDateTime();
+    }
+
+    getPojo() {
+        return {
+            name: this.name,
+            value: this.value,
+            isSynced: this.isSynced,
+            utcDateModified: this.utcDateModified
+        };
+    }
+}
+
 export default BOption;

apps/server/src/becca/entities/brecent_note.ts

@@ -1,2 +1,46 @@
-import { BRecentNote } from "@triliumnext/core";
+"use strict";
+
+import type { RecentNoteRow } from "@triliumnext/commons";
+
+import dateUtils from "../../services/date_utils.js";
+import AbstractBeccaEntity from "./abstract_becca_entity.js";
+
+/**
+ * RecentNote represents recently visited note.
+ */
+class BRecentNote extends AbstractBeccaEntity<BRecentNote> {
+    static get entityName() {
+        return "recent_notes";
+    }
+    static get primaryKeyName() {
+        return "noteId";
+    }
+    static get hashedProperties() {
+        return ["noteId", "notePath"];
+    }
+
+    noteId!: string;
+    notePath!: string;
+
+    constructor(row: RecentNoteRow) {
+        super();
+
+        this.updateFromRow(row);
+    }
+
+    updateFromRow(row: RecentNoteRow): void {
+        this.noteId = row.noteId;
+        this.notePath = row.notePath;
+        this.utcDateCreated = row.utcDateCreated || dateUtils.utcNowDateTime();
+    }
+
+    getPojo() {
+        return {
+            noteId: this.noteId,
+            notePath: this.notePath,
+            utcDateCreated: this.utcDateCreated
+        };
+    }
+}
+
 export default BRecentNote;

apps/server/src/becca/entities/brevision.ts

@@ -1,2 +1,225 @@
-import { BRevision } from "@triliumnext/core";
+"use strict";
+
+import protectedSessionService from "../../services/protected_session.js";
+import utils from "../../services/utils.js";
+import dateUtils from "../../services/date_utils.js";
+import becca from "../becca.js";
+import AbstractBeccaEntity from "./abstract_becca_entity.js";
+import sql from "../../services/sql.js";
+import BAttachment from "./battachment.js";
+import type { AttachmentRow, NoteType, RevisionPojo, RevisionRow } from "@triliumnext/commons";
+import eraseService from "../../services/erase.js";
+
+interface ContentOpts {
+    /** will also save this BRevision entity */
+    forceSave?: boolean;
+}
+
+interface GetByIdOpts {
+    includeContentLength?: boolean;
+}
+
+/**
+ * Revision represents a snapshot of note's title and content at some point in the past.
+ * It's used for seamless note versioning.
+ */
+class BRevision extends AbstractBeccaEntity<BRevision> {
+    static get entityName() {
+        return "revisions";
+    }
+    static get primaryKeyName() {
+        return "revisionId";
+    }
+    static get hashedProperties() {
+        return ["revisionId", "noteId", "title", "isProtected", "dateLastEdited", "dateCreated", "utcDateLastEdited", "utcDateCreated", "utcDateModified", "blobId"];
+    }
+
+    revisionId?: string;
+    noteId!: string;
+    type!: NoteType;
+    mime!: string;
+    title!: string;
+    dateLastEdited?: string;
+    utcDateLastEdited?: string;
+    contentLength?: number;
+    content?: string | Buffer;
+
+    constructor(row: RevisionRow, titleDecrypted = false) {
+        super();
+
+        this.updateFromRow(row);
+        if (this.isProtected && !titleDecrypted) {
+            const decryptedTitle = protectedSessionService.isProtectedSessionAvailable() ? protectedSessionService.decryptString(this.title) : null;
+            this.title = decryptedTitle || "[protected]";
+        }
+    }
+
+    updateFromRow(row: RevisionRow) {
+        this.revisionId = row.revisionId;
+        this.noteId = row.noteId;
+        this.type = row.type;
+        this.mime = row.mime;
+        this.isProtected = !!row.isProtected;
+        this.title = row.title;
+        this.blobId = row.blobId;
+        this.dateLastEdited = row.dateLastEdited;
+        this.dateCreated = row.dateCreated;
+        this.utcDateLastEdited = row.utcDateLastEdited;
+        this.utcDateCreated = row.utcDateCreated;
+        this.utcDateModified = row.utcDateModified;
+        this.contentLength = row.contentLength;
+    }
+
+    getNote() {
+        return becca.notes[this.noteId];
+    }
+
+    /** @returns true if the note has string content (not binary) */
+    override hasStringContent(): boolean {
+        return utils.isStringNote(this.type, this.mime);
+    }
+
+    isContentAvailable() {
+        return (
+            !this.revisionId || // new note which was not encrypted yet
+            !this.isProtected ||
+            protectedSessionService.isProtectedSessionAvailable()
+        );
+    }
+
+    /*
+     * Note revision content has quite special handling - it's not a separate entity, but a lazily loaded
+     * part of Revision entity with its own sync. The reason behind this hybrid design is that
+     * content can be quite large, and it's not necessary to load it / fill memory for any note access even
+     * if we don't need a content, especially for bulk operations like search.
+     *
+     * This is the same approach as is used for Note's content.
+     */
+    getContent(): string | Buffer {
+        return this._getContent();
+    }
+
+    /**
+     * @throws Error in case of invalid JSON */
+    getJsonContent(): {} | null {
+        const content = this.getContent();
+
+        if (!content || typeof content !== "string" || !content.trim()) {
+            return null;
+        }
+
+        return JSON.parse(content);
+    }
+
+    /** @returns valid object or null if the content cannot be parsed as JSON */
+    getJsonContentSafely(): {} | null {
+        try {
+            return this.getJsonContent();
+        } catch (e) {
+            return null;
+        }
+    }
+
+    setContent(content: string | Buffer, opts: ContentOpts = {}) {
+        this._setContent(content, opts);
+    }
+
+    getAttachments(): BAttachment[] {
+        return sql
+            .getRows<AttachmentRow>(
+                `
+                SELECT attachments.*
+                FROM attachments
+                WHERE ownerId = ?
+                AND isDeleted = 0`,
+                [this.revisionId]
+            )
+            .map((row) => new BAttachment(row));
+    }
+
+    getAttachmentById(attachmentId: String, opts: GetByIdOpts = {}): BAttachment | null {
+        opts.includeContentLength = !!opts.includeContentLength;
+
+        const query = opts.includeContentLength
+            ? /*sql*/`SELECT attachments.*, LENGTH(blobs.content) AS contentLength
+                FROM attachments
+                JOIN blobs USING (blobId)
+                WHERE ownerId = ? AND attachmentId = ? AND isDeleted = 0`
+            : /*sql*/`SELECT * FROM attachments WHERE ownerId = ? AND attachmentId = ? AND isDeleted = 0`;
+
+        return sql.getRows<AttachmentRow>(query, [this.revisionId, attachmentId]).map((row) => new BAttachment(row))[0];
+    }
+
+    getAttachmentsByRole(role: string): BAttachment[] {
+        return sql
+            .getRows<AttachmentRow>(
+                `
+                SELECT attachments.*
+                FROM attachments
+                WHERE ownerId = ?
+                AND role = ?
+                AND isDeleted = 0
+                ORDER BY position`,
+                [this.revisionId, role]
+            )
+            .map((row) => new BAttachment(row));
+    }
+
+    getAttachmentByTitle(title: string): BAttachment {
+        // cannot use SQL to filter by title since it can be encrypted
+        return this.getAttachments().filter((attachment) => attachment.title === title)[0];
+    }
+
+    /**
+     * Revisions are not soft-deletable, they are immediately hard-deleted (erased).
+     */
+    eraseRevision() {
+        if (this.revisionId) {
+            eraseService.eraseRevisions([this.revisionId]);
+        }
+    }
+
+    override beforeSaving() {
+        super.beforeSaving();
+
+        this.utcDateModified = dateUtils.utcNowDateTime();
+    }
+
+    getPojo() {
+        return {
+            revisionId: this.revisionId,
+            noteId: this.noteId,
+            type: this.type,
+            mime: this.mime,
+            isProtected: this.isProtected,
+            title: this.title,
+            blobId: this.blobId,
+            dateLastEdited: this.dateLastEdited,
+            dateCreated: this.dateCreated,
+            utcDateLastEdited: this.utcDateLastEdited,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified,
+            content: this.content, // used when retrieving full note revision to frontend
+            contentLength: this.contentLength
+        } satisfies RevisionPojo;
+    }
+
+    override getPojoToSave() {
+        const pojo = this.getPojo();
+        delete pojo.content; // not getting persisted
+        delete pojo.contentLength; // not getting persisted
+
+        if (pojo.isProtected) {
+            if (protectedSessionService.isProtectedSessionAvailable()) {
+                pojo.title = protectedSessionService.encrypt(this.title) ?? "";
+            } else {
+                // updating protected note outside of protected session means we will keep original ciphertexts
+                pojo.title = "";
+            }
+        }
+
+        return pojo;
+    }
+}
+
 export default BRevision;

apps/server/src/becca/similarity.ts

@@ -1,7 +1,7 @@
 import becca from "./becca.js";
-import { getLog } from "../services/log.js";
+import log from "../services/log.js";
 import beccaService from "./becca_service.js";
-import dateUtils from "../services/utils/date";
+import dateUtils from "../services/date_utils.js";
 import { parse } from "node-html-parser";
 import type BNote from "./entities/bnote.js";
 import { SimilarNote } from "@triliumnext/commons";
@@ -359,7 +359,7 @@ async function findSimilarNotes(noteId: string): Promise<SimilarNote[] | undefin
             let factor = 1;
 
             if (!value.startsWith) {
-                getLog().info(`Unexpected falsy value for attribute ${JSON.stringify(attr.getPojo())}`);
+                log.info(`Unexpected falsy value for attribute ${JSON.stringify(attr.getPojo())}`);
                 continue;
             } else if (value.startsWith("http")) {
                 value = filterUrlValue(value);

apps/server/src/cls_provider.ts

@@ -1,24 +0,0 @@
-import { ExecutionContext } from "@triliumnext/core";
-import clsHooked from "cls-hooked";
-
-export const namespace = clsHooked.createNamespace("trilium");
-
-export default class ClsHookedExecutionContext implements ExecutionContext {
-
-    get<T = any>(key: string): T | undefined {
-        return namespace.get(key);
-    }
-
-    set(key: string, value: any): void {
-        namespace.set(key, value);
-    }
-
-    reset(): void {
-        clsHooked.reset();
-    }
-
-    init<T>(callback: () => T): T {
-        return namespace.runAndReturn(callback);
-    }
-
-}

apps/server/src/crypto_provider.ts

@@ -1,29 +0,0 @@
-import { CryptoProvider } from "@triliumnext/core";
-import crypto from "crypto";
-import { generator } from "rand-token";
-
-const randtoken = generator({ source: "crypto" });
-
-export default class NodejsCryptoProvider implements CryptoProvider {
-
-    createHash(algorithm: "sha1", content: string | Uint8Array): Uint8Array {
-        return crypto.createHash(algorithm).update(content).digest();
-    }
-
-    createCipheriv(algorithm: "aes-128-cbc", key: Uint8Array, iv: Uint8Array): { update(data: Uint8Array): Uint8Array; final(): Uint8Array; } {
-        return crypto.createCipheriv(algorithm, key, iv);
-    }
-
-    createDecipheriv(algorithm: "aes-128-cbc", key: Uint8Array, iv: Uint8Array) {
-        return crypto.createDecipheriv(algorithm, key, iv);
-    }
-
-    randomBytes(size: number): Uint8Array {
-        return crypto.randomBytes(size);
-    }
-
-    randomString(length: number): string {
-        return randtoken.generate(length);
-    }
-
-}

apps/server/src/errors/forbidden_error.ts

@@ -0,0 +1,12 @@
+import HttpError from "./http_error.js";
+
+class ForbiddenError extends HttpError {
+
+    constructor(message: string) {
+        super(message, 403);
+        this.name = "ForbiddenError";
+    }
+
+}
+
+export default ForbiddenError;

apps/server/src/errors/http_error.ts

@@ -0,0 +1,13 @@
+class HttpError extends Error {
+
+    statusCode: number;
+
+    constructor(message: string, statusCode: number) {
+        super(message);
+        this.name = "HttpError";
+        this.statusCode = statusCode;
+    }
+
+}
+
+export default HttpError;

apps/server/src/errors/not_found_error.ts

@@ -0,0 +1,12 @@
+import HttpError from "./http_error.js";
+
+class NotFoundError extends HttpError {
+
+    constructor(message: string) {
+        super(message, 404);
+        this.name = "NotFoundError";
+    }
+
+}
+
+export default NotFoundError;

apps/server/src/errors/open_id_error.ts

@@ -0,0 +1,9 @@
+class OpenIdError {
+    message: string;
+
+    constructor(message: string) {
+        this.message = message;
+    }
+}
+
+export default OpenIdError;

apps/server/src/errors/validation_error.ts

@@ -0,0 +1,12 @@
+import HttpError from "./http_error.js";
+
+class ValidationError extends HttpError {
+
+    constructor(message: string) {
+        super(message, 400)
+        this.name = "ValidationError";
+    }
+
+}
+
+export default ValidationError;

apps/server/src/etapi/etapi_utils.ts

@@ -1,14 +1,12 @@
-import type { NextFunction, Request, RequestHandler, Response, Router } from "express";
-
-import becca from "../becca/becca.js";
-import { namespace } from "../cls_provider.js";
-import type { ApiRequestHandler, SyncRouteRequestHandler } from "../routes/route_api.js";
 import cls from "../services/cls.js";
-import config from "../services/config.js";
-import etapiTokenService from "../services/etapi_tokens.js";
-import log from "../services/log.js";
 import sql from "../services/sql.js";
+import log from "../services/log.js";
+import becca from "../becca/becca.js";
+import etapiTokenService from "../services/etapi_tokens.js";
+import config from "../services/config.js";
+import type { NextFunction, Request, RequestHandler, Response, Router } from "express";
 import type { ValidatorMap } from "./etapi-interface.js";
+import type { ApiRequestHandler, SyncRouteRequestHandler } from "../routes/route_api.js";
 const GENERIC_CODE = "GENERIC";
 
 type HttpMethod = "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head";
@@ -37,8 +35,8 @@ function sendError(res: Response, statusCode: number, code: string, message: str
         .send(
             JSON.stringify({
                 status: statusCode,
-                code,
-                message
+                code: code,
+                message: message
             })
         );
 }
@@ -53,8 +51,8 @@ function checkEtapiAuth(req: Request, res: Response, next: NextFunction) {
 
 function processRequest(req: Request, res: Response, routeHandler: ApiRequestHandler, next: NextFunction, method: string, path: string) {
     try {
-        namespace.bindEmitter(req);
-        namespace.bindEmitter(res);
+        cls.namespace.bindEmitter(req);
+        cls.namespace.bindEmitter(res);
 
         cls.init(() => {
             cls.set("componentId", "etapi");
@@ -88,9 +86,9 @@ function getAndCheckNote(noteId: string) {
 
     if (note) {
         return note;
-    } 
-    throw new EtapiError(404, "NOTE_NOT_FOUND", `Note '${noteId}' not found.`);
-    
+    } else {
+        throw new EtapiError(404, "NOTE_NOT_FOUND", `Note '${noteId}' not found.`);
+    }
 }
 
 function getAndCheckAttachment(attachmentId: string) {
@@ -98,9 +96,9 @@ function getAndCheckAttachment(attachmentId: string) {
 
     if (attachment) {
         return attachment;
-    } 
-    throw new EtapiError(404, "ATTACHMENT_NOT_FOUND", `Attachment '${attachmentId}' not found.`);
-    
+    } else {
+        throw new EtapiError(404, "ATTACHMENT_NOT_FOUND", `Attachment '${attachmentId}' not found.`);
+    }
 }
 
 function getAndCheckBranch(branchId: string) {
@@ -108,9 +106,9 @@ function getAndCheckBranch(branchId: string) {
 
     if (branch) {
         return branch;
-    } 
-    throw new EtapiError(404, "BRANCH_NOT_FOUND", `Branch '${branchId}' not found.`);
-    
+    } else {
+        throw new EtapiError(404, "BRANCH_NOT_FOUND", `Branch '${branchId}' not found.`);
+    }
 }
 
 function getAndCheckAttribute(attributeId: string) {
@@ -118,9 +116,9 @@ function getAndCheckAttribute(attributeId: string) {
 
     if (attribute) {
         return attribute;
-    } 
-    throw new EtapiError(404, "ATTRIBUTE_NOT_FOUND", `Attribute '${attributeId}' not found.`);
-    
+    } else {
+        throw new EtapiError(404, "ATTRIBUTE_NOT_FOUND", `Attribute '${attributeId}' not found.`);
+    }
 }
 
 function validateAndPatch(target: any, source: any, allowedProperties: ValidatorMap) {

apps/server/src/etapi/notes.ts

@@ -1,21 +1,20 @@
-import { NoteParams } from "@triliumnext/core";
-import type { Request, Router } from "express";
-import type { ParsedQs } from "qs";
-
 import becca from "../becca/becca.js";
-import zipExportService from "../services/export/zip.js";
-import type { ExportFormat } from "../services/export/zip/abstract_provider.js";
-import zipImportService from "../services/import/zip.js";
-import noteService from "../services/notes.js";
-import SearchContext from "../services/search/search_context.js";
-import searchService from "../services/search/services/search.js";
-import type { SearchParams } from "../services/search/services/types.js";
-import TaskContext from "../services/task_context.js";
 import utils from "../services/utils.js";
 import eu from "./etapi_utils.js";
-import type { ValidatorMap } from "./etapi-interface.js";
 import mappers from "./mappers.js";
+import noteService from "../services/notes.js";
+import TaskContext from "../services/task_context.js";
 import v from "./validators.js";
+import searchService from "../services/search/services/search.js";
+import SearchContext from "../services/search/search_context.js";
+import zipExportService from "../services/export/zip.js";
+import zipImportService from "../services/import/zip.js";
+import type { Request, Router } from "express";
+import type { ParsedQs } from "qs";
+import type { NoteParams } from "../services/note-interface.js";
+import type { SearchParams } from "../services/search/services/types.js";
+import type { ValidatorMap } from "./etapi-interface.js";
+import type { ExportFormat } from "../services/export/zip/abstract_provider.js";
 
 function register(router: Router) {
     eu.route(router, "get", "/etapi/notes", (req, res, next) => {

apps/server/src/main.ts

@@ -3,49 +3,9 @@
  * are loaded later and will result in an empty string.
  */
 
-import { initializeCore } from "@triliumnext/core";
-
-import ClsHookedExecutionContext from "./cls_provider.js";
-import NodejsCryptoProvider from "./crypto_provider.js";
-import BetterSqlite3Provider from "./sql_provider.js";
+import { initializeTranslations } from "./services/i18n.js";
 
 async function startApplication() {
-    const config = (await import("./services/config.js")).default;
-    const { DOCUMENT_PATH } = (await import("./services/data_dir.js")).default;
-
-    const dbProvider = new BetterSqlite3Provider();
-    dbProvider.loadFromFile(DOCUMENT_PATH, config.General.readOnly);
-
-    initializeCore({
-        dbConfig: {
-            provider: dbProvider,
-            isReadOnly: config.General.readOnly,
-            async onTransactionCommit() {
-                const ws = (await import("./services/ws.js")).default;
-                ws.sendTransactionEntityChangesToAllClients();
-            },
-            async onTransactionRollback() {
-                const cls = (await import("./services/cls.js")).default;
-                const becca_loader = (await import("@triliumnext/core")).becca_loader;
-                const entity_changes = (await import("./services/entity_changes.js")).default;
-                const log = (await import("./services/log")).default;
-
-                const entityChangeIds = cls.getAndClearEntityChangeIds();
-
-                if (entityChangeIds.length > 0) {
-                    log.info("Transaction rollback dirtied the becca, forcing reload.");
-
-                    becca_loader.load();
-                }
-
-                // the maxEntityChangeId has been incremented during failed transaction, need to recalculate
-                entity_changes.recalculateMaxEntityChangeId();
-            }
-        },
-        crypto: new NodejsCryptoProvider(),
-        executionContext: new ClsHookedExecutionContext()
-    });
-    const { initializeTranslations } = (await import("./services/i18n.js"));
     await initializeTranslations();
     const startTriliumServer = (await import("./www.js")).default;
     await startTriliumServer();

apps/server/src/migrations/0220__migrate_images_to_attachments.ts

@@ -1,6 +1,5 @@
-import { becca_loader } from "@triliumnext/core";
-
 import becca from "../becca/becca.js";
+import becca_loader from "../becca/becca_loader.js";
 import cls from "../services/cls.js";
 import log from "../services/log.js";
 import sql from "../services/sql.js";

apps/server/src/migrations/0233__migrate_geo_map_to_collection.ts

@@ -1,6 +1,5 @@
-import { becca_loader } from "@triliumnext/core";
-
 import becca from "../becca/becca";
+import becca_loader from "../becca/becca_loader";
 import cls from "../services/cls.js";
 import hidden_subtree from "../services/hidden_subtree";
 

apps/server/src/routes/api/attachments.ts

@@ -1,10 +1,9 @@
-import { ConvertAttachmentToNoteResponse } from "@triliumnext/commons";
-import blobService from "../../services/blob";
-import { ValidationError } from "../../errors";
-import type { Request } from "express";
-
 import becca from "../../becca/becca.js";
+import blobService from "../../services/blob.js";
+import ValidationError from "../../errors/validation_error.js";
 import imageService from "../../services/image.js";
+import type { Request } from "express";
+import { ConvertAttachmentToNoteResponse } from "@triliumnext/commons";
 
 function getAttachmentBlob(req: Request) {
     const preview = req.query.preview === "true";
@@ -35,7 +34,7 @@ function getAllAttachments(req: Request) {
 function saveAttachment(req: Request) {
     const { noteId } = req.params;
     const { attachmentId, role, mime, title, content } = req.body;
-    const matchByQuery = req.query.matchBy;
+    const matchByQuery = req.query.matchBy
     const isValidMatchBy = (typeof matchByQuery === "string") && (matchByQuery === "attachmentId" || matchByQuery === "title");
     const matchBy = isValidMatchBy ? matchByQuery : undefined;
 

apps/server/src/routes/api/attributes.ts

@@ -1,12 +1,13 @@
-import { UpdateAttributeResponse } from "@triliumnext/commons";
-import { ValidationError } from "@triliumnext/core";
-import type { Request } from "express";
+"use strict";
 
-import becca from "../../becca/becca.js";
-import BAttribute from "../../becca/entities/battribute.js";
-import attributeService from "../../services/attributes.js";
-import log from "../../services/log.js";
 import sql from "../../services/sql.js";
+import log from "../../services/log.js";
+import attributeService from "../../services/attributes.js";
+import BAttribute from "../../becca/entities/battribute.js";
+import becca from "../../becca/becca.js";
+import ValidationError from "../../errors/validation_error.js";
+import type { Request } from "express";
+import { UpdateAttributeResponse } from "@triliumnext/commons";
 
 function getEffectiveNoteAttributes(req: Request) {
     const note = becca.getNote(req.params.noteId);
@@ -46,7 +47,7 @@ function updateNoteAttribute(req: Request) {
         }
 
         attribute = new BAttribute({
-            noteId,
+            noteId: noteId,
             name: body.name,
             type: body.type,
             isInheritable: body.isInheritable
@@ -207,7 +208,7 @@ function createRelation(req: Request) {
     if (!attribute) {
         attribute = new BAttribute({
             noteId: sourceNoteId,
-            name,
+            name: name,
             type: "relation",
             value: targetNoteId
         }).save();

apps/server/src/routes/api/autocomplete.ts

@@ -1,7 +1,8 @@
-import { becca_service, ValidationError } from "@triliumnext/core";
 import type { Request } from "express";
 
 import becca from "../../becca/becca.js";
+import beccaService from "../../becca/becca_service.js";
+import ValidationError from "../../errors/validation_error.js";
 import cls from "../../services/cls.js";
 import log from "../../services/log.js";
 import searchService from "../../services/search/services/search.js";
@@ -66,8 +67,8 @@ function getRecentNotes(activeNoteId: string) {
     return recentNotes.map((rn) => {
         const notePathArray = rn.notePath.split("/");
 
-        const { title, icon } = becca_service.getNoteTitleAndIcon(notePathArray[notePathArray.length - 1]);
-        const notePathTitle = becca_service.getNoteTitleForPath(notePathArray);
+        const { title, icon } = beccaService.getNoteTitleAndIcon(notePathArray[notePathArray.length - 1]);
+        const notePathTitle = beccaService.getNoteTitleForPath(notePathArray);
 
         return {
             notePath: rn.notePath,