hoffmation-base 3.0.0-alpha.43 → 3.0.0-alpha.45

package/lib/index.js

@@ -84,9 +84,9 @@ class HoffmationBase {
             server_1.SonosService.addOwnDevices(server_1.OwnSonosDevices.ownDevices);
             server_1.SonosService.initialize();
         }
-        if (server_1.SettingsService.settings.goveeDevicesPresent) {
+        if (server_1.SettingsService.settings.goveeSettings) {
             server_1.GooveeService.addOwnDevices(server_1.OwnGoveeDevices.ownDevices);
-            server_1.GooveeService.initialize();
+            server_1.GooveeService.initialize(server_1.SettingsService.settings.goveeSettings);
         }
         if ((_b = server_1.SettingsService.settings.daikin) === null || _b === void 0 ? void 0 : _b.active) {
             server_1.DaikinService.addOwnDevices(server_1.OwnAcDevices.ownDevices);

package/lib/server/config/iConfig.d.ts

@@ -23,6 +23,7 @@ import { iEnergyManagerSettings } from './iEnergyManagerSettings';
 import { iUnifiSettings } from './iUnifiSettings';
 import { iBlockAutomaticHandlerDefaults } from './iBlockAutomaticHandlerDefaults';
 import { iRestSettings } from './iRestSettings';
+import { iGoveeSettings } from './iGoveeSettings';
 /**
  * The main configuration for Hoffmation normally stored in the `main-config.json` file.
  */
@@ -56,9 +57,9 @@ export interface iConfig {
      */
     espresense?: iEspresenseSettings;
     /**
-     * Whether any Govee devices are present in the house and should be included in Hoffmation.
+     * @see iGoveeSettings
      */
-    goveeDevicesPresent?: boolean;
+    goveeSettings?: iGoveeSettings;
     /**
      * @see iHeaterSettings
      */

package/lib/server/config/iGoveeSettings.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Settings to connect to an external GoveeApi
+ */
+export interface iGoveeSettings {
+    /**
+     * The url of the {@link https://github.com/theimo1221/govee-express-api GoveeApi}
+     */
+    url: string;
+}

package/lib/server/config/iGoveeSettings.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/server/config/index.d.ts

@@ -26,3 +26,4 @@ export * from './iUnifiSettings';
 export * from './iUnifiConnectionOptions';
 export * from './iVictronSettings';
 export { iBlockAutomaticHandlerDefaults } from './iBlockAutomaticHandlerDefaults';
+export { iGoveeSettings } from './iGoveeSettings';

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

@@ -54,6 +54,7 @@ class AcDevice {
         this._room = room;
         if (room !== undefined && !this._movementCallbackAdded) {
             this._movementCallbackAdded = true;
+            // TODO: Maybe change to any Movement
             (_a = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.addFirstEnterCallback(this.onRoomFirstEnter.bind(this));
             (_b = room === null || room === void 0 ? void 0 : room.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.addLastLeftCallback(this.onRoomLastLeave.bind(this));
         }

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

@@ -0,0 +1,25 @@
+/**
+ * Interface for any device data updates
+ */
+export interface GoveeDeviceData {
+    /**
+     * The device id form Govee
+     */
+    id: string;
+    /**
+     * The current state
+     */
+    actuatorOn: boolean;
+    /**
+     * The active brightness
+     */
+    brightness: number;
+    /**
+     * The hex coded active color starting with #
+     */
+    hexColor: string;
+    /**
+     * The colortemp
+     */
+    colortemp: number;
+}

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,12 +1,14 @@
 import { OwnGoveeDevice } from './own-govee-device';
+import { iGoveeSettings } from '../../config';
 export declare class GooveeService {
-    private static devicesDict;
-    private static goveeApi;
+    private static _serverUrl;
     private static ownDevices;
+    private static _refreshInterval;
     static addOwnDevices(gvDevice: {
         [name: string]: OwnGoveeDevice;
     }): void;
-    static initialize(): void;
-    private static initializeDevice;
-    private static updateDevice;
+    static initialize(config: iGoveeSettings): void;
+    static cleanup(): void;
+    static sendCommand(device: OwnGoveeDevice, command: string): Promise<boolean>;
+    private static loadDevices;
 }

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

@@ -1,63 +1,90 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GooveeService = void 0;
 const log_service_1 = require("../log-service");
 const models_1 = require("../../../models");
-const govee_lan_controller_1 = require("@j3lte/govee-lan-controller");
+const http = __importStar(require("http"));
+const utils_1 = require("../utils");
 class GooveeService {
     static addOwnDevices(gvDevice) {
         this.ownDevices = gvDevice;
     }
-    static initialize() {
+    static initialize(config) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, 'Initializing Goovee-Service');
-        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(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();
+        this._serverUrl = config.url;
+        this._refreshInterval = utils_1.Utils.guardedInterval(this.loadDevices, 5000, this, true);
     }
-    static initializeDevice(d) {
-        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;
+    static cleanup() {
+        if (this._refreshInterval !== null) {
+            clearInterval(this._refreshInterval);
+            this._refreshInterval = null;
         }
-        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);
+    }
+    static async sendCommand(device, command) {
+        return new Promise((resolve, _reject) => {
+            const requestLink = `${this._serverUrl}/device/${device.deviceId}/${command}`;
+            const req = http.get(requestLink, (res) => {
+                if (res.statusCode !== 200) {
+                    log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Failed to send Govee Command(${requestLink}): ${res.statusCode} - ${res.statusMessage}`);
+                    resolve(false);
+                    return;
+                }
+                resolve(true);
+                return;
+            });
+            req.on('error', (e) => {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Govee Error: ${e.message}`);
+            });
         });
-        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.id] === undefined) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Unknown Govee Device "${device.id}"`);
-            return;
-        }
-        this.ownDevices[device.id].update(data);
+    static loadDevices() {
+        const req = http.get(`${this._serverUrl}/devices`, (res) => {
+            if (res.statusCode !== 200) {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `Failed to load Govee Devices: ${res.statusCode}`);
+                return;
+            }
+            res.on('data', (d) => {
+                const data = JSON.parse(d.toString());
+                Object.keys(data).forEach((key) => {
+                    const deviceData = data[key];
+                    const ownDevice = this.ownDevices[key];
+                    if (ownDevice === undefined) {
+                        log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `Unknown Govee Device "${key}"`);
+                        return;
+                    }
+                    ownDevice.update(deviceData);
+                });
+            });
+        });
+        req.on('error', (e) => {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Govee Error: ${e.message}`);
+        });
     }
 }
 exports.GooveeService = GooveeService;
-GooveeService.devicesDict = {};
+GooveeService._serverUrl = 'http://127.0.0.1:3000';
 GooveeService.ownDevices = {};
+GooveeService._refreshInterval = null;

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

@@ -3,11 +3,9 @@ import { ActuatorSetStateCommand, ActuatorToggleCommand, ActuatorWriteStateToDev
 import { LogDebugType } from '../log-service';
 import { DeviceCapability } from '../../devices/DeviceCapability';
 import { iLedRgbCct } from '../../devices/baseDeviceInterfaces/iLedRgbCct';
-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';
+import { GoveeDeviceData } from './govee-device-data';
 export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAutomatic {
-    device: GoveeDevice | undefined;
     /** @inheritDoc */
     settings: LedSettings;
     /** @inheritDoc */
@@ -31,7 +29,7 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     private _color;
     private _colortemp;
     private _room;
-    constructor(deviceId: string, ownDeviceName: string, roomName: string, device: GoveeDevice | undefined);
+    constructor(deviceId: string, ownDeviceName: string, roomName: string);
     get color(): string;
     get colortemp(): number;
     get room(): RoomBase;
@@ -54,7 +52,7 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     toggleActuator(c: ActuatorToggleCommand): boolean;
     toggleLight(c: LampToggleLightCommand): boolean;
     writeActuatorStateToDevice(c: ActuatorWriteStateToDeviceCommand): void;
-    update(data: GoveeDeviceState & GoveeDeviceStateInfo): void;
+    update(data: GoveeDeviceData): void;
     private setBrightness;
     private setColor;
     private turnOn;

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

@@ -12,9 +12,9 @@ const lodash_1 = __importDefault(require("lodash"));
 const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const api_1 = require("../api");
 const blockAutomaticHandler_1 = require("../blockAutomaticHandler");
+const govee_service_1 = require("./govee-service");
 class OwnGoveeDevice {
-    constructor(deviceId, ownDeviceName, roomName, device) {
-        this.device = device;
+    constructor(deviceId, ownDeviceName, roomName) {
         /** @inheritDoc */
         this.settings = new models_1.LedSettings();
         /** @inheritDoc */
@@ -165,54 +165,55 @@ class OwnGoveeDevice {
     }
     update(data) {
         this.queuedValue = null;
-        this._actuatorOn = data.onOff === 1;
+        this._actuatorOn = data.actuatorOn;
         this.brightness = data.brightness;
-        this._color = `#${data.color.r.toString(16)}${data.color.g.toString(16)}${data.color.b.toString(16)}`;
-        this._colortemp = data.colorTemInKelvin;
+        this._color = data.hexColor;
+        this._colortemp = data.colortemp;
     }
     setBrightness(brightness, cb) {
-        var _a;
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setBrightness(brightness).then(() => {
+        govee_service_1.GooveeService.sendCommand(this, `brightness/${brightness}`).then((result) => {
+            if (!result) {
+                this.log(models_1.LogLevel.Error, 'Govee set brightness resulted in error');
+            }
             cb();
-        }).catch((error) => {
-            this.log(models_1.LogLevel.Error, `Govee set brightness resulted in error: ${error}`);
         });
     }
     setColor(color) {
-        var _a;
-        if (color === this._color) {
-            return;
-        }
-        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}`);
+        govee_service_1.GooveeService.sendCommand(this, `color/${color.replace('#', '')}`).then((result) => {
+            if (!result) {
+                this.log(models_1.LogLevel.Error, 'Govee set color resulted in error');
+            }
+            else {
+                this.log(models_1.LogLevel.Debug, `Govee set color to ${color}`, log_service_1.LogDebugType.SetActuator);
+            }
         });
     }
     turnOn() {
-        var _a;
         if (this._actuatorOn) {
             return;
         }
         this.queuedValue = true;
-        (_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}`);
+        govee_service_1.GooveeService.sendCommand(this, `on/true`).then((result) => {
+            if (!result) {
+                this.log(models_1.LogLevel.Error, 'Govee turn on resulted in error');
+            }
+            else {
+                this.log(models_1.LogLevel.Debug, `Govee turned on`, log_service_1.LogDebugType.SetActuator);
+            }
         });
     }
     turnOff() {
-        var _a;
-        this.queuedValue = false;
-        (_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}`);
+        if (this._actuatorOn) {
+            return;
+        }
+        this.queuedValue = true;
+        govee_service_1.GooveeService.sendCommand(this, `on/false`).then((result) => {
+            if (!result) {
+                this.log(models_1.LogLevel.Error, 'Govee turn off resulted in error');
+            }
+            else {
+                this.log(models_1.LogLevel.Debug, `Govee turned off`, log_service_1.LogDebugType.SetActuator);
+            }
         });
     }
 }