iobroker.google-sharedlocations2 0.3.1 → 0.3.3

package/README.md

@@ -27,6 +27,12 @@ Copyright and trademark of Google are property of Google.
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 0.3.3 (2026-02-17)
+* (Garfonso) if deleting cookies, also delete cookies in Browser to force login with username & password.
+
+### 0.3.2 (2026-02-09)
+* (Garfonso) refresh with browser ignores cookies from adapter
+
 ### 0.3.1 (2026-02-09)
 * (Garfonso) improved logging during login.
 * (Garfonso) handle situation where browser logs in with his cookie, so we only need to read the cookie.

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "google-sharedlocations2",
-    "version": "0.3.1",
+    "version": "0.3.3",
     "news": {
+      "0.3.3": {
+        "en": "if deleting cookies, also delete cookies in Browser to force login with username & password.",
+        "de": "wenn Sie Cookies löschen, löschen Sie auch Cookies im Browser, um die Anmeldung mit Benutzername & Passwort zu zwingen.",
+        "ru": "при удалении файлов cookie также удаляйте файлы cookie в браузере, чтобы заставить войти в систему с именем пользователя и паролем.",
+        "pt": "se excluir cookies, também excluir cookies no Navegador para forçar login com nome de usuário e senha.",
+        "nl": "als u cookies verwijdert, verwijdert u ook cookies in de browser om inloggen met gebruikersnaam en wachtwoord te forceren.",
+        "fr": "si vous supprimez les cookies, supprimez également les cookies dans le navigateur pour forcer la connexion avec le nom d'utilisateur et le mot de passe.",
+        "it": "se la cancellazione dei cookie, anche eliminare i cookie in Browser per forzare il login con nome utente e password.",
+        "es": "si elimina las cookies, también eliminar las cookies en Browser para forzar el login con el nombre de usuario & contraseña.",
+        "pl": "jeśli usuniesz pliki cookie, usuń je również w przeglądarce, aby wymusić logowanie z nazwą użytkownika i hasłem.",
+        "uk": "якщо видаліть файли cookie, також видаліть файли cookie у браузері, щоб захистити логін з ім'ям користувача та паролем.",
+        "zh-cn": "如果删除 cookie, 也可以在浏览器中删除 cookie, 以强制用户名和密码登录 ."
+      },
+      "0.3.2": {
+        "en": "refresh with browser ignores cookies from adapter",
+        "de": "mit browser aktualisieren ignoriert cookies vom adapter",
+        "ru": "обновление с браузером игнорирует файлы cookie от адаптера",
+        "pt": "atualizar com o navegador ignora cookies do adaptador",
+        "nl": "vernieuwen met browser negeert cookies van adapter",
+        "fr": "rafraîchir avec le navigateur ignore les cookies de l'adaptateur",
+        "it": "aggiornare con il browser ignora i cookie dall'adattatore",
+        "es": "refresco con el navegador ignora las cookies del adaptador",
+        "pl": "odświeżenie z przeglądarką ignoruje pliki cookie z adaptera",
+        "uk": "оновлення з браузером ігнорує файли cookie з адаптера",
+        "zh-cn": "用浏览器刷新忽略适配器的 cookie"
+      },
       "0.3.1": {
         "en": "improved logging during login.\nhandle situation where browser logs in with his cookie, so we only need to read the cookie.",
         "de": "verbessertes logging während des logins.\nkorrektes bearbeiten der situation, in der sich browser mit seinem cookie einloggt, wir müssen nur das cookie lesen.",
@@ -67,32 +93,6 @@
         "pl": "dodane: wsparcie dla miejsc\ndodane: wsparcie dla ogrodzeń\nspróbuj zapobiec logowaniu jak najwięcej.",
         "uk": "додано: підтримка місць\nдоданий: підтримка парканів\nнамагатися попередити логін якомога простіше.",
         "zh-cn": "添加:对位置的支持\n添加:支持围栏\n尽量防止登录."
-      },
-      "0.0.3": {
-        "en": "prevent login if no username and password is set\nfix tests",
-        "de": "verhindern login, wenn kein benutzername und passwort eingestellt ist\ntests repariert",
-        "ru": "предотвратить вход в систему, если имя пользователя и пароль не установлены\nисправление",
-        "pt": "impedir o login se nenhum nome de usuário e senha estiver definido\ncorrigir os testes",
-        "nl": "login voorkomen als er geen gebruikersnaam en wachtwoord is ingesteld\nvastleggen van tests",
-        "fr": "empêcher le login si aucun nom d'utilisateur et mot de passe n'est défini\nessais de correction",
-        "it": "impedire il login se non viene impostato nessun nome utente e password\ntest di correzione",
-        "es": "previene el inicio de sesión si no se establece el nombre de usuario y la contraseña\npruebas de reparación",
-        "pl": "zapobiec logowaniu, jeśli nie jest ustawiona nazwa użytkownika i hasło\nbadania naprawcze",
-        "uk": "заборонити логін, якщо не встановлено ім’я користувача та пароль\nфіксувати тести",
-        "zh-cn": "如果没有设置用户名和密码, 请防止登录\n固定测试"
-      },
-      "0.0.2": {
-        "en": "store password encrypted",
-        "de": "speicher passwort verschlüsselt",
-        "ru": "зашифрованный пароль",
-        "pt": "guardar a senha encriptada",
-        "nl": "wachtwoord versleuteld opslaan",
-        "fr": "crypté du mot de passe de stockage",
-        "it": "negozio password crittografato",
-        "es": "almacenar contraseña cifrada",
-        "pl": "przechowywać zaszyfrowane hasło",
-        "uk": "зашифрований паролем",
-        "zh-cn": "存储加密密码"
       }
     },
     "titleLang": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.google-sharedlocations2",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Share your location with iobroker via google maps.",
   "author": {
     "name": "Garfonso",

package/src/lib/Cookie.ts

@@ -169,12 +169,15 @@ export class Cookie {
                 }
             }
 
+            // seems puppeteer sets expires to -1 if not present.
             this.cookies
-                .filter(c => c.expires && c.expires < Date.now() / 1000)
+                .filter(c => c.expires && c.expires > 0 && c.expires < Date.now() / 1000)
                 .forEach(c =>
-                    this.log.debug(`Cookie ${c.name} expired at ${new Date(c.expires! * 1000).toISOString()}`),
+                    this.log.debug(
+                        `Cookie ${c.name} expired at ${new Date(c.expires! * 1000).toISOString()} - ${c.expires}`,
+                    ),
                 );
-            this.cookies = this.cookies.filter(c => !c.expires || c.expires > Date.now() / 1000); //remove expired cookies
+            this.cookies = this.cookies.filter(c => !c.expires || c.expires < 0 || c.expires > Date.now() / 1000); //remove expired cookies
 
             this.log?.debug(`Cookie updated. Length: ${oldLength} -> ${this.cookies.length}`);
             return this.storeCookie();
@@ -311,9 +314,10 @@ export class Cookie {
     /**
      * Refresh the current cookie by using puppeteer to load Google Maps with existing cookie.
      *
+     * @param withCookies - if true, will try to set existing cookies in browser before loading page, default is false. This can help if cookies are still valid but not complete enough to work without browser session.
      * @returns true if refresh was successful
      */
-    async refreshCookieWithBrowser(): Promise<boolean> {
+    async refreshCookieWithBrowser(withCookies: boolean = false): Promise<boolean> {
         if (this.browser) {
             this.log.info('Seems we are already trying to log in. Aborting new login attempt.');
             return false;
@@ -323,50 +327,75 @@ export class Cookie {
         const page = await this.startBrowser();
         if (!page) {
             this.log.error('Could not start browser for cookie refresh.');
+            await this.cleanUp();
             return false;
         }
 
-        const cookieArray = [...this.cookies];
-        // somehow we stored wrong cookies... :-/ Try to clean up here.
-        while (cookieArray.length > 0) {
-            try {
-                //await page.setCookie(...cookieArray);
-                await this.browser!.setCookie(...cookieArray);
-                break;
-            } catch (e) {
-                this.log.error(`Error setting cookies in browser: ${(e as Error).message}, trying again...`);
-                const cookie = cookieArray.pop(); //remove last cookie and try again, maybe some cookies are not valid for puppeteer or something.
-                console.log('Removed cookie:', cookie);
+        if (withCookies) {
+            const cookieArray = [...this.cookies];
+            // somehow we stored wrong cookies... :-/ Try to clean up here.
+            while (cookieArray.length > 0) {
+                try {
+                    //await page.setCookie(...cookieArray);
+                    await this.browser!.setCookie(...cookieArray);
+                    break;
+                } catch (e) {
+                    this.log.error(`Error setting cookies in browser: ${(e as Error).message}, trying again...`);
+                    const cookie = cookieArray.pop(); //remove last cookie and try again, maybe some cookies are not valid for puppeteer or something.
+                    console.log('Removed cookie:', cookie);
+                }
             }
         }
 
         try {
-            await page.goto('https://www.google.com/maps', { waitUntil: 'networkidle2', timeout: 60000 });
+            this.log.debug('Loading Google login page to refresh cookie.');
+            await page.goto(
+                'https://accounts.google.com/ServiceLogin?hl=de&continue=https://www.google.com/maps&gae=cb-eomtm',
+                { waitUntil: 'networkidle2', timeout: 60000 },
+            );
+            this.log.debug(
+                'Waiting for page to load, currently waiting fixed 5 seconds, because network never gets idle for maps',
+            );
             await new Promise(r => setTimeout(r, 5000));
-
-            await this.sendRequest();
-            await this.getCookiesFromPage(page);
-            return true;
+            if (!page.url().includes('accounts.google.com')) {
+                this.log.debug('Browser logged in, refreshing cookie.');
+                await this.getCookiesFromPage(page);
+                const results = await this.sendRequest();
+                if (results && results.length > 0) {
+                    await this.cleanUp();
+                    return true;
+                }
+            }
         } catch (e) {
             this.log.error(
                 `Error during cookie refresh: ${(e as Error).message}, ${e instanceof Error ? e.stack : ''}`,
             );
-            return false;
         }
+        await this.cleanUp();
+        return false;
     }
 
     /**
      * Login to Google using puppeteer to get new cookies.
+     *
+     * @param forceLogin - if true, will try to login even if current cookie seems valid, default is false
      */
-    async loginToGetNewCookies(): Promise<boolean> {
+    async loginToGetNewCookies(forceLogin: boolean = false): Promise<boolean> {
         let currentStep;
         try {
-            if (this.isValid()) {
-                this.log.info('Current cookie seems valid, trying refresh.');
-                await this.refreshCookieWithBrowser();
-                if (this.isValid()) {
+            // try to refresh cookie from browser session first:
+            if (!forceLogin) {
+                let result = await this.refreshCookieWithBrowser();
+                if (result) {
                     this.log.info('Cookie refresh successful, no need to login again.');
                     return true;
+                } else if (this.isValid()) {
+                    this.log.info('Current cookie seems valid, trying refresh.');
+                    result = await this.refreshCookieWithBrowser(true);
+                    if (result) {
+                        this.log.info('Cookie refresh with existing cookies successful, no need to login again.');
+                        return true;
+                    }
                 }
             }
 
@@ -384,6 +413,7 @@ export class Cookie {
             const page = await this.startBrowser();
             if (!page) {
                 this.log.error('Could not start browser for login.');
+                await this.cleanUp();
                 return false;
             }
 
@@ -391,6 +421,13 @@ export class Cookie {
                 currentStep = msg;
                 this.log.debug(msg);
             };
+
+            if (forceLogin) {
+                logDebug('Force login enabled, clearing cookies and local storage.');
+                const cookies = await this.browser!.cookies();
+                await this.browser!.deleteCookie(...cookies);
+            }
+
             logDebug('going to google login page.');
             await page.goto(
                 'https://accounts.google.com/ServiceLogin?hl=de&continue=https://www.google.com/maps&gae=cb-eomtm',
@@ -405,7 +442,13 @@ export class Cookie {
             if (!page.url().includes('accounts.google.com')) {
                 logDebug('Already logged in, refreshing cookie.');
                 await this.getCookiesFromPage(page);
-                return true;
+                await this.cleanUp();
+                const results = await this.sendRequest();
+                if (results && results.length > 0) {
+                    this.log.info('Login successful with existing session, no need to fill in credentials.');
+                    return true;
+                }
+                return false;
             }
 
             logDebug('filling in username.');
@@ -432,19 +475,18 @@ export class Cookie {
             await page.goto('https://www.google.com/maps');
             logDebug('getting cookies.');
             await this.getCookiesFromPage(page);
-            return true;
+            await this.cleanUp();
+            const results = await this.sendRequest();
+            if (results && results.length > 0) {
+                this.log.info('Login successful with existing session, no need to fill in credentials.');
+                return true;
+            }
+            return false;
         } catch (e) {
             this.log.error(`Error in puppeteer: ${(e as Error).message}`);
             this.log.error(`The step puppeteer failed was: ${currentStep}`);
             // try to close browser if open
-            if (this.browser) {
-                try {
-                    await this.browser.close();
-                } catch {
-                    /* ignore */
-                }
-            }
-            this.browser = null;
+            await this.cleanUp();
         }
         return false;
     }
@@ -453,9 +495,13 @@ export class Cookie {
      * Clean up on unload.
      */
     async cleanUp(): Promise<void> {
-        if (this.browser) {
-            await this.browser.close();
-            this.browser = null;
+        try {
+            if (this.browser) {
+                await this.browser.close();
+                this.browser = null;
+            }
+        } catch (e) {
+            this.log.error(`Error closing browser: ${(e as Error).message} - ${e instanceof Error ? e.stack : ''}`);
         }
     }
 

package/src/main.ts

@@ -141,6 +141,9 @@ export class GoogleSharedlocations2 extends utils.Adapter {
             await this.setState('info.connection', false, true);
             if (this._successFullPolls > 0) {
                 //try to get new cookie:
+                this.log.debug(
+                    `Polling failed, trying to obtain new cookies, because got ${this._successFullPolls} valid results before.`,
+                );
                 this._successFullPolls = 0;
                 await this.cookie.loginToGetNewCookies();
             }
@@ -365,7 +368,7 @@ export class GoogleSharedlocations2 extends utils.Adapter {
                 this.log.info('Current cookies state was cleared, trying to obtain new cookies.');
                 this._successFullPolls = 0;
                 this.cookie.readCookieFromString(''); //clear old cookie
-                await this.cookie.loginToGetNewCookies();
+                await this.cookie.loginToGetNewCookies(true);
             } else {
                 this.log.info(
                     'Current cookies state was changed from outside the adapter, updating internal cookie store.',