hoffmation-base 1.0.63 → 1.0.66

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoffmation-base",
   "description": "Base Libraries and functions for own Hoffmation projects",
-  "version": "1.0.63",
+  "version": "1.0.66",
   "files": [
     "lib/**/*"
   ],
@@ -47,11 +47,11 @@
     "@types/socket.io-client": "^1.4.36",
     "@types/xml2js": "^0.4.11",
     "aws-sdk": "2.1211.0",
+    "bson": "^4.7.0",
     "daikin-controller": "^2.1.0",
     "get-mp3-duration": "^1.0.0",
     "https": "^1.0.0",
     "lodash": "^4.17.21",
-    "mongodb": "^4.9.1",
     "node-fetch": "3.2.10",
     "node-ical": "^0.15.1",
     "node-merlin-wrt-api": "^0.0.2-alpha.5",

package/lib/models/persistence/DailyMovementCount.d.ts

@@ -1,7 +0,0 @@
-export declare class DailyMovementCount {
-    deviceID: string;
-    counter: number;
-    roomName: string;
-    date: Date;
-    constructor(deviceID: string, counter: number, roomName: string, date: Date);
-}

package/lib/models/persistence/DailyMovementCount.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DailyMovementCount = void 0;
-class DailyMovementCount {
-    constructor(deviceID, counter, roomName, date) {
-        this.deviceID = deviceID;
-        this.counter = counter;
-        this.roomName = roomName;
-        this.date = date;
-    }
-}
-exports.DailyMovementCount = DailyMovementCount;

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

@@ -1,33 +0,0 @@
-import { iPersistenceSettings } from '../../config';
-import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
-import { iPersist } from './iPersist';
-import { iAcDevice, iHeater, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
-export declare class MongoPersistance implements iPersist {
-    initialized: boolean;
-    private BasicRoomCollection?;
-    private CountTodayCollection?;
-    private CurrentIlluminationCollection?;
-    private DailyMovementCountTodayCollection?;
-    private HeatGroupCollection?;
-    private RoomDetailsCollection?;
-    private ShutterCalibrationCollection?;
-    private TemperatureHistoryCollection?;
-    private Mongo?;
-    private MongoClient;
-    private mongoConf;
-    constructor(config: iPersistenceSettings);
-    persistAC(_device: iAcDevice): void;
-    persistMotionSensor(_device: iMotionSensor): void;
-    private static handleReject;
-    addTemperaturDataPoint(heater: iHeater): void;
-    addRoom(room: RoomBase): void;
-    getCount(device: IoBrokerBaseDevice): Promise<CountToday>;
-    getShutterCalibration(device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
-    initialize(): Promise<void>;
-    persistTodayCount(device: IoBrokerBaseDevice, count: number, oldCount: number): void;
-    persistShutterCalibration(data: ShutterCalibration): void;
-    persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
-    readTemperaturDataPoint(heater: iHeater, limit?: number): Promise<TemperaturDataPoint[]>;
-    persistEnergyManager(_energyData: EnergyCalculation): void;
-    private isMongoAllowedAndReady;
-}

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

@@ -1,174 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoPersistance = void 0;
-const mongodb_1 = require("mongodb");
-const log_service_1 = require("../log-service");
-const models_1 = require("../../../models");
-class MongoPersistance {
-    constructor(config) {
-        this.initialized = false;
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        this.mongoConf = config.mongo;
-        this.MongoClient = new mongodb_1.MongoClient(this.mongoConf.mongoConnection);
-    }
-    persistAC(_device) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Mongo doesn't support AC Persistence yet.`);
-    }
-    persistMotionSensor(_device) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Mongo doesn't support MotionSensor Persistence yet.`);
-    }
-    static handleReject(reason, func) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Error persisting data for "${func}"`);
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Persisting Error reason: "${reason}"`);
-    }
-    addTemperaturDataPoint(heater) {
-        var _a, _b;
-        if (!this.isMongoAllowedAndReady()) {
-            return;
-        }
-        const dataPoint = new models_1.TemperaturDataPoint(heater.info.customName, heater.iTemperature, heater.desiredTemperature, heater.iLevel, heater.humidity, new Date());
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Temperatur Data for ${heater.info.customName}`);
-        (_a = this.TemperatureHistoryCollection) === null || _a === void 0 ? void 0 : _a.insertOne(dataPoint).catch((r) => {
-            MongoPersistance.handleReject(r, 'TemperatureHistoryCollection.insertOne');
-        });
-        // Needs to be duplicated as the object "dataPoint" is an document now
-        const heatGroupDataPoint = new models_1.TemperaturDataPoint(heater.info.customName, heater.iTemperature, heater.desiredTemperature, heater.iLevel, heater.humidity, new Date());
-        (_b = this.HeatGroupCollection) === null || _b === void 0 ? void 0 : _b.updateOne({ name: dataPoint.name }, { $set: heatGroupDataPoint }, { upsert: true }).catch((r) => {
-            MongoPersistance.handleReject(r, 'HeatGroupCollection.updateOne');
-        });
-    }
-    addRoom(room) {
-        var _a, _b;
-        if (!this.isMongoAllowedAndReady()) {
-            return;
-        }
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Room for ${room.roomName}`);
-        (_a = this.BasicRoomCollection) === null || _a === void 0 ? void 0 : _a.updateOne({ roomName: room.roomName }, { $set: new models_1.BasicRoomInfo(room.roomName, room.settings.etage) }, { upsert: true }).catch((r) => {
-            MongoPersistance.handleReject(r, 'BasicRoomCollection.updateOne');
-        });
-        const detailed = new models_1.RoomDetailInfo(room.roomName, room.settings.etage);
-        if (room.HeatGroup) {
-            for (const h of (_b = room.HeatGroup) === null || _b === void 0 ? void 0 : _b.getHeater()) {
-                detailed.heaters.push(h.info.customName);
-            }
-        }
-        if (this.RoomDetailsCollection) {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            this.RoomDetailsCollection.updateOne({ roomName: room.roomName }, { $set: detailed }, { upsert: true }).catch((r) => {
-                MongoPersistance.handleReject(r, 'RoomDetailsCollection.updateOne');
-            });
-        }
-    }
-    async getCount(device) {
-        var _a;
-        if (!this.isMongoAllowedAndReady()) {
-            return new models_1.CountToday(device.info.fullID, 0);
-        }
-        const options = {
-            limit: 1,
-        };
-        const databaseValue = (await ((_a = this.CountTodayCollection) === null || _a === void 0 ? void 0 : _a.find({ deviceID: device.info.fullID }, options).toArray()));
-        if (databaseValue.length !== 0) {
-            return databaseValue[0];
-        }
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `Es gibt noch keinen persistierten Counter für ${device.info.fullName}`);
-        return new models_1.CountToday(device.info.fullID, 0);
-    }
-    async getShutterCalibration(device) {
-        var _a;
-        if (!this.isMongoAllowedAndReady()) {
-            return new models_1.ShutterCalibration(device.info.fullID, 0, 0, 0, 0);
-        }
-        const options = {
-            limit: 1,
-        };
-        const databaseValue = (await ((_a = this.ShutterCalibrationCollection) === null || _a === void 0 ? void 0 : _a.find({ deviceID: device.info.fullID }, options).toArray()));
-        if (databaseValue.length !== 0) {
-            return databaseValue[0];
-        }
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `There is no persisted calibration data for ${device.info.fullName}`);
-        return new models_1.ShutterCalibration(device.info.fullID, 0, 0, 0, 0);
-    }
-    async initialize() {
-        await this.MongoClient.connect();
-        this.Mongo = this.MongoClient.db(this.mongoConf.mongoDbName);
-        this.TemperatureHistoryCollection = this.Mongo.collection('TemperaturData');
-        this.HeatGroupCollection = this.Mongo.collection('HeatGroupCollection');
-        this.BasicRoomCollection = this.Mongo.collection('BasicRooms');
-        this.RoomDetailsCollection = this.Mongo.collection('RoomDetailsCollection');
-        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;
-    }
-    persistTodayCount(device, count, oldCount) {
-        var _a, _b;
-        if (!this.isMongoAllowedAndReady()) {
-            return;
-        }
-        const result = (_a = this.CountTodayCollection) === null || _a === void 0 ? void 0 : _a.updateOne({ deviceID: device.info.fullID }, { $set: new models_1.CountToday(device.info.fullID, count) }, { upsert: true });
-        if (count === 0) {
-            const date = new Date();
-            date.setHours(-24, 0, 0, 0);
-            const result2 = (_b = this.DailyMovementCountTodayCollection) === null || _b === void 0 ? void 0 : _b.updateOne({ deviceID: device.info.fullID, date: date }, { $set: new models_1.DailyMovementCount(device.info.fullID, oldCount, device.info.room, date) }, { upsert: true }).catch((r) => {
-                MongoPersistance.handleReject(r, 'DailyMovementCountTodayCollection.updateOne');
-            });
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Daily Movement Count for ${device.info.customName} to ${oldCount} resolved with "${result2}"`);
-        }
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting PresenceToday Data for ${device.info.customName} to ${count} resolved with "${result}"`);
-    }
-    persistShutterCalibration(data) {
-        var _a;
-        if (!this.isMongoAllowedAndReady()) {
-            return;
-        }
-        const result = (_a = this.CountTodayCollection) === null || _a === void 0 ? void 0 : _a.updateOne({ deviceID: data.deviceID }, { $set: data }, { upsert: true });
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting ShutterCalibration for ${data.deviceID} resolved with "${result}"`);
-    }
-    persistCurrentIllumination(data) {
-        var _a;
-        if (!this.isMongoAllowedAndReady()) {
-            return;
-        }
-        const result = (_a = this.CurrentIlluminationCollection) === null || _a === void 0 ? void 0 : _a.updateOne({ deviceID: data.deviceID, date: data.date }, { $set: data }, { upsert: true }).catch((r) => {
-            MongoPersistance.handleReject(r, 'persistCurrentIllumination');
-        });
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `Persisting Illumination Data for ${data.deviceID} to ${data.currentIllumination} resolved with "${result}"`);
-    }
-    async readTemperaturDataPoint(heater, limit = -1) {
-        return new Promise(async (resolve) => {
-            var _a;
-            if (!this.isMongoAllowedAndReady()) {
-                resolve([]);
-                return;
-            }
-            const options = {
-                limit: limit > 0 ? limit : undefined,
-                sort: { date: -1 },
-            };
-            const data = (await ((_a = this.TemperatureHistoryCollection) === null || _a === void 0 ? void 0 : _a.find({ name: heater.info.customName }, options).toArray()));
-            resolve(data);
-        });
-    }
-    persistEnergyManager(_energyData) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `MongoDb doesn't support EnergyCalculation yet.`);
-    }
-    isMongoAllowedAndReady() {
-        if (!this.initialized) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Db is not yet initialized`);
-            return false;
-        }
-        if (!this.MongoClient) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `Mongo client missing`);
-            return false;
-        }
-        if (!this.Mongo) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Error, `MongoDb connection is missing`);
-            return false;
-        }
-        return true;
-    }
-}
-exports.MongoPersistance = MongoPersistance;