hoffmation-base 0.1.1 → 0.1.5

package/server/devices/wledDevice.ts

@@ -1,124 +1,124 @@
-import { LogLevel } from '../../models/logLevel';
-import { ServerLogService } from '../services/log-service';
-import { IOBrokerConnection } from '../ioBroker/connection';
-import { DeviceInfo } from './DeviceInfo';
-
-export class WledDevice {
-  public on: boolean = false;
-  public brightness: number = -1;
-  public linkQuality: number = 0;
-  public battery: number = -1;
-  public voltage: string = '';
-  private _info: DeviceInfo;
-  private _ioConnection?: IOBrokerConnection;
-  private _onID: string;
-  private _brightnessID: string;
-
-  public constructor(pInfo: DeviceInfo) {
-    this._info = pInfo;
-    this.addToCorrectRoom();
-    this._onID = `${this.info.fullID}.on`;
-    this._brightnessID = `${this.info.fullID}.bri`;
-  }
-
-  /**
-   * Getter info
-   * @return {DeviceInfo}
-   */
-  public get info(): DeviceInfo {
-    return this._info;
-  }
-
-  /**
-   * Setter info
-   * @param {DeviceInfo} value
-   */
-  public set info(value: DeviceInfo) {
-    this._info = value;
-  }
-
-  /**
-   * Getter ioConn
-   * @return {IOBrokerConnection}
-   */
-  public get ioConn(): IOBrokerConnection | undefined {
-    return this._ioConnection;
-  }
-
-  /**
-   * Setter ioConn
-   * @param {IOBrokerConnection} value
-   */
-  public set ioConn(value: IOBrokerConnection | undefined) {
-    this._ioConnection = value;
-  }
-
-  private addToCorrectRoom(): void {
-    ServerLogService.writeLog(LogLevel.DeepTrace, `Neues Zigbee Gerät für ${this._info.room}`);
-    switch (this._info.room) {
-      case 'Wohnz':
-        // room1OGWohn.addWLED(this._info);
-        break;
-      default:
-        console.warn(`${this._info.room} ist noch kein bekannter Raum für WLED Geräte`);
-    }
-  }
-
-  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false, pOverride: boolean = false): void {
-    ServerLogService.writeLog(
-      LogLevel.DeepTrace,
-      `Wled:Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
-    );
-    if (!pOverride) {
-      ServerLogService.writeLog(
-        LogLevel.Warn,
-        `Keine Update Überschreibung für "${this.info.customName}":\n\tID: ${idSplit.join(
-          '.',
-        )}\n\tData: ${JSON.stringify(state)}`,
-      );
-    }
-
-    switch (idSplit[3]) {
-      case 'on':
-        this.on = state.val as boolean;
-        break;
-      case 'bri':
-        this.brightness = state.val as number;
-        break;
-    }
-  }
-
-  public setLight(pValue: boolean, brightness: number = -1): void {
-    if (this._onID === '') {
-      ServerLogService.writeLog(LogLevel.Error, `Keine On 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 (pValue && brightness === -1 && this.brightness < 10) {
-      brightness = 10;
-    }
-    ServerLogService.writeLog(
-      LogLevel.Debug,
-      `WLED Schalten: "${this.info.customName}" An: ${pValue}\tHelligkeit: ${brightness}%`,
-    );
-
-    this.ioConn.setState(this._onID, pValue, (err) => {
-      if (err) {
-        ServerLogService.writeLog(LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
-      }
-    });
-
-    if (brightness > -1) {
-      this.ioConn.setState(this._brightnessID, brightness, (err) => {
-        if (err) {
-          ServerLogService.writeLog(LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
-        }
-      });
-    }
-  }
-}
+import { LogLevel } from '../../models/logLevel';
+import { ServerLogService } from '../services/log-service';
+import { IOBrokerConnection } from '../ioBroker/connection';
+import { DeviceInfo } from './DeviceInfo';
+
+export class WledDevice {
+  public on: boolean = false;
+  public brightness: number = -1;
+  public linkQuality: number = 0;
+  public battery: number = -1;
+  public voltage: string = '';
+  private _info: DeviceInfo;
+  private _ioConnection?: IOBrokerConnection;
+  private _onID: string;
+  private _brightnessID: string;
+
+  public constructor(pInfo: DeviceInfo) {
+    this._info = pInfo;
+    this.addToCorrectRoom();
+    this._onID = `${this.info.fullID}.on`;
+    this._brightnessID = `${this.info.fullID}.bri`;
+  }
+
+  /**
+   * Getter info
+   * @return {DeviceInfo}
+   */
+  public get info(): DeviceInfo {
+    return this._info;
+  }
+
+  /**
+   * Setter info
+   * @param {DeviceInfo} value
+   */
+  public set info(value: DeviceInfo) {
+    this._info = value;
+  }
+
+  /**
+   * Getter ioConn
+   * @return {IOBrokerConnection}
+   */
+  public get ioConn(): IOBrokerConnection | undefined {
+    return this._ioConnection;
+  }
+
+  /**
+   * Setter ioConn
+   * @param {IOBrokerConnection} value
+   */
+  public set ioConn(value: IOBrokerConnection | undefined) {
+    this._ioConnection = value;
+  }
+
+  private addToCorrectRoom(): void {
+    ServerLogService.writeLog(LogLevel.DeepTrace, `Neues Zigbee Gerät für ${this._info.room}`);
+    switch (this._info.room) {
+      case 'Wohnz':
+        // room1OGWohn.addWLED(this._info);
+        break;
+      default:
+        console.warn(`${this._info.room} ist noch kein bekannter Raum für WLED Geräte`);
+    }
+  }
+
+  public update(idSplit: string[], state: ioBroker.State, initial: boolean = false, pOverride: boolean = false): void {
+    ServerLogService.writeLog(
+      LogLevel.DeepTrace,
+      `Wled:Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`,
+    );
+    if (!pOverride) {
+      ServerLogService.writeLog(
+        LogLevel.Warn,
+        `Keine Update Überschreibung für "${this.info.customName}":\n\tID: ${idSplit.join(
+          '.',
+        )}\n\tData: ${JSON.stringify(state)}`,
+      );
+    }
+
+    switch (idSplit[3]) {
+      case 'on':
+        this.on = state.val as boolean;
+        break;
+      case 'bri':
+        this.brightness = state.val as number;
+        break;
+    }
+  }
+
+  public setLight(pValue: boolean, brightness: number = -1): void {
+    if (this._onID === '') {
+      ServerLogService.writeLog(LogLevel.Error, `Keine On 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 (pValue && brightness === -1 && this.brightness < 10) {
+      brightness = 10;
+    }
+    ServerLogService.writeLog(
+      LogLevel.Debug,
+      `WLED Schalten: "${this.info.customName}" An: ${pValue}\tHelligkeit: ${brightness}%`,
+    );
+
+    this.ioConn.setState(this._onID, pValue, (err) => {
+      if (err) {
+        ServerLogService.writeLog(LogLevel.Error, `WLED schalten ergab Fehler: ${err}`);
+      }
+    });
+
+    if (brightness > -1) {
+      this.ioConn.setState(this._brightnessID, brightness, (err) => {
+        if (err) {
+          ServerLogService.writeLog(LogLevel.Error, `Dimmer Helligkeit schalten ergab Fehler: ${err}`);
+        }
+      });
+    }
+  }
+}

package/server/devices/zigbee/ZigbeeActuator.ts

@@ -1,113 +1,113 @@
-import { LogLevel } from '../../../models/logLevel';
-import { ZigbeeDevice } from './zigbeeDevice';
-import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDeviceType } from './zigbeeDeviceType';
-import { ServerLogService } from '../../services/log-service';
-import { Utils } from '../../services/utils/utils';
-import { LampSettings } from '../../../models/lampSettings';
-
-export class ZigbeeActuator extends ZigbeeDevice {
-  public settings: LampSettings = new LampSettings();
-  protected readonly actuatorOnSwitchID: string;
-  protected queuedValue: boolean | null = null;
-  protected actuatorOn: boolean = false;
-  private turnOffTimeout: NodeJS.Timeout | undefined = undefined;
-  private turnOffTime: number = 0;
-
-  public constructor(pInfo: DeviceInfo, type: ZigbeeDeviceType, actuatorOnSwitchID: string) {
-    super(pInfo, type);
-    this.actuatorOnSwitchID = actuatorOnSwitchID;
-  }
-
-  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)}`,
-      );
-    }
-    this.queuedValue = null;
-    super.update(idSplit, state, initial, true);
-    switch (idSplit[3]) {
-      case 'state':
-        !handledByChildObject &&
-          ServerLogService.writeLog(LogLevel.Trace, `Aktor Update für ${this.info.customName} auf ${state.val}`);
-        this.actuatorOn = state.val as boolean;
-        break;
-    }
-  }
-
-  public setActuator(pValue: boolean, timeout: number = -1, force: boolean = false): void {
-    if (this.actuatorOnSwitchID === '') {
-      ServerLogService.writeLog(LogLevel.Error, `Keine Switch ID für "${this.info.customName}" bekannt.`);
-      return;
-    }
-
-    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 (!this.ioConn) {
-      ServerLogService.writeLog(LogLevel.Error, `Keine Connection für "${this.info.customName}" bekannt.`);
-      return;
-    }
-
-    if (!force && pValue === this.actuatorOn && this.queuedValue === null) {
-      ServerLogService.writeLog(
-        LogLevel.Debug,
-        `Skip actuator command for "${this.info.customName}" as it is already ${pValue}`,
-      );
-      return;
-    }
-
-    ServerLogService.writeLog(LogLevel.Debug, `Stecker schalten: "${this.info.customName}" Wert: ${pValue}`);
-    this.ioConn.setState(this.actuatorOnSwitchID, pValue, (err) => {
-      if (err) {
-        console.log(`Stecker schalten ergab Fehler: ${err}`);
-      }
-    });
-    this.queuedValue = pValue;
-
-    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.setActuator(false, -1, true);
-        } else {
-          this.room.setLightTimeBased(true);
-        }
-      },
-      timeout,
-      this,
-    );
-  }
-
-  public toggleActuator(force: boolean = false): boolean {
-    const newVal = this.queuedValue !== null ? !this.queuedValue : !this.actuatorOn;
-    const timeout: number = newVal && force ? 30 * 60 * 1000 : -1;
-    this.setActuator(newVal, timeout, force);
-    return newVal;
-  }
-}
+import { LogLevel } from '../../../models/logLevel';
+import { ZigbeeDevice } from './zigbeeDevice';
+import { DeviceInfo } from '../DeviceInfo';
+import { ZigbeeDeviceType } from './zigbeeDeviceType';
+import { ServerLogService } from '../../services/log-service';
+import { Utils } from '../../services/utils/utils';
+import { LampSettings } from '../../../models/lampSettings';
+
+export class ZigbeeActuator extends ZigbeeDevice {
+  public settings: LampSettings = new LampSettings();
+  protected readonly actuatorOnSwitchID: string;
+  protected queuedValue: boolean | null = null;
+  protected actuatorOn: boolean = false;
+  private turnOffTimeout: NodeJS.Timeout | undefined = undefined;
+  private turnOffTime: number = 0;
+
+  public constructor(pInfo: DeviceInfo, type: ZigbeeDeviceType, actuatorOnSwitchID: string) {
+    super(pInfo, type);
+    this.actuatorOnSwitchID = actuatorOnSwitchID;
+  }
+
+  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)}`,
+      );
+    }
+    this.queuedValue = null;
+    super.update(idSplit, state, initial, true);
+    switch (idSplit[3]) {
+      case 'state':
+        !handledByChildObject &&
+          ServerLogService.writeLog(LogLevel.Trace, `Aktor Update für ${this.info.customName} auf ${state.val}`);
+        this.actuatorOn = state.val as boolean;
+        break;
+    }
+  }
+
+  public setActuator(pValue: boolean, timeout: number = -1, force: boolean = false): void {
+    if (this.actuatorOnSwitchID === '') {
+      ServerLogService.writeLog(LogLevel.Error, `Keine Switch ID für "${this.info.customName}" bekannt.`);
+      return;
+    }
+
+    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 (!this.ioConn) {
+      ServerLogService.writeLog(LogLevel.Error, `Keine Connection für "${this.info.customName}" bekannt.`);
+      return;
+    }
+
+    if (!force && pValue === this.actuatorOn && this.queuedValue === null) {
+      ServerLogService.writeLog(
+        LogLevel.Debug,
+        `Skip actuator command for "${this.info.customName}" as it is already ${pValue}`,
+      );
+      return;
+    }
+
+    ServerLogService.writeLog(LogLevel.Debug, `Stecker schalten: "${this.info.customName}" Wert: ${pValue}`);
+    this.ioConn.setState(this.actuatorOnSwitchID, pValue, (err) => {
+      if (err) {
+        console.log(`Stecker schalten ergab Fehler: ${err}`);
+      }
+    });
+    this.queuedValue = pValue;
+
+    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.setActuator(false, -1, true);
+        } else {
+          this.room.setLightTimeBased(true);
+        }
+      },
+      timeout,
+      this,
+    );
+  }
+
+  public toggleActuator(force: boolean = false): boolean {
+    const newVal = this.queuedValue !== null ? !this.queuedValue : !this.actuatorOn;
+    const timeout: number = newVal && force ? 30 * 60 * 1000 : -1;
+    this.setActuator(newVal, timeout, force);
+    return newVal;
+  }
+}