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

worker_bouncer: try replace newConn function code as class inherited from WebSocket

Browse Source 
Signed-off-by: Yonle <yonle@lecturify.net>
This commit is contained in:
Yonle 2024-06-07 23:34:41 +07:00
parent a9aa39567b
commit ec9baec453
1 changed files with 168 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
worker_bouncer.js
View File

@ -179,18 +179,24 @@ function newsess() {
if (cache_relays) { if (cache_relays) {
for (const url of cache_relays) { for (const url of cache_relays) {
newConn(url, id); if (!csess.hasOwnProperty(id)) break;
const relay = new newConn(url, id);
userRelays[id].add(relay);
} }
} }
switch (shift) { switch (shift) {
case undefined: case undefined:
for (const url of relays) { for (const url of relays) {
newConn(url, id); if (!csess.hasOwnProperty(id)) break;
const relay = new newConn(url, id);
userRelays[id].add(relay);
} }
break; break;
default: default:
newConn(shift, id); if (!csess.hasOwnProperty(id)) break;
const relay = new newConn(shift, id);
userRelays[id].add(relay);
break; break;
} }
} }
@ -275,21 +281,21 @@ function relay_type(addr) {
} }
} }
function newConn(addr, id, reconn_t = 0) { class newConn extends WebSocket {
if (!csess.hasOwnProperty(id)) return; constructor(addr, id, reconn_t = 0) {
if (!stats[addr]) stats[addr] = { raw_rx: 0, rx: 0, tx: 0, f: 0 }; if (!stats[addr]) stats[addr] = { raw_rx: 0, rx: 0, tx: 0, f: 0 };
const relay = new WebSocket(addr, { super(addr, {
headers: { headers: {
"User-Agent": `Bostr ${version}; The nostr relay bouncer; https://github.com/Yonle/bostr; ConnID: ${id}; ${server_meta.canonical_url || "No canonical bouncer URL specified"}; Contact: ${server_meta.contact}`, "User-Agent": `Bostr ${version}; The nostr relay bouncer; https://github.com/Yonle/bostr; ConnID: ${id}; ${server_meta.canonical_url || "No canonical bouncer URL specified"}; Contact: ${server_meta.contact}`,
} }
}); });
relay.isCache = relay_type(addr) === "cache_relay"; this.isCache = relay_type(addr) === "cache_relay";
relay.isLoadBalancer = relay_type(addr) === "loadbalancer"; this.isLoadBalancer = relay_type(addr) === "loadbalancer";
relay.ratelimit = 0; this.ratelimit = 0;
relay.pendingNIP42 = new Set(); this.pendingNIP42 = new Set();
relay.on('open', _ => { this.on('open', _ => {
if (!csess.hasOwnProperty(id)) return relay.terminate(); if (!csess.hasOwnProperty(id)) return this.terminate();
const client = csess[id]; const client = csess[id];
reconn_t = 0; reconn_t = 0;
if (log_about_relays) console.log(threadId, "---", id, "Connected to", addr, `(${relay_type(addr)})`); if (log_about_relays) console.log(threadId, "---", id, "Connected to", addr, `(${relay_type(addr)})`);
@ -297,11 +303,11 @@ function newConn(addr, id, reconn_t = 0) {
if (!client) return; if (!client) return;
for (const i in client.subs) { for (const i in client.subs) {
relay.send(JSON.stringify(["REQ", client.fakesubalias[i], ...client.subs[i]])); this.send(JSON.stringify(["REQ", client.fakesubalias[i], ...client.subs[i]]));
} }
}); });
relay.on('message', data => { this.on('message', data => {
try { try {
data = JSON.parse(data); data = JSON.parse(data);
} catch (error) { } catch (error) {
@ -319,9 +325,9 @@ function newConn(addr, id, reconn_t = 0) {
data[1] = client.subalias[data[1]]; data[1] = client.subalias[data[1]];
if (client.events[data[1]].has(data[2]?.id)) return; // No need to transmit once it has been transmitted before. if (client.events[data[1]].has(data[2]?.id)) return; // No need to transmit once it has been transmitted before.
if (!relay.isCache) bc(["EVENT", data[2]], id, true); // store to cache relay if (!this.isCache) bc(["EVENT", data[2]], id, true); // store to cache relay
const filter = client.mergedFilters[data[1]]; const filter = client.mergedFilters[data[1]];
if (client.pause_subs.has(data[1]) && (filter.since > data[2].created_at) && !relay.isCache) return; if (client.pause_subs.has(data[1]) && (filter.since > data[2].created_at) && !this.isCache) return;
if (client.rejectKinds && client.rejectKinds.includes(data[2]?.id)) return; if (client.rejectKinds && client.rejectKinds.includes(data[2]?.id)) return;
@ -331,7 +337,7 @@ function newConn(addr, id, reconn_t = 0) {
const NotInSearchQuery = "search" in filter && !data[2]?.content?.toLowerCase().includes(filter.search.toLowerCase()); const NotInSearchQuery = "search" in filter && !data[2]?.content?.toLowerCase().includes(filter.search.toLowerCase());
if (NotInSearchQuery) return; if (NotInSearchQuery) return;
if (!relay.isLoadBalancer) client.events[data[1]].add(data[2]?.id); if (!this.isLoadBalancer) client.events[data[1]].add(data[2]?.id);
parentPort.postMessage({ type: "upstream_msg", id, data: JSON.stringify(data) }); parentPort.postMessage({ type: "upstream_msg", id, data: JSON.stringify(data) });
if (max_known_events && client.events[data[1]].size >= max_known_events) if (max_known_events && client.events[data[1]].size >= max_known_events)
@ -344,7 +350,7 @@ function newConn(addr, id, reconn_t = 0) {
// If it's at the limit, Send EOSE to client and delete pendingEOSE of subID // If it's at the limit, Send EOSE to client and delete pendingEOSE of subID
// Skip if EOSE has been omitted // Skip if EOSE has been omitted
if (!client.pendingEOSE.hasOwnProperty(data[1]) || client.pause_subs.has(data[1]) || relay.isLoadBalancer) return; if (!client.pendingEOSE.hasOwnProperty(data[1]) || client.pause_subs.has(data[1]) || this.isLoadBalancer) return;
const limit = getFilterLimit(filter); const limit = getFilterLimit(filter);
if (limit === Infinity) return; if (limit === Infinity) return;
if (client.events[data[1]].size >= limit) { if (client.events[data[1]].size >= limit) {
@ -362,29 +368,29 @@ function newConn(addr, id, reconn_t = 0) {
case "EOSE": case "EOSE":
if (!client.subalias.hasOwnProperty(data[1])) return; if (!client.subalias.hasOwnProperty(data[1])) return;
data[1] = client.subalias[data[1]]; data[1] = client.subalias[data[1]];
if (!client.pendingEOSE.hasOwnProperty(data[1]) && !relay.isLoadBalancer) return; if (!client.pendingEOSE.hasOwnProperty(data[1]) && !this.isLoadBalancer) return;
client.pendingEOSE[data[1]]++; client.pendingEOSE[data[1]]++;
if (log_about_relays) console.log(threadId, "---", id, `got EOSE from ${addr} for ${data[1]}. There are ${client.pendingEOSE[data[1]]} EOSE received out of ${userRelays[id].size} connected relays.`); if (log_about_relays) console.log(threadId, "---", id, `got EOSE from ${addr} for ${data[1]}. There are ${client.pendingEOSE[data[1]]} EOSE received out of ${userRelays[id].size} connected relays.`);
if (!relay.isCache && (wait_eose && ((client.pendingEOSE[data[1]] < max_eose_score) || (client.pendingEOSE[data[1]] < userRelays[id].size)))) return; if (!this.isCache && (wait_eose && ((client.pendingEOSE[data[1]] < max_eose_score) || (client.pendingEOSE[data[1]] < userRelays[id].size)))) return;
if (relay.isCache && !client.events[data[1]].size) return; // if cache relays did not send anything but EOSE, Don't send EOSE yet. if (this.isCache && !client.events[data[1]].size) return; // if cache relays did not send anything but EOSE, Don't send EOSE yet.
delete client.pendingEOSE[data[1]]; delete client.pendingEOSE[data[1]];
if (client.pause_subs.has(data[1]) && !relay.isLoadBalancer) { if (client.pause_subs.has(data[1]) && !this.isLoadBalancer) {
client.pause_subs.delete(data[1]); client.pause_subs.delete(data[1]);
} else { } else {
parentPort.postMessage({ type: "upstream_msg", id, data: JSON.stringify(data) }); parentPort.postMessage({ type: "upstream_msg", id, data: JSON.stringify(data) });
} }
break; break;
case "AUTH": case "AUTH":
if (!private_keys || typeof(data[1]) !== "string" || !client.pubkey) return relay.pendingNIP42.add(data[1]); if (!private_keys || typeof(data[1]) !== "string" || !client.pubkey) return this.pendingNIP42.add(data[1]);
nip42(relay, client.pubkey, private_keys[client.pubkey], data[1]); nip42(this, client.pubkey, private_keys[client.pubkey], data[1]);
break; break;
case "NOTICE": case "NOTICE":
if (typeof(data[1]) !== "string") return; if (typeof(data[1]) !== "string") return;
if (data[1].startsWith("rate-limited")) relay.ratelimit = Date.now(); if (data[1].startsWith("rate-limited")) this.ratelimit = Date.now();
if (log_about_relays) console.log(threadId, id, addr, data[0], data[1]); if (log_about_relays) console.log(threadId, id, addr, data[0], data[1]);
@ -395,7 +401,7 @@ function newConn(addr, id, reconn_t = 0) {
case "CLOSED": case "CLOSED":
if ((typeof(data[1]) !== "string") || (typeof(data[2]) !== "string")) return; if ((typeof(data[1]) !== "string") || (typeof(data[2]) !== "string")) return;
if (data[2].startsWith("rate-limited")) relay.ratelimit = Date.now(); if (data[2].startsWith("rate-limited")) this.ratelimit = Date.now();
if (log_about_relays) console.log(threadId, id, addr, data[0], data[1], data[2]); if (log_about_relays) console.log(threadId, id, addr, data[0], data[1], data[2]);
@ -408,7 +414,7 @@ function newConn(addr, id, reconn_t = 0) {
case "OK": case "OK":
if ((typeof(data[1]) !== "string") || (typeof(data[2]) !== "boolean") || (typeof(data[3]) !== "string")) return; if ((typeof(data[1]) !== "string") || (typeof(data[2]) !== "boolean") || (typeof(data[3]) !== "string")) return;
if (data[3].startsWith("rate-limited")) relay.ratelimit = Date.now(); if (data[3].startsWith("rate-limited")) this.ratelimit = Date.now();
if (log_about_relays) console.log(threadId, id, addr, data[0], data[1], data[2], data[3]); if (log_about_relays) console.log(threadId, id, addr, data[0], data[1], data[2], data[3]);
@ -425,27 +431,29 @@ function newConn(addr, id, reconn_t = 0) {
} }
}); });
relay.on('error', _ => { this.on('error', _ => {
if (log_about_relays) console.error(threadId, "-!-", id, addr, _.toString()) if (log_about_relays) console.error(threadId, "-!-", id, addr, _.toString())
}); });
relay.on('close', _ => { this.on('close', _ => {
if (!userRelays.hasOwnProperty(id)) return; if (!userRelays.hasOwnProperty(id)) return;
userRelays[id].delete(relay); userRelays[id].delete(this);
if (log_about_relays) console.log(threadId, "-!-", id, "Disconnected from", addr, `(${relay_type(addr)})`); if (log_about_relays) console.log(threadId, "-!-", id, "Disconnected from", addr, `(${relay_type(addr)})`);
reconn_t += reconnect_time || 5000 reconn_t += reconnect_time || 5000
setTimeout(_ => { setTimeout(_ => {
newConn(addr, id, reconn_t); if (!csess.hasOwnProperty(id)) return;
const relay = new newConn(addr, id, reconn_t);
userRelays[id].add(relay);
}, reconn_t); }, reconn_t);
stats._global.f++ stats._global.f++
stats[addr].f++ stats[addr].f++
}); });
relay.on('unexpected-response', (req, res) => { this.on('unexpected-response', (req, res) => {
if (!userRelays.hasOwnProperty(id)) return; if (!userRelays.hasOwnProperty(id)) return;
userRelays[id].delete(relay); userRelays[id].delete(this);
if (res.statusCode >= 500) return relay.emit("close", null); if (res.statusCode >= 500) return this.emit("close", null);
relays.splice(relays.indexOf(addr), 1); relays.splice(relays.indexOf(addr), 1);
cache_relays.splice(cache_relays.indexOf(addr), 1); cache_relays.splice(cache_relays.indexOf(addr), 1);
loadbalancer.splice(loadbalancer.indexOf(addr), 1); loadbalancer.splice(loadbalancer.indexOf(addr), 1);
@ -454,8 +462,7 @@ function newConn(addr, id, reconn_t = 0) {
stats._global.f++ stats._global.f++
stats[addr].f++ stats[addr].f++
}); });
}
userRelays[id].add(relay);
} }
for (let i = 1; i <= (idle_sessions || 1); i++) { for (let i = 1; i <= (idle_sessions || 1); i++) {