pinokiod 3.280.0 → 3.282.0

package/package.json

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

package/server/public/common.js

@@ -2857,40 +2857,14 @@ document.addEventListener("DOMContentLoaded", () => {
       return;
     }
     trigger.dataset.createLauncherInit = 'true';
-    trigger.addEventListener('click', () => {
-      handleCreateLauncherClick(api);
-    });
-  }
-
-  async function handleCreateLauncherClick(api) {
-    if (!api || typeof api.showModal !== 'function') {
-      return;
-    }
-    try {
-      const response = await fetch('/bundle/dev', {
-        headers: {
-          'Accept': 'application/json',
-        },
-      });
-      if (response.ok) {
-        const data = await response.json();
-        if (data && data.available === false) {
-          const callback = encodeURIComponent(window.location.pathname + window.location.search);
-          window.location.href = `/setup/dev?callback=${callback}`;
-          return;
-        }
-      }
-    } catch (error) {
-      console.warn('Failed to verify tooling before opening create modal', error);
-    }
-    api.showModal();
+    trigger.addEventListener('click', () => guardCreateLauncher(api));
   }
 
   function openPendingCreateLauncherModal(api) {
     if (!api || !createLauncherState.pendingDefaults) {
       return;
     }
-    api.showModal(createLauncherState.pendingDefaults);
+    guardCreateLauncher(api, createLauncherState.pendingDefaults);
     createLauncherState.pendingDefaults = null;
     if (createLauncherState.shouldCleanupQuery) {
       cleanupCreateLauncherParams();
@@ -2898,6 +2872,96 @@ 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 () => {};
+      }
+      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}`;
+        } else {
+          openModal();
+        }
+      })
+    })
+  }
+
   function parseCreateLauncherDefaults() {
     try {
       const params = new URLSearchParams(window.location.search);

package/server/views/file_explorer.ejs

@@ -3,6 +3,7 @@
 <title>Pinokio</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+<link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">
@@ -156,6 +157,10 @@ body.dark .browser-options-row {
 <script src="/sweetalert2.js"></script>
 <script src="/noty.js"></script>
 <script src="/notyq.js"></script>
+<script src="/xterm.js"></script>
+<script src="/xterm-addon-fit.js"></script>
+<script src="/xterm-addon-web-links.js"></script>
+<script src="/xterm-theme.js"></script>
 <script src="/Socket.js"></script>
 <script src="/install.js"></script>
 <script src="/common.js"></script>

package/server/views/index.ejs

@@ -692,7 +692,7 @@ body.dark aside .current.selected {
       <div>Get started by installing or creating some pinokio scripts.</div>
       <a href="/home?mode=explore" class='btn'><i class="fa-solid fa-globe"></i> Discover</a>
       <span>&nbsp;or&nbsp;</span>
-      <a href="/home?create=1" class='btn'><i class="fa-solid fa-wand-magic-sparkles"></i> Create</a>
+      <button type='button' class='btn' onclick="(function(btn){ if(btn){ btn.click(); } })(document.getElementById('create-launcher-button'))"><i class="fa-solid fa-wand-magic-sparkles"></i> Create</button>
     </div>
   <% } %>
 <% } else { %>

package/server/views/install.ejs

@@ -125,7 +125,6 @@ body {
 <script src="/xterm-addon-web-links.js"></script>
 <script src="/xterm-theme.js"></script>
 <script src="/Socket.js"></script>
-<script src="/resizeSync.js"></script>
 <script src="/terminal-settings.js"></script>
 <script src="/pinokio-touch.js"></script>
 <!--
@@ -211,16 +210,11 @@ const createTerm = async (_theme) => {
 document.addEventListener("DOMContentLoaded", async () => {
   const n = new N()
   let socket = new Socket()
-  const resizeSync = window.PinokioResizeSync.create({
-    socket,
-    getShellId: () => shell_id
-  })
   <% if (theme === "dark") { %>
   let term = await createTerm(xtermTheme.FrontEndDelight)
   <% } else { %>
   let term = await createTerm(xtermTheme.Tomorrow)
   <% } %>
-  resizeSync.updateTerm(term, fitAddon, socket)
   let params = new URLSearchParams(location.search)
   let entries = [...params.entries()]
   let options;
@@ -240,10 +234,8 @@ document.addEventListener("DOMContentLoaded", async () => {
   })
   let observer = new ResizeObserver(() => {
     fitAddon.fit()
-    resizeSync.sendResize(term.cols, term.rows)
   });
   observer.observe(document.body)
-  resizeSync.reset()
   await new Promise((resolve, reject) => {
     console.log({ cols: term.cols, rows: term.rows })
     socket.run({
@@ -259,17 +251,11 @@ document.addEventListener("DOMContentLoaded", async () => {
       console.log("packet", packet)
       if (packet.type === "stream") {
         if (packet.data.id) {
-          if (!shell_id) {
-            shell_id = packet.data.id
-            resizeSync.sendInitial()
-          } else {
-            shell_id = packet.data.id
-          }
+          shell_id = packet.data.id
         }
         term.write(packet.data.raw)
       } else if (packet.type === "shell.kill") {
         socket.close()
-        resizeSync.reset()
       } else if (packet.type === "result") {
         resolve() 
       } else if (packet.type === "error") {
@@ -323,8 +309,6 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
           n.Noty(payload)
         }
-      } else if (packet.type === "resize") {
-        resizeSync.handleResizePacket(packet)
       } else if (packet.type === "input") {
         let params = packet.data
         /*

package/server/views/pro.ejs

@@ -14,6 +14,7 @@
 <script src="/xterm-addon-search-bar.js"></script>
 <script src="/sweetalert2.js"></script>
 <script src="/Socket.js"></script>
+<script src="/resizeSync.js"></script>
 <script src="/terminal-settings.js"></script>
 <script src="/pinokio-touch.js"></script>
 <script src="/common.js"></script>