pinokiod 7.1.66 → 7.1.67

package/package.json

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

package/server/views/connect/index.ejs

@@ -49,11 +49,6 @@
             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;
@@ -558,10 +553,8 @@
         const name = "<%=name%>"
         const SECURE_CONNECT_POLL_INTERVAL = 2000
         const SECURE_CONNECT_TIMEOUT = 120000
-        const SECURE_CONNECT_BROWSER_RETRY_DELAY = 1200
         let secureConnectPollTimer = null
         let secureConnectTimeoutHandle = null
-        let secureConnectBrowserRetryHandle = null
 
         function generateRandomString(length) {
             const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
@@ -593,21 +586,6 @@
                 .replace(/=/g, '');
         }
 
-        async function openAuthInBrowser(authUrl) {
-            const response = await fetch('/go', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ url: authUrl })
-            });
-            if (!response.ok) {
-                throw new Error(`Browser launch failed with status ${response.status}`);
-            }
-            const payload = await response.json().catch(() => ({}));
-            if (payload && payload.error) {
-                throw new Error(payload.error);
-            }
-        }
-
         // OAuth functions
         async function login() {
             try {
@@ -641,24 +619,10 @@
                     startSecureConnectPolling();
                     setStatus(`Continue the ${name} login in your browser.`, 'warning');
                     try {
-                        if (secureConnectBrowserRetryHandle) {
-                            clearTimeout(secureConnectBrowserRetryHandle);
-                            secureConnectBrowserRetryHandle = null;
-                        }
-                        await openAuthInBrowser(authUrl);
-                        secureConnectBrowserRetryHandle = setTimeout(async () => {
-                            secureConnectBrowserRetryHandle = null;
-                            try {
-                                const token = await ensureValidToken();
-                                if (!token && document.visibilityState === 'visible' && document.hasFocus()) {
-                                    await openAuthInBrowser(authUrl);
-                                }
-                            } catch (retryError) {
-                                console.warn('Retry browser launch failed:', retryError);
-                            }
-                        }, SECURE_CONNECT_BROWSER_RETRY_DELAY);
+                        window.open(authUrl, '_blank', 'browser');
                     } catch (openError) {
-                        stopSecureConnectPolling(`Could not open the browser automatically. Please open ${authUrl} manually.`, 'error');
+                        hideLoader();
+                        setStatus(`Could not open the browser. Please open ${authUrl} manually.`, 'error');
                         return;
                     }
                     return;
@@ -684,10 +648,6 @@
                 clearTimeout(secureConnectTimeoutHandle);
                 secureConnectTimeoutHandle = null;
             }
-            if (secureConnectBrowserRetryHandle) {
-                clearTimeout(secureConnectBrowserRetryHandle);
-                secureConnectBrowserRetryHandle = null;
-            }
             if (message) {
                 hideLoader();
                 setStatus(message, type);
@@ -866,15 +826,12 @@
 
         function startHttpConnect() {
             stopConnectPolling()
-            showLoader('Connecting... Complete the login in the secure window.', {
+            showLoader(`Connecting... Complete the login in the ${CONNECT_AGENT === 'electron' ? 'browser' : 'secure window'}.`, {
                 cancellable: true,
                 onCancel: () => stopConnectPolling('Connection cancelled.', 'warning')
             })
             setStatus('Waiting for connection...', 'warning')
-            const secureWindow = window.open(SECURE_CONNECT_URL, '_blank')
-            if (!secureWindow) {
-                setStatus('Could not open the secure window. Please allow pop-ups or open https://pinokio.localhost/connect/<%=name%> manually.', 'error')
-            }
+            window.open(SECURE_CONNECT_URL, '_blank', 'browser')
             pollConnectStatus()
             connectPollTimer = setInterval(pollConnectStatus, CONNECT_POLL_INTERVAL)
             connectTimeoutHandle = setTimeout(() => {