hoffmation-base 0.1.36 → 0.1.37

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

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeAqaraOpple3Switch = void 0;
+const zigbeeSwitch_1 = require("./zigbeeSwitch");
+const button_1 = require("../button");
+const deviceType_1 = require("../deviceType");
+const logLevel_1 = require("../../../models/logLevel");
+class ZigbeeAqaraOpple3Switch extends zigbeeSwitch_1.ZigbeeSwitch {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.ZigbeeAqaraOpple3Switch);
+        this.buttonTopLeft = new button_1.Button('TopLeft', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        this.buttonMidLeft = new button_1.Button('MidLeft', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        this.buttonBotLeft = new button_1.Button('BotLeft', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        this.buttonTopRight = new button_1.Button('TopRight', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        this.buttonMidRight = new button_1.Button('MidRight', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        this.buttonBotRight = new button_1.Button('BotRight', ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES);
+        this.buttonBot = undefined;
+        this.buttonTop = undefined;
+    }
+    update(idSplit, state, initial = false) {
+        this.log(logLevel_1.LogLevel.DeepTrace, `Magnet Contact Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
+        super.update(idSplit, state, initial, true);
+        const name = idSplit[3];
+        if (name.startsWith('button_')) {
+            this.updateButton(name, state.val);
+        }
+    }
+    updateButton(name, val) {
+        const parts = name.split('_');
+        if (parts.length < 3) {
+            this.log(logLevel_1.LogLevel.Error, `Unknown State Name: ${name}, expected something like "button_3_click"`);
+            return;
+        }
+        const index = parseInt(parts[1], 10);
+        let taste;
+        switch (index) {
+            case 1:
+                taste = this.buttonTopLeft;
+                break;
+            case 2:
+                taste = this.buttonTopRight;
+                break;
+            case 3:
+                taste = this.buttonMidLeft;
+                break;
+            case 4:
+                taste = this.buttonMidRight;
+                break;
+            case 5:
+                taste = this.buttonBotLeft;
+                break;
+            case 6:
+                taste = this.buttonBotRight;
+                break;
+            default:
+                this.log(logLevel_1.LogLevel.Error, `Unknown index: ${index} for button, Aqara Opple 3 has only 6 buttons.`);
+                return;
+        }
+        switch (parts[2]) {
+            case 'click':
+                taste.updateState(button_1.ButtonPressType.short, val);
+                return;
+            case 'hold':
+                taste.updateState(button_1.ButtonPressType.long, val);
+                return;
+            case 'double':
+                taste.updateState(button_1.ButtonPressType.double, val);
+                return;
+            case 'triple':
+                taste.updateState(button_1.ButtonPressType.triple, val);
+                return;
+            default:
+                this.log(logLevel_1.LogLevel.Error, `Unknown pressType: "${parts[2]}" for button, Aqara Opple 3 has only types "click, hold, double, triple".`);
+                return;
+        }
+    }
+    getButtonAssignment() {
+        const result = [`Button: ${this.info.customName}`];
+        for (const taste of [
+            this.buttonTopLeft,
+            this.buttonTopRight,
+            this.buttonMidLeft,
+            this.buttonMidRight,
+            this.buttonBotLeft,
+            this.buttonBotRight,
+        ]) {
+            const desc = taste.getDescription();
+            if (desc === '') {
+                continue;
+            }
+            result.push(`Button "${taste.name}":`);
+            result.push(desc);
+            result.push('');
+        }
+        result.push('____________');
+        return result.join('\n');
+    }
+}
+exports.ZigbeeAqaraOpple3Switch = ZigbeeAqaraOpple3Switch;
+ZigbeeAqaraOpple3Switch.BUTTON_CAPABILLITIES = {
+    shortPress: true,
+    longPress: true,
+    doublePress: true,
+    triplePress: true,
+};

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

@@ -87,6 +87,7 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
     }
     processNewMovementState(val) {
         const newState = val <= 30 ? MovementState.Down : val >= 70 ? MovementState.Up : MovementState.Stop;
+        this.log(logLevel_1.LogLevel.Trace, `New Movementstate "${MovementState[val]}"`);
         if (newState !== MovementState.Stop) {
             this._movementState = newState;
             return;
@@ -101,6 +102,7 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
             this._shutterCalibrationData.averageUp +=
                 (this._msTilTop - this._shutterCalibrationData.averageUp) / this._shutterCalibrationData.counterUp;
             this.persistCalibrationData();
+            this.log(logLevel_1.LogLevel.Trace, `New Measurment for shutter up (${this._msTilTop}ms), new Average: ${this._shutterCalibrationData.averageUp}`);
             return;
         }
         if (this._movementStartPos === 100 && oldState === MovementState.Down && this._setLevel === 0) {
@@ -111,6 +113,7 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
             this._shutterCalibrationData.averageDown +=
                 (this._msTilBot - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
             this.persistCalibrationData();
+            this.log(logLevel_1.LogLevel.Trace, `New Measurment for shutter down (${this._msTilBot}ms), new Average: ${this._shutterCalibrationData.averageDown}`);
             return;
         }
         if (!this.isCalibrated()) {
@@ -127,6 +130,7 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         return this._shutterCalibrationData.averageUp > 0 && this._shutterCalibrationData.averageDown > 0;
     }
     persistCalibrationData() {
+        this.log(logLevel_1.LogLevel.Trace, `Persiting Calibration Data. Average Up: ${this._shutterCalibrationData.averageUp}, Down: ${this._shutterCalibrationData.averageDown}`);
         persist_1.Persist.persistShutterCalibration(this._shutterCalibrationData);
     }
 }

package/lib/server/devices/zigbee/zigbeeSwitch.d.ts

@@ -0,0 +1,19 @@
+/// <reference types="iobroker" />
+import { iButtonSwitch } from '../iButtonSwitch';
+import { ZigbeeDevice } from './zigbeeDevice';
+import { DeviceInfo } from '../DeviceInfo';
+import { DeviceType } from '../deviceType';
+import { Button } from '../button';
+export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButtonSwitch {
+    abstract buttonBot: Button | undefined;
+    abstract buttonBotLeft: Button | undefined;
+    abstract buttonBotRight: Button | undefined;
+    abstract buttonMidLeft: Button | undefined;
+    abstract buttonMidRight: Button | undefined;
+    abstract buttonTop: Button | undefined;
+    abstract buttonTopLeft: Button | undefined;
+    abstract buttonTopRight: Button | undefined;
+    constructor(pInfo: DeviceInfo, deviceType: DeviceType);
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
+    abstract getButtonAssignment(): string;
+}

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeSwitch = void 0;
+const zigbeeDevice_1 = require("./zigbeeDevice");
+class ZigbeeSwitch extends zigbeeDevice_1.ZigbeeDevice {
+    constructor(pInfo, deviceType) {
+        super(pInfo, deviceType);
+    }
+    update(idSplit, state, initial = false, pOverrride = false) {
+        super.update(idSplit, state, initial, pOverrride);
+    }
+}
+exports.ZigbeeSwitch = ZigbeeSwitch;

package/lib/server/services/Telegram/telegram-Commands.js

@@ -114,7 +114,7 @@ class TelegramCommands {
             for (const id in devices_1.Devices.alLDevices) {
                 const d = devices_1.Devices.alLDevices[id];
                 if (d.deviceType === deviceType_1.DeviceType.HmIpTaster) {
-                    response.push(d.getTastenAssignment());
+                    response.push(d.getButtonAssignment());
                 }
             }
             telegram_service_1.TelegramService.sendMessage([m.from.id], response.join('\n'));

package/lib/server/services/news-service.js

@@ -93,7 +93,9 @@ class NewsService {
     }
     static downloadLatestFileFromFeed(rssUrl, targetDir) {
         const parser = new rss_parser_1.default();
-        parser.parseURL(rssUrl).then((feed) => {
+        parser
+            .parseURL(rssUrl)
+            .then((feed) => {
             try {
                 const currentFeedItem = feed.items[0];
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Most recent news on ${feed.title} is "${currentFeedItem.title}"`);
@@ -129,6 +131,9 @@ class NewsService {
             catch (e) {
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Error while parsing feed: ${e}`, { source: logSource_1.LogSource.News });
             }
+        })
+            .catch((e) => {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Error while getting feed: ${e}`, { source: logSource_1.LogSource.News });
         });
     }
     /**