@homebridge-plugins/homebridge-tado 8.3.0-beta.4 → 8.3.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@homebridge-plugins/homebridge-tado",
-  "version": "8.3.0-beta.4",
+  "version": "8.3.0-beta.6",
   "description": "Homebridge plugin for controlling tado° devices.",
   "main": "index.js",
   "scripts": {

package/src/helper/handler.js

@@ -1,6 +1,6 @@
 import Logger from '../helper/logger.js';
 import moment from 'moment';
-import { writeFile } from 'fs/promises';
+import { writeFile, access, readFile } from 'fs/promises';
 import { join } from "path";
 
 var settingState = false;
@@ -10,6 +10,18 @@ let tasksInitialized = false;
 const timeout = (ms) => new Promise((res) => setTimeout(res, ms));
 const aRefreshHistoryHandlers = [];
 
+export async function getPersistedStates(storagePath) {
+  try {
+    const sFilePath = join(storagePath, "tado-states.json");
+    await access(sFilePath);
+    const sData = (await readFile(sFilePath, "utf-8"));
+    if (sData) return JSON.parse(sData);
+  } catch (error) {
+    //no states data => ignore
+    Logger.debug(`Failed to read tado states file: ${error.message || error}`);
+  }
+}
+
 export default (api, accessories, config, tado, telegram) => {
   const storagePath = api.user.storagePath();
 
@@ -705,26 +717,24 @@ export default (api, accessories, config, tado, telegram) => {
 
   async function persistStates(homeId, zoneStates) {
     try {
-      const data = {};
-      data.zoneStates = zoneStates ?? {};
-      await writeFile(join(storagePath, `tado-states-${homeId}.json`), JSON.stringify(data, null, 2), "utf-8");
+      const homeData = {};
+      homeData.zoneStates = zoneStates ?? {};
+      await writeFile(join(storagePath, `tado-states-${homeId}.json`), JSON.stringify(homeData, null, 2), "utf-8");
     } catch (error) {
-      Logger.error(`Error while updating tado states file for home id ${homeId}: ${error.message || error}`);
+      Logger.error(`Error while updating the tado states file for home id ${homeId}: ${error.message || error}`);
     }
     try {
       const data = {};
       data.counterData = await tado.getCounterData();
-      await writeFile(join(storagePath, "tado-counter.json"), JSON.stringify(data, null, 2), "utf-8");
+      await writeFile(join(storagePath, "tado-states.json"), JSON.stringify(data, null, 2), "utf-8");
     } catch (error) {
-      Logger.error(`Error while updating tado counter file: ${error.message || error}`);
+      Logger.error(`Error while updating the tado states file: ${error.message || error}`);
     }
     try {
-      if (aRefreshHistoryHandlers.length) {
-        //wait for fakegato services to be loaded
-        await new Promise(r => setTimeout(r, 4000));
-        for (const fnRefreshHistory of aRefreshHistoryHandlers) {
-          fnRefreshHistory();
-        }
+      //wait for fakegato services to be loaded
+      await new Promise(r => setTimeout(r, 4000));
+      for (const fnRefreshHistory of aRefreshHistoryHandlers) {
+        fnRefreshHistory();
       }
     } catch (error) {
       Logger.error(`Error while refreshing history: ${error.message || error}`);

package/src/tado/tado-api.js

@@ -1,7 +1,8 @@
 import Logger from '../helper/logger.js';
+import { getPersistedStates } from '../helper/handler.js';
 import got from 'got';
-import path from 'path';
-import fs, { access, readFile } from 'fs/promises';
+import { join } from 'path';
+import { access, readFile, writeFile } from 'fs/promises';
 
 const tado_url = "https://my.tado.com";
 const tado_auth_url = "https://login.tado.com/oauth2";
@@ -25,7 +26,7 @@ export default class Tado {
       return (hash >>> 0).toString(36).padStart(7, '0');
     };
     this.username = usesExternalTokenFile ? undefined : config.username;
-    this._tadoInternalTokenFilePath = usesExternalTokenFile ? undefined : path.join(this.storagePath, `.tado-token-${fnSimpleHash(config.username)}.json`);
+    this._tadoInternalTokenFilePath = usesExternalTokenFile ? undefined : join(this.storagePath, `.tado-token-${fnSimpleHash(config.username)}.json`);
     this._tadoApiClientId = tado_client_id;
     this._tadoTokenPromise = undefined;
     this._tadoAuthenticationCallback = undefined;
@@ -34,17 +35,9 @@ export default class Tado {
   }
 
   async _initCounter() {
-    let counterData;
-    try {
-      const sFilePath = path.join(this.storagePath, `tado-counter.json`);
-      await access(sFilePath);
-      const sData = (await readFile(sFilePath, "utf-8"));
-      counterData = JSON.parse(sData)?.counterData;
-    } catch (_err) {
-      //no counter data => ignore
-    }
-    this._counter = counterData?.counter ?? 0;
-    this._counterTimestamp = counterData?.counterTimestamp ?? new Date().toISOString();
+    const persistedCounterData = (await getPersistedStates(this.storagePath))?.counterData;
+    this._counter = persistedCounterData?.counter ?? 0;
+    this._counterTimestamp = persistedCounterData?.counterTimestamp ?? new Date().toISOString();
     this._checkCounterMidnightReset();
   }
 
@@ -106,7 +99,7 @@ export default class Tado {
   async _retrieveToken() {
     try {
       if (this._tadoBearerToken.refresh_token) return this._refreshToken(this._tadoBearerToken.refresh_token);
-      await fs.access(this._tadoInternalTokenFilePath);
+      await access(this._tadoInternalTokenFilePath);
       const refresh_token = await this._retrieveRefreshTokenFromInternalFile();
       return this._refreshToken(refresh_token);
 
@@ -119,7 +112,7 @@ export default class Tado {
     const maxRetries = 3;
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
-        const data = await fs.readFile(this._tadoInternalTokenFilePath, "utf8");
+        const data = await readFile(this._tadoInternalTokenFilePath, "utf8");
         const json = JSON.parse(data);
         if (json.refresh_token) return json.refresh_token;
       } catch (error) {
@@ -145,7 +138,7 @@ export default class Tado {
       await this._increaseCounter();
       const { access_token, refresh_token } = response.body;
       if (!access_token || !refresh_token) throw new Error("Empty access/refresh token.");
-      await fs.writeFile(this._tadoInternalTokenFilePath, JSON.stringify({ access_token, refresh_token }));
+      await writeFile(this._tadoInternalTokenFilePath, JSON.stringify({ access_token, refresh_token }));
       this._tadoBearerToken = { access_token, refresh_token, timestamp: Date.now() };
     } catch (error) {
       Logger.warn(`Error while refreshing token: ${error.message || error}`);
@@ -187,7 +180,7 @@ export default class Tado {
       if (tokenResponse?.body) {
         const { access_token, refresh_token } = tokenResponse.body;
         if (access_token && refresh_token) {
-          await fs.writeFile(this._tadoInternalTokenFilePath, JSON.stringify({ access_token, refresh_token }));
+          await writeFile(this._tadoInternalTokenFilePath, JSON.stringify({ access_token, refresh_token }));
           this._tadoBearerToken = { access_token, refresh_token, timestamp: Date.now() };
           Logger.info("Authentication successful!");
           return;
@@ -202,7 +195,7 @@ export default class Tado {
     const maxRetries = 3;
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
-        const data = await fs.readFile(this._tadoExternalTokenFilePath, 'utf8');
+        const data = await readFile(this._tadoExternalTokenFilePath, 'utf8');
         const json = JSON.parse(data);
         if (json.access_token) {
           this._tadoBearerToken = { access_token: json.access_token, refresh_token: undefined, timestamp: Date.now() };