iobroker.google-sharedlocations2 0.1.0 → 0.2.0

package/README.md

@@ -27,6 +27,13 @@ Copyright and trademark of Google are property of Google.
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 0.2.0 (2026-02-03)
+* (Garfonso) now using data director to store chrome data
+* (Garfonso) try to use existint 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

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "google-sharedlocations2",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "news": {
+      "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而不登录."
+      },
+      "0.1.1": {
+        "en": "improved recovery from login errors",
+        "de": "verbesserte wiederherstellung von login-fehlern",
+        "ru": "улучшенное восстановление после ошибок входа",
+        "pt": "recuperação melhorada de erros de login",
+        "nl": "verbeterd herstel van login fouten",
+        "fr": "amélioration de la récupération des erreurs de connexion",
+        "it": "miglioramento del recupero da errori di login",
+        "es": "mejor recuperación de errores de inicio de sesión",
+        "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.",

package/package.json

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

package/src/lib/Cookie.ts

@@ -1,7 +1,8 @@
 import axios from 'axios';
 import type { GoogleSharedlocations2 } from '../main';
 import puppeteer from 'puppeteer';
-import type { Browser } from 'puppeteer';
+import type { Browser, Page } from 'puppeteer';
+import { mkdir } from 'fs/promises';
 
 /**
  * Helper class to manage Google cookies.
@@ -13,18 +14,21 @@ export class Cookie {
     adapter: GoogleSharedlocations2;
     log;
     private browser: Browser | null = null;
+    dataDir: string;
 
     /**
      * Construct cookie helper
      *
      * @param adapter - adapter instance
+     * @param dataDir - data directory of the instance to store browser data to.
      */
-    constructor(adapter: GoogleSharedlocations2) {
+    constructor(adapter: GoogleSharedlocations2, dataDir: string) {
         this.currentCookie = '';
         this.username = '';
         this.password = '';
         this.adapter = adapter;
         this.log = adapter.log;
+        this.dataDir = dataDir;
     }
 
     /**
@@ -33,7 +37,10 @@ export class Cookie {
     async init(): Promise<void> {
         this.username = this.adapter.config.googleUsername;
         this.password = this.adapter.config.googlePassword;
+        this.log = this.adapter.log; // does not exist during construction...
         try {
+            //ensure data dir exists
+            await mkdir(this.dataDir, { recursive: true }); //recursive true should prevent error if already exists.
             const state = await this.adapter.getStateAsync('info.currentCookies');
             if (state && state.val && typeof state.val === 'string') {
                 this.currentCookie = state.val;
@@ -93,7 +100,7 @@ export class Cookie {
     /**
      * Improve the current cookie by making a request to Google My Account page.
      */
-    async improveCookie(): Promise<void> {
+    async improveCookie(): Promise<boolean> {
         //see https://github.com/costastf/locationsharinglib/blob/master/locationsharinglib/locationsharinglib.py#L105
         const options = {
             url: 'https://myaccount.google.com/?hl=en',
@@ -108,12 +115,158 @@ export class Cookie {
 
             if (response.status !== 200) {
                 this.log?.error(`Failed improving cookie: ${response.status}`);
-            } else {
-                await this.augmentCookieFromHeader(response.headers);
+                return false;
             }
+            await this.augmentCookieFromHeader(response.headers);
+            return true;
         } catch (err: any) {
             this.log?.error(err);
             this.log?.info('Connection to google maps failure.');
+            return false;
+        }
+    }
+
+    /**
+     * Start a puppeteer browser instance and return a new page. Sets up user agent and hides automation flag.
+     *
+     * @returns puppeteer page or undefined if browser could not be started
+     */
+    private async startBrowser(): Promise<Page | undefined> {
+        if (this.browser) {
+            this.log.info('Seems we are already trying to log in. Aborting new login attempt.');
+            return;
+        }
+        this.log.debug('Starting browser.');
+        this.browser = await puppeteer.launch({
+            headless: true,
+            args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-blink-features=AutomationControlled'],
+            ignoreDefaultArgs: ['--enable-automation'], //h// ide automation flag, did not help.
+            userDataDir: this.dataDir,
+        });
+        this.log.debug('browser started, opening new page.');
+        const page = await this.browser.newPage();
+        //hide puppeteer automation flag
+        await page.evaluateOnNewDocument(() => {
+            Object.defineProperty(navigator, 'webdriver', { get: () => false });
+        });
+        await page.setUserAgent({
+            userAgent:
+                'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+        });
+
+        return page;
+    }
+
+    /**
+     * Request location Data from Google Maps
+     *
+     * @returns Array of location data or undefined if request failed
+     */
+    async sendRequest(): Promise<Array<any> | undefined> {
+        if (!this.isValid()) {
+            this.log.error('Cannot send request, no cookies available!');
+            return;
+        }
+
+        //send request with current cookies
+        this.log.debug('Sending request with current cookies');
+        const options = {
+            method: 'GET',
+            url: 'https://www.google.com/maps/rpc/locationsharing/read',
+            headers: {
+                Cookie: this.currentCookie,
+            },
+            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);
+            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) {
+                return locations;
+            }
+            this.log.info('No shared locations found in the response, probably not logged in.');
+        } catch (e) {
+            this.log.error(`Error during request: ${(e as Error).message}`);
+        }
+    }
+
+    /**
+     * Get cookies from the given page and store them. Also closes Browser.
+     *
+     * @param page - puppeteer page
+     */
+    private async getCookiesFromPage(page: Page): Promise<void> {
+        //using deprecated function, but browser.cookies just does not work...???
+        const cookies = await page.cookies();
+
+        this.currentCookie = cookies
+            .filter(c => c.domain.includes('google'))
+            .map(c => `${c.name}=${c.value}`)
+            .join('; ');
+        await this.browser!.close();
+        if (this.currentCookie.length < 50) {
+            this.log.warn('Cookie string seems too short, login probably failed!');
+        } else {
+            this.log.info('Obtained new cookies from Google login.');
+            await this.storeCookie();
+        }
+        this.browser = null;
+    }
+
+    /**
+     * Refresh the current cookie by using puppeteer to load Google Maps with existing cookie.
+     *
+     * @returns true if refresh was successful
+     */
+    private async refreshCookie(): Promise<boolean> {
+        if (this.browser) {
+            this.log.info('Seems we are already trying to log in. Aborting new login attempt.');
+            return false;
+        }
+
+        const page = await this.startBrowser();
+        if (!page) {
+            this.log.error('Could not start browser for cookie refresh.');
+            return false;
+        }
+
+        const cookieArray = this.currentCookie
+            .split(';')
+            .map(pair => {
+                const parts = pair.trim().split('=');
+                return parts.length >= 2
+                    ? {
+                          name: parts[0].trim(),
+                          value: parts.slice(1).join('=').trim(),
+                          domain: '.google.com',
+                          path: '/',
+                          secure: true,
+                      }
+                    : null;
+            })
+            .filter(c => c !== null);
+        await page.setCookie(...cookieArray);
+
+        await page.goto('https://www.google.com/maps', { waitUntil: 'networkidle2', timeout: 60000 });
+        await new Promise(r => setTimeout(r, 5000));
+
+        try {
+            await this.sendRequest();
+            await this.getCookiesFromPage(page);
+            return true;
+        } catch (e) {
+            this.log.error(`Error during cookie refresh: ${(e as Error).message}`);
+            return false;
         }
     }
 
@@ -122,6 +275,15 @@ export class Cookie {
      */
     async loginToGetNewCookies(): Promise<boolean> {
         try {
+            if (this.currentCookie && this.currentCookie.length >= 50) {
+                this.log.info('Current cookie seems valid, trying refresh.');
+                await this.refreshCookie();
+                if (this.currentCookie && this.currentCookie.length >= 50) {
+                    this.log.info('Cookie refresh successful, no need to login again.');
+                    return true;
+                }
+            }
+
             if (this.browser) {
                 this.log.info('Seems we are already trying to log in. Aborting new login attempt.');
                 return false;
@@ -133,23 +295,11 @@ export class Cookie {
 
             this.log.info('Trying to login to Google to get new cookies.');
             //testing puppeteer:
-            this.log.debug('Starting browser.');
-            this.browser = await puppeteer.launch({
-                headless: true,
-                args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-blink-features=AutomationControlled'],
-                ignoreDefaultArgs: ['--enable-automation'], //hide automation flag, did not help.
-            });
-            this.log.debug('browser started, opening new page.');
-            const page = await this.browser.newPage();
-
-            //hide puppeteer automation flag
-            await page.evaluateOnNewDocument(() => {
-                Object.defineProperty(navigator, 'webdriver', { get: () => false });
-            });
-            await page.setUserAgent({
-                userAgent:
-                    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-            });
+            const page = await this.startBrowser();
+            if (!page) {
+                this.log.error('Could not start browser for login.');
+                return false;
+            }
 
             this.log.debug('going to google login page.');
             await page.goto(
@@ -177,26 +327,19 @@ export class Cookie {
 
             await page.goto('https://www.google.com/maps');
             this.log.debug('getting cookies.');
-            //using deprecated function, but browser.cookies just does not work...???
-            const cookies = await page.cookies();
-
-            this.currentCookie = cookies
-                .filter(c => c.domain.includes('google'))
-                .map(c => `${c.name}=${c.value}`)
-                .join('; ');
-            //this.log.debug(this._cookies);
-            //console.log(this._cookies);
-            await this.browser.close();
-            if (this.currentCookie.length < 50) {
-                this.log.warn('Cookie string seems too short, login probably failed!');
-            } else {
-                this.log.info('Obtained new cookies from Google login.');
-                await this.storeCookie();
-            }
-            this.browser = null;
+            await this.getCookiesFromPage(page);
             return true;
         } catch (e) {
             this.log.error(`Error in puppeteer: ${(e as Error).message}`);
+            // try to close browser if open
+            if (this.browser) {
+                try {
+                    await this.browser.close();
+                } catch {
+                    /* ignore */
+                }
+            }
+            this.browser = null;
         }
         return false;
     }

package/src/main.ts

@@ -9,7 +9,6 @@ import * as utils from '@iobroker/adapter-core';
 import { User } from './lib/User';
 import { Fence } from './lib/Fence';
 import { Cookie } from './lib/Cookie';
-import axios from 'axios';
 
 //used to test timeout against
 const MAX_INT32 = 2 ** 31 - 1; // 2147483647 (hex 0x7FFFFFFF)
@@ -43,7 +42,7 @@ export class GoogleSharedlocations2 extends utils.Adapter {
         // this.on('objectChange', this.onObjectChange.bind(this));
         this.on('message', this.onMessage.bind(this));
         this.on('unload', this.onUnload.bind(this));
-        this.cookie = new Cookie(this);
+        this.cookie = new Cookie(this, utils.getAbsoluteInstanceDataDir(this));
     }
 
     /**
@@ -137,62 +136,26 @@ export class GoogleSharedlocations2 extends utils.Adapter {
     }
 
     private async sendRequest(): Promise<void> {
-        if (!this.cookie.isValid()) {
-            this.log.error('Cannot send request, no cookies available!');
+        const results = await this.cookie.sendRequest();
+        if (!results) {
             await this.setState('info.connection', false, true);
-            return;
-        }
-
-        //send request with current cookies
-        this.log.debug('Sending request with current cookies');
-        const options = {
-            method: 'GET',
-            url: 'https://www.google.com/maps/rpc/locationsharing/read',
-            headers: {
-                Cookie: this.cookie.currentCookie,
-            },
-            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);
-            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) {
-                this._successFullPolls += 1;
-                await this.setState('info.connection', true, true);
-                for (const location of locations) {
-                    const user = new User(location);
-                    if (user.id) {
-                        this._users[user.id] = user;
-                        await this.fillIntoObjects(user);
-                        await this.notifyPlaces(user);
-                        await this.checkFences(user);
-                    }
-                }
-            } else {
-                this.log.info('No shared locations found in the response, probably not logged in.');
-                if (this._successFullPolls > 0) {
-                    //try to get new cookie:
-                    this._successFullPolls = 0;
-                    await this.cookie.loginToGetNewCookies();
-                }
-            }
-        } catch (e) {
-            this.log.error(`Error during request: ${(e as Error).message}`);
             if (this._successFullPolls > 0) {
                 //try to get new cookie:
                 this._successFullPolls = 0;
                 await this.cookie.loginToGetNewCookies();
             }
+        } else {
+            this._successFullPolls += 1;
+            await this.setState('info.connection', true, true);
+            for (const location of results) {
+                const user = new User(location);
+                if (user.id) {
+                    this._users[user.id] = user;
+                    await this.fillIntoObjects(user);
+                    await this.notifyPlaces(user);
+                    await this.checkFences(user);
+                }
+            }
         }
     }
 
@@ -396,16 +359,17 @@ export class GoogleSharedlocations2 extends utils.Adapter {
             if (state.val === '') {
                 this.log.info('Current cookies state was cleared, trying to obtain new cookies.');
                 this._successFullPolls = 0;
+                this.cookie.currentCookie = '';
                 await this.cookie.loginToGetNewCookies();
-                if (this.cookie.isValid()) {
-                    await this.sendRequest();
-                }
             } else {
                 this.log.info(
                     'Current cookies state was changed from outside the adapter, updating internal cookie store.',
                 );
                 this.cookie.currentCookie = state.val as string;
             }
+            if (this.cookie.isValid()) {
+                await this.sendRequest();
+            }
         }
     }