Merge branch 'master' into ask-ai-in-scene

front/src/components/boxs/device-in-room/DeviceRow.jsx

@@ -12,6 +12,7 @@ import NumberDeviceFeature from './device-features/NumberDeviceFeature';
 import CoverDeviceFeature from './device-features/CoverDeviceFeature';
 import ThermostatDeviceFeature from './device-features/ThermostatDeviceFeature';
 import AirConditioningModeDeviceFeature from './device-features/AirConditioningModeDeviceFeature';
+import PilotWireModeDeviceFeature from './device-features/PilotWireModeDeviceFeature';
 import LMHVolumeDeviceFeature from './device-features/LMHVolumeDeviceFeature';
 
 const ROW_TYPE_BY_FEATURE_TYPE = {
@@ -29,6 +30,7 @@ const ROW_TYPE_BY_FEATURE_TYPE = {
   [DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE]: ThermostatDeviceFeature,
   [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE]: AirConditioningModeDeviceFeature,
   [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: ThermostatDeviceFeature,
+  [DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE]: PilotWireModeDeviceFeature,
   [DEVICE_FEATURE_TYPES.SIREN.LMH_VOLUME]: LMHVolumeDeviceFeature,
   [DEVICE_FEATURE_TYPES.SIREN.MELODY]: NumberDeviceFeature,
   [DEVICE_FEATURE_TYPES.DURATION.DECIMAL]: MultiLevelDeviceFeature

front/src/components/boxs/device-in-room/SupportedFeatureTypes.jsx

@@ -13,6 +13,7 @@ const SUPPORTED_FEATURE_TYPES = [
   DEVICE_FEATURE_TYPES.THERMOSTAT.TARGET_TEMPERATURE,
   DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE,
   DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE,
+  DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE,
   DEVICE_FEATURE_TYPES.SIREN.LMH_VOLUME,
   DEVICE_FEATURE_TYPES.SIREN.MELODY,
   DEVICE_FEATURE_TYPES.DURATION.DECIMAL

front/src/components/boxs/device-in-room/device-features/PilotWireModeDeviceFeature.jsx

@@ -0,0 +1,52 @@
+import get from 'get-value';
+import { Text } from 'preact-i18n';
+
+import { DeviceFeatureCategoriesIcon } from '../../../../utils/consts';
+import { PILOT_WIRE_MODE } from '../../../../../../server/utils/constants';
+
+const PilotWireModeDeviceFeature = ({ children, ...props }) => {
+  const { deviceFeature } = props;
+  const { category, type } = deviceFeature;
+
+  function updateValue(e) {
+    props.updateValueWithDebounce(deviceFeature, e.currentTarget.value);
+  }
+
+  return (
+    <tr>
+      <td>
+        <i class={`fe fe-${get(DeviceFeatureCategoriesIcon, `${category}.${type}`, { default: 'sliders' })}`} />
+      </td>
+      <td>{props.rowName}</td>
+
+      <td class="py-0">
+        <div class="justify-content-end">
+          <div class="form-group mb-0">
+            <select value={props.deviceFeature.last_value} onChange={updateValue} class="form-control form-control-sm">
+              <option value={PILOT_WIRE_MODE.OFF}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.off`} />
+              </option>
+              <option value={PILOT_WIRE_MODE.FROST_PROTECTION}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.frost-protection`} />
+              </option>
+              <option value={PILOT_WIRE_MODE.ECO}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.eco`} />
+              </option>
+              <option value={PILOT_WIRE_MODE.COMFORT_2}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.comfort_-2`} />
+              </option>
+              <option value={PILOT_WIRE_MODE.COMFORT_1}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.comfort_-1`} />
+              </option>
+              <option value={PILOT_WIRE_MODE.COMFORT}>
+                <Text id={`deviceFeatureAction.category.${category}.${type}.comfort`} />
+              </option>
+            </select>
+          </div>
+        </div>
+      </td>
+    </tr>
+  );
+};
+
+export default PilotWireModeDeviceFeature;

front/src/config/i18n/de.json

@@ -2769,6 +2769,16 @@
           "heating": "Heizen"
         }
       },
+      "heater": {
+        "pilot-wire-mode": {
+          "comfort": "Komfort",
+          "eco": "Öko",
+          "off": "Aus",
+          "frost-protection": "Frostschutz",
+          "comfort_-1": "Komfort -1°C",
+          "comfort_-2": "Komfort -2°C"
+        }
+      },
       "siren": {
         "lmh_volume": {
           "low": "Niedrig",
@@ -3043,6 +3053,10 @@
       "mode": "Modus",
       "target-temperature": "Temperatur"
     },
+    "heater": {
+      "shortCategoryName": "Heizung",
+      "pilot-wire-mode": "Modus"
+    },
     "tamper": {
       "shortCategoryName": "Manipulation",
       "binary": "Manipulation (ja/nein)"

front/src/config/i18n/en.json

@@ -2769,6 +2769,16 @@
           "heating": "Heat"
         }
       },
+      "heater": {
+        "pilot-wire-mode": {
+          "comfort": "Comfort",
+          "eco": "Eco",
+          "off": "Off",
+          "frost-protection": "Frost Protection",
+          "comfort_-1": "Comfort -1°C",
+          "comfort_-2": "Comfort -2°C"
+        }
+      },
       "siren": {
         "lmh_volume": {
           "low": "Low",
@@ -3043,6 +3053,10 @@
       "mode": "Mode",
       "target-temperature": "Temperature"
     },
+    "heater": {
+      "shortCategoryName": "Heating",
+      "pilot-wire-mode": "Mode"
+    },
     "tamper": {
       "shortCategoryName": "Tamper",
       "binary": "Tamper (yes/no)"

front/src/config/i18n/fr.json

@@ -2769,6 +2769,16 @@
           "heating": "Chauffage"
         }
       },
+      "heater": {
+        "pilot-wire-mode": {
+          "comfort": "Confort",
+          "eco": "Eco",
+          "off": "Off",
+          "frost-protection": "Hors Gel",
+          "comfort_-1": "Confort -1°C",
+          "comfort_-2": "Confort -2°C"
+        }
+      },
       "siren": {
         "lmh_volume": {
           "low": "Faible",
@@ -3043,6 +3053,10 @@
       "mode": "Mode",
       "target-temperature": "Température"
     },
+    "heater": {
+      "shortCategoryName": "Chauffage",
+      "pilot-wire-mode": "Mode"
+    },
     "tamper": {
       "shortCategoryName": "Détecteur de sabotage",
       "binary": "Détection sabotage (Oui/Non)"

front/src/routes/scene/edit-scene/triggers/ScheduledTrigger.jsx

@@ -91,7 +91,7 @@ class TurnOnLight extends Component {
     return (
       <div>
         <div class="row">
-          <div class="col-sm-4">
+          <div class="col-sm-6">
             <div class="form-group">
               <div class="form-label">
                 <Text id="editScene.triggersCard.scheduledTrigger.typeLabel" />
@@ -267,7 +267,7 @@ class TurnOnLight extends Component {
             </div>
           )}
           {this.props.trigger.scheduler_type === 'every-week' && (
-            <div class="col-sm-2">
+            <div class="col-sm-4">
               <div class="form-group">
                 <div class="form-label">
                   <Text id="editScene.triggersCard.scheduledTrigger.timeLabel" />

front/src/utils/consts.js

@@ -172,6 +172,9 @@ export const DeviceFeatureCategoriesIcon = {
     [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.MODE]: 'settings',
     [DEVICE_FEATURE_TYPES.AIR_CONDITIONING.TARGET_TEMPERATURE]: 'thermometer'
   },
+  [DEVICE_FEATURE_CATEGORIES.HEATER]: {
+    [DEVICE_FEATURE_TYPES.HEATER.PILOT_WIRE_MODE]: 'thermometer'
+  },
   [DEVICE_FEATURE_CATEGORIES.TELEVISION]: {
     [DEVICE_FEATURE_TYPES.TELEVISION.BINARY]: 'power',
     [DEVICE_FEATURE_TYPES.TELEVISION.SOURCE]: 'airplay',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gladys",
-  "version": "4.46.2",
+  "version": "4.47.0",
   "description": "A privacy-first, open-source home assistant",
   "main": "index.js",
   "engines": {

server/lib/gateway/gateway.restoreBackup.js

@@ -47,9 +47,11 @@ async function restoreBackup(sqliteBackupFilePath, duckDbBackupFolderPath) {
     await new Promise((resolve) => {
       db.duckDb.close(() => resolve());
     });
-    // Delete current DuckDB file
+    // Delete current DuckDB files
     const duckDbFilePath = `${this.config.storage.replace('.db', '')}.duckdb`;
+    const duckDbWalFilePath = `${this.config.storage.replace('.db', '')}.duckdb.wal`;
     await fse.remove(duckDbFilePath);
+    await fse.remove(duckDbWalFilePath);
     const duckDb = new duckdb.Database(duckDbFilePath);
     const duckDbWriteConnection = duckDb.connect();
     const duckDbWriteConnectionAllAsync = promisify(duckDbWriteConnection.all).bind(duckDbWriteConnection);

server/lib/scene/scene.checkCalendarTriggers.js

@@ -22,7 +22,7 @@ dayjs.extend(LocalizedFormat);
 async function checkCalendarTriggers() {
   // getting a fixed value for now, as soon as possible in the function
   const now = dayjs.tz(dayjs(), this.timezone);
-  logger.info(`Checking calendar triggers at ${now}`);
+  logger.debug(`Checking calendar triggers at ${now}`);
   // First, we try to constitute a list of triggers
   // related to calendars events
   const calendarEventTriggers = [];

server/package.json

@@ -86,7 +86,7 @@
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.6",
     "dockerode": "^3.3.4",
-    "duckdb": "^1.0.0",
+    "duckdb": "^1.1.1",
     "express": "^4.18.2",
     "express-rate-limit": "^6.7.0",
     "form-data": "^2.3.3",

server/services/homekit/lib/buildAccessory.js

@@ -24,8 +24,32 @@ function buildAccessory(device) {
 
   const accessory = new this.hap.Accessory(device.name, device.id);
   Object.keys(categories).forEach((category) => {
-    const service = this.buildService(device, categories[category], mappings[category]);
-    accessory.addService(service);
+    const serviceConfigs = [];
+
+    categories[category].forEach((cat) => {
+      if (
+        serviceConfigs.length > 0 &&
+        !serviceConfigs[serviceConfigs.length - 1].find(
+          (config) => config.category === cat.category && config.type === cat.type,
+        )
+      ) {
+        serviceConfigs[serviceConfigs.length - 1].push(cat);
+
+        return;
+      }
+
+      serviceConfigs.push([cat]);
+    });
+
+    serviceConfigs.forEach((config, i) => {
+      const service = this.buildService(
+        device,
+        config,
+        mappings[category],
+        serviceConfigs.length > 1 ? `${category} ${i + 1}` : undefined,
+      );
+      accessory.addService(service);
+    });
   });
 
   return accessory.services.length <= 1 ? null : accessory;

server/services/homekit/lib/buildService.js

@@ -18,14 +18,15 @@ const sleep = promisify(setTimeout);
  * @param {object} device - Gladys device to format as HomeKit accessory.
  * @param {object} features - Device features to associate to service.
  * @param {object} categoryMapping - Homekit mapping for the current device category.
+ * @param {string} subtype - Optional subtype if multiple same service.
  * @returns {object} HomeKit service to expose.
  * @example
  * buildService(device, features, categoryMapping)
  */
-function buildService(device, features, categoryMapping) {
+function buildService(device, features, categoryMapping, subtype) {
   const { Characteristic, CharacteristicEventTypes, Perms, Service } = this.hap;
 
-  const service = new Service[categoryMapping.service](device.name);
+  const service = new Service[categoryMapping.service](subtype ? features[0].name : device.name, subtype);
 
   features.forEach((feature) => {
     switch (`${feature.category}:${feature.type}`) {
@@ -51,8 +52,7 @@ function buildService(device, features, categoryMapping) {
               status: ACTIONS_STATUS.PENDING,
               value: value ? 1 : 0,
               device: device.selector,
-              feature_category: feature.category,
-              feature_type: feature.type,
+              device_feature: feature.selector,
             };
             this.gladys.event.emit(EVENTS.ACTION.TRIGGERED, action);
             callback();
@@ -107,8 +107,7 @@ function buildService(device, features, categoryMapping) {
                 ),
               ),
               device: device.selector,
-              feature_category: feature.category,
-              feature_type: feature.type,
+              device_feature: feature.selector,
             };
             this.gladys.event.emit(EVENTS.ACTION.TRIGGERED, action);
             callback();
@@ -136,8 +135,7 @@ function buildService(device, features, categoryMapping) {
             status: ACTIONS_STATUS.PENDING,
             value: rgbToInt(rgb),
             device: device.selector,
-            feature_category: feature.category,
-            feature_type: feature.type,
+            device_feature: feature.selector,
           };
           this.gladys.event.emit(EVENTS.ACTION.TRIGGERED, action);
           callback();
@@ -161,8 +159,7 @@ function buildService(device, features, categoryMapping) {
             status: ACTIONS_STATUS.PENDING,
             value: rgbToInt(rgb),
             device: device.selector,
-            feature_category: feature.category,
-            feature_type: feature.type,
+            device_feature: feature.selector,
           };
           this.gladys.event.emit(EVENTS.ACTION.TRIGGERED, action);
           callback();