Compare commits

...

1 Commits

Author SHA1 Message Date
Elouan Martinet
88d271ea53 Fix streaming using deprecated url.parse instead of WHATWG URL API
Removes [DEP0169] DeprecationWarning from the startup logs.
2025-11-21 12:43:40 +01:00

View File

@ -91,6 +91,19 @@ const parseJSON = (json, req) => {
}
};
/**
* Parses the query string from a request object.
* @param {any?} req
* @returns {any?|undefined}
*/
const parseQueryString = (req) => {
if (!req.url) {
return undefined;
}
const url = new URL(req.url, "http:.");
return Object.fromEntries(Array.from(url.searchParams));
}
// Used for priming the counters/gauges for the various metrics that are
// per-channel
const CHANNEL_NAMES = [
@ -391,8 +404,8 @@ const startServer = async () => {
*/
const accountFromRequest = (req) => new Promise((resolve, reject) => {
const authorization = req.headers.authorization;
const location = req.url ? url.parse(req.url, true) : undefined;
const accessToken = location?.query.access_token || req.headers['sec-websocket-protocol'];
const query = parseQueryString(req);
const accessToken = query?.access_token || req.headers['sec-websocket-protocol'];
if (!authorization && !accessToken) {
reject(new AuthenticationError('Missing access token'));
@ -1298,8 +1311,8 @@ const startServer = async () => {
* @param {import('pino').Logger} log
*/
function onConnection(ws, req, log) {
// Note: url.parse could throw, which would terminate the connection, so we
// increment the connected clients metric straight away when we establish
// In case the handler throws, which would terminate the connection,
// increment the connected clients metric straight away when it establishes
// the connection, without waiting:
metrics.connectedClients.labels({ type: 'websocket' }).inc();
@ -1381,11 +1394,10 @@ const startServer = async () => {
subscribeWebsocketToSystemChannel(session);
// Parse the URL for the connection arguments (if supplied), url.parse can throw:
const location = req.url && url.parse(req.url, true);
if (location && location.query.stream) {
subscribeWebsocketToChannel(session, firstParam(location.query.stream), location.query);
// Parse the URL for the connection arguments (if supplied)
const query = parseQueryString(req);
if (query && query.stream) {
subscribeWebsocketToChannel(session, firstParam(query.stream), query);
}
}