pinokiod 3.9.33 → 3.9.35

package/kernel/util.js

@@ -109,6 +109,19 @@ const run = (cmd, cwd, kernel) => {
   */
 
 }
+const openURL = (url) => {
+  const platform = os.platform()
+  let command;
+  if (platform === 'darwin') {
+    command = `open "${url}"`; // macOS
+  } else if (platform === 'win32') {
+    command = `start "" "${url}"`; // Windows
+  } else {
+    command = `xdg-open "${url}"`; // Linux
+  }
+  console.log("openURL", { url, command })
+  child_process.exec(command);
+}
 const openfs = (dirPath, options, kernel) => {
   let command = '';
   const platform = os.platform()
@@ -362,5 +375,5 @@ function fill_object(obj, pattern, list, cache) {
 }
 
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run, openURL
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.9.33",
+  "version": "3.9.35",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -2894,6 +2894,10 @@ class Server {
       Util.run(cmd, cwd, this.kernel)
       res.json({ success: true })
     }))
+    this.app.post("/go", ex(async (req, res) => {
+      Util.openURL(req.body.url)
+      res.json({ success: true })
+    }))
     this.app.post("/openfs", ex(async (req, res) => {
       //Util.openfs(req.body.path, req.body.mode)
       Util.openfs(req.body.path, req.body, this.kernel)

package/server/public/opener.js

@@ -69,7 +69,22 @@ document.addEventListener("click", async (e) => {
     e.preventDefault()
     e.stopPropagation()
     let features = el.getAttribute("features")
-    window.open(el.href, "_blank", features)
+    if (features.includes("browser")) {
+      debugger
+      fetch("/go", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ url: el.href })
+      }).then((res) => {
+        return res.json()
+      }).then((res) => {
+        console.log(res)
+      })
+    } else {
+      window.open(el.href, "_blank", features)
+    }
     return
   }
 

package/server/public/style.css

@@ -59,8 +59,8 @@
 
 /* Firefox */
 * {
-  scrollbar-width: auto;
-  scrollbar-color: black transparent;
+  scrollbar-width: thin;
+  scrollbar-color: rgba(0,0,0,0.2) transparent;
 }
 
 /* Chrome, Edge, and Safari */
@@ -69,23 +69,21 @@
 }
 
 *::-webkit-scrollbar-track {
-  background: white;
+  background: none;
 }
 
 *::-webkit-scrollbar-thumb {
-  background-color: silver;
+  background-color: rgba(0,0,0,0.2);
   border-radius: 30px;
-  border: 3px solid transparent;
+  border: 7px solid rgba(0,0,0,0.2);
 }
 
 body.dark * {
-  scrollbar-color: silver transparent;
-}
-body.dark *::-webkit-scrollbar-track {
-  background: black;
+  scrollbar-color: rgba(255,255,255,0.3) transparent;
 }
 body.dark *::-webkit-scrollbar-thumb {
-  background-color: black;
+  background-color: rgba(255,255,255,0.3);
+  border: 7px solid rgba(255,255,255,0.3);
 }
 
 @font-face {
@@ -967,10 +965,14 @@ header a.path {
 header .runner {
   padding: 0 10px;
   box-sizing: border-box;
+  display: flex;
+  align-items: center;
 }
 header .runner .btn {
   padding: 5px 10px;
   font-size: 12px;
+  margin-right: 10px;
+  flex-shrink: 0;
 }
 body.dark .memory {
   background: rgba(0,0,0,0.8);

package/server/views/app.ejs

@@ -571,6 +571,7 @@ body.dark #open-location {
 }
 #open-location {
   border: none;
+  color: black;
   background: rgba(0,0,0,0.04);
   padding: 10px;
   margin-right: 10px;
@@ -745,7 +746,7 @@ body.dark .appcanvas {
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <input type='url' id='location' readonly value="<%=execUrl%>">
-<a id='open-location' target="_blank"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
+<a id='open-location' target="_blank" features="browser"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
 <div class='nav-btns'>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>

package/server/views/terminal.ejs

@@ -104,6 +104,18 @@ header {
   background: royalblue;
 }
 */
+#status-window {
+  flex-grow: 1;
+  text-align: right;
+  padding: 0 10px;
+}
+#status-window b {
+  color: black;
+  font-weight: normal;
+}
+body.dark #status-window b {
+  color: white;
+}
 #del-bin {
   color: royalblue;
   cursor: pointer;
@@ -251,15 +263,12 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .stop").classList.remove("hidden")
             if (packet.data && packet.data.description) {
               if ('current' in packet.data) {
-                document.querySelector("footer").innerHTML = `<b>
+                document.querySelector("#status-window").innerHTML = `<b>
                   <i class="fa-solid fa-circle-notch fa-spin"></i>(${packet.data.current+1}/${packet.data.total}) ${packet.data.title ? packet.data.title : ''}
                 </b>
                 <div class='flexible content'>${packet.data.description}</div>`
-//                <div class='toggle-expand'>
-//                  <i class="fa-solid fa-circle-chevron-up"></i>
-//                </div>`
               } else {
-                document.querySelector("footer").innerHTML = `<b>
+                document.querySelector("#status-window").innerHTML = `<b>
                   <i class="fa-solid fa-circle-notch fa-spin"></i> ${packet.data.title ? packet.data.title : ''}
                 </b>
                 <div class='flexible content'></div>`
@@ -268,13 +277,9 @@ document.addEventListener("DOMContentLoaded", async () => {
 //                </div>`
               }
             } else if (packet.data && packet.data.method) {
-              document.querySelector("footer").innerHTML = `<b>
+              document.querySelector("#status-window").innerHTML = `<b>
                 <i class="fa-solid fa-circle-notch fa-spin"></i> (${packet.data.current+1}/${packet.data.total}) ${packet.data.method}
-              </b>
-              <div class='flexible content'>${packet.data.params ? JSON.stringify(packet.data.params) : ''}</div>`
-//              <div class='toggle-expand'>
-//                <i class="fa-solid fa-circle-chevron-up"></i>
-//              </div>`
+              </b>`
             }
           } else if (packet.type === "stream") {
             // set the current shell id
@@ -298,7 +303,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             refreshParent(packet)
             reloadMemory()
             this.term.write("\r\nDisconnected...\r\n")
-            document.querySelector("footer").innerHTML = "<b>Ready</b>"
+            document.querySelector("#status-window").innerHTML = "<b>Ready</b>"
             this.socket.close()
             document.querySelector(".run .play").classList.remove("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
@@ -527,23 +532,6 @@ document.addEventListener("DOMContentLoaded", async () => {
               text: `${packet.data}`,
             })
           } else if (packet.type === "error") {
-//            n.Noty({
-//              text: `${packet.data}`,
-//              type: "error"
-//            })
-
-//            this.socket.close()
-//            refreshParent(packet)
-//            reloadMemory()
-
-
-
-            //document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
-            //document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>ERROR</pre>`
-//            document.querySelector("footer .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
-//            document.querySelector("footer").classList.add("expanded")
-            //document.querySelector("footer i").className = "fa-solid fa-triangle-exclamation"
-
             document.querySelector(".run .play").classList.remove("hidden")
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
@@ -569,7 +557,7 @@ document.addEventListener("DOMContentLoaded", async () => {
 
           } else if (packet.type === "event") {
             if (packet.data === "stop") {
-              document.querySelector("footer").innerHTML = "<b>Ready</b>"
+              document.querySelector("#status-window").innerHTML = "<b>Ready</b>"
               setTimeout(() => {
 
                 let params = new URLSearchParams(location.search)
@@ -921,9 +909,7 @@ const reloadMemory = async () => {
         <% if (locals.filepath) { %>
           <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
         <% } %>
-        <!--
-        <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
-        -->
+        <div id='status-window'></div>
       </div>
     </header>
   <% } %>
@@ -1007,7 +993,6 @@ const reloadMemory = async () => {
         <% } %>
         <div id='terminal'></div>
       </div>
-      <footer><b>Ready</b></footer>
     <% } %>
   <% } %>
   <div id='error-screen' class='hidden'>