only creating proxy once

myNodeServer.js

@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 //@ts-check
+const VERSION = '0.0.8d';
 
 const express = require('express');
 const http = require('http');
@@ -14,7 +15,7 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
 const app = express();
 
 const CONTAINER_HOST = '127.0.0.1';
-
+const OMNI_URL = 'http://127.0.0.1:1688'; // URL of the OMNITOOL service
 const PROXY_PORT_OMNITOOL = 4444;
 const CONTAINER_PORT_OMNITOOL = 1688;
 
@@ -28,10 +29,12 @@ global.ALREADY_STARTING = false;
 global.LOCAL_URL = "";
 global.PING_URL = "";
 global.PROTOCOL = "";
+global.PROXY_STARTED = false;
+global.logs = [];
+global.OMNITOOL_PROXY = null;
+
 
-const VERSION = '0.0.8a';
 console.log(`************ Omnitool Proxy Server v${VERSION} ************`);
-let omnitoolLogs = [];
 
 // HTML templates and constants
 const LOG_CONTAINER_HTML = `<div id="logContainer"></div>`;
@@ -69,10 +72,9 @@ async function startOmnitoolServer()
     return new Promise((resolve, reject) =>
     {
         const omnitoolStartProcess = spawn('./omnitool_start.sh');
-
         omnitoolStartProcess.stdout.on('data', (data) =>
         {
-            omnitoolLogs.push(data.toString());
+            global.logs.push(data.toString());
             console.log(`omnitool stdout: ${data}`);
 
             if (data.toString().includes(`Server has started and is ready to accept connections`))
@@ -86,14 +88,14 @@ async function startOmnitoolServer()
         omnitoolStartProcess.stderr.on('data', (data) =>
         {
             console.error(`omnitool stderr: ${data}`);
-            omnitoolLogs.push(data.toString());
+            global.logs.push(data.toString());
         });
 
         omnitoolStartProcess.on('close', (code) =>
         {
             const message = `Omnitool server process exited with code: ${code}`;
             console.log(message);
-            omnitoolLogs.push(message);
+            global.logs.push(message);
 
             global.ALREADY_STARTING = false;
             if (code === 0)
@@ -181,10 +183,11 @@ async function handleGetStartOmnitoolServer(req, res)
 async function handleGetOmnitoolLogs(req, res)
 {
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    const reply = { logs: omnitoolLogs, ready:global.OMNITOOL_READY };
+    const reply = { logs: global.logs, ready:global.OMNITOOL_READY };
     res.end(JSON.stringify(reply));
     return;
 }
+
 async function handleGetBurstIframe(req, res)
 {
     res.writeHead(200, { 'Content-Type': 'application/json' });
@@ -197,6 +200,11 @@ async function handleGetBurstIframe(req, res)
 
 async function proxyRequest(req, res)
 {
+
+    console.log('Proxying request');
+    if (global.PROXY_STARTED) return;
+    global.PROXY_STARTED = true;
+
     // Proxy logic...
     const options = { hostname: CONTAINER_HOST, port: CONTAINER_PORT_OMNITOOL, path: req.url, method: req.method, headers: req.headers, };
     const proxy = http.request(options, (proxyRes) =>
@@ -208,7 +216,7 @@ async function proxyRequest(req, res)
     return;
 }
 
-function getButtonsString(buttonsHTML, gotoUrl)
+function getButtonsString(buttonsHTML)
 {
 
     return `
@@ -231,7 +239,7 @@ function getButtonsString(buttonsHTML, gotoUrl)
                             .then(response => response.json())
                             .then(data => startLogPolling());
   
-    
+                        
                     }
 
                     function exitIframe() {
@@ -247,12 +255,12 @@ function getButtonsString(buttonsHTML, gotoUrl)
                                 .then(response => response.json())
                                 .then(data => {
                                     const logContainer = document.getElementById('logContainer');
-                                    logContainer.innerText = data.logs.join("\\n");
+                                    logContainer.innerText = data.logs.join("");
                                     if (data.ready) {
                                         clearInterval(interval);
-                                        setTimeout(function() {
-                                            window.location.reload(1);
-                                        }, 5000);
+                                        document.getElementById('exitIframeButton').classList.add('highlight-button');
+
+
                                     }
                                     else {
                                         scrollToBottom(logContainer);
@@ -264,7 +272,7 @@ function getButtonsString(buttonsHTML, gotoUrl)
                     function scrollToBottom(element) {
                         element.scrollTop = element.scrollHeight;
                     }
-
+                    
                     startLogPolling();
                 </script>
             </body>
@@ -285,9 +293,14 @@ async function handleGetRoot(req, res)
     if (!global.OMNITOOL_RUNNING)
     {
         console.log('Omnitool server is not running')
-        let startButtonClass = 'highlight-button';
+        let startButtonClass = '';
+        if (!global.ALREADY_STARTING) startButtonClass = 'highlight-button';
+        const gotoButtonClass = '';
+        
         let buttonsHTML = `<button id="startServerButton" class="${startButtonClass}" onclick="startServer()">Start Omnitool Server</button>`;
-        const html = getButtonsString(buttonsHTML, global.LOCAL_URL);
+        buttonsHTML += `<button id="exitIframeButton" class="${gotoButtonClass}" onclick="exitIframe()">GOTO OMNITOOL</button>`;
+
+        const html = getButtonsString(buttonsHTML);
         res.writeHead(200, { 'Content-Type': 'text/html' });
         res.end(html);
 
@@ -299,7 +312,7 @@ async function handleGetRoot(req, res)
         console.log('First time visitor')
         const gotoButtonClass = 'highlight-button';
         const buttonsHTML = `<button id="exitIframeButton" class="${gotoButtonClass}" onclick="exitIframe()">GOTO OMNITOOL</button>`;
-        const html = getButtonsString(buttonsHTML, global.LOCAL_URL);
+        const html = getButtonsString(buttonsHTML);
         res.writeHead(200, { 'Content-Type': 'text/html' });
         res.end(html);
 
@@ -324,16 +337,13 @@ function setGlobals(req)
 async function startServer()
 {
     // Start server
-    const PORT = 4444;
-    http.createServer(app).listen(PORT, () =>
+    http.createServer(app).listen(PROXY_PORT_OMNITOOL, () =>
     {
-        console.log(`Server running on port ${PORT}`);
+        console.log(`Server running on port ${PROXY_PORT_OMNITOOL}`);
     });
     
 }
 
-const OMNI_URL = 'http://127.0.0.1:1688'; // URL of the OMNITOOL service
-
 function omnitoolProxyMiddleware(req, res, next) {
     if (global.OMNITOOL_RUNNING && req.session.isVisited) {
         // Proxy all requests to OMNITOOL when conditions are met
@@ -361,7 +371,16 @@ async function main(app)
         resave: false,
         saveUninitialized: true
     }));
-    await startServer();
+    try
+    {
+        await startServer();
+    }
+    catch (error)
+    {
+        console.error(`There was an error starting the server: ${error}`);
+        return;
+    }
+    
     
     app.use(omnitoolProxyMiddleware);
 
@@ -376,13 +395,24 @@ async function main(app)
         await checkOmnitoolStatus();
     }, CHECK_OMNI_INTERVAL);
     
+}
 
-    //const server = http.createServer(async (req, res) => handleRoutes(req, res, app));
-    //server.listen(PROXY_PORT_OMNITOOL, '0.0.0.0');
+// Define the proxy middleware outside the function
+global.OMNITOOL_PROXY = createProxyMiddleware({
+    target: OMNI_URL,
+    changeOrigin: true,
+    ws: true // if you need WebSocket support
+});
 
-    console.log(`Server running on port ${PROXY_PORT_OMNITOOL}`);
+function omnitoolProxyMiddleware(req, res, next) {
+    if (global.OMNITOOL_RUNNING && req.session.isVisited) {
+        // Use the predefined proxy middleware
+        return global.OMNITOOL_PROXY(req, res, next);
+    } else {
+        // Continue with normal processing for other cases
+        next();
+    }
 }
-
 main(app);