@marcel2215/homebridge-supla-plugin 2.1.29 → 2.1.31

package/dist/Accesories/WicketAccesory.js

@@ -1,18 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WicketAccesory = void 0;
+/**
+ * Legacy wicket handler retained for source compatibility. It is not selected
+ * by the current platform mapping, but must remain fail-safe if reused.
+ */
 class WicketAccesory {
     constructor(platform, accessory, context) {
         this.platform = platform;
         this.accessory = accessory;
         this.context = context;
-        this.connected = true;
+        this.state = this.platform.Characteristic.CurrentDoorState.CLOSED;
+        this.connected = false;
+        this.hasState = false;
+        this.commandUncertain = false;
+        this.confirmationExpired = false;
+        this.confirmationTimeoutMs = 15000;
         this.accessory.getService(this.platform.Service.AccessoryInformation)
             .setCharacteristic(this.platform.Characteristic.Manufacturer, 'Supla')
-            .setCharacteristic(this.platform.Characteristic.Model, 'GarageDoorOpener');
+            .setCharacteristic(this.platform.Characteristic.Model, 'WicketController');
         this.service = this.accessory.getService(this.platform.Service.GarageDoorOpener)
             || this.accessory.addService(this.platform.Service.GarageDoorOpener);
         this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
+        this.commandUncertain = this.accessory.context.suplaWicketCommandUncertain === true;
+        this.confirmationExpired = this.commandUncertain;
+        this.platform.registerOwnerCleanup?.(this.accessory.UUID, () => {
+            this.clearConfirmationTimer();
+        });
         this.service.getCharacteristic(this.platform.Characteristic.CurrentDoorState)
             .onGet(this.handleCurrentDoorStateGet.bind(this));
         this.service.getCharacteristic(this.platform.Characteristic.TargetDoorState)
@@ -20,28 +34,154 @@ class WicketAccesory {
             .onSet(this.handleTargetDoorStateSet.bind(this));
         this.service.getCharacteristic(this.platform.Characteristic.ObstructionDetected)
             .onGet(this.handleObstructionDetectedGet.bind(this));
+        this.platform.registerMqttHandler(`${this.context.topic}/state/hi`, (message, _topic, packet) => {
+            const closed = this.platform.parseBooleanStrict(message.toString());
+            if (closed === undefined) {
+                return;
+            }
+            if (this.commandUncertain && packet?.retain === true) {
+                return;
+            }
+            this.state = closed
+                ? this.platform.Characteristic.CurrentDoorState.CLOSED
+                : this.platform.Characteristic.CurrentDoorState.OPEN;
+            this.hasState = true;
+            if (this.commandUncertain && packet?.retain !== true) {
+                if (this.state === this.platform.Characteristic.CurrentDoorState.OPEN) {
+                    this.setCommandUncertain(false);
+                }
+                else if (this.confirmationExpired) {
+                    this.platform.log.warn(`Wicket command for ${this.accessory.displayName} was not applied; ` +
+                        'reconciled from the latest live state after the confirmation window expired.');
+                    this.setCommandUncertain(false);
+                }
+            }
+            this.service.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.state);
+            if (!this.commandUncertain) {
+                const target = this.state === this.platform.Characteristic.CurrentDoorState.OPEN
+                    ? this.platform.Characteristic.TargetDoorState.OPEN
+                    : this.platform.Characteristic.TargetDoorState.CLOSED;
+                this.service.updateCharacteristic(this.platform.Characteristic.TargetDoorState, target);
+            }
+        }, this.accessory.UUID);
         this.platform.registerMqttHandler(`${this.context.topic}/state/connected`, (message) => {
-            this.connected = this.platform.parseBoolean(message.toString());
-            this.service.updateCharacteristic(this.platform.Characteristic.StatusFault, this.connected ? 0 : 1);
+            const connected = this.platform.parseBooleanStrict(message.toString());
+            if (connected === undefined) {
+                return;
+            }
+            this.connected = connected;
+            if (!connected) {
+                this.hasState = false;
+                this.expirePendingConfirmation();
+            }
+        }, this.accessory.UUID);
+        this.platform.registerMqttTransportHandler?.((transportConnected) => {
+            if (!transportConnected) {
+                this.connected = false;
+                this.hasState = false;
+                this.expirePendingConfirmation();
+            }
         }, this.accessory.UUID);
     }
     async handleCurrentDoorStateGet() {
-        return this.platform.Characteristic.TargetDoorState.CLOSED;
+        this.assertAvailable();
+        return this.state;
     }
     async handleTargetDoorStateGet() {
-        return this.platform.Characteristic.TargetDoorState.CLOSED;
+        this.assertAvailable();
+        return this.state === this.platform.Characteristic.CurrentDoorState.OPEN
+            ? this.platform.Characteristic.TargetDoorState.OPEN
+            : this.platform.Characteristic.TargetDoorState.CLOSED;
     }
-    async handleTargetDoorStateSet() {
+    async handleTargetDoorStateSet(value) {
+        if (value !== this.platform.Characteristic.TargetDoorState.OPEN
+            && value !== this.platform.Characteristic.TargetDoorState.CLOSED) {
+            throw new this.platform.api.hap.HapStatusError(-70410 /* this.platform.api.hap.HAPStatus.INVALID_VALUE_IN_REQUEST */);
+        }
+        if (this.commandUncertain) {
+            throw new this.platform.api.hap.HapStatusError(-70403 /* this.platform.api.hap.HAPStatus.RESOURCE_BUSY */);
+        }
+        this.assertAvailable();
+        const isOpen = this.state === this.platform.Characteristic.CurrentDoorState.OPEN;
+        if (value === this.platform.Characteristic.TargetDoorState.CLOSED) {
+            if (!isOpen) {
+                return;
+            }
+            throw new this.platform.api.hap.HapStatusError(-70412 /* this.platform.api.hap.HAPStatus.NOT_ALLOWED_IN_CURRENT_STATE */);
+        }
+        if (isOpen) {
+            return;
+        }
+        this.setCommandUncertain(true, true);
+        this.armConfirmationTimer();
         this.platform.log.debug(`Publishing ${this.context.topic}/execute_action = open`);
-        this.platform.publishCommand(`${this.context.topic}/execute_action`, 'open');
-        this.service.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.OPEN);
-        setTimeout(() => {
-            this.service.updateCharacteristic(this.platform.Characteristic.CurrentDoorState, this.platform.Characteristic.CurrentDoorState.CLOSED);
-        }, 1000);
+        try {
+            await this.platform.publishActionAsync(`${this.context.topic}/execute_action`, 'open');
+        }
+        catch (error) {
+            if (!this.platform.isPublishCompletionUnknown(error)) {
+                this.setCommandUncertain(false);
+            }
+            throw error;
+        }
     }
     async handleObstructionDetectedGet() {
-        const state = 0;
-        return state;
+        return false;
+    }
+    assertAvailable() {
+        if (!this.connected || !this.hasState || this.commandUncertain) {
+            throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+        }
+    }
+    setCommandUncertain(uncertain, requirePersistence = false) {
+        const previous = this.commandUncertain;
+        const previousConfirmationExpired = this.confirmationExpired;
+        const previousContext = this.accessory.context.suplaWicketCommandUncertain;
+        this.commandUncertain = uncertain;
+        this.confirmationExpired = uncertain ? this.confirmationExpired : false;
+        this.accessory.context.suplaWicketCommandUncertain = uncertain;
+        try {
+            this.platform.api.updatePlatformAccessories([this.accessory]);
+        }
+        catch (error) {
+            this.commandUncertain = previous;
+            this.confirmationExpired = previous && !uncertain
+                ? true
+                : previousConfirmationExpired;
+            this.accessory.context.suplaWicketCommandUncertain = previousContext;
+            this.platform.log.error(`Failed to persist wicket command uncertainty for ${this.accessory.displayName}: ${error.message}`);
+            if (requirePersistence) {
+                throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
+            }
+        }
+        if (!this.commandUncertain) {
+            this.clearConfirmationTimer();
+        }
+    }
+    armConfirmationTimer() {
+        this.clearConfirmationTimer();
+        this.confirmationExpired = false;
+        this.confirmationTimer = setTimeout(() => {
+            this.confirmationTimer = undefined;
+            if (!this.commandUncertain) {
+                return;
+            }
+            this.confirmationExpired = true;
+            this.platform.log.warn(`Wicket command for ${this.accessory.displayName} was not confirmed within ` +
+                `${this.confirmationTimeoutMs}ms; waiting for a live state before allowing another action.`);
+        }, this.confirmationTimeoutMs);
+    }
+    expirePendingConfirmation() {
+        if (this.commandUncertain) {
+            this.confirmationExpired = true;
+            this.clearConfirmationTimer();
+        }
+    }
+    clearConfirmationTimer() {
+        if (this.confirmationTimer) {
+            clearTimeout(this.confirmationTimer);
+            this.confirmationTimer = undefined;
+        }
     }
 }
 exports.WicketAccesory = WicketAccesory;

package/dist/Accesories/WicketAccesory.js.map

@@ -1 +1 @@
-{"version":3,"file":"WicketAccesory.js","sourceRoot":"","sources":["../../src/Accesories/WicketAccesory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WicketAccesory.js","sourceRoot":"","sources":["../../src/Accesories/WicketAccesory.ts"],"names":[],"mappings":"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"}

package/dist/Heplers/ColorConverters.d.ts

@@ -8,10 +8,10 @@ export declare function RGBtoHSV(r: any, g: any, b: any): {
     s: number;
     v: number;
 };
-export declare function HexToRGB(hex: any): {
+export declare function HexToRGB(hex: unknown): {
     r: number;
     g: number;
     b: number;
-};
+} | undefined;
 export declare function RGBToHex(r: any, g: any, b: any): string;
 //# sourceMappingURL=ColorConverters.d.ts.map

package/dist/Heplers/ColorConverters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColorConverters.d.ts","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EAiC/B;AAED,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EA2B/B;AAED,wBAAgB,QAAQ,CAAC,GAAG,KAAA;;;;EAM3B;AAED,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA,UAU/B"}
+{"version":3,"file":"ColorConverters.d.ts","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EAiC/B;AAED,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA;;;;EA2B/B;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,GAAG,SAAS,CAUpF;AAED,wBAAgB,QAAQ,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA,EAAE,CAAC,KAAA,UAU/B"}

package/dist/Heplers/ColorConverters.js

@@ -86,10 +86,14 @@ function RGBtoHSV(r, g, b) {
     };
 }
 function HexToRGB(hex) {
+    if (typeof hex !== 'string' || !/^0x[0-9a-fA-F]{6}$/.test(hex.trim())) {
+        return undefined;
+    }
+    const normalized = hex.trim();
     return {
-        r: parseInt(hex.substr(2, 2), 16),
-        g: parseInt(hex.substr(4, 2), 16),
-        b: parseInt(hex.substr(6, 2), 16),
+        r: parseInt(normalized.slice(2, 4), 16),
+        g: parseInt(normalized.slice(4, 6), 16),
+        b: parseInt(normalized.slice(6, 8), 16),
     };
 }
 function RGBToHex(r, g, b) {

package/dist/Heplers/ColorConverters.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColorConverters.js","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ColorConverters.js","sourceRoot":"","sources":["../../src/Heplers/ColorConverters.ts"],"names":[],"mappings":"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"}

package/dist/Heplers/DisplayName.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Retains the vendor's caption losslessly apart from unsafe control characters,
+ * and canonicalizes equivalent Unicode spellings so cache comparisons are stable.
+ */
+export declare function normalizeVendorCaption(value: unknown): string | undefined;
+/**
+ * Produces a HAP-compliant label without applying an ASCII-only sanitizer.
+ * Unicode letters and numbers (including Polish and non-Latin scripts) survive.
+ */
+export declare function toHomeKitDisplayName(value: unknown): string | undefined;
+export declare function isHomeKitDisplayName(value: unknown): value is string;
+export declare function homeKitElectricityServiceName(baseName: string, metric: string): string;
+export declare function generatedChannelCaption(deviceId: string, channelId: string): string;
+export declare function isGeneratedChannelCaption(caption: string | undefined, deviceId: string, channelId: string): boolean;
+//# sourceMappingURL=DisplayName.d.ts.map

package/dist/Heplers/DisplayName.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DisplayName.d.ts","sourceRoot":"","sources":["../../src/Heplers/DisplayName.ts"],"names":[],"mappings":"AA6EA;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CASzE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAkCvE;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAKpE;AAED,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAStF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAInF;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAsBT"}

package/dist/Heplers/DisplayName.js

@@ -0,0 +1,174 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeVendorCaption = normalizeVendorCaption;
+exports.toHomeKitDisplayName = toHomeKitDisplayName;
+exports.isHomeKitDisplayName = isHomeKitDisplayName;
+exports.homeKitElectricityServiceName = homeKitElectricityServiceName;
+exports.generatedChannelCaption = generatedChannelCaption;
+exports.isGeneratedChannelCaption = isGeneratedChannelCaption;
+const DASHES = /[\u2010-\u2015\u2212\uFE58\uFE63\uFF0D]/gu;
+const SINGLE_QUOTES = /[\u2018\u201b\u2032]/gu;
+const DOUBLE_QUOTES = /[\u201c\u201d\u201e\u201f\u2033]/gu;
+const HOMEKIT_INTERIOR = /[\p{L}\p{N}\p{Zs}\u2019'&!._:;()/,-]/u;
+const HOMEKIT_EDGE = /[\p{L}\p{N}]/u;
+const HOMEKIT_NAME_MAX_UTF16_LENGTH = 64;
+const ELECTRICITY_METRIC_NAMES = {
+    total_forward_active_power: { label: 'Total forward active power', unit: 'W' },
+    active_power: { label: 'Active power', unit: 'W' },
+    power: { label: 'Power', unit: 'W' },
+    total_forward_active_energy: { label: 'Total forward active energy', unit: 'kWh' },
+    energy: { label: 'Energy', unit: 'kWh' },
+    current: { label: 'Current', unit: 'A' },
+    voltage: { label: 'Voltage', unit: 'V' },
+    frequency: { label: 'Frequency', unit: 'Hz' },
+    value: { label: 'Generic value', unit: 'unknown unit' },
+};
+function replaceUnpairedSurrogates(value) {
+    let result = '';
+    for (let index = 0; index < value.length; index += 1) {
+        const code = value.charCodeAt(index);
+        if (code >= 0xd800 && code <= 0xdbff) {
+            const next = value.charCodeAt(index + 1);
+            if (next >= 0xdc00 && next <= 0xdfff) {
+                result += value[index] + value[index + 1];
+                index += 1;
+            }
+            else {
+                result += ' ';
+            }
+            continue;
+        }
+        if (code >= 0xdc00 && code <= 0xdfff) {
+            result += ' ';
+            continue;
+        }
+        result += value[index];
+    }
+    return result;
+}
+function replaceUnsafeControls(value) {
+    let result = '';
+    for (const character of value) {
+        const codePoint = character.codePointAt(0);
+        const isUnsafe = /\p{Cc}|\p{Zl}|\p{Zp}/u.test(character)
+            || (/\p{Cf}/u.test(character) && codePoint !== 0x200c && codePoint !== 0x200d);
+        result += isUnsafe ? ' ' : character;
+    }
+    return result;
+}
+function stripInvalidEdges(value) {
+    const characters = Array.from(value);
+    while (characters.length > 0 && !HOMEKIT_EDGE.test(characters[0])) {
+        characters.shift();
+    }
+    while (characters.length > 0 && !HOMEKIT_EDGE.test(characters[characters.length - 1])) {
+        characters.pop();
+    }
+    return characters.join('').trim();
+}
+function truncateUtf16Safely(value, maxLength = HOMEKIT_NAME_MAX_UTF16_LENGTH) {
+    let result = '';
+    for (const character of value) {
+        if (result.length + character.length > maxLength) {
+            break;
+        }
+        result += character;
+    }
+    return result;
+}
+/**
+ * Retains the vendor's caption losslessly apart from unsafe control characters,
+ * and canonicalizes equivalent Unicode spellings so cache comparisons are stable.
+ */
+function normalizeVendorCaption(value) {
+    if (value === undefined || value === null) {
+        return undefined;
+    }
+    const normalized = replaceUnsafeControls(replaceUnpairedSurrogates(String(value)))
+        .normalize('NFC')
+        .replace(/\p{Zs}+/gu, ' ')
+        .trim();
+    return normalized || undefined;
+}
+/**
+ * Produces a HAP-compliant label without applying an ASCII-only sanitizer.
+ * Unicode letters and numbers (including Polish and non-Latin scripts) survive.
+ */
+function toHomeKitDisplayName(value) {
+    const vendorName = normalizeVendorCaption(value);
+    if (!vendorName) {
+        return undefined;
+    }
+    const mapped = vendorName
+        .replace(DASHES, '-')
+        .replace(SINGLE_QUOTES, '\u2019')
+        .replace(DOUBLE_QUOTES, ' ');
+    let result = '';
+    let insertedSeparator = false;
+    for (const character of mapped) {
+        if (HOMEKIT_INTERIOR.test(character)) {
+            result += character;
+            insertedSeparator = false;
+        }
+        else if (result && !insertedSeparator) {
+            // Do not concatenate words that were separated by an unsupported symbol.
+            result += ' ';
+            insertedSeparator = true;
+        }
+    }
+    result = result.replace(/\p{Zs}+/gu, ' ').trim();
+    result = stripInvalidEdges(truncateUtf16Safely(result));
+    if (!result) {
+        return undefined;
+    }
+    // HAP-NodeJS's current validation requires distinct start and end code points.
+    if (Array.from(result).length === 1) {
+        result = `${result} Device`;
+    }
+    return result;
+}
+function isHomeKitDisplayName(value) {
+    if (typeof value !== 'string' || value.length > HOMEKIT_NAME_MAX_UTF16_LENGTH) {
+        return false;
+    }
+    return /^[\p{L}\p{N}][\p{L}\p{N}\p{Zs}\u2019'&!._:;()/,-]*[\p{L}\p{N}]$/u.test(value);
+}
+function homeKitElectricityServiceName(baseName, metric) {
+    const metadata = ELECTRICITY_METRIC_NAMES[metric]
+        ?? { label: 'Metric', unit: 'unknown unit' };
+    const suffix = toHomeKitDisplayName(`${metadata.label}; ${metadata.unit}`) ?? 'Meter';
+    const separator = ' - ';
+    const safeBase = toHomeKitDisplayName(baseName) ?? 'Supla';
+    const baseLimit = Math.max(1, HOMEKIT_NAME_MAX_UTF16_LENGTH - separator.length - suffix.length);
+    const shortenedBase = stripInvalidEdges(truncateUtf16Safely(safeBase, baseLimit)) || 'S';
+    return `${shortenedBase}${separator}${suffix}`;
+}
+function generatedChannelCaption(deviceId, channelId) {
+    return deviceId === 'legacy'
+        ? `RollerShutter ${channelId}`
+        : `Device ${deviceId} Channel ${channelId}`;
+}
+function isGeneratedChannelCaption(caption, deviceId, channelId) {
+    const normalized = normalizeVendorCaption(caption);
+    if (!normalized) {
+        return true;
+    }
+    const folded = normalized.toLocaleLowerCase('pl-PL').replace(/\p{Zs}+/gu, ' ');
+    const placeholders = [
+        generatedChannelCaption(deviceId, channelId),
+        `Device ${deviceId}`,
+        `Channel ${channelId}`,
+        `Urządzenie ${deviceId}`,
+        `Kanał ${channelId}`,
+        'Unknown',
+        'Undefined',
+        'Null',
+        'Unnamed',
+        'No caption',
+        'N/A',
+        'None',
+        '-',
+    ];
+    return placeholders.some(value => value.toLocaleLowerCase('pl-PL') === folded);
+}
+//# sourceMappingURL=DisplayName.js.map

package/dist/Heplers/DisplayName.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DisplayName.js","sourceRoot":"","sources":["../../src/Heplers/DisplayName.ts"],"names":[],"mappings":"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"}

package/dist/Heplers/SuplaChannelContext.d.ts

@@ -6,6 +6,8 @@ export declare class SuplaChannelContext {
     deviceId: string;
     channelId: string;
     rawTopic?: string | undefined;
-    constructor(topic: string, channelType: string, channelFunction: string, channelCaption: string, deviceId: string, channelId: string, rawTopic?: string | undefined);
+    channelCaptionAuthoritative?: boolean | undefined;
+    channelCaptionSource?: "retained" | "authoritative_snapshot" | "cache" | "generated" | undefined;
+    constructor(topic: string, channelType: string, channelFunction: string, channelCaption: string, deviceId: string, channelId: string, rawTopic?: string | undefined, channelCaptionAuthoritative?: boolean | undefined, channelCaptionSource?: "retained" | "authoritative_snapshot" | "cache" | "generated" | undefined);
 }
 //# sourceMappingURL=SuplaChannelContext.d.ts.map

package/dist/Heplers/SuplaChannelContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SuplaChannelContext.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAmB;IAErB,KAAK,EAAE,MAAM;IACb,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,MAAM;IACvB,cAAc,EAAE,MAAM;IACtB,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,MAAM;IACjB,QAAQ,CAAC,EAAE,MAAM;gBANjB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,YAAA;CAG3B"}
+{"version":3,"file":"SuplaChannelContext.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":"AAAA,qBAAa,mBAAmB;IAErB,KAAK,EAAE,MAAM;IACb,WAAW,EAAE,MAAM;IACnB,eAAe,EAAE,MAAM;IACvB,cAAc,EAAE,MAAM;IACtB,QAAQ,EAAE,MAAM;IAChB,SAAS,EAAE,MAAM;IACjB,QAAQ,CAAC,EAAE,MAAM;IACjB,2BAA2B,CAAC,EAAE,OAAO;IACrC,oBAAoB,CAAC,EAAE,UAAU,GAAG,wBAAwB,GAAG,OAAO,GAAG,WAAW;gBARpF,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,YAAA,EACjB,2BAA2B,CAAC,EAAE,OAAO,YAAA,EACrC,oBAAoB,CAAC,EAAE,UAAU,GAAG,wBAAwB,GAAG,OAAO,GAAG,WAAW,YAAA;CAG9F"}

package/dist/Heplers/SuplaChannelContext.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SuplaChannelContext = void 0;
 class SuplaChannelContext {
-    constructor(topic, channelType, channelFunction, channelCaption, deviceId, channelId, rawTopic) {
+    constructor(topic, channelType, channelFunction, channelCaption, deviceId, channelId, rawTopic, channelCaptionAuthoritative, channelCaptionSource) {
         this.topic = topic;
         this.channelType = channelType;
         this.channelFunction = channelFunction;
@@ -10,6 +10,8 @@ class SuplaChannelContext {
         this.deviceId = deviceId;
         this.channelId = channelId;
         this.rawTopic = rawTopic;
+        this.channelCaptionAuthoritative = channelCaptionAuthoritative;
+        this.channelCaptionSource = channelCaptionSource;
     }
 }
 exports.SuplaChannelContext = SuplaChannelContext;

package/dist/Heplers/SuplaChannelContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"SuplaChannelContext.js","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":";;;AAAA,MAAa,mBAAmB;IAC9B,YACS,KAAa,EACb,WAAmB,EACnB,eAAuB,EACvB,cAAsB,EACtB,QAAgB,EAChB,SAAiB,EACjB,QAAiB;QANjB,UAAK,GAAL,KAAK,CAAQ;QACb,gBAAW,GAAX,WAAW,CAAQ;QACnB,oBAAe,GAAf,eAAe,CAAQ;QACvB,mBAAc,GAAd,cAAc,CAAQ;QACtB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAS;IAE1B,CAAC;CACF;AAXD,kDAWC"}
+{"version":3,"file":"SuplaChannelContext.js","sourceRoot":"","sources":["../../src/Heplers/SuplaChannelContext.ts"],"names":[],"mappings":";;;AAAA,MAAa,mBAAmB;IAC9B,YACS,KAAa,EACb,WAAmB,EACnB,eAAuB,EACvB,cAAsB,EACtB,QAAgB,EAChB,SAAiB,EACjB,QAAiB,EACjB,2BAAqC,EACrC,oBAAoF;QARpF,UAAK,GAAL,KAAK,CAAQ;QACb,gBAAW,GAAX,WAAW,CAAQ;QACnB,oBAAe,GAAf,eAAe,CAAQ;QACvB,mBAAc,GAAd,cAAc,CAAQ;QACtB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAS;QACjB,gCAA2B,GAA3B,2BAA2B,CAAU;QACrC,yBAAoB,GAApB,oBAAoB,CAAgE;IAE7F,CAAC;CACF;AAbD,kDAaC"}

package/dist/Heplers/SuplaMqttClient.d.ts

@@ -1,16 +1,25 @@
-import { IPublishPacket, MqttClient } from 'mqtt';
+import { MqttClient } from 'mqtt';
 import { Logger } from 'homebridge';
 import { SuplaMqttClientContext } from './SuplaMqttClientContext';
 import { SuplaChannelContext } from './SuplaChannelContext';
-type RegisterHandler = (topic: string, handler: (message: Buffer, topic: string, packet: IPublishPacket) => void) => () => void;
+export interface DiscoverySnapshot<T> {
+    items: T[];
+    observedIds: Set<string>;
+    authoritative: boolean;
+    complete: boolean;
+    warnings: string[];
+}
 export declare class SuplaMqttClient {
     private readonly context;
     private readonly log;
     client: MqttClient;
     constructor(context: SuplaMqttClientContext, log: Logger);
-    discoverChannelsAsync(registerHandler?: RegisterHandler): Promise<Array<SuplaChannelContext>>;
+    discoverChannelsAsync(): Promise<Array<SuplaChannelContext>>;
+    discoverChannelsSnapshotAsync(): Promise<DiscoverySnapshot<SuplaChannelContext>>;
     private discoverCloudChannelsAsync;
     private discoverLegacyRollerShuttersAsync;
+    private collectRetainedMessages;
+    private waitForConnection;
     private resolveProtocol;
     private resolveIncludeHidden;
     private escapeRegex;
@@ -19,5 +28,4 @@ export declare class SuplaMqttClient {
     private resolveBoolean;
     private resolveTopicScheme;
 }
-export {};
 //# sourceMappingURL=SuplaMqttClient.d.ts.map

package/dist/Heplers/SuplaMqttClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SuplaMqttClient.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClient.ts"],"names":[],"mappings":"AAAA,OAAa,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,MAAM,CAAC;AAEtD,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAE1D,KAAK,eAAe,GAAG,CACrB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,KAAK,IAAI,KACtE,MAAM,IAAI,CAAC;AAEhB,qBAAa,eAAe;IAGxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHf,MAAM,EAAE,UAAU,CAAC;gBAEP,OAAO,EAAG,sBAAsB,EAChC,GAAG,EAAG,MAAM;IAuClB,qBAAqB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAI,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YAiB7F,0BAA0B;YAuI1B,iCAAiC;IAoG/C,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,kBAAkB;CAU3B"}
+{"version":3,"file":"SuplaMqttClient.d.ts","sourceRoot":"","sources":["../../src/Heplers/SuplaMqttClient.ts"],"names":[],"mappings":"AAAA,OAAa,EAAiB,UAAU,EAAC,MAAM,MAAM,CAAC;AAGtD,OAAO,EAAC,MAAM,EAAC,MAAM,YAAY,CAAC;AAClC,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAO1D,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,KAAK,EAAE,CAAC,EAAE,CAAC;IACX,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,qBAAa,eAAe;IAGxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHf,MAAM,EAAE,UAAU,CAAC;gBAEP,OAAO,EAAG,sBAAsB,EAChC,GAAG,EAAG,MAAM;IAuClB,qBAAqB,IAAK,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAI7D,6BAA6B,IAAI,OAAO,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;YAsB/E,0BAA0B;YAgI1B,iCAAiC;YAiFjC,uBAAuB;YAyHvB,iBAAiB;IAwB/B,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,cAAc;IAsBtB,OAAO,CAAC,kBAAkB;CAU3B"}