iobroker.google-sharedlocations2 0.3.2 → 0.3.4

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.4 (2026-04-22)
+* (Garfonso) replaced axios dependency. Tried to make login more robust.
+
+### 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
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "google-sharedlocations2",
-    "version": "0.3.2",
+    "version": "0.3.4",
     "news": {
+      "0.3.4": {
+        "en": "replaced axios dependency. Tried to make login more robust.",
+        "de": "ersetzt axios Abhängigkeit. Versuchen Sie, die Anmeldung robuster zu machen.",
+        "ru": "замена аксиозависимости. Пытался сделать логин более надежным.",
+        "pt": "substituiu a dependência axios. Tentou tornar o login mais robusto.",
+        "nl": "axios afhankelijkheid vervangen. Probeerde om login robuuster te maken.",
+        "fr": "a remplacé la dépendance aux axios. J'ai essayé de rendre la connexion plus robuste.",
+        "it": "ha sostituito la dipendenza dagli assi. Ho cercato di rendere il login più robusto.",
+        "es": "sustituyó la dependencia de axios. Traté de hacer que el login sea más robusto.",
+        "pl": "zastąpił zależność aksjońską. Próbował uczynić logowanie bardziej solidnym.",
+        "uk": "замінена аксіос залежність. Виконується, щоб зробити логін більш надійним.",
+        "zh-cn": "取代对轴的依赖。 试图使登录更坚固."
+      },
+      "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",
@@ -67,32 +93,6 @@
         "pl": "poprawa odzyskiwania z błędów logowania",
         "uk": "поліпшення відновлення від помилок логіна",
         "zh-cn": "改进登录错误的恢复"
-      },
-      "0.1.0": {
-        "en": "added: support for places\nadded: support for fences\ntry to prevent login as much as possible.",
-        "de": "hinzugefügt: unterstützung für places\nhinzugefügt: unterstützung für fences\nversuche, die anmeldung so weit wie möglich zu verhindern.",
-        "ru": "добавлено: поддержка мест\nдобавлено: поддержка заборов\nстарайтесь максимально предотвратить вход.",
-        "pt": "adicionado: suporte para locais\nadicionado: suporte para cercas\ntentar evitar o login o máximo possível.",
-        "nl": "toegevoegd: ondersteuning voor plaatsen\ntoegevoegd: steun voor hekken\nproberen zo veel mogelijk inloggen te voorkomen.",
-        "fr": "ajouté: soutien aux places\najouté: soutien aux clôtures\nessayer d'éviter la connexion autant que possible.",
-        "it": "aggiunto: supporto per i luoghi\naggiunto: supporto per recinzioni\ncercare di impedire il login il più possibile.",
-        "es": "añadido: apoyo a los lugares\nañadido: soporte para vallas\ntratar de prevenir la entrada tanto como sea posible.",
-        "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固定测试"
       }
     },
     "titleLang": {
@@ -158,7 +158,7 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=7.0.23"
+        "admin": ">=7.6.17"
       }
     ],
     "osDependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.google-sharedlocations2",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Share your location with iobroker via google maps.",
   "author": {
     "name": "Garfonso",
@@ -26,21 +26,19 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
-    "axios": "^1.13.4",
-    "puppeteer": "^24.36.1"
+    "puppeteer": "^24.42.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^5.0.0",
-    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
-    "@alcalzone/release-script-plugin-license": "^4.0.0",
-    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
+    "@alcalzone/release-script": "^5.1.1",
+    "@alcalzone/release-script-plugin-iobroker": "^5.1.2",
+    "@alcalzone/release-script-plugin-license": "^5.1.1",
+    "@alcalzone/release-script-plugin-manual-review": "^5.1.1",
     "@iobroker/adapter-dev": "^1.5.0",
-    "@iobroker/dev-server": "^0.8.0",
     "@iobroker/eslint-config": "^2.2.0",
     "@iobroker/testing": "^5.2.2",
-    "@iobroker/types": "^7.1.0",
+    "@iobroker/types": "^7.1.1",
     "@tsconfig/node22": "^22.0.5",
-    "@types/node": "^22.19.7",
+    "@types/node": "^22.19.17 < 23",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.2",
     "typescript": "~5.9.3"

package/src/lib/Cookie.ts

@@ -1,8 +1,8 @@
-import axios from 'axios';
 import type { GoogleSharedlocations2 } from '../main';
 import puppeteer from 'puppeteer';
-import type { Browser, Page, CookieData } from 'puppeteer';
+import type { Browser, Page, CookieData, CookiePriority, CookieSameSite } from 'puppeteer';
 import { mkdir } from 'fs/promises';
+import type { RequestCredentials } from 'undici-types/fetch';
 
 /**
  * Helper class to manage Google cookies.
@@ -114,18 +114,24 @@ export class Cookie {
     /**
      * Augment the current cookie with data from the 'set-cookie' header.
      *
-     * @param headers - HTTP headers of axios response
+     * @param headersObj - HTTP headers of response
      */
-    async augmentCookieFromHeader(headers: Record<string, any>): Promise<void> {
-        if (headers['set-cookie'] && headers['set-cookie'].length) {
+    async augmentCookieFromHeader(headersObj: Headers): Promise<void> {
+        const headers = headersObj.getSetCookie();
+        if (headers.length > 0) {
             this.log?.debug('New header received.');
             const oldLength = this.cookies.length;
 
             //split old cookie and new cookie. Update single values.
-            for (const header of headers['set-cookie']) {
+            for (const header of headers) {
                 //console.log('Processing header cookie:', header);
                 const keyValues = header.split('; ');
-                const [name, value] = keyValues.shift().split('='); // first part is cookie, rest are attributes like path, secure etc.
+                const firstCookie = keyValues.shift();
+                if (firstCookie === undefined) {
+                    this.log.debug(`Invalid cookie header: ${header}`);
+                    continue;
+                }
+                const [name, value] = firstCookie.split('='); // first part is cookie, rest are attributes like path, secure etc.
                 const cookie = {
                     name: name.trim(),
                     value: value.trim(),
@@ -147,13 +153,13 @@ export class Cookie {
                             cookie.httpOnly = true;
                             break;
                         case 'samesite':
-                            cookie.sameSite = v ? v.trim() : 'Lax';
+                            cookie.sameSite = v ? (v.trim() as CookieSameSite) : 'Lax';
                             break;
                         case 'expires':
                             cookie.expires = new Date(v).getTime() / 1000; //puppeteer expects expires in seconds, not milliseconds
                             break;
                         case 'priority':
-                            cookie.priority = v ? v.trim() : 'Medium';
+                            cookie.priority = v ? (v.trim() as CookiePriority) : 'Medium';
                             break;
                         default:
                             this.log.debug(`Unknown cookie attribute: ${k}=${v}`);
@@ -189,8 +195,9 @@ export class Cookie {
      */
     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 = {
-            url: 'https://myaccount.google.com/?hl=en',
+            credentials: 'same-origin' as RequestCredentials, //or do we need 'include' here?
             headers: {
                 Cookie: this.cookies.map(c => `${c.name}=${c.value}`).join('; '),
             },
@@ -198,7 +205,7 @@ export class Cookie {
         };
 
         try {
-            const response = await axios(options);
+            const response = await fetch(url, options);
 
             if (response.status !== 200) {
                 this.log?.error(`Failed improving cookie: ${response.status}`);
@@ -257,30 +264,34 @@ export class Cookie {
 
         //send request with current cookies
         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';
         const options = {
             method: 'GET',
-            url: 'https://www.google.com/maps/rpc/locationsharing/read',
+            credentials: 'same-origin' as RequestCredentials, //or do we need 'include' here?
             headers: {
                 Cookie: this.cookies.map(c => `${c.name}=${c.value}`).join('; '),
             },
-            params: {
+            /*params: {
                 authuser: 2,
                 hl: 'en',
                 gl: 'us',
                 //pb is place on map. Is irrelevant, set to google head quarters here.
                 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',
-            },
+            },*/
         };
-
         try {
-            const response = await axios.request(options);
+            const response = await fetch(url, options);
             this.log.debug(`Request successful, response code: ${response.status}`);
-            const data = response.data.split('\n').slice(1).join('\n');
-            const locationData = JSON.parse(data);
-            const locations = locationData[0];
-            if (locations && locations.length > 0) {
-                await this.augmentCookieFromHeader(response.headers);
-                return locations;
+            if (response.ok) {
+                const dataBuffer = await response.text();
+                const data = dataBuffer.split('\n').slice(1).join('\n');
+                const locationData = JSON.parse(data);
+                const locations = locationData[0];
+                if (locations && locations.length > 0) {
+                    await this.augmentCookieFromHeader(response.headers);
+                    return locations;
+                }
             }
             this.log.info('No shared locations found in the response, probably not logged in.');
         } catch (e) {
@@ -314,6 +325,7 @@ 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(withCookies: boolean = false): Promise<boolean> {
@@ -376,21 +388,25 @@ export class Cookie {
 
     /**
      * 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 {
             // try to refresh cookie from browser session first:
-            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 (!forceLogin) {
+                let result = await this.refreshCookieWithBrowser();
                 if (result) {
-                    this.log.info('Cookie refresh with existing cookies successful, no need to login again.');
+                    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;
+                    }
                 }
             }
 
@@ -416,6 +432,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',
@@ -439,8 +462,21 @@ export class Cookie {
                 return false;
             }
 
-            logDebug('filling in username.');
-            await page.locator('#identifierId').fill(this.username);
+            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);
+            }
+
             //is this enough, or do we need to search button in this div?
             logDebug('clicking user next button.');
             await page.locator('#identifierNext').click();

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.',