autoclicking on various buttons for the starting and the launching. Added royal override. Added -ll 5 option to yarn start

hf_server.js

@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 //@ts-check
-const VERSION = '0.6.0.hf.015.d';
+const VERSION = '0.6.0.hf.015.e';
 
 const express = require('express');
 const http = require('http');
@@ -33,6 +33,7 @@ const targetDir = '/data';//'omnitool/data';
 
 const DELAY_OMNITOOL_SET_TO_RUNNING = 2000; // 2 seconds
 const CHECK_OMNI_INTERVAL = 60000; // 1 minute
+const MAX_LOG_SIZE = 1000; // Set your desired maximum log size
 
 // Global variable
 global.OMNITOOL_RUNNING = false;
@@ -105,6 +106,12 @@ const COMMON_STYLES =
             `<script>
                 // Script to check Hugging Face login status and control 'Clone Repo' button
 
+                if (document.getElementById('startServerButton'))
+                {
+                    // Call startServer after 1 second
+                    setTimeout(startServer, 1000);
+                }
+
                 function startServer() {
                     document.getElementById('startServerButton').classList.remove
                     ('highlight-button-green');
@@ -139,42 +146,42 @@ const COMMON_STYLES =
                     const interval = setInterval(() => {
                         fetch('/omnitool-logs')
                             .then(response => response.json())
-                            .then(data => {
+                            .then(data => 
+                            {
                                 const logContainer = document.getElementById('logContainer');
                                 logContainer.innerText = data.logs.join("");
-                                if (data.ready) {
-                                    
-                                    scrollToBottom(logContainer);
-                                    document.getElementById('refreshButton').disabled = false;
-                                    document.getElementById('refreshButton').classList.add('highlight-button');
-                                    clearInterval(interval);
-
+                                
+                                if (data.ready)
+                                {
+                                    if (document.getElementById('refreshButton').disabled == true) 
+                                    {
+                                        document.getElementById('refreshButton').disabled = false;
+
+                                        scrollToBottom(logContainer);
+                                        document.getElementById('refreshButton').classList.add('highlight-button');
+                                        setTimeout(() => {
+                                            window.location.reload(); // Refresh the page after 2 seconds
+                                        }, 3000);
+                                    }
                                 }
-                                else {
-                                    scrollToBottom(logContainer);
+                                else
+                                {
+                                    if (document.getElementById('refreshButton').disabled == false) 
+                                    {
+                                        document.getElementById('refreshButton').disabled = true;
+                                        document.getElementById('refreshButton').classList.remove('highlight-button'); 
+                                        setTimeout(() => {
+                                            window.location.reload(); // Refresh the page after 2 seconds
+                                        }, 3000);  
+                                    }
+                                    else
+                                    {
+                                        scrollToBottom(logContainer);
+                                    }
                                 }
                             });
-                    }, 500);
-
-                    const interval2 = setInterval(() => {
-                        fetch('/omnitool-logs')
-                            .then(response => response.json())
-                            .then(data => {
-                                const logContainer = document.getElementById('logContainer');
-                                logContainer.innerText = data.logs.join("");
-                                if (data.ready) {
-                                    
-                                    scrollToBottom(logContainer);
-                                    document.getElementById('refreshButton').disabled = false;
-                                    document.getElementById('refreshButton').classList.add('highlight-button');
-                                    clearInterval(interval);
+                    }, 2000);
 
-                                }
-                                else {
-                                    scrollToBottom(logContainer);
-                                }
-                            });
-                    }, 500);
                 }
 
                 function scrollToBottom(element) {
@@ -212,9 +219,12 @@ async function startOmnitoolServer()
         const omnitoolStartProcess = spawn(OMNITOOL_INSTALL_SCRIPT);
         omnitoolStartProcess.stdout.on('data', (data) =>
         {
+            if (global.logs.length >= MAX_LOG_SIZE) {
+                global.logs.shift(); // Remove the oldest log entry
+            }
             global.logs.push(data.toString());
-            console.log(`omnitool stdout: ${data}`);
-
+            console.log(`[omnitool] ${data}`);
+        
             if (!global.OMNITOOL_RUNNING)
             {
                 if (data.toString().includes(`Server has started and is ready to accept connections`))
@@ -223,12 +233,11 @@ async function startOmnitoolServer()
                     setOmnitoolRunning(true);
                 }
             }
-
         });
 
         omnitoolStartProcess.stderr.on('data', (data) =>
         {
-            console.error(`omnitool stderr: ${data}`);
+            console.error(`[omnitool stderr] ${data}`);
             global.logs.push(data.toString());
         });
 
@@ -281,7 +290,6 @@ function setOmnitoolRunning(set_running)
 // Function to check the status of the external service
 async function checkOmnitoolStatus()
 {
-    console.log("Checking external service");
     try
     {
         //@ts-ignore
@@ -296,7 +304,6 @@ async function checkOmnitoolStatus()
         }
     } catch (error)
     {
-        console.log('Please press [START] button');
         setOmnitoolRunning(false);
     }
 }
@@ -375,7 +382,7 @@ async function handleGetRoot(req, res)
         await checkOmnitoolStatus();
     }
 
-    if (global.CONNECTED_TO_MASTER)
+    if (global.CONNECTED_TO_MASTER && !req.session.roayl_override)
     {
         let page_message ="";
        
@@ -407,13 +414,11 @@ async function handleGetRoot(req, res)
             </body>
         </html>`; 
 
-        console.log(`page_html = ${page_html}`);
-
         res.writeHead(200, { 'Content-Type': 'text/html' });
         res.end(page_html);
         return;
     }
-
+    
 
     if (!req.session.isVisited)
     {
@@ -421,6 +426,7 @@ async function handleGetRoot(req, res)
         page_message += `<div style="color: green;">You are now connected to the space [ ${global.LOCAL_URL} ]</div>`
         page_message += `<div style="color: red;">If this is NOT your SPACE, it is HIGHLY recommended that you duplicate this space and make it private to secure your keys, recipes and outputs.</div>`
         page_message += `<div>DUPLICATING and using your own SPACE is FREE. You can do it by pressing this button: <a href="${HF_SPACE_DUPLICATE_URL}" target="_blank" class="button-like-link" id="duplicateRepoButton">DUPLICATE SPACE</a></div><div>However, consider choosing the 20 Gig Storage option (~ 5 USD/month) to persist keys, recipes and outputs between server restarts.</div>`;
+        page_message += `<p></p><p></p>`;
         page_message += `<div>To ACCESS OMNITOOL on this SPACE: press the [START] button below.</div>`;
 
         const gotoButtonClass = 'highlight-button';
@@ -439,11 +445,12 @@ async function handleGetRoot(req, res)
                     ${page_message}
                     <p></p>
                     ${buttons_html}
+                    <p></p>
+                    ${LOG_CONTAINER_HTML}
                     ${SCRIPTS}
                 </body>
             </html>
             `; 
-        console.log(`page_html = ${page_html}`);
         res.writeHead(200, { 'Content-Type': 'text/html' });
         res.end(page_html);
         return;
@@ -451,15 +458,15 @@ async function handleGetRoot(req, res)
     
     if (!global.OMNITOOL_RUNNING)
     {
-        let page_message ="";
-        page_message += `<div>It looks like Omnitool is not running on this Space. Let's fix that.</div><div>Press the [LAUNCH] button below.</div><div>Once Omnitool is running, you will be able to access it by pressing the [REFRESH] button.</div>`;
 
+        let page_message ="";
+        page_message += `<div>It looks like Omnitool is not running on this Space. Let's fix that.</div>`;
         console.log('Omnitool server is not running');
         const startButtonClass = 'highlight-button-green';
         
         let buttonsHTML = `
-            <button id="startServerButton" class="${startButtonClass}" onclick="startServer()">LAUNCH</button>
-            <button id="refreshButton" class="${''}" disabled onclick="refreshPage()">REFRESH</button>
+            <button id="startServerButton" class="${startButtonClass}" onclick="startServer()">LAUNCHING...</button>
+            <button id="refreshButton" class="${''}" disabled onclick="refreshPage()">REFRESHING...</button>
             `;
 
         const SCRIPTS = getScriptsHtml();
@@ -480,9 +487,13 @@ async function handleGetRoot(req, res)
             </html>
             `; 
 
-        console.log(`page_html = ${page_html}`);    
         res.writeHead(200, { 'Content-Type': 'text/html' });
+
+     
+
         res.end(page_html);
+
+
         return;
     }
 
@@ -513,7 +524,7 @@ function setGlobals(req)
 
 }
 
-async function startServer()
+async function startHuggingfaceServer()
 {
     // Start server
     http.createServer(app).listen(PROXY_PORT_OMNITOOL, () =>
@@ -557,7 +568,7 @@ async function main(app)
     }));
     try
     {
-        await startServer();
+        await startHuggingfaceServer();
     }
     catch (error)
     {

omnitool_init.sh

@@ -44,4 +44,4 @@ else
 fi
 
 echo "[->] YARN START "
-yarn start -u -rb -ll 2 -R blocks
+yarn start -u -rb -ll 5 -R blocks