npm - pinokiod - Versions diffs - 7.1.60 → 7.1.61 - Mend

pinokiod 7.1.60 → 7.1.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json +1 -1
package/server/index.js +5 -1
package/server/views/connect/index.ejs +99 -47
package/server/views/setup.ejs +104 -29

package/package.json CHANGED Viewed

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

package/server/index.js CHANGED Viewed

@@ -15492,6 +15492,7 @@ class Server {
       if (this.onrestart) {
         console.log("onrestart exists")
         this.onrestart()
+        res.json({ success: true })
       } else {
         await this.start({ debug: this.debug, browser: this.browser })
         res.json({ success: true })
@@ -15499,7 +15500,10 @@ class Server {
     }))
     this.app.post("/restart", ex(async (req, res) => {
       console.log("post /restart")
-      this.start({ debug: this.debug, browser: this.browser })
+      this.start({ debug: this.debug, browser: this.browser }).catch((error) => {
+        console.error("[Pinokiod] restart failed", error && error.stack ? error.stack : error)
+      })
+      res.json({ success: true })
     }))
     this.app.post("/network", ex(async (req, res) => {
       if (this.kernel.homedir) {

package/server/views/connect/index.ejs CHANGED Viewed

@@ -44,9 +44,16 @@
             color: var(--connect-text);
             margin: 0;
             min-height: 100vh;
+            display: flex;
+            flex-direction: column;
             color-scheme: light;
         }
+        body[data-page="connect"][data-agent="electron"] {
+            padding-top: 26px;
+            box-sizing: border-box;
+        }
         @media (prefers-color-scheme: dark) {
             body[data-page="connect"] {
                 --connect-body-bg: #010617;
@@ -101,6 +108,12 @@
             color-scheme: dark;
         }
+        body[data-page="connect"] main.connect-page-shell {
+            flex: 1 1 auto;
+            padding: 24px 20px 48px;
+            box-sizing: border-box;
+        }
         body[data-page="connect"] .container {
             background: var(--connect-card-bg);
             max-width: 600px;
@@ -261,7 +274,7 @@
         body[data-page="connect"] header.head {
           max-width: 600px;
           margin: 0 auto;
-          padding: 50px;
+          padding: 16px 50px 36px;
           text-align: center;
         }
@@ -297,47 +310,23 @@
 <script src="/nav.js"></script>
 </head>
 <body class='<%=theme%>' data-agent="<%=agent%>" data-page="connect">
-    <header class="navheader grabbable">
-      <h1>
-        <a class="home" href="/home"><img class="icon" src="/pinokio-black.png"></a>
-        <button class="btn2" id="minimize-header" data-tippy-content="fullscreen" title="fullscreen">
-          <div><i class="fa-solid fa-expand"></i></div>
-        </button>
-        <button class="btn2" id="back" data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
-        <button class="btn2" id="forward" data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
-        <button class="btn2" id="refresh-page" data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>
-        <button class="btn2" id="screenshot" data-tippy-content="screen capture"><i class="fa-solid fa-camera"></i></button>
-        <button class="btn2" id="inspector" data-tippy-content="X-ray mode"><i class="fa-solid fa-eye"></i></button>
-        <div class="flexible"></div>
-        <a class="btn2" href="/columns" data-tippy-content="split into 2 columns">
-          <div><i class="fa-solid fa-table-columns"></i></div>
-        </a>
-        <a class="btn2" href="/rows" data-tippy-content="split into 2 rows">
-          <div><i class="fa-solid fa-table-columns fa-rotate-270"></i></div>
-        </a>
-        <button class="btn2" id="new-window" data-tippy-content="open a new window" title="open a new window" data-agent="web">
-          <div><i class="fa-solid fa-plus"></i></div>
-        </button>
-        <button class="btn2 hidden" id="close-window" data-tippy-content="close this section">
-          <div><i class="fa-solid fa-xmark"></i></div>
-        </button>
-      </h1>
-    </header>
-    <header class='head'>
-      <div class='logos'>
-        <img class='logo' src="/pinokio-black.png"/>
-        <div>+</div>
-        <% if (name === "huggingface") { %>
-          <div class='logo'>🤗</div>
-        <% } else if (name === "x") { %>
-          <i class="logo fa-brands fa-square-x-twitter"></i>
-        <% } else if (name === "pinokio") { %>
+    <%- include('../partials/app_navheader', { agent }) %>
+    <main class="connect-page-shell">
+      <header class='head'>
+        <div class='logos'>
           <img class='logo' src="/pinokio-black.png"/>
-        <% } %>
-      </div>
-      <h1><%=name%> Connect</h1>
-    </header>
-    <div class="container">
+          <div>+</div>
+          <% if (name === "huggingface") { %>
+            <div class='logo'>🤗</div>
+          <% } else if (name === "x") { %>
+            <i class="logo fa-brands fa-square-x-twitter"></i>
+          <% } else if (name === "pinokio") { %>
+            <img class='logo' src="/pinokio-black.png"/>
+          <% } %>
+        </div>
+        <h1><%=name%> Connect</h1>
+      </header>
+      <div class="container">
         <div id="status" class="status hidden">
         </div>
@@ -359,7 +348,8 @@
             </div>
         </div>
-    </div>
+      </div>
+    </main>
     <div id="connect-loader" class="loader-overlay hidden">
       <div class="loader-spinner"></div>
@@ -369,6 +359,7 @@
     <script>
         const CONNECT_NAME = "<%=name%>"
+        const CONNECT_AGENT = document.body.getAttribute('data-agent') || 'web'
         const isSecureConnectContext = <%= protocol === "https" ? 'true' : 'false' %>
         const statusElement = document.getElementById('status')
         const loaderElement = document.getElementById('connect-loader')
@@ -565,6 +556,10 @@
         const PROFILE_URL = "<%=config.PROFILE_URL%>"
         const SCOPE = "<%=config.SCOPE%>"
         const name = "<%=name%>"
+        const SECURE_CONNECT_POLL_INTERVAL = 2000
+        const SECURE_CONNECT_TIMEOUT = 120000
+        let secureConnectPollTimer = null
+        let secureConnectTimeoutHandle = null
         function generateRandomString(length) {
             const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
@@ -599,8 +594,6 @@
         // OAuth functions
         async function login() {
             try {
-                showLoader('Connecting...');
-                setStatus(`Redirecting to ${name}...`, 'warning');
                 // Clear existing data
                 localStorage.removeItem('oauth_state');
                 localStorage.removeItem('code_verifier');
@@ -626,8 +619,22 @@
                 });
                 const authUrl = OAUTH_URL + '?' + params.toString();
-                // Redirect
+                if (CONNECT_AGENT === 'electron') {
+                    startSecureConnectPolling();
+                    setStatus(`Continue the ${name} login in your browser.`, 'warning');
+                    try {
+                        window.open(authUrl, '_blank', 'browser');
+                    } catch (openError) {
+                        hideLoader();
+                        setStatus(`Could not open the browser. Please open ${authUrl} manually.`, 'error');
+                        return;
+                    }
+                    return;
+                }
+                showLoader('Connecting...');
+                setStatus(`Redirecting to ${name}...`, 'warning');
                 window.location.href = authUrl;
             } catch (error) {
@@ -637,6 +644,48 @@
             }
         }
+        function stopSecureConnectPolling(message = '', type = 'warning') {
+            if (secureConnectPollTimer) {
+                clearInterval(secureConnectPollTimer);
+                secureConnectPollTimer = null;
+            }
+            if (secureConnectTimeoutHandle) {
+                clearTimeout(secureConnectTimeoutHandle);
+                secureConnectTimeoutHandle = null;
+            }
+            if (message) {
+                hideLoader();
+                setStatus(message, type);
+            }
+        }
+        async function pollSecureConnectStatus() {
+            const token = await ensureValidToken();
+            if (!token) {
+                return false;
+            }
+            stopSecureConnectPolling();
+            localStorage.removeItem('oauth_state');
+            localStorage.removeItem('code_verifier');
+            await fetchUserInfo(token);
+            setStatus('Connected.', 'success');
+            return true;
+        }
+        function startSecureConnectPolling() {
+            stopSecureConnectPolling();
+            showLoader('Waiting for authentication in the browser...', {
+                cancellable: true,
+                onCancel: () => stopSecureConnectPolling('Connection cancelled.', 'warning')
+            });
+            setStatus(`Waiting for ${name} authentication to finish...`, 'warning');
+            pollSecureConnectStatus();
+            secureConnectPollTimer = setInterval(pollSecureConnectStatus, SECURE_CONNECT_POLL_INTERVAL);
+            secureConnectTimeoutHandle = setTimeout(() => {
+                stopSecureConnectPolling('Timed out waiting for the browser login to finish. Please try again.', 'error');
+            }, SECURE_CONNECT_TIMEOUT);
+        }
         async function handleOAuthCallback(code) {
             showLoader('Finishing connection...');
             try {
@@ -670,6 +719,7 @@
                 console.log('Token response:', response)
                 // Store tokens
                 if (response.access_token) {
+                    stopSecureConnectPolling();
                     // Cleanup
                     localStorage.removeItem('oauth_state');
                     localStorage.removeItem('code_verifier');
@@ -721,11 +771,13 @@
                 await handleOAuthCallback(code);
                 return;
             }
             // Check existing session with automatic refresh
             const token = await ensureValidToken();
             if (token) {
                 await fetchUserInfo(token);
+            } else if (CONNECT_AGENT === 'electron' && localStorage.getItem('oauth_state')) {
+                startSecureConnectPolling();
             } else {
                 setStatus('Not authenticated', 'warning');
             }

package/server/views/setup.ejs CHANGED Viewed

@@ -240,38 +240,113 @@ document.addEventListener("DOMContentLoaded", async () => {
     location.href = location.href
   <% } %>
   <% if (!requirements_pending && !install_required && wait === "caddy") { %>
-    console.log("RESTART")
-    alert("RESTART")
+    const waitRoot = document.querySelector(".requirements .content")
+    const waitLabel = document.querySelector(".requirements .content .loading span")
+    const WAIT_TIMEOUT_MS = 120000
+    const setWaitLabel = (message) => {
+      if (waitLabel) {
+        waitLabel.textContent = message
+      }
+    }
+    const showWaitError = (message) => {
+      if (waitRoot) {
+        waitRoot.innerHTML = `
+          <div class='loading'>
+            <i class="fa-solid fa-circle-exclamation"></i>
+            <span>${message}</span>
+          </div>
+          <div class='item'>
+            <a class='btn' href='${location.href}'>Retry</a>
+          </div>
+        `
+      } else {
+        alert(message)
+      }
+    }
-    let r = await fetch("/network", {
-      method: "post",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        PINOKIO_NETWORK_ACTIVE: "1",
-        PINOKIO_HTTPS_ACTIVE: "1",
+    try {
+      setWaitLabel("Enabling secure localhost access...")
+      const networkResponse = await fetch("/network", {
+        method: "post",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          PINOKIO_NETWORK_ACTIVE: "1",
+          PINOKIO_HTTPS_ACTIVE: "1",
+        })
+      }).then((res) => {
+        return res.json()
       })
-    }).then((res) => {
-      return res.json()
-    })
-    fetch("/restart", {
-      method: "post"
-    }, () => {
-    })
-    console.log("Fetch finished")
-    await new Promise((resolve, reject) => {
-      let interval = setInterval(() => {
-        fetch("/check_router_up").then((res) => {
-          return res.json()
-        }).then((res) => {
-          console.log(res)
-          if (res.success) {
-            clearInterval(interval)
-            resolve()
-          }
+      if (networkResponse && networkResponse.error) {
+        throw new Error(networkResponse.error)
+      }
+      setWaitLabel("Restarting Pinokio...")
+      try {
+        await fetch("/restart", {
+          method: "post"
         })
-      }, 500)
-    })
-    location.href = "<%=current%>"
+      } catch (error) {
+        console.warn("restart request ended early", error)
+      }
+      const startedAt = Date.now()
+      let lastKnownError = null
+      let lastKnownPhase = null
+      await new Promise((resolve, reject) => {
+        const interval = setInterval(async () => {
+          try {
+            const [routerStatus, startupStatus] = await Promise.all([
+              fetch("/check_router_up").then((res) => res.json()),
+              fetch("/pinokio/startup_status").then((res) => res.json()).catch(() => null)
+            ])
+            if (routerStatus && routerStatus.success) {
+              clearInterval(interval)
+              resolve()
+              return
+            }
+            if (routerStatus && routerStatus.error) {
+              lastKnownError = routerStatus.error
+            }
+            if (startupStatus && startupStatus.error) {
+              lastKnownError = startupStatus.error
+            }
+            if (startupStatus && startupStatus.phase) {
+              lastKnownPhase = startupStatus.phase
+              const phaseMessage = startupStatus.phase === "ready"
+                ? "Secure router is almost ready..."
+                : `Restarting Pinokio... (${startupStatus.phase.replace(/_/g, " ")})`
+              setWaitLabel(phaseMessage)
+            }
+            if (startupStatus && startupStatus.phase === "error") {
+              clearInterval(interval)
+              reject(new Error(lastKnownError || "Pinokio failed to restart cleanly"))
+              return
+            }
+            if ((Date.now() - startedAt) >= WAIT_TIMEOUT_MS) {
+              clearInterval(interval)
+              const detail = lastKnownError || lastKnownPhase || "secure localhost router did not come up"
+              reject(new Error(`Timed out waiting for restart: ${detail}`))
+            }
+          } catch (error) {
+            lastKnownError = error && error.message ? error.message : String(error)
+            if ((Date.now() - startedAt) >= WAIT_TIMEOUT_MS) {
+              clearInterval(interval)
+              reject(new Error(`Timed out waiting for restart: ${lastKnownError}`))
+            }
+          }
+        }, 1000)
+      })
+      location.href = "<%=current%>"
+    } catch (error) {
+      console.error("secure router setup failed", error)
+      showWaitError(error && error.message ? error.message : "Failed to restart Pinokio")
+    }
   <% } %>
   if (document.querySelector("#del-bin")) {
     document.querySelector("#del-bin").addEventListener("click", async (e) => {