Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Claire 2021-03-24 10:53:50 +01:00
commit f60c99a8fb
53 changed files with 684 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

22
streaming/index.js
View file

@ -9,9 +9,9 @@ const redis = require('redis');
const pg = require('pg');
const log = require('npmlog');
const url = require('url');
const { WebSocketServer } = require('@clusterws/cws');
const uuid = require('uuid');
const fs = require('fs');
const WebSocket = require('ws');
const env = process.env.NODE_ENV || 'development';
const alwaysRequireAuth = process.env.LIMITED_FEDERATION_MODE === 'true' || process.env.WHITELIST_MODE === 'true' || process.env.AUTHORIZED_FETCH === 'true';
@ -774,7 +774,7 @@ const startWorker = (workerId) => {
});
});
const wss = new WebSocketServer({ server, verifyClient: wsVerifyClient });
const wss = new WebSocket.Server({ server, verifyClient: wsVerifyClient });
/**
* @typedef StreamParams
@ -1021,6 +1021,12 @@ const startWorker = (workerId) => {
req.requestId = uuid.v4();
req.remoteAddress = ws._socket.remoteAddress;
ws.isAlive = true;
ws.on('pong', () => {
ws.isAlive = true;
});
/**
* @type {WebSocketSession}
*/
@ -1070,7 +1076,17 @@ const startWorker = (workerId) => {
}
});
wss.startAutoPing(30000);
setInterval(() => {
wss.clients.forEach(ws => {
if (ws.isAlive === false) {
ws.terminate();
return;
}
ws.isAlive = false;
ws.ping('', false, true);
});
}, 30000);
attachServerWithConfig(server, address => {
log.info(`Worker ${workerId} now listening on ${address}`);