homebridge-viessmann-vicare 2.0.5 → 2.0.7

package/dist/auth-manager.d.ts

@@ -113,8 +113,11 @@ export declare class AuthManager {
          this.log.warn('⚠️ Error opening browser:', error);
        }
      }
+   
+   
    **/
     private openBrowser;
+    private tryOpenBrowserDirect;
     private exchangeCodeForTokens;
     refreshAccessToken(): Promise<void>;
     private setTokens;

package/dist/auth-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-manager.d.ts","sourceRoot":"","sources":["../src/auth-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth-manager.d.ts","sourceRoot":"","sources":["../src/auth-manager.ts"],"names":[],"mappings":"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"}

package/dist/auth-manager.js

@@ -422,41 +422,56 @@ class AuthManager {
     async performFullAuth() {
         return new Promise((resolve, reject) => {
             const authUrl = this.buildAuthUrl();
-            this.log.info('='.repeat(80));
-            this.log.info('🔐 VIESSMANN OAUTH AUTHENTICATION');
-            this.log.info('='.repeat(80));
-            this.log.info('⚠️ CRITICAL: You have only 20 seconds after browser authorization!');
-            this.log.info('');
-            this.log.info('🔗 Please open this URL in your browser to authenticate:');
-            this.log.info('');
-            this.log.info(authUrl);
-            this.log.info('');
-            this.log.info('⏳ Waiting for authentication callback...');
-            const authTimeout = this.config.authTimeout || 300000;
-            this.log.info(`⏰ This process will timeout after ${authTimeout / 1000} seconds.`);
-            this.log.info('='.repeat(80));
+            const isSystemdService = !!(process.env.SYSTEMD_EXEC_PID || process.env.INVOCATION_ID);
+            if (isSystemdService) {
+                // Messaggio semplificato per servizi
+                this.log.info('='.repeat(80));
+                this.log.info('🔐 VIESSMANN AUTHENTICATION REQUIRED');
+                this.log.info('='.repeat(80));
+            }
+            else {
+                // Messaggio dettagliato per installazioni desktop
+                this.log.info('='.repeat(80));
+                this.log.info('🔐 VIESSMANN OAUTH AUTHENTICATION');
+                this.log.info('='.repeat(80));
+                this.log.info('⚠️ CRITICAL: You have only 20 seconds after browser authorization!');
+                this.log.info('');
+            }
             // Set timeout for authentication process
+            const authTimeout = this.config.authTimeout || 300000;
             this.authTimeout = setTimeout(() => {
                 this.stopAuthServer();
                 reject(new Error(`Authentication timeout - no response received within ${authTimeout / 1000} seconds`));
             }, authTimeout);
             // Start local server to capture callback
             this.startAuthServer((code, error) => {
-                if (this.authTimeout) {
-                    clearTimeout(this.authTimeout);
-                    this.authTimeout = undefined;
-                }
                 if (error) {
+                    if (this.authTimeout) {
+                        clearTimeout(this.authTimeout);
+                        this.authTimeout = undefined;
+                    }
                     reject(error);
                     return;
                 }
                 if (code) {
                     this.exchangeCodeForTokens(code)
-                        .then(() => resolve())
-                        .catch(reject);
+                        .then(() => {
+                        if (this.authTimeout) {
+                            clearTimeout(this.authTimeout);
+                            this.authTimeout = undefined;
+                        }
+                        resolve();
+                    })
+                        .catch((err) => {
+                        if (this.authTimeout) {
+                            clearTimeout(this.authTimeout);
+                            this.authTimeout = undefined;
+                        }
+                        reject(err);
+                    });
                 }
             });
-            // Auto-open browser if possible
+            // Try to open browser (will show URL if systemd service)
             this.openBrowser(authUrl);
         });
     }
@@ -472,10 +487,13 @@ class AuthManager {
         return `${this.authURL}/authorize?${params.toString()}`;
     }
     startAuthServer(callback) {
+        // Verifica se server è già attivo
+        if (this.authServer && this.authServer.listening) {
+            this.log.debug('🟢 Auth server already listening, reusing existing server');
+            return;
+        }
         this.authServer = http.createServer((req, res) => {
             const url = new URL(req.url, `http://localhost:${this.config.redirectPort || 4200}`);
-            this.log.warn(`🟢 Auth server listening on http://${this.hostIp}:${this.config.redirectPort || 4200}/`);
-            this.log.warn(`👉 If the browser does not open automatically, open this URL manually from another device:\nhttp://${this.hostIp}:${this.config.redirectPort || 4200}/login`);
             if (url.pathname === '/') {
                 const code = url.searchParams.get('code');
                 const error = url.searchParams.get('error');
@@ -483,42 +501,60 @@ class AuthManager {
                     const errorDescription = url.searchParams.get('error_description') || error;
                     res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
                     res.end(`
-            <html>
-              <head><title>Authentication Failed</title></head>
-              <body style="font-family: -apple-system, sans-serif; text-align: center; padding: 50px;">
-                <h1 style="color: #ff4757;">❌ Authentication Failed</h1>
-                <p>${errorDescription}</p>
-                <p>Please close this window and check your Homebridge logs.</p>
-              </body>
-            </html>
-          `);
+          <html>
+            <head><title>Authentication Failed</title></head>
+            <body style="font-family: -apple-system, sans-serif; text-align: center; padding: 50px;">
+              <h1 style="color: #ff4757;">❌ Authentication Failed</h1>
+              <p>${errorDescription}</p>
+              <p>Please close this window and check your Homebridge logs.</p>
+            </body>
+          </html>
+        `);
                     callback(undefined, new Error(`OAuth error: ${errorDescription}`));
-                    //this.stopAuthServer();
+                    // 🆕 Chiudi dopo un delay per far vedere la pagina
+                    setTimeout(() => this.stopAuthServer(), 3000);
                     return;
                 }
                 if (code) {
                     res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
                     res.end(`
-            <html>
-              <head><title>Authentication Successful</title></head>
-              <body style="font-family: -apple-system, sans-serif; text-align: center; padding: 50px;">
-                <h1 style="color: #2ed573;">✅ Authentication Successful!</h1>
-                <p>You can now close this window.</p>
-                <p>Homebridge will continue setup automatically.</p>
-              </body>
-            </html>
-          `);
+          <html>
+            <head><title>Authentication Successful</title></head>
+            <body style="font-family: -apple-system, sans-serif; text-align: center; padding: 50px;">
+              <h1 style="color: #2ed573;">✅ Authentication Successful!</h1>
+              <p>You can now close this window.</p>
+              <p>Homebridge will continue setup automatically.</p>
+            </body>
+          </html>
+        `);
                     callback(code);
-                    //this.stopAuthServer();
+                    // 🆕 Chiudi dopo un delay per far vedere la pagina
+                    setTimeout(() => this.stopAuthServer(), 3000);
                     return;
                 }
             }
-            // Handle other requests
+            // Handle other requests - root path senza parametri
+            if (url.pathname === '/') {
+                res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+                res.end(`
+        <html>
+          <head><title>Viessmann Authentication</title></head>
+          <body style="font-family: -apple-system, sans-serif; text-align: center; padding: 50px;">
+            <h1>🔐 Viessmann Authentication</h1>
+            <p>Waiting for authentication callback...</p>
+            <p>If you see this page, the authentication server is working correctly.</p>
+            <p style="color: #666; font-size: 14px;">Server: ${this.hostIp}:${this.config.redirectPort || 4200}</p>
+          </body>
+        </html>
+      `);
+                return;
+            }
+            // 404 per altre richieste
             res.writeHead(404, { 'Content-Type': 'text/plain' });
             res.end('Not found');
         });
-        this.authServer.listen(this.config.redirectPort || 4200, () => {
-            this.log.debug(`🌐 Auth server listening on ${this.hostIp}:${this.config.redirectPort || 4200}`);
+        this.authServer.listen(this.config.redirectPort || 4200, '0.0.0.0', () => {
+            this.log.info(`🟢 Auth server ready at: http://${this.hostIp}:${this.config.redirectPort || 4200}/`);
         });
         this.authServer.on('error', (error) => {
             this.log.error('❌ Auth server error:', error);
@@ -570,99 +606,58 @@ class AuthManager {
          this.log.warn('⚠️ Error opening browser:', error);
        }
      }
+   
+   
    **/
     openBrowser(url) {
-        const { execFile, exec } = require('child_process');
-        const tryExecFile = (cmd, args, env) => new Promise((resolve, reject) => {
-            execFile(cmd, args, { env }, (err) => err ? reject(err) : resolve());
-        });
-        const tryExec = (command, env) => new Promise((resolve, reject) => {
-            exec(command, { env }, (err) => err ? reject(err) : resolve());
-        });
-        // Copia pulita dell'ambiente
-        const env = { ...process.env };
-        // Migliora compatibilità Linux (X/Wayland) senza toccare il servizio
-        if (process.platform === 'linux') {
-            if (!env.DISPLAY) {
-                // fallback tipico X11
-                env.DISPLAY = ':0';
-            }
-            if (!env.XDG_RUNTIME_DIR && typeof process.getuid === 'function') {
-                env.XDG_RUNTIME_DIR = `/run/user/${process.getuid()}`;
-            }
+        // 🆕 Per servizi systemd: NON tentare di aprire automaticamente
+        // L'utente può aprire da qualsiasi dispositivo sulla rete
+        const isSystemdService = !!(process.env.SYSTEMD_EXEC_PID || process.env.INVOCATION_ID);
+        const isHomebridge = process.env.USER === 'homebridge';
+        // Se siamo in un servizio systemd o utente homebridge, non aprire automaticamente
+        if (isSystemdService || isHomebridge) {
+            this.log.info('='.repeat(80));
+            this.log.info('🔐 AUTHENTICATION REQUIRED');
+            this.log.info('='.repeat(80));
+            this.log.info('');
+            this.log.info('📱 Open this URL from ANY device on your network:');
+            this.log.info('');
+            this.log.info(`   ${url}`);
+            this.log.info('');
+            this.log.info('✅ You can open it from:');
+            this.log.info('   • Your computer/laptop');
+            this.log.info('   • Your smartphone/tablet');
+            this.log.info('   • This Raspberry Pi (if you have a browser)');
+            this.log.info('');
+            this.log.info(`🌐 Auth server is listening on: ${this.hostIp}:${this.config.redirectPort || 4200}`);
+            this.log.info('⏳ Waiting for authentication...');
+            this.log.info('='.repeat(80));
+            return;
         }
-        const tryLinux = async () => {
-            // 1) Standard freedesktop
-            try {
-                await tryExecFile('xdg-open', [url], env);
-                this.log.debug('🌐 xdg-open OK');
-                return;
-            }
-            catch { }
-            // 2) Gio / GVFS
-            try {
-                await tryExec(`gio open "${url}"`, env);
-                this.log.debug('🌐 gio open OK');
-                return;
-            }
-            catch { }
-            // 3) Debian-like helpers
-            try {
-                await tryExecFile('sensible-browser', [url], env);
-                this.log.debug('🌐 sensible-browser OK');
-                return;
-            }
-            catch { }
-            try {
-                await tryExecFile('x-www-browser', [url], env);
-                this.log.debug('🌐 x-www-browser OK');
-                return;
-            }
-            catch { }
-            // 4) xdg-desktop-portal (DBus OpenURI) — compatibile Wayland/X
-            try {
-                await tryExec(`gdbus call --session ` +
-                    `--dest org.freedesktop.portal.Desktop ` +
-                    `--object-path /org/freedesktop/portal/desktop ` +
-                    `--method org.freedesktop.portal.OpenURI.OpenURI "" "${url}" "{}"`, env);
-                this.log.debug('🌐 xdg-desktop-portal OpenURI OK');
-                return;
-            }
-            catch { }
-            // 5) backend specifici (best-effort, non bloccanti)
-            try {
-                await tryExecFile('kde-open5', [url], env);
-                this.log.debug('🌐 kde-open5 OK');
-                return;
-            }
-            catch { }
-            try {
-                await tryExecFile('gnome-open', [url], env);
-                this.log.debug('🌐 gnome-open OK');
-                return;
-            }
-            catch { }
-            // Nessun metodo disponibile/riuscito
-            throw new Error('No Linux opener succeeded');
-        };
-        (async () => {
-            try {
-                switch (process.platform) {
-                    case 'darwin':
-                        await tryExec(`open "${url}"`, env);
-                        break;
-                    case 'win32':
-                        await tryExec(`start "" "${url}"`, env);
-                        break;
-                    default:
-                        await tryLinux();
-                }
-                this.log.info('✅ Tentativo di apertura browser completato');
+        // Solo per installazioni non-systemd (es. macOS, sviluppo locale)
+        this.tryOpenBrowserDirect(url);
+    }
+    tryOpenBrowserDirect(url) {
+        const { exec } = require('child_process');
+        let command;
+        switch (process.platform) {
+            case 'darwin':
+                command = `open "${url}"`;
+                break;
+            case 'win32':
+                command = `start "" "${url}"`;
+                break;
+            default: // Linux desktop (non-systemd)
+                command = `xdg-open "${url}" 2>/dev/null || firefox "${url}" 2>/dev/null || chromium-browser "${url}" 2>/dev/null`;
+        }
+        exec(command, (error) => {
+            if (error) {
+                this.log.info('📱 Please open the authentication URL manually in your browser');
             }
-            catch (e) {
-                this.log.warn(`⚠️ Impossibile aprire automaticamente il browser (${e?.message || e}). Apri l’URL manualmente.`);
+            else {
+                this.log.info('🌐 Opening browser...');
             }
-        })();
+        });
     }
     async exchangeCodeForTokens(authCode) {
         const tokenData = new url_1.URLSearchParams({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-viessmann-vicare",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Complete Homebridge plugin for Viessmann ViCare heating systems with full control capabilities, advanced rate limiting protection, and intelligent cache management",
   "main": "dist/index.js",
   "scripts": {