highperfocused/bostr
1
0
Fork 0
mirror of https://github.com/Yonle/bostr.git synced 2025-06-13 18:32:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

bouncer: remove eose_timeout

Browse Source 
Signed-off-by: Yonle <yonle@lecturify.net>
This commit is contained in:
Yonle 2024-02-16 23:07:24 +07:00
parent dbe7250965
commit 95bc83261a
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bouncer.js
View File

@ -32,7 +32,6 @@ module.exports = (ws, req, onClose) => {
ws.events = new Map(); // only to prevent the retransmit of the same event. per subID ws.events = new Map(); // only to prevent the retransmit of the same event. per subID
ws.my_events = new Set(); // for event retransmitting. ws.my_events = new Set(); // for event retransmitting.
ws.pendingEOSE = new Map(); // each contain subID ws.pendingEOSE = new Map(); // each contain subID
ws.EOSETimeout = new Map(); // per subID
ws.reconnectTimeout = new Set(); // relays timeout() before reconnection. Only use after client disconnected. ws.reconnectTimeout = new Set(); // relays timeout() before reconnection. Only use after client disconnected.
ws.subalias = new Map(); ws.subalias = new Map();
ws.fakesubalias = new Map(); ws.fakesubalias = new Map();
@ -119,7 +118,6 @@ module.exports = (ws, req, onClose) => {
ws.pause_subs.delete(origID); ws.pause_subs.delete(origID);
ws.fakesubalias.delete(origID); ws.fakesubalias.delete(origID);
ws.subalias.delete(faked); ws.subalias.delete(faked);
cancel_EOSETimeout(ws.id, origID);
data[1] = faked; data[1] = faked;
cache_bc(data, ws.id); cache_bc(data, ws.id);
@ -149,10 +147,6 @@ module.exports = (ws, req, onClose) => {
console.log(process.pid, "---", `${ip} (${ws.id}) disconnected`); console.log(process.pid, "---", `${ip} (${ws.id}) disconnected`);
for (const i of ws.EOSETimeout) {
clearTimeout(i[1]);
};
for (const i of ws.reconnectTimeout) { for (const i of ws.reconnectTimeout) {
clearTimeout(i); clearTimeout(i);
// Let the garbage collector do the thing. No need to add ws.reconnectTimeout.delete(i); // Let the garbage collector do the thing. No need to add ws.reconnectTimeout.delete(i);
@ -167,35 +161,6 @@ module.exports = (ws, req, onClose) => {
} }
} }
// CL - Set up EOSE timeout
function timeoutEOSE(id, subid) {
if (!eose_timeout) return;
const c = csess.get(id);
if (!c) return;
clearTimeout(c.EOSETimeout.get(subid));
c.EOSETimeout.set(subid, setTimeout(_ => timed_out_eose(id, subid), eose_timeout || 2300));
}
// CL - Handle timed out EOSE
function timed_out_eose(id, subid) {
const c = csess.get(id);
if (!c) return;
c.EOSETimeout.delete(subid);
if (!c.pendingEOSE.has(subid)) return;
c.pendingEOSE.delete(subid);
if (c.pause_subs.has(subid)) return c.pause_subs.delete(subid);
c.send(JSON.stringify(["EOSE", subid]));
}
function cancel_EOSETimeout(id, subid) {
const c = csess.get(id);
if (!c) return;
clearTimeout(c.EOSETimeout.get(subid));
c.EOSETimeout.delete(subid);
}
// WS - New session for client $id // WS - New session for client $id
function newsess(id) { function newsess(id) {
cache_relays?.forEach(_ => newConn(_, id)); cache_relays?.forEach(_ => newConn(_, id));
@ -279,7 +244,6 @@ function newConn(addr, id, reconn_t = 0) {
if (data.length < 3 || typeof(data[1]) !== "string" || typeof(data[2]) !== "object") return; if (data.length < 3 || typeof(data[1]) !== "string" || typeof(data[2]) !== "object") return;
if (!client.subalias.has(data[1])) return; if (!client.subalias.has(data[1])) return;
data[1] = client.subalias.get(data[1]); data[1] = client.subalias.get(data[1]);
timeoutEOSE(id, data[1]);
if (client.pause_subs.has(data[1]) && !cache_relays?.includes(relay.url)) return; if (client.pause_subs.has(data[1]) && !cache_relays?.includes(relay.url)) return;
// if filter.since > receivedEvent.created_at, skip // if filter.since > receivedEvent.created_at, skip
@ -329,8 +293,6 @@ function newConn(addr, id, reconn_t = 0) {
if (!cache_relays?.includes(relay.url)) { if (!cache_relays?.includes(relay.url)) {
if (wait_eose && ((client.pendingEOSE.get(data[1]) < max_eose_score) || (client.pendingEOSE.get(data[1]) < Array.from(socks).filter(sock => sock.id === id).length))) return; if (wait_eose && ((client.pendingEOSE.get(data[1]) < max_eose_score) || (client.pendingEOSE.get(data[1]) < Array.from(socks).filter(sock => sock.id === id).length))) return;
if (client.pause_subs.has(data[1])) return client.pause_subs.delete(data[1]); if (client.pause_subs.has(data[1])) return client.pause_subs.delete(data[1]);
cancel_EOSETimeout(data[1]);
} else { } else {
if (client.pendingEOSE.get(data[1]) < Array.from(socks).filter(sock => (sock.id === id) && cache_relays?.includes(sock.url)).length) return; if (client.pendingEOSE.get(data[1]) < Array.from(socks).filter(sock => (sock.id === id) && cache_relays?.includes(sock.url)).length) return;
// get the filter // get the filter

6
config.js.example
View File

@ -55,12 +55,6 @@ module.exports = {
// You may also need to adjust <max_eose_score>. // You may also need to adjust <max_eose_score>.
pause_on_limit: false, pause_on_limit: false,
// EOSE timeout in milliseconds
// Setting as 0 will disable this feature.
//
// Enabling this may make CPU usage to be intensive
eose_timeout: 0,
// Maximum of received EOSE from relays to send EOSE to client. // Maximum of received EOSE from relays to send EOSE to client.
// Normally, waiting EOSE from 3 relays should be enough. Leaving it with 0 equals wait for every established relays. // Normally, waiting EOSE from 3 relays should be enough. Leaving it with 0 equals wait for every established relays.
// NOTE: Please adjust this max score correctly with your configured relays. // NOTE: Please adjust this max score correctly with your configured relays.