forks/peertube
1
0
Fork 0
Code Releases Activity

Prevent crash on plugin ws error

Browse source
This commit is contained in:
Chocobozzz 2023-04-17 09:51:18 +02:00
parent 208c97e111
commit 82d1653d79
No known key found for this signature in database
GPG key ID: 583A612D890159BE
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/lib/plugins/plugin-manager.ts
View file

@ -79,6 +79,10 @@ export class PluginManager implements ServerHook {
registerWebSocketRouter () { registerWebSocketRouter () {
this.server.on('upgrade', (request, socket, head) => { 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 url = request.url
const matched = url.match(`/plugins/([^/]+)/([^/]+/)?ws(/.*)`) const matched = url.match(`/plugins/([^/]+)/([^/]+/)?ws(/.*)`)
@ -95,7 +99,11 @@ export class PluginManager implements ServerHook {
const wss = routes.find(r => r.route.startsWith(subRoute)) const wss = routes.find(r => r.route.startsWith(subRoute))
if (!wss) return if (!wss) return
wss.handler(request, socket, head) try {
wss.handler(request, socket, head)
} catch (err) {
logger.error('Exception in plugin handler ' + npmName, { err })
}
}) })
} }