DorianNiemiecSVRJS/svrjs
Archived
1
0
Fork 0
forked from svrjs/svrjs
Code Pull requests Activity

chore: rename the cluster shim method and function, because it's also for Deno 2, not just for Bun

Browse source
This commit is contained in:
Dorian Niemiec 2024-10-18 20:08:52 +02:00
parent 9abb89d560
commit b1a40e7a20
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/handlers/serverErrorHandler.js
View file

@ -1,5 +1,5 @@
const os = require("os"); const os = require("os");
const cluster = require("../utils/clusterBunShim.js"); const cluster = require("../utils/clusterShim.js");
const serverErrorDescs = require("../res/serverErrorDescriptions.js"); const serverErrorDescs = require("../res/serverErrorDescriptions.js");
let serverconsole = {}; let serverconsole = {};
let attmts = 5; let attmts = 5;

4
src/index.js
View file

@ -199,7 +199,7 @@ if (!fs.existsSync(process.dirname + "/mods"))
if (!fs.existsSync(process.dirname + "/temp")) if (!fs.existsSync(process.dirname + "/temp"))
fs.mkdirSync(process.dirname + "/temp"); fs.mkdirSync(process.dirname + "/temp");
const cluster = require("./utils/clusterBunShim.js"); // Cluster module with shim for Bun const cluster = require("./utils/clusterShim.js"); // Cluster module with shim for Bun
const legacyModWrapper = require("./utils/legacyModWrapper.js"); const legacyModWrapper = require("./utils/legacyModWrapper.js");
const generateErrorStack = require("./utils/generateErrorStack.js"); const generateErrorStack = require("./utils/generateErrorStack.js");
const { const {
@ -1453,7 +1453,7 @@ function SVRJSFork() {
err.message == "Not implemented: cluster.fork" err.message == "Not implemented: cluster.fork"
) { ) {
// If cluster.fork throws a NotImplementedError, shim cluster module // If cluster.fork throws a NotImplementedError, shim cluster module
cluster.bunShim(); cluster.shim();
if ( if (
!threadLimitWarned && !threadLimitWarned &&
cluster.__shimmed__ && cluster.__shimmed__ &&

2
src/middleware/blocklist.js
View file

@ -1,4 +1,4 @@
const cluster = require("../utils/clusterBunShim.js"); const cluster = require("../utils/clusterShim.js");
const ipBlockList = require("../utils/ipBlockList.js"); const ipBlockList = require("../utils/ipBlockList.js");
let blocklist = ipBlockList(process.serverConfig.blacklist); let blocklist = ipBlockList(process.serverConfig.blacklist);

2
src/middleware/nonStandardCodesAndHttpAuthentication.js
View file

@ -4,7 +4,7 @@ const createRegex = require("../utils/createRegex.js");
const ipMatch = require("../utils/ipMatch.js"); const ipMatch = require("../utils/ipMatch.js");
const matchHostname = require("../utils/matchHostname.js"); const matchHostname = require("../utils/matchHostname.js");
const ipBlockList = require("../utils/ipBlockList.js"); const ipBlockList = require("../utils/ipBlockList.js");
const cluster = require("../utils/clusterBunShim.js"); const cluster = require("../utils/clusterShim.js");
const svrjsInfo = require("../../svrjs.json"); const svrjsInfo = require("../../svrjs.json");
const { name } = svrjsInfo; const { name } = svrjsInfo;

4
src/utils/clusterBunShim.js → src/utils/clusterShim.js
View file

@ -15,7 +15,7 @@ if (!process.singleThreaded) {
// Cluster & IPC shim for Bun and Deno // Cluster & IPC shim for Bun and Deno
cluster.bunShim = () => { cluster.shim = () => {
cluster.isMaster = !process.env.NODE_UNIQUE_ID; cluster.isMaster = !process.env.NODE_UNIQUE_ID;
cluster.isPrimary = cluster.isMaster; cluster.isPrimary = cluster.isMaster;
cluster.isWorker = !cluster.isMaster; cluster.isWorker = !cluster.isMaster;
@ -220,7 +220,7 @@ if (!process.singleThreaded) {
(cluster.isMaster === undefined || (cluster.isMaster === undefined ||
(cluster.isMaster && process.env.NODE_UNIQUE_ID)) (cluster.isMaster && process.env.NODE_UNIQUE_ID))
) { ) {
cluster.bunShim(); cluster.shim();
} }
// Shim cluster.isPrimary field // Shim cluster.isPrimary field

2
src/utils/serverconsole.js
View file

@ -3,7 +3,7 @@ const fs = require("fs");
let enableLoggingIntoFile = process.serverConfig.enableLogging; let enableLoggingIntoFile = process.serverConfig.enableLogging;
let logFile = undefined; let logFile = undefined;
let logSync = false; let logSync = false;
let cluster = require("./clusterBunShim.js"); let cluster = require("./clusterShim.js");
let reallyExiting = false; let reallyExiting = false;
const timestamp = process.serverConfig.timestamp; const timestamp = process.serverConfig.timestamp;

4
tests/middleware/blocklist.test.js
View file

@ -1,8 +1,8 @@
const middleware = require("../../src/utils/ipBlockList.js"); const middleware = require("../../src/utils/ipBlockList.js");
const cluster = require("../../src/utils/clusterBunShim.js"); const cluster = require("../../src/utils/clusterShim.js");
jest.mock("../../src/utils/ipBlockList.js"); jest.mock("../../src/utils/ipBlockList.js");
jest.mock("../../src/utils/clusterBunShim.js"); jest.mock("../../src/utils/clusterShim.js");
const ipBlockListAdd = jest.fn(); const ipBlockListAdd = jest.fn();
const ipBlockListCheck = jest.fn(); const ipBlockListCheck = jest.fn();

4
tests/middleware/nonStandardCodesAndHttpAuthentication.test.js
View file

@ -2,13 +2,13 @@ const sha256 = require("../../src/utils/sha256.js");
const ipMatch = require("../../src/utils/ipMatch.js"); const ipMatch = require("../../src/utils/ipMatch.js");
const matchHostname = require("../../src/utils/matchHostname.js"); const matchHostname = require("../../src/utils/matchHostname.js");
const ipBlockList = require("../../src/utils/ipBlockList.js"); const ipBlockList = require("../../src/utils/ipBlockList.js");
const cluster = require("../../src/utils/clusterBunShim.js"); const cluster = require("../../src/utils/clusterShim.js");
jest.mock("../../src/utils/sha256.js"); jest.mock("../../src/utils/sha256.js");
jest.mock("../../src/utils/ipMatch.js"); jest.mock("../../src/utils/ipMatch.js");
jest.mock("../../src/utils/matchHostname.js"); jest.mock("../../src/utils/matchHostname.js");
jest.mock("../../src/utils/ipBlockList.js"); jest.mock("../../src/utils/ipBlockList.js");
jest.mock("../../src/utils/clusterBunShim.js"); jest.mock("../../src/utils/clusterShim.js");
let mockScryptHash = "mocked-scrypt-hash"; let mockScryptHash = "mocked-scrypt-hash";
let mockPbkdf2Hash = "mocked-pbkdf2-hash"; let mockPbkdf2Hash = "mocked-pbkdf2-hash";