Archos/masto-fe-archos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-10-09 21:12:28 +02:00
parent b63d526590 774e1189d2
commit 4a9cdfb928
19 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
streaming/index.js
View File

@@ -256,7 +256,7 @@ const startServer = async () => {
CHANNEL_NAMES.forEach(( channel ) => {
connectedChannels.set({ type: 'websocket', channel }, 0);
connectedChannels.set({ type: 'eventsource', channel }, 0);
})
});
// Prime the counters so that we don't loose metrics between restarts.
// Unfortunately counters don't support the set() API, so instead I'm using
@@ -1317,7 +1317,7 @@ const startServer = async () => {
log.verbose(request.requestId, 'Subscription error:', err.toString());
socket.send(JSON.stringify({ error: err.toString() }));
});
}
};
const removeSubscription = (subscriptions, channelIds, request) => {
@@ -1337,7 +1337,7 @@ const startServer = async () => {
subscription.stopHeartbeat();
delete subscriptions[channelIds.join(';')];
}
};
/**
* @param {WebSocketSession} session
@@ -1357,7 +1357,7 @@ const startServer = async () => {
socket.send(JSON.stringify({ error: "Error unsubscribing from channel" }));
}
});
}
};
/**
* @param {WebSocketSession} session
@@ -1435,7 +1435,7 @@ const startServer = async () => {
const subscriptions = Object.keys(session.subscriptions);
subscriptions.forEach(channelIds => {
removeSubscription(session.subscriptions, channelIds.split(';'), req)
removeSubscription(session.subscriptions, channelIds.split(';'), req);
});
// Decrement the metrics for connected clients: