Skip to content

Commit cf2fc98

Browse files
committed
Close #113 - Fix Websocket error handling
1 parent 64fbf23 commit cf2fc98

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

routes/webSocket.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ export function route(app, server) {
3737
wss.clients.forEach((client) => {
3838
try {
3939
client.send(message, (error) => {
40-
if (typeof error !== "undefined") {
41-
base.error(`${base.bundle.getText("sendError")}: ${error.toString()}`)
40+
if (error !== null && typeof error !== "undefined") {
41+
base.error(`${base.bundle.getText("sendError")}: ${error}`)
4242
}
4343
})
4444
} catch (e) {
45-
base.error(`${base.bundle.getText("broadcastError")}: ${e.toString()}`)
45+
base.error(`${base.bundle.getText("broadcastError")}: ${e}`)
4646
}
4747
})
4848
base.debug(`${base.bundle.getText("sent")}: ${message}`)
4949
}
5050

5151

5252
wss.on("error", (error) => {
53-
base.error(`${base.bundle.getText("websocketError")}: ${error.toString()}`)
53+
base.error(`${base.bundle.getText("websocketError")}: ${error}`)
5454
})
5555

5656
wss.on("connection", (ws) => {
@@ -75,21 +75,21 @@ export function route(app, server) {
7575
})
7676

7777
ws.on("error", (error) => {
78-
base.error(`${base.bundle.getText("websocketError")}: ${error.toString()}`)
78+
base.error(`${base.bundle.getText("websocketError")}: ${error}`)
7979
})
8080

8181
ws.send(JSON.stringify({
8282
text: base.bundle.getText("connectedToProcess")
8383
}), (error) => {
84-
if (typeof error !== "undefined") {
85-
base.error(`${base.bundle.getText("sendError")}: ${error.toString()}`)
84+
if (error !== null && typeof error !== "undefined") {
85+
base.error(`${base.bundle.getText("sendError")}: ${error}`)
8686
}
8787
})
8888
})
8989

9090

9191
} catch (e) {
92-
base.error(`${base.bundle.getText("generalError")}: ${e.toString()}`)
92+
base.error(`${base.bundle.getText("generalError")}: ${e}`)
9393
}
9494
return app
9595
}

0 commit comments

Comments
 (0)