hoffmation-base 2.13.2 → 2.14.1

package/lib/server/services/api/api-service.d.ts

@@ -1,7 +1,8 @@
-import { ButtonPosition, ButtonPressType, iBaseDevice } from '../../devices';
+import { BaseGroup, ButtonPosition, ButtonPressType, iBaseDevice } from '../../devices';
 import { CollisionSolving, DeviceSettings, RoomBase } from '../../../models';
 import { LogObject } from '../log-service';
 import { AcDevice, AcMode } from '../ac';
+import { GroupSettings } from '../../../models/groupSettings/groupSettings';
 export declare class API {
     /**
      * Endpoint to end a scene manually (or early if it has automatic turn off)
@@ -19,6 +20,7 @@ export declare class API {
         [id: string]: iBaseDevice;
     };
     static getDevice(id: string): iBaseDevice;
+    static getGroup(id: string): BaseGroup | undefined;
     static getRooms(): Map<string, RoomBase>;
     static getRoom(id: string): RoomBase | undefined;
     static getLog(): LogObject[];
@@ -27,9 +29,10 @@ export declare class API {
      * @param id The id of the device, if wrong false will be returned
      * @param {boolean} desiredState
      * @param {AcMode} desiredMode
+     * @param desiredTemperature
      * @param forceTime The time in ms this should not change before automatic change is allowed again
      */
-    static setAc(id: string, desiredState: boolean, desiredMode?: AcMode, forceTime?: number): boolean;
+    static setAc(id: string, desiredState: boolean, desiredMode?: AcMode, desiredTemperature?: number, forceTime?: number): boolean;
     /**
      * Turns on/off all AC´s in the home
      * @param {boolean} desiredState
@@ -96,6 +99,7 @@ export declare class API {
      * @returns {Error | null} In case it failed the Error containing the reason
      */
     static setDeviceSettings(deviceId: string, settings: Partial<DeviceSettings>): Error | null;
+    static setGroupSettings(groupId: string, settings: Partial<GroupSettings>): Error | null;
     /**
      * Changes the settings of a given room
      * @param {string} roomName The id of the Room to change the settings

package/lib/server/services/api/api-service.js

@@ -49,6 +49,13 @@ class API {
         }
         return devices_1.Devices.alLDevices[id];
     }
+    static getGroup(id) {
+        const g = room_service_1.RoomService.Groups.get(id);
+        if (g === undefined) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Api.getGroup() --> "${id}" not found`);
+        }
+        return g;
+    }
     static getRooms() {
         // console.log(inspect(Object.fromEntries(RoomService.Rooms)));
         return room_service_1.RoomService.Rooms;
@@ -64,9 +71,10 @@ class API {
      * @param id The id of the device, if wrong false will be returned
      * @param {boolean} desiredState
      * @param {AcMode} desiredMode
+     * @param desiredTemperature
      * @param forceTime The time in ms this should not change before automatic change is allowed again
      */
-    static setAc(id, desiredState, desiredMode, forceTime = 60 * 60 * 1000) {
+    static setAc(id, desiredState, desiredMode, desiredTemperature, forceTime = 60 * 60 * 1000) {
         const d = this.getAc(id);
         if (!d) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `AC Device for id ${id} not found`);
@@ -84,7 +92,7 @@ class API {
                 desiredMode = settings_service_1.SettingsService.heatMode == config_1.HeatingMode.Winter ? ac_1.AcMode.Heating : ac_1.AcMode.Cooling;
             }
         }
-        d.setState(desiredMode, forceTime);
+        d.setState(desiredMode, desiredTemperature, forceTime);
         return true;
     }
     /**
@@ -242,6 +250,18 @@ class API {
         d.settings.persist(d);
         return null;
     }
+    static setGroupSettings(groupId, settings) {
+        const g = this.getGroup(groupId);
+        if (g === undefined) {
+            return new Error(`Group with ID ${groupId} not found`);
+        }
+        if (g.settings === undefined) {
+            return new Error(`Group with ID ${groupId} has no settings`);
+        }
+        g.settings.fromPartialObject(settings);
+        g.settings.persist(g);
+        return null;
+    }
     /**
      * Changes the settings of a given room
      * @param {string} roomName The id of the Room to change the settings

package/lib/server/services/dbo/postgreSqlPersist.js

@@ -325,7 +325,7 @@ BEGIN
     WHERE table_name = 'EnergyCalculation'
       and column_name = 'batteryStoredKwH') Then
     alter table hoffmation_schema."EnergyCalculation"
-      add "batteryStoredKwH" integer;
+      add "batteryStoredKwH" double precision;
   END IF;
   
   IF (SELECT COUNT(column_name) = 0

package/lib/server/services/room-service/room-service.d.ts

@@ -1,8 +1,9 @@
 import { ringStorage } from '../utils';
 import { iRoomBase, RoomBase } from '../../../models';
-import { iRoomDevice } from '../../devices';
+import { BaseGroup, iRoomDevice } from '../../devices';
 export declare class RoomService {
     static Rooms: Map<string, RoomBase>;
+    static Groups: Map<string, BaseGroup>;
     static awayModeActive: boolean;
     static nightAlarmActive: boolean;
     static movementHistory: ringStorage<string>;

package/lib/server/services/room-service/room-service.js

@@ -192,6 +192,7 @@ class RoomService {
 }
 exports.RoomService = RoomService;
 RoomService.Rooms = new Map();
+RoomService.Groups = new Map();
 RoomService.awayModeActive = false;
 RoomService.nightAlarmActive = false;
 RoomService.movementHistory = new utils_1.ringStorage(15);

package/lib/server/services/victron/victron-device.js

@@ -56,7 +56,7 @@ class VictronDevice {
     }
     get id() {
         var _a;
-        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `sonos-${this.info.room}-${this.info.customName}`;
+        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `victron-${this.info.room}-${this.info.customName}`;
     }
     addExcessConsumer(device) {
         this._excessEnergyConsumer.push(device);