hoffmation-base 0.1.29-5 → 0.1.29-9

package/lib/server/devices/zigbee/zigbeeShutter.js

@@ -5,7 +5,7 @@ const utils_1 = require("../../services/utils/utils");
 const log_service_1 = require("../../services/log-service");
 const logLevel_1 = require("../../../models/logLevel");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const FensterPosition_1 = require("../FensterPosition");
+const FensterPosition_1 = require("../models/FensterPosition");
 class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);

package/lib/server/services/dbo/persist.d.ts

@@ -5,22 +5,30 @@ import { TemperaturDataPoint } from '../../../models/persistence/temperaturDataP
 import { HmIpHeizgruppe } from '../../devices/hmIPDevices/hmIpHeizgruppe';
 import { CurrentIlluminationDataPoint } from '../../../models/persistence/CurrentIlluminationDataPoint';
 import { iPersistenceSettings } from '../../config/iConfig';
+import { ShutterCalibration } from '../../../models/persistence/ShutterCalibration';
 export declare class Persist {
-    private static TemperatureHistoryCollection;
-    private static HeatGroupCollection;
     private static BasicRoomCollection;
-    private static RoomDetailsCollection;
     private static CountTodayCollection;
     private static CurrentIlluminationCollection;
     private static DailyMovementCountTodayCollection;
+    private static HeatGroupCollection;
+    private static RoomDetailsCollection;
+    private static ShutterCalibrationCollection;
+    private static TemperatureHistoryCollection;
+    private static initialized;
     private static Mongo;
     private static MongoClient;
+    private static turnedOff;
     static addTemperaturDataPoint(hzGrp: HmIpHeizgruppe): void;
     static addRoom(room: RoomBase): void;
     static getCount(device: IoBrokerBaseDevice): Promise<CountToday>;
+    static getShutterCalibration(device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
     static initialize(config: iPersistenceSettings): Promise<void>;
     static persistTodayCount(device: IoBrokerBaseDevice, count: number, oldCount: number): void;
+    static persistShutterCalibration(data: ShutterCalibration): void;
     static persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
     static readTemperaturDataPoint(hzGrp: HmIpHeizgruppe, limit?: number): Promise<TemperaturDataPoint[]>;
+    static turnOff(): void;
     private static handleReject;
+    private static isMongoAllowedAndReady;
 }

package/lib/server/services/dbo/persist.js

@@ -9,8 +9,12 @@ const temperaturDataPoint_1 = require("../../../models/persistence/temperaturDat
 const log_service_1 = require("../log-service");
 const BasicRoomInfo_1 = require("../../../models/persistence/BasicRoomInfo");
 const logLevel_1 = require("../../../models/logLevel");
+const ShutterCalibration_1 = require("../../../models/persistence/ShutterCalibration");
 class Persist {
     static addTemperaturDataPoint(hzGrp) {
+        if (!this.isMongoAllowedAndReady()) {
+            return;
+        }
         const dataPoint = new temperaturDataPoint_1.TemperaturDataPoint(hzGrp.info.customName, hzGrp.iTemperatur, hzGrp.desiredTemperatur, hzGrp.iLevel, hzGrp.humidity, new Date());
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Persisting Temperatur Data for ${hzGrp.info.customName}`);
         this.TemperatureHistoryCollection.insertOne(dataPoint).catch((r) => {
@@ -23,6 +27,9 @@ class Persist {
         });
     }
     static addRoom(room) {
+        if (!this.isMongoAllowedAndReady()) {
+            return;
+        }
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Persisting Room for ${room.roomName}`);
         this.BasicRoomCollection.updateOne({ roomName: room.roomName }, { $set: new BasicRoomInfo_1.BasicRoomInfo(room.roomName, room.Settings.etage) }, { upsert: true }).catch((r) => {
             this.handleReject(r, 'BasicRoomCollection.updateOne');
@@ -36,20 +43,32 @@ class Persist {
         });
     }
     static async getCount(device) {
-        const result = new Promise(async (resolve) => {
-            const options = {
-                limit: 1,
-            };
-            const databaseValue = (await this.CountTodayCollection.find({ deviceID: device.info.fullID }, options).toArray());
-            if (databaseValue.length === 0) {
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Es gibt noch keinen persistierten Counter für ${device.info.fullName}`);
-                resolve(new todaysCount_1.CountToday(device.info.fullID, 0));
-            }
-            else {
-                resolve(databaseValue[0]);
-            }
-        });
-        return result;
+        if (!this.isMongoAllowedAndReady()) {
+            return new todaysCount_1.CountToday(device.info.fullID, 0);
+        }
+        const options = {
+            limit: 1,
+        };
+        const databaseValue = (await this.CountTodayCollection.find({ deviceID: device.info.fullID }, options).toArray());
+        if (databaseValue.length !== 0) {
+            return databaseValue[0];
+        }
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Es gibt noch keinen persistierten Counter für ${device.info.fullName}`);
+        return new todaysCount_1.CountToday(device.info.fullID, 0);
+    }
+    static async getShutterCalibration(device) {
+        if (!this.isMongoAllowedAndReady()) {
+            return new ShutterCalibration_1.ShutterCalibration(device.info.fullID, 0, 0, 0, 0);
+        }
+        const options = {
+            limit: 1,
+        };
+        const databaseValue = (await this.ShutterCalibrationCollection.find({ deviceID: device.info.fullID }, options).toArray());
+        if (databaseValue.length !== 0) {
+            return databaseValue[0];
+        }
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `There is no persisted calibration data for ${device.info.fullName}`);
+        return new ShutterCalibration_1.ShutterCalibration(device.info.fullID, 0, 0, 0, 0);
     }
     static async initialize(config) {
         this.MongoClient = new mongodb_1.MongoClient(config.mongoConnection);
@@ -62,8 +81,13 @@ class Persist {
         this.CountTodayCollection = this.Mongo.collection('PresenceToday');
         this.CurrentIlluminationCollection = this.Mongo.collection('CurrentIllumination');
         this.DailyMovementCountTodayCollection = this.Mongo.collection('DailyMovementCount');
+        this.ShutterCalibrationCollection = this.Mongo.collection('ShutterCalibration');
+        this.initialized = true;
     }
     static persistTodayCount(device, count, oldCount) {
+        if (!this.isMongoAllowedAndReady()) {
+            return;
+        }
         const result = this.CountTodayCollection.updateOne({ deviceID: device.info.fullID }, { $set: new todaysCount_1.CountToday(device.info.fullID, count) }, { upsert: true });
         if (count === 0) {
             const date = new Date();
@@ -75,7 +99,17 @@ class Persist {
         }
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Persisting PresenceToday Data for ${device.info.customName} to ${count} resolved with "${result}"`);
     }
+    static persistShutterCalibration(data) {
+        if (!this.isMongoAllowedAndReady()) {
+            return;
+        }
+        const result = this.CountTodayCollection.updateOne({ deviceID: data.deviceID }, { $set: data }, { upsert: true });
+        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Persisting ShutterCalibration for ${data.deviceID} resolved with "${result}"`);
+    }
     static persistCurrentIllumination(data) {
+        if (!this.isMongoAllowedAndReady()) {
+            return;
+        }
         const result = this.CurrentIlluminationCollection.updateOne({ deviceID: data.deviceID, date: data.date }, { $set: data }, { upsert: true }).catch((r) => {
             this.handleReject(r, 'persistCurrentIllumination');
         });
@@ -83,6 +117,10 @@ class Persist {
     }
     static async readTemperaturDataPoint(hzGrp, limit = -1) {
         const result = new Promise(async (resolve) => {
+            if (!this.isMongoAllowedAndReady()) {
+                resolve([]);
+                return;
+            }
             const options = {
                 limit: limit > 0 ? limit : undefined,
                 sort: { date: -1 },
@@ -92,9 +130,32 @@ class Persist {
         });
         return result;
     }
+    static turnOff() {
+        this.turnedOff = true;
+    }
     static handleReject(reason, func) {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Error persisting data for "${func}"`);
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Persisting Error reason: "${reason}"`);
     }
+    static isMongoAllowedAndReady() {
+        if (this.turnedOff) {
+            return false;
+        }
+        if (!this.initialized) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Db is not yet initialized`);
+            return false;
+        }
+        if (!this.MongoClient) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `Mongo client missing`);
+            return false;
+        }
+        if (!this.Mongo) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `MongoDb connection is missing`);
+            return false;
+        }
+        return true;
+    }
 }
 exports.Persist = Persist;
+Persist.initialized = false;
+Persist.turnedOff = false;