pinokiod 3.283.0 → 3.285.0

package/package.json

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

package/server/public/common.js

@@ -1,5 +1,90 @@
 const CAPTURE_MIN_SIZE = 32;
 
+function createMinimalLoadingSwal () {
+  if (typeof window === 'undefined' || typeof window.Swal === 'undefined') {
+    return () => {};
+  }
+  const swal = window.Swal;
+  if (typeof swal.fire !== 'function') {
+    return () => {};
+  }
+  const close = () => {
+    if (swal.isVisible()) {
+      swal.close();
+    }
+  };
+  swal.fire({
+    html: "<i class='fa-solid fa-circle-notch fa-spin'></i> Loading...",
+    allowOutsideClick: false,
+    allowEscapeKey: false,
+    showConfirmButton: false,
+    customClass: {
+      container: 'loader-container',
+      popup: 'loader-popup',
+      htmlContainer: 'loader-dialog',
+      footer: 'hidden',
+      actions: 'hidden'
+    }
+  });
+  return close;
+}
+function check_ready () {
+  return fetch("/pinokio/requirements_ready").then((res) => {
+    return res.json()
+  }).then((res) => {
+    if (res.error) {
+      return false
+    } else if (!res.requirements_pending) {
+      return true
+    }
+    return false
+  })
+}
+
+function check_dev () {
+  return fetch('/bundle/dev').then((response) => response.json())
+}
+
+
+/*
+let onfinish = await wait_ready()
+if (onfinish) {
+  onfinish()
+}
+// The original task
+*/
+function wait_ready () {
+  return new Promise((resolve, reject) => {
+    check_ready().then((ready) => {
+      if (ready) {
+        check_dev().then((data) => {
+          if (data && data.available === false) {
+            resolve({ closeModal: null, ready: false })
+          } else {
+            resolve({ closeModal: null, ready: true })
+          }
+        })
+      } else {
+        let loader = createMinimalLoadingSwal();
+        let interval = setInterval(() => {
+          check_ready().then((ready) => {
+            if (ready) {
+              clearInterval(interval)
+              check_dev().then((data) => {
+                if (data && data.available === false) {
+                  resolve({ ready: false, closeModal: loader })
+                } else {
+                  resolve({ ready: true, closeModal: loader })
+                }
+              })
+            }
+          })
+        }, 500)
+      }
+    })
+  })
+}
+
 function collectPostMessageTargets(contextWindow) {
   const ctx = contextWindow || window;
   const targets = new Set();
@@ -2872,93 +2957,25 @@ document.addEventListener("DOMContentLoaded", () => {
     }
   }
 
+
   function guardCreateLauncher(api, defaults = null) {
     if (!api || typeof api.showModal !== 'function') {
       return;
     }
-    const openModal = () => {
-      if (defaults) {
-        api.showModal(defaults);
-      } else {
-        api.showModal();
-      }
-    };
-    const createMinimalLoadingSwal = () => {
-      if (typeof window === 'undefined' || typeof window.Swal === 'undefined') {
-        return () => {};
+    wait_ready().then(({ closeModal, ready }) => {
+      if (closeModal) {
+        closeModal()
       }
-      const swal = window.Swal;
-      if (typeof swal.fire !== 'function') {
-        return () => {};
-      }
-      const close = () => {
-        if (swal.isVisible()) {
-          swal.close();
-        }
-      };
-      swal.fire({
-        html: "<i class='fa-solid fa-circle-notch fa-spin'></i> Loading...",
-        allowOutsideClick: false,
-        allowEscapeKey: false,
-        showConfirmButton: false,
-        customClass: {
-          container: 'loader-container',
-          popup: 'loader-popup',
-          htmlContainer: 'loader-dialog',
-          footer: 'hidden',
-          actions: 'hidden'
-        }
-      });
-      return close;
-    };
-    const check_ready = () => {
-      return fetch("/pinokio/requirements_ready").then((res) => {
-        return res.json()
-      }).then((res) => {
-        if (res.error) {
-          return false
-        } else if (!res.requirements_pending) {
-          return true
-        }
-        return false
-      })
-    }
-    let closeMinimalLoadingModal
-    let promise = new Promise((resolve, reject) => {
-      check_ready().then((ready) => {
-        if (ready) {
-          console.log("ready 1", ready)
-          resolve()
-        } else {
-          closeMinimalLoadingModal = createMinimalLoadingSwal();
-          let interval = setInterval(() => {
-            check_ready().then((ready) => {
-              console.log("ready 2", ready)
-              if (ready) {
-                clearInterval(interval)
-                resolve()
-              }
-            })
-          }, 500)
-        }
-      })
-    })
-    promise.then(() => {
-      if (closeMinimalLoadingModal) {
-        closeMinimalLoadingModal()
-      }
-      console.log("ready")
-      fetch('/bundle/dev')
-      .then((response) => response.json())
-      .then((data) => {
-        console.log("Data", data)
-        if (data && data.available === false) {
-          const callback = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash);
-          window.location.href = `/setup/dev?callback=${callback}`;
+      if (ready) {
+        if (defaults) {
+          api.showModal(defaults);
         } else {
-          openModal();
+          api.showModal();
         }
-      })
+      } else {
+        const callback = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash);
+        window.location.href = `/setup/dev?callback=${callback}`;
+      }
     })
   }
 

package/server/public/style.css

@@ -2752,8 +2752,7 @@ aside .qr {
 
 @media only screen and (max-width: 600px) {
   aside .tab, aside .tab.submenu {
-    flex-direction: column !important;
-    padding: 10px 0 !important;
+    font-size: 11px;
   }
   aside .caption {
     width: 50px !important;

package/server/public/tab-link-popover.js

@@ -38,18 +38,18 @@
           if (targetMode === "_self") {
             window.location.assign(url)
           } else {
-//            window.open(url, "_blank", "noopener")
-            fetch("/go", {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json"
-              },
-              body: JSON.stringify({ url })
-            }).then((res) => {
-              return res.json()
-            }).then((res) => {
-              console.log(res)
-            })
+            window.open(url, "_blank", "browser")
+//            fetch("/go", {
+//              method: "POST",
+//              headers: {
+//                "Content-Type": "application/json"
+//              },
+//              body: JSON.stringify({ url })
+//            }).then((res) => {
+//              return res.json()
+//            }).then((res) => {
+//              console.log(res)
+//            })
           }
         }
         hideTabLinkPopover({ immediate: true })

package/server/views/app.ejs

@@ -5361,7 +5361,6 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
       }
       let default_selection = document.querySelector(".dynamic .submenu [data-default]")
       if (default_selection) {
-        console.log("CLICK default")
         default_selection.click()
       }
       rendered = true
@@ -5387,7 +5386,6 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
     }
   }
   const refresh = async (silent, options) => {
-    console.log("REFRESH")
 
     if (options && options.nodelay) {
     } else {
@@ -5502,7 +5500,7 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
               refresh_du("logs")
             } else {
               <% if (type === 'run') { %>
-              if (event.data.type === 'start') {
+              if (event.data.type === 'start' || event.data.type === "disconnect" || (event.data.type === 'event' && event.data.data === 'stop')) {
                 ignorePersistedSelection = true
               }
               <% } %>

package/server/views/index.ejs

@@ -756,6 +756,49 @@ let paths = location.pathname.split("/").filter(x=>x)
 var term
 const n = new N()
 let socket = new Socket()
+window.PinokioHomeGuardNavigate = null;
+<% if (ishome) { %>
+document.addEventListener("DOMContentLoaded", () => {
+  // Run wait_ready for every /home navigation so we only leave when requirements are satisfied
+  const guardNavigate = (href, options = {}) => {
+    wait_ready().then(({ closeModal, ready }) => {
+      if (closeModal) {
+        closeModal()
+      }
+      if (ready) {
+        options?.replace ? location.replace(href) : location.assign(href);
+      } else {
+        const callback = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash);
+        window.location.href = `/setup/dev?callback=${callback}`;
+      }
+    });
+  };
+  // Capture same-window anchor clicks and reroute them through the guard
+  document.addEventListener("click", (event) => {
+    // Ignore clicks the page already handled or anything besides a plain left-click
+    if (event.defaultPrevented || event.button !== 0) return;
+    // Let modifier-assisted shortcuts (open in new tab, etc.) behave normally
+    if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
+    // Only guard actual anchor navigations
+    const anchor = event.target.closest("a[href]");
+    if (!anchor) return;
+    // Skip downloads so they aren’t blocked by readiness polling
+    if (anchor.hasAttribute("download")) return;
+    // Don’t intercept links that explicitly open in another browsing context
+    const targetAttr = anchor.getAttribute("target");
+    if (targetAttr && targetAttr !== "_self") return;
+    // Ignore hash jumps, javascript: URLs, and empty hrefs
+    const rawHref = anchor.getAttribute("href") || "";
+    if (!rawHref || rawHref.startsWith("#") || /^javascript:/i.test(rawHref)) return;
+    // Prevent cross-origin navigations from being delayed—they don’t hit Pinokio anyway
+    const url = new URL(anchor.href, location.href);
+    if (url.origin !== location.origin) return;
+    event.preventDefault();
+    guardNavigate(url.toString());
+  });
+  window.PinokioHomeGuardNavigate = guardNavigate;
+});
+<% } %>
 const pull = async () => {
   if (!term) {
     <% if (theme === "dark") { %>
@@ -1004,7 +1047,12 @@ document.querySelector("form input[type=search]").focus()
 //})
 <% if (display.includes("install")) { %>
 document.querySelector("#install").addEventListener("click", async (e) => {
-  location.href = e.target.getAttribute("data-url")
+  const targetUrl = e.target.getAttribute("data-url");
+  if (window.PinokioHomeGuardNavigate) {
+    window.PinokioHomeGuardNavigate(targetUrl);
+  } else {
+    location.href = targetUrl;
+  }
 })
 <% } %>
 //Reporter()
@@ -1384,7 +1432,11 @@ document.addEventListener("click", async (e) => {
     e.preventDefault()
     e.stopPropagation()
     let src = target.getAttribute("data-src")
-    location.href = src
+    if (window.PinokioHomeGuardNavigate) {
+      window.PinokioHomeGuardNavigate(src)
+    } else {
+      location.href = src
+    }
     return
   }