From d15373aa8ef4d13b16a0cc359d5c84ee295ca3df Mon Sep 17 00:00:00 2001
From: Dorian Niemiec <webmaster@svrjs.org>
Date: Fri, 4 Aug 2023 21:19:23 +0200
Subject: [PATCH] Improved reliability while loading server-side JavaScript.

---
 index.html          |  6 +++---
 licenses/index.html |  8 ++++----
 svr.js              | 19 +++++++++++++------
 tests.html          |  4 ++--
 4 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/index.html b/index.html
index 6616f4a..66d6560 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.6.3</title>
+    <title>SVR.JS 3.6.4</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>Welcome to SVR.JS 3.6.3</h1>
+    <h1>Welcome to SVR.JS 3.6.4</h1>
     <br/>
     <img src="/logo.png" style="width: 256px;" />
     <br/>
@@ -110,7 +110,7 @@
     </div>
     <p>Changes:</p>
     <ul>
-      <li>Fixed bug with directory listing generating invalid HTML with custom head containing <i>&lt;html&gt;</i> tag with attributes.</li>
+      <li>Improved reliability while loading server-side JavaScript.</li>
     </ul>
     <p>Bugs:</p>
     <ul>
diff --git a/licenses/index.html b/licenses/index.html
index 3a00561..79f2951 100644
--- a/licenses/index.html
+++ b/licenses/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.6.3 Licenses</title>
+    <title>SVR.JS 3.6.4 Licenses</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,8 +12,8 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.6.3 Licenses</h1>
-    <h2>SVR.JS 3.6.3</h2>
+    <h1>SVR.JS 3.6.4 Licenses</h1>
+    <h2>SVR.JS 3.6.4</h2>
     <div style="display: inline-block; text-align: left; border-width: 2px; border-style: solid; border-color: gray; padding: 8px;">
       MIT License<br/>
       <br/>
@@ -37,7 +37,7 @@
       OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE<br/>
       SOFTWARE.<br/>
     </div>
-    <h2>Packages used by SVR.JS 3.6.3 and utilities</h2>
+    <h2>Packages used by SVR.JS 3.6.4 and utilities</h2>
     <div style="width: 100%; background-color: #ccc; border: 1px solid green; text-align: left; margin: 10px 0;">
       <div style="float: right;">License: MIT</div>
       <div style="font-size: 20px;">
diff --git a/svr.js b/svr.js
index e510f89..8c31ee2 100644
--- a/svr.js
+++ b/svr.js
@@ -77,7 +77,7 @@ function deleteFolderRecursive(path) {
 }
 
 var os = require("os");
-var version = "3.6.3";
+var version = "3.6.4";
 var singlethreaded = false;
 
 if (process.versions) process.versions.svrjs = version; //Inject SVR.JS into process.versions
@@ -1233,6 +1233,13 @@ if (!disableMods) {
     // If not the master process, create a unique modloader folder name for each worker
     modloaderFolderName = ".modloader_w" + Math.floor(Math.random() * 65536);
   }
+  
+  // Define the temporary server-side JavaScript file name
+  var tempServerSideScriptName = "serverSideScript.js";
+  if (!process.isBun && cluster.isMaster === false) {
+    // If not the master process and it's not Bun, create a unique temporary server-side JavaScript file name for each worker
+    tempServerSideScriptName = ".serverSideScript_w" + Math.floor(Math.random() * 65536) + ".js";
+  }
 
   // Iterate through the list of mod files
   for (var i = 0; i < modFiles.length; i++) {
@@ -1342,20 +1349,20 @@ if (!disableMods) {
       var modhead = "var readline = require('readline');\r\nvar os = require('os');\r\nvar http = require('http');\r\nvar url = require('url');\r\nvar fs = require('fs');\r\nvar path = require('path');\r\n" + (hexstrbase64 === undefined ? "" : "var hexstrbase64 = require('../hexstrbase64/index.js');\r\n") + (crypto.__disabled__ === undefined ? "var crypto = require('crypto');\r\nvar https = require('https');\r\n" : "") + "var stream = require('stream');\r\nvar customvar1;\r\nvar customvar2;\r\nvar customvar3;\r\nvar customvar4;\r\n\r\nfunction Mod() {}\r\nMod.prototype.callback = function callback(req, res, serverconsole, responseEnd, href, ext, uobject, search, defaultpage, users, page404, head, foot, fd, elseCallback, configJSON, callServerError, getCustomHeaders, origHref, redirect, parsePostData) {\r\nreturn function () {\r\nvar disableEndElseCallbackExecute = false;\r\nfunction filterHeaders(headers){for(var jsn=JSON.stringify(headers,null,2).split('\\n'),njsn=[\"{\"],i=1;i<jsn.length-1;i++)0!==jsn[i].replace(/ /g,\"\").indexOf('\":')&&(eval(\"var value = \"+(\",\"==jsn[i][jsn[i].length-1]?jsn[i].substring(0,jsn[i].length-1):jsn[i]).split('\": ')[1]),\",\"==jsn[i][jsn[i].length-1]&&i==jsn.length-2?njsn.push(jsn[i].substring(0,jsn[i].length-1)):null!=value&&njsn.push(jsn[i]));return njsn.push(\"}\"),JSON.parse(njsn.join(os.EOL))}\r\n";
       var modfoot = "\r\nif(!disableEndElseCallbackExecute) {\r\ntry{\r\nelseCallback();\r\n} catch(err) {\r\n}\r\n}\r\n}\r\n}\r\nmodule.exports = Mod;";
       // Write the modified server side script to the temp folder
-      fs.writeFileSync(__dirname + "/temp/serverSideScript.js", modhead + fs.readFileSync("./serverSideScript.js") + modfoot);
+      fs.writeFileSync(__dirname + "/temp/" + tempServerSideScriptName, modhead + fs.readFileSync("./serverSideScript.js") + modfoot);
 
       // Initialize variables for server side script loading
       var aMod = undefined;
       var amod = undefined;
 
-      // Attempt to require the custom server side script, retrying up to 8 times in case of syntax errors
-      for (var i = 0; i < 8; i++) {
+      // Attempt to require the custom server side script, retrying up to 5 times
+      for (var i = 0; i < 5; i++) {
         try {
-          aMod = require("./temp/serverSideScript.js");
+          aMod = require("./temp/" + tempServerSideScriptName);
           amod = new aMod();
           break;
         } catch (err) {
-          if (i >= 7 || err.name == "SyntaxError") throw err;
+          if (i >= 4 || err.name == "SyntaxError") throw err;
           // Wait for a short time before retrying
           var now = Date.now();
           while (Date.now() - now < 2);
diff --git a/tests.html b/tests.html
index e63bb87..0351e6b 100644
--- a/tests.html
+++ b/tests.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>SVR.JS 3.6.3 Tests</title>
+    <title>SVR.JS 3.6.4 Tests</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta charset="UTF-8" />
     <style>
@@ -12,7 +12,7 @@
     </style>
   </head>
   <body>
-    <h1>SVR.JS 3.6.3 Tests</h1>
+    <h1>SVR.JS 3.6.4 Tests</h1>
     <h2>Directory</h2>
     <iframe src="/testdir" width="50%" height="300px"></iframe>
     <h2>Directory (with query)</h2>
