From 8ca945cdbd09a839506e787de66db22ee26f4fe2 Mon Sep 17 00:00:00 2001
From: Dorian Niemiec <webmaster@svrjs.org>
Date: Thu, 10 Aug 2023 03:16:52 +0200
Subject: [PATCH] Fixed master spawning other masters while SVR.JS is run in
 Bun 0.7.x.

---
 config.json |  2 +-
 svr.js      | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/config.json b/config.json
index 7cc7bd0..b77e6a4 100644
--- a/config.json
+++ b/config.json
@@ -3,7 +3,7 @@
   "port": 80,
   "pubport": 80,
   "page404": "404.html",
-  "timestamp": 1691622823922,
+  "timestamp": 1691626302396,
   "blacklist": [],
   "nonStandardCodes": [],
   "enableCompression": true,
diff --git a/svr.js b/svr.js
index 0468e63..98bff78 100644
--- a/svr.js
+++ b/svr.js
@@ -221,18 +221,32 @@ if (!singlethreaded) {
           sendImplemented = false;
         }
 
+        oldLog = console.log;
+        console.log = function(a,b,c,d,e,f) {
+          if(a == "ChildProcess.prototype.send() - Sorry! Not implemented yet") {
+            throw new Error("NOT IMPLEMENTED");
+          } else {
+            oldLog(a,b,c,d,e,f);
+          }
+        }
+        
         try {
-          eval("'use strict';(" + String(worker.send).replace(/console\.log *\( *(["'])ChildProcess\.prototype\.send\(\) - Sorry! Not implemented yet\1 *\) *;?/, "throw new Error(\"NOT IMPLEMENTED\"); //") + ")(undefined)");
+          worker.send(undefined);
         } catch (err) {
           if (err.message === "NOT IMPLEMENTED") {
             sendImplemented = false;
           }
         }
+        
+        console.log = oldLog;
 
         return sendImplemented;
       }
 
       if (!checkSendImplementation(newWorker)) {
+        var net = require("net");
+        var os = require("os");
+        
         // Create a fake IPC server for worker process to receive messages
         var fakeWorkerIPCServer = net.createServer(function (socket) {
           var receivedData = "";
@@ -276,7 +290,7 @@ if (!singlethreaded) {
     };
   }
 
-  if (process.isBun && cluster.isMaster === undefined) {
+  if (process.isBun && (cluster.isMaster === undefined || (cluster.isMaster && process.env.NODE_UNIQUE_ID))) {
     cluster.bunShim();
   }