hoffmation-base 2.22.14 → 2.22.16

package/lib/index.js

@@ -19,7 +19,6 @@ const server_1 = require("./server");
 const models_1 = require("./models");
 const dachs_1 = require("./server/devices/dachs");
 require("@iobroker/types");
-const govee_1 = require("./server/services/govee");
 __exportStar(require("./models/index"), exports);
 __exportStar(require("./server/index"), exports);
 __exportStar(require("./liquid-pid"), exports);
@@ -64,6 +63,10 @@ class HoffmationBase {
             server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Asus Router settings detected --> initializing`);
             new server_1.AsusRouter(server_1.SettingsService.settings.asusConfig);
         }
+        else if (server_1.SettingsService.settings.unifiSettings) {
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Unifi Router settings detected --> initializing`);
+            new server_1.UnifiRouter(server_1.SettingsService.settings.unifiSettings);
+        }
         server_1.TimeCallbackService.init();
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base First Initializations finished`);
     }
@@ -82,8 +85,8 @@ class HoffmationBase {
             server_1.SonosService.initialize();
         }
         if (server_1.SettingsService.settings.goveeDevicesPresent) {
-            govee_1.GooveeService.addOwnDevices(govee_1.OwnGoveeDevices.ownDevices);
-            govee_1.GooveeService.initialize();
+            server_1.GooveeService.addOwnDevices(server_1.OwnGoveeDevices.ownDevices);
+            server_1.GooveeService.initialize();
         }
         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

@@ -21,6 +21,7 @@ import { iTibberSettings } from './iTibberSettings';
 import { iVictronSettings } from './iVictronSettings';
 import { iDachsSettings } from './iDachsSettings';
 import { iEnergyManagerSettings } from './iEnergyManagerSettings';
+import { iUnifiSettings } from './iUnifiSettings';
 export interface iConfig {
     asusConfig?: iAsusConfig;
     blueIris?: iBlueIrisSettings;
@@ -45,6 +46,7 @@ export interface iConfig {
     tibber?: iTibberSettings;
     timeSettings: iTimeSettings;
     translationSettings: iTranslationSettings;
+    unifiSettings?: iUnifiSettings;
     weather?: iWeatherSettings;
     victron?: iVictronSettings;
 }

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

@@ -0,0 +1,11 @@
+export interface iUnifiConnectionOptions {
+    host?: string;
+    port?: number;
+    username?: string;
+    password?: string;
+    token2FA?: string;
+    site?: string;
+    sslverify?: boolean;
+    timeout?: number;
+    rememberMe?: boolean;
+}

package/lib/server/config/iUnifiConnectionOptions.js

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

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

@@ -0,0 +1,4 @@
+import { iUnifiConnectionOptions } from './iUnifiConnectionOptions';
+export interface iUnifiSettings {
+    loginOptions: iUnifiConnectionOptions;
+}

package/lib/server/config/iUnifiSettings.js

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

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

@@ -22,4 +22,6 @@ export * from './iTelegramSettings';
 export * from './iTibberSettings';
 export * from './iTimeSettings';
 export * from './iTimePair';
+export * from './iUnifiSettings';
+export * from './iUnifiConnectionOptions';
 export * from './iVictronSettings';

package/lib/server/config/index.js

@@ -38,4 +38,6 @@ __exportStar(require("./iTelegramSettings"), exports);
 __exportStar(require("./iTibberSettings"), exports);
 __exportStar(require("./iTimeSettings"), exports);
 __exportStar(require("./iTimePair"), exports);
+__exportStar(require("./iUnifiSettings"), exports);
+__exportStar(require("./iUnifiConnectionOptions"), exports);
 __exportStar(require("./iVictronSettings"), exports);

package/lib/server/services/ac/own-daikin-device.d.ts

@@ -21,4 +21,5 @@ export declare class OwnDaikinDevice extends AcDevice {
     private updateInfo;
     private handleDeviceUnreach;
     private handleParamNg;
+    toJSON(): Partial<OwnDaikinDevice>;
 }

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

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnDaikinDevice = void 0;
 const daikin_controller_1 = require("daikin-controller");
@@ -11,6 +14,7 @@ const ac_device_1 = require("./ac-device");
 const ac_mode_1 = require("./ac-mode");
 const acDeviceType_1 = require("./acDeviceType");
 const devices_1 = require("../../devices");
+const lodash_1 = __importDefault(require("lodash"));
 class OwnDaikinDevice extends ac_device_1.AcDevice {
     constructor(name, roomName, ip, device) {
         super(name, roomName, ip, acDeviceType_1.AcDeviceType.Daikin);
@@ -152,5 +156,11 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             }
         });
     }
+    toJSON() {
+        // eslint-disable-next-line
+        const result = lodash_1.default.omit(this, ['room', '_room', 'device', '_device']);
+        result['on'] = this.on;
+        return utils_1.Utils.jsonFilter(result);
+    }
 }
 exports.OwnDaikinDevice = OwnDaikinDevice;

package/lib/server/services/network/index.d.ts

@@ -1,2 +1,3 @@
 export * from './asusRouter';
+export * from './unifiRouter';
 export * from './router';

package/lib/server/services/network/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./asusRouter"), exports);
+__exportStar(require("./unifiRouter"), exports);
 __exportStar(require("./router"), exports);

package/lib/server/services/network/unifiRouter.d.ts

@@ -0,0 +1,11 @@
+import { Router } from './router';
+import { iUnifiSettings } from '../../config';
+export declare class UnifiRouter extends Router {
+    get loggedIn(): boolean;
+    private readonly _api;
+    private _loggedIn;
+    constructor(config: iUnifiSettings);
+    reconnectDeviceByMac(mac: string): Promise<boolean>;
+    reconnectDeviceByIp(_ip: string): Promise<boolean>;
+    private login;
+}

package/lib/server/services/network/unifiRouter.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnifiRouter = void 0;
+const router_1 = require("./router");
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-expect-error
+const node_unifi_1 = __importDefault(require("node-unifi"));
+const log_service_1 = require("../log-service");
+const models_1 = require("../../../models");
+class UnifiRouter extends router_1.Router {
+    get loggedIn() {
+        return this._loggedIn;
+    }
+    constructor(config) {
+        super();
+        this._loggedIn = false;
+        this._api = new node_unifi_1.default.Controller(config.loginOptions);
+        router_1.Router.setRouter(this);
+        this.login();
+    }
+    reconnectDeviceByMac(mac) {
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Unifi: Reconnecting Device "${mac}"`);
+        return new Promise(async (resolve, _reject) => {
+            if (!this.loggedIn && !(await this.login())) {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Unifi: Can't reconnect Device "${mac}" as we can't log in`);
+                resolve(false);
+            }
+            const result = await this._api.reconnectClient(mac).catch((error) => {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Unifi: Failed to reconnect "${mac}" due to: ${error}`);
+                resolve(false);
+                return;
+            });
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Unifi: Reconnecting ${mac} resulted in ${result}`);
+            resolve(true);
+        });
+    }
+    reconnectDeviceByIp(_ip) {
+        throw new Error('Method not implemented, use reconnectDeviceByMac instead.');
+    }
+    login() {
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Unifi: Trying to login to Unifi-Controller');
+        return new Promise(async (resolve, _reject) => {
+            await this._api.login().catch((error) => {
+                log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Unifi: Login failed: ${error}`);
+                this._loggedIn = false;
+                resolve(false);
+            });
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Unifi: Login successful');
+            this._loggedIn = true;
+            resolve(true);
+        });
+    }
+}
+exports.UnifiRouter = UnifiRouter;