iobroker.google-sharedlocations2 0.3.5 → 0.3.6

package/README.md

@@ -27,6 +27,10 @@ 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.6 (2026-04-25)
+* (Garfonso) somehow the old improve cookie call does not work anymore (since switch to fetch). Don't see why. -> So we just run the browser once a day.
+* (Garfonso) Login with browser no tries to clear cookies in browser, if normal login does not work.
+
 ### 0.3.5 (2026-04-22)
 * (Garfonso) resize logo.
 
@@ -39,35 +43,6 @@ Copyright and trademark of Google are property of Google.
 ### 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.
-
-### 0.3.0 (2026-02-09)
-* (Garfonso) do not update states if no new position is available.
-* (Garfonso) fixed: refresh via browser
-* (Garfonso) added: force refresh via browser by setting "forceRefresh" state to true
-* (Garfonso) changed: now store complete cookies array
-
-### 0.2.0 (2026-02-03)
-* (Garfonso) now using data directory to store chrome data
-* (Garfonso) try to use existing cookie in browser to refresh cookie without login.
-
-### 0.1.1 (2026-02-02)
-* (Garfonso) improved recovery from login errors
-
-### 0.1.0 (2026-02-02)
-* (Garfonso) added: support for places
-* (Garfonso) added: support for fences
-* (Garfonso) try to prevent login as much as possible.
-
-### 0.0.3 (2026-01-28)
-* (Garfonso) prevent login if no username and password is set
-* (Garfonso) fix tests
-
-### 0.0.2 (2026-01-28)
-* (Garfonso) store password encrypted
-
 ## License
 MIT License
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "google-sharedlocations2",
-    "version": "0.3.5",
+    "version": "0.3.6",
     "news": {
+      "0.3.6": {
+        "en": "somehow the old improve cookie call does not work anymore (since switch to fetch). Don't see why. -> So we just run the browser once a day.\nLogin with browser now tries to clear cookies in browser, if normal login does not work.",
+        "de": "irgendwie funktioniert der alte Cookie-Verbessern-Aufruf nicht mehr (seit Umschalten auf Fetch). Ich sehen nicht, warum. -> Also starten wir den Browser einmal am Tag.\nEinloggen mit Browser versucht jetzt, Cookies im Browser zu löschen, wenn normale Anmeldung nicht funktioniert.",
+        "ru": "как-то старый улучшенный вызов куки больше не работает (поскольку переключается на извлечение). Не понимаю почему. -> Поэтому мы просто запускаем браузер один раз в день.\nЛогин с браузером не пытается очистить файлы cookie в браузере, если обычный логин не работает.",
+        "pt": "de alguma forma o velho melhorar chamada de cookies não funciona mais (desde switch to fetch). Não vejo porquê. -> Então, nós apenas dirigimos o navegador uma vez por dia.\nLogin com o navegador não tenta limpar cookies no navegador, se o login normal não funcionar.",
+        "nl": "op de een of andere manier werkt de oude verbetering cookie call niet meer (sinds switch to fetch). Ik zie niet in waarom. -> Dus we doen de browser één keer per dag.\nInloggen met browser niet probeert te wissen cookies in de browser, als de normale login niet werkt.",
+        "fr": "d'une certaine façon, l'ancien appel à cookies d'amélioration ne fonctionne plus (depuis le commutateur pour récupérer). Je ne vois pas pourquoi. -> Donc, on fait fonctionner le navigateur une fois par jour.\nSe connecter avec le navigateur ne tente pas d'effacer les cookies dans le navigateur, si la connexion normale ne fonctionne pas.",
+        "it": "in qualche modo il vecchio migliorare la chiamata dei cookie non funziona più (dal momento che l'interruttore a prendere). Non capisco perche'. - > Quindi facciamo funzionare il browser una volta al giorno.\nAccedi con il browser non cerca di cancellare i cookie nel browser, se il normale login non funziona.",
+        "es": "de alguna manera la vieja mejora de la llamada de cookies ya no funciona (después de cambiar a buscar). No veo por qué. - No. Así que sólo corremos el navegador una vez al día.\nIniciar sesión con el navegador no intenta limpiar las cookies en el navegador, si el login normal no funciona.",
+        "pl": "jakoś stare ulepszenie cookies połączenia nie działa już (od przełącznika do pobierania). Nie widzę powodu. - > Więc po prostu sprawdzamy przeglądarkę raz dziennie.\nZaloguj się z przeglądarką bez próby wyczyszczenia plików cookie w przeglądarce, jeśli normalne logowanie nie działa.",
+        "uk": "якось старий поліпшення cookie-зв'язку не працює більше (з перемикачем на fetch). Не бачте, чому. до Так ми просто запускаємо браузер один раз на добу.\nВвійти з браузером не намагається очистити файли cookie в браузері, якщо звичайний логін не працює.",
+        "zh-cn": "不知何故,旧的改进饼干呼叫已不再可行(因为切换到接取). 无明故. - > 开口 所以我们只是每天运行浏览器一次.\n在浏览器中登录不尝试清除 cookie, 如果正常的登录无效 ."
+      },
       "0.3.5": {
         "en": "resize logo.",
         "de": "größe des logos angepasst.",
@@ -80,19 +93,6 @@
         "pl": "nie aktualizować stanów, jeśli nie jest dostępna nowa pozycja.\nstałe: odświeżenie przez przeglądarkę\ndodane: siła odświeżania przez przeglądarkę poprzez ustawienie stanu \"forceRefresh\" na true\nzmienione: teraz przechowywać pełną tablicę cookies",
         "uk": "не оновлювати стани, якщо немає нової позиції.\nвиправлено: оновлення через браузер\nдодано: сила освіження через браузер за допомогою налаштування \"forceRefresh\" стану true\nзмінено: тепер зберігає повний масив файлів cookie",
         "zh-cn": "如果没有新职位,则不更新状态.\n固定: 通过浏览器刷新\n添加: 通过浏览器将“ ForceRefresh” 状态设置为真以强制刷新\n更改: 现在存储完整的 cookie 阵列"
-      },
-      "0.2.0": {
-        "en": "now using data directory to store chrome data\ntry to use existing cookie in browser to refresh cookie without login.",
-        "de": "jetzt mit data directory, um chromdaten zu speichern\nversuchen, existierenden cookie im browser zu verwenden, um cookie ohne anmeldung zu aktualisieren.",
-        "ru": "теперь используя директор данных для хранения хромированных данных\nпопробуйте использовать существующий cookie в браузере, чтобы обновить cookie без входа в систему.",
-        "pt": "agora usando o diretor de dados para armazenar dados de cromo\ntentar usar cookie existente no navegador para atualizar cookie sem login.",
-        "nl": "nu met behulp van data director om chroom gegevens op te slaan\nprobeer bestaande cookie in de browser te gebruiken om cookie te vernieuwen zonder in te loggen.",
-        "fr": "maintenant en utilisant le directeur de données pour stocker des données chrome\nessayez d'utiliser le cookie existentint dans le navigateur pour rafraîchir le cookie sans vous connecter.",
-        "it": "ora utilizzando il data director per memorizzare i dati cromati\nprovare a utilizzare cookie esisteint nel browser per aggiornare i cookie senza effettuare il login.",
-        "es": "ahora utilizando el director de datos para almacenar datos de cromo\ntratar de utilizar la cookie existente en el navegador para refrescar la cookie sin login.",
-        "pl": "teraz za pomocą dyrektora danych do przechowywania danych chromowych\nspróbuj użyć plików cookie existint w przeglądarce, aby odświeżyć pliki cookie bez logowania.",
-        "uk": "тепер використовуючи каталог даних для зберігання хромованих даних\nспробуйте використовувати наявний cookie-файли в браузері, щоб оновити cookie без реєстрації.",
-        "zh-cn": "现在使用数据总监存储铬数据\n尝试在浏览器中使用存在 cookie来刷新 cookie而不登录."
       }
     },
     "titleLang": {
@@ -158,7 +158,7 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=7.6.17"
+        "admin": ">=7.6.20"
       }
     ],
     "osDependencies": {

package/package.json

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

package/src/lib/Cookie.ts

@@ -1,7 +1,7 @@
 import type { GoogleSharedlocations2 } from '../main';
 import puppeteer from 'puppeteer';
 import type { Browser, Page, CookieData, CookiePriority, CookieSameSite } from 'puppeteer';
-import { mkdir } from 'fs/promises';
+import { mkdir } from 'node:fs/promises';
 import type { RequestCredentials } from 'undici-types/fetch';
 
 /**
@@ -167,10 +167,10 @@ export class Cookie {
                 }
                 const cIndex = this.cookies.findIndex(c => c.name === name);
                 if (cIndex < 0) {
-                    this.log.debug(`Adding new cookie from header: ${cookie.name}=${cookie.value}`);
+                    this.log.debug(`Adding new cookie from header: ${cookie.name}`);
                     this.cookies.push(cookie); //add
                 } else {
-                    this.log.debug(`Updating cookie from header: ${cookie.name}=${cookie.value}`);
+                    this.log.debug(`Updating cookie from header: ${cookie.name}`);
                     this.cookies[cIndex] = cookie; //update
                 }
             }
@@ -194,7 +194,6 @@ export class Cookie {
      * Improve the current cookie by making a request to Google My Account page.
      */
     async improveCookie(): Promise<boolean> {
-        //see https://github.com/costastf/locationsharinglib/blob/master/locationsharinglib/locationsharinglib.py#L105
         const url = 'https://myaccount.google.com/?hl=en';
         const options = {
             credentials: 'same-origin' as RequestCredentials, //or do we need 'include' here?
@@ -205,10 +204,13 @@ export class Cookie {
         };
 
         try {
+            this.log.debug('Trying to improve cookie.');
             const response = await fetch(url, options);
 
             if (response.status !== 200) {
-                this.log?.error(`Failed improving cookie: ${response.status}`);
+                this.log?.error(`Failed improving cookie: ${response.status} - ${response.statusText}`);
+                console.log(response.headers);
+                console.log(await response.text());
                 return false;
             }
             await this.augmentCookieFromHeader(response.headers);
@@ -263,6 +265,7 @@ export class Cookie {
         }
 
         //send request with current cookies
+        //see https://github.com/costastf/locationsharinglib/blob/master/locationsharinglib/locationsharinglib.py#L105 for info on parameters
         this.log.debug('Sending request with current cookies');
         const url =
             'https://www.google.com/maps/rpc/locationsharing/read?authuser=2&hl=en&gl=us&pb=!1m7!8m6!1m3!1i14!2i8413!3i5385!2i6!3x4095!2m3!1e0!2sm!3i407105169!3m7!2sen!5e1105!12m4!1e68!2m2!1sset!2sRoadmap!4e1!5m4!1e4!8m2!1e0!1e1!6m9!1e12!2i2!26m1!4b1!30m1!1f1.3953487873077393!39b1!44e1!50e0!23i4111425';
@@ -459,59 +462,62 @@ export class Cookie {
                     this.log.info('Login successful with existing session, no need to fill in credentials.');
                     return true;
                 }
-                return false;
-            }
-
-            try {
-                logDebug('Trying to click on username, if user was logged in before.');
-                const userElement = await page.$(`[data-email="${this.username}"]`);
-                if (userElement) {
-                    await userElement.click();
-                } else {
-                    logDebug('No user element found, filling in username.');
+            } else {
+                try {
+                    logDebug('Trying to click on username, if user was logged in before.');
+                    const userElement = await page.$(`[data-email="${this.username}"]`);
+                    if (userElement) {
+                        await userElement.click();
+                    } else {
+                        logDebug('No user element found, filling in username.');
+                        await page.locator('#identifierId').fill(this.username);
+                    }
+                } catch (e: any) {
+                    logDebug(`Ok, no user it seems (${e}). Let's fill in useranme`);
+                    logDebug('filling in username.');
                     await page.locator('#identifierId').fill(this.username);
                 }
-            } catch (e: any) {
-                logDebug(`Ok, no user it seems (${e}). Let's fill in useranme`);
-                logDebug('filling in username.');
-                await page.locator('#identifierId').fill(this.username);
-            }
 
-            //is this enough, or do we need to search button in this div?
-            logDebug('clicking user next button.');
-            await page.locator('#identifierNext').click();
-            //waiting for #password fails in headles.. :-(
-            logDebug('waiting for network idle before filling password');
-            await page.waitForNetworkIdle({ idleTime: 2000 });
-
-            logDebug('filling in password.');
-            //do we need to  wait until page is loaded / rendered here?
-            await page.locator('input[type="password"]').fill(this.password);
-            logDebug('clicking password next button.');
-            await page.locator('#passwordNext').click();
-            //await page.waitForNetworkIdle({ idleTime: 2000 }); -> does never happen in headless.. :-/
-            logDebug(
-                'waiting for page to load after password, currently waiting fixed 3 seconds, because network never gets idle?',
-            );
-            await new Promise(resolve => setTimeout(resolve, 3000));
+                //is this enough, or do we need to search button in this div?
+                logDebug('clicking user next button.');
+                await page.locator('#identifierNext').click();
+                //waiting for #password fails in headles.. :-(
+                logDebug('waiting for network idle before filling password');
+                await page.waitForNetworkIdle({ idleTime: 2000 });
+
+                logDebug('filling in password.');
+                //do we need to  wait until page is loaded / rendered here?
+                await page.locator('input[type="password"]').fill(this.password);
+                logDebug('clicking password next button.');
+                await page.locator('#passwordNext').click();
+                //await page.waitForNetworkIdle({ idleTime: 2000 }); -> does never happen in headless.. :-/
+                logDebug(
+                    'waiting for page to load after password, currently waiting fixed 3 seconds, because network never gets idle?',
+                );
+                await new Promise(resolve => setTimeout(resolve, 3000));
 
-            logDebug('navigating to google maps to load right cookies.');
-            await page.goto('https://www.google.com/maps');
-            logDebug('getting cookies.');
-            await this.getCookiesFromPage(page);
-            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;
+                logDebug('navigating to google maps to load right cookies.');
+                await page.goto('https://www.google.com/maps');
+                logDebug('getting cookies.');
+                await this.getCookiesFromPage(page);
+                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
             await this.cleanUp();
         }
+        // ok, somehow everything failed -> see if we can retry:
+        if (!forceLogin && this.username && this.password) {
+            this.log.info('Retrying to login with user & password.');
+            return this.loginToGetNewCookies(true);
+        }
         return false;
     }
 

package/src/main.ts

@@ -23,6 +23,7 @@ export class GoogleSharedlocations2 extends utils.Adapter {
     _pollTimeout: ioBroker.Timeout | undefined;
     _pollInterval: number = 300;
     _successFullPolls: number = 1; // let us try a relogin at start, if cookie does not work.
+    _lastBrowserRefresh = 0;
     _users: Record<string, User> = {};
     fences: Fence[] = [];
     cookie: Cookie;
@@ -67,6 +68,7 @@ export class GoogleSharedlocations2 extends utils.Adapter {
         if (this._pollInterval > MAX_INT32) {
             this._pollInterval = MAX_INT32;
         }
+        this.log.info(`Working with pollInterval of ${this._pollInterval}s`);
 
         //read fences:
         for (const fenceConfig of this.config.fences || []) {
@@ -123,10 +125,12 @@ export class GoogleSharedlocations2 extends utils.Adapter {
                 this.log.debug('Polling positions with current cookies.');
                 const lastSuccessPolls = this._successFullPolls;
                 await this.sendRequest();
-                if (this._successFullPolls > 0 && lastSuccessPolls !== this._successFullPolls) {
-                    if (this._successFullPolls % 10 === 0) {
+                if (this._successFullPolls > 0 && lastSuccessPolls < this._successFullPolls) {
+                    if (Date.now() - this._lastBrowserRefresh > 24 * 60 * 60 * 1000) {
                         //try to get some more headers from google:
-                        await this.cookie.improveCookie();
+                        //await this.cookie.improveCookie(); -> somehow fails always..?? Don't understand, why.
+                        await this.cookie.refreshCookieWithBrowser();
+                        this._lastBrowserRefresh = Date.now();
                     }
                 }
             }