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

fix(types): broken types after ws upgrade

Browse Source
This commit is contained in:
Elian Doran 2025-01-26 20:39:19 +02:00
parent c56eb9a8a1
commit 61d4d3fd2c
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/services/ws.ts
View File

@ -1,4 +1,4 @@
import WebSocket from "ws"; import { WebSocketServer as WebSocketServer, WebSocket } from "ws";
import { isElectron, randomString } from "./utils.js"; import { isElectron, randomString } from "./utils.js";
import log from "./log.js"; import log from "./log.js";
import sql from "./sql.js"; import sql from "./sql.js";
@ -10,7 +10,7 @@ import becca from "../becca/becca.js";
import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js"; import AbstractBeccaEntity from "../becca/entities/abstract_becca_entity.js";
import env from "./env.js"; import env from "./env.js";
import type { IncomingMessage, Server } from "http"; import type { IncomingMessage, Server as HttpServer } from "http";
import type { EntityChange } from "./entity_changes_interface.js"; import type { EntityChange } from "./entity_changes_interface.js";
if (env.isDev()) { if (env.isDev()) {
@ -24,7 +24,7 @@ if (env.isDev()) {
.on("unlink", debouncedReloadFrontend); .on("unlink", debouncedReloadFrontend);
} }
let webSocketServer!: WebSocket.Server; let webSocketServer!: WebSocketServer;
let lastSyncedPush: number | null = null; let lastSyncedPush: number | null = null;
interface Message { interface Message {
@ -58,8 +58,8 @@ interface Message {
} }
type SessionParser = (req: IncomingMessage, params: {}, cb: () => void) => void; type SessionParser = (req: IncomingMessage, params: {}, cb: () => void) => void;
function init(httpServer: Server, sessionParser: SessionParser) { function init(httpServer: HttpServer, sessionParser: SessionParser) {
webSocketServer = new WebSocket.Server({ webSocketServer = new WebSocketServer({
verifyClient: (info, done) => { verifyClient: (info, done) => {
sessionParser(info.req, {}, () => { 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);