Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-08-10 10:22:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'style/next/forms' of https://github.com/TriliumNext/Notes into style/next/forms

Browse Source
This commit is contained in:
Adorian Doran 2025-01-29 23:14:38 +02:00
commit 0fed7842cf
29 changed files with 216 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/ISSUE_TEMPLATE/task.yml vendored Normal file
View File

@ -0,0 +1,10 @@
name: Task
description: Create a new Task
type: "Task"
body:
- type: textarea
attributes:
label: Describe Task
description: A clear and concise description of what the task is about.
validations:
required: true

1
bin/copy-dist.ts
View File

@ -89,7 +89,6 @@ const copy = async () => {
"node_modules/jsplumb/dist/",
"node_modules/vanilla-js-wheel-zoom/dist/",
"node_modules/mark.js/dist/",
"node_modules/knockout/build/output/",
"node_modules/normalize.css/",
"node_modules/jquery.fancytree/dist/",
"node_modules/bootstrap/dist/",

2
e2e/help.spec.ts
View File

@ -9,7 +9,7 @@ test("Help popup", async ({ page, context }) => {
const popupPromise = page.waitForEvent("popup");
await app.currentNoteSplit.press("F1");
await page.getByRole("link", { name: "online↗" }).click();
await page.getByRole("link", { name: "online" }).click();
const popup = await popupPromise;
expect(popup.url()).toBe("https://triliumnext.github.io/Docs/");
});

4
src/app.ts
View File

@ -35,7 +35,7 @@ app.use((req, res, next) => {
return next();
});
if (!utils.isElectron()) {
if (!utils.isElectron) {
app.use(compression()); // HTTP compression
}
@ -77,7 +77,7 @@ await import("./services/scheduler.js");
startScheduledCleanup();
if (utils.isElectron()) {
if (utils.isElectron) {
(await import("@electron/remote/main/index.js")).initialize();
}

107
src/public/app/setup.js
View File

@ -1,107 +0,0 @@
import utils from "./services/utils.js";
import macInit from "./services/mac_init.js";
macInit.init();
function SetupModel() {
if (syncInProgress) {
setInterval(checkOutstandingSyncs, 1000);
}
const serverAddress = `${location.protocol}//${location.host}`;
$("#current-host").html(serverAddress);
this.step = ko.observable(syncInProgress ? "sync-in-progress" : "setup-type");
this.setupType = ko.observable();
this.setupNewDocument = ko.observable(false);
this.setupSyncFromDesktop = ko.observable(false);
this.setupSyncFromServer = ko.observable(false);
this.syncServerHost = ko.observable();
this.syncProxy = ko.observable();
this.password = ko.observable();
this.setupTypeSelected = () => !!this.setupType();
this.selectSetupType = () => {
if (this.setupType() === "new-document") {
this.step("new-document-in-progress");
$.post("api/setup/new-document").then(() => {
window.location.replace("./setup");
});
} else {
this.step(this.setupType());
}
};
this.back = () => {
this.step("setup-type");
this.setupType("");
};
this.finish = async () => {
const syncServerHost = this.syncServerHost();
const syncProxy = this.syncProxy();
const password = this.password();
if (!syncServerHost) {
showAlert("Trilium server address can't be empty");
return;
}
if (!password) {
showAlert("Password can't be empty");
return;
}
// not using server.js because it loads too many dependencies
const resp = await $.post("api/setup/sync-from-server", {
syncServerHost: syncServerHost,
syncProxy: syncProxy,
password: password
});
if (resp.result === "success") {
this.step("sync-in-progress");
setInterval(checkOutstandingSyncs, 1000);
hideAlert();
} else {
showAlert(`Sync setup failed: ${resp.error}`);
}
};
}
async function checkOutstandingSyncs() {
const { outstandingPullCount, initialized } = await $.get("api/sync/stats");
if (initialized) {
if (utils.isElectron()) {
const remote = utils.dynamicRequire("@electron/remote");
remote.app.relaunch();
remote.app.exit(0);
} else {
utils.reloadFrontendApp();
}
} else {
$("#outstanding-syncs").html(outstandingPullCount);
}
}
function showAlert(message) {
$("#alert").html(message);
$("#alert").show();
}
function hideAlert() {
$("#alert").hide();
}
ko.applyBindings(new SetupModel(), document.getElementById("setup-dialog"));
$("#setup-dialog").show();

130
src/public/app/setup.ts Normal file
View File

@ -0,0 +1,130 @@
import utils from "./services/utils.js";
import macInit from "./services/mac_init.js";
import ko from "knockout";
macInit.init();
// TriliumNextTODO: properly make use of below types
// type SetupModelSetupType = "new-document" | "sync-from-desktop" | "sync-from-server" | "";
// type SetupModelStep = "sync-in-progress" | "setup-type" | "new-document-in-progress" | "sync-from-desktop";
class SetupModel {
syncInProgress: boolean;
step: ko.Observable<string>;
setupType: ko.Observable<string>;
setupNewDocument: ko.Observable<boolean>;
setupSyncFromDesktop: ko.Observable<boolean>;
setupSyncFromServer: ko.Observable<boolean>;
syncServerHost: ko.Observable<string | undefined>;
syncProxy: ko.Observable<string | undefined>;
password: ko.Observable<string | undefined>;
constructor(syncInProgress: boolean) {
this.syncInProgress = syncInProgress;
this.step = ko.observable(syncInProgress ? "sync-in-progress" : "setup-type");
this.setupType = ko.observable("");
this.setupNewDocument = ko.observable(false);
this.setupSyncFromDesktop = ko.observable(false);
this.setupSyncFromServer = ko.observable(false);
this.syncServerHost = ko.observable();
this.syncProxy = ko.observable();
this.password = ko.observable();
if (this.syncInProgress) {
setInterval(checkOutstandingSyncs, 1000);
}
const serverAddress = `${location.protocol}//${location.host}`;
$("#current-host").html(serverAddress);
}
// this is called in setup.ejs
setupTypeSelected() {
return !!this.setupType();
}
selectSetupType() {
if (this.setupType() === "new-document") {
this.step("new-document-in-progress");
$.post("api/setup/new-document").then(() => {
window.location.replace("./setup");
});
} else {
this.step(this.setupType());
}
}
back() {
this.step("setup-type");
this.setupType("");
}
async finish() {
const syncServerHost = this.syncServerHost();
const syncProxy = this.syncProxy();
const password = this.password();
if (!syncServerHost) {
showAlert("Trilium server address can't be empty");
return;
}
if (!password) {
showAlert("Password can't be empty");
return;
}
// not using server.js because it loads too many dependencies
const resp = await $.post("api/setup/sync-from-server", {
syncServerHost: syncServerHost,
syncProxy: syncProxy,
password: password
});
if (resp.result === "success") {
this.step("sync-in-progress");
setInterval(checkOutstandingSyncs, 1000);
hideAlert();
} else {
showAlert(`Sync setup failed: ${resp.error}`);
}
}
}
async function checkOutstandingSyncs() {
const { outstandingPullCount, initialized } = await $.get("api/sync/stats");
if (initialized) {
if (utils.isElectron()) {
const remote = utils.dynamicRequire("@electron/remote");
remote.app.relaunch();
remote.app.exit(0);
} else {
utils.reloadFrontendApp();
}
} else {
$("#outstanding-syncs").html(outstandingPullCount);
}
}
function showAlert(message: string) {
$("#alert").text(message);
$("#alert").show();
}
function hideAlert() {
$("#alert").hide();
}
function getSyncInProgress() {
const el = document.getElementById("syncInProgress");
if (!el || !(el instanceof HTMLMetaElement)) return false;
return !!parseInt(el.content);
}
addEventListener("DOMContentLoaded", (event) => {
ko.applyBindings(new SetupModel(getSyncInProgress()), document.getElementById("setup-dialog"));
$("#setup-dialog").show();
});

2
src/routes/api/clipper.ts
View File

@ -195,7 +195,7 @@ function processContent(images: Image[], note: BNote, content: string) {
}
function openNote(req: Request) {
if (utils.isElectron()) {
if (utils.isElectron) {
ws.sendMessageToAllClients({
type: "openNote",
noteId: req.params.noteId

2
src/routes/api/files.ts
View File

@ -181,7 +181,7 @@ function saveToTmpDir(fileName: string, content: string | Buffer, entityType: st
log.info(`Saved temporary file ${tmpObj.name}`);
if (utils.isElectron()) {
if (utils.isElectron) {
chokidar.watch(tmpObj.name).on("change", (path, stats) => {
ws.sendMessageToAllClients({
type: "openedFileUpdated",

8
src/routes/assets.ts
View File

@ -2,11 +2,11 @@ import assetPath from "../services/asset_path.js";
import path from "path";
import { fileURLToPath } from "url";
import express from "express";
import env from "../services/env.js";
import { isDev } from "../services/utils.js";
import type serveStatic from "serve-static";
const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOptions<express.Response<any, Record<string, any>>>) => {
if (!env.isDev()) {
if (!isDev) {
options = {
maxAge: "1y",
...options
@ -17,7 +17,7 @@ const persistentCacheStatic = (root: string, options?: serveStatic.ServeStaticOp
async function register(app: express.Application) {
const srcRoot = path.join(path.dirname(fileURLToPath(import.meta.url)), "..");
if (env.isDev()) {
if (isDev) {
const webpack = (await import("webpack")).default;
const webpackMiddleware = (await import("webpack-dev-middleware")).default;
const productionConfig = (await import("../../webpack.config.js")).default;
@ -88,8 +88,6 @@ async function register(app: express.Application) {
// Deprecated, https://www.npmjs.com/package/autocomplete.js?activeTab=readme
app.use(`/${assetPath}/node_modules/autocomplete.js/dist/`, persistentCacheStatic(path.join(srcRoot, "..", "node_modules/autocomplete.js/dist/")));
app.use(`/${assetPath}/node_modules/knockout/build/output/`, persistentCacheStatic(path.join(srcRoot, "..", "node_modules/knockout/build/output/")));
app.use(`/${assetPath}/node_modules/normalize.css/`, persistentCacheStatic(path.join(srcRoot, "..", "node_modules/normalize.css/")));
app.use(`/${assetPath}/node_modules/jquery.fancytree/dist/`, persistentCacheStatic(path.join(srcRoot, "..", "node_modules/jquery.fancytree/dist/")));

2
src/routes/csrf_protection.ts
View File

@ -8,7 +8,7 @@ const doubleCsrfUtilities = doubleCsrf({
path: "", // empty, so cookie is valid only for the current path
secure: false,
sameSite: "strict",
httpOnly: !isElectron() // set to false for Electron, see https://github.com/TriliumNext/Notes/pull/966
httpOnly: !isElectron // set to false for Electron, see https://github.com/TriliumNext/Notes/pull/966
},
cookieName: "_csrf"
});

8
src/routes/index.ts
View File

@ -5,8 +5,7 @@ import attributeService from "../services/attributes.js";
import config from "../services/config.js";
import optionService from "../services/options.js";
import log from "../services/log.js";
import env from "../services/env.js";
import utils from "../services/utils.js";
import { isDev, isElectron } from "../services/utils.js";
import protectedSessionService from "../services/protected_session.js";
import packageJson from "../../package.json" with { type: "json" };
import assetPath from "../services/asset_path.js";
@ -19,7 +18,7 @@ import type BNote from "../becca/entities/bnote.js";
function index(req: Request, res: Response) {
const options = optionService.getOptionMap();
const view = !utils.isElectron() && req.cookies["trilium-device"] === "mobile" ? "mobile" : "desktop";
const view = !isElectron && req.cookies["trilium-device"] === "mobile" ? "mobile" : "desktop";
//'overwrite' set to false (default) => the existing token will be re-used and validated
//'validateOnReuse' set to false => if validation fails, generate a new token instead of throwing an error
@ -34,7 +33,6 @@ function index(req: Request, res: Response) {
const theme = options.theme;
const themeNote = attributeService.getNoteWithLabel("appTheme", theme);
const isElectron = utils.isElectron();
res.render(view, {
device: view,
csrfToken: csrfToken,
@ -53,7 +51,7 @@ function index(req: Request, res: Response) {
maxEntityChangeSyncIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes WHERE isSynced = 1"),
instanceName: config.General ? config.General.instanceName : null,
appCssNoteIds: getAppCssNoteIds(),
isDev: env.isDev(),
isDev,
isMainWindow: view === "mobile" ? true : !req.query.extraWindow,
isProtectedSessionAvailable: protectedSessionService.isProtectedSessionAvailable(),
maxContentWidth: Math.max(640, parseInt(options.maxContentWidth)),

4
src/routes/routes.ts
View File

@ -1,6 +1,6 @@
"use strict";
import utils from "../services/utils.js";
import { isElectron } from "../services/utils.js";
import multer from "multer";
import log from "../services/log.js";
import express from "express";
@ -280,7 +280,7 @@ function register(app: express.Application) {
apiRoute(DEL, "/api/etapi-tokens/:etapiTokenId", etapiTokensApiRoutes.deleteToken);
// in case of local electron, local calls are allowed unauthenticated, for server they need auth
const clipperMiddleware = utils.isElectron() ? [] : [auth.checkEtapiToken];
const clipperMiddleware = isElectron ? [] : [auth.checkEtapiToken];
route(GET, "/api/clipper/handshake", clipperMiddleware, clipperRoute.handshake, apiResultHandler);
route(PST, "/api/clipper/clippings", clipperMiddleware, clipperRoute.addClipping, apiResultHandler);

4
src/routes/setup.ts
View File

@ -2,14 +2,14 @@
import sqlInit from "../services/sql_init.js";
import setupService from "../services/setup.js";
import utils from "../services/utils.js";
import { isElectron } from "../services/utils.js";
import assetPath from "../services/asset_path.js";
import appPath from "../services/app_path.js";
import type { Request, Response } from "express";
function setupPage(req: Request, res: Response) {
if (sqlInit.isDbInitialized()) {
if (utils.isElectron()) {
if (isElectron) {
handleElectronRedirect();
} else {
res.redirect(".");

2
src/services/app_icon.ts
View File

@ -23,7 +23,7 @@ Terminal=false
* We overwrite this file during every run as it might have been updated.
*/
function installLocalAppIcon() {
if (!isElectron() || ["win32", "darwin"].includes(os.platform()) || (config.General && config.General.noDesktopIcon)) {
if (!isElectron || ["win32", "darwin"].includes(os.platform()) || (config.General && config.General.noDesktopIcon)) {
return;
}

4
src/services/app_path.ts
View File

@ -1,4 +1,4 @@
import assetPath from "./asset_path.js";
import env from "./env.js";
import { isDev } from "./utils.js";
export default env.isDev() ? assetPath + "/app" : assetPath + "/app-dist";
export default isDev ? assetPath + "/app" : assetPath + "/app-dist";

8
src/services/auth.ts
View File

@ -14,7 +14,7 @@ const noAuthentication = config.General && config.General.noAuthentication === t
function checkAuth(req: Request, res: Response, next: NextFunction) {
if (!sqlInit.isDbInitialized()) {
res.redirect("setup");
} else if (!req.session.loggedIn && !isElectron() && !noAuthentication) {
} else if (!req.session.loggedIn && !isElectron && !noAuthentication) {
res.redirect("login");
} else {
next();
@ -24,7 +24,7 @@ function checkAuth(req: Request, res: Response, next: NextFunction) {
// for electron things which need network stuff
// currently, we're doing that for file upload because handling form data seems to be difficult
function checkApiAuthOrElectron(req: Request, res: Response, next: NextFunction) {
if (!req.session.loggedIn && !isElectron() && !noAuthentication) {
if (!req.session.loggedIn && !isElectron && !noAuthentication) {
reject(req, res, "Logged in session not found");
} else {
next();
@ -48,7 +48,7 @@ function checkAppInitialized(req: Request, res: Response, next: NextFunction) {
}
function checkPasswordSet(req: Request, res: Response, next: NextFunction) {
if (!isElectron() && !passwordService.isPasswordSet()) {
if (!isElectron && !passwordService.isPasswordSet()) {
res.redirect("set-password");
} else {
next();
@ -56,7 +56,7 @@ function checkPasswordSet(req: Request, res: Response, next: NextFunction) {
}
function checkPasswordNotSet(req: Request, res: Response, next: NextFunction) {
if (!isElectron() && passwordService.isPasswordSet()) {
if (!isElectron && passwordService.isPasswordSet()) {
res.redirect("login");
} else {
next();

5
src/services/code_block_theme.ts
View File

@ -8,8 +8,7 @@ import fs from "fs";
import themeNames from "./code_block_theme_names.json" with { type: "json" };
import { t } from "i18next";
import { join } from "path";
import { isElectron, getResourceDir } from "./utils.js";
import env from "./env.js";
import { isDev, isElectron, getResourceDir } from "./utils.js";
/**
* Represents a color scheme for the code block syntax highlight.
@ -46,7 +45,7 @@ export function listSyntaxHighlightingThemes() {
}
function getStylesDirectory() {
if (isElectron() && !env.isDev()) {
if (isElectron && !isDev) {
return "styles";
}

7
src/services/env.ts
View File

@ -1,7 +0,0 @@
function isDev() {
return !!(process.env.TRILIUM_ENV && process.env.TRILIUM_ENV === "dev");
}
export default {
isDev
};

5
src/services/keyboard_actions.ts
View File

@ -2,13 +2,10 @@
import optionService from "./options.js";
import log from "./log.js";
import { isElectron as getIsElectron, isMac as getIsMac } from "./utils.js";
import { isElectron, isMac } from "./utils.js";
import type { KeyboardShortcut } from "./keyboard_actions_interface.js";
import { t } from "i18next";
const isMac = getIsMac();
const isElectron = getIsElectron();
function getDefaultKeyboardActions() {
if (!t("keyboard_actions.note-navigation")) {
throw new Error("Keyboard actions loaded before translations.");

2
src/services/log.ts
View File

@ -17,7 +17,7 @@ const MINUTE = 60 * SECOND;
const HOUR = 60 * MINUTE;
const DAY = 24 * HOUR;
const NEW_LINE = isWindows() ? "\r\n" : "\n";
const NEW_LINE = isWindows ? "\r\n" : "\n";
let todaysMidnight!: Date;

2
src/services/options_init.ts
View File

@ -77,7 +77,7 @@ const defaultOptions: DefaultOption[] = [
{ name: "revisionSnapshotTimeInterval", value: "600", isSynced: true },
{ name: "revisionSnapshotNumberLimit", value: "-1", isSynced: true },
{ name: "protectedSessionTimeout", value: "600", isSynced: true },
{ name: "zoomFactor", value: isWindows() ? "0.9" : "1.0", isSynced: false },
{ name: "zoomFactor", value: isWindows ? "0.9" : "1.0", isSynced: false },
{ name: "overrideThemeFonts", value: "false", isSynced: false },
{ name: "mainFontFamily", value: "theme", isSynced: false },
{ name: "mainFontSize", value: "100", isSynced: false },

7
src/services/port.ts
View File

@ -1,6 +1,5 @@
import config from "./config.js";
import { isElectron } from "./utils.js";
import env from "./env.js";
import { isDev, isElectron } from "./utils.js";
import dataDir from "./data_dir.js";
function parseAndValidate(portStr: string, source: string) {
@ -18,8 +17,8 @@ let port: number;
if (process.env.TRILIUM_PORT) {
port = parseAndValidate(process.env.TRILIUM_PORT, "environment variable TRILIUM_PORT");
} else if (isElectron()) {
port = env.isDev() ? 37740 : 37840;
} else if (isElectron) {
port = isDev ? 37740 : 37840;
} else {
port = parseAndValidate(config["Network"]["port"] || "3000", `Network.port in ${dataDir.CONFIG_INI_PATH}`);
}

2
src/services/request.ts
View File

@ -206,7 +206,7 @@ async function getProxyAgent(opts: ClientOpts) {
async function getClient(opts: ClientOpts): Promise<Client> {
// it's not clear how to explicitly configure proxy (as opposed to system proxy),
// so in that case, we always use node's modules
if (isElectron() && !opts.proxy) {
if (isElectron && !opts.proxy) {
return (await import("electron")).net as Client;
} else {
const { protocol } = url.parse(opts.url);

2
src/services/sql_init.ts
View File

@ -37,7 +37,7 @@ function isDbInitialized() {
async function initDbConnection() {
if (!isDbInitialized()) {
log.info(`DB not initialized, please visit setup page` + (isElectron() ? "" : ` - http://[your-server-host]:${port} to see instructions on how to initialize Trilium.`));
log.info(`DB not initialized, please visit setup page` + (isElectron ? "" : ` - http://[your-server-host]:${port} to see instructions on how to initialize Trilium.`));
return;
}

25
src/services/utils.ts
View File

@ -8,11 +8,18 @@ import sanitize from "sanitize-filename";
import mimeTypes from "mime-types";
import path from "path";
import { fileURLToPath } from "url";
import env from "./env.js";
import { dirname, join } from "path";
const randtoken = generator({ source: "crypto" });
export const isMac = process.platform === "darwin";
export const isWindows = process.platform === "win32";
export const isElectron = !!process.versions["electron"];
export const isDev = !!(process.env.TRILIUM_ENV && process.env.TRILIUM_ENV === "dev");
export function newEntityId() {
return randomString(12);
}
@ -58,10 +65,6 @@ export function hmac(secret: any, value: any) {
return hmac.digest("base64");
}
export function isElectron() {
return !!process.versions["electron"];
}
export function hash(text: string) {
text = text.normalize();
@ -128,7 +131,7 @@ export function escapeRegExp(str: string) {
}
export async function crash() {
if (isElectron()) {
if (isElectron) {
(await import("electron")).app.exit(1);
} else {
process.exit(1);
@ -314,21 +317,13 @@ export function envToBoolean(val: string | undefined) {
* @returns the resource dir.
*/
export function getResourceDir() {
if (isElectron() && !env.isDev()) {
if (isElectron && !isDev) {
return process.resourcesPath;
} else {
return join(dirname(fileURLToPath(import.meta.url)), "..", "..");
}
}
export function isMac() {
return process.platform === "darwin";
}
export function isWindows() {
return process.platform === "win32";
}
export default {
randomSecureToken,
randomString,

11
src/services/window.ts
View File

@ -2,7 +2,6 @@ import path from "path";
import url from "url";
import port from "./port.js";
import optionService from "./options.js";
import env from "./env.js";
import log from "./log.js";
import sqlInit from "./sql_init.js";
import cls from "./cls.js";
@ -10,7 +9,7 @@ import keyboardActionsService from "./keyboard_actions.js";
import remoteMain from "@electron/remote/main/index.js";
import type { App, BrowserWindow, BrowserWindowConstructorOptions, WebContents } from "electron";
import { ipcMain } from "electron";
import { isMac, isWindows } from "./utils.js";
import { isDev, isMac, isWindows } from "./utils.js";
import { fileURLToPath } from "url";
import { dirname } from "path";
@ -116,10 +115,10 @@ function getWindowExtraOpts() {
const extraOpts: Partial<BrowserWindowConstructorOptions> = {};
if (!optionService.getOptionBool("nativeTitleBarVisible")) {
if (isMac()) {
if (isMac) {
extraOpts.titleBarStyle = "hiddenInset";
extraOpts.titleBarOverlay = true;
} else if (isWindows()) {
} else if (isWindows) {
extraOpts.titleBarStyle = "hidden";
extraOpts.titleBarOverlay = true;
} else {
@ -129,7 +128,7 @@ function getWindowExtraOpts() {
}
// Window effects (Mica)
if (optionService.getOptionBool("backgroundEffects") && isWindows()) {
if (optionService.getOptionBool("backgroundEffects") && isWindows) {
extraOpts.backgroundMaterial = "auto";
}
@ -169,7 +168,7 @@ function configureWebContents(webContents: WebContents, spellcheckEnabled: boole
}
function getIcon() {
return path.join(dirname(fileURLToPath(import.meta.url)), "../../images/app-icons/png/256x256" + (env.isDev() ? "-dev" : "") + ".png");
return path.join(dirname(fileURLToPath(import.meta.url)), "../../images/app-icons/png/256x256" + (isDev ? "-dev" : "") + ".png");
}
async function createSetupWindow() {

9
src/services/ws.ts
View File

@ -1,5 +1,5 @@
import { WebSocketServer as WebSocketServer, WebSocket } from "ws";
import { isElectron, randomString } from "./utils.js";
import { isDev, isElectron, randomString } from "./utils.js";
import log from "./log.js";
import sql from "./sql.js";
import cls from "./cls.js";
@ -9,16 +9,15 @@ import protectedSessionService from "./protected_session.js";
import becca from "../becca/becca.js";
import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
import env from "./env.js";
import type { IncomingMessage, Server as HttpServer } from "http";
import type { EntityChange } from "./entity_changes_interface.js";
if (env.isDev()) {
if (isDev) {
const chokidar = (await import("chokidar")).default;
const debounce = (await import("debounce")).default;
const debouncedReloadFrontend = debounce(() => reloadFrontend("source code change"), 200);
chokidar
.watch(isElectron() ? "dist/src/public" : "src/public")
.watch(isElectron ? "dist/src/public" : "src/public")
.on("add", debouncedReloadFrontend)
.on("change", debouncedReloadFrontend)
.on("unlink", debouncedReloadFrontend);
@ -62,7 +61,7 @@ function init(httpServer: HttpServer, sessionParser: SessionParser) {
webSocketServer = new WebSocketServer({
verifyClient: (info, done) => {
sessionParser(info.req, {}, () => {
const allowed = isElectron() || (info.req as any).session.loggedIn || (config.General && config.General.noAuthentication);
const allowed = isElectron || (info.req as any).session.loggedIn || (config.General && config.General.noAuthentication);
if (!allowed) {
log.error("WebSocket connection not allowed because session is neither electron nor logged in.");

40
src/views/setup.ejs
View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta id="syncInProgress" content="<%= syncInProgress ? 1 : 0 %>" />
<title><%= t("setup.title") %></title>
<style>
@ -53,20 +54,23 @@
</div>
<div id="setup-type" data-bind="visible: step() == 'setup-type'" style="margin-top: 20px;">
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupType">
<%= t("setup.new-document") %></label>
</div>
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupType">
<%= t("setup.sync-from-desktop") %></label>
</div>
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupType">
<%= t("setup.sync-from-server") %></label>
</div>
<form data-bind="submit: selectSetupType">
<button type="button" data-bind="disable: !setupTypeSelected(), click: selectSetupType" class="btn btn-primary"><%= t("setup.next") %></button>
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupType"">
<%= t("setup.new-document") %></label>
</div>
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupType">
<%= t("setup.sync-from-desktop") %></label>
</div>
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupType"">
<%= t("setup.sync-from-server") %></label>
</div>
<button type="submit" data-bind="disable: !setupTypeSelected()" class="btn btn-primary"><%= t("setup.next") %></button>
</form>
</div>
<div data-bind="visible: step() == 'new-document-in-progress'">
@ -104,6 +108,8 @@
</div>
<div data-bind="visible: step() == 'sync-from-server'">
<form data-bind="submit: finish">
<h2><%= t("setup_sync-from-server.heading") %></h2>
<p><%= t("setup_sync-from-server.instructions") %></p>
@ -125,9 +131,9 @@
<button type="button" data-bind="click: back" class="btn btn-secondary"><%= t("setup_sync-from-server.back") %></button>
&nbsp;
<button type="submit" class="btn btn-primary"><%= t("setup_sync-from-server.finish-setup") %></button>
</form>
<button type="button" data-bind="click: finish" class="btn btn-primary"><%= t("setup_sync-from-server.finish-setup") %></button>
</div>
<div data-bind="visible: step() == 'sync-in-progress'">
@ -146,8 +152,6 @@
window.glob = {
componentId: ''
};
window.syncInProgress = <%= syncInProgress ? 'true' : 'false' %>;
</script>
<!-- Required for correct loading of scripts in Electron -->
@ -159,8 +163,6 @@
<link href="<%= assetPath %>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<script src="<%= assetPath %>/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="<%= assetPath %>/node_modules/knockout/build/output/knockout-latest.js"></script>
<script src="<%= appPath %>/setup.js" crossorigin type="module"></script>
<link href="<%= assetPath %>/stylesheets/theme-light.css" rel="stylesheet" />
<link href="<%= assetPath %>/stylesheets/theme-next.css" rel="stylesheet" />

6
src/www.ts
View File

@ -53,7 +53,7 @@ async function startTrilium() {
* its startup is slower than focusing the existing process/window. So in the end, it works out without having
* to do a complex evaluation.
*/
if (utils.isElectron()) {
if (utils.isElectron) {
(await import("electron")).app.requestSingleInstanceLock();
}
@ -71,7 +71,7 @@ async function startTrilium() {
ws.init(httpServer, sessionParser as any); // TODO: Not sure why session parser is incompatible.
if (utils.isElectron()) {
if (utils.isElectron) {
const electronRouting = await import("./routes/electron.js");
electronRouting.default(app);
}
@ -146,7 +146,7 @@ function startHttpServer() {
}
}
if (utils.isElectron()) {
if (utils.isElectron) {
import("electron").then(({ app, dialog }) => {
// Not all situations require showing an error dialog. When Trilium is already open,
// clicking the shortcut, the software icon, or the taskbar icon, or when creating a new window,