Merge branch 'latest' of https://github.com/Surfysamy/homebridge-otodo-vav into latest

Author: Surfysamy

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-otodo-vav",
-  "version": "1.3.4",
+  "version": "1.4.1",
   "description": "Homebridge plugin for Otodo VAV thermostats",
   "keywords": [
     "homebridge-plugin",

package.json

@@ -1,3 +1,4 @@
+// platform.ts
 import type {
   API,
   DynamicPlatformPlugin,
@@ -18,15 +19,19 @@ import { ThermostatClient } from './thermostatClient';
 import type { ThermostatService, Room, Hub, DeviceCapability } from './types';
 import { ThermostatAccessory } from './thermostatAccessory';
 import { OtodoModeSliderAccessory } from './otodoModeSliderAccessory';
-import { OtodoTempSensorAccessory } from './otodoTempAccessory';
 
 export class OtodoVavPlatform implements DynamicPlatformPlugin {
   public readonly accessories: PlatformAccessory[] = [];
 
   private auth!: AuthClient;
   private client!: OtodoClient;
   private tClient!: ThermostatClient;
-  private tempSensors: Map<number, OtodoTempSensorAccessory> = new Map();
+
+  /**
+   * 🔥 NOUVEAU :
+   * deviceId → ThermostatAccessory
+   */
+  private thermostatByDeviceId: Map<number, ThermostatAccessory> = new Map();
 
   private roomsById: Map<string, Room> = new Map();
   private hubsById: Map<string, Hub> = new Map();
@@ -270,8 +275,6 @@ export class OtodoVavPlatform implements DynamicPlatformPlugin {
 
     this.log.debug('📦 Création du TokenStore...');
     const store = new TokenStore(this.api.user.storagePath());
-
-    this.log.debug("🔐 Initialisation de l'authentification...");
     this.auth = new AuthClient(this.log, store, {
       email: String(cfg.email || '').trim(),
       password: String(cfg.password || ''),
@@ -329,118 +332,88 @@ export class OtodoVavPlatform implements DynamicPlatformPlugin {
 
   private async loadRooms(): Promise<void> {
     try {
-      this.log.debug('📂 Récupération des rooms...');
       const rooms = await this.tClient.getRooms();
       this.roomsById = new Map(rooms.map(r => [r._id, r]));
-      this.log.debug(`📂 ${rooms.length} rooms chargées`);
     } catch (e) {
-      this.log.warn(
-        '⚠️ Impossible de récupérer les rooms (optionnel) : ' + String(e),
-      );
+      this.log.warn('⚠️ Impossible de récupérer les rooms : ' + String(e));
     }
   }
 
   private async loadHubs(): Promise<void> {
     try {
-      this.log.debug('📂 Récupération des hubs...');
       const hubs = await this.tClient.getHubs();
       this.hubsById = new Map(hubs.map(r => [r._id, r]));
-      this.log.debug(`📂 ${hubs.length} hubs chargés`);
     } catch (e) {
       this.log.warn('⚠️ Impossible de récupérer les hubs : ' + String(e));
     }
   }
 
   configureAccessory(accessory: PlatformAccessory): void {
-    this.log.debug("🔄 Restauration de l'accessoire:", accessory.displayName);
     this.accessories.push(accessory);
   }
 
+  /**
+   * 🔥 THERMOSTAT UNIQUEMENT
+   * ET enregistrement deviceId → ThermostatAccessory
+   */
   private upsertThermostat(t: ThermostatService): void {
-    const uuidThermo = this.api.hap.uuid.generate(`thermo:${t.hubId}:${t._id}`);
+    const uuid = this.api.hap.uuid.generate(`thermo:${t.hubId}:${t._id}`);
     const uuidSlider = this.api.hap.uuid.generate(`slider:${t.hubId}:${t._id}`);
-    const uuidTemp = this.api.hap.uuid.generate(`temp:${t.hubId}:${t._id}`);
 
     const roomName = this.roomsById.get(t.roomId)?.name;
     const thermoName = roomName
       ? `Thermostat ${roomName}`
       : `Thermostat ${t._id}`;
     const sliderName = roomName ? `Mode ${roomName}` : `Mode ${t._id}`;
 
-    // ========== THERMOSTAT ACCESSORY ==========
-    const existingThermo = this.accessories.find(a => a.UUID === uuidThermo);
-    if (existingThermo) {
-      new ThermostatAccessory(this, existingThermo, t, this.tClient);
+    // --- THERMOSTAT ---
+    let acc = this.accessories.find(a => a.UUID === uuid);
+
+    if (acc) {
+      this.log.info(`♻️ Restauration thermostat: ${thermoName}`);
     } else {
-      const acc = new this.api.platformAccessory(thermoName, uuidThermo);
-      new ThermostatAccessory(this, acc, t, this.tClient);
+      acc = new this.api.platformAccessory(thermoName, uuid);
       this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [acc]);
       this.accessories.push(acc);
     }
 
-    // ========== MODE SLIDER ACCESSORY ==========
-    const existingSlider = this.accessories.find(a => a.UUID === uuidSlider);
+    const thermoCtrl = new ThermostatAccessory(this, acc, t, this.tClient);
 
-    if (this.displayModeSliders) {
-      // Création / restauration
-      if (existingSlider) {
-        this.log.info(`♻️ Restauration du mode slider: ${sliderName}`);
-        new OtodoModeSliderAccessory(this, existingSlider, t, this.tClient);
-      } else {
-        this.log.info(`➕ Ajout du mode slider: ${sliderName}`);
-        const acc = new this.api.platformAccessory(sliderName, uuidSlider);
-        new OtodoModeSliderAccessory(this, acc, t, this.tClient);
-        this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [acc]);
-        this.accessories.push(acc);
-      }
-    } else {
-      // 🔥 SUPPRESSION AUTOMATIQUE SI désactivé
-      if (existingSlider) {
-        this.log.info(`🗑️ Suppression du mode slider désactivé: ${sliderName}`);
-        this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [
-          existingSlider,
-        ]);
-        this.accessories.splice(this.accessories.indexOf(existingSlider), 1);
-      }
+    // 🔥 ENREGISTREMENT deviceId → thermostat
+    const deviceId = t.modules?.[0]?.deviceId;
+    if (deviceId) {
+      this.thermostatByDeviceId.set(deviceId, thermoCtrl);
+      acc.context.deviceId = deviceId;
     }
 
-    // ========= TEMP SENSOR ACCESSORY =========
-    const tempName = roomName
-      ? `Température ${roomName}`
-      : `Température ${t._id}`;
-    const existingTemp = this.accessories.find(a => a.UUID === uuidTemp);
-
-    let tempAccessory: OtodoTempSensorAccessory;
+    // --- MODE SLIDER ---
+    let accSlider = this.accessories.find(a => a.UUID === uuidSlider);
 
-    if (existingTemp) {
-      tempAccessory = new OtodoTempSensorAccessory(this, existingTemp, t);
-    } else {
-      const acc = new this.api.platformAccessory(tempName, uuidTemp);
-      tempAccessory = new OtodoTempSensorAccessory(this, acc, t);
-      this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [acc]);
-      this.accessories.push(acc);
+    if (this.displayModeSliders) {
+      if (!accSlider) {
+        accSlider = new this.api.platformAccessory(sliderName, uuidSlider);
+        this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [
+          accSlider,
+        ]);
+        this.accessories.push(accSlider);
+      }
+      new OtodoModeSliderAccessory(this, accSlider, t, this.tClient);
+    } else if (accSlider) {
+      this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [
+        accSlider,
+      ]);
+      this.accessories.splice(this.accessories.indexOf(accSlider), 1);
     }
-
-    // Stockage (deviceId → sensorInstance)
-    this.tempSensors.set(tempAccessory.deviceId, tempAccessory);
   }
 
   private async discoverDevices(hubId: string): Promise<void> {
-    this.log.info('🔍 Recherche des thermostats Otodo VAV...');
-    try {
-      const thermostats = await this.tClient.getAllThermostats(hubId);
-      this.log.info(`   ${thermostats.length} thermostat(s) trouvé(s)`);
-
-      for (const t of thermostats) {
-        this.upsertThermostat(t);
-      }
-    } catch (e) {
-      this.log.error(
-        '❌ Erreur lors de la découverte des thermostats : ' + String(e),
-      );
+    const thermostats = await this.tClient.getAllThermostats(hubId);
+    for (const t of thermostats) {
+      this.upsertThermostat(t);
     }
   }
 
+  // 🔥 Poller TRV → mise à jour du thermostat associé
   private async startDevicesPolling(): Promise<void> {
     this.log.info(
       `📡 Mise en place du poller global /devices (intervalle: ${
@@ -457,9 +430,6 @@ export class OtodoVavPlatform implements DynamicPlatformPlugin {
     }, this.pollIntervalMs);
   }
 
-  /**
-   * Fonction interne : récupère /devices et met à jour les capteurs
-   */
   private async refreshDevicesOnce(): Promise<void> {
     try {
       const devices = await this.tClient.getDevices();
@@ -477,19 +447,19 @@ export class OtodoVavPlatform implements DynamicPlatformPlugin {
           continue;
         }
 
-        const deviceId = dev._id;
-        const sensor = this.tempSensors.get(deviceId);
-        if (!sensor) {
-          continue;
-        }
-
         const kelvinX10 = tempCap.value;
         const celsius = Number(((kelvinX10 - 2731) / 10).toFixed(1));
 
-        sensor.updateTemperature(celsius);
+        // Trouver le ThermostatAccessory correspondant
+        const ctrl = this.thermostatByDeviceId.get(dev._id);
+        if (!ctrl) {
+          continue;
+        }
+
+        ctrl.updateCurrentTemperature(celsius);
       }
-    } catch (err) {
-      this.log.warn(`⚠️ Poller devices: ${String(err)}`);
+    } catch (e) {
+      this.log.warn(`⚠️ Erreur polling /devices : ${e}`);
     }
   }
 }