hoffmation-base 0.1.1 → 0.1.5

package/server/devices/zigbee/zigbeeIkeaSteckdose.ts

@@ -1,31 +1,31 @@
-import { LogLevel } from '../../../models/logLevel';
-import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { ServerLogService } from '../../services/log-service';
-import { ZigbeeActuator } from './ZigbeeActuator';
-
-export class ZigbeeIkeaSteckdose extends ZigbeeActuator {
-  public get steckerOn(): boolean {
-    return super.actuatorOn;
-  }
-
-  public constructor(pInfo: DeviceInfo) {
-    super(pInfo, ZigbeeDeviceType.ZigbeeIkeaSteckdose, `${pInfo.fullID}.state`);
-  }
-
-  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
-    ServerLogService.writeLog(
-      LogLevel.DeepTrace,
-      `Stecker Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
-    );
-    super.update(idSplit, state, initial, true);
-  }
-
-  public setStecker(pValue: boolean, timeout: number = -1, force: boolean = false): void {
-    super.setActuator(pValue, timeout, force);
-  }
-
-  public toggleStecker(force: boolean = false): boolean {
-    return super.toggleActuator(force);
-  }
-}
+import { LogLevel } from '../../../models/logLevel';
+import { DeviceInfo } from '../DeviceInfo';
+import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { ServerLogService } from '../../services/log-service';
+import { ZigbeeActuator } from './ZigbeeActuator';
+
+export class ZigbeeIkeaSteckdose extends ZigbeeActuator {
+  public get steckerOn(): boolean {
+    return super.actuatorOn;
+  }
+
+  public constructor(pInfo: DeviceInfo) {
+    super(pInfo, ZigbeeDeviceType.ZigbeeIkeaSteckdose, `${pInfo.fullID}.state`);
+  }
+
+  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
+    ServerLogService.writeLog(
+      LogLevel.DeepTrace,
+      `Stecker Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
+    );
+    super.update(idSplit, state, initial, true);
+  }
+
+  public setStecker(pValue: boolean, timeout: number = -1, force: boolean = false): void {
+    super.setActuator(pValue, timeout, force);
+  }
+
+  public toggleStecker(force: boolean = false): boolean {
+    return super.toggleActuator(force);
+  }
+}

package/server/devices/zigbee/zigbeeIlluActuator.ts

@@ -1,37 +1,37 @@
-import { LogLevel } from '../../../models/logLevel';
-import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { ServerLogService } from '../../services/log-service';
-import { ZigbeeActuator } from './ZigbeeActuator';
-
-export class ZigbeeIlluActuator extends ZigbeeActuator {
-  public get isActuatorOn(): boolean {
-    return this.actuatorOn;
-  }
-  public constructor(pInfo: DeviceInfo, deviceType: ZigbeeDeviceType = ZigbeeDeviceType.ZigbeeIlluActuator) {
-    super(pInfo, deviceType, `${pInfo.fullID}.state`);
-  }
-
-  public update(
-    idSplit: string[],
-    state: ioBroker.State,
-    initial: boolean = false,
-    handledByChildObject: boolean = false,
-  ): void {
-    if (!handledByChildObject) {
-      ServerLogService.writeLog(
-        LogLevel.DeepTrace,
-        `Aktuator Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
-      );
-    }
-    super.update(idSplit, state, initial, true);
-  }
-
-  public setActuator(pValue: boolean, timeout: number = -1, force: boolean = false): void {
-    super.setActuator(pValue, timeout, force);
-  }
-
-  public toggleActuator(force: boolean = false): boolean {
-    return super.toggleActuator(force);
-  }
-}
+import { LogLevel } from '../../../models/logLevel';
+import { DeviceInfo } from '../DeviceInfo';
+import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { ServerLogService } from '../../services/log-service';
+import { ZigbeeActuator } from './ZigbeeActuator';
+
+export class ZigbeeIlluActuator extends ZigbeeActuator {
+  public get isActuatorOn(): boolean {
+    return this.actuatorOn;
+  }
+  public constructor(pInfo: DeviceInfo, deviceType: ZigbeeDeviceType = ZigbeeDeviceType.ZigbeeIlluActuator) {
+    super(pInfo, deviceType, `${pInfo.fullID}.state`);
+  }
+
+  public update(
+    idSplit: string[],
+    state: ioBroker.State,
+    initial: boolean = false,
+    handledByChildObject: boolean = false,
+  ): void {
+    if (!handledByChildObject) {
+      ServerLogService.writeLog(
+        LogLevel.DeepTrace,
+        `Aktuator Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
+      );
+    }
+    super.update(idSplit, state, initial, true);
+  }
+
+  public setActuator(pValue: boolean, timeout: number = -1, force: boolean = false): void {
+    super.setActuator(pValue, timeout, force);
+  }
+
+  public toggleActuator(force: boolean = false): boolean {
+    return super.toggleActuator(force);
+  }
+}

package/server/devices/zigbee/zigbeeIlluDimmer.ts

@@ -1,165 +1,165 @@
-import { LogLevel } from '../../../models/logLevel';
-import { ServerLogService } from '../../services/log-service';
-import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDevice } from './zigbeeDevice';
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { DimmerSettings } from '../../../models/dimmerSettings';
-import { TimeOfDay } from '../../services/time-callback-service';
-import { Utils } from '../../services/utils/utils';
-
-export class ZigbeeIlluDimmer extends ZigbeeDevice {
-  public on: boolean = false;
-  public queuedValue: boolean | null = null;
-  public brightness: number = 0;
-  public transitionTime: number = 0;
-  public settings: DimmerSettings = new DimmerSettings();
-  private stateID: string = 'state';
-  private brightnessID: string = 'brightness';
-  private transitionID: string = 'transition_time';
-  private turnOffTimeout: NodeJS.Timeout | undefined = undefined;
-  private turnOffTime: number = 0;
-
-  public constructor(pInfo: DeviceInfo) {
-    super(pInfo, ZigbeeDeviceType.ZigbeeIlluDimmer);
-    this.stateID = `${this.info.fullID}.state`;
-    this.brightnessID = `${this.info.fullID}.brightness`;
-    this.transitionID = `${this.info.fullID}.transition_time`;
-  }
-
-  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
-    this.queuedValue = null;
-    ServerLogService.writeLog(
-      LogLevel.DeepTrace,
-      `Dimmer Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
-    );
-    super.update(idSplit, state, initial, true);
-    switch (idSplit[3]) {
-      case 'state':
-        ServerLogService.writeLog(LogLevel.Trace, `Dimmer Update für ${this.info.customName} auf ${state.val}`);
-        this.on = state.val as boolean;
-        break;
-      case 'brightness':
-        ServerLogService.writeLog(
-          LogLevel.Trace,
-          `Dimmer Helligkeit Update für ${this.info.customName} auf ${state.val}`,
-        );
-        this.brightness = state.val as number;
-        break;
-      case 'transition_time':
-        ServerLogService.writeLog(
-          LogLevel.Trace,
-          `Dimmer Transition Time Update für ${this.info.customName} auf ${state.val}`,
-        );
-        this.transitionTime = state.val as number;
-        break;
-    }
-  }
-
-  public setTimeBased(time: TimeOfDay, timeout: number = -1, force: boolean = false): void {
-    switch (time) {
-      case TimeOfDay.Night:
-        this.setLight(true, timeout, force, 50);
-        break;
-      case TimeOfDay.AfterSunset:
-      case TimeOfDay.BeforeSunrise:
-        this.setLight(true, timeout, force, 75);
-        break;
-      case TimeOfDay.Daylight:
-        this.setLight(true, timeout, force, 100);
-        break;
-    }
-  }
-
-  public setLight(
-    pValue: boolean,
-    timeout: number = -1,
-    force: boolean = false,
-    brightness: number = -1,
-    transitionTime: number = -1,
-  ): void {
-    if (this.stateID === '') {
-      ServerLogService.writeLog(LogLevel.Error, `Keine State ID für "${this.info.customName}" bekannt.`);
-      return;
-    }
-
-    if (!this.ioConn) {
-      ServerLogService.writeLog(LogLevel.Error, `Keine Connection für "${this.info.customName}" bekannt.`);
-      return;
-    }
-
-    if (transitionTime > -1) {
-      this.ioConn.setState(this.transitionID, transitionTime, (err) => {
-        if (err) {
-          ServerLogService.writeLog(LogLevel.Error, `Dimmer TransitionTime schalten ergab Fehler: ${err}`);
-        }
-      });
-    }
-
-    if (!force && Utils.nowMS() < this.turnOffTime) {
-      ServerLogService.writeLog(
-        LogLevel.Debug,
-        `Skip automatic command for "${this.info.customName}" to ${pValue} as it is locked until ${new Date(
-          this.turnOffTime,
-        ).toLocaleTimeString()}`,
-      );
-      return;
-    }
-
-    if (pValue && brightness === -1 && this.brightness < 10) {
-      brightness = 10;
-    }
-    ServerLogService.writeLog(
-      LogLevel.Debug,
-      `Dimmer Schalten: "${this.info.customName}" An: ${pValue}\tHelligkeit: ${brightness}%`,
-    );
-
-    this.ioConn.setState(this.stateID, pValue, (err) => {
-      if (err) {
-        ServerLogService.writeLog(LogLevel.Error, `Dimmer schalten ergab Fehler: ${err}`);
-      }
-    });
-    this.queuedValue = pValue;
-
-    if (brightness > -1) {
-      this.ioConn.setState(this.brightnessID, brightness, (err) => {
-        if (err) {
-          ServerLogService.writeLog(LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
-        }
-      });
-    }
-    if (this.turnOffTimeout !== undefined) {
-      clearTimeout(this.turnOffTimeout);
-      this.turnOffTimeout = undefined;
-    }
-
-    if (timeout < 0 || !pValue) {
-      return;
-    }
-
-    this.turnOffTime = Utils.nowMS() + timeout;
-    this.turnOffTimeout = Utils.guardedTimeout(
-      () => {
-        ServerLogService.writeLog(LogLevel.Debug, `Delayed Turnoff for "${this.info.customName}" initiated`);
-        this.turnOffTimeout = undefined;
-        if (!this.room) {
-          this.setLight(false, -1, true);
-        } else {
-          this.room.setLightTimeBased(true);
-        }
-      },
-      timeout,
-      this,
-    );
-  }
-
-  public toggleLight(time?: TimeOfDay, force: boolean = false): boolean {
-    const newVal = this.queuedValue !== null ? !this.queuedValue : !this.on;
-    const timeout: number = newVal && force ? 30 * 60 * 1000 : -1;
-    if (newVal && time !== undefined) {
-      this.setTimeBased(time, timeout, force);
-      return true;
-    }
-    this.setLight(newVal, timeout, force);
-    return newVal;
-  }
-}
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
+import { DeviceInfo } from '../DeviceInfo';
+import { ZigbeeDevice } from './zigbeeDevice';
+import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { DimmerSettings } from '../../../models/dimmerSettings';
+import { TimeOfDay } from '../../services/time-callback-service';
+import { Utils } from '../../services/utils/utils';
+
+export class ZigbeeIlluDimmer extends ZigbeeDevice {
+  public on: boolean = false;
+  public queuedValue: boolean | null = null;
+  public brightness: number = 0;
+  public transitionTime: number = 0;
+  public settings: DimmerSettings = new DimmerSettings();
+  private stateID: string = 'state';
+  private brightnessID: string = 'brightness';
+  private transitionID: string = 'transition_time';
+  private turnOffTimeout: NodeJS.Timeout | undefined = undefined;
+  private turnOffTime: number = 0;
+
+  public constructor(pInfo: DeviceInfo) {
+    super(pInfo, ZigbeeDeviceType.ZigbeeIlluDimmer);
+    this.stateID = `${this.info.fullID}.state`;
+    this.brightnessID = `${this.info.fullID}.brightness`;
+    this.transitionID = `${this.info.fullID}.transition_time`;
+  }
+
+  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
+    this.queuedValue = null;
+    ServerLogService.writeLog(
+      LogLevel.DeepTrace,
+      `Dimmer Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
+    );
+    super.update(idSplit, state, initial, true);
+    switch (idSplit[3]) {
+      case 'state':
+        ServerLogService.writeLog(LogLevel.Trace, `Dimmer Update für ${this.info.customName} auf ${state.val}`);
+        this.on = state.val as boolean;
+        break;
+      case 'brightness':
+        ServerLogService.writeLog(
+          LogLevel.Trace,
+          `Dimmer Helligkeit Update für ${this.info.customName} auf ${state.val}`,
+        );
+        this.brightness = state.val as number;
+        break;
+      case 'transition_time':
+        ServerLogService.writeLog(
+          LogLevel.Trace,
+          `Dimmer Transition Time Update für ${this.info.customName} auf ${state.val}`,
+        );
+        this.transitionTime = state.val as number;
+        break;
+    }
+  }
+
+  public setTimeBased(time: TimeOfDay, timeout: number = -1, force: boolean = false): void {
+    switch (time) {
+      case TimeOfDay.Night:
+        this.setLight(true, timeout, force, 50);
+        break;
+      case TimeOfDay.AfterSunset:
+      case TimeOfDay.BeforeSunrise:
+        this.setLight(true, timeout, force, 75);
+        break;
+      case TimeOfDay.Daylight:
+        this.setLight(true, timeout, force, 100);
+        break;
+    }
+  }
+
+  public setLight(
+    pValue: boolean,
+    timeout: number = -1,
+    force: boolean = false,
+    brightness: number = -1,
+    transitionTime: number = -1,
+  ): void {
+    if (this.stateID === '') {
+      ServerLogService.writeLog(LogLevel.Error, `Keine State ID für "${this.info.customName}" bekannt.`);
+      return;
+    }
+
+    if (!this.ioConn) {
+      ServerLogService.writeLog(LogLevel.Error, `Keine Connection für "${this.info.customName}" bekannt.`);
+      return;
+    }
+
+    if (transitionTime > -1) {
+      this.ioConn.setState(this.transitionID, transitionTime, (err) => {
+        if (err) {
+          ServerLogService.writeLog(LogLevel.Error, `Dimmer TransitionTime schalten ergab Fehler: ${err}`);
+        }
+      });
+    }
+
+    if (!force && Utils.nowMS() < this.turnOffTime) {
+      ServerLogService.writeLog(
+        LogLevel.Debug,
+        `Skip automatic command for "${this.info.customName}" to ${pValue} as it is locked until ${new Date(
+          this.turnOffTime,
+        ).toLocaleTimeString()}`,
+      );
+      return;
+    }
+
+    if (pValue && brightness === -1 && this.brightness < 10) {
+      brightness = 10;
+    }
+    ServerLogService.writeLog(
+      LogLevel.Debug,
+      `Dimmer Schalten: "${this.info.customName}" An: ${pValue}\tHelligkeit: ${brightness}%`,
+    );
+
+    this.ioConn.setState(this.stateID, pValue, (err) => {
+      if (err) {
+        ServerLogService.writeLog(LogLevel.Error, `Dimmer schalten ergab Fehler: ${err}`);
+      }
+    });
+    this.queuedValue = pValue;
+
+    if (brightness > -1) {
+      this.ioConn.setState(this.brightnessID, brightness, (err) => {
+        if (err) {
+          ServerLogService.writeLog(LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
+        }
+      });
+    }
+    if (this.turnOffTimeout !== undefined) {
+      clearTimeout(this.turnOffTimeout);
+      this.turnOffTimeout = undefined;
+    }
+
+    if (timeout < 0 || !pValue) {
+      return;
+    }
+
+    this.turnOffTime = Utils.nowMS() + timeout;
+    this.turnOffTimeout = Utils.guardedTimeout(
+      () => {
+        ServerLogService.writeLog(LogLevel.Debug, `Delayed Turnoff for "${this.info.customName}" initiated`);
+        this.turnOffTimeout = undefined;
+        if (!this.room) {
+          this.setLight(false, -1, true);
+        } else {
+          this.room.setLightTimeBased(true);
+        }
+      },
+      timeout,
+      this,
+    );
+  }
+
+  public toggleLight(time?: TimeOfDay, force: boolean = false): boolean {
+    const newVal = this.queuedValue !== null ? !this.queuedValue : !this.on;
+    const timeout: number = newVal && force ? 30 * 60 * 1000 : -1;
+    if (newVal && time !== undefined) {
+      this.setTimeBased(time, timeout, force);
+      return true;
+    }
+    this.setLight(newVal, timeout, force);
+    return newVal;
+  }
+}

package/server/devices/zigbee/zigbeeIlluLampe.ts

@@ -1,33 +1,33 @@
-import { LogLevel } from '../../../models/logLevel';
-import { ServerLogService } from '../../services/log-service';
-import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { ZigbeeIlluActuator } from './zigbeeIlluActuator';
-
-export class ZigbeeIlluLampe extends ZigbeeIlluActuator {
-  public get lampOn(): boolean {
-    return super.actuatorOn;
-  }
-
-  public constructor(pInfo: DeviceInfo) {
-    super(pInfo, ZigbeeDeviceType.ZigbeeIlluLampe);
-  }
-
-  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
-    super.update(idSplit, state, initial, true);
-    switch (idSplit[3]) {
-      case 'state':
-        ServerLogService.writeLog(LogLevel.Trace, `Lampen Update für ${this.info.customName} auf ${state.val}`);
-        break;
-    }
-  }
-
-  public setLight(pValue: boolean, timeout: number = -1, force: boolean = false): void {
-    ServerLogService.writeLog(LogLevel.Debug, `Lampenaktor schalten: "${this.info.customName}" Wert: ${pValue}`);
-    super.setActuator(pValue, timeout, force);
-  }
-
-  public toggleLight(force: boolean = false): boolean {
-    return super.toggleActuator(force);
-  }
-}
+import { LogLevel } from '../../../models/logLevel';
+import { ServerLogService } from '../../services/log-service';
+import { DeviceInfo } from '../DeviceInfo';
+import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { ZigbeeIlluActuator } from './zigbeeIlluActuator';
+
+export class ZigbeeIlluLampe extends ZigbeeIlluActuator {
+  public get lampOn(): boolean {
+    return super.actuatorOn;
+  }
+
+  public constructor(pInfo: DeviceInfo) {
+    super(pInfo, ZigbeeDeviceType.ZigbeeIlluLampe);
+  }
+
+  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false): void {
+    super.update(idSplit, state, initial, true);
+    switch (idSplit[3]) {
+      case 'state':
+        ServerLogService.writeLog(LogLevel.Trace, `Lampen Update für ${this.info.customName} auf ${state.val}`);
+        break;
+    }
+  }
+
+  public setLight(pValue: boolean, timeout: number = -1, force: boolean = false): void {
+    ServerLogService.writeLog(LogLevel.Debug, `Lampenaktor schalten: "${this.info.customName}" Wert: ${pValue}`);
+    super.setActuator(pValue, timeout, force);
+  }
+
+  public toggleLight(force: boolean = false): boolean {
+    return super.toggleActuator(force);
+  }
+}