@smarthome.exchange/integrations 0.2.0 → 1.0.0

package/dist_ts/integrations/hue/hue.discovery.js

@@ -1,25 +1,62 @@
+import * as plugins from '../../plugins.js';
+import { hueBridgeId, hueContentType, normalizeHueHost } from './hue.validation.js';
 import { DiscoveryDescriptor } from '../../core/classes.discoverydescriptor.js';
 export class HueBrokerDiscoveryProbe {
     id = 'hue-broker-probe';
     source = 'broker';
     description = 'Return Hue bridge candidates from the Hue discovery broker.';
     async probe(contextArg) {
-        if (contextArg.abortSignal?.aborted) {
+        if (contextArg.abortSignal?.aborted)
             return { candidates: [] };
+        const signal = AbortSignal.any([AbortSignal.timeout(5000), ...(contextArg.abortSignal ? [contextArg.abortSignal] : [])]);
+        const response = await fetch('https://discovery.meethue.com/', { signal, redirect: 'error', cache: 'no-store' });
+        if (!response.ok || !response.body || !hueContentType(response.headers.get('content-type'), 'application/json')) {
+            await response.body?.cancel();
+            throw new Error('Hue discovery broker returned an invalid response.');
         }
-        return {
-            candidates: [
-                {
-                    source: 'broker',
-                    integrationDomain: 'hue',
-                    id: '001788fffe123456',
-                    host: '192.168.1.42',
-                    port: 443,
-                    manufacturer: 'Signify',
-                    model: 'Philips Hue Bridge',
-                },
-            ],
-        };
+        const reader = response.body.getReader();
+        const chunks = [];
+        let bytes = 0;
+        try {
+            while (true) {
+                const result = await reader.read();
+                if (result.done)
+                    break;
+                bytes += result.value.byteLength;
+                if (bytes > 262144) {
+                    await reader.cancel();
+                    throw new Error('Hue discovery broker response exceeds its size limit.');
+                }
+                chunks.push(result.value);
+            }
+        }
+        finally {
+            reader.releaseLock();
+        }
+        let payload;
+        try {
+            payload = JSON.parse(new TextDecoder('utf-8', { fatal: true }).decode(Buffer.concat(chunks)));
+        }
+        catch {
+            throw new Error('Hue discovery broker returned invalid JSON.');
+        }
+        if (!Array.isArray(payload) || payload.length > 1024)
+            throw new Error('Hue discovery broker returned invalid bridge metadata.');
+        const candidates = [];
+        const ids = new Set();
+        for (const record of payload) {
+            if (!record || typeof record !== 'object' || Array.isArray(record) || !('id' in record) || !hueBridgeId(record.id)
+                || !('internalipaddress' in record) || typeof record.internalipaddress !== 'string' || !plugins.net.isIP(record.internalipaddress)) {
+                throw new Error('Hue discovery broker returned invalid bridge metadata.');
+            }
+            const id = record.id.toLowerCase();
+            if (ids.has(id))
+                throw new Error('Hue discovery broker returned duplicate bridge identities.');
+            ids.add(id);
+            candidates.push({ source: 'broker', integrationDomain: 'hue', id, host: record.internalipaddress, port: 443,
+                manufacturer: 'Signify', model: 'Philips Hue Bridge' });
+        }
+        return { candidates };
     }
 }
 export class HueMdnsMatcher {
@@ -27,27 +64,36 @@ export class HueMdnsMatcher {
     source = 'mdns';
     description = 'Recognize Hue bridge mDNS records by bridgeid TXT data.';
     async matches(recordArg) {
+        if (!recordArg || typeof recordArg !== 'object')
+            return { matched: false, confidence: 'low', reason: 'Hue mDNS record is invalid.' };
         const bridgeId = recordArg.txt?.bridgeid;
-        if (!bridgeId) {
+        if (!hueBridgeId(bridgeId) || !recordArg.host) {
             return {
                 matched: false,
                 confidence: 'low',
                 reason: 'No Hue bridge ID found.',
             };
         }
+        let host;
+        try {
+            host = normalizeHueHost(recordArg.host);
+        }
+        catch {
+            return { matched: false, confidence: 'low', reason: 'Hue mDNS host is invalid.' };
+        }
         return {
             matched: true,
-            confidence: 'certain',
+            confidence: 'high',
             reason: 'mDNS record contains Hue bridge ID.',
-            normalizedDeviceId: bridgeId,
+            normalizedDeviceId: bridgeId.toLowerCase(),
             candidate: {
                 source: 'mdns',
                 integrationDomain: 'hue',
-                id: bridgeId,
-                host: recordArg.host,
-                port: recordArg.port,
+                id: bridgeId.toLowerCase(),
+                host,
+                port: 443,
                 manufacturer: 'Signify',
-                model: recordArg.txt?.modelid,
+                model: typeof recordArg.txt?.modelid === 'string' && recordArg.txt.modelid.length <= 128 ? recordArg.txt.modelid : undefined,
             },
         };
     }
@@ -57,19 +103,26 @@ export class HueBridgeValidator {
     description = 'Confirm a candidate has enough Hue bridge metadata to start setup.';
     async validate(candidateArg) {
         const isHue = candidateArg.integrationDomain === 'hue' || candidateArg.manufacturer === 'Signify';
-        if (!isHue || !candidateArg.host) {
+        if (!isHue || !candidateArg.host || !hueBridgeId(candidateArg.id)) {
             return {
                 matched: false,
                 confidence: 'low',
                 reason: 'Candidate lacks Hue metadata or host information.',
             };
         }
+        try {
+            normalizeHueHost(candidateArg.host);
+        }
+        catch {
+            return { matched: false, confidence: 'low', reason: 'Hue candidate host is invalid.' };
+        }
         return {
             matched: true,
-            confidence: candidateArg.id ? 'certain' : 'high',
+            confidence: 'high',
             reason: 'Candidate can be configured as a Hue bridge.',
-            candidate: candidateArg,
-            normalizedDeviceId: candidateArg.id,
+            candidate: { source: candidateArg.source, integrationDomain: 'hue', id: candidateArg.id.toLowerCase(),
+                host: normalizeHueHost(candidateArg.host), port: 443, manufacturer: 'Signify' },
+            normalizedDeviceId: candidateArg.id.toLowerCase(),
         };
     }
 }
@@ -82,4 +135,4 @@ export const createHueDiscoveryDescriptor = () => {
         .addMatcher(new HueMdnsMatcher())
         .addValidator(new HueBridgeValidator());
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHVlLmRpc2NvdmVyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL2ludGVncmF0aW9ucy9odWUvaHVlLmRpc2NvdmVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQVloRixNQUFNLE9BQU8sdUJBQXVCO0lBQzNCLEVBQUUsR0FBRyxrQkFBa0IsQ0FBQztJQUN4QixNQUFNLEdBQUcsUUFBaUIsQ0FBQztJQUMzQixXQUFXLEdBQUcsNkRBQTZELENBQUM7SUFFNUUsS0FBSyxDQUFDLEtBQUssQ0FBQyxVQUE2QjtRQUM5QyxJQUFJLFVBQVUsQ0FBQyxXQUFXLEVBQUUsT0FBTyxFQUFFLENBQUM7WUFDcEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxFQUFFLEVBQUUsQ0FBQztRQUM1QixDQUFDO1FBQ0QsT0FBTztZQUNMLFVBQVUsRUFBRTtnQkFDVjtvQkFDRSxNQUFNLEVBQUUsUUFBUTtvQkFDaEIsaUJBQWlCLEVBQUUsS0FBSztvQkFDeEIsRUFBRSxFQUFFLGtCQUFrQjtvQkFDdEIsSUFBSSxFQUFFLGNBQWM7b0JBQ3BCLElBQUksRUFBRSxHQUFHO29CQUNULFlBQVksRUFBRSxTQUFTO29CQUN2QixLQUFLLEVBQUUsb0JBQW9CO2lCQUM1QjthQUNGO1NBQ0YsQ0FBQztJQUNKLENBQUM7Q0FDRjtBQUVELE1BQU0sT0FBTyxjQUFjO0lBQ2xCLEVBQUUsR0FBRyxnQkFBZ0IsQ0FBQztJQUN0QixNQUFNLEdBQUcsTUFBZSxDQUFDO0lBQ3pCLFdBQVcsR0FBRyx5REFBeUQsQ0FBQztJQUV4RSxLQUFLLENBQUMsT0FBTyxDQUFDLFNBQXlCO1FBQzVDLE1BQU0sUUFBUSxHQUFHLFNBQVMsQ0FBQyxHQUFHLEVBQUUsUUFBUSxDQUFDO1FBQ3pDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUNkLE9BQU87Z0JBQ0wsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsVUFBVSxFQUFFLEtBQUs7Z0JBQ2pCLE1BQU0sRUFBRSx5QkFBeUI7YUFDbEMsQ0FBQztRQUNKLENBQUM7UUFFRCxPQUFPO1lBQ0wsT0FBTyxFQUFFLElBQUk7WUFDYixVQUFVLEVBQUUsU0FBUztZQUNyQixNQUFNLEVBQUUscUNBQXFDO1lBQzdDLGtCQUFrQixFQUFFLFFBQVE7WUFDNUIsU0FBUyxFQUFFO2dCQUNULE1BQU0sRUFBRSxNQUFNO2dCQUNkLGlCQUFpQixFQUFFLEtBQUs7Z0JBQ3hCLEVBQUUsRUFBRSxRQUFRO2dCQUNaLElBQUksRUFBRSxTQUFTLENBQUMsSUFBSTtnQkFDcEIsSUFBSSxFQUFFLFNBQVMsQ0FBQyxJQUFJO2dCQUNwQixZQUFZLEVBQUUsU0FBUztnQkFDdkIsS0FBSyxFQUFFLFNBQVMsQ0FBQyxHQUFHLEVBQUUsT0FBTzthQUM5QjtTQUNGLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sa0JBQWtCO0lBQ3RCLEVBQUUsR0FBRyxzQkFBc0IsQ0FBQztJQUM1QixXQUFXLEdBQUcsb0VBQW9FLENBQUM7SUFFbkYsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFpQztRQUNyRCxNQUFNLEtBQUssR0FBRyxZQUFZLENBQUMsaUJBQWlCLEtBQUssS0FBSyxJQUFJLFlBQVksQ0FBQyxZQUFZLEtBQUssU0FBUyxDQUFDO1FBQ2xHLElBQUksQ0FBQyxLQUFLLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDakMsT0FBTztnQkFDTCxPQUFPLEVBQUUsS0FBSztnQkFDZCxVQUFVLEVBQUUsS0FBSztnQkFDakIsTUFBTSxFQUFFLG1EQUFtRDthQUM1RCxDQUFDO1FBQ0osQ0FBQztRQUNELE9BQU87WUFDTCxPQUFPLEVBQUUsSUFBSTtZQUNiLFVBQVUsRUFBRSxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLE1BQU07WUFDaEQsTUFBTSxFQUFFLDhDQUE4QztZQUN0RCxTQUFTLEVBQUUsWUFBWTtZQUN2QixrQkFBa0IsRUFBRSxZQUFZLENBQUMsRUFBRTtTQUNwQyxDQUFDO0lBQ0osQ0FBQztDQUNGO0FBRUQsTUFBTSxDQUFDLE1BQU0sNEJBQTRCLEdBQUcsR0FBd0IsRUFBRTtJQUNwRSxPQUFPLElBQUksbUJBQW1CLENBQUM7UUFDN0IsaUJBQWlCLEVBQUUsS0FBSztRQUN4QixXQUFXLEVBQUUsYUFBYTtLQUMzQixDQUFDO1NBQ0MsUUFBUSxDQUFDLElBQUksdUJBQXVCLEVBQUUsQ0FBQztTQUN2QyxVQUFVLENBQUMsSUFBSSxjQUFjLEVBQUUsQ0FBQztTQUNoQyxZQUFZLENBQUMsSUFBSSxrQkFBa0IsRUFBRSxDQUFDLENBQUM7QUFDNUMsQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHVlLmRpc2NvdmVyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL2ludGVncmF0aW9ucy9odWUvaHVlLmRpc2NvdmVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFZaEYsTUFBTSxPQUFPLHVCQUF1QjtJQUMzQixFQUFFLEdBQUcsa0JBQWtCLENBQUM7SUFDeEIsTUFBTSxHQUFHLFFBQWlCLENBQUM7SUFDM0IsV0FBVyxHQUFHLDZEQUE2RCxDQUFDO0lBRTVFLEtBQUssQ0FBQyxLQUFLLENBQUMsVUFBNkI7UUFDOUMsSUFBSSxVQUFVLENBQUMsV0FBVyxFQUFFLE9BQU87WUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLEVBQUUsRUFBRSxDQUFDO1FBQy9ELE1BQU0sTUFBTSxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3pILE1BQU0sUUFBUSxHQUFHLE1BQU0sS0FBSyxDQUFDLGdDQUFnQyxFQUFFLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUM7UUFDakgsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsR0FBRyxD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

package/dist_ts/integrations/hue/hue.mapper.d.ts

@@ -5,5 +5,4 @@ export declare class HueMapper {
     static toDevices(resourcesArg: IHueResourceResponse): plugins.shxInterfaces.data.IDeviceDefinition[];
     static toEntities(resourcesArg: IHueResourceResponse): IIntegrationEntity[];
     static toIntegrationEvent(eventArg: IHueEvent): IIntegrationEvent;
-    private static slug;
 }

package/dist_ts/integrations/hue/hue.mapper.js

@@ -1,73 +1,45 @@
 import * as plugins from '../../plugins.js';
 export class HueMapper {
     static toDevices(resourcesArg) {
-        const devices = [];
-        if (resourcesArg.bridge) {
-            devices.push({
+        const timestamp = new Date().toISOString();
+        const devices = [{
                 id: `hue.bridge.${resourcesArg.bridge.id}`,
-                integrationDomain: 'hue',
-                name: resourcesArg.bridge.metadata?.name || 'Hue Bridge',
-                protocol: 'hue',
-                manufacturer: resourcesArg.bridge.productData?.manufacturerName || 'Signify',
+                integrationDomain: 'hue', name: resourcesArg.bridge.metadata?.name || 'Hue Bridge', protocol: 'hue',
+                manufacturer: resourcesArg.bridge.productData?.manufacturerName,
                 model: resourcesArg.bridge.productData?.productName || resourcesArg.bridge.productData?.modelId,
                 online: true,
-                features: [
-                    { id: 'connectivity', capability: 'sensor', name: 'Connectivity', readable: true, writable: false },
-                ],
-                state: [
-                    { featureId: 'connectivity', value: 'online', updatedAt: new Date().toISOString() },
-                ],
-            });
-        }
+                features: [{ id: 'connectivity', capability: 'sensor', name: 'Connectivity', readable: true, writable: false }],
+                state: [{ featureId: 'connectivity', value: 'online', updatedAt: timestamp }],
+            }];
         for (const light of resourcesArg.lights) {
+            const owner = resourcesArg.devices.find((deviceArg) => deviceArg.id === light.owner.rid);
             devices.push({
-                id: `hue.light.${light.id}`,
-                integrationDomain: 'hue',
-                name: light.metadata?.name || `Hue Light ${light.id}`,
-                protocol: 'hue',
-                manufacturer: 'Signify',
-                model: light.metadata?.archetype,
-                online: true,
-                features: [
-                    { id: 'on', capability: 'light', name: 'Power', readable: true, writable: true },
-                    { id: 'brightness', capability: 'light', name: 'Brightness', readable: true, writable: true, unit: '%' },
-                ],
-                state: [
-                    { featureId: 'on', value: light.on?.on ?? false, updatedAt: new Date().toISOString() },
-                    { featureId: 'brightness', value: light.dimming?.brightness ?? null, updatedAt: new Date().toISOString() },
-                ],
-                metadata: {
-                    hueOwnerRid: light.owner?.rid,
-                },
+                id: `hue.light.${light.id}`, integrationDomain: 'hue',
+                name: light.metadata?.name || owner?.metadata?.name || `Hue Light ${light.id}`, protocol: 'hue',
+                manufacturer: owner?.productData?.manufacturerName,
+                model: owner?.productData?.productName || owner?.productData?.modelId,
+                online: light.available,
+                features: [{ id: 'on', capability: 'light', name: 'Power', readable: true, writable: true },
+                    ...(light.dimming ? [{ id: 'brightness', capability: 'light', name: 'Brightness', readable: true, writable: true, unit: '%' }] : [])],
+                state: [{ featureId: 'on', value: light.on.on, updatedAt: timestamp },
+                    ...(light.dimming ? [{ featureId: 'brightness', value: light.dimming.brightness, updatedAt: timestamp }] : [])],
+                metadata: { hueOwnerRid: light.owner.rid },
             });
         }
         return devices;
     }
     static toEntities(resourcesArg) {
         return resourcesArg.lights.map((lightArg) => ({
-            id: `light.${this.slug(lightArg.metadata?.name || lightArg.id)}`,
-            uniqueId: `hue_light_${lightArg.id}`,
-            integrationDomain: 'hue',
-            deviceId: `hue.light.${lightArg.id}`,
-            platform: 'light',
-            name: lightArg.metadata?.name || `Hue Light ${lightArg.id}`,
-            state: lightArg.on?.on ? 'on' : 'off',
-            attributes: {
-                brightness: lightArg.dimming?.brightness,
-            },
-            available: true,
+            id: `light.${lightArg.id}`, uniqueId: `hue_light_${lightArg.id}`, integrationDomain: 'hue',
+            deviceId: `hue.light.${lightArg.id}`, platform: 'light',
+            name: lightArg.metadata?.name || resourcesArg.devices.find((deviceArg) => deviceArg.id === lightArg.owner.rid)?.metadata?.name || `Hue Light ${lightArg.id}`,
+            state: lightArg.on.on ? 'on' : 'off',
+            attributes: lightArg.dimming ? { brightness: lightArg.dimming.brightness } : {}, available: lightArg.available,
         }));
     }
     static toIntegrationEvent(eventArg) {
-        return {
-            type: 'state_changed',
-            integrationDomain: 'hue',
-            data: eventArg,
-            timestamp: Date.now(),
-        };
-    }
-    static slug(valueArg) {
-        return valueArg.toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/^_+|_+$/g, '') || 'hue_light';
+        return { type: eventArg.type === 'delete' ? 'device_removed' : eventArg.type === 'add' ? 'device_added' : 'state_changed',
+            integrationDomain: 'hue', data: eventArg, timestamp: Date.now() };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHVlLm1hcHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL2ludGVncmF0aW9ucy9odWUvaHVlLm1hcHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBSTVDLE1BQU0sT0FBTyxTQUFTO0lBQ2IsTUFBTSxDQUFDLFNBQVMsQ0FBQyxZQUFrQztRQUN4RCxNQUFNLE9BQU8sR0FBbUQsRUFBRSxDQUFDO1FBRW5FLElBQUksWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ3hCLE9BQU8sQ0FBQyxJQUFJLENBQUM7Z0JBQ1gsRUFBRSxFQUFFLGNBQWMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUU7Z0JBQzFDLGlCQUFpQixFQUFFLEtBQUs7Z0JBQ3hCLElBQUksRUFBRSxZQUFZLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxJQUFJLElBQUksWUFBWTtnQkFDeEQsUUFBUSxFQUFFLEtBQUs7Z0JBQ2YsWUFBWSxFQUFFLFlBQVksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLGdCQUFnQixJQUFJLFNBQVM7Z0JBQzVFLEtBQUssRUFBRSxZQUFZLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxXQUFXLElBQUksWUFBWSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsT0FBTztnQkFDL0YsTUFBTSxFQUFFLElBQUk7Z0JBQ1osUUFBUSxFQUFFO29CQUNSLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFO2lCQUNwRztnQkFDRCxLQUFLLEVBQUU7b0JBQ0wsRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUU7aUJB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHVlLm1hcHBlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL2ludGVncmF0aW9ucy9odWUvaHVlLm1hcHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBSTVDLE1BQU0sT0FBTyxTQUFTO0lBQ2IsTUFBTSxDQUFDLFNBQVMsQ0FBQyxZQUFrQztRQUN4RCxNQUFNLFNBQVMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQzNDLE1BQU0sT0FBTyxHQUFtRCxDQUFDO2dCQUMvRCxFQUFFLEVBQUUsY0FBYyxZQUFZLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRTtnQkFDMUMsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxZQUFZLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBRSxJQUFJLElBQUksWUFBWSxFQUFFLFFBQVEsRUFBRSxLQUFLO2dCQUNuRyxZQUFZLEVBQUUsWUFBWSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsZ0JBQWdCO2dCQUMvRCxLQUFLLEVBQUUsWUFBWSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsV0FBVyxJQUFJLFlBQVksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLE9BQU87Z0JBQy9GLE1BQU0sRUFBRSxJQUFJO2dCQUNaLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLENBQUM7Z0JBQy9HLEtBQUssRUFBRSxDQUFDLEVBQUUsU0FBUyxFQUFFLGNBQWMsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsQ0FBQzthQUM5RSxDQUFDLENBQUM7UUFDSCxLQUFLLE1BQU0sS0FBSyxJQUFJLFlBQVksQ0FB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

package/dist_ts/integrations/hue/hue.types.d.ts

@@ -3,10 +3,13 @@ export interface IHueConfig {
     host: string;
     appKey: string;
     port?: number;
-    resources?: IHueResourceResponse;
+    /** PEM CA supplied by the operator from a trusted source. */
+    trustedCa?: string;
+    requestTimeoutMs?: number;
 }
 export interface IHueLightStatePatch {
     on?: boolean;
+    /** Hue v2 brightness is a percentage, from 0 through 100. */
     brightness?: number;
 }
 export interface IHueDeviceResource {
@@ -26,23 +29,24 @@ export interface IHueDeviceResource {
 export interface IHueLightResource {
     id: string;
     idV1?: string;
-    owner?: {
+    owner: {
         rid: string;
-        rtype: string;
+        rtype: 'device';
     };
     metadata?: {
         name?: string;
         archetype?: string;
     };
-    on?: {
+    on: {
         on: boolean;
     };
     dimming?: {
         brightness: number;
     };
+    available: boolean;
 }
 export interface IHueResourceResponse {
-    bridge?: IHueDeviceResource;
+    bridge: IHueDeviceResource;
     devices: IHueDeviceResource[];
     lights: IHueLightResource[];
 }
@@ -57,6 +61,9 @@ export interface IHueMdnsRecord {
 }
 export interface IHueEvent {
     id: string;
-    type: string;
-    data: unknown;
+    type: 'add' | 'update' | 'delete';
+    data: Array<{
+        id: string;
+        type: string;
+    }>;
 }

package/dist_ts/integrations/hue/hue.validation.d.ts

@@ -0,0 +1,11 @@
+import type { IHueConfig, IHueEvent, IHueLightStatePatch, IHueResourceResponse } from './hue.types.js';
+export declare const hueContentType: (valueArg: unknown, expectedArg: string) => boolean;
+export declare const hueUuid: (valueArg: unknown) => valueArg is string;
+export declare const hueBridgeId: (valueArg: unknown) => valueArg is string;
+export declare const hueRecord: (valueArg: unknown) => Record<string, unknown>;
+export declare const normalizeHueHost: (valueArg: unknown) => string;
+export declare const normalizeHueConfig: (configArg: IHueConfig) => Required<Pick<IHueConfig, 'bridgeId' | 'host' | 'appKey' | 'port' | 'requestTimeoutMs'>> & Pick<IHueConfig, 'trustedCa'>;
+export declare const validateHuePatch: (patchArg: IHueLightStatePatch) => void;
+export declare const parseHueEnvelope: (valueArg: unknown) => unknown[];
+export declare const parseHueResources: (dataArg: unknown[], bridgeIdArg: string) => IHueResourceResponse;
+export declare const parseHueEvents: (valueArg: unknown) => IHueEvent[];

package/dist_ts/integrations/hue/hue.validation.js

@@ -0,0 +1,160 @@
+import * as plugins from '../../plugins.js';
+export const hueContentType = (valueArg, expectedArg) => typeof valueArg === 'string' && valueArg.split(';', 1)[0].trim().toLowerCase() === expectedArg;
+export const hueUuid = (valueArg) => typeof valueArg === 'string' && /^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i.test(valueArg);
+export const hueBridgeId = (valueArg) => typeof valueArg === 'string' && /^[0-9a-f]{16}$/i.test(valueArg);
+export const hueRecord = (valueArg) => {
+    if (!valueArg || typeof valueArg !== 'object' || Array.isArray(valueArg)) {
+        throw new Error('Hue returned an invalid object.');
+    }
+    return valueArg;
+};
+export const normalizeHueHost = (valueArg) => {
+    if (typeof valueArg !== 'string' || valueArg.length > 253 || valueArg !== valueArg.trim()) {
+        throw new Error('Hue host must be a hostname or IP address.');
+    }
+    const host = valueArg.replace(/^\[([^\]]+)\]$/, '$1');
+    if (plugins.net.isIP(host))
+        return host;
+    if (!/^(?=.{1,253}$)[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/i.test(host)
+        || host.split('.').some((partArg) => !/^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/i.test(partArg))) {
+        throw new Error('Hue host must be a hostname or IP address.');
+    }
+    return host;
+};
+export const normalizeHueConfig = (configArg) => {
+    const record = hueRecord(configArg);
+    const allowed = new Set(['bridgeId', 'host', 'appKey', 'port', 'trustedCa', 'requestTimeoutMs']);
+    if (Reflect.ownKeys(record).some((keyArg) => typeof keyArg !== 'string' || !allowed.has(keyArg))) {
+        throw new Error('Hue configuration contains unsupported fields.');
+    }
+    if (!hueBridgeId(record.bridgeId))
+        throw new Error('Hue bridgeId must contain 16 hexadecimal characters.');
+    if (typeof record.appKey !== 'string' || !/^[a-z0-9_-]{1,256}$/i.test(record.appKey)) {
+        throw new Error('Hue appKey must be a nonempty application key.');
+    }
+    const port = record.port ?? 443;
+    const requestTimeoutMs = record.requestTimeoutMs ?? 10_000;
+    if (typeof port !== 'number' || !Number.isInteger(port) || port < 1 || port > 65_535)
+        throw new Error('Hue port is invalid.');
+    if (typeof requestTimeoutMs !== 'number' || !Number.isInteger(requestTimeoutMs) || requestTimeoutMs < 50 || requestTimeoutMs > 60_000) {
+        throw new Error('Hue requestTimeoutMs must be between 50 and 60000.');
+    }
+    if (record.trustedCa !== undefined && (typeof record.trustedCa !== 'string' || record.trustedCa.length > 65_536
+        || !record.trustedCa.includes('-----BEGIN CERTIFICATE-----')))
+        throw new Error('Hue trustedCa must contain a PEM certificate.');
+    return { bridgeId: record.bridgeId.toLowerCase(), host: normalizeHueHost(record.host), appKey: record.appKey, port, requestTimeoutMs,
+        trustedCa: typeof record.trustedCa === 'string' ? record.trustedCa : undefined };
+};
+export const validateHuePatch = (patchArg) => {
+    const patch = hueRecord(patchArg);
+    if (Reflect.ownKeys(patch).some((keyArg) => keyArg !== 'on' && keyArg !== 'brightness')
+        || (patch.on === undefined && patch.brightness === undefined))
+        throw new Error('Hue light state requires power or brightness.');
+    if (patch.on !== undefined && typeof patch.on !== 'boolean')
+        throw new Error('Hue power must be boolean.');
+    if (patch.brightness !== undefined && (typeof patch.brightness !== 'number' || !Number.isFinite(patch.brightness)
+        || patch.brightness < 0 || patch.brightness > 100))
+        throw new Error('Hue brightness must be between 0 and 100 percent.');
+};
+export const parseHueEnvelope = (valueArg) => {
+    const envelope = hueRecord(valueArg);
+    if (!Array.isArray(envelope.errors) || !Array.isArray(envelope.data) || envelope.data.length > 10_000) {
+        throw new Error('Hue returned an invalid API envelope.');
+    }
+    if (envelope.errors.length)
+        throw new Error('Hue bridge rejected the API request.');
+    return envelope.data;
+};
+const optionalString = (valueArg) => {
+    if (valueArg === undefined)
+        return undefined;
+    if (typeof valueArg !== 'string' || valueArg.length > 1024)
+        throw new Error('Hue returned an invalid text field.');
+    return valueArg;
+};
+const deviceResource = (resourceArg) => {
+    if (!hueUuid(resourceArg.id))
+        throw new Error('Hue device resource has an invalid UUID.');
+    const metadata = resourceArg.metadata === undefined ? undefined : hueRecord(resourceArg.metadata);
+    const product = resourceArg.product_data === undefined ? undefined : hueRecord(resourceArg.product_data);
+    return { id: resourceArg.id.toLowerCase(), idV1: optionalString(resourceArg.id_v1),
+        metadata: metadata ? { name: optionalString(metadata.name), archetype: optionalString(metadata.archetype) } : undefined,
+        productData: product ? { manufacturerName: optionalString(product.manufacturer_name), modelId: optionalString(product.model_id),
+            productName: optionalString(product.product_name), softwareVersion: optionalString(product.software_version) } : undefined };
+};
+export const parseHueResources = (dataArg, bridgeIdArg) => {
+    const devices = new Map();
+    const connectivity = new Map();
+    const lightResources = [];
+    const ids = new Set();
+    let bridgeOwner;
+    for (const item of dataArg) {
+        const resource = hueRecord(item);
+        if (!hueUuid(resource.id) || typeof resource.type !== 'string' || resource.type.length > 64 || ids.has(resource.id.toLowerCase())) {
+            throw new Error('Hue returned invalid or duplicate resource identities.');
+        }
+        ids.add(resource.id.toLowerCase());
+        if (resource.type === 'device')
+            devices.set(resource.id.toLowerCase(), deviceResource(resource));
+        if (resource.type === 'light')
+            lightResources.push(resource);
+        if (resource.type === 'bridge') {
+            if (bridgeOwner || typeof resource.bridge_id !== 'string' || resource.bridge_id.toLowerCase() !== bridgeIdArg) {
+                throw new Error('Hue bridge identity does not match the configured bridge.');
+            }
+            const owner = hueRecord(resource.owner);
+            if (!hueUuid(owner.rid) || owner.rtype !== 'device')
+                throw new Error('Hue bridge owner is invalid.');
+            bridgeOwner = owner.rid.toLowerCase();
+        }
+        if (resource.type === 'zigbee_connectivity') {
+            const owner = hueRecord(resource.owner);
+            if (!hueUuid(owner.rid) || owner.rtype !== 'device' || typeof resource.status !== 'string'
+                || !['connected', 'disconnected', 'connectivity_issue', 'unidirectional_incoming', 'pending_discovery'].includes(resource.status)
+                || connectivity.has(owner.rid.toLowerCase()))
+                throw new Error('Hue connectivity resource is invalid.');
+            connectivity.set(owner.rid.toLowerCase(), resource.status === 'connected');
+        }
+    }
+    const bridge = bridgeOwner ? devices.get(bridgeOwner) : undefined;
+    if (!bridge)
+        throw new Error('Hue response has no verified bridge device.');
+    const lights = lightResources.map((resourceArg) => {
+        const owner = hueRecord(resourceArg.owner);
+        const power = hueRecord(resourceArg.on);
+        const dimming = resourceArg.dimming === undefined ? undefined : hueRecord(resourceArg.dimming);
+        const metadata = resourceArg.metadata === undefined ? undefined : hueRecord(resourceArg.metadata);
+        if (!hueUuid(owner.rid) || owner.rtype !== 'device' || !devices.has(owner.rid.toLowerCase()) || typeof power.on !== 'boolean') {
+            throw new Error('Hue light owner or power state is invalid.');
+        }
+        if (dimming && (typeof dimming.brightness !== 'number' || !Number.isFinite(dimming.brightness)
+            || dimming.brightness < 0 || dimming.brightness > 100))
+            throw new Error('Hue light brightness is invalid.');
+        return { id: resourceArg.id.toLowerCase(), idV1: optionalString(resourceArg.id_v1), owner: { rid: owner.rid.toLowerCase(), rtype: 'device' },
+            metadata: metadata ? { name: optionalString(metadata.name), archetype: optionalString(metadata.archetype) } : undefined,
+            on: { on: power.on }, dimming: dimming ? { brightness: dimming.brightness } : undefined,
+            available: connectivity.get(owner.rid.toLowerCase()) === true };
+    });
+    return { bridge, devices: [...devices.values()], lights };
+};
+export const parseHueEvents = (valueArg) => {
+    if (!Array.isArray(valueArg) || valueArg.length > 256)
+        throw new Error('Hue event batch is invalid.');
+    return valueArg.map((itemArg) => {
+        const event = hueRecord(itemArg);
+        if (!hueUuid(event.id) || !['add', 'update', 'delete'].includes(String(event.type))
+            || !Array.isArray(event.data) || event.data.length > 10_000)
+            throw new Error('Hue event envelope is invalid.');
+        const data = [];
+        for (const resourceArg of event.data) {
+            const resource = hueRecord(resourceArg);
+            if (!hueUuid(resource.id) || typeof resource.type !== 'string')
+                throw new Error('Hue event resource identity is invalid.');
+            // Notifications cause authoritative rereads; unknown resource payloads may contain credentials.
+            if (['bridge', 'device', 'light', 'zigbee_connectivity'].includes(resource.type))
+                data.push({ id: resource.id.toLowerCase(), type: resource.type });
+        }
+        return { id: event.id.toLowerCase(), type: event.type, data };
+    }).filter((eventArg) => eventArg.data.length > 0);
+};
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hue.validation.js","sourceRoot":"","sources":["../../../ts/integrations/hue/hue.validation.ts"],"names":[],"mappings":"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"}