hoffmation-base 0.1.1 → 0.1.5

package/server/devices/Griffe.ts

@@ -1,31 +1,31 @@
-import { Devices } from './devices';
-import { FensterPosition } from './hmIPDevices/FensterPosition';
-import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
-import { HmIpGriff } from './hmIPDevices/hmIpGriff';
-
-export class Griffe {
-  public static getGriffPosition(): string {
-    const griffe: HmIpGriff[] = Griffe.getAllGriffe();
-    griffe.sort((a, b): number => {
-      a.position;
-      return b.position - a.position;
-    });
-
-    const response: string[] = [`Dies sind die aktuellen Stellungen der FensterGriffe:`];
-    for (const g of griffe) {
-      response.push(`${FensterPosition[g.position]} Fenster: "${g.info.customName}"`);
-    }
-    return response.join('\n');
-  }
-
-  public static getAllGriffe(): HmIpGriff[] {
-    const griffe: HmIpGriff[] = [];
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
-      if (d.deviceType === HmIpDeviceType.HmIpGriff) {
-        griffe.push(d as HmIpGriff);
-      }
-    }
-    return griffe;
-  }
-}
+import { Devices } from './devices';
+import { FensterPosition } from './hmIPDevices/FensterPosition';
+import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
+import { HmIpGriff } from './hmIPDevices/hmIpGriff';
+
+export class Griffe {
+  public static getGriffPosition(): string {
+    const griffe: HmIpGriff[] = Griffe.getAllGriffe();
+    griffe.sort((a, b): number => {
+      a.position;
+      return b.position - a.position;
+    });
+
+    const response: string[] = [`Dies sind die aktuellen Stellungen der FensterGriffe:`];
+    for (const g of griffe) {
+      response.push(`${FensterPosition[g.position]} Fenster: "${g.info.customName}"`);
+    }
+    return response.join('\n');
+  }
+
+  public static getAllGriffe(): HmIpGriff[] {
+    const griffe: HmIpGriff[] = [];
+    for (const dID in Devices.hmIP) {
+      const d = Devices.hmIP[dID];
+      if (d.deviceType === HmIpDeviceType.HmIpGriff) {
+        griffe.push(d as HmIpGriff);
+      }
+    }
+    return griffe;
+  }
+}

package/server/devices/Heizgruppen.ts

@@ -1,91 +1,91 @@
-import { Persist } from '../services/dbo/persist';
-import { Devices } from './devices';
-import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
-import { HmIpHeizgruppe } from './hmIPDevices/hmIpHeizgruppe';
-import { HmIpHeizung } from './hmIPDevices/hmIpHeizung';
-import { TemperaturDataPoint } from '../../models/persistence/temperaturDataPoint';
-
-export class Heizgruppen {
-  public static getInfo(): string {
-    const gruppen: HmIpHeizgruppe[] = Heizgruppen.getAllGruppen();
-    gruppen.sort((a, b): number => {
-      return a.info.customName.localeCompare(b.info.customName);
-    });
-
-    const response: string[] = [`Dies sind die aktuellen Informationen der Heizungen:`];
-    response.push(`Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung`);
-    for (const g of gruppen) {
-      response.push(
-        `${g.info.customName}:\t\t${g.humidity}%\t\t${g.sTemperatur}\t\t${g.desiredTemperatur}°C\t\t${g.sLevel}`,
-      );
-    }
-    return response.join('\n');
-  }
-
-  public static async getSpecificInfo(pText: string | undefined): Promise<string> {
-    if (pText === undefined || !pText.includes('"')) {
-      return `Bitte übergeben Sie eine Heizgruppe innerhalb von "". z.B. "EG Flur HeizGr"`;
-    }
-    const searchText = pText.split('"')[1];
-    const group: HmIpHeizgruppe | undefined = this.getSpecificGroup(searchText);
-
-    if (group === undefined) {
-      return `"${searchText}" ist keine gültige Heizgruppe, im Folgenden ist eine Liste aller gültigen Heizgruppen:\n${this.getInfo()}`;
-    }
-
-    const results: TemperaturDataPoint[] = await Persist.readTemperaturDataPoint(group, 20);
-    const response: string[] = [`Dies sind die letzten 20 Messpunkte der Heizgruppe:`];
-    response.push(`Zeitpunkt\t\tIst-Temperatur\t\tSoll-Temperatur\t\tVentilstellung`);
-    for (const r of results) {
-      response.push(
-        `${r.date.toLocaleTimeString('de-DE')}:\t\t${r.istTemperatur}°C\t\t${r.sollTemperatur}°C\t\t${r.level}%`,
-      );
-    }
-    return response.join('\n');
-  }
-
-  public static getProblems(): string {
-    const groups: HmIpHeizgruppe[] = this.getAllGruppen();
-
-    const response: string[] = [`Dies sind die bestehenden Differenzen:`];
-    response.push(`Raumname\t\tIst-Temperatur\t\tGerät`);
-    for (const g of groups) {
-      const heizungen: HmIpHeizung[] = g.getBelongingHeizungen();
-      const tempProblem: string[] = [`${g.info.room}\t\t${g.iTemperatur}°C\t\t${g.info.customName}`];
-      let print = false;
-      for (const h of heizungen) {
-        if (h.iTemperatur !== g.iTemperatur) {
-          print = true;
-        }
-        tempProblem.push(`${h.info.room}\t\t${h.iTemperatur}°C\t\t${h.info.customName}`);
-      }
-      if (print) {
-        response.push(tempProblem.join('\n'));
-        response.push(' ');
-      }
-    }
-    return response.join('\n');
-  }
-
-  public static getAllGruppen(): HmIpHeizgruppe[] {
-    const gruppen: HmIpHeizgruppe[] = [];
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
-      if (d.deviceType === HmIpDeviceType.HmIpHeizgruppe) {
-        gruppen.push(d as HmIpHeizgruppe);
-      }
-    }
-    return gruppen;
-  }
-
-  public static getSpecificGroup(name: string): HmIpHeizgruppe | undefined {
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
-      if (d.deviceType === HmIpDeviceType.HmIpHeizgruppe && d.info.customName === name) {
-        return d as HmIpHeizgruppe;
-      }
-    }
-
-    return undefined;
-  }
-}
+import { Persist } from '../services/dbo/persist';
+import { Devices } from './devices';
+import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
+import { HmIpHeizgruppe } from './hmIPDevices/hmIpHeizgruppe';
+import { HmIpHeizung } from './hmIPDevices/hmIpHeizung';
+import { TemperaturDataPoint } from '../../models/persistence/temperaturDataPoint';
+
+export class Heizgruppen {
+  public static getInfo(): string {
+    const gruppen: HmIpHeizgruppe[] = Heizgruppen.getAllGruppen();
+    gruppen.sort((a, b): number => {
+      return a.info.customName.localeCompare(b.info.customName);
+    });
+
+    const response: string[] = [`Dies sind die aktuellen Informationen der Heizungen:`];
+    response.push(`Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung`);
+    for (const g of gruppen) {
+      response.push(
+        `${g.info.customName}:\t\t${g.humidity}%\t\t${g.sTemperatur}\t\t${g.desiredTemperatur}°C\t\t${g.sLevel}`,
+      );
+    }
+    return response.join('\n');
+  }
+
+  public static async getSpecificInfo(pText: string | undefined): Promise<string> {
+    if (pText === undefined || !pText.includes('"')) {
+      return `Bitte übergeben Sie eine Heizgruppe innerhalb von "". z.B. "EG Flur HeizGr"`;
+    }
+    const searchText = pText.split('"')[1];
+    const group: HmIpHeizgruppe | undefined = this.getSpecificGroup(searchText);
+
+    if (group === undefined) {
+      return `"${searchText}" ist keine gültige Heizgruppe, im Folgenden ist eine Liste aller gültigen Heizgruppen:\n${this.getInfo()}`;
+    }
+
+    const results: TemperaturDataPoint[] = await Persist.readTemperaturDataPoint(group, 20);
+    const response: string[] = [`Dies sind die letzten 20 Messpunkte der Heizgruppe:`];
+    response.push(`Zeitpunkt\t\tIst-Temperatur\t\tSoll-Temperatur\t\tVentilstellung`);
+    for (const r of results) {
+      response.push(
+        `${r.date.toLocaleTimeString('de-DE')}:\t\t${r.istTemperatur}°C\t\t${r.sollTemperatur}°C\t\t${r.level}%`,
+      );
+    }
+    return response.join('\n');
+  }
+
+  public static getProblems(): string {
+    const groups: HmIpHeizgruppe[] = this.getAllGruppen();
+
+    const response: string[] = [`Dies sind die bestehenden Differenzen:`];
+    response.push(`Raumname\t\tIst-Temperatur\t\tGerät`);
+    for (const g of groups) {
+      const heizungen: HmIpHeizung[] = g.getBelongingHeizungen();
+      const tempProblem: string[] = [`${g.info.room}\t\t${g.iTemperatur}°C\t\t${g.info.customName}`];
+      let print = false;
+      for (const h of heizungen) {
+        if (h.iTemperatur !== g.iTemperatur) {
+          print = true;
+        }
+        tempProblem.push(`${h.info.room}\t\t${h.iTemperatur}°C\t\t${h.info.customName}`);
+      }
+      if (print) {
+        response.push(tempProblem.join('\n'));
+        response.push(' ');
+      }
+    }
+    return response.join('\n');
+  }
+
+  public static getAllGruppen(): HmIpHeizgruppe[] {
+    const gruppen: HmIpHeizgruppe[] = [];
+    for (const dID in Devices.hmIP) {
+      const d = Devices.hmIP[dID];
+      if (d.deviceType === HmIpDeviceType.HmIpHeizgruppe) {
+        gruppen.push(d as HmIpHeizgruppe);
+      }
+    }
+    return gruppen;
+  }
+
+  public static getSpecificGroup(name: string): HmIpHeizgruppe | undefined {
+    for (const dID in Devices.hmIP) {
+      const d = Devices.hmIP[dID];
+      if (d.deviceType === HmIpDeviceType.HmIpHeizgruppe && d.info.customName === name) {
+        return d as HmIpHeizgruppe;
+      }
+    }
+
+    return undefined;
+  }
+}

package/server/devices/Rollos.ts

@@ -1,48 +1,48 @@
-import { Devices } from './devices';
-import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
-import { HmIpRoll } from './hmIPDevices/hmIpRoll';
-import { RoomBase } from '../../models/rooms/RoomBase';
-
-export class Rolladen {
-  public static getRolladenPosition(): string {
-    const rollos: HmIpRoll[] = Rolladen.getAllRollos();
-    rollos.sort((a, b): number => {
-      return b.currentLevel - a.currentLevel;
-    });
-
-    const response: string[] = [`Dies sind die aktuellen Rollo Positionen:`];
-    for (const r of rollos) {
-      response.push(`${r.currentLevel}% Rollo: "${r.info.customName}" Gewünschte Position: ${r.desiredFensterLevel}`);
-    }
-    response.push(`\nDie nächsten Zeiten zum Hochfahren:`);
-    const down: string[] = [`\nDie nächsten Zeiten zum Runterfahren:`];
-    const rooms: RoomBase[] = RoomBase.allRooms;
-    for (const r of rooms) {
-      for (const f of r.FensterGroup.fenster) {
-        if (f.rollo) {
-          response.push(
-            `Rollo: "${f.rollo.info.customName}"\t${
-              f.noRolloOnSunrise ? 'Hochfahren inaktiv' : r.sonnenAufgangCallback?.nextToDo?.toLocaleTimeString()
-            }`,
-          );
-          down.push(
-            `Rollo: "${f.rollo.info.customName}"\t${r.sonnenUntergangCallback?.nextToDo?.toLocaleTimeString()}`,
-          );
-        }
-      }
-    }
-    response.push(down.join('\n'));
-    return response.join('\n');
-  }
-
-  public static getAllRollos(): HmIpRoll[] {
-    const rollos: HmIpRoll[] = [];
-    for (const dID in Devices.hmIP) {
-      const d = Devices.hmIP[dID];
-      if (d.deviceType === HmIpDeviceType.HmIpRoll) {
-        rollos.push(d as HmIpRoll);
-      }
-    }
-    return rollos;
-  }
-}
+import { Devices } from './devices';
+import { HmIpDeviceType } from './hmIPDevices/hmIpDeviceType';
+import { HmIpRoll } from './hmIPDevices/hmIpRoll';
+import { RoomBase } from '../../models/rooms/RoomBase';
+
+export class Rolladen {
+  public static getRolladenPosition(): string {
+    const rollos: HmIpRoll[] = Rolladen.getAllRollos();
+    rollos.sort((a, b): number => {
+      return b.currentLevel - a.currentLevel;
+    });
+
+    const response: string[] = [`Dies sind die aktuellen Rollo Positionen:`];
+    for (const r of rollos) {
+      response.push(`${r.currentLevel}% Rollo: "${r.info.customName}" Gewünschte Position: ${r.desiredFensterLevel}`);
+    }
+    response.push(`\nDie nächsten Zeiten zum Hochfahren:`);
+    const down: string[] = [`\nDie nächsten Zeiten zum Runterfahren:`];
+    const rooms: RoomBase[] = RoomBase.allRooms;
+    for (const r of rooms) {
+      for (const f of r.FensterGroup.fenster) {
+        if (f.rollo) {
+          response.push(
+            `Rollo: "${f.rollo.info.customName}"\t${
+              f.noRolloOnSunrise ? 'Hochfahren inaktiv' : r.sonnenAufgangCallback?.nextToDo?.toLocaleTimeString()
+            }`,
+          );
+          down.push(
+            `Rollo: "${f.rollo.info.customName}"\t${r.sonnenUntergangCallback?.nextToDo?.toLocaleTimeString()}`,
+          );
+        }
+      }
+    }
+    response.push(down.join('\n'));
+    return response.join('\n');
+  }
+
+  public static getAllRollos(): HmIpRoll[] {
+    const rollos: HmIpRoll[] = [];
+    for (const dID in Devices.hmIP) {
+      const d = Devices.hmIP[dID];
+      if (d.deviceType === HmIpDeviceType.HmIpRoll) {
+        rollos.push(d as HmIpRoll);
+      }
+    }
+    return rollos;
+  }
+}

package/server/devices/deviceUpdater.ts

@@ -1,72 +1,72 @@
-import { LogLevel } from '../../models/logLevel';
-import { ServerLogService } from '../services/log-service';
-import { Devices } from './devices';
-import { HmIPDevice } from './hmIPDevices/hmIpDevice';
-import { IDeviceUpdater } from './iDeviceUpdater';
-import { ZigbeeDevice } from './zigbee/zigbeeDevice';
-
-export class DeviceUpdater implements IDeviceUpdater {
-  private static IDENTIFIER_HOMEMATIC: string = 'hm-rpc';
-  private static IDENTIFIER_ZIGBEE: string = 'zigbee';
-  public devices: Devices;
-
-  constructor(pDevices: Devices) {
-    this.devices = pDevices;
-  }
-
-  public updateObject(pId: string, pObj: ioBroker.Object): void {
-    const idSplit: string[] = pId.split('.');
-    if (idSplit.length < 2) return;
-
-    if (idSplit[0] === DeviceUpdater.IDENTIFIER_HOMEMATIC) {
-      console.log(`Neuer Wert in HomematicIP für ${pId}: ${JSON.stringify(pObj)}`);
-    }
-  }
-
-  public updateState(id: string, state: ioBroker.State, initial: boolean = false): void {
-    if (state === null) {
-      // Ignore null states
-      return;
-    }
-    const idSplit: string[] = id.split('.');
-    if (idSplit.length < 2) return;
-
-    if (idSplit[0] === DeviceUpdater.IDENTIFIER_HOMEMATIC) {
-      try {
-        this.updateHomeMaticDevice(idSplit, state, initial);
-      } catch (e: any) {
-        ServerLogService.writeLog(
-          LogLevel.Alert,
-          `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`,
-        );
-      }
-    } else if (idSplit[0] === DeviceUpdater.IDENTIFIER_ZIGBEE) {
-      try {
-        this.updateZigbeeDevice(idSplit, state, initial);
-      } catch (e: any) {
-        ServerLogService.writeLog(
-          LogLevel.Alert,
-          `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`,
-        );
-      }
-    } else {
-      ServerLogService.writeLog(LogLevel.DeepTrace, `unbekannter Identifier: "${idSplit[0]}"`);
-    }
-  }
-
-  private updateHomeMaticDevice(idSplit: string[], state: ioBroker.State, initial: boolean = false) {
-    const device: undefined | HmIPDevice = Devices.hmIP[idSplit[2]];
-    if (typeof device === 'undefined') {
-      return;
-    }
-    device.update(idSplit, state, initial);
-  }
-
-  private updateZigbeeDevice(idSplit: string[], state: ioBroker.State, initial: boolean = false) {
-    const device: undefined | ZigbeeDevice = Devices.Zigbee[idSplit[2]];
-    if (typeof device === 'undefined') {
-      return;
-    }
-    device.update(idSplit, state, initial);
-  }
-}
+import { LogLevel } from '../../models/logLevel';
+import { ServerLogService } from '../services/log-service';
+import { Devices } from './devices';
+import { HmIPDevice } from './hmIPDevices/hmIpDevice';
+import { IDeviceUpdater } from './iDeviceUpdater';
+import { ZigbeeDevice } from './zigbee/zigbeeDevice';
+
+export class DeviceUpdater implements IDeviceUpdater {
+  private static IDENTIFIER_HOMEMATIC: string = 'hm-rpc';
+  private static IDENTIFIER_ZIGBEE: string = 'zigbee';
+  public devices: Devices;
+
+  constructor(pDevices: Devices) {
+    this.devices = pDevices;
+  }
+
+  public updateObject(pId: string, pObj: ioBroker.Object): void {
+    const idSplit: string[] = pId.split('.');
+    if (idSplit.length < 2) return;
+
+    if (idSplit[0] === DeviceUpdater.IDENTIFIER_HOMEMATIC) {
+      console.log(`Neuer Wert in HomematicIP für ${pId}: ${JSON.stringify(pObj)}`);
+    }
+  }
+
+  public updateState(id: string, state: ioBroker.State, initial: boolean = false): void {
+    if (state === null) {
+      // Ignore null states
+      return;
+    }
+    const idSplit: string[] = id.split('.');
+    if (idSplit.length < 2) return;
+
+    if (idSplit[0] === DeviceUpdater.IDENTIFIER_HOMEMATIC) {
+      try {
+        this.updateHomeMaticDevice(idSplit, state, initial);
+      } catch (e: any) {
+        ServerLogService.writeLog(
+          LogLevel.Alert,
+          `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`,
+        );
+      }
+    } else if (idSplit[0] === DeviceUpdater.IDENTIFIER_ZIGBEE) {
+      try {
+        this.updateZigbeeDevice(idSplit, state, initial);
+      } catch (e: any) {
+        ServerLogService.writeLog(
+          LogLevel.Alert,
+          `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`,
+        );
+      }
+    } else {
+      ServerLogService.writeLog(LogLevel.DeepTrace, `unbekannter Identifier: "${idSplit[0]}"`);
+    }
+  }
+
+  private updateHomeMaticDevice(idSplit: string[], state: ioBroker.State, initial: boolean = false) {
+    const device: undefined | HmIPDevice = Devices.hmIP[idSplit[2]];
+    if (typeof device === 'undefined') {
+      return;
+    }
+    device.update(idSplit, state, initial);
+  }
+
+  private updateZigbeeDevice(idSplit: string[], state: ioBroker.State, initial: boolean = false) {
+    const device: undefined | ZigbeeDevice = Devices.Zigbee[idSplit[2]];
+    if (typeof device === 'undefined') {
+      return;
+    }
+    device.update(idSplit, state, initial);
+  }
+}