Spaces:

omnitool-ai
/

omnitool_on_hf

Running

App Files Files Community

manu-sapiens commited on Dec 6, 2023

Commit

f2e8e3c

1 Parent(s): bba9027

fixed the double START pressing issue when getting out of the iFrame

Browse files

Files changed (2) hide show

hf_server.js +41 -7
test_iframe.html +12 -0

hf_server.js CHANGED Viewed

@@ -3,7 +3,7 @@
  * All rights reserved.
  */
 //@ts-check
-const VERSION = '0.6.0.hf.015.a';
 const express = require('express');
 const http = require('http');
@@ -104,7 +104,7 @@ const COMMON_STYLES = `
         function startServer() {
             document.getElementById('startServerButton').classList.remove
-            ('highlight-button');
             document.getElementById('startServerButton').disabled = true;
@@ -116,7 +116,15 @@ const COMMON_STYLES = `
         }
         function exitIframe() {
-            fetch('/burst-iframe').then(response => response.json()).then(data => {window.open('/', '_blank');});
         }
         function refreshPage() {
@@ -133,8 +141,30 @@ const COMMON_STYLES = `
                         logContainer.innerText = data.logs.join("");
                         if (data.ready) {
                             document.getElementById('refreshButton').disabled = false;
                             document.getElementById('refreshButton').classList.add('highlight-button');
                         }
                         else {
@@ -294,10 +324,10 @@ async function handleGetOmnitoolLogs(req, res)
 async function handleGetBurstIframe(req, res)
 {
-    res.writeHead(200, { 'Content-Type': 'application/json' });
     req.session.isVisited = true;
     const reply = { burst_iframe: true };
     res.end(JSON.stringify(reply));
     return;
@@ -324,7 +354,8 @@ async function proxyRequest(req, res)
 async function handleGetRoot(req, res)
 {
     setGlobals(req);
     console.log(`req.session.isVisited = ${req.session.isVisited}`);
     console.log(`global.OMNITOOL_RUNNING = ${global.OMNITOOL_RUNNING}`);
@@ -356,6 +387,7 @@ async function handleGetRoot(req, res)
                 ${COMMON_STYLES}
             </head>
             <body>
                 ${INTRO_MESSAGE}
                 ${page_message}
                 <p></p>
@@ -390,6 +422,7 @@ async function handleGetRoot(req, res)
                     ${COMMON_STYLES}
                 </head>
                 <body>
                     ${INTRO_MESSAGE}
                     ${page_message}
                     <p></p>
@@ -410,11 +443,11 @@ async function handleGetRoot(req, res)
         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>`;
         console.log('Omnitool server is not running');
-        const startButtonClass = 'highlight-button';
         let buttonsHTML = `
             <button id="startServerButton" class="${startButtonClass}" onclick="startServer()">LAUNCH</button>
-            <button id="refreshButton" class="${''}" onclick="refreshPage()">REFRESH</button>
             `;
         const page_html = `
@@ -424,6 +457,7 @@ async function handleGetRoot(req, res)
                     ${COMMON_STYLES}
                 </head>
                 <body>
                     ${INTRO_MESSAGE}
                     ${page_message}
                     <p></p>

  * All rights reserved.
  */
 //@ts-check
+const VERSION = '0.6.0.hf.015.b';
 const express = require('express');
 const http = require('http');
         function startServer() {
             document.getElementById('startServerButton').classList.remove
+            ('highlight-button-green');
             document.getElementById('startServerButton').disabled = true;
         }
         function exitIframe() {
+            if (window.self !== window.top)
+            {
+                // open a new window to get out of the iframe, then wait 1s,  then fetch burst-iframe then reload
+                window.open(window.location.href+"?isVisited=true", '_blank');
+            }
+            else
+            {
+                fetch('/burst-iframe').then(response => response.json()).then(data => {window.location.reload();});
+            }
         }
         function refreshPage() {
                         logContainer.innerText = data.logs.join("");
                         if (data.ready) {
+                            scrollToBottom(logContainer);
                             document.getElementById('refreshButton').disabled = false;
                             document.getElementById('refreshButton').classList.add('highlight-button');
+                            clearInterval(interval);
+                        }
+                        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);
                         }
                         else {
 async function handleGetBurstIframe(req, res)
 {
     req.session.isVisited = true;
     const reply = { burst_iframe: true };
+    res.writeHead(200, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify(reply));
     return;
 async function handleGetRoot(req, res)
 {
     setGlobals(req);
+    if (req.query.isVisited) req.session.isVisited = true;
     console.log(`req.session.isVisited = ${req.session.isVisited}`);
     console.log(`global.OMNITOOL_RUNNING = ${global.OMNITOOL_RUNNING}`);
                 ${COMMON_STYLES}
             </head>
             <body>
+                <div>req.session.isVisited = ${req.session.isVisited}</div>
                 ${INTRO_MESSAGE}
                 ${page_message}
                 <p></p>
                     ${COMMON_STYLES}
                 </head>
                 <body>
+                    <div>req.session.isVisited = ${req.session.isVisited}</div>
                     ${INTRO_MESSAGE}
                     ${page_message}
                     <p></p>
         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>`;
         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>
             `;
         const page_html = `
                     ${COMMON_STYLES}
                 </head>
                 <body>
+                    <div>req.session.isVisited = ${req.session.isVisited}</div>
                     ${INTRO_MESSAGE}
                     ${page_message}
                     <p></p>

test_iframe.html ADDED Viewed

	@@ -0,0 +1,12 @@

+<!DOCTYPE html>
+<html>
+<head>
+    <title>Test Page</title>
+</head>
+<body>
+    <iframe src="http://localhost:4444" width="100%" height="600px">
+        <!-- Fallback content for browsers that don't support iframes -->
+        <p>Your browser does not support iframes.</p>
+    </iframe>
+</body>
+</html>