Merge remote-tracking branch 'origin/main' into lightweight/browser_api

; Conflicts:
;	apps/client/src/widgets/layout/StatusBar.tsx

.github/workflows/deploy-app.yml

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

apps/client-standalone/package.json

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

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

apps/client-standalone/src/desktop.ts

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

apps/client-standalone/src/index.html

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

@@ -0,0 +1,254 @@
+/**
+ * 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

@@ -0,0 +1,92 @@
+/**
+ * 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

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

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

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

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

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

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

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

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

apps/client-standalone/src/sw.ts

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

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

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

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

apps/client-standalone/tsconfig.spec.json

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

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

@@ -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/desktop.html

@@ -0,0 +1,115 @@
+<!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/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 = await server.get<number>(`autocomplete/notesCount`);
+const notesCount = 10000; // TODO: Replace with dynamic count from becca once available.
 let debounceTimeoutId: ReturnType<typeof setTimeout>;
 
 function getSearchDelay(notesCount: number): number {

apps/client/src/services/promoted_attribute_definition_parser.ts

@@ -1,14 +1,4 @@
-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;
-}
+import { DefinitionObject, LabelType, Multiplicity } from "@triliumnext/commons";
 
 function parse(value: string) {
     const tokens = value.split(",").map((t) => t.trim());

apps/client/src/services/utils.ts

@@ -133,6 +133,8 @@ 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`.
  */
@@ -814,7 +816,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.
  */
-function isUpdateAvailable(latestVersion: string | null | undefined, currentVersion: string): boolean {
+export function isUpdateAvailable(latestVersion: string | null | undefined, currentVersion: string): boolean {
     if (!latestVersion) {
         return false;
     }

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

@@ -21,7 +21,13 @@
     },
     "bundle-error": {
       "title": "Nem sikerült betölteni az egyéni szkriptet",
-      "message": "A(z) \"{{id}}\" azonosítójú, \"{{title}}\" című jegyzetből származó szkript nem hajtható végre a következő ok miatt:\n\n{{message}}"
+      "message": "A skript nem hajtható végre a következő ok miatt:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "A Widget-ek letöltése sikertelen volt"
+    },
+    "widget-render-error": {
+      "title": "Nem sikerült renderelni a React widget-et"
     }
   },
   "add_link": {

apps/client/src/types.d.ts

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

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

@@ -1,14 +1,16 @@
-import { useState } from "preact/hooks";
-import FNote from "../../entities/fnote";
 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 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 { useTriliumEvent } from "../react/hooks";
 import Icon from "../react/Icon";
 import NoteLink from "../react/NoteLink";
-import { getReadableTextColor } from "../../services/css_class_manager";
 
 interface UserAttributesListProps {
     note: FNote;
@@ -29,7 +31,7 @@ export default function UserAttributesDisplay({ note, ignoredAttributes }: UserA
         <div className="user-attributes">
             {userAttributes?.map(attr => buildUserAttribute(attr))}
         </div>
-    )
+    );
 
 }
 
@@ -46,13 +48,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 {
@@ -61,7 +63,7 @@ function buildUserAttribute(attr: AttributeWithDefinitions): ComponentChildren {
     let style: CSSProperties | undefined;
 
     if (attr.type === "label") {
-        let value = attr.value;
+        const value = attr.value;
         switch (attr.def.labelType) {
             case "number":
                 let formattedValue = value;
@@ -102,7 +104,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, reloadFrontendApp } from "../../services/utils";
+import utils, { dynamicRequire, isElectron, isMobile, isStandalone, 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, glob.triliumVersion);
+    const isUpdateAvailable = utils.isUpdateAvailable(latestVersion, window.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) {
+        if (!checkForUpdates || !isStandalone) {
             setLatestVersion(undefined);
             return;
         }

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

@@ -1,11 +1,12 @@
-import type { CellComponent, ColumnDefinition, EmptyCallback, FormatterParams, ValueBooleanCallback, ValueVoidCallback } from "tabulator-tables";
-import { LabelType } from "../../../services/promoted_attribute_definition_parser.js";
+import { LabelType } from "@triliumnext/commons";
 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 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 { renderReactWidget } from "../../react/react_utils.jsx";
 
 type ColumnType = LabelType | "relation";
 
@@ -78,7 +79,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"></span>{" "}</>}
+                {(formatterParams as RowNumberFormatterParams).movableRows && <><span class="bx bx-dots-vertical-rounded" />{" "}</>}
                 {cell.getRow().getPosition(true)}
             </div>),
             formatterParams: { movableRows } satisfies RowNumberFormatterParams
@@ -200,14 +201,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;
@@ -231,5 +232,5 @@ function RelationEditor({ cell, success }: EditorOpts) {
             hideAllButtons: true
         }}
         noteIdChanged={success}
-    />
+    />;
 }

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

@@ -27,6 +27,7 @@ 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/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 refreshCount = useCallback((note: FNote) => {
+    const getAttributeCount = useCallback((note: FNote) => {
         return note.getAttributes().filter(a => !a.isAutoLink).length;
     }, []);
 
     // React to note changes.
     useEffect(() => {
-        setCount(refreshCount(note));
-    }, [ note, refreshCount ]);
+        setCount(getAttributeCount(note));
+    }, [ note, getAttributeCount ]);
 
     // React to changes in count.
     useTriliumEvent("entitiesReloaded", (({loadResults}) => {
         if (loadResults.getAttributeRows().some(attr => attributes.isAffecting(attr, note))) {
-            setCount(refreshCount(note));
+            setCount(getAttributeCount(note));
         }
     }));
 

apps/client/src/widgets/sql_table_schemas.tsx

@@ -8,39 +8,44 @@ 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);
     }, []);
 
-    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")}{": "}
+    return schemas && (
+        <>
+            {t("sql_table_schemas.tables")}{": "}
 
-                    <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>
+            <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>
+        </>
     )
-}
+}

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

@@ -134,11 +134,12 @@ export async function buildConfig(opts: BuildEditorOptions): Promise<EditorConfi
             defaultProtocol: "https://",
             allowedProtocols: ALLOWED_PROTOCOLS
         },
-        emoji: {
-            definitionsUrl: window.glob.isDev
-                ? new URL(import.meta.url).origin + emojiDefinitionsUrl
-                : emojiDefinitionsUrl
-        },
+        // TODO: Disabled for now
+        // 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,7 +3,6 @@ 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 {
@@ -21,20 +20,25 @@ const debouncedHandleContentUpdate = debounce(handleContentUpdate, 1000);
  * @returns the list of templates.
  */
 export default async function getTemplates() {
-    // 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);
+    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);
 
-        definitions.push({
-            title: snippet.title,
-            data: () => templateCache.get(snippet.noteId)?.content ?? "",
-            icon: buildIcon(snippet),
-            description
-        });
+            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 [];
     }
-    return definitions;
 }
 
 async function invalidateCacheFor(snippet: FNote) {

apps/client/vite.config.mts

@@ -1,19 +1,32 @@
 /// <reference types='vitest' />
-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";
+import { join } from 'path';
+import webpackStatsPlugin from 'rollup-plugin-webpack-stats';
+import { defineConfig } from 'vite';
+import { viteStaticCopy } from 'vite-plugin-static-copy'
 
 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) {
@@ -70,7 +83,7 @@ export default defineConfig(() => ({
         sourcemap: false,
         rollupOptions: {
             input: {
-                desktop: join(__dirname, "src", "desktop.ts"),
+                desktop: join(__dirname, "src", "desktop.html"),
                 mobile: join(__dirname, "src", "mobile.ts"),
                 login: join(__dirname, "src", "login.ts"),
                 setup: join(__dirname, "src", "setup.ts"),

apps/server/package.json

@@ -35,11 +35,11 @@
     "sucrase": "3.35.1"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.71.2",
-    "@braintree/sanitize-url": "7.1.1",
+    "@anthropic-ai/sdk": "0.71.2",    
     "@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,17 +49,14 @@
     "@types/compression": "1.8.1",
     "@types/cookie-parser": "1.4.10",
     "@types/debounce": "1.2.4",
-    "@types/ejs": "3.1.5",
-    "@types/escape-html": "1.0.4",
+    "@types/ejs": "3.1.5",    
     "@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/mime-types": "3.0.1",
+    "@types/ini": "4.1.1",    
     "@types/multer": "2.0.0",
-    "@types/safe-compare": "1.1.2",
-    "@types/sanitize-html": "2.16.0",
+    "@types/safe-compare": "1.1.2",    
     "@types/sax": "1.2.7",
     "@types/serve-favicon": "2.5.7",
     "@types/serve-static": "2.2.0",
@@ -86,8 +83,7 @@
     "ejs": "3.1.10",
     "electron": "39.2.7",
     "electron-debug": "4.1.0",
-    "electron-window-state": "5.0.3",
-    "escape-html": "1.0.3",
+    "electron-window-state": "5.0.3",    
     "express": "5.2.1",
     "express-http-proxy": "2.1.2",
     "express-openid-connect": "2.19.3",
@@ -109,15 +105,12 @@
     "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",
-    "sanitize-filename": "1.6.3",
-    "sanitize-html": "2.17.0",
+    "safe-compare": "1.1.4",    
     "sax": "1.4.3",
     "serve-favicon": "2.5.1",
     "stream-throttle": "0.1.3",
@@ -128,9 +121,8 @@
     "time2fa": "1.4.2",
     "tmp": "0.2.5",
     "turndown": "7.2.2",
-    "unescape": "1.0.1",
     "vite": "7.3.0",
-    "ws": "8.19.0",
+    "ws": "8.18.3",
     "xml2js": "0.6.2",
     "yauzl": "3.2.0"
   }

apps/server/src/anonymize.ts

@@ -1,6 +1,6 @@
 import anonymizationService from "./services/anonymization.js";
 import sqlInit from "./services/sql_init.js";
-await import("./becca/entity_constructor.js");
+await import("@triliumnext/core");
 
 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 { startScheduledCleanup } from "./services/erase.js";
-import sql_init from "./services/sql_init.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 routes from "./routes/routes.js";
+import config from "./services/config.js";
 import log from "./services/log.js";
-import "./services/handlers.js";
-import "./becca/becca_loader.js";
+import openID from "./services/open_id.js";
 import { RESOURCE_DIR } from "./services/resource_dir.js";
+import sql_init from "./services/sql_init.js";
+import utils, { getResourceDir, isDev } from "./services/utils.js";
 
 export default async function buildApp() {
     const app = express();
@@ -107,7 +107,7 @@ export default async function buildApp() {
 
     await import("./services/scheduler.js");
 
-    startScheduledCleanup();
+    erase.startScheduledCleanup();
 
     if (utils.isElectron) {
         (await import("@electron/remote/main/index.js")).initialize();

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

@@ -10,6 +10,7 @@
     "creating-and-moving-notes": "नोट्स बनाना और स्थानांतरित करना",
     "move-note-up": "नोट को ऊपर ले जाएं",
     "move-note-down": "नोट को नीचे ले जाएं",
-    "note-clipboard": "नोट क्लिपबोर्ड"
+    "note-clipboard": "नोट क्लिपबोर्ड",
+    "duplicate-subtree": "डुप्लिकेट सबट्री"
   }
 }

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

@@ -1,58 +1,10 @@
 <!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

@@ -1,25 +0,0 @@
-<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.ts

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

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

@@ -1,260 +1,2 @@
-
-
-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;
-    }
-}
-
+import { BAttachment } from "@triliumnext/core";
 export default BAttachment;

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

@@ -1,227 +1,2 @@
-"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
-        });
-    }
-}
-
+import { BAttribute } from "@triliumnext/core";
 export default BAttribute;

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

@@ -1,288 +1,2 @@
-"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;
-    }
-
-}
-
+import { BBranch } from "@triliumnext/core";
 export default BBranch;

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

@@ -1,89 +1,2 @@
-"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;
-        }
-    }
-}
-
+import { BEtapiToken } from "@triliumnext/core";
 export default BEtapiToken;

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

@@ -1,56 +1,2 @@
-"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
-        };
-    }
-}
-
+import { BOption } from "@triliumnext/core";
 export default BOption;

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

@@ -1,46 +1,2 @@
-"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
-        };
-    }
-}
-
+import { BRecentNote } from "@triliumnext/core";
 export default BRecentNote;

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

@@ -1,225 +1,2 @@
-"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;
-    }
-}
-
+import { BRevision } from "@triliumnext/core";
 export default BRevision;

apps/server/src/cls_provider.ts

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

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

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

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

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

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

apps/server/src/errors/validation_error.ts

@@ -1,12 +0,0 @@
-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,12 +1,14 @@
-import cls from "../services/cls.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 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 type { ValidatorMap } from "./etapi-interface.js";
 const GENERIC_CODE = "GENERIC";
 
 type HttpMethod = "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head";
@@ -35,8 +37,8 @@ function sendError(res: Response, statusCode: number, code: string, message: str
         .send(
             JSON.stringify({
                 status: statusCode,
-                code: code,
-                message: message
+                code,
+                message
             })
         );
 }
@@ -51,8 +53,8 @@ function checkEtapiAuth(req: Request, res: Response, next: NextFunction) {
 
 function processRequest(req: Request, res: Response, routeHandler: ApiRequestHandler, next: NextFunction, method: string, path: string) {
     try {
-        cls.namespace.bindEmitter(req);
-        cls.namespace.bindEmitter(res);
+        namespace.bindEmitter(req);
+        namespace.bindEmitter(res);
 
         cls.init(() => {
             cls.set("componentId", "etapi");
@@ -86,9 +88,9 @@ function getAndCheckNote(noteId: string) {
 
     if (note) {
         return note;
-    } else {
-        throw new EtapiError(404, "NOTE_NOT_FOUND", `Note '${noteId}' not found.`);
-    }
+    } 
+    throw new EtapiError(404, "NOTE_NOT_FOUND", `Note '${noteId}' not found.`);
+    
 }
 
 function getAndCheckAttachment(attachmentId: string) {
@@ -96,9 +98,9 @@ function getAndCheckAttachment(attachmentId: string) {
 
     if (attachment) {
         return attachment;
-    } else {
-        throw new EtapiError(404, "ATTACHMENT_NOT_FOUND", `Attachment '${attachmentId}' not found.`);
-    }
+    } 
+    throw new EtapiError(404, "ATTACHMENT_NOT_FOUND", `Attachment '${attachmentId}' not found.`);
+    
 }
 
 function getAndCheckBranch(branchId: string) {
@@ -106,9 +108,9 @@ function getAndCheckBranch(branchId: string) {
 
     if (branch) {
         return branch;
-    } else {
-        throw new EtapiError(404, "BRANCH_NOT_FOUND", `Branch '${branchId}' not found.`);
-    }
+    } 
+    throw new EtapiError(404, "BRANCH_NOT_FOUND", `Branch '${branchId}' not found.`);
+    
 }
 
 function getAndCheckAttribute(attributeId: string) {
@@ -116,9 +118,9 @@ function getAndCheckAttribute(attributeId: string) {
 
     if (attribute) {
         return attribute;
-    } else {
-        throw new EtapiError(404, "ATTRIBUTE_NOT_FOUND", `Attribute '${attributeId}' not found.`);
-    }
+    } 
+    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,20 +1,21 @@
-import becca from "../becca/becca.js";
-import utils from "../services/utils.js";
-import eu from "./etapi_utils.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 { NoteParams } from "@triliumnext/core";
 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 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 v from "./validators.js";
 
 function register(router: Router) {
     eu.route(router, "get", "/etapi/notes", (req, res, next) => {

apps/server/src/main.ts

@@ -3,9 +3,49 @@
  * are loaded later and will result in an empty string.
  */
 
-import { initializeTranslations } from "./services/i18n.js";
+import { initializeCore } from "@triliumnext/core";
+
+import ClsHookedExecutionContext from "./cls_provider.js";
+import NodejsCryptoProvider from "./crypto_provider.js";
+import BetterSqlite3Provider from "./sql_provider.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,5 +1,6 @@
+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,5 +1,6 @@
+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/attributes.ts

@@ -1,13 +1,12 @@
-"use strict";
-
-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";
+import { ValidationError } from "@triliumnext/core";
+import type { Request } from "express";
+
+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";
 
 function getEffectiveNoteAttributes(req: Request) {
     const note = becca.getNote(req.params.noteId);
@@ -47,7 +46,7 @@ function updateNoteAttribute(req: Request) {
         }
 
         attribute = new BAttribute({
-            noteId: noteId,
+            noteId,
             name: body.name,
             type: body.type,
             isInheritable: body.isInheritable
@@ -208,7 +207,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,8 +1,7 @@
+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";
@@ -67,8 +66,8 @@ function getRecentNotes(activeNoteId: string) {
     return recentNotes.map((rn) => {
         const notePathArray = rn.notePath.split("/");
 
-        const { title, icon } = beccaService.getNoteTitleAndIcon(notePathArray[notePathArray.length - 1]);
-        const notePathTitle = beccaService.getNoteTitleForPath(notePathArray);
+        const { title, icon } = becca_service.getNoteTitleAndIcon(notePathArray[notePathArray.length - 1]);
+        const notePathTitle = becca_service.getNoteTitleForPath(notePathArray);
 
         return {
             notePath: rn.notePath,

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

@@ -1,18 +1,15 @@
-"use strict";
-
-import sql from "../../services/sql.js";
-import utils from "../../services/utils.js";
-import entityChangesService from "../../services/entity_changes.js";
-import treeService from "../../services/tree.js";
-import eraseService from "../../services/erase.js";
-import becca from "../../becca/becca.js";
-import TaskContext from "../../services/task_context.js";
-import branchService from "../../services/branches.js";
-import log from "../../services/log.js";
-import ValidationError from "../../errors/validation_error.js";
-import eventService from "../../services/events.js";
+import { erase as eraseService, events as eventService, ValidationError } from "@triliumnext/core";
 import type { Request } from "express";
 
+import becca from "../../becca/becca.js";
+import branchService from "../../services/branches.js";
+import entityChangesService from "../../services/entity_changes.js";
+import log from "../../services/log.js";
+import sql from "../../services/sql.js";
+import TaskContext from "../../services/task_context.js";
+import treeService from "../../services/tree.js";
+import utils from "../../services/utils.js";
+
 /**
  * Code in this file deals with moving and cloning branches. The relationship between note and parent note is unique
  * for not deleted branches. There may be multiple deleted note-parent note relationships.
@@ -256,7 +253,7 @@ function deleteBranch(req: Request) {
     }
 
     return {
-        noteDeleted: noteDeleted
+        noteDeleted
     };
 }
 
@@ -272,7 +269,7 @@ function setPrefix(req: Request) {
 
 function setPrefixBatch(req: Request) {
     const { branchIds, prefix } = req.body;
-    
+
     if (!Array.isArray(branchIds)) {
         throw new ValidationError("branchIds must be an array");
     }

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

@@ -1,16 +1,15 @@
+import { sanitize, ValidationError } from "@triliumnext/core";
 import type { Request } from "express";
 import { parse } from "node-html-parser";
 import path from "path";
 
 import type BNote from "../../becca/entities/bnote.js";
-import ValidationError from "../../errors/validation_error.js";
 import appInfo from "../../services/app_info.js";
 import attributeFormatter from "../../services/attribute_formatter.js";
 import attributeService from "../../services/attributes.js";
 import cloneService from "../../services/cloning.js";
 import dateNoteService from "../../services/date_notes.js";
 import dateUtils from "../../services/date_utils.js";
-import htmlSanitizer from "../../services/html_sanitizer.js";
 import imageService from "../../services/image.js";
 import log from "../../services/log.js";
 import noteService from "../../services/notes.js";
@@ -32,13 +31,13 @@ async function addClipping(req: Request) {
 
     const clipperInbox = await getClipperInboxNote();
 
-    const pageUrl = htmlSanitizer.sanitizeUrl(req.body.pageUrl);
+    const pageUrl = sanitize.sanitizeUrl(req.body.pageUrl);
     let clippingNote = findClippingNote(clipperInbox, pageUrl, clipType);
 
     if (!clippingNote) {
         clippingNote = noteService.createNewNote({
             parentNoteId: clipperInbox.noteId,
-            title: title,
+            title,
             content: "",
             type: "text"
         }).note;
@@ -99,8 +98,8 @@ async function getClipperInboxNote() {
 async function createNote(req: Request) {
     const { content, images, labels } = req.body;
 
-    const clipType = htmlSanitizer.sanitize(req.body.clipType);
-    const pageUrl = htmlSanitizer.sanitizeUrl(req.body.pageUrl);
+    const clipType = sanitize.sanitizeHtml(req.body.clipType);
+    const pageUrl = sanitize.sanitizeUrl(req.body.pageUrl);
 
     const trimmedTitle = (typeof req.body.title === "string") ? req.body.title.trim() : "";
     const title = trimmedTitle || `Clipped note from ${pageUrl}`;
@@ -126,7 +125,7 @@ async function createNote(req: Request) {
 
     if (labels) {
         for (const labelName in labels) {
-            const labelValue = htmlSanitizer.sanitize(labels[labelName]);
+            const labelValue = sanitize.sanitizeHtml(labels[labelName]);
             note.setLabel(labelName, labelValue);
         }
     }
@@ -147,7 +146,7 @@ async function createNote(req: Request) {
 }
 
 export function processContent(images: Image[], note: BNote, content: string) {
-    let rewrittenContent = htmlSanitizer.sanitize(content);
+    let rewrittenContent = sanitize.sanitizeHtml(content);
 
     if (images) {
         for (const { src, dataUrl, imageId } of images) {
@@ -198,11 +197,11 @@ function openNote(req: Request) {
         return {
             result: "ok"
         };
-    } else {
-        return {
-            result: "open-in-browser"
-        };
     }
+    return {
+        result: "open-in-browser"
+    };
+
 }
 
 function handshake() {

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

@@ -1,15 +1,13 @@
-"use strict";
-
-import sql from "../../services/sql.js";
-import log from "../../services/log.js";
-import backupService from "../../services/backup.js";
-import anonymizationService from "../../services/anonymization.js";
-import consistencyChecksService from "../../services/consistency_checks.js";
-import type { Request } from "express";
-import ValidationError from "../../errors/validation_error.js";
-import sql_init from "../../services/sql_init.js";
-import becca_loader from "../../becca/becca_loader.js";
 import { BackupDatabaseNowResponse, DatabaseCheckIntegrityResponse } from "@triliumnext/commons";
+import { becca_loader, ValidationError } from "@triliumnext/core";
+import type { Request } from "express";
+
+import anonymizationService from "../../services/anonymization.js";
+import backupService from "../../services/backup.js";
+import consistencyChecksService from "../../services/consistency_checks.js";
+import log from "../../services/log.js";
+import sql from "../../services/sql.js";
+import sql_init from "../../services/sql_init.js";
 
 function getExistingBackups() {
     return backupService.getExistingBackups();

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

@@ -1,14 +1,12 @@
-"use strict";
-
-import zipExportService from "../../services/export/zip.js";
-import singleExportService from "../../services/export/single.js";
-import opmlExportService from "../../services/export/opml.js";
-import becca from "../../becca/becca.js";
-import TaskContext from "../../services/task_context.js";
-import log from "../../services/log.js";
-import NotFoundError from "../../errors/not_found_error.js";
+import { NotFoundError, ValidationError } from "@triliumnext/core";
 import type { Request, Response } from "express";
-import ValidationError from "../../errors/validation_error.js";
+
+import becca from "../../becca/becca.js";
+import opmlExportService from "../../services/export/opml.js";
+import singleExportService from "../../services/export/single.js";
+import zipExportService from "../../services/export/zip.js";
+import log from "../../services/log.js";
+import TaskContext from "../../services/task_context.js";
 import { safeExtractMessageAndStackFromError } from "../../services/utils.js";
 
 function exportBranch(req: Request, res: Response) {

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

@@ -1,5 +1,4 @@
-
-
+import { ValidationError } from "@triliumnext/core";
 import chokidar from "chokidar";
 import type { Request, Response } from "express";
 import fs from "fs";
@@ -9,7 +8,6 @@ import tmp from "tmp";
 import becca from "../../becca/becca.js";
 import type BAttachment from "../../becca/entities/battachment.js";
 import type BNote from "../../becca/entities/bnote.js";
-import ValidationError from "../../errors/validation_error.js";
 import dataDirs from "../../services/data_dir.js";
 import log from "../../services/log.js";
 import noteService from "../../services/notes.js";
@@ -123,7 +121,7 @@ function attachmentContentProvider(req: Request) {
     return streamContent(attachment.getContent(), attachment.getFileName(), attachment.mime);
 }
 
-async function streamContent(content: string | Buffer, fileName: string, mimeType: string) {
+async function streamContent(content: string | Uint8Array, fileName: string, mimeType: string) {
     if (typeof content === "string") {
         content = Buffer.from(content, "utf8");
     }
@@ -170,7 +168,7 @@ function saveAttachmentToTmpDir(req: Request) {
 
 const createdTemporaryFiles = new Set<string>();
 
-function saveToTmpDir(fileName: string, content: string | Buffer, entityType: string, entityId: string) {
+function saveToTmpDir(fileName: string, content: string | Uint8Array, entityType: string, entityId: string) {
     const tmpObj = tmp.fileSync({
         postfix: fileName,
         tmpdir: dataDirs.TMP_DIR

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

@@ -1,11 +1,12 @@
-"use strict";
 
-import imageService from "../../services/image.js";
-import becca from "../../becca/becca.js";
-import fs from "fs";
+
 import type { Request, Response } from "express";
+import fs from "fs";
+
+import becca from "../../becca/becca.js";
 import type BNote from "../../becca/entities/bnote.js";
 import type BRevision from "../../becca/entities/brevision.js";
+import imageService from "../../services/image.js";
 import { RESOURCE_DIR } from "../../services/resource_dir.js";
 
 function returnImageFromNote(req: Request, res: Response) {
@@ -42,7 +43,7 @@ function returnImageInt(image: BNote | BRevision | null, res: Response) {
 }
 
 export function renderSvgAttachment(image: BNote | BRevision, res: Response, attachmentName: string) {
-    let svg: string | Buffer = `<svg xmlns="http://www.w3.org/2000/svg"></svg>`;
+    let svg: string | Uint8Array = `<svg xmlns="http://www.w3.org/2000/svg"></svg>`;
     const attachment = image.getAttachmentByTitle(attachmentName);
 
     if (attachment) {

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

@@ -1,18 +1,16 @@
-"use strict";
+import { becca_loader,ValidationError } from "@triliumnext/core";
+import type { Request } from "express";
+import path from "path";
 
+import becca from "../../becca/becca.js";
+import type BNote from "../../becca/entities/bnote.js";
+import cls from "../../services/cls.js";
 import enexImportService from "../../services/import/enex.js";
 import opmlImportService from "../../services/import/opml.js";
-import zipImportService from "../../services/import/zip.js";
 import singleImportService from "../../services/import/single.js";
-import cls from "../../services/cls.js";
-import path from "path";
-import becca from "../../becca/becca.js";
-import beccaLoader from "../../becca/becca_loader.js";
+import zipImportService from "../../services/import/zip.js";
 import log from "../../services/log.js";
 import TaskContext from "../../services/task_context.js";
-import ValidationError from "../../errors/validation_error.js";
-import type { Request } from "express";
-import type BNote from "../../becca/entities/bnote.js";
 import { safeExtractMessageAndStackFromError } from "../../services/utils.js";
 
 async function importNotesToBranch(req: Request) {
@@ -88,7 +86,7 @@ async function importNotesToBranch(req: Request) {
         setTimeout(
             () =>
                 taskContext.taskSucceeded({
-                    parentNoteId: parentNoteId,
+                    parentNoteId,
                     importedNoteId: note?.noteId
                 }),
             1000
@@ -96,7 +94,7 @@ async function importNotesToBranch(req: Request) {
     }
 
     // import has deactivated note events so becca is not updated, instead we force it to reload
-    beccaLoader.load();
+    becca_loader.load();
 
     return note.getPojo();
 }
@@ -138,7 +136,7 @@ function importAttachmentsToNote(req: Request) {
         setTimeout(
             () =>
                 taskContext.taskSucceeded({
-                    parentNoteId: parentNoteId
+                    parentNoteId
                 }),
             1000
         );

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

@@ -1,20 +1,18 @@
-"use strict";
-
-import options from "../../services/options.js";
-import utils from "../../services/utils.js";
-import dateUtils from "../../services/date_utils.js";
-import instanceId from "../../services/instance_id.js";
-import passwordEncryptionService from "../../services/encryption/password_encryption.js";
-import protectedSessionService from "../../services/protected_session.js";
-import appInfo from "../../services/app_info.js";
-import eventService from "../../services/events.js";
-import sqlInit from "../../services/sql_init.js";
-import sql from "../../services/sql.js";
-import ws from "../../services/ws.js";
-import etapiTokenService from "../../services/etapi_tokens.js";
+import { events as eventService, getInstanceId } from "@triliumnext/core";
 import type { Request } from "express";
-import totp from "../../services/totp";
+
+import appInfo from "../../services/app_info.js";
+import dateUtils from "../../services/date_utils.js";
+import passwordEncryptionService from "../../services/encryption/password_encryption.js";
 import recoveryCodeService from "../../services/encryption/recovery_codes";
+import etapiTokenService from "../../services/etapi_tokens.js";
+import options from "../../services/options.js";
+import protectedSessionService from "../../services/protected_session.js";
+import sql from "../../services/sql.js";
+import sqlInit from "../../services/sql_init.js";
+import totp from "../../services/totp";
+import utils from "../../services/utils.js";
+import ws from "../../services/ws.js";
 
 /**
  * @swagger
@@ -115,7 +113,7 @@ function loginSync(req: Request) {
     req.session.loggedIn = true;
 
     return {
-        instanceId: instanceId,
+        instanceId: getInstanceId(),
         maxEntityChangeId: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes WHERE isSynced = 1")
     };
 }

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

@@ -341,6 +341,7 @@ export function findExcerpts(sourceNote: BNote, referencedNoteId: string) {
     return excerpts;
 }
 
+// TODO: Deduplicate with core
 function getFilteredBacklinks(note: BNote): BAttribute[] {
     return (
         note
@@ -350,16 +351,6 @@ function getFilteredBacklinks(note: BNote): BAttribute[] {
     );
 }
 
-function getBacklinkCount(req: Request) {
-    const { noteId } = req.params;
-
-    const note = becca.getNoteOrThrow(noteId);
-
-    return {
-        count: getFilteredBacklinks(note).length
-    } satisfies BacklinkCountResponse;
-}
-
 function getBacklinks(req: Request): BacklinksResponse {
     const { noteId } = req.params;
     const note = becca.getNoteOrThrow(noteId);
@@ -389,6 +380,5 @@ function getBacklinks(req: Request): BacklinksResponse {
 export default {
     getLinkMap,
     getTreeMap,
-    getBacklinkCount,
     getBacklinks
 };

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

@@ -1,34 +1,9 @@
 import type { Request } from "express";
 
-import becca from "../../becca/becca.js";
 import markdownService from "../../services/import/markdown.js";
 import markdown from "../../services/export/markdown.js";
 import { RenderMarkdownResponse, ToMarkdownResponse } from "@triliumnext/commons";
 
-function getIconUsage() {
-    const iconClassToCountMap: Record<string, number> = {};
-
-    for (const { value: iconClass, noteId } of becca.findAttributes("label", "iconClass")) {
-        if (noteId.startsWith("_")) {
-            continue; // ignore icons of "system" notes since they were not set by the user
-        }
-
-        if (!iconClass?.trim()) {
-            continue;
-        }
-
-        for (const clazz of iconClass.trim().split(/\s+/)) {
-            if (clazz === "bx") {
-                continue;
-            }
-
-            iconClassToCountMap[clazz] = (iconClassToCountMap[clazz] || 0) + 1;
-        }
-    }
-
-    return { iconClassToCountMap };
-}
-
 function renderMarkdown(req: Request) {
     const { markdownContent } = req.body;
     if (!markdownContent || typeof markdownContent !== 'string') {
@@ -50,7 +25,6 @@ function toMarkdown(req: Request) {
 }
 
 export default {
-    getIconUsage,
     renderMarkdown,
     toMarkdown
 };

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

@@ -1,16 +1,15 @@
-"use strict";
+import { ChangePasswordResponse } from "@triliumnext/commons";
+import { ValidationError } from "@triliumnext/core";
+import type { Request } from "express";
 
 import passwordService from "../../services/encryption/password.js";
-import ValidationError from "../../errors/validation_error.js";
-import type { Request } from "express";
-import { ChangePasswordResponse } from "@triliumnext/commons";
 
 function changePassword(req: Request): ChangePasswordResponse {
     if (passwordService.isPasswordSet()) {
         return passwordService.changePassword(req.body.current_password, req.body.new_password);
-    } else {
-        return passwordService.setPassword(req.body.new_password);
     }
+    return passwordService.setPassword(req.body.new_password);
+
 }
 
 function resetPassword(req: Request) {

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

@@ -1,18 +1,14 @@
-"use strict";
-
-import beccaService from "../../becca/becca_service.js";
-import utils from "../../services/utils.js";
-import sql from "../../services/sql.js";
-import cls from "../../services/cls.js";
-import path from "path";
-import becca from "../../becca/becca.js";
-import blobService from "../../services/blob.js";
-import eraseService from "../../services/erase.js";
+import { EditedNotesResponse, RevisionItem, RevisionPojo } from "@triliumnext/commons";
+import { becca_service, binary_utils, blob as blobService, erase as eraseService, NotePojo } from "@triliumnext/core";
 import type { Request, Response } from "express";
-import type BRevision from "../../becca/entities/brevision.js";
+import path from "path";
+
+import becca from "../../becca/becca.js";
 import type BNote from "../../becca/entities/bnote.js";
-import type { NotePojo } from "../../becca/becca-interface.js";
-import { EditedNotesResponse, RevisionItem, RevisionPojo, RevisionRow } from "@triliumnext/commons";
+import type BRevision from "../../becca/entities/brevision.js";
+import cls from "../../services/cls.js";
+import sql from "../../services/sql.js";
+import utils from "../../services/utils.js";
 
 interface NotePath {
     noteId: string;
@@ -56,7 +52,7 @@ function getRevision(req: Request) {
         revision.content = revision.getContent();
 
         if (revision.content && revision.type === "image") {
-            revision.content = revision.content.toString("base64");
+            revision.content = binary_utils.encodeBase64(revision.content);
         }
     }
 
@@ -166,7 +162,7 @@ function getEditedNotesOnDate(req: Request) {
         )
         ORDER BY isDeleted
         LIMIT 50`,
-        { date: `${req.params.date}%` }
+    { date: `${req.params.date}%` }
     );
 
     let notes = becca.getNotes(noteIds, true);
@@ -191,7 +187,7 @@ function getNotePathData(note: BNote): NotePath | undefined {
     const retPath = note.getBestNotePath();
 
     if (retPath) {
-        const noteTitle = beccaService.getNoteTitleForPath(retPath);
+        const noteTitle = becca_service.getNoteTitleForPath(retPath);
 
         let branchId;
 
@@ -204,7 +200,7 @@ function getNotePathData(note: BNote): NotePath | undefined {
 
         return {
             noteId: note.noteId,
-            branchId: branchId,
+            branchId,
             title: noteTitle,
             notePath: retPath,
             path: retPath.join("/")

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

@@ -1,17 +1,14 @@
-"use strict";
-
+import { becca_service,ValidationError } from "@triliumnext/core";
 import type { Request } from "express";
 
 import becca from "../../becca/becca.js";
-import SearchContext from "../../services/search/search_context.js";
-import searchService, { EMPTY_RESULT, type SearchNoteResult } from "../../services/search/services/search.js";
+import attributeFormatter from "../../services/attribute_formatter.js";
 import bulkActionService from "../../services/bulk_actions.js";
 import cls from "../../services/cls.js";
-import attributeFormatter from "../../services/attribute_formatter.js";
-import ValidationError from "../../errors/validation_error.js";
-import type SearchResult from "../../services/search/search_result.js";
 import hoistedNoteService from "../../services/hoisted_note.js";
-import beccaService from "../../becca/becca_service.js";
+import SearchContext from "../../services/search/search_context.js";
+import type SearchResult from "../../services/search/search_result.js";
+import searchService, { EMPTY_RESULT, type SearchNoteResult } from "../../services/search/services/search.js";
 
 function searchFromNote(req: Request): SearchNoteResult {
     const note = becca.getNoteOrThrow(req.params.noteId);
@@ -72,7 +69,7 @@ function quickSearch(req: Request) {
 
     // Map to API format
     const searchResults = trimmed.map((result) => {
-        const { title, icon } = beccaService.getNoteTitleAndIcon(result.noteId);
+        const { title, icon } = becca_service.getNoteTitleAndIcon(result.noteId);
         return {
             notePath: result.notePath,
             noteTitle: title,
@@ -82,7 +79,7 @@ function quickSearch(req: Request) {
             highlightedContentSnippet: result.highlightedContentSnippet,
             attributeSnippet: result.attributeSnippet,
             highlightedAttributeSnippet: result.highlightedAttributeSnippet,
-            icon: icon
+            icon
         };
     });
 
@@ -90,7 +87,7 @@ function quickSearch(req: Request) {
 
     return {
         searchResultNoteIds: resultNoteIds,
-        searchResults: searchResults,
+        searchResults,
         error: searchContext.getError()
     };
 }

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

@@ -1,9 +1,9 @@
+import { utils } from "@triliumnext/core";
 import type { Request } from "express";
 import imageType from "image-type";
 
 import imageService from "../../services/image.js";
 import noteService from "../../services/notes.js";
-import sanitizeAttributeName from "../../services/sanitize_attribute_name.js";
 import specialNotesService from "../../services/special_notes.js";
 
 async function uploadImage(req: Request) {
@@ -43,14 +43,14 @@ async function uploadImage(req: Request) {
         const labels = JSON.parse(labelsStr);
 
         for (const { name, value } of labels) {
-            note.setLabel(sanitizeAttributeName(name), value);
+            note.setLabel(utils.sanitizeAttributeName(name), value);
         }
     }
 
     note.setLabel("sentFromSender");
 
     return {
-        noteId: noteId
+        noteId
     };
 }
 
@@ -72,7 +72,7 @@ async function saveNote(req: Request) {
 
     if (req.body.labels) {
         for (const { name, value } of req.body.labels) {
-            note.setLabel(sanitizeAttributeName(name), value);
+            note.setLabel(utils.sanitizeAttributeName(name), value);
         }
     }
 

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

@@ -1,17 +1,15 @@
-"use strict";
-
+import { SimilarNoteResponse } from "@triliumnext/commons";
+import { similarity } from "@triliumnext/core";
 import type { Request } from "express";
 
-import similarityService from "../../becca/similarity.js";
 import becca from "../../becca/becca.js";
-import { SimilarNoteResponse } from "@triliumnext/commons";
 
 async function getSimilarNotes(req: Request) {
     const noteId = req.params.noteId;
 
     const _note = becca.getNoteOrThrow(noteId);
 
-    return (await similarityService.findSimilarNotes(noteId) satisfies SimilarNoteResponse);
+    return (await similarity.findSimilarNotes(noteId) satisfies SimilarNoteResponse);
 }
 
 export default {

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

@@ -1,9 +1,8 @@
-"use strict";
-
-import sql from "../../services/sql.js";
-import becca from "../../becca/becca.js";
+import { ValidationError } from "@triliumnext/core";
 import type { Request } from "express";
-import ValidationError from "../../errors/validation_error.js";
+
+import becca from "../../becca/becca.js";
+import sql from "../../services/sql.js";
 import { safeExtractMessageAndStackFromError } from "../../services/utils.js";
 
 interface Table {

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

@@ -1,21 +1,20 @@
-"use strict";
+import { type EntityChange,SyncTestResponse } from "@triliumnext/commons";
+import { ValidationError } from "@triliumnext/core";
+import type { Request } from "express";
+import { t } from "i18next";
 
-import syncService from "../../services/sync.js";
-import syncUpdateService from "../../services/sync_update.js";
+import consistencyChecksService from "../../services/consistency_checks.js";
+import contentHashService from "../../services/content_hash.js";
 import entityChangesService from "../../services/entity_changes.js";
+import log from "../../services/log.js";
+import optionService from "../../services/options.js";
 import sql from "../../services/sql.js";
 import sqlInit from "../../services/sql_init.js";
-import optionService from "../../services/options.js";
-import contentHashService from "../../services/content_hash.js";
-import log from "../../services/log.js";
+import syncService from "../../services/sync.js";
 import syncOptions from "../../services/sync_options.js";
+import syncUpdateService from "../../services/sync_update.js";
 import utils, { safeExtractMessageAndStackFromError } from "../../services/utils.js";
 import ws from "../../services/ws.js";
-import type { Request } from "express";
-import ValidationError from "../../errors/validation_error.js";
-import consistencyChecksService from "../../services/consistency_checks.js";
-import { t } from "i18next";
-import { SyncTestResponse, type EntityChange } from "@triliumnext/commons";
 
 async function testSync(): Promise<SyncTestResponse> {
     try {
@@ -287,10 +286,10 @@ function update(req: Request) {
 
         if (pageIndex !== pageCount - 1) {
             return;
-        } else {
-            body = JSON.parse(partialRequests[requestId].payload);
-            delete partialRequests[requestId];
-        }
+        } 
+        body = JSON.parse(partialRequests[requestId].payload);
+        delete partialRequests[requestId];
+        
     }
 
     const { entities, instanceId } = body;

apps/server/src/routes/assets.ts

@@ -25,14 +25,20 @@ async function register(app: express.Application) {
         const clientDir = path.join(srcRoot, "../client");
         const vite = await createViteServer({
             server: { middlewareMode: true },
-            appType: "custom",
+            appType: "spa",
             cacheDir: path.join(srcRoot, "../../.cache/vite"),
             base: `/${assetUrlFragment}/`,
             root: clientDir,
             css: { devSourcemap: true }
         });
-        app.use(`/${assetUrlFragment}/`, (req, res, next) => {
-            req.url = `/${assetUrlFragment}${req.url}`;
+        app.use(`/${assetUrlFragment}/`, vite.middlewares);
+        app.get(`/`, (req, res, next) => {
+            // We force the page to not be cached since on mobile the CSRF token can be
+            // broken when closing the browser and coming back in to the page.
+            // The page is restored from cache, but the API call fail.
+            res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+
+            req.url = `/${assetUrlFragment}/src/desktop.html`;
             vite.middlewares(req, res, next);
         });
         app.use(`/node_modules/@excalidraw/excalidraw/dist/prod`, persistentCacheStatic(path.join(srcRoot, "../../node_modules/@excalidraw/excalidraw/dist/prod")));

apps/server/src/routes/custom.ts

@@ -1,11 +1,13 @@
-import log from "../services/log.js";
-import fileService from "./api/files.js";
-import scriptService from "../services/script.js";
-import cls from "../services/cls.js";
-import sql from "../services/sql.js";
-import becca from "../becca/becca.js";
 import type { Request, Response, Router } from "express";
-import { safeExtractMessageAndStackFromError, normalizeCustomHandlerPattern } from "../services/utils.js";
+
+import becca from "../becca/becca.js";
+import { namespace } from "../cls_provider.js";
+import cls from "../services/cls.js";
+import log from "../services/log.js";
+import scriptService from "../services/script.js";
+import sql from "../services/sql.js";
+import { normalizeCustomHandlerPattern,safeExtractMessageAndStackFromError } from "../services/utils.js";
+import fileService from "./api/files.js";
 
 function handleRequest(req: Request, res: Response) {
 
@@ -27,7 +29,7 @@ function handleRequest(req: Request, res: Response) {
     // splitPath.map(segment => encodeURIComponent(segment)).join("/")
     // might be safer
 
-    const path = splitPath.join("/")
+    const path = splitPath.join("/");
 
     const attributeIds = sql.getColumn<string>("SELECT attributeId FROM attributes WHERE isDeleted = 0 AND type = 'label' AND name IN ('customRequestHandler', 'customResourceProvider')");
 
@@ -96,8 +98,8 @@ function register(router: Router) {
     // explicitly no CSRF middleware since it's meant to allow integration from external services
 
     router.all("/custom/*path", (req: Request, res: Response, _next) => {
-        cls.namespace.bindEmitter(req);
-        cls.namespace.bindEmitter(res);
+        namespace.bindEmitter(req);
+        namespace.bindEmitter(res);
 
         cls.init(() => handleRequest(req, res));
     });

apps/server/src/routes/error_handlers.ts

@@ -1,8 +1,7 @@
+import { ForbiddenError, HttpError, NotFoundError } from "@triliumnext/core";
 import type { Application, NextFunction, Request, Response } from "express";
+
 import log from "../services/log.js";
-import NotFoundError from "../errors/not_found_error.js";
-import ForbiddenError from "../errors/forbidden_error.js";
-import HttpError from "../errors/http_error.js";
 
 function register(app: Application) {
 

apps/server/src/routes/index.ts

@@ -7,7 +7,7 @@ import assetPath from "../services/asset_path.js";
 import attributeService from "../services/attributes.js";
 import config from "../services/config.js";
 import { getCurrentLocale } from "../services/i18n.js";
-import { generateCss, generateIconRegistry, getIconPacks, MIME_TO_EXTENSION_MAPPINGS } from "../services/icon_packs.js";
+import { icon_packs as iconPackService } from "@triliumnext/core";
 import log from "../services/log.js";
 import optionService from "../services/options.js";
 import protectedSessionService from "../services/protected_session.js";
@@ -15,10 +15,10 @@ import sql from "../services/sql.js";
 import { isDev, isElectron, isWindows11 } from "../services/utils.js";
 import { generateToken as generateCsrfToken } from "./csrf_protection.js";
 
+
 type View = "desktop" | "mobile" | "print";
 
-function index(req: Request, res: Response) {
-    const view = getView(req);
+export function bootstrap(req: Request, res: Response) {
     const options = optionService.getOptionMap();
 
     //'overwrite' set to false (default) => the existing token will be re-used and validated
@@ -26,17 +26,14 @@ function index(req: Request, res: Response) {
     const csrfToken = generateCsrfToken(req, res, false, false);
     log.info(`CSRF token generation: ${csrfToken ? "Successful" : "Failed"}`);
 
-    // We force the page to not be cached since on mobile the CSRF token can be
-    // broken when closing the browser and coming back in to the page.
-    // The page is restored from cache, but the API call fail.
-    res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
-
+    const view = getView(req);
     const theme = options.theme;
     const themeNote = attributeService.getNoteWithLabel("appTheme", theme);
     const nativeTitleBarVisible = options.nativeTitleBarVisible === "true";
-    const iconPacks = getIconPacks();
+    const iconPacks = iconPackService.getIconPacks();
+    const currentLocale = getCurrentLocale();
 
-    res.render(view, {
+    res.send({
         device: view,
         csrfToken,
         themeCssUrl: getThemeCssUrl(theme, themeNote),
@@ -47,9 +44,10 @@ function index(req: Request, res: Response) {
         isElectron,
         hasNativeTitleBar: isElectron && nativeTitleBarVisible,
         hasBackgroundEffects: isElectron && isWindows11 && !nativeTitleBarVisible && options.backgroundEffects === "true",
-        mainFontSize: parseInt(options.mainFontSize),
-        treeFontSize: parseInt(options.treeFontSize),
-        detailFontSize: parseInt(options.detailFontSize),
+        // TODO: These font size don't actually seem to be used.
+        mainFontSize: parseInt(options.mainFontSize, 10),
+        treeFontSize: parseInt(options.treeFontSize, 10),
+        detailFontSize: parseInt(options.detailFontSize, 10),
         maxEntityChangeIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes"),
         maxEntityChangeSyncIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes WHERE isSynced = 1"),
         instanceName: config.General ? config.General.instanceName : null,
@@ -61,14 +59,16 @@ function index(req: Request, res: Response) {
         assetPath,
         appPath,
         baseApiUrl: 'api/',
-        currentLocale: getCurrentLocale(),
+        currentLocale,
+        isRtl: !!currentLocale.rtl,
         iconPackCss: iconPacks
-            .map(p => generateCss(p, p.builtin
-                ? `${assetPath}/fonts/${p.fontAttachmentId}.${MIME_TO_EXTENSION_MAPPINGS[p.fontMime]}`
+            .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: generateIconRegistry(iconPacks)
+        iconRegistry: iconPackService.generateIconRegistry(iconPacks),
+        TRILIUM_SAFE_MODE: !!process.env.TRILIUM_SAFE_MODE
     });
 }
 
@@ -133,7 +133,3 @@ function getThemeCssUrl(theme: string, themeNote: BNote | null) {
 function getAppCssNoteIds() {
     return attributeService.getNotesWithLabel("appCss").map((note) => note.noteId);
 }
-
-export default {
-    index
-};

apps/server/src/routes/login.ts

@@ -1,18 +1,19 @@
+import { ValidationError } from "@triliumnext/core";
 import crypto from "crypto";
-import utils from "../services/utils.js";
-import optionService from "../services/options.js";
-import myScryptService from "../services/encryption/my_scrypt.js";
-import log from "../services/log.js";
-import passwordService from "../services/encryption/password.js";
-import assetPath, { assetUrlFragment } from "../services/asset_path.js";
-import appPath from "../services/app_path.js";
-import ValidationError from "../errors/validation_error.js";
 import type { Request, Response } from 'express';
-import totp from '../services/totp.js';
-import recoveryCodeService from '../services/encryption/recovery_codes.js';
-import openID from '../services/open_id.js';
+
+import appPath from "../services/app_path.js";
+import assetPath, { assetUrlFragment } from "../services/asset_path.js";
+import myScryptService from "../services/encryption/my_scrypt.js";
 import openIDEncryption from '../services/encryption/open_id_encryption.js';
+import passwordService from "../services/encryption/password.js";
+import recoveryCodeService from '../services/encryption/recovery_codes.js';
 import { getCurrentLocale } from "../services/i18n.js";
+import log from "../services/log.js";
+import openID from '../services/open_id.js';
+import optionService from "../services/options.js";
+import totp from '../services/totp.js';
+import utils from "../services/utils.js";
 
 function loginPage(req: Request, res: Response) {
     // Login page is triggered twice. Once here, and another time (see sendLoginError) if the password is failed.
@@ -23,9 +24,9 @@ function loginPage(req: Request, res: Response) {
         ssoEnabled: openID.isOpenIDEnabled(),
         ssoIssuerName: openID.getSSOIssuerName(),
         ssoIssuerIcon: openID.getSSOIssuerIcon(),
-        assetPath: assetPath,
+        assetPath,
         assetPathFragment: assetUrlFragment,
-        appPath: appPath,
+        appPath,
         currentLocale: getCurrentLocale()
     });
 }
@@ -181,9 +182,9 @@ function sendLoginError(req: Request, res: Response, errorType: 'password' | 'to
         wrongTotp: errorType === 'totp',
         totpEnabled: totp.isTotpEnabled(),
         ssoEnabled: openID.isOpenIDEnabled(),
-        assetPath: assetPath,
+        assetPath,
         assetPathFragment: assetUrlFragment,
-        appPath: appPath,
+        appPath,
         currentLocale: getCurrentLocale()
     });
 }

apps/server/src/routes/route_api.ts

@@ -1,15 +1,15 @@
+import { routes, NotFoundError, ValidationError } from "@triliumnext/core";
 import express, { type RequestHandler } from "express";
 import multer from "multer";
-import log from "../services/log.js";
-import cls from "../services/cls.js";
-import sql from "../services/sql.js";
-import entityChangesService from "../services/entity_changes.js";
-import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
-import NotFoundError from "../errors/not_found_error.js";
-import ValidationError from "../errors/validation_error.js";
+
+import { namespace } from "../cls_provider.js";
 import auth from "../services/auth.js";
-import { doubleCsrfProtection as csrfMiddleware } from "./csrf_protection.js";
+import cls from "../services/cls.js";
+import entityChangesService from "../services/entity_changes.js";
+import log from "../services/log.js";
+import sql from "../services/sql.js";
 import { safeExtractMessageAndStackFromError } from "../services/utils.js";
+import { doubleCsrfProtection as csrfMiddleware } from "./csrf_protection.js";
 
 const MAX_ALLOWED_FILE_SIZE_MB = 250;
 export const router = express.Router();
@@ -23,38 +23,10 @@ type NotAPromise<T> = T & { then?: void };
 export type ApiRequestHandler = (req: express.Request, res: express.Response, next: express.NextFunction) => unknown;
 export type SyncRouteRequestHandler = (req: express.Request, res: express.Response, next: express.NextFunction) => NotAPromise<object> | number | string | void | null;
 
-/** Handling common patterns. If entity is not caught, serialization to JSON will fail */
-function convertEntitiesToPojo(result: unknown) {
-    if (result instanceof AbstractBeccaEntity) {
-        result = result.getPojo();
-    } else if (Array.isArray(result)) {
-        for (const idx in result) {
-            if (result[idx] instanceof AbstractBeccaEntity) {
-                result[idx] = result[idx].getPojo();
-            }
-        }
-    } else if (result && typeof result === "object") {
-        if ("note" in result && result.note instanceof AbstractBeccaEntity) {
-            result.note = result.note.getPojo();
-        }
-
-        if ("branch" in result && result.branch instanceof AbstractBeccaEntity) {
-            result.branch = result.branch.getPojo();
-        }
-    }
-
-    if (result && typeof result === "object" && "executionResult" in result) {
-        // from runOnBackend()
-        result.executionResult = convertEntitiesToPojo(result.executionResult);
-    }
-
-    return result;
-}
-
 export function apiResultHandler(req: express.Request, res: express.Response, result: unknown) {
     res.setHeader("trilium-max-entity-change-id", entityChangesService.getMaxEntityChangeId());
 
-    result = convertEntitiesToPojo(result);
+    result = routes.convertEntitiesToPojo(result);
 
     // if it's an array and the first element is integer, then we consider this to be [statusCode, response] format
     if (Array.isArray(result) && result.length > 0 && Number.isInteger(result[0])) {
@@ -67,9 +39,9 @@ export function apiResultHandler(req: express.Request, res: express.Response, re
         return send(res, statusCode, response);
     } else if (result === undefined) {
         return send(res, 204, "");
-    } else {
-        return send(res, 200, result);
     }
+    return send(res, 200, result);
+
 }
 
 function send(res: express.Response, statusCode: number, response: unknown) {
@@ -81,14 +53,14 @@ function send(res: express.Response, statusCode: number, response: unknown) {
         res.status(statusCode).send(response);
 
         return response.length;
-    } else {
-        const json = JSON.stringify(response);
-
-        res.setHeader("Content-Type", "application/json");
-        res.status(statusCode).send(json);
-
-        return json.length;
     }
+    const json = JSON.stringify(response);
+
+    res.setHeader("Content-Type", "application/json");
+    res.status(statusCode).send(json);
+
+    return json.length;
+
 }
 
 export function apiRoute(method: HttpMethod, path: string, routeHandler: SyncRouteRequestHandler) {
@@ -112,8 +84,8 @@ function internalRoute(method: HttpMethod, path: string, middleware: express.Han
         const start = Date.now();
 
         try {
-            cls.namespace.bindEmitter(req);
-            cls.namespace.bindEmitter(res);
+            namespace.bindEmitter(req);
+            namespace.bindEmitter(res);
 
             const result = cls.init(() => {
                 cls.set("componentId", req.headers["trilium-component-id"]);
@@ -193,7 +165,7 @@ export function createUploadMiddleware(): RequestHandler {
 const uploadMiddleware = createUploadMiddleware();
 
 export const uploadMiddlewareWithErrorHandling = function (req: express.Request, res: express.Response, next: express.NextFunction) {
-    uploadMiddleware(req, res, function (err) {
+    uploadMiddleware(req, res, (err) => {
         if (err?.code === "LIMIT_FILE_SIZE") {
             res.setHeader("Content-Type", "text/plain").status(400).send(`Cannot upload file because it excceeded max allowed file size of ${MAX_ALLOWED_FILE_SIZE_MB} MiB`);
         } else {

apps/server/src/routes/routes.ts

@@ -1,76 +1,68 @@
-import { isElectron } from "../services/utils.js";
-import express from "express";
-
-import auth from "../services/auth.js";
-import openID from '../services/open_id.js';
-import totp from './api/totp.js';
-import recoveryCodes from './api/recovery_codes.js';
-import { doubleCsrfProtection as csrfMiddleware } from "./csrf_protection.js";
 import { createPartialContentHandler } from "@triliumnext/express-partial-content";
+import express from "express";
 import rateLimit from "express-rate-limit";
 
-// page routes
-import setupRoute from "./setup.js";
-import loginRoute from "./login.js";
-import indexRoute from "./index.js";
-
-// API routes
-import treeApiRoute from "./api/tree.js";
-import notesApiRoute from "./api/notes.js";
-import branchesApiRoute from "./api/branches.js";
-import attachmentsApiRoute from "./api/attachments.js";
-import autocompleteApiRoute from "./api/autocomplete.js";
-import cloningApiRoute from "./api/cloning.js";
-import revisionsApiRoute from "./api/revisions.js";
-import recentChangesApiRoute from "./api/recent_changes.js";
-import optionsApiRoute from "./api/options.js";
-import passwordApiRoute from "./api/password.js";
-import syncApiRoute from "./api/sync.js";
-import loginApiRoute from "./api/login.js";
-import recentNotesRoute from "./api/recent_notes.js";
-import appInfoRoute from "./api/app_info.js";
-import exportRoute from "./api/export.js";
-import importRoute from "./api/import.js";
-import setupApiRoute from "./api/setup.js";
-import sqlRoute from "./api/sql.js";
-import databaseRoute from "./api/database.js";
-import imageRoute from "./api/image.js";
-import attributesRoute from "./api/attributes.js";
-import scriptRoute from "./api/script.js";
-import senderRoute from "./api/sender.js";
-import filesRoute from "./api/files.js";
-import searchRoute from "./api/search.js";
-import bulkActionRoute from "./api/bulk_action.js";
-import specialNotesRoute from "./api/special_notes.js";
-import noteMapRoute from "./api/note_map.js";
-import clipperRoute from "./api/clipper.js";
-import similarNotesRoute from "./api/similar_notes.js";
-import keysRoute from "./api/keys.js";
-import backendLogRoute from "./api/backend_log.js";
-import statsRoute from "./api/stats.js";
-import fontsRoute from "./api/fonts.js";
-import etapiTokensApiRoutes from "./api/etapi_tokens.js";
-import relationMapApiRoute from "./api/relation-map.js";
-import otherRoute from "./api/other.js";
-import metricsRoute from "./api/metrics.js";
-import shareRoutes from "../share/routes.js";
-import ollamaRoute from "./api/ollama.js";
-import openaiRoute from "./api/openai.js";
-import anthropicRoute from "./api/anthropic.js";
-import llmRoute from "./api/llm.js";
-import systemInfoRoute from "./api/system_info.js";
-
-import etapiAuthRoutes from "../etapi/auth.js";
 import etapiAppInfoRoutes from "../etapi/app_info.js";
 import etapiAttachmentRoutes from "../etapi/attachments.js";
 import etapiAttributeRoutes from "../etapi/attributes.js";
-import etapiBranchRoutes from "../etapi/branches.js";
-import etapiNoteRoutes from "../etapi/notes.js";
-import etapiSpecialNoteRoutes from "../etapi/special_notes.js";
-import etapiSpecRoute from "../etapi/spec.js";
+import etapiAuthRoutes from "../etapi/auth.js";
 import etapiBackupRoute from "../etapi/backup.js";
+import etapiBranchRoutes from "../etapi/branches.js";
 import etapiMetricsRoute from "../etapi/metrics.js";
+import etapiNoteRoutes from "../etapi/notes.js";
+import etapiSpecRoute from "../etapi/spec.js";
+import etapiSpecialNoteRoutes from "../etapi/special_notes.js";
+import auth from "../services/auth.js";
+import openID from '../services/open_id.js';
+import { isElectron } from "../services/utils.js";
+import shareRoutes from "../share/routes.js";
+import anthropicRoute from "./api/anthropic.js";
+import appInfoRoute from "./api/app_info.js";
+import attributesRoute from "./api/attributes.js";
+import autocompleteApiRoute from "./api/autocomplete.js";
+import backendLogRoute from "./api/backend_log.js";
+import branchesApiRoute from "./api/branches.js";
+import bulkActionRoute from "./api/bulk_action.js";
+import clipperRoute from "./api/clipper.js";
+import cloningApiRoute from "./api/cloning.js";
+import databaseRoute from "./api/database.js";
+import etapiTokensApiRoutes from "./api/etapi_tokens.js";
+import exportRoute from "./api/export.js";
+import filesRoute from "./api/files.js";
+import fontsRoute from "./api/fonts.js";
+import imageRoute from "./api/image.js";
+import importRoute from "./api/import.js";
+import llmRoute from "./api/llm.js";
+import loginApiRoute from "./api/login.js";
+import metricsRoute from "./api/metrics.js";
+import noteMapRoute from "./api/note_map.js";
+import ollamaRoute from "./api/ollama.js";
+import openaiRoute from "./api/openai.js";
+import otherRoute from "./api/other.js";
+import passwordApiRoute from "./api/password.js";
+import recentChangesApiRoute from "./api/recent_changes.js";
+import recoveryCodes from './api/recovery_codes.js';
+import relationMapApiRoute from "./api/relation-map.js";
+import revisionsApiRoute from "./api/revisions.js";
+import scriptRoute from "./api/script.js";
+import searchRoute from "./api/search.js";
+import senderRoute from "./api/sender.js";
+import setupApiRoute from "./api/setup.js";
+import similarNotesRoute from "./api/similar_notes.js";
+import specialNotesRoute from "./api/special_notes.js";
+import sqlRoute from "./api/sql.js";
+import statsRoute from "./api/stats.js";
+import syncApiRoute from "./api/sync.js";
+import systemInfoRoute from "./api/system_info.js";
+import totp from './api/totp.js';
+// API routes
+import { doubleCsrfProtection as csrfMiddleware } from "./csrf_protection.js";
+import * as indexRoute from "./index.js";
+import loginRoute from "./login.js";
 import { apiResultHandler, apiRoute, asyncApiRoute, asyncRoute, route, router, uploadMiddlewareWithErrorHandling } from "./route_api.js";
+// page routes
+import setupRoute from "./setup.js";
+import { routes } from "@triliumnext/core";
 
 const GET = "get",
     PST = "post",
@@ -79,7 +71,6 @@ const GET = "get",
     DEL = "delete";
 
 function register(app: express.Application) {
-    route(GET, "/", [auth.checkAuth, csrfMiddleware], indexRoute.index);
     route(GET, "/login", [auth.checkAppInitialized, auth.checkPasswordSet], loginRoute.loginPage);
     route(GET, "/set-password", [auth.checkAppInitialized, auth.checkPasswordNotSet], loginRoute.setPasswordPage);
 
@@ -89,6 +80,7 @@ function register(app: express.Application) {
         skipSuccessfulRequests: true // successful auth to rate-limited ETAPI routes isn't counted. However, successful auth to /login is still counted!
     });
 
+    route(GET, "/bootstrap", [ auth.checkAuth ], indexRoute.bootstrap);
     route(PST, "/login", [loginRateLimiter], loginRoute.login);
     route(PST, "/logout", [csrfMiddleware, auth.checkAuth], loginRoute.logout);
     route(PST, "/set-password", [auth.checkAppInitialized, auth.checkPasswordNotSet], loginRoute.setPassword);
@@ -108,22 +100,8 @@ function register(app: express.Application) {
     apiRoute(GET, '/api/totp_recovery/enabled', recoveryCodes.checkForRecoveryKeys);
     apiRoute(GET, '/api/totp_recovery/used', recoveryCodes.getUsedRecoveryCodes);
 
-    apiRoute(GET, '/api/tree', treeApiRoute.getTree);
-    apiRoute(PST, '/api/tree/load', treeApiRoute.load);
+    routes.buildSharedApiRoutes(apiRoute);
 
-    apiRoute(GET, "/api/notes/:noteId", notesApiRoute.getNote);
-    apiRoute(GET, "/api/notes/:noteId/blob", notesApiRoute.getNoteBlob);
-    apiRoute(GET, "/api/notes/:noteId/metadata", notesApiRoute.getNoteMetadata);
-    apiRoute(PUT, "/api/notes/:noteId/data", notesApiRoute.updateNoteData);
-    apiRoute(DEL, "/api/notes/:noteId", notesApiRoute.deleteNote);
-    apiRoute(PUT, "/api/notes/:noteId/undelete", notesApiRoute.undeleteNote);
-    apiRoute(PST, "/api/notes/:noteId/revision", notesApiRoute.forceSaveRevision);
-    apiRoute(PST, "/api/notes/:parentNoteId/children", notesApiRoute.createNote);
-    apiRoute(PUT, "/api/notes/:noteId/sort-children", notesApiRoute.sortChildNotes);
-    apiRoute(PUT, "/api/notes/:noteId/protect/:isProtected", notesApiRoute.protectNote);
-    apiRoute(PUT, "/api/notes/:noteId/type", notesApiRoute.setNoteTypeMime);
-    apiRoute(PUT, "/api/notes/:noteId/title", notesApiRoute.changeTitle);
-    apiRoute(PST, "/api/notes/:noteId/duplicate/:parentNoteId", notesApiRoute.duplicateSubtree);
     apiRoute(PUT, "/api/notes/:noteId/clone-to-branch/:parentBranchId", cloningApiRoute.cloneNoteToBranch);
     apiRoute(PUT, "/api/notes/:noteId/toggle-in-parent/:parentNoteId/:present", cloningApiRoute.toggleNoteInParent);
     apiRoute(PUT, "/api/notes/:noteId/clone-to-note/:parentNoteId", cloningApiRoute.cloneNoteToParentNote);
@@ -145,7 +123,6 @@ function register(app: express.Application) {
     route(GET, "/api/notes/download/:noteId", [auth.checkApiAuthOrElectron], filesRoute.downloadFile);
     apiRoute(PST, "/api/notes/:noteId/save-to-tmp-dir", filesRoute.saveNoteToTmpDir);
     apiRoute(PST, "/api/notes/:noteId/upload-modified-file", filesRoute.uploadModifiedFileToNote);
-    apiRoute(PST, "/api/notes/:noteId/convert-to-attachment", notesApiRoute.convertNoteToAttachment);
 
     apiRoute(PUT, "/api/branches/:branchId/move-to/:parentBranchId", branchesApiRoute.moveBranchToParent);
     apiRoute(PUT, "/api/branches/:branchId/move-before/:beforeBranchId", branchesApiRoute.moveBranchBeforeNote);
@@ -156,15 +133,8 @@ function register(app: express.Application) {
     apiRoute(PUT, "/api/branches/:branchId/set-prefix", branchesApiRoute.setPrefix);
     apiRoute(PUT, "/api/branches/set-prefix-batch", branchesApiRoute.setPrefixBatch);
 
-    apiRoute(GET, "/api/notes/:noteId/attachments", attachmentsApiRoute.getAttachments);
-    apiRoute(PST, "/api/notes/:noteId/attachments", attachmentsApiRoute.saveAttachment);
-    route(PST, "/api/notes/:noteId/attachments/upload", [auth.checkApiAuthOrElectron, uploadMiddlewareWithErrorHandling, csrfMiddleware], attachmentsApiRoute.uploadAttachment, apiResultHandler);
-    apiRoute(GET, "/api/attachments/:attachmentId", attachmentsApiRoute.getAttachment);
-    apiRoute(GET, "/api/attachments/:attachmentId/all", attachmentsApiRoute.getAllAttachments);
-    apiRoute(PST, "/api/attachments/:attachmentId/convert-to-note", attachmentsApiRoute.convertAttachmentToNote);
-    apiRoute(DEL, "/api/attachments/:attachmentId", attachmentsApiRoute.deleteAttachment);
-    apiRoute(PUT, "/api/attachments/:attachmentId/rename", attachmentsApiRoute.renameAttachment);
-    apiRoute(GET, "/api/attachments/:attachmentId/blob", attachmentsApiRoute.getAttachmentBlob);
+    // TODO: Bring back attachment uploading
+    // route(PST, "/api/notes/:noteId/attachments/upload", [auth.checkApiAuthOrElectron, uploadMiddlewareWithErrorHandling, csrfMiddleware], attachmentsApiRoute.uploadAttachment, apiResultHandler);
     route(GET, "/api/attachments/:attachmentId/image/:filename", [auth.checkApiAuthOrElectron], imageRoute.returnAttachedImage);
     route(GET, "/api/attachments/:attachmentId/open", [auth.checkApiAuthOrElectron], filesRoute.openAttachment);
     asyncRoute(
@@ -214,13 +184,6 @@ function register(app: express.Application) {
     route(GET, "/api/images/:noteId/:filename", [auth.checkApiAuthOrElectron], imageRoute.returnImageFromNote);
     route(PUT, "/api/images/:noteId", [auth.checkApiAuthOrElectron, uploadMiddlewareWithErrorHandling, csrfMiddleware], imageRoute.updateImage, apiResultHandler);
 
-    apiRoute(GET, "/api/options", optionsApiRoute.getOptions);
-    // FIXME: possibly change to sending value in the body to avoid host of HTTP server issues with slashes
-    apiRoute(PUT, "/api/options/:name/:value", optionsApiRoute.updateOption);
-    apiRoute(PUT, "/api/options", optionsApiRoute.updateOptions);
-    apiRoute(GET, "/api/options/user-themes", optionsApiRoute.getUserThemes);
-    apiRoute(GET, "/api/options/locales", optionsApiRoute.getSupportedLocales);
-
     apiRoute(PST, "/api/password/change", passwordApiRoute.changePassword);
     apiRoute(PST, "/api/password/reset", passwordApiRoute.resetPassword);
 
@@ -236,7 +199,6 @@ function register(app: express.Application) {
     route(PST, "/api/sync/queue-sector/:entityName/:sector", [auth.checkApiAuth], syncApiRoute.queueSector, apiResultHandler);
     route(GET, "/api/sync/stats", [], syncApiRoute.getStats, apiResultHandler);
 
-    apiRoute(PST, "/api/recent-notes", recentNotesRoute.addRecentNote);
     apiRoute(GET, "/api/app-info", appInfoRoute.getAppInfo);
     apiRoute(GET, "/api/metrics", metricsRoute.getMetrics);
     apiRoute(GET, "/api/system-checks", systemInfoRoute.systemChecks);
@@ -334,19 +296,12 @@ function register(app: express.Application) {
     asyncRoute(PST, "/api/sender/image", [auth.checkEtapiToken, uploadMiddlewareWithErrorHandling], senderRoute.uploadImage, apiResultHandler);
     asyncRoute(PST, "/api/sender/note", [auth.checkEtapiToken], senderRoute.saveNote, apiResultHandler);
 
-    apiRoute(GET, "/api/keyboard-actions", keysRoute.getKeyboardActions);
-    apiRoute(GET, "/api/keyboard-shortcuts-for-notes", keysRoute.getShortcutsForNotes);
-
     apiRoute(PST, "/api/relation-map", relationMapApiRoute.getRelationMap);
-    apiRoute(PST, "/api/notes/erase-deleted-notes-now", notesApiRoute.eraseDeletedNotesNow);
-    apiRoute(PST, "/api/notes/erase-unused-attachments-now", notesApiRoute.eraseUnusedAttachmentsNow);
     asyncApiRoute(GET, "/api/similar-notes/:noteId", similarNotesRoute.getSimilarNotes);
     asyncApiRoute(GET, "/api/backend-log", backendLogRoute.getBackendLog);
     apiRoute(GET, "/api/stats/note-size/:noteId", statsRoute.getNoteSize);
     apiRoute(GET, "/api/stats/subtree-size/:noteId", statsRoute.getSubtreeSize);
-    apiRoute(PST, "/api/delete-notes-preview", notesApiRoute.getDeleteNotesPreview);
     route(GET, "/api/fonts", [auth.checkApiAuthOrElectron], fontsRoute.getFontCss);
-    apiRoute(GET, "/api/other/icon-usage", otherRoute.getIconUsage);
     apiRoute(PST, "/api/other/render-markdown", otherRoute.renderMarkdown);
     apiRoute(PST, "/api/other/to-markdown", otherRoute.toMarkdown);
     apiRoute(GET, "/api/recent-changes/:ancestorNoteId", recentChangesApiRoute.getRecentChanges);
@@ -354,7 +309,6 @@ function register(app: express.Application) {
 
     apiRoute(PST, "/api/note-map/:noteId/tree", noteMapRoute.getTreeMap);
     apiRoute(PST, "/api/note-map/:noteId/link", noteMapRoute.getLinkMap);
-    apiRoute(GET, "/api/note-map/:noteId/backlink-count", noteMapRoute.getBacklinkCount);
     apiRoute(GET, "/api/note-map/:noteId/backlinks", noteMapRoute.getBacklinks);
 
     shareRoutes.register(router);

apps/server/src/services/app_info.ts

@@ -1,21 +1,11 @@
-import path from "path";
-import build from "./build.js";
-import packageJson from "../../package.json" with { type: "json" };
-import dataDir from "./data_dir.js";
 import { AppInfo } from "@triliumnext/commons";
+import { app_info as coreAppInfo } from "@triliumnext/core";
+import path from "path";
 
-const APP_DB_VERSION = 233;
-const SYNC_VERSION = 36;
-const CLIPPER_PROTOCOL_VERSION = "1.0";
+import dataDir from "./data_dir.js";
 
 export default {
-    appVersion: packageJson.version,
-    dbVersion: APP_DB_VERSION,
+    ...coreAppInfo,
     nodeVersion: process.version,
-    syncVersion: SYNC_VERSION,
-    buildDate: build.buildDate,
-    buildRevision: build.buildRevision,
     dataDirectory: path.resolve(dataDir.TRILIUM_DATA_DIR),
-    clipperProtocolVersion: CLIPPER_PROTOCOL_VERSION,
-    utcDateTime: new Date().toISOString()
 } satisfies AppInfo;

apps/server/src/services/backend_script_api.ts

@@ -1,41 +1,38 @@
+import { type AttributeRow, dayjs, formatLogMessage } from "@triliumnext/commons";
+import { type AbstractBeccaEntity, Becca, NoteParams } from "@triliumnext/core";
+import axios from "axios";
+import * as cheerio from "cheerio";
+import xml2js from "xml2js";
+
+import becca from "../becca/becca.js";
+import type BAttachment from "../becca/entities/battachment.js";
+import type BAttribute from "../becca/entities/battribute.js";
+import type BBranch from "../becca/entities/bbranch.js";
+import type BEtapiToken from "../becca/entities/betapi_token.js";
+import type BNote from "../becca/entities/bnote.js";
+import type BOption from "../becca/entities/boption.js";
+import type BRevision from "../becca/entities/brevision.js";
+import appInfo from "./app_info.js";
+import attributeService from "./attributes.js";
+import type { ApiParams } from "./backend_script_api_interface.js";
+import backupService from "./backup.js";
+import branchService from "./branches.js";
+import cloningService from "./cloning.js";
+import config from "./config.js";
+import dateNoteService from "./date_notes.js";
+import exportService from "./export/zip.js";
 import log from "./log.js";
 import noteService from "./notes.js";
-import sql from "./sql.js";
-import { randomString, escapeHtml, unescapeHtml } from "./utils.js";
-import attributeService from "./attributes.js";
-import dateNoteService from "./date_notes.js";
-import treeService from "./tree.js";
-import config from "./config.js";
-import axios from "axios";
-import { dayjs } from "@triliumnext/commons";
-import xml2js from "xml2js";
-import * as cheerio from "cheerio";
-import cloningService from "./cloning.js";
-import appInfo from "./app_info.js";
-import searchService from "./search/services/search.js";
+import optionsService from "./options.js";
 import SearchContext from "./search/search_context.js";
-import becca from "../becca/becca.js";
-import ws from "./ws.js";
+import searchService from "./search/services/search.js";
 import SpacedUpdate from "./spaced_update.js";
 import specialNotesService from "./special_notes.js";
-import branchService from "./branches.js";
-import exportService from "./export/zip.js";
+import sql from "./sql.js";
 import syncMutex from "./sync_mutex.js";
-import backupService from "./backup.js";
-import optionsService from "./options.js";
-import { formatLogMessage } from "@triliumnext/commons";
-import type BNote from "../becca/entities/bnote.js";
-import type AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
-import type BBranch from "../becca/entities/bbranch.js";
-import type BAttribute from "../becca/entities/battribute.js";
-import type BAttachment from "../becca/entities/battachment.js";
-import type BRevision from "../becca/entities/brevision.js";
-import type BEtapiToken from "../becca/entities/betapi_token.js";
-import type BOption from "../becca/entities/boption.js";
-import type { AttributeRow } from "@triliumnext/commons";
-import type Becca from "../becca/becca-interface.js";
-import type { NoteParams } from "./note-interface.js";
-import type { ApiParams } from "./backend_script_api_interface.js";
+import treeService from "./tree.js";
+import { escapeHtml, randomString, unescapeHtml } from "./utils.js";
+import ws from "./ws.js";
 
 /**
  * A whole number
@@ -506,7 +503,7 @@ function BackendScriptApi(this: Api, currentNote: BNote, apiParams: ApiParams) {
             throw new Error(`Unable to find parent note with ID ${parentNote}.`);
         }
 
-        let extraOptions: NoteParams = {
+        const extraOptions: NoteParams = {
             ..._extraOptions,
             content: "",
             type: "text",
@@ -620,13 +617,13 @@ function BackendScriptApi(this: Api, currentNote: BNote, apiParams: ApiParams) {
         }
 
         const parentNoteId = opts.isVisible ? "_lbVisibleLaunchers" : "_lbAvailableLaunchers";
-        const noteId = "al_" + opts.id;
+        const noteId = `al_${  opts.id}`;
 
         const launcherNote =
             becca.getNote(noteId) ||
             specialNotesService.createLauncher({
-                noteId: noteId,
-                parentNoteId: parentNoteId,
+                noteId,
+                parentNoteId,
                 launcherType: opts.type
             }).note;
 
@@ -680,7 +677,7 @@ function BackendScriptApi(this: Api, currentNote: BNote, apiParams: ApiParams) {
 
         ws.sendMessageToAllClients({
             type: "execute-script",
-            script: script,
+            script,
             params: prepareParams(params),
             startNoteId: this.startNote?.noteId,
             currentNoteId: this.currentNote.noteId,
@@ -696,9 +693,9 @@ function BackendScriptApi(this: Api, currentNote: BNote, apiParams: ApiParams) {
             return params.map((p) => {
                 if (typeof p === "function") {
                     return `!@#Function: ${p.toString()}`;
-                } else {
-                    return p;
                 }
+                return p;
+
             });
         }
     };

apps/server/src/services/backend_script_api_interface.ts

@@ -1,5 +1,6 @@
+import type { AbstractBeccaEntity } from "@triliumnext/core";
 import type { Request, Response } from "express";
-import type AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
+
 import type BNote from "../becca/entities/bnote.js";
 
 export interface ApiParams {

apps/server/src/services/blob-interface.ts

@@ -1,5 +0,0 @@
-export interface Blob {
-    blobId: string;
-    content: string | Buffer;
-    utcDateModified: string;
-}

apps/server/src/services/bulk_actions.ts

@@ -1,11 +1,12 @@
-import log from "./log.js";
-import becca from "../becca/becca.js";
-import cloningService from "./cloning.js";
-import branchService from "./branches.js";
-import { randomString } from "./utils.js";
-import eraseService from "./erase.js";
-import type BNote from "../becca/entities/bnote.js";
 import { ActionHandlers, BulkAction, BulkActionData } from "@triliumnext/commons";
+import { erase as eraseService } from "@triliumnext/core";
+
+import becca from "../becca/becca.js";
+import type BNote from "../becca/entities/bnote.js";
+import branchService from "./branches.js";
+import cloningService from "./cloning.js";
+import log from "./log.js";
+import { randomString } from "./utils.js";
 
 type ActionHandler<T> = (action: T, note: BNote) => void;
 

apps/server/src/services/cloning.ts

@@ -1,190 +1,2 @@
-"use strict";
-
-import sql from "./sql.js";
-import eventChangesService from "./entity_changes.js";
-import treeService from "./tree.js";
-import BBranch from "../becca/entities/bbranch.js";
-import becca from "../becca/becca.js";
-import log from "./log.js";
-import { CloneResponse } from "@triliumnext/commons";
-
-function cloneNoteToParentNote(noteId: string, parentNoteId: string, prefix: string | null = null): CloneResponse {
-    if (!(noteId in becca.notes) || !(parentNoteId in becca.notes)) {
-        return { success: false, message: "Note cannot be cloned because either the cloned note or the intended parent is deleted." };
-    }
-
-    const parentNote = becca.getNote(parentNoteId);
-    if (!parentNote) {
-        return { success: false, message: "Note cannot be cloned because the parent note could not be found." };
-    }
-
-    if (parentNote.type === "search") {
-        return {
-            success: false,
-            message: "Can't clone into a search note"
-        };
-    }
-
-    const validationResult = treeService.validateParentChild(parentNoteId, noteId);
-
-    if (!validationResult.success) {
-        return validationResult;
-    }
-
-    const branch = new BBranch({
-        noteId: noteId,
-        parentNoteId: parentNoteId,
-        prefix: prefix,
-        isExpanded: false
-    }).save();
-
-    log.info(`Cloned note '${noteId}' to a new parent note '${parentNoteId}' with prefix '${prefix}'`);
-
-    return {
-        success: true,
-        branchId: branch.branchId,
-        notePath: `${parentNote.getBestNotePathString()}/${noteId}`
-    };
-}
-
-function cloneNoteToBranch(noteId: string, parentBranchId: string, prefix?: string) {
-    const parentBranch = becca.getBranch(parentBranchId);
-
-    if (!parentBranch) {
-        return { success: false, message: `Parent branch '${parentBranchId}' does not exist.` };
-    }
-
-    const ret = cloneNoteToParentNote(noteId, parentBranch.noteId, prefix);
-
-    parentBranch.isExpanded = true; // the new target should be expanded, so it immediately shows up to the user
-    parentBranch.save();
-
-    return ret;
-}
-
-function ensureNoteIsPresentInParent(noteId: string, parentNoteId: string, prefix?: string) {
-    if (!(noteId in becca.notes)) {
-        return { branch: null, success: false, message: `Note '${noteId}' is deleted.` };
-    } else if (!(parentNoteId in becca.notes)) {
-        return { branch: null, success: false, message: `Note '${parentNoteId}' is deleted.` };
-    }
-
-    const parentNote = becca.getNote(parentNoteId);
-
-    if (!parentNote) {
-        return { branch: null, success: false, message: "Can't find parent note." };
-    }
-    if (parentNote.type === "search") {
-        return { branch: null, success: false, message: "Can't clone into a search note" };
-    }
-
-    const validationResult = treeService.validateParentChild(parentNoteId, noteId);
-
-    if (!validationResult.success) {
-        return validationResult;
-    }
-
-    const branch = new BBranch({
-        noteId: noteId,
-        parentNoteId: parentNoteId,
-        prefix: prefix,
-        isExpanded: false
-    }).save();
-
-    log.info(`Ensured note '${noteId}' is in parent note '${parentNoteId}' with prefix '${branch.prefix}'`);
-
-    return { branch: branch, success: true };
-}
-
-function ensureNoteIsAbsentFromParent(noteId: string, parentNoteId: string) {
-    const branchId = sql.getValue<string>(/*sql*/`SELECT branchId FROM branches WHERE noteId = ? AND parentNoteId = ? AND isDeleted = 0`, [noteId, parentNoteId]);
-    const branch = becca.getBranch(branchId);
-
-    if (branch) {
-        if (!branch.isWeak && branch.getNote().getStrongParentBranches().length <= 1) {
-            return {
-                success: false,
-                message: `Cannot remove branch '${branch.branchId}' between child '${noteId}' and parent '${parentNoteId}' because this would delete the note as well.`
-            };
-        }
-
-        branch.deleteBranch();
-
-        log.info(`Ensured note '${noteId}' is NOT in parent note '${parentNoteId}'`);
-
-        return { success: true };
-    }
-}
-
-function toggleNoteInParent(present: boolean, noteId: string, parentNoteId: string, prefix?: string) {
-    if (present) {
-        return ensureNoteIsPresentInParent(noteId, parentNoteId, prefix);
-    } else {
-        return ensureNoteIsAbsentFromParent(noteId, parentNoteId);
-    }
-}
-
-function cloneNoteAfter(noteId: string, afterBranchId: string) {
-    if (["_hidden", "root"].includes(noteId)) {
-        return { success: false, message: `Cloning the note '${noteId}' is forbidden.` };
-    }
-
-    const afterBranch = becca.getBranch(afterBranchId);
-
-    if (!afterBranch) {
-        return { success: false, message: `Branch '${afterBranchId}' does not exist.` };
-    }
-
-    if (afterBranch.noteId === "_hidden") {
-        return { success: false, message: "Cannot clone after the hidden branch." };
-    }
-
-    const afterNote = becca.getBranch(afterBranchId);
-
-    if (!(noteId in becca.notes)) {
-        return { success: false, message: `Note to be cloned '${noteId}' is deleted or does not exist.` };
-    } else if (!afterNote || !(afterNote.parentNoteId in becca.notes)) {
-        return { success: false, message: `After note '${afterNote?.parentNoteId}' is deleted or does not exist.` };
-    }
-
-    const parentNote = becca.getNote(afterNote.parentNoteId);
-
-    if (!parentNote || parentNote.type === "search") {
-        return {
-            success: false,
-            message: "Can't clone into a search note"
-        };
-    }
-
-    const validationResult = treeService.validateParentChild(afterNote.parentNoteId, noteId);
-
-    if (!validationResult.success) {
-        return validationResult;
-    }
-
-    // we don't change utcDateModified, so other changes are prioritized in case of conflict
-    // also we would have to sync all those modified branches otherwise hash checks would fail
-    sql.execute("UPDATE branches SET notePosition = notePosition + 10 WHERE parentNoteId = ? AND notePosition > ? AND isDeleted = 0", [afterNote.parentNoteId, afterNote.notePosition]);
-
-    eventChangesService.putNoteReorderingEntityChange(afterNote.parentNoteId);
-
-    const branch = new BBranch({
-        noteId: noteId,
-        parentNoteId: afterNote.parentNoteId,
-        notePosition: afterNote.notePosition + 10,
-        isExpanded: false
-    }).save();
-
-    log.info(`Cloned note '${noteId}' into parent note '${afterNote.parentNoteId}' after note '${afterNote.noteId}', branch '${afterBranchId}'`);
-
-    return { success: true, branchId: branch.branchId };
-}
-
-export default {
-    cloneNoteToBranch,
-    cloneNoteToParentNote,
-    ensureNoteIsPresentInParent,
-    ensureNoteIsAbsentFromParent,
-    toggleNoteInParent,
-    cloneNoteAfter
-};
+import { cloning } from "@triliumnext/core";
+export default cloning;

apps/server/src/services/cls.ts

@@ -1,109 +1,79 @@
-import clsHooked from "cls-hooked";
 import type { EntityChange } from "@triliumnext/commons";
-const namespace = clsHooked.createNamespace("trilium");
+import { cls } from "@triliumnext/core";
 
-type Callback = (...args: any[]) => any;
-
-function init(callback: Callback) {
-    return namespace.runAndReturn(callback);
-}
-
-function wrap(callback: Callback) {
-    return () => {
-        try {
-            init(callback);
-        } catch (e: any) {
-            console.log(`Error occurred: ${e.message}: ${e.stack}`);
-        }
-    };
-}
-
-function get(key: string) {
-    return namespace.get(key);
-}
-
-function set(key: string, value: any) {
-    namespace.set(key, value);
+function init<T>(callback: () => T) {
+    return cls.getContext().init(callback);
 }
 
 function getHoistedNoteId() {
-    return namespace.get("hoistedNoteId") || "root";
+    return cls.getHoistedNoteId();
 }
 
 function getComponentId() {
-    return namespace.get("componentId");
-}
-
-function getLocalNowDateTime() {
-    return namespace.get("localNowDateTime");
+    return cls.getComponentId();
 }
 
+/** @deprecated */
 function disableEntityEvents() {
-    namespace.set("disableEntityEvents", true);
+    cls.disableEntityEvents();
 }
 
+/** @deprecated */
 function enableEntityEvents() {
-    namespace.set("disableEntityEvents", false);
+    cls.enableEntityEvents();
 }
 
 function isEntityEventsDisabled() {
-    return !!namespace.get("disableEntityEvents");
+    return cls.isEntityEventsDisabled();
 }
 
+/** @deprecated */
 function setMigrationRunning(running: boolean) {
-    namespace.set("migrationRunning", !!running);
+    cls.setMigrationRunning(running);
 }
 
+/** @deprecated */
 function isMigrationRunning() {
-    return !!namespace.get("migrationRunning");
-}
-
-function disableSlowQueryLogging(disable: boolean) {
-    namespace.set("disableSlowQueryLogging", disable);
-}
-
-function isSlowQueryLoggingDisabled() {
-    return !!namespace.get("disableSlowQueryLogging");
+    return cls.isMigrationRunning();
 }
 
 function getAndClearEntityChangeIds() {
-    const entityChangeIds = namespace.get("entityChangeIds") || [];
+    const entityChangeIds = cls.getContext().get("entityChangeIds") || [];
 
-    namespace.set("entityChangeIds", []);
+    cls.getContext().set("entityChangeIds", []);
 
     return entityChangeIds;
 }
 
 function putEntityChange(entityChange: EntityChange) {
-    if (namespace.get("ignoreEntityChangeIds")) {
-        return;
-    }
-
-    const entityChangeIds = namespace.get("entityChangeIds") || [];
-
-    // store only ID since the record can be modified (e.g., in erase)
-    entityChangeIds.push(entityChange.id);
-
-    namespace.set("entityChangeIds", entityChangeIds);
-}
-
-function reset() {
-    clsHooked.reset();
+    cls.putEntityChange(entityChange);
 }
 
 function ignoreEntityChangeIds() {
-    namespace.set("ignoreEntityChangeIds", true);
+    cls.getContext().set("ignoreEntityChangeIds", true);
 }
 
+function get(key: string) {
+    return cls.getContext().get(key);
+}
+
+function set(key: string, value: unknown) {
+    cls.getContext().set(key, value);
+}
+
+function reset() {
+    cls.getContext().reset();
+}
+
+export const wrap = cls.wrap;
+
 export default {
     init,
     wrap,
     get,
     set,
-    namespace,
     getHoistedNoteId,
     getComponentId,
-    getLocalNowDateTime,
     disableEntityEvents,
     enableEntityEvents,
     isEntityEventsDisabled,
@@ -111,8 +81,6 @@ export default {
     getAndClearEntityChangeIds,
     putEntityChange,
     ignoreEntityChangeIds,
-    disableSlowQueryLogging,
-    isSlowQueryLoggingDisabled,
     setMigrationRunning,
     isMigrationRunning
 };

apps/server/src/services/consistency_checks.ts

@@ -1,22 +1,19 @@
-"use strict";
-
-import sql from "./sql.js";
-import sqlInit from "./sql_init.js";
-import log from "./log.js";
-import ws from "./ws.js";
-import syncMutexService from "./sync_mutex.js";
-import cls from "./cls.js";
-import entityChangesService from "./entity_changes.js";
-import optionsService from "./options.js";
-import BBranch from "../becca/entities/bbranch.js";
-import becca from "../becca/becca.js";
-import { hash as getHash, hashedBlobId, randomString } from "../services/utils.js";
-import eraseService from "../services/erase.js";
-import sanitizeAttributeName from "./sanitize_attribute_name.js";
-import noteTypesService from "../services/note_types.js";
 import type { BranchRow } from "@triliumnext/commons";
 import type { EntityChange } from "@triliumnext/commons";
-import becca_loader from "../becca/becca_loader.js";
+import { becca_loader, erase as eraseService, utils } from "@triliumnext/core";
+
+import becca from "../becca/becca.js";
+import BBranch from "../becca/entities/bbranch.js";
+import noteTypesService from "../services/note_types.js";
+import { hashedBlobId, randomString } from "../services/utils.js";
+import cls from "./cls.js";
+import entityChangesService from "./entity_changes.js";
+import log from "./log.js";
+import optionsService from "./options.js";
+import sql from "./sql.js";
+import sqlInit from "./sql_init.js";
+import syncMutexService from "./sync_mutex.js";
+import ws from "./ws.js";
 const noteTypes = noteTypesService.getNoteTypeNames();
 
 class ConsistencyChecks {
@@ -84,11 +81,11 @@ class ConsistencyChecks {
                         }
 
                         return true;
-                    } else {
-                        logError(`Tree cycle detected at parent-child relationship: '${parentNoteId}' - '${noteId}', whole path: '${path}'`);
-
-                        this.unrecoveredConsistencyErrors = true;
                     }
+                    logError(`Tree cycle detected at parent-child relationship: '${parentNoteId}' - '${noteId}', whole path: '${path}'`);
+
+                    this.unrecoveredConsistencyErrors = true;
+
                 } else {
                     const newPath = path.slice();
                     newPath.push(noteId);
@@ -186,7 +183,7 @@ class ConsistencyChecks {
                     if (note.getParentBranches().length === 0) {
                         const newBranch = new BBranch({
                             parentNoteId: "root",
-                            noteId: noteId,
+                            noteId,
                             prefix: "recovered"
                         }).save();
 
@@ -349,7 +346,7 @@ class ConsistencyChecks {
                 if (this.autoFix) {
                     const branch = new BBranch({
                         parentNoteId: "root",
-                        noteId: noteId,
+                        noteId,
                         prefix: "recovered"
                     }).save();
 
@@ -485,18 +482,18 @@ class ConsistencyChecks {
                     if (!blobAlreadyExists) {
                         // manually creating row since this can also affect deleted notes
                         sql.upsert("blobs", "blobId", {
-                            noteId: noteId,
+                            noteId,
                             content: blankContent,
                             utcDateModified: fakeDate,
                             dateModified: fakeDate
                         });
 
-                        const hash = getHash(randomString(10));
+                        const hash = utils.hash(randomString(10));
 
                         entityChangesService.putEntityChange({
                             entityName: "blobs",
                             entityId: blobId,
-                            hash: hash,
+                            hash,
                             isErased: false,
                             utcDateChanged: fakeDate,
                             isSynced: true
@@ -805,7 +802,7 @@ class ConsistencyChecks {
         const attrNames = sql.getColumn<string>(/*sql*/`SELECT DISTINCT name FROM attributes`);
 
         for (const origName of attrNames) {
-            const fixedName = sanitizeAttributeName(origName);
+            const fixedName = utils.sanitizeAttributeName(origName);
 
             if (fixedName !== origName) {
                 if (this.autoFix) {
@@ -911,7 +908,7 @@ class ConsistencyChecks {
 
             ws.sendMessageToAllClients({ type: "consistency-checks-failed" });
         } else {
-            log.info(`All consistency checks passed ` + (this.fixedIssues ? "after some fixes" : "with no errors detected") + ` (took ${elapsedTimeMs}ms)`);
+            log.info(`All consistency checks passed ${  this.fixedIssues ? "after some fixes" : "with no errors detected"  } (took ${elapsedTimeMs}ms)`);
         }
     }
 }

apps/server/src/services/content_hash.ts

@@ -1,9 +1,7 @@
-"use strict";
+import { erase as eraseService,utils } from "@triliumnext/core";
 
-import sql from "./sql.js";
-import { hash } from "./utils.js";
 import log from "./log.js";
-import eraseService from "./erase.js";
+import sql from "./sql.js";
 
 type SectorHash = Record<string, string>;
 
@@ -48,7 +46,7 @@ function getEntityHashes() {
 
     for (const entityHashMap of Object.values(hashMap)) {
         for (const key in entityHashMap) {
-            entityHashMap[key] = hash(entityHashMap[key]);
+            entityHashMap[key] = utils.hash(entityHashMap[key]);
         }
     }