Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 19:06:18 +02:00
Code Issues Packages Projects Releases Activity

fix(server): web socket initialization not working

Browse Source
This commit is contained in:
Elian Doran
2026-03-22 20:44:07 +02:00
parent 63198a03ab
commit ef8c4cef8a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/server/src/main.ts
View File

@@ -8,8 +8,9 @@ import path from "path";
import ClsHookedExecutionContext from "./cls_provider.js";
import NodejsCryptoProvider from "./crypto_provider.js";
import NodeRequestProvider from "./services/request.js";
import dataDirs from "./services/data_dir.js";
import NodeRequestProvider from "./services/request.js";
import WebSocketMessagingProvider from "./services/ws_messaging_provider.js";
import BetterSqlite3Provider from "./sql_provider.js";
async function startApplication() {
@@ -48,6 +49,7 @@ async function startApplication() {
crypto: new NodejsCryptoProvider(),
request: new NodeRequestProvider(),
executionContext: new ClsHookedExecutionContext(),
messaging: new WebSocketMessagingProvider(),
translations: (await import("./services/i18n.js")).initializeTranslations,
extraAppInfo: {
nodeVersion: process.version,

4
apps/server/src/services/ws_messaging_provider.ts
View File

@@ -16,11 +16,11 @@ type SessionParser = (req: IncomingMessage, params: {}, cb: () => void) => void;
* message serialization, and client tracking.
*/
export default class WebSocketMessagingProvider implements MessagingProvider {
private webSocketServer: WebSocketServer;
private webSocketServer!: WebSocketServer;
private clientMap = new Map<string, WebSocket>();
private clientMessageHandler?: ClientMessageHandler;
constructor(httpServer: HttpServer, sessionParser: SessionParser) {
init(httpServer: HttpServer, sessionParser: SessionParser) {
this.webSocketServer = new WebSocketServer({
verifyClient: (info, done) => {
sessionParser(info.req, {}, () => {

5
apps/server/src/www.ts
View File

@@ -1,3 +1,4 @@
import { getMessagingProvider } from "@triliumnext/core";
import type { Express } from "express";
import fs from "fs";
import http from "http";
@@ -12,7 +13,6 @@ import log from "./services/log.js";
import port from "./services/port.js";
import { getDbSize } from "./services/sql_init.js";
import utils, { formatSize, formatUtcTime } from "./services/utils.js";
import ws from "./services/ws.js";
import WebSocketMessagingProvider from "./services/ws_messaging_provider.js";
const MINIMUM_NODE_VERSION = "20.0.0";
@@ -60,8 +60,7 @@ export default async function startTriliumServer() {
const httpServer = startHttpServer(app);
const sessionParser = (await import("./routes/session_parser.js")).default;
const messagingProvider = new WebSocketMessagingProvider(httpServer, sessionParser);
ws.init(messagingProvider); // TODO: Not sure why session parser is incompatible.
(getMessagingProvider() as WebSocketMessagingProvider).init(httpServer, sessionParser); // TODO: Not sure why session parser is incompatible.
if (utils.isElectron) {
const electronRouting = await import("./routes/electron.js");