From 61d4d3fd2c36472486124db25a42593c24a29b93 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 26 Jan 2025 20:39:19 +0200 Subject: [PATCH] fix(types): broken types after ws upgrade --- src/services/ws.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/services/ws.ts b/src/services/ws.ts index 1439e4555..aa24e65a2 100644 --- a/src/services/ws.ts +++ b/src/services/ws.ts @@ -1,4 +1,4 @@ -import WebSocket from "ws"; +import { WebSocketServer as WebSocketServer, WebSocket } from "ws"; import { isElectron, randomString } from "./utils.js"; import log from "./log.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 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"; if (env.isDev()) { @@ -24,7 +24,7 @@ if (env.isDev()) { .on("unlink", debouncedReloadFrontend); } -let webSocketServer!: WebSocket.Server; +let webSocketServer!: WebSocketServer; let lastSyncedPush: number | null = null; interface Message { @@ -58,8 +58,8 @@ interface Message { } type SessionParser = (req: IncomingMessage, params: {}, cb: () => void) => void; -function init(httpServer: Server, sessionParser: SessionParser) { - webSocketServer = new WebSocket.Server({ +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);