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

Merge pull request #1037 from TriliumNext/renovate/ws-8.x

Browse Source 
chore(deps): update dependency @types/ws to v8.5.14
This commit is contained in:
Elian Doran 2025-01-26 20:48:57 +02:00 committed by GitHub
commit 8e62c942ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -147,7 +147,7 @@
"@types/stream-throttle": "0.1.4", "@types/stream-throttle": "0.1.4",
"@types/tmp": "0.2.6", "@types/tmp": "0.2.6",
"@types/turndown": "5.0.5", "@types/turndown": "5.0.5",
"@types/ws": "8.5.13", "@types/ws": "8.5.14",
"@types/xml2js": "0.4.14", "@types/xml2js": "0.4.14",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.0.4", "@vitest/coverage-v8": "3.0.4",
@ -4126,9 +4126,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/ws": { "node_modules/@types/ws": {
"version": "8.5.13", "version": "8.5.14",
"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
"integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==", "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

2
package.json
View File

@ -189,7 +189,7 @@
"@types/stream-throttle": "0.1.4", "@types/stream-throttle": "0.1.4",
"@types/tmp": "0.2.6", "@types/tmp": "0.2.6",
"@types/turndown": "5.0.5", "@types/turndown": "5.0.5",
"@types/ws": "8.5.13", "@types/ws": "8.5.14",
"@types/xml2js": "0.4.14", "@types/xml2js": "0.4.14",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
"@vitest/coverage-v8": "3.0.4", "@vitest/coverage-v8": "3.0.4",

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);