homebridge-enphase-envoy 10.2.7-beta.5 → 10.2.7-beta.7

package/index.js

@@ -77,7 +77,7 @@ class EnvoyPlatform {
         const postFix = host.split('.').join('');
         const envoyIdFile = join(prefDir, `envoyId_${postFix}`);
         const envoyTokenFile = join(prefDir, `envoyToken_${postFix}`);
-        const energyMeterHistoryFileName = `energyMeterHistory_${postFix}.json`;
+        const energyMeterHistoryFileName = `energyMeterHistory_${postFix}`;
 
         try {
           [envoyIdFile, envoyTokenFile].forEach(file => {

package/package.json

@@ -2,7 +2,7 @@
     "private": false,
     "displayName": "Enphase Envoy",
     "name": "homebridge-enphase-envoy",
-    "version": "10.2.7-beta.5",
+    "version": "10.2.7-beta.7",
     "description": "Homebridge p7ugin for Photovoltaic Energy System manufactured by Enphase.",
     "license": "MIT",
     "author": "grzegorz914",

package/src/constants.js

@@ -399,6 +399,14 @@ export const MetersKeyMap = {
     "pv3p": "pv3p"
 };
 
+export const MetersKeyMap1 = {
+    "Production": "production",
+    "Consumption Net": "consumptionNet",
+    "Consumption Total": "consumptionTotal",
+    "Storage": "storage",
+    "Generator": "generator",
+};
+
 export const DeviceTypeMap = {
     1: "Microinverter",
     12: "Q-Relay",

package/src/envoydevice.js

@@ -4,7 +4,7 @@ import RestFul from './restful.js';
 import Mqtt from './mqtt.js';
 import Functions from './functions.js';
 import fakegato from 'fakegato-history';
-import { PartNumbers, ApiCodes, MetersKeyMap, DeviceTypeMap, LedStatus } from './constants.js';
+import { PartNumbers, ApiCodes, MetersKeyMap, MetersKeyMap1, DeviceTypeMap, LedStatus } from './constants.js';
 let Accessory, Characteristic, Service, Categories, AccessoryUUID;
 
 class EnvoyDevice extends EventEmitter {
@@ -785,27 +785,24 @@ class EnvoyDevice extends EventEmitter {
             const accessories = [];
             const devices = this.energyMeter ? 2 : 1;
             for (let i = 0; i < devices; i++) {
-
-                const envoySerialNumber = i === 0 ? this.pv.info.serialNumber : this.pv.info.serialNumber + 'Energy Meter';
-                const displayType = i === 0 ? this.displayType : 4;
-                const accessoryName = i === 0 ? this.name : `${this.name} ${this.pv.powerAndEnergyData.data[0].measurementType}`;
-
-                //accessory
-                if (this.logDebug) this.emit('debug', `Prepare ${accessoryName} accessory`);
-                const accessoryUUID = AccessoryUUID.generate(envoySerialNumber);
-                const accessoryCategory = [Categories.OTHER, Categories.LIGHTBULB, Categories.FAN, Categories.SENSOR, Categories.SENSOR][displayType];
-                const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
-
-                //information service
-                if (this.logDebug) this.emit('debug', `Prepare Information Service`);
-                accessory.getService(Service.AccessoryInformation)
-                    .setCharacteristic(Characteristic.Manufacturer, 'Enphase')
-                    .setCharacteristic(Characteristic.Model, this.pv.info.modelName ?? 'Model Name')
-                    .setCharacteristic(Characteristic.SerialNumber, envoySerialNumber ?? 'Serial Number')
-                    .setCharacteristic(Characteristic.FirmwareRevision, this.pv.info.software.replace(/[a-zA-Z]/g, '') ?? '0');
-
                 switch (i) {
                     case 0://PV
+                        const envoySerialNumber = this.pv.info.serialNumber;
+                        const accessoryName = this.name;
+
+                        //accessory
+                        if (this.logDebug) this.emit('debug', `Prepare ${accessoryName} accessory`);
+                        const accessoryUUID = AccessoryUUID.generate(envoySerialNumber);
+                        const accessoryCategory = [Categories.OTHER, Categories.LIGHTBULB, Categories.FAN, Categories.SENSOR, Categories.SENSOR][this.displayType];
+                        const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
+
+                        //information service
+                        if (this.logDebug) this.emit('debug', `Prepare Information Service`);
+                        accessory.getService(Service.AccessoryInformation)
+                            .setCharacteristic(Characteristic.Manufacturer, 'Enphase')
+                            .setCharacteristic(Characteristic.Model, this.pv.info.modelName ?? 'Model Name')
+                            .setCharacteristic(Characteristic.SerialNumber, envoySerialNumber ?? 'Serial Number')
+                            .setCharacteristic(Characteristic.FirmwareRevision, this.pv.info.software.replace(/[a-zA-Z]/g, '') ?? '0');
                         //system
                         if (this.systemAccessory) {
                             if (this.logDebug) this.emit('debug', `Prepare System Service`);
@@ -2998,22 +2995,39 @@ class EnvoyDevice extends EventEmitter {
 
                         accessories.push(accessory);
                         break;
-                    case 1: //Energy Meter
-                        if (this.logDebug) this.emit('debug', `Prepare Fakegato ${this.pv.powerAndEnergyData.data[0].measurementType} Service`);
-                        this.fakegatoHistoryService = new this.fakegatoHistory(`energy`, accessory, {
-                            storage: 'fs',
-                            disableRepeatLastData: true,
-                            disableTimer: false,
-                            path: this.prefDir,
-                            filename: this.energyMeterHistoryFileName
-                        })
-
-                        // Energy Meter Service
+                    case 1: //Energy Meter Production
+                        this.fakegatoHistoryServices = [];
                         this.energyMeterServices = [];
                         for (const source of this.pv.powerAndEnergyData.data) {
                             const measurementType = source.measurementType;
+                            const envoySerialNumber = `${this.pv.info.serialNumber}${measurementType}`;
+                            const accessoryName = `${this.name} Energy Meter ${measurementType}`;
                             const power = source.power > 0 ? source.power : 0;
 
+                            //accessory
+                            if (this.logDebug) this.emit('debug', `Prepare ${accessoryName} accessory`);
+                            const accessoryUUID = AccessoryUUID.generate(envoySerialNumber);
+                            const accessoryCategory = Categories.SENSOR;
+                            const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
+
+                            //information service
+                            if (this.logDebug) this.emit('debug', `Prepare Information Service`);
+                            accessory.getService(Service.AccessoryInformation)
+                                .setCharacteristic(Characteristic.Manufacturer, 'Enphase')
+                                .setCharacteristic(Characteristic.Model, this.pv.info.modelName ?? 'Model Name')
+                                .setCharacteristic(Characteristic.SerialNumber, envoySerialNumber ?? 'Serial Number')
+                                .setCharacteristic(Characteristic.FirmwareRevision, this.pv.info.software.replace(/[a-zA-Z]/g, '') ?? '0');
+
+                            if (this.logDebug) this.emit('debug', `Prepare Fakegato ${measurementType} Service`);
+                            const fakegatoHistoryService = new this.fakegatoHistory(`energy`, accessory, {
+                                storage: 'fs',
+                                disableRepeatLastData: true,
+                                disableTimer: false,
+                                path: this.prefDir,
+                                filename: `${this.energyMeterHistoryFileName}_${MetersKeyMap1[measurementType]}.json`
+                            })
+
+                            // Energy Meter Service
                             if (this.logDebug) this.emit('debug', `Prepare Energy Meter ${measurementType} Service`);
                             const energyMeterService = accessory.addService(Service.EvePowerMeter, `Energy Meter ${measurementType}`, `energyMeterService${measurementType}`);
                             energyMeterService.setCharacteristic(Characteristic.ConfiguredName, `Energy Meter ${measurementType}`);
@@ -3056,10 +3070,11 @@ class EnvoyDevice extends EventEmitter {
                                     }
                                 });
 
+                            this.fakegatoHistoryServices.push(fakegatoHistoryService);
                             this.energyMeterServices.push(energyMeterService);
-                        }
 
-                        accessories.push(accessory);
+                            accessories.push(accessory);
+                        }
                         break;
                 }
             }
@@ -4103,10 +4118,10 @@ class EnvoyDevice extends EventEmitter {
                             }
 
                             // Energy meter
-                            if (key === 'production' && this.energyMeter) {
+                            if (this.energyMeter) {
                                 const power = obj.power > 0 ? obj.power : 0;
                                 // Add to fakegato history
-                                this.fakegatoHistoryService?.addEntry({
+                                this.fakegatoHistoryServices?.[index]?.addEntry({
                                     time: Math.floor(Date.now() / 1000),
                                     power: power ?? 0
                                 });