pinokiod 7.1.65 → 7.1.66

package/package.json

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

package/server/views/connect/index.ejs

@@ -558,8 +558,10 @@
         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';
@@ -591,6 +593,21 @@
                 .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 {
@@ -624,7 +641,22 @@
                     startSecureConnectPolling();
                     setStatus(`Continue the ${name} login in your browser.`, 'warning');
                     try {
-                        window.open(authUrl, '_blank', 'browser');
+                        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);
                     } catch (openError) {
                         stopSecureConnectPolling(`Could not open the browser automatically. Please open ${authUrl} manually.`, 'error');
                         return;
@@ -652,6 +684,10 @@
                 clearTimeout(secureConnectTimeoutHandle);
                 secureConnectTimeoutHandle = null;
             }
+            if (secureConnectBrowserRetryHandle) {
+                clearTimeout(secureConnectBrowserRetryHandle);
+                secureConnectBrowserRetryHandle = null;
+            }
             if (message) {
                 hideLoader();
                 setStatus(message, type);