From 82d1653d799ccc0bcc228bb5e5aafef7a071c2db Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 17 Apr 2023 09:51:18 +0200 Subject: [PATCH] Prevent crash on plugin ws error --- server/lib/plugins/plugin-manager.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/lib/plugins/plugin-manager.ts b/server/lib/plugins/plugin-manager.ts index c4d9b6574..d368aecfc 100644 --- a/server/lib/plugins/plugin-manager.ts +++ b/server/lib/plugins/plugin-manager.ts @@ -79,6 +79,10 @@ export class PluginManager implements ServerHook { registerWebSocketRouter () { this.server.on('upgrade', (request, socket, head) => { + // Check if it's a plugin websocket connection + // No need to destroy the stream when we abort the request + // Other handlers in PeerTube will catch this upgrade event too (socket.io, tracker etc) + const url = request.url const matched = url.match(`/plugins/([^/]+)/([^/]+/)?ws(/.*)`) @@ -95,7 +99,11 @@ export class PluginManager implements ServerHook { const wss = routes.find(r => r.route.startsWith(subRoute)) if (!wss) return - wss.handler(request, socket, head) + try { + wss.handler(request, socket, head) + } catch (err) { + logger.error('Exception in plugin handler ' + npmName, { err }) + } }) }