pinokiod 2.15.7 → 2.15.9

package/server/public/style.css

@@ -1593,3 +1593,48 @@ footer.status {
 .btn.red {
   background: brown !important;
 }
+
+#error-screen {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 100000000;
+  display: flex;
+  flex-direction: column;
+}
+#error-screen pre {
+  padding: 20px;
+  box-sizing: border-box;
+  width: 100%;
+  /*
+  height: 100%;
+  */
+  margin: 0;
+  background: royalblue;
+  color: white;
+  overflow: auto;
+  flex-grow: 1;
+}
+#error-screen-footer {
+  padding: 10px;
+  box-sizing: border-box;
+  text-align: center;
+  background: royalblue;
+}
+#error-screen-close {
+  background: rgba(0, 0, 0, 0.6);
+  font-size: 16px;
+  padding: 10px 20px;
+  font-weight: bold;
+  width: 100%;
+}
+
+mark{
+  background: red;
+  color: white;
+  padding: 5px;
+  display: inline-block;
+  margin: 5px 0;
+}

package/server/views/browser-experimental.ejs

@@ -676,9 +676,6 @@ const subUrlOf = (s, f) => {
     if (!fullParsed.searchParams.has(key)) {
       return false
     }
-    console.log("key", key)
-    console.log("f", fullParsed.searchParams.get(key))
-    console.log("s", val)
     if (fullParsed.searchParams.get(key) !== val) {
       return false
     }
@@ -691,7 +688,6 @@ const renderCursor = () => {
     el.classList.remove("cursor")
   })
   const target = document.querySelector(".selectable[data-index='" + cursorIndex + "']")
-  console.log({ cursorIndex, target })
   target.classList.add("cursor")
 }
 const nav = (type) => {
@@ -794,7 +790,6 @@ const renderSelection = (e, force) => {
     //
     //  => select that tab and frame
 
-    console.log("target", target)
     if (target) {
 
       // display the menu button at the top
@@ -809,12 +804,10 @@ const renderSelection = (e, force) => {
     }
 
     if (target) {
-      console.log("# 3")
 
 
       // Instantiate a frame with the selected target's href
       let url = target.href
-      console.log("> url", url)
       document.querySelector("#open-browser").href = url
       document.querySelector("#clone-tab").setAttribute("data-href", url)
       document.querySelector("#location").value = url
@@ -1409,6 +1402,11 @@ const refresh = async (silent) => {
   // render the selected frame only if not silent
   if (silent) {
   } else {
+    await new Promise((resolve, reject) => {
+      setTimeout(() => {
+        resolve()
+      }, 1000)
+    })
     renderSelection()
   }
 }

package/server/views/editor.ejs

@@ -23,6 +23,7 @@
 <script src="/waitmodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
+<script src="/mark.min.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
@@ -307,6 +308,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             this.socket.close()
             document.querySelector(".run .play").classList.remove("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
+
           } else if (packet.type === 'connect') {
 //            document.querySelector(".terminal-container").classList.remove("hidden")
             const message = "..........Connected!\r\n"
@@ -464,13 +466,14 @@ document.addEventListener("DOMContentLoaded", async () => {
               text: `${packet.data}`,
             })
           } else if (packet.type === "error") {
+            debugger
 //            n.Noty({
 //              text: `${packet.data}`,
 //              type: "error"
 //            })
-            this.socket.close()
-//            refreshParent(packet)
-            reloadMemory()
+//            this.socket.close()
+////            refreshParent(packet)
+//            reloadMemory()
             //document.querySelector("footer").innerHTML = `<b><i class="fa-solid fa-triangle-exclamation"></i> ERROR</b><pre>${packet.data}</pre>`
             document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
 //            document.querySelector("footer .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
@@ -481,6 +484,23 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
 
+            document.querySelector("#error-screen").classList.remove("hidden")
+            document.querySelector("#error-screen pre").textContent = packet.data
+            let instance = new Mark(document.querySelector("#error-screen pre"), {
+              separateWordSearch: false,
+              accuracy: "exactly"
+            })
+            /*
+            document.querySelector("#error-screen").addEventListener("click", (e) => {
+              document.querySelector("#error-screen").classList.add("hidden")
+            })
+            */
+            console.log("instance", instance)
+            console.log("EVENT", packet.event)
+            instance.mark(packet.event)
+            let element = document.querySelector("mark")
+            element.scrollIntoView({ behavior: "smooth", block: "center" });
+
           } else if (packet.type === "event") {
             if (packet.data === "stop") {
               document.querySelector("footer").innerHTML = "<b>Ready</b>"
@@ -865,5 +885,11 @@ const reloadMemory = async () => {
       <footer><b>Ready</b></footer>
     <% } %>
   <% } %>
+  <div id='error-screen' class='hidden'>
+    <pre></pre>
+    <div id='error-screen-footer'>
+      <button id='error-screen-close' class='btn'>Close</button>
+    </div>
+  </div>
 </body>
 </html>

package/server/views/fullscreen_editor.ejs

@@ -25,6 +25,7 @@
 <script src="/waitmodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
+<script src="/mark.min.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
@@ -41,7 +42,6 @@ html {
   height: 100%;
   overflow: hidden;
 }
-
 body {
   height: 100%;
   overflow: hidden;
@@ -192,6 +192,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             rows: this.term.rows,
           }
         }, async (packet) => {
+          console.log({ packet })
           if (packet.type === 'start') {
             refreshParent(packet)
             reloadMemory()
@@ -425,9 +426,12 @@ document.addEventListener("DOMContentLoaded", async () => {
 //              text: `${packet.data}`,
 //              type: "error"
 //            })
-            this.socket.close()
-            refreshParent(packet)
-            reloadMemory()
+
+//            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 .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
@@ -438,6 +442,27 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
 
+
+            document.querySelector("#error-screen").classList.remove("hidden")
+            document.querySelector("#error-screen pre").textContent = packet.data
+            let instance = new Mark(document.querySelector("#error-screen pre"), {
+              separateWordSearch: false,
+              accuracy: "exactly"
+            })
+            /*
+            document.querySelector("#error-screen").addEventListener("click", (e) => {
+              document.querySelector("#error-screen").classList.add("hidden")
+            })
+            */
+            console.log("instance", instance)
+            console.log("EVENT", packet.event)
+            instance.mark(packet.event)
+            let element = document.querySelector("mark")
+            element.scrollIntoView({ behavior: "smooth", block: "center" });
+
+
+
+
           } else if (packet.type === "event") {
             if (packet.data === "stop") {
               document.querySelector("footer").innerHTML = "<b>Ready</b>"
@@ -480,7 +505,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                 document.querySelector(".run .starting").classList.add("hidden")
                 document.querySelector(".run .stop").classList.add("hidden")
               }, 0)
-              this.socket.close()
+              //this.socket.close()
             }
           }
 
@@ -798,5 +823,11 @@ const reloadMemory = async () => {
       <footer><b>Ready</b></footer>
     <% } %>
   <% } %>
+  <div id='error-screen' class='hidden'>
+    <pre></pre>
+    <div id='error-screen-footer' class='hidden'>
+      <button id='error-screen-close' class='btn'>Close</button>
+    </div>
+  </div>
 </body>
 </html>

package/server/views/index.ejs

@@ -182,6 +182,7 @@ body.dark .browser-options-row {
 </form>
 <% if (ishome) { %>
   <div class='nav-btns'>
+    <a class='btn2' href='/proxy'><div><i class="fa-solid fa-wifi"></i></div><div>Share</div></a>
     <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
     <a class='btn2' href="https://portal.pinokio.computer/" target="_blank"><div><i class="fa-solid fa-face-smile-beam"></i></div><div>Community</div></a>
     <% if (agent === "electron") { %>
@@ -235,24 +236,32 @@ body.dark .browser-options-row {
           </div>
         </div>
       <% } %>
+      <!--
       <div class='browser-options-row'>
-        <% if (proxy) { %>
-          <a id='wifi-stop' data-proxy="<%=proxy.proxy%>" class='btn'><div><i class="fa-solid fa-stop"></i> Stop</div></a>
-          <div class='flexible'>
-            <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
-            <div>Access Pinokio from any device on the same network. By default it's off.</div>
-            <span class='badge'><i class="fa-solid fa-circle-notch fa-spin"></i> Running at <a href="<%=proxy.proxy%>" target="_blank" features="browser"><%=proxy.proxy%></a></span>
-            <a id='wifi-qr' class='badge'><i class="fa-solid fa-qrcode"></i> Scan QR Code</a>
-          </div>
-        <% } else { %>
-          <a id='wifi' class='btn'><div><i class="fa-solid fa-play"></i> Start</div></a>
-          <a id='wifi-starting' class='btn disabled hidden'><div><i class="fa-solid fa-circle-notch fa-spin"></i> Starting</div></a>
-          <div class='flexible'>
-            <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
-            <div>Access Pinokio from any device on the same network. By default it's off.</div>
-          </div>
+        <a href="/proxy" class='flexible'>
+          <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
+          <div>Access Pinokio, Ollama, and other 3rd party apps from any device on the same network. By default it's off.</div>
+        </a>
+        <% if (false) { %>
+          <% if (proxy) { %>
+            <a id='wifi-stop' data-proxy="<%=proxy.proxy%>" class='btn'><div><i class="fa-solid fa-stop"></i> Stop</div></a>
+            <div class='flexible'>
+              <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
+              <div>Access Pinokio from any device on the same network. By default it's off.</div>
+              <span class='badge'><i class="fa-solid fa-circle-notch fa-spin"></i> Running at <a href="<%=proxy.proxy%>" target="_blank" features="browser"><%=proxy.proxy%></a></span>
+              <a id='wifi-qr' class='badge'><i class="fa-solid fa-qrcode"></i> Scan QR Code</a>
+            </div>
+          <% } else { %>
+            <a id='wifi' class='btn'><div><i class="fa-solid fa-play"></i> Start</div></a>
+            <a id='wifi-starting' class='btn disabled hidden'><div><i class="fa-solid fa-circle-notch fa-spin"></i> Starting</div></a>
+            <div class='flexible'>
+              <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
+              <div>Access Pinokio from any device on the same network. By default it's off.</div>
+            </div>
+          <% } %>
         <% } %>
       </div>
+        -->
       <div class='browser-options-row hidden'>
         <% if (cloudflare_pub) { %>
           <a id='cloudflare-stop' class='btn'><div><i class="fa-solid fa-stop"></i> Stop</div></a>
@@ -1006,12 +1015,16 @@ if (document.querySelector("#cloudflare")) {
   })
 }
 <% } %>
-document.querySelector("#back").addEventListener("click", (e) => {
-  history.back()
-})
-document.querySelector("#forward").addEventListener("click", (e) => {
-  history.forward()
-})
+if (document.querySelector("#back")) {
+  document.querySelector("#back").addEventListener("click", (e) => {
+    history.back()
+  })
+}
+if (document.querySelector("#forward")) {
+  document.querySelector("#forward").addEventListener("click", (e) => {
+    history.forward()
+  })
+}
 document.querySelector("#genlog").addEventListener("click", (e) => {
   e.preventDefault()
   e.stopPropagation()