highperfocused/bostr
1
0
Fork 0
mirror of https://github.com/Yonle/bostr.git synced 2025-11-18 18:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

make socket termination faster and fix handling onClose

Browse Source 
Signed-off-by: Yonle <yonle@lecturify.net>
This commit is contained in:
Yonle
2024-01-23 22:49:43 +07:00
parent 9ed79a0892
commit c356fbfcf7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bouncer.js
View File

@@ -20,7 +20,7 @@ if (relays.length < max_eose_score) max_eose_score = 0;
cache_relays = cache_relays?.map(i => i.endsWith("/") ? i : i + "/"); cache_relays = cache_relays?.map(i => i.endsWith("/") ? i : i + "/");
// CL - User socket // CL - User socket
module.exports = (ws, req) => { module.exports = (ws, req, onClose) => {
let authKey = null; let authKey = null;
let authorized = true; let authorized = true;
let orphan = getOrphanSess(); // if available let orphan = getOrphanSess(); // if available
@@ -134,6 +134,7 @@ module.exports = (ws, req) => {
ws.on('error', console.error); ws.on('error', console.error);
ws.on('close', _ => { ws.on('close', _ => {
onClose();
console.log(process.pid, "---", "Sock", ws.id, "has disconnected.", `(${howManyOrphanSess()+1} orphans)`); console.log(process.pid, "---", "Sock", ws.id, "has disconnected.", `(${howManyOrphanSess()+1} orphans)`);
if (csess.has(ws.id)) { if (csess.has(ws.id)) {
csess.set(ws.id, null); // set as orphan. csess.set(ws.id, null); // set as orphan.
@@ -206,7 +207,7 @@ function direct_bc(msg, id) {
for (const sock of socks) { for (const sock of socks) {
if (cache_relays?.includes(sock.url)) continue; if (cache_relays?.includes(sock.url)) continue;
if (sock.id !== id) continue; if (sock.id !== id) continue;
if (sock.readyState >= 2) return socks.delete(sock); if (sock.readyState !== 2) continue;
// skip the ratelimit after <config.upstream_ratelimit_expiration> // skip the ratelimit after <config.upstream_ratelimit_expiration>
if ((upstream_ratelimit_expiration) > (Date.now() - sock.ratelimit)) continue; if ((upstream_ratelimit_expiration) > (Date.now() - sock.ratelimit)) continue;
@@ -218,7 +219,7 @@ function cache_bc(msg, id) {
for (const sock of socks) { for (const sock of socks) {
if (!cache_relays?.includes(sock.url)) continue; if (!cache_relays?.includes(sock.url)) continue;
if (sock.id !== id) continue; if (sock.id !== id) continue;
if (sock.readyState >= 2) return socks.delete(sock); if (sock.readyState !== 2) continue;
sock.send(JSON.stringify(msg)); sock.send(JSON.stringify(msg));
} }
} }
@@ -291,7 +292,6 @@ function newConn(addr, id, reconn_t = 0) {
const client = csess.get(id); const client = csess.get(id);
if (!csess.has(id)) return relay.terminate(); if (!csess.has(id)) return relay.terminate();
reconn_t = 0; reconn_t = 0;
socks.add(relay); // Add this socket session to [socks]
if (log_about_relays) console.log(process.pid, "---", `[${id}] [${socks.size}/${relays.length*csess.size}] ${relay.url} is connected ${!client ? "(orphan)" : ""}`); if (log_about_relays) console.log(process.pid, "---", `[${id}] [${socks.size}/${relays.length*csess.size}] ${relay.url} is connected ${!client ? "(orphan)" : ""}`);
if (!client) return; // is orphan, do nothing. if (!client) return; // is orphan, do nothing.
@@ -403,7 +403,7 @@ function newConn(addr, id, reconn_t = 0) {
relay.on('close', _ => { relay.on('close', _ => {
const client = csess.get(id); const client = csess.get(id);
socks.delete(relay) // Remove this socket session from [socks] list socks.delete(relay); // Remove this socket session from [socks] list
if (log_about_relays) console.log(process.pid, "-!-", `[${id}] [${socks.size}/${relays.length*csess.size}]`, "Disconnected from", relay.url); if (log_about_relays) console.log(process.pid, "-!-", `[${id}] [${socks.size}/${relays.length*csess.size}]`, "Disconnected from", relay.url);
if (!csess.has(id)) return; if (!csess.has(id)) return;
@@ -421,4 +421,6 @@ function newConn(addr, id, reconn_t = 0) {
delete relays[relays.indexOf(addr)]; delete relays[relays.indexOf(addr)];
console.log(process.pid, "-!-", `${relay.url} give status code ${res.statusCode}. Not (re)connect with new session again.`); console.log(process.pid, "-!-", `${relay.url} give status code ${res.statusCode}. Not (re)connect with new session again.`);
}); });
socks.add(relay); // Add this socket session to [socks]
} }

3
http.js
View File

@@ -88,8 +88,7 @@ server.on('upgrade', (req, sock, head) => {
lastConn.set(ip, Date.now()); lastConn.set(ip, Date.now());
req.on('close', _ => lastConn.set(ip, Date.now())); wss.handleUpgrade(req, sock, head, _ => bouncer(_, req, _ => lastConn.set(ip, Date.now())));
wss.handleUpgrade(req, sock, head, _ => bouncer(_, req));
}); });
const listened = server.listen(process.env.PORT || config.port, config.address || "0.0.0.0", _ => { const listened = server.listen(process.env.PORT || config.port, config.address || "0.0.0.0", _ => {