hoffmation-base 2.22.9 → 2.22.11

package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.d.ts

@@ -41,4 +41,5 @@ export declare abstract class ZigbeeDimmer extends ZigbeeDevice implements iDimm
     setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number): void;
     persist(): void;
     toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
+    private setBrightnessState;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.js

@@ -106,7 +106,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {
             return;
         }
-        if (pValue && brightness === -1 && this.brightness < 10) {
+        if (pValue && brightness <= 0 && this.brightness < 10) {
             brightness = 10;
         }
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, services_1.LogDebugType.SetActuator);
@@ -120,13 +120,13 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             return;
         }
         if (brightness >= this.settings.turnOnThreshhold) {
-            this.setState(this._stateIdBrightness, brightness);
+            this.setBrightnessState(brightness);
             return;
         }
-        this.setState(this._stateIdBrightness, this.settings.turnOnThreshhold, () => {
+        this.setBrightnessState(this.settings.turnOnThreshhold, () => {
             services_1.Utils.guardedTimeout(() => {
                 this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
-                this.setState(this._stateIdBrightness, brightness);
+                this.setBrightnessState(brightness);
             }, 1000, this);
         });
     }
@@ -142,5 +142,8 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
     toggleLight(time, force = false, calculateTime = false) {
         return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
     }
+    setBrightnessState(brightness, onSuccess) {
+        this.setState(this._stateIdBrightness, Math.max(0, Math.min(brightness, 100)), onSuccess);
+    }
 }
 exports.ZigbeeDimmer = ZigbeeDimmer;

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

@@ -1,5 +1,5 @@
-import { Device as GoveeDevice } from 'theimo1221-govee-lan-control';
 import { OwnGoveeDevice } from './own-govee-device';
+import { Device as GoveeDevice } from '@j3lte/govee-lan-controller';
 export declare class GooveeService {
     static all: GoveeDevice[];
     static devicesDict: {

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

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GooveeService = void 0;
 const log_service_1 = require("../log-service");
 const models_1 = require("../../../models");
-const theimo1221_govee_lan_control_1 = __importDefault(require("theimo1221-govee-lan-control"));
+const govee_lan_controller_1 = require("@j3lte/govee-lan-controller");
 class GooveeService {
     static addOwnDevices(gvDevice) {
         this.ownDevices = gvDevice;
@@ -14,40 +11,52 @@ class GooveeService {
     static initialize() {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Initializing Goovee-Service`);
         this.all = [];
-        this.goveeApi = new theimo1221_govee_lan_control_1.default({
-            logger: (message) => {
-                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Govee: ${message}`);
-            },
-            errorLogger: (message) => {
-                if (message.startsWith('UDP Socket was not')) {
-                    return;
-                }
-                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Govee: ${message}`);
-            },
-        });
-        this.goveeApi.on('deviceAdded', (device) => {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `GoveeDevice ${device.deviceID} joined`);
+        this.goveeApi = new govee_lan_controller_1.Govee({
+            discover: true,
+            discoverInterval: 300000,
+        });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.Scan, (data) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `GoveeDevice ${data.ip} scanned`);
+        });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.Ready, () => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Govee ready`);
+        });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.Error, (err) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Govee-Error: ${err}`);
+        });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.NewDevice, (device) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `GoveeDevice ${device.id} joined`);
             GooveeService.initializeDevice(device);
         });
-        this.goveeApi.on('updatedStatus', (device, data, _stateChanged) => {
-            GooveeService.updateDevice(device, data);
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.UnknownDevice, (_data) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `GoveeDevice unknown`);
+        });
+        this.goveeApi.on(govee_lan_controller_1.GoveeEventTypes.UnknownMessage, (data) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `GoveeDevice unknown message: ${data}`);
         });
+        this.goveeApi.discover();
     }
     static initializeDevice(d) {
-        this.devicesDict[d.deviceID] = d;
-        if (this.ownDevices[d.deviceID] === undefined) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Unknown Govee Device "${d.deviceID}"`);
+        this.devicesDict[d.id] = d;
+        if (this.ownDevices[d.id] === undefined) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Unknown Govee Device "${d.id}"`);
             return;
         }
-        this.ownDevices[d.deviceID].device = d;
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Govee ${d.deviceID} found at address ${d.ip}`);
+        const ownDevice = this.ownDevices[d.id];
+        ownDevice.device = d;
+        ownDevice.update(d.getState());
+        d.on(govee_lan_controller_1.GoveeDeviceEventTypes.StateChange, (data) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Govee ${d.id} state changed`);
+            this.updateDevice(d, data);
+        });
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Govee ${d.id} found at address ${d.ipAddr}`);
     }
     static updateDevice(device, data) {
-        if (this.ownDevices[device.deviceID] === undefined) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Unknown Govee Device "${device.deviceID}"`);
+        if (this.ownDevices[device.id] === undefined) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Unknown Govee Device "${device.id}"`);
             return;
         }
-        this.ownDevices[device.deviceID].update(data);
+        this.ownDevices[device.id].update(data);
     }
 }
 exports.GooveeService = GooveeService;

package/lib/server/services/govee/own-govee-device.d.ts

@@ -3,8 +3,9 @@ import { LedSettings, LogLevel, RoomBase, TimeOfDay } from '../../../models';
 import { LogDebugType } from '../log-service';
 import { DeviceCapability } from '../../devices/DeviceCapability';
 import { iLedRgbCct } from '../../devices/baseDeviceInterfaces/iLedRgbCct';
-import { Device as GoveeDevice, DeviceState as GoveeDeviceState } from 'theimo1221-govee-lan-control';
+import { Device as GoveeDevice, DeviceStateInfo as GoveeDeviceStateInfo } from '@j3lte/govee-lan-controller';
 import { BlockAutomaticHandler } from '../blockAutomaticHandler';
+import { DeviceState as GoveeDeviceState } from '@j3lte/govee-lan-controller/build/types/device';
 export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAutomatic {
     device: GoveeDevice | undefined;
     settings: LedSettings;
@@ -48,7 +49,7 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     persist(): void;
     toggleActuator(_force: boolean): boolean;
     toggleLight(time?: TimeOfDay, _force?: boolean, calculateTime?: boolean): boolean;
-    update(data: GoveeDeviceState): void;
+    update(data: GoveeDeviceState & GoveeDeviceStateInfo): void;
     private setBrightness;
     private setColor;
     private turnOn;

package/lib/server/services/govee/own-govee-device.js

@@ -176,14 +176,14 @@ class OwnGoveeDevice {
     }
     update(data) {
         this.queuedValue = null;
-        this.on = data.isOn === 1;
+        this.on = data.onOff === 1;
         this.brightness = data.brightness;
         this._color = `#${data.color.r.toString(16)}${data.color.g.toString(16)}${data.color.b.toString(16)}`;
-        this._colortemp = data.colorKelvin;
+        this._colortemp = data.colorTemInKelvin;
     }
     setBrightness(brightness, cb) {
         var _a;
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setBrightness(brightness).then(() => {
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setBrightness(brightness).then(() => {
             cb();
         }).catch((error) => {
             this.log(models_1.LogLevel.Error, `Govee set brightness resulted in error: ${error}`);
@@ -194,7 +194,12 @@ class OwnGoveeDevice {
         if (color === this._color) {
             return;
         }
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setColor({ hex: color }).then(() => {
+        const colors = utils_1.Utils.hexToRgb(color);
+        if (colors === null) {
+            this.log(models_1.LogLevel.Error, `Govee set color resulted in error: ${color} is not a valid color`);
+            return;
+        }
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setColorRGB(colors).then(() => {
             this.log(models_1.LogLevel.Debug, `Govee set color to ${color}`, log_service_1.LogDebugType.SetActuator);
         }).catch((error) => {
             this.log(models_1.LogLevel.Error, `Govee set color resulted in error: ${error}`);
@@ -206,7 +211,7 @@ class OwnGoveeDevice {
             return;
         }
         this.queuedValue = true;
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setOn().then(() => {
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.turnOn().then(() => {
             this.log(models_1.LogLevel.Debug, `Govee turned on`, log_service_1.LogDebugType.SetActuator);
         }).catch((error) => {
             this.log(models_1.LogLevel.Error, `Govee turn on resulted in error: ${error}`);
@@ -215,7 +220,7 @@ class OwnGoveeDevice {
     turnOff() {
         var _a;
         this.queuedValue = false;
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.actions.setOff().then(() => {
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.turnOff().then(() => {
             this.log(models_1.LogLevel.Debug, `Govee turned off`, log_service_1.LogDebugType.SetActuator);
         }).catch((error) => {
             this.log(models_1.LogLevel.Error, `Govee turn off resulted in error: ${error}`);

package/lib/server/services/utils/utils.d.ts

@@ -34,4 +34,9 @@ export declare class Utils {
     static nextMatchingDate(hours?: number, minutes?: number, now?: Date): Date;
     static timeWithinBorders(minimumHours: number, minimumMinutes: number, maxHours: number, maxMinutes: number, now?: Date): boolean;
     static formatHex(hex: string): string | null;
+    static hexToRgb(color: string): {
+        r: number;
+        g: number;
+        b: number;
+    } | null;
 }

package/lib/server/services/utils/utils.js

@@ -244,5 +244,26 @@ class Utils {
         }
         return hex;
     }
+    static hexToRgb(color) {
+        let hex = Utils.formatHex(color);
+        if (hex === null) {
+            return null;
+        }
+        const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+        hex = hex.replace(shorthandRegex, (_m, r, g, b) => {
+            return r + r + g + g + b + b;
+        });
+        const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+        if (!result || result.length !== 4) {
+            return null;
+        }
+        const r = parseInt(result[1], 16);
+        const g = parseInt(result[2], 16);
+        const b = parseInt(result[3], 16);
+        if (isNaN(r) || isNaN(g) || isNaN(b)) {
+            return null;
+        }
+        return { r, g, b };
+    }
 }
 exports.Utils = Utils;