homey-lib 2.35.2 → 2.35.4

package/lib/App/index.js

@@ -60,6 +60,18 @@ const BATTERY_CAPABILITIES = [
   'alarm_battery',
 ];
 
+const RESERVED_SETTING_PREFIXES = new Set([
+  'homey:',
+  'zw_',
+  'zb_',
+  'mtr_',
+  'thread_',
+  'zone_',
+  'energy_',
+  'satellite_mode_',
+  'homekit_',
+])
+
 class App {
 
   constructor(path) {
@@ -355,47 +367,9 @@ class App {
           }
         }
 
-      
-        const reservedPrefixes = new Set([
-          'homey:',
-          'zw_',
-          'zb_',
-          'mtr_',
-          'thread_',
-          'zone_',
-          'energy_',
-          'satellite_mode_',
-          'homekit_',
-        ])
-
         if (Array.isArray(driver.settings)) {
           for (const setting of driver.settings) {
-            if (
-              setting.type &&
-              setting.type === "group" &&
-              setting.children &&
-              Array.isArray(setting.children)
-            ) {
-              for (const childSettings of setting.children) {
-                for (const prefix of reservedPrefixes) {
-                  if (childSettings.id.startsWith(prefix)) {
-                    console.warn(
-                      `drivers.${driver.id} invalid setting id: ${setting.id}, cannot start with reserved prefix: ${prefix}`
-                    );
-                    // throw new Error(`drivers.${driver.id} invalid setting id: ${setting.id}, cannot start with reserved prefix: ${prefix}`);
-                  }
-                }
-              }
-            } else {
-              for (const prefix of reservedPrefixes) {
-                if (setting.id.startsWith(prefix)) {
-                  console.warn(
-                    `drivers.${driver.id} invalid setting id: ${setting.id}, cannot start with reserved prefix: ${prefix}`
-                  );
-                  // throw new Error(`drivers.${driver.id} invalid setting id: ${setting.id}, cannot start with reserved prefix: ${prefix}`);
-                }
-              }
-            }
+            this._checkPrivateSettingPrefixUse(setting, driver);
           }
         }
 
@@ -491,16 +465,18 @@ class App {
             });
           }
 
-          if (driver.energy.cumulative === true) { 
+          const hasMeterPowerCapability = driver.capabilities.some(capability => Capability.isInstanceOfId(capability, 'meter_power'));
+
+          if (driver.energy.cumulative === true && hasMeterPowerCapability) {
             if (typeof driver.energy.cumulativeImportedCapability !== 'string') {
-              console.warn(`Warning: drivers.${driver.id} has energy.cumulative set to true, but is missing 'cumulativeImportedCapability'. Disregard this warning if the driver does not have \`meter_power\` capabilities.`);
+              console.warn(`Warning: drivers.${driver.id} has energy.cumulative set to true, but is missing 'cumulativeImportedCapability'.`);
             }
             if (typeof driver.energy.cumulativeExportedCapability !== 'string') {
-              console.warn(`Warning: drivers.${driver.id} has energy.cumulative set to true, but is missing 'cumulativeExportedCapability'. Disregard this warning if the driver does not have \`meter_power\` capabilities.`);
+              console.warn(`Warning: drivers.${driver.id} has energy.cumulative set to true, but is missing 'cumulativeExportedCapability'.`);
             }
           }
 
-          if (driver.energy.homeBattery === true) { 
+          if (driver.energy.homeBattery === true && hasMeterPowerCapability) { 
             if (typeof driver.energy.meterPowerImportedCapability !== 'string') {
               console.warn(`Warning: drivers.${driver.id} has energy.homeBattery set to true, but is missing 'meterPowerImportedCapability'.`);
             }
@@ -509,6 +485,12 @@ class App {
             }
           }
 
+          if (driver.energy.evCharger === true && hasMeterPowerCapability) { 
+            if (typeof driver.energy.meterPowerImportedCapability !== 'string') {
+              console.warn(`Warning: drivers.${driver.id} has energy.evCharger set to true, but is missing 'meterPowerImportedCapability'.`);
+            }
+          }
+
           if (typeof driver.energy.cumulativeImportedCapability === 'string' && Capability.isInstanceOfId(driver.energy.cumulativeImportedCapability, 'meter_power') === false) {
             throw new Error(`drivers.${driver.id} has 'cumulativeImportedCapability': '${driver.energy.cumulativeImportedCapability}' but only instances of 'meter_power' are allowed.`);
           }
@@ -719,6 +701,27 @@ class App {
     this.debug('Validated successfully');
   }
 
+  _checkPrivateSettingPrefixUse(setting, driver) {
+    if (
+      setting.type &&
+      setting.type === "group" &&
+      setting.children &&
+      Array.isArray(setting.children)
+    ) {
+      for (const childSetting of setting.children) {
+        this._checkPrivateSettingPrefixUse(childSetting, driver);
+      }
+    } else {
+      for (const prefix of RESERVED_SETTING_PREFIXES) {
+        if (setting.id.startsWith(prefix)) {
+          console.warn(
+            `drivers.${driver.id} invalid setting id: ${setting.id}, cannot start with reserved prefix: ${prefix}`
+          );
+        }
+      }
+    }
+  }
+
   _checkZwaveForSetting(driver, setting) {
     if (!driver || !setting || !setting.zwave) return;
     if (typeof setting.zwave.index !== 'number' || typeof setting.zwave.size !== 'number') throw new Error(`Missing property in "zwave" at ${driver.id}, ${setting.id}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homey-lib",
-  "version": "2.35.2",
+  "version": "2.35.4",
   "description": "Shared Library for Homey",
   "main": "index.js",
   "scripts": {