hoffmation-base 2.22.17 → 2.23.0

package/lib/server/services/ac/daikin-service.d.ts

@@ -12,7 +12,7 @@ export declare class DaikinService {
     static getDevice(name: string): DaikinAC | undefined;
     static initialize(): Promise<void>;
     static setAll(on: boolean, force?: boolean): void;
-    static reconnect(name: string, ip: string): Promise<DaikinAC | undefined>;
+    static reconnect(name: string, ip: string, mac?: string): Promise<DaikinAC | undefined>;
     private static reconstructDaikinAc;
     private static initializeDevice;
 }

package/lib/server/services/ac/daikin-service.js

@@ -85,13 +85,18 @@ class DaikinService {
             }
         }
     }
-    static async reconnect(name, ip) {
+    static async reconnect(name, ip, mac) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Reconnecting Daikin AC "${name}"`);
         const router = network_1.Router.getRouter();
         if (router === undefined) {
             return this.reconstructDaikinAc(ip, name);
         }
-        await router.reconnectDeviceByIp(ip);
+        if (mac !== undefined) {
+            await router.reconnectDeviceByMac(mac);
+        }
+        else {
+            await router.reconnectDeviceByIp(ip);
+        }
         await utils_1.Utils.delay(5000);
         return this.reconstructDaikinAc(ip, name);
     }

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

@@ -3,13 +3,14 @@ import { AcDevice } from './ac-device';
 import { AcMode } from './ac-mode';
 import { DeviceType } from '../../devices';
 export declare class OwnDaikinDevice extends AcDevice {
+    private _device;
+    private _mac;
     desiredState: boolean;
     desiredHum: number | 'AUTO';
     desiredMode: number;
     deviceType: DeviceType;
     private _on;
-    constructor(name: string, roomName: string, ip: string, device: DaikinAC | undefined);
-    private _device;
+    constructor(name: string, roomName: string, ip: string, _device: DaikinAC | undefined, _mac?: string | undefined);
     get device(): DaikinAC | undefined;
     get on(): boolean;
     set device(device: DaikinAC | undefined);

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

@@ -16,14 +16,15 @@ 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) {
+    constructor(name, roomName, ip, _device, _mac = undefined) {
         super(name, roomName, ip, acDeviceType_1.AcDeviceType.Daikin);
+        this._device = _device;
+        this._mac = _mac;
         this.desiredState = daikin_controller_1.Power.OFF;
         this.desiredHum = 'AUTO';
         this.desiredMode = daikin_controller_1.Mode.COLD;
         this.deviceType = devices_1.DeviceType.Daikin;
         this._on = false;
-        this._device = device;
     }
     get device() {
         return this._device;
@@ -138,11 +139,15 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
     }
     handleDeviceUnreach() {
         this.log(models_1.LogLevel.Warn, `Detected EHOSTUNREACH for ${this.name}(${this.ip}), will try reconecting`);
-        daikin_service_1.DaikinService.reconnect(this.name, this.ip).then((device) => {
+        daikin_service_1.DaikinService.reconnect(this.name, this.ip, this._mac)
+            .then((device) => {
             this.device = device;
             utils_1.Utils.guardedTimeout(() => {
                 this.setDesiredInfo(true);
             }, 5000, this);
+        })
+            .catch((err) => {
+            this.log(models_1.LogLevel.Error, `Reconnecting failed for ${this.name}(${this.ip}): ${err}`);
         });
     }
     handleParamNg(changeObject) {