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

code: use .close() instead of .terminate() & change the name for node module load

Browse Source 
Signed-off-by: Yonle <yonle@lecturify.net>
This commit is contained in:
Yonle 2024-06-05 19:57:17 +07:00
parent 08eb54b106
commit 30fd601263
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bouncer.js
View File

@ -1,9 +1,9 @@
"use strict"; "use strict";
// Anything about handling client connections is in this code. // Anything about handling client connections is in this code.
const { Worker } = require("worker_threads"); const { Worker } = require("node:worker_threads");
const { version } = require("./package.json"); const { version } = require("./package.json");
const querystring = require("querystring"); const querystring = require("node:querystring");
const { validateEvent, nip19 } = require("nostr-tools"); const { validateEvent, nip19 } = require("nostr-tools");
const auth = require("./auth.js"); const auth = require("./auth.js");

6
http.js
View File

@ -4,9 +4,9 @@ process.title = "Bostr (cluster)";
const { version } = require("./package.json"); const { version } = require("./package.json");
const WebSocket = require("ws"); const WebSocket = require("ws");
const http = require("http"); const http = require("node:http");
const http2 = require("http2"); const http2 = require("node:http2");
const fs = require("fs"); const fs = require("node:fs");
const bouncer = require(`./bouncer.js`); const bouncer = require(`./bouncer.js`);
const undici = require("undici"); const undici = require("undici");

6
index.js
View File

@ -10,9 +10,9 @@ if (typeof(Bun) === "object") {
return require("./http.js"); return require("./http.js");
} }
const cluster = require("cluster"); const cluster = require("node:cluster");
const fs = require("fs"); const fs = require("node:fs");
const os = require("os"); const os = require("node:os");
if (!process.env.NO_CLUSTERS && cluster.isPrimary) { if (!process.env.NO_CLUSTERS && cluster.isPrimary) {
const numClusters = process.env.CLUSTERS || config.clusters || (os.availableParallelism ? os.availableParallelism() : (os.cpus().length || 2)) const numClusters = process.env.CLUSTERS || config.clusters || (os.availableParallelism ? os.availableParallelism() : (os.cpus().length || 2))

6
worker_bouncer.js
View File

@ -1,7 +1,7 @@
"use strict"; "use strict";
// Anything about talking to upstream relays is handled here. // Anything about talking to upstream relays is handled here.
const { parentPort, threadId } = require("worker_threads"); const { parentPort, threadId } = require("node:worker_threads");
const { version } = require("./package.json"); const { version } = require("./package.json");
const WebSocket = require("ws"); const WebSocket = require("ws");
const { validateEvent, nip19, matchFilters, mergeFilters, getFilterLimit } = require("nostr-tools"); const { validateEvent, nip19, matchFilters, mergeFilters, getFilterLimit } = require("nostr-tools");
@ -137,7 +137,7 @@ parentPort.on('message', m => {
if (!csess.hasOwnProperty(m.id)) return; if (!csess.hasOwnProperty(m.id)) return;
for (const sock of userRelays[m.id]) { for (const sock of userRelays[m.id]) {
sock.terminate(); sock.close();
} }
delete userRelays[m.id]; delete userRelays[m.id];
@ -289,7 +289,7 @@ function newConn(addr, id, reconn_t = 0) {
relay.ratelimit = 0; relay.ratelimit = 0;
relay.pendingNIP42 = new Set(); relay.pendingNIP42 = new Set();
relay.on('open', _ => { relay.on('open', _ => {
if (!csess.hasOwnProperty(id)) return relay.terminate(); if (!csess.hasOwnProperty(id)) return relay.close();
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)})`);