@smarthome.exchange/integrations 0.2.0 → 1.0.0

package/dist_ts/integrations/roku/roku.classes.integration.js

@@ -1,8 +1,10 @@
+import * as plugins from '../../plugins.js';
 import { BaseIntegration } from '../../core/classes.baseintegration.js';
 import { RokuClient } from './roku.classes.client.js';
 import { RokuConfigFlow } from './roku.classes.configflow.js';
 import { createRokuDiscoveryDescriptor } from './roku.discovery.js';
 import { RokuMapper } from './roku.mapper.js';
+import { normalizeRokuUdn, readRokuRecord, validateRokuAppId, validateRokuKey } from './roku.validation.js';
 export class RokuIntegration extends BaseIntegration {
     domain = 'roku';
     displayName = 'Roku';
@@ -10,118 +12,99 @@ export class RokuIntegration extends BaseIntegration {
     discoveryDescriptor = createRokuDiscoveryDescriptor();
     configFlow = new RokuConfigFlow();
     metadata = {
-        source: 'home-assistant/core',
-        upstreamPath: 'homeassistant/components/roku',
-        upstreamDomain: 'roku',
-        integrationType: 'device',
-        iotClass: 'local_polling',
-        qualityScale: 'unknown',
+        source: 'home-assistant/core', upstreamPath: 'homeassistant/components/roku', upstreamDomain: 'roku',
+        integrationType: 'device', iotClass: 'local_polling', qualityScale: 'unknown',
     };
+    clients = new Set();
+    closed = false;
+    closePromise;
     async setup(configArg, contextArg) {
-        void contextArg;
-        return new RokuRuntime(new RokuClient(configArg));
+        if (this.closed)
+            throw new Error('Roku integration is closed.');
+        const client = new RokuClient(configArg, { abortSignal: contextArg.abortSignal });
+        this.clients.add(client);
+        try {
+            const snapshot = await client.getSnapshot(contextArg.abortSignal);
+            if (this.closed || client.isClosed)
+                throw new Error('Roku setup was cancelled.');
+            return new RokuRuntime(client, snapshot.deviceInfo.udn, () => this.clients.delete(client));
+        }
+        catch (errorArg) {
+            await client.destroy();
+            this.clients.delete(client);
+            throw errorArg;
+        }
+    }
+    destroy() {
+        if (!this.closePromise) {
+            this.closed = true;
+            this.closePromise = Promise.all([...this.clients].map((clientArg) => clientArg.destroy())).then(() => { this.clients.clear(); });
+        }
+        return this.closePromise;
     }
-    async destroy() { }
 }
 export class HomeAssistantRokuIntegration extends RokuIntegration {
 }
 class RokuRuntime {
     client;
+    onDestroyed;
     domain = 'roku';
-    constructor(client) {
+    deviceId;
+    entityId;
+    constructor(client, udnArg, onDestroyed) {
         this.client = client;
+        this.onDestroyed = onDestroyed;
+        const udn = normalizeRokuUdn(udnArg);
+        this.deviceId = `roku.device.${udn}`;
+        this.entityId = `media_player.roku_${udn.replace(/-/g, '_')}`;
     }
-    async devices() {
-        return RokuMapper.toDevices(await this.client.getSnapshot());
+    async devices(abortSignalArg) {
+        return RokuMapper.toDevices(await this.client.getSnapshot(abortSignalArg));
     }
     async entities() {
         return RokuMapper.toEntities(await this.client.getSnapshot());
     }
     async callService(requestArg) {
-        if (requestArg.domain === 'remote') {
-            const command = requestArg.data?.command;
-            if (typeof command === 'string') {
-                await this.client.keypress(command);
-                return { success: true };
-            }
-            if (Array.isArray(command)) {
-                for (const item of command) {
-                    if (typeof item === 'string') {
-                        await this.client.keypress(item);
-                    }
-                }
-                return { success: true };
-            }
-            return { success: false, error: 'Roku remote service requires data.command.' };
-        }
-        if (requestArg.domain !== 'media_player') {
-            return { success: false, error: `Unsupported Roku service domain: ${requestArg.domain}` };
-        }
-        if (requestArg.service === 'turn_on') {
-            await this.client.keypress('PowerOn');
-            return { success: true };
-        }
-        if (requestArg.service === 'turn_off') {
-            await this.client.keypress('PowerOff');
-            return { success: true };
-        }
-        if (requestArg.service === 'play' || requestArg.service === 'pause' || requestArg.service === 'play_pause') {
-            await this.client.keypress('Play');
-            return { success: true };
+        const request = readRokuRecord(requestArg, ['domain', 'service', 'target', 'data']);
+        this.validateTarget(request.target);
+        if (request.domain === 'remote' && request.service === 'send_command') {
+            const data = readRokuRecord(request.data, ['command']);
+            const key = validateRokuKey(data.command);
+            await this.client.keypress(key);
         }
-        if (requestArg.service === 'next_track') {
-            await this.client.keypress('Fwd');
-            return { success: true };
+        else if (request.domain === 'media_player' && request.service === 'select_source') {
+            const data = readRokuRecord(request.data, ['source']);
+            await this.client.launch(validateRokuAppId(data.source));
         }
-        if (requestArg.service === 'previous_track') {
-            await this.client.keypress('Rev');
-            return { success: true };
+        else {
+            return { success: false, error: 'Roku supports remote.send_command and media_player.select_source.' };
         }
-        if (requestArg.service === 'volume_up') {
-            await this.client.keypress('VolumeUp');
-            return { success: true };
-        }
-        if (requestArg.service === 'volume_down') {
-            await this.client.keypress('VolumeDown');
-            return { success: true };
-        }
-        if (requestArg.service === 'volume_mute') {
-            await this.client.keypress('VolumeMute');
-            return { success: true };
-        }
-        if (requestArg.service === 'select_source') {
-            const source = requestArg.data?.source;
-            if (source === 'Home') {
-                await this.client.keypress('Home');
-                return { success: true };
-            }
-            if (typeof source === 'string') {
-                const apps = await this.client.getApps();
-                const app = apps.find((appArg) => source === appArg.id || source === appArg.name);
-                if (app) {
-                    await this.client.launch(app.id);
-                    return { success: true };
-                }
-            }
-            return { success: false, error: 'Roku select_source requires a known source.' };
-        }
-        if (requestArg.service === 'play_media') {
-            const mediaId = requestArg.data?.media_content_id ?? requestArg.data?.uri;
-            const mediaType = requestArg.data?.media_content_type ?? requestArg.data?.media_type;
-            if (typeof mediaId !== 'string' || !mediaId) {
-                return { success: false, error: 'Roku play_media requires data.media_content_id or data.uri.' };
-            }
-            if (mediaType === 'app') {
-                await this.client.launch(mediaId);
-                return { success: true };
-            }
-            await this.client.playUrl(mediaId, mediaType === 'music' || mediaType === 'audio' ? 'audio' : 'video', typeof requestArg.data?.title === 'string' ? requestArg.data.title : undefined);
-            return { success: true };
-        }
-        return { success: false, error: `Unsupported Roku media_player service: ${requestArg.service}` };
+        return { success: true, data: { confirmation: 'ecp-http', effectOutcome: 'accepted' } };
+    }
+    async writeFeature(requestArg, abortSignalArg) {
+        const request = readRokuRecord(requestArg, ['device', 'feature', 'value']);
+        const device = readRokuRecord(request.device, ['id', 'integrationDomain', 'name', 'protocol', 'manufacturer', 'model', 'online', 'features', 'state', 'metadata', 'room']);
+        if (device.id !== this.deviceId || device.integrationDomain !== this.domain)
+            throw new Error('Roku feature target does not belong to this connection.');
+        const feature = readRokuRecord(request.feature, ['id', 'name', 'capability', 'readable', 'writable', 'unit', 'options', 'metadata']);
+        if (feature.id === 'remote_key')
+            await this.client.keypress(validateRokuKey(request.value), abortSignalArg);
+        else if (feature.id === 'active_app')
+            await this.client.launch(validateRokuAppId(request.value), abortSignalArg);
+        else
+            return { success: false, error: 'Roku writes support remote_key or an installed active_app id.' };
+        return { success: true, data: { confirmation: 'ecp-http', effectOutcome: 'accepted' } };
     }
     async destroy() {
         await this.client.destroy();
+        this.onDestroyed();
+    }
+    validateTarget(targetArg) {
+        const target = readRokuRecord(targetArg, ['deviceId', 'entityId']);
+        if (target.deviceId !== undefined && target.deviceId !== this.deviceId || target.entityId !== undefined && target.entityId !== this.entityId ||
+            target.deviceId === undefined && target.entityId === undefined) {
+            throw new Error('Roku service requires an exact connected device or entity target.');
+        }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9rdS5jbGFzc2VzLmludGVncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvaW50ZWdyYXRpb25zL3Jva3Uvcm9rdS5jbGFzc2VzLmludGVncmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUV4RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDdEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQzlELE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3BFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUc5QyxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxlQUE0QjtJQUMvQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ2hCLFdBQVcsR0FBRyxNQUFNLENBQUM7SUFDckIsTUFBTSxHQUFHLGlCQUEwQixDQUFDO0lBQ3BDLG1CQUFtQixHQUFHLDZCQUE2QixFQUFFLENBQUM7SUFDdEQsVUFBVSxHQUFHLElBQUksY0FBYyxFQUFFLENBQUM7SUFDbEMsUUFBUSxHQUFHO1FBQ3pCLE1BQU0sRUFBRSxxQkFBcUI7UUFDN0IsWUFBWSxFQUFFLCtCQUErQjtRQUM3QyxjQUFjLEVBQUUsTUFBTTtRQUN0QixlQUFlLEVBQUUsUUFBUTtRQUN6QixRQUFRLEVBQUUsZUFBZTtRQUN6QixZQUFZLEVBQUUsU0FBUztLQUN4QixDQUFDO0lBRUssS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFzQixFQUFFLFVBQW9DO1FBQzdFLEtBQUssVUFBVSxDQUFDO1FBQ2hCLE9BQU8sSUFBSSxXQUFXLENBQUMsSUFBSSxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRU0sS0FBSyxDQUFDLE9BQU8sS0FBbUIsQ0FBQztDQUN6QztBQUVELE1BQU0sT0FBTyw0QkFBNkIsU0FBUSxlQUFlO0NBQUc7QUFFcEUsTUFBTSxXQUFXO0lBR2M7SUFGdEIsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUV2QixZQUE2QixNQUFrQjtRQUFsQixXQUFNLEdBQU4sTUFBTSxDQUFZO0lBQUcsQ0FBQztJQUU1QyxLQUFLLENBQUMsT0FBTztRQUNsQixPQUFPLFVBQVUsQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFDL0QsQ0FBQztJQUVNLEtBQUssQ0FBQyxRQUFRO1FBQ25CLE9BQU8sVUFBVSxDQUFDLFVBQVUsQ0FBQyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBRU0sS0FBSyxDQUFDLFdBQVcsQ0FBQyxVQUErQjtRQUN0RCxJQUFJLFVBQVUsQ0FBQyxNQUFNLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDbkMsTUFBTSxPQUFPLEdBQUcsVUFBVSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUM7WUFDekMsSUFBSSxPQUFPLE9BQU8sS0FBSyxRQUFRLEVBQUUsQ0FBQztnQkFDaEMsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDcEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztZQUMzQixDQUFDO1lBQ0QsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQzNCLEtBQUssTUFBTSxJQUFJLElBQUksT0FBTyxFQUFFLENBQUM7b0JBQzNCLElBQUksT0FBTyxJQUFJLEtBQUssUUFBUSxFQUFFLENBQUM7d0JBQzdCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ25DLENBQUM7Z0JBQ0gsQ0FBQztnQkFDRCxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzNCLENBQUM7WUFDRCxPQUFPLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsNENBQTRDLEVBQUUsQ0FBQztRQUNqRixDQUFDO1FBRUQsSUFBSSxVQUFVLENBQUMsTUFBTSxLQUFLLGNBQWMsRUFBRSxDQUFDO1lBQ3pDLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxvQ0FBb0MsVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDNUYsQ0FBQztRQUVELElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUNyQyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQ3RDLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDM0IsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxVQUFVLEVBQUUsQ0FBQztZQUN0QyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ3ZDLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDM0IsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxNQUFNLElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxPQUFPLElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxZQUFZLEVBQUUsQ0FBQztZQUMzRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ25DLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDM0IsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxZQUFZLEVBQUUsQ0FBQztZQUN4QyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ2xDLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDM0IsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxnQkFBZ0IsRUFBRSxDQUFDO1lBQzVDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbEMsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUMzQixDQUFDO1FBQ0QsSUFBSSxVQUFVLENBQUMsT0FBTyxLQUFLLFdBQVcsRUFBRSxDQUFDO1lBQ3ZDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDdkMsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUMzQixDQUFDO1FBQ0QsSUFBSSxVQUFVLENBQUMsT0FBTyxLQUFLLGFBQWEsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDekMsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUMzQixDQUFDO1FBQ0QsSUFBSSxVQUFVLENBQUMsT0FBTyxLQUFLLGFBQWEsRUFBRSxDQUFDO1lBQ3pDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUM7WUFDekMsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUMzQixDQUFDO1FBQ0QsSUFBSSxVQUFVLENBQUMsT0FBTyxLQUFLLGVBQWUsRUFBRSxDQUFDO1lBQzNDLE1BQU0sTUFBTSxHQUFHLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDO1lBQ3ZDLElBQUksTUFBTSxLQUFLLE1BQU0sRUFBRSxDQUFDO2dCQUN0QixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUNuQyxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzNCLENBQUM7WUFDRCxJQUFJLE9BQU8sTUFBTSxLQUFLLFFBQVEsRUFBRSxDQUFDO2dCQUMvQixNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7Z0JBQ3pDLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLE1BQU0sS0FBSyxNQUFNLENBQUMsRUFBRSxJQUFJLE1BQU0sS0FBSyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ2xGLElBQUksR0FBRyxFQUFFLENBQUM7b0JBQ1IsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7b0JBQ2pDLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLENBQUM7Z0JBQzNCLENBQUM7WUFDSCxDQUFDO1lBQ0QsT0FBTyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLDZDQUE2QyxFQUFFLENBQUM7UUFDbEYsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLE9BQU8sS0FBSyxZQUFZLEVBQUUsQ0FBQztZQUN4QyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsSUFBSSxFQUFFLGdCQUFnQixJQUFJLFVBQVUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDO1lBQzFFLE1BQU0sU0FBUyxHQUFHLFVBQVUsQ0FBQyxJQUFJLEVBQUUsa0JBQWtCLElBQUksVUFBVSxDQUFDLElBQUksRUFBRSxVQUFVLENBQUM7WUFDckYsSUFBSSxPQUFPLE9BQU8sS0FBSyxRQUFRLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztnQkFDNUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLDZEQUE2RCxFQUFFLENBQUM7WUFDbEcsQ0FBQztZQUNELElBQUksU0FBUyxLQUFLLEtBQUssRUFBRSxDQUFDO2dCQUN4QixNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNsQyxPQUFPLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO1lBQzNCLENBQUM7WUFDRCxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxTQUFTLEtBQUssT0FBTyxJQUFJLFNBQVMsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxFQUFFLE9BQU8sVUFBVSxDQUFDLElBQUksRUFBRSxLQUFLLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDdkwsT0FBTyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsQ0FBQztRQUMzQixDQUFDO1FBRUQsT0FBTyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLDBDQUEwQyxVQUFVLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztJQUNuRyxDQUFDO0lBRU0sS0FBSyxDQUFDLE9BQU87UUFDbEIsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzlCLENBQUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9rdS5jbGFzc2VzLmludGVncmF0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvaW50ZWdyYXRpb25zL3Jva3Uvcm9rdS5jbGFzc2VzLmludGVncmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBRXhFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN0RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDOUQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDcEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTlDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxjQUFjLEVBQUUsaUJBQWlCLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFNUcsTUFBTSxPQUFPLGVBQWdCLFNBQVEsZUFBNEI7SUFDL0MsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUNoQixXQUFXLEdBQUcsTUFBTSxDQUFDO0lBQ3JCLE1BQU0sR0FBRyxpQkFBaUIsQ0FBQztJQUMzQixtQkFBbUIsR0FBRyw2QkFBNkIsRUFBRSxDQUFDO0lBQ3RELFVBQVUsR0FBRyxJQUFJLGNBQWMsRUFBRSxDQUFDO0lBQ2xDLFFBQVEsR0FBRztRQUN6QixNQUFNLEVBQUUscUJBQXFCLEVBQUUsWUFBWSxFQUFFLCtCQUErQixFQUFFLGNBQWMsRUFBRSxNQUFNO1FBQ3BHLGVBQWUsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLGVBQWUsRUFBRSxZQUFZLEVBQUUsU0FBUztLQUM5RSxDQUFDO0lBQ2UsT0FBTyxHQUFHLElBQUksR0FBRyxFQUFjLENBQUM7SUFDekMsTUFBTSxHQUFHLEtBQUssQ0FBQztJQUNmLFlBQVks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

package/dist_ts/integrations/roku/roku.discovery.d.ts

@@ -2,20 +2,20 @@ import { DiscoveryDescriptor } from '../../core/classes.discoverydescriptor.js';
 import type { IDiscoveryCandidate, IDiscoveryMatch, IDiscoveryMatcher, IDiscoveryValidator } from '../../core/types.js';
 import type { IRokuManualEntry, IRokuSsdpRecord } from './roku.types.js';
 export declare class RokuSsdpMatcher implements IDiscoveryMatcher<IRokuSsdpRecord> {
-    id: string;
-    source: "ssdp";
-    description: string;
+    readonly id = "roku-ssdp-match";
+    readonly source = "ssdp";
+    readonly description = "Admit passive roku:ecp records without fetching their LOCATION.";
     matches(recordArg: IRokuSsdpRecord): Promise<IDiscoveryMatch>;
 }
 export declare class RokuManualMatcher implements IDiscoveryMatcher<IRokuManualEntry> {
-    id: string;
-    source: "manual";
-    description: string;
+    readonly id = "roku-manual-match";
+    readonly source = "manual";
+    readonly description = "Admit explicitly selected Roku manual entries.";
     matches(inputArg: IRokuManualEntry): Promise<IDiscoveryMatch>;
 }
 export declare class RokuCandidateValidator implements IDiscoveryValidator {
-    id: string;
-    description: string;
+    readonly id = "roku-candidate-validator";
+    readonly description = "Normalize Roku candidate fields without retaining arbitrary discovery metadata.";
     validate(candidateArg: IDiscoveryCandidate): Promise<IDiscoveryMatch>;
 }
 export declare const createRokuDiscoveryDescriptor: () => DiscoveryDescriptor;

package/dist_ts/integrations/roku/roku.discovery.js

@@ -1,85 +1,102 @@
 import { DiscoveryDescriptor } from '../../core/classes.discoverydescriptor.js';
+import { readRokuRecord, validateRokuHost, validateRokuPort } from './roku.validation.js';
+const unmatched = () => ({ matched: false, confidence: 'low', reason: 'Input is not an admitted Roku endpoint.' });
+const readHeader = (headersArg, keyArg) => {
+    if (headersArg === undefined)
+        return undefined;
+    if (typeof headersArg !== 'object' || headersArg === null)
+        throw new Error('Invalid Roku SSDP headers.');
+    const fields = Object.getOwnPropertyNames(headersArg).filter((fieldArg) => fieldArg.toLowerCase() === keyArg);
+    const headers = readRokuRecord(headersArg, fields, true);
+    const values = Object.entries(headers).filter(([nameArg]) => nameArg.toLowerCase() === keyArg).map(([, valueArg]) => valueArg);
+    if (values.length > 1 || values.some((valueArg) => typeof valueArg !== 'string'))
+        throw new Error('Ambiguous Roku SSDP header.');
+    const value = values[0];
+    return typeof value === 'string' ? value : undefined;
+};
 export class RokuSsdpMatcher {
     id = 'roku-ssdp-match';
     source = 'ssdp';
-    description = 'Recognize Roku ECP SSDP advertisements.';
+    description = 'Admit passive roku:ecp records without fetching their LOCATION.';
     async matches(recordArg) {
-        const st = recordArg.st || recordArg.headers?.st || recordArg.headers?.ST;
-        const usn = recordArg.usn || recordArg.headers?.usn || recordArg.headers?.USN;
-        const location = recordArg.location || recordArg.headers?.location || recordArg.headers?.LOCATION;
-        const manufacturer = recordArg.headers?.manufacturer || recordArg.headers?.MANUFACTURER;
-        const matched = st === 'roku:ecp' || manufacturer === 'Roku' || Boolean(usn?.toLowerCase().includes('roku'));
-        if (!matched) {
-            return { matched: false, confidence: 'low', reason: 'SSDP record is not Roku ECP.' };
+        try {
+            const record = readRokuRecord(recordArg, ['st', 'usn', 'location', 'headers']);
+            const headerSt = readHeader(record.headers, 'st');
+            const headerUsn = readHeader(record.headers, 'usn');
+            const headerLocation = readHeader(record.headers, 'location');
+            if (record.st !== undefined && headerSt !== undefined && record.st !== headerSt ||
+                record.usn !== undefined && headerUsn !== undefined && record.usn !== headerUsn ||
+                record.location !== undefined && headerLocation !== undefined && record.location !== headerLocation)
+                return unmatched();
+            const st = record.st ?? headerSt;
+            const usn = record.usn ?? headerUsn;
+            const location = record.location ?? headerLocation;
+            if (st !== 'roku:ecp' || typeof usn !== 'string' || typeof location !== 'string')
+                return unmatched();
+            const serial = /^uuid:roku:ecp:([A-Za-z0-9_-]{1,128})$/.exec(usn)?.[1];
+            if (!serial)
+                return unmatched();
+            const url = new URL(location);
+            if (url.protocol !== 'http:' || url.username || url.password || url.pathname !== '/' || url.search || url.hash)
+                return unmatched();
+            const host = validateRokuHost(url.hostname);
+            const port = validateRokuPort(url.port ? Number(url.port) : 80);
+            if (port !== 8060)
+                return unmatched();
+            return {
+                matched: true, confidence: 'high', reason: 'Passive record advertises the Roku ECP service.', normalizedDeviceId: serial,
+                candidate: { source: 'ssdp', integrationDomain: 'roku', id: serial, host, port, manufacturer: 'Roku' },
+            };
+        }
+        catch {
+            return unmatched();
         }
-        const url = location ? new URL(location) : undefined;
-        const id = usn?.replace(/^uuid:/i, '').split('::')[0];
-        return {
-            matched: true,
-            confidence: id ? 'certain' : 'high',
-            reason: 'SSDP record matches Roku ECP metadata.',
-            normalizedDeviceId: id,
-            candidate: {
-                source: 'ssdp',
-                integrationDomain: 'roku',
-                id,
-                host: url?.hostname,
-                port: url?.port ? Number(url.port) : 8060,
-                manufacturer: 'Roku',
-                model: recordArg.headers?.modelName || recordArg.headers?.MODELNAME,
-                metadata: { st, usn, location },
-            },
-        };
     }
 }
 export class RokuManualMatcher {
     id = 'roku-manual-match';
     source = 'manual';
-    description = 'Recognize manual Roku setup entries.';
+    description = 'Admit explicitly selected Roku manual entries.';
     async matches(inputArg) {
-        const matched = Boolean(inputArg.host || inputArg.model?.toLowerCase().includes('roku') || inputArg.metadata?.roku);
-        if (!matched) {
-            return { matched: false, confidence: 'low', reason: 'Manual entry does not contain Roku setup hints.' };
+        try {
+            const input = readRokuRecord(inputArg, ['integrationDomain', 'host', 'port', 'id', 'name']);
+            if (input.integrationDomain !== 'roku')
+                return unmatched();
+            if (input.id !== undefined && typeof input.id !== 'string' || input.name !== undefined && typeof input.name !== 'string')
+                return unmatched();
+            return new RokuCandidateValidator().validate({ source: 'manual', integrationDomain: 'roku', host: validateRokuHost(input.host), port: validateRokuPort(input.port), id: input.id, name: input.name });
+        }
+        catch {
+            return unmatched();
         }
-        return {
-            matched: true,
-            confidence: inputArg.host ? 'high' : 'medium',
-            reason: 'Manual entry can start Roku setup.',
-            normalizedDeviceId: inputArg.id,
-            candidate: {
-                source: 'manual',
-                integrationDomain: 'roku',
-                id: inputArg.id,
-                host: inputArg.host,
-                port: inputArg.port || 8060,
-                name: inputArg.name,
-                manufacturer: 'Roku',
-                model: inputArg.model,
-                metadata: inputArg.metadata,
-            },
-        };
     }
 }
 export class RokuCandidateValidator {
     id = 'roku-candidate-validator';
-    description = 'Validate Roku ECP candidate metadata.';
+    description = 'Normalize Roku candidate fields without retaining arbitrary discovery metadata.';
     async validate(candidateArg) {
-        const manufacturer = candidateArg.manufacturer?.toLowerCase() || '';
-        const model = candidateArg.model?.toLowerCase() || '';
-        const matched = candidateArg.integrationDomain === 'roku' || manufacturer === 'roku' || model.includes('roku');
-        return {
-            matched,
-            confidence: matched && candidateArg.host ? 'high' : matched ? 'medium' : 'low',
-            reason: matched ? 'Candidate has Roku metadata.' : 'Candidate is not Roku.',
-            candidate: matched ? candidateArg : undefined,
-            normalizedDeviceId: candidateArg.id,
-        };
+        try {
+            const input = readRokuRecord(candidateArg, ['source', 'integrationDomain', 'id', 'host', 'port', 'name', 'manufacturer', 'model', 'serialNumber', 'macAddress', 'metadata']);
+            if (input.integrationDomain !== 'roku' || input.source !== 'manual' && input.source !== 'ssdp')
+                return unmatched();
+            const candidate = { source: input.source === 'manual' ? 'manual' : 'ssdp', integrationDomain: 'roku', host: validateRokuHost(input.host), port: validateRokuPort(input.port), manufacturer: 'Roku' };
+            if (input.id !== undefined) {
+                if (typeof input.id !== 'string' || !/^[A-Za-z0-9_-]{1,128}$/.test(input.id))
+                    return unmatched();
+                candidate.id = input.id;
+            }
+            if (input.name !== undefined) {
+                if (typeof input.name !== 'string' || input.name.length > 128 || /[\u0000-\u001f]/.test(input.name))
+                    return unmatched();
+                candidate.name = input.name;
+            }
+            return { matched: true, confidence: 'high', reason: 'Candidate has an explicit Roku domain and safe local endpoint.', candidate, normalizedDeviceId: candidate.id };
+        }
+        catch {
+            return unmatched();
+        }
     }
 }
-export const createRokuDiscoveryDescriptor = () => {
-    return new DiscoveryDescriptor({ integrationDomain: 'roku', displayName: 'Roku' })
-        .addMatcher(new RokuSsdpMatcher())
-        .addMatcher(new RokuManualMatcher())
-        .addValidator(new RokuCandidateValidator());
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9rdS5kaXNjb3ZlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9pbnRlZ3JhdGlvbnMvcm9rdS9yb2t1LmRpc2NvdmVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUloRixNQUFNLE9BQU8sZUFBZTtJQUNuQixFQUFFLEdBQUcsaUJBQWlCLENBQUM7SUFDdkIsTUFBTSxHQUFHLE1BQWUsQ0FBQztJQUN6QixXQUFXLEdBQUcseUNBQXlDLENBQUM7SUFFeEQsS0FBSyxDQUFDLE9BQU8sQ0FBQyxTQUEwQjtRQUM3QyxNQUFNLEVBQUUsR0FBRyxTQUFTLENBQUMsRUFBRSxJQUFJLFNBQVMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLFNBQVMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO1FBQzFFLE1BQU0sR0FBRyxHQUFHLFNBQVMsQ0FBQyxHQUFHLElBQUksU0FBUyxDQUFDLE9BQU8sRUFBRSxHQUFHLElBQUksU0FBUyxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQUM7UUFDOUUsTUFBTSxRQUFRLEdBQUcsU0FBUyxDQUFDLFFBQVEsSUFBSSxTQUFTLENBQUMsT0FBTyxFQUFFLFFBQVEsSUFBSSxTQUFTLENBQUMsT0FBTyxFQUFFLFFBQVEsQ0FBQztRQUNsRyxNQUFNLFlBQVksR0FBRyxTQUFTLENBQUMsT0FBTyxFQUFFLFlBQVksSUFBSSxTQUFTLENBQUMsT0FBTyxFQUFFLFlBQVksQ0FBQztRQUN4RixNQUFNLE9BQU8sR0FBRyxFQUFFLEtBQUssVUFBVSxJQUFJLFlBQVksS0FBSyxNQUFNLElBQUksT0FBTyxDQUFDLEdBQUcsRUFBRSxXQUFXLEVBQUUsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUM3RyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDYixPQUFPLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxVQUFV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
+export const createRokuDiscoveryDescriptor = () => new DiscoveryDescriptor({ integrationDomain: 'roku', displayName: 'Roku' })
+    .addMatcher(new RokuSsdpMatcher()).addMatcher(new RokuManualMatcher()).addValidator(new RokuCandidateValidator());
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9rdS5kaXNjb3ZlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9pbnRlZ3JhdGlvbnMvcm9rdS9yb2t1LmRpc2NvdmVyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUdoRixPQUFPLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFMUYsTUFBTSxTQUFTLEdBQUcsR0FBb0IsRUFBRSxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLHlDQUF5QyxFQUFFLENBQUMsQ0FBQztBQUVwSSxNQUFNLFVBQVUsR0FBRyxDQUFDLFVBQW1CLEVBQUUsTUFBYyxFQUFzQixFQUFFO0lBQzdFLElBQUksVUFBVSxLQUFLLFNBQVM7UUFBRSxPQUFPLFNBQVMsQ0FBQztJQUMvQyxJQUFJLE9BQU8sVUFBVSxLQUFLLFFBQVEsSUFBSSxVQUFVLEtBQUssSUFBSTtRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUN6RyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsbUJBQW1CLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLEtBQUssTUFBTSxDQUFDLENBQUM7SUFDOUcsTUFBTSxPQUFPLEdBQUcsY0FBYyxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDekQsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEtBQUssTUFBTSxDQUFDLENB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

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

@@ -4,9 +4,6 @@ import type { IRokuSnapshot } from './roku.types.js';
 export declare class RokuMapper {
     static toDevices(snapshotArg: IRokuSnapshot): plugins.shxInterfaces.data.IDeviceDefinition[];
     static toEntities(snapshotArg: IRokuSnapshot): IIntegrationEntity[];
-    private static mediaState;
-    private static powerState;
     private static deviceId;
     private static deviceName;
-    private static slug;
 }

package/dist_ts/integrations/roku/roku.mapper.js

@@ -1,76 +1,44 @@
 import * as plugins from '../../plugins.js';
+import { normalizeRokuUdn } from './roku.validation.js';
 export class RokuMapper {
     static toDevices(snapshotArg) {
-        const updatedAt = new Date().toISOString();
         return [{
-                id: this.deviceId(snapshotArg),
-                integrationDomain: 'roku',
-                name: this.deviceName(snapshotArg),
-                protocol: 'http',
-                manufacturer: snapshotArg.deviceInfo.vendorName || 'Roku',
-                model: snapshotArg.deviceInfo.modelName || snapshotArg.deviceInfo.modelNumber,
+                id: this.deviceId(snapshotArg), integrationDomain: 'roku', name: this.deviceName(snapshotArg), protocol: 'http',
+                manufacturer: snapshotArg.deviceInfo.vendorName ?? 'Roku', model: snapshotArg.deviceInfo.modelName ?? snapshotArg.deviceInfo.modelNumber,
                 online: true,
                 features: [
-                    { id: 'power', capability: 'media', name: 'Power', readable: true, writable: true },
+                    { id: 'power_mode', capability: 'media', name: 'Reported power mode', readable: true, writable: false },
                     { id: 'active_app', capability: 'media', name: 'Active app', readable: true, writable: true },
                     { id: 'remote_key', capability: 'media', name: 'Remote key', readable: false, writable: true },
                 ],
                 state: [
-                    { featureId: 'power', value: this.powerState(snapshotArg), updatedAt },
-                    { featureId: 'active_app', value: snapshotArg.activeApp?.name || null, updatedAt },
+                    { featureId: 'power_mode', value: snapshotArg.deviceInfo.powerMode ?? null, updatedAt: snapshotArg.observedAt },
+                    { featureId: 'active_app', value: snapshotArg.activeApp.id ?? null, updatedAt: snapshotArg.observedAt },
                 ],
                 metadata: {
-                    serialNumber: snapshotArg.deviceInfo.serialNumber,
-                    deviceId: snapshotArg.deviceInfo.deviceId,
-                    deviceType: snapshotArg.deviceInfo.deviceType,
-                    softwareVersion: snapshotArg.deviceInfo.softwareVersion,
-                    apps: snapshotArg.apps.map((appArg) => ({ id: appArg.id, name: appArg.name })),
+                    udn: snapshotArg.deviceInfo.udn, serialNumber: snapshotArg.deviceInfo.serialNumber, deviceId: snapshotArg.deviceInfo.deviceId,
+                    softwareVersion: snapshotArg.deviceInfo.softwareVersion, activeAppName: snapshotArg.activeApp.name,
+                    apps: snapshotArg.apps.map((appArg) => ({ id: appArg.id, name: appArg.name, type: appArg.type })),
                 },
             }];
     }
     static toEntities(snapshotArg) {
+        const udn = normalizeRokuUdn(snapshotArg.deviceInfo.udn);
         return [{
-                id: `media_player.${this.slug(this.deviceName(snapshotArg))}`,
-                uniqueId: `roku_${this.slug(snapshotArg.deviceInfo.deviceId || snapshotArg.deviceInfo.serialNumber || this.deviceName(snapshotArg))}`,
-                integrationDomain: 'roku',
-                deviceId: this.deviceId(snapshotArg),
-                platform: 'media_player',
-                name: this.deviceName(snapshotArg),
-                state: this.mediaState(snapshotArg),
+                id: `media_player.roku_${udn.replace(/-/g, '_')}`, uniqueId: `roku_${udn}`, integrationDomain: 'roku',
+                deviceId: this.deviceId(snapshotArg), platform: 'media_player', name: this.deviceName(snapshotArg),
+                state: snapshotArg.activeApp.name,
                 attributes: {
-                    source: snapshotArg.activeApp?.name,
-                    appId: snapshotArg.activeApp?.id,
-                    sourceList: ['Home', ...snapshotArg.apps.map((appArg) => appArg.name)],
-                    powerMode: snapshotArg.deviceInfo.powerMode,
+                    appId: snapshotArg.activeApp.id, source: snapshotArg.activeApp.name,
+                    sources: snapshotArg.apps.map((appArg) => ({ id: appArg.id, name: appArg.name })),
+                    powerMode: snapshotArg.deviceInfo.powerMode, observedAt: snapshotArg.observedAt,
                 },
                 available: true,
             }];
     }
-    static mediaState(snapshotArg) {
-        if (this.powerState(snapshotArg) === 'off') {
-            return 'off';
-        }
-        const activeName = snapshotArg.activeApp?.name;
-        if (!activeName || activeName === 'Power Saver' || activeName === 'Roku') {
-            return 'idle';
-        }
-        return 'on';
-    }
-    static powerState(snapshotArg) {
-        const powerMode = snapshotArg.deviceInfo.powerMode?.toLowerCase() || '';
-        if (powerMode.includes('off') || powerMode.includes('standby') || powerMode.includes('suspend')) {
-            return 'off';
-        }
-        return 'on';
-    }
-    static deviceId(snapshotArg) {
-        return `roku.device.${this.slug(snapshotArg.deviceInfo.deviceId || snapshotArg.deviceInfo.serialNumber || this.deviceName(snapshotArg))}`;
-    }
+    static deviceId(snapshotArg) { return `roku.device.${normalizeRokuUdn(snapshotArg.deviceInfo.udn)}`; }
     static deviceName(snapshotArg) {
         return snapshotArg.deviceInfo.userDeviceName || snapshotArg.deviceInfo.friendlyDeviceName || snapshotArg.deviceInfo.modelName || 'Roku';
     }
-    static slug(valueArg) {
-        return valueArg.toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/^_+|_+$/g, '') || 'roku';
-    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9rdS5tYXBwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9pbnRlZ3JhdGlvbnMvcm9rdS9yb2t1Lm1hcHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBSTVDLE1BQU0sT0FBTyxVQUFVO0lBQ2QsTUFBTSxDQUFDLFNBQVMsQ0FBQyxXQUEwQjtRQUNoRCxNQUFNLFNBQVMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQzNDLE9BQU8sQ0FBQztnQkFDTixFQUFFLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUM7Z0JBQzlCLGlCQUFpQixFQUFFLE1BQU07Z0JBQ3pCLElBQUksRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQztnQkFDbEMsUUFBUSxFQUFFLE1BQU07Z0JBQ2hCLFlBQVksRUFBRSxXQUFXLENBQUMsVUFBVSxDQUFDLFVBQVUsSUFBSSxNQUFNO2dCQUN6RCxLQUFLLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxTQUFTLElBQUksV0FBVyxDQUFDLFVBQVUsQ0FBQyxXQUFXO2dCQUM3RSxNQUFNLEVBQUUsSUFBSTtnQkFDWixRQUFRLEVBQUU7b0JBQ1IsRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUU7b0JBQ25GLEVBQUUsRUFBRSxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFO29CQUM3RixFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm9rdS5tYXBwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9pbnRlZ3JhdGlvbnMvcm9rdS9yb2t1Lm1hcHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBRzVDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRXhELE1BQU0sT0FBTyxVQUFVO0lBQ2QsTUFBTSxDQUFDLFNBQVMsQ0FBQyxXQUEwQjtRQUNoRCxPQUFPLENBQUM7Z0JBQ04sRUFBRSxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFLFFBQVEsRUFBRSxNQUFNO2dCQUMvRyxZQUFZLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxVQUFVLElBQUksTUFBTSxFQUFFLEtBQUssRUFBRSxXQUFXLENBQUMsVUFBVSxDQUFDLFNBQVMsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLFdBQVc7Z0JBQ3hJLE1BQU0sRUFBRSxJQUFJO2dCQUNaLFFBQVEsRUFBRTtvQkFDUixFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUscUJBQXFCLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFO29CQUN2RyxFQUFFLEVBQUUsRUFBRSxZQUFZLEVBQUUsVUFBVSxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRTtvQkFDN0YsRUFBRSxFQUFFLEVBQUUsWUFBWSxFQUFFLFVBQVUsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUU7aUJBQy9GO2dCQUNELEtBQUssRUFBRTtvQkFDTCxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLFdBQVcsQ0FBQyxVQUFVLENBQUMsU0FBUyxJQUFJLElBQUksRUFBRSxTQUFTLEVBQUUsV0FBVyxDQUFDLFVBQVUsRUFBRTtvQkFDL0csRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLEtBQUssRUFBRSxXQUFXLENBQUMsU0FBUyxDQUFDLEVBQUUsSUFBSSxJQUFJLEVBQUUsU0FBUyxFQUFFLFdBQVcsQ0FBQyxVQUFVLEVBQUU7aUJBQ3hHO2dCQUNELFFBQVEsRUFBRTtvQkFDUixHQUFHLEVBQUUsV0FBVyxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsWUFBWSxFQUFFLFdBQVcsQ0FBQyxVQUFVLENBQUMsWUFBWSxFQUFFLFFBQVEsRUFBRSxXQUFXLENBQUMsVUFBVSxDQUFDLFFBQVE7b0JBQzdILGVBQWUsRUFBRSxXQUFXLENBQUMsVUFBVSxDQUFDLGVBQWUsRUFBRSxhQUFhLEVBQUUsV0FBVyxDQUFDLFNBQVMsQ0FBQyxJQUFJO29CQUNsRyxJQUFJLEVBQUUsV0FBVyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsTUFBTSxDQUFDLEVBQUUsRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7aUJBQ2xHO2FBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVNLE1BQU0sQ0FBQyxVQUFVLENBQUMsV0FBMEI7UUFDakQsTUFBTSxHQUFHLEdBQUcsZ0JBQWdCLENBQUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN6RCxPQUFPLENBQUM7Z0JBQ04sRUFBRSxFQUFFLHFCQUFxQixHQUFHLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxRQUFRLEdBQUcsRUFBRSxFQUFFLGlCQUFpQixFQUFFLE1BQU07Z0JBQ3JHLFFBQVEsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxFQUFFLFFBQVEsRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDO2dCQUNsRyxLQUFLLEVBQUUsV0FBVyxDQUFDLFNBQVMsQ0FBQyxJQUFJO2dCQUNqQyxVQUFVLEVBQUU7b0JBQ1YsS0FBSyxFQUFFLFdBQVcsQ0FBQyxTQUFTLENBQUMsRUFBRSxFQUFFLE1BQU0sRUFBRSxXQUFXLENBQUMsU0FBUyxDQUFDLElBQUk7b0JBQ25FLE9BQU8sRUFBRSxXQUFXLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLElBQUksRUFBRSxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztvQkFDakYsU0FBUyxFQUFFLFdBQVcsQ0FBQyxVQUFVLENBQUMsU0FBUyxFQUFFLFVBQVUsRUFBRSxXQUFXLENBQUMsVUFBVTtpQkFDaEY7Z0JBQ0QsU0FBUyxFQUFFLElBQUk7YUFDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVPLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBMEIsSUFBWSxPQUFPLGVBQWUsZ0JBQWdCLENBQUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUU3SCxNQUFNLENBQUMsVUFBVSxDQUFDLFdBQTBCO1FBQ2xELE9BQU8sV0FBVyxDQUFDLFVBQVUsQ0FBQyxjQUFjLElBQUksV0FBVyxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLFNBQVMsSUFBSSxNQUFNLENBQUM7SUFDMUksQ0FBQztDQUNGIn0=