hoffmation-base 3.0.0-alpha.46 → 3.0.0-alpha.47

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

@@ -44,4 +44,8 @@ export interface iLogSettings {
      * Whether to log debug messages for trilateration calculations
      */
     debugTrilateration?: boolean;
+    /**
+     * Whether to send telegram messages on "HOST Unreach" of Dachs
+     */
+    alertDachsUnreachable?: boolean;
 }

package/lib/server/devices/dachs/dachs.js

@@ -53,7 +53,7 @@ class Dachs {
             flatten: true,
         };
         this.config = modifiedOptions;
-        this.client = new lib_1.DachsHttpClient(this.config.connectionOptions);
+        this.client = new lib_1.DachsHttpClient(this.config.connectionOptions, this.log.bind(this));
         this.warmWaterSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'ww', 'Water Temperature');
         this.heatStorageTempSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'hs', 'Heat Storage Temperature');
         services_1.Utils.guardedInterval(this.loadData, this.config.refreshInterval, this);
@@ -135,7 +135,7 @@ class Dachs {
             this.persist();
         })
             .catch((error) => {
-            this.log(models_1.LogLevel.Error, `Error while fetching data: ${error}`);
+            this.log(models_1.LogLevel.Error, `Error while fetching data: ${error}`, services_1.LogDebugType.DachsUnreach);
         });
     }
     /** @inheritDoc */

package/lib/server/devices/dachs/lib/dachsHttpClient.d.ts

@@ -1,5 +1,7 @@
 import { AxiosResponse } from 'axios';
 import { DachsClientOptions, iFlattenedCompleteResponse, KeyListEntityResponse } from '../interfaces';
+import { LogDebugType } from '../../../services';
+import { LogLevel } from '../../../../models';
 /**
  * axios HTTP Client Class
  * - with some prepared fetch functions for data
@@ -8,10 +10,11 @@ import { DachsClientOptions, iFlattenedCompleteResponse, KeyListEntityResponse }
  * @class
  */
 export declare class DachsHttpClient {
+    private readonly _logger;
     private options;
     private readonly url;
     private axiosInstance;
-    constructor(options: DachsClientOptions);
+    constructor(options: DachsClientOptions, _logger: (level: LogLevel, message: string, logDebugType?: LogDebugType) => void);
     /**
      * Takes every key and add the key to the get parameter list
      * @param {string[]} keys - Array of request keys

package/lib/server/devices/dachs/lib/dachsHttpClient.js

@@ -41,8 +41,9 @@ const models_1 = require("../../../../models");
  * @class
  */
 class DachsHttpClient {
-    constructor(options) {
+    constructor(options, _logger) {
         var _a;
+        this._logger = _logger;
         this.options = options;
         //combine parameter to baseUrl
         //check http prefix
@@ -61,7 +62,7 @@ class DachsHttpClient {
         this.axiosInstance.interceptors.response.use((response) => {
             return response;
         }, (error) => {
-            services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `DachsHttpClient: ${error.message}`);
+            this._logger(models_1.LogLevel.Error, `DachsHttpClient: ${error.message}`, services_1.LogDebugType.DachsUnreach);
         });
     }
     /**
@@ -89,7 +90,7 @@ class DachsHttpClient {
     fetchByKeys(...keys) {
         return new Promise((resolve, reject) => {
             this.axiosInstance
-                .get("/getKey" + this.urlBuilder(keys))
+                .get('/getKey' + this.urlBuilder(keys))
                 .then((res) => {
                 if (!res.data)
                     reject('No data received');
@@ -117,7 +118,7 @@ class DachsHttpClient {
     setKeys(data) {
         return new Promise((resolve, reject) => {
             this.axiosInstance
-                .post("/setKeys", Object.entries(data)
+                .post('/setKeys', Object.entries(data)
                 .map(([key, value]) => `${key}=${value}`)
                 .join('&'))
                 .then((res) => {

package/lib/server/services/log-service/log-debug-type.d.ts

@@ -8,5 +8,6 @@ export declare enum LogDebugType {
     SkipUnchangedMovementState = 6,
     DaikinSuccessfullControlInfo = 7,
     EuroHeaterValveLogging = 8,
-    Trilateration = 9
+    Trilateration = 9,
+    DachsUnreach = 10
 }

package/lib/server/services/log-service/log-debug-type.js

@@ -13,4 +13,5 @@ var LogDebugType;
     LogDebugType[LogDebugType["DaikinSuccessfullControlInfo"] = 7] = "DaikinSuccessfullControlInfo";
     LogDebugType[LogDebugType["EuroHeaterValveLogging"] = 8] = "EuroHeaterValveLogging";
     LogDebugType[LogDebugType["Trilateration"] = 9] = "Trilateration";
+    LogDebugType[LogDebugType["DachsUnreach"] = 10] = "DachsUnreach";
 })(LogDebugType || (exports.LogDebugType = LogDebugType = {}));