From 1c2d92e0d2db9f052a99fcf483d3d09f10fcfe55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Thu, 27 Jun 2019 09:41:14 +0200 Subject: [PATCH] More refactoring --- custom_components/browser_mod/__init__.py | 17 ++++--- custom_components/browser_mod/browser_mod.js | 2 +- custom_components/browser_mod/connection.py | 47 +++++++++++++++---- custom_components/browser_mod/const.py | 14 ++++++ custom_components/browser_mod/media_player.py | 46 +++++------------- custom_components/browser_mod/mod_view.py | 9 ++-- js/main.js | 10 ++-- 7 files changed, 83 insertions(+), 62 deletions(-) diff --git a/custom_components/browser_mod/__init__.py b/custom_components/browser_mod/__init__.py index 34368b6..45fd2c7 100644 --- a/custom_components/browser_mod/__init__.py +++ b/custom_components/browser_mod/__init__.py @@ -2,34 +2,33 @@ import logging from .mod_view import setup_view from .connection import setup_connection -from .const import DOMAIN +from .const import DOMAIN, DATA_DEVICES, DATA_ALIASES, DATA_ADDERS, CONFIG_DEVICES -FRONTEND_SCRIPT_URL = "/browser_mod.js" _LOGGER = logging.getLogger(__name__) async def async_setup(hass, config): _LOGGER.error(f"Setting up browser_mod") - setup_view(hass, FRONTEND_SCRIPT_URL) + setup_view(hass) _LOGGER.error(f"Registered frontend script") aliases = {} - for d in config[DOMAIN].get("devices", {}): - name = config[DOMAIN]["devices"][d].get("name", None) + for d in config[DOMAIN].get(CONFIG_DEVICES, {}): + name = config[DOMAIN][CONFIG_DEVICES][d].get("name", None) if name: aliases[name] = d hass.data[DOMAIN] = { - "devices": {}, - "aliases": aliases, - "adders": [], + DATA_DEVICES: {}, + DATA_ALIASES: aliases, + DATA_ADDERS: [], } await hass.helpers.discovery.async_load_platform("media_player", DOMAIN, {}, config) _LOGGER.error(f"Set up media_player") - _LOGGER.error(hass.data[DOMAIN]["adders"]) + _LOGGER.error(hass.data[DOMAIN][DATA_ADDERS]) setup_connection(hass) diff --git a/custom_components/browser_mod/browser_mod.js b/custom_components/browser_mod/browser_mod.js index 6f70d90..5c492f8 100644 --- a/custom_components/browser_mod/browser_mod.js +++ b/custom_components/browser_mod/browser_mod.js @@ -1 +1 @@ -!function(e){var o={};function n(t){if(o[t])return o[t].exports;var r=o[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=o,n.d=function(e,o,t){n.o(e,o)||Object.defineProperty(e,o,{enumerable:!0,get:t})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,o){if(1&o&&(e=n(e)),8&o)return e;if(4&o&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(n.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&o&&"string"!=typeof e)for(var r in e)n.d(t,r,function(o){return e[o]}.bind(null,r));return t},n.n=function(e){var o=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(o,"a",o),o},n.o=function(e,o){return Object.prototype.hasOwnProperty.call(e,o)},n.p="",n(n.s=0)}([function(e,o,n){"use strict";n.r(o);let t=function(){if(window.fully&&"function"==typeof fully.getDeviceId)return fully.getDeviceId();if(!localStorage["lovelace-player-device-id"]){const e=()=>Math.floor(1e5*(1+Math.random())).toString(16).substring(1);localStorage["lovelace-player-device-id"]=`${e()}${e()}-${e()}${e()}`}return localStorage["lovelace-player-device-id"]}();window.browser_mod=new class{constructor(){window.hassConnection.then(e=>this.connect(e.conn))}connect(e){console.log("Connection opened. Connecting to browser_mod"),this.conn=e,e.subscribeMessage(e=>this.callback(e),{type:"browser_mod/connect",deviceID:t}),console.log("Connected"),console.log(this.connection)}callback(e){console.log("Got ws message"),console.log(e),"update"===e.command&&this.update()}update(){this.conn&&this.conn.sendMessage({type:"browser_mod/update",deviceID:t,browser:{},player:{state:"idle"}})}}}]); \ No newline at end of file +!function(e){var o={};function n(t){if(o[t])return o[t].exports;var r=o[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=o,n.d=function(e,o,t){n.o(e,o)||Object.defineProperty(e,o,{enumerable:!0,get:t})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,o){if(1&o&&(e=n(e)),8&o)return e;if(4&o&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(n.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&o&&"string"!=typeof e)for(var r in e)n.d(t,r,function(o){return e[o]}.bind(null,r));return t},n.n=function(e){var o=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(o,"a",o),o},n.o=function(e,o){return Object.prototype.hasOwnProperty.call(e,o)},n.p="",n(n.s=0)}([function(e,o,n){"use strict";n.r(o);let t=function(){if(window.fully&&"function"==typeof fully.getDeviceId)return fully.getDeviceId();if(!localStorage["lovelace-player-device-id"]){const e=()=>Math.floor(1e5*(1+Math.random())).toString(16).substring(1);localStorage["lovelace-player-device-id"]=`${e()}${e()}-${e()}${e()}`}return localStorage["lovelace-player-device-id"]}();window.browser_mod=new class{constructor(){window.hassConnection.then(e=>this.connect(e.conn))}connect(e){console.log("Connection opened. Connecting to browser_mod"),this.conn=e,e.subscribeMessage(e=>this.callback(e),{type:"browser_mod/connect",deviceID:t}),console.log("Connected"),console.log(this.connection)}callback(e){console.log("Got ws message"),console.log(e),"update"===e.command&&this.update()}update(){this.conn&&this.conn.sendMessage({type:"browser_mod/update",deviceID:t,data:{browser:{},player:{state:"idle"}}})}}}]); \ No newline at end of file diff --git a/custom_components/browser_mod/connection.py b/custom_components/browser_mod/connection.py index 223b933..a64bba5 100644 --- a/custom_components/browser_mod/connection.py +++ b/custom_components/browser_mod/connection.py @@ -2,43 +2,70 @@ import logging import voluptuous as vol from homeassistant.components.websocket_api import websocket_command, result_message, event_message, async_register_command +from homeassistant.helpers.entity import Entity, async_generate_entity_id -from .const import DOMAIN +from .const import DOMAIN, DATA_DEVICES, DATA_ADDERS, WS_CONNECT, WS_UPDATE _LOGGER = logging.getLogger(__name__) + def setup_connection(hass): async_register_command(hass, handle_connect) async_register_command(hass, handle_update) _LOGGER.error(f"Registered connect ws command") - @websocket_command({ - vol.Required("type"): "browser_mod/connect", + vol.Required("type"): WS_CONNECT, vol.Required("deviceID"): str, }) def handle_connect(hass, connection, msg): _LOGGER.error(f"Got connection {msg}") - devices = hass.data[DOMAIN]["devices"] + devices = hass.data[DOMAIN][DATA_DEVICES] deviceID = msg["deviceID"] if deviceID in devices: devices[deviceID].ws_connect(connection, msg["id"]) else: - adder = hass.data[DOMAIN]["adders"][0] + adder = hass.data[DOMAIN][DATA_ADDERS][0] devices[deviceID] = adder(hass, deviceID, connection, msg["id"]) connection.send_message(result_message(msg["id"])) @websocket_command({ - vol.Required("type"): "browser_mod/update", + vol.Required("type"): WS_UPDATE, vol.Required("deviceID"): str, - vol.Optional("browser"): dict, - vol.Optional("player"): dict, + vol.Optional("data"): dict, }) def handle_update(hass, connection, msg): - devices = hass.data[DOMAIN]["devices"] + devices = hass.data[DOMAIN][DATA_DEVICES] deviceID = msg["deviceID"] if deviceID in devices: - devices[deviceID].ws_update(msg.get("browser", None), msg.get("player", None)) + devices[deviceID].ws_update(msg.get("data", None)) + + +class BrowserModEntity(Entity): + def __init__(self, hass, deviceID, alias=None): + self.hass = hass + self.deviceID = deviceID + self.alias = alias + self.ws_data = {} + self.entity_id = async_generate_entity_id("media_player.{}", alias or deviceID, hass=hass) + + def ws_send(self, command, data=None): + data = data or {} + self.ws_connection.send_message(event_message(self.ws_cid, { + "command": command, + **data, + })) + + def ws_connect(self, connection, cid): + self.ws_cid = cid + self.ws_connection = connection + _LOGGER.error(f"Connecting {self.entity_id}") + self.ws_send("update") + + def ws_update(self, data): + self.ws_data = data + self.schedule_update_ha_state() + pass diff --git a/custom_components/browser_mod/const.py b/custom_components/browser_mod/const.py index f750028..329d94f 100644 --- a/custom_components/browser_mod/const.py +++ b/custom_components/browser_mod/const.py @@ -1 +1,15 @@ DOMAIN = "browser_mod" + +FRONTEND_SCRIPT_URL = "/browser_mod.js" + +DATA_EXTRA_MODULE_URL = 'frontend_extra_module_url' + +DATA_DEVICES = "devices" +DATA_ALIASES = "aliases" +DATA_ADDERS = "adders" + +CONFIG_DEVICES = "devices" + +WS_ROOT = DOMAIN +WS_CONNECT = "{}/connect".format(WS_ROOT) +WS_UPDATE = "{}/update".format(WS_ROOT) diff --git a/custom_components/browser_mod/media_player.py b/custom_components/browser_mod/media_player.py index 913fe65..7e0e969 100644 --- a/custom_components/browser_mod/media_player.py +++ b/custom_components/browser_mod/media_player.py @@ -1,11 +1,12 @@ import logging from homeassistant.components.media_player import MediaPlayerDevice -from homeassistant.components.websocket_api import event_message -from .const import DOMAIN +from .const import DOMAIN, DATA_DEVICES, DATA_ADDERS, DATA_ALIASES +from .connection import BrowserModEntity _LOGGER = logging.getLogger(__name__) + async def async_setup_platform(hass, config, async_add_devices, discovery_info=None): def adder(hass, deviceID, connection, cid): player = BrowserModPlayer(hass, deviceID) @@ -13,49 +14,24 @@ async def async_setup_platform(hass, config, async_add_devices, discovery_info=N player.ws_connect(connection, cid) async_add_devices([player]) return player - hass.data[DOMAIN]["adders"].append(adder) + hass.data[DOMAIN][DATA_ADDERS].append(adder) - for k,v in hass.data[DOMAIN]["aliases"].items(): - devices = hass.data[DOMAIN]["devices"] + for k,v in hass.data[DOMAIN][DATA_ALIASES].items(): + devices = hass.data[DOMAIN][DATA_DEVICES] devices[v] = BrowserModPlayer(hass, v, k) async_add_devices([devices[v]]) -class BrowserModPlayer(MediaPlayerDevice): + +class BrowserModPlayer(MediaPlayerDevice, BrowserModEntity): def __init__(self, hass, deviceID, alias=None): - self.hass = hass - self.deviceID = deviceID - self.alias = alias - self.player_state = {} - self.browser_state = {} + super().__init__(hass, deviceID, alias) _LOGGER.error(f"Create player {deviceID}({alias})") - @property - def name(self): - return self.alias or self.deviceID.replace('-','_') - @property def device_state_attributes(self): return { - "player": self.player_state, - "browser": self.browser_state, + "player": self.ws_data.get("player"), + "browser": self.ws_data.get("browser"), } - def ws_send(self, command, data=None): - data = data or {} - self.connection.send_message(event_message(self.cid, { - "command": command, - **data, - })) - - - def ws_connect(self, connection, cid): - self.cid = cid - self.connection = connection - _LOGGER.error(f"Connecting {self.entity_id}") - self.ws_send("update") - - def ws_update(self, browser, player): - self.browser_state = browser - self.player_state = player - pass diff --git a/custom_components/browser_mod/mod_view.py b/custom_components/browser_mod/mod_view.py index f0e43c7..83452e0 100644 --- a/custom_components/browser_mod/mod_view.py +++ b/custom_components/browser_mod/mod_view.py @@ -2,15 +2,16 @@ from aiohttp import web import aiofiles from homeassistant.components.http import HomeAssistantView -DATA_EXTRA_MODULE_URL = 'frontend_extra_module_url' +from .const import FRONTEND_SCRIPT_URL, DATA_EXTRA_MODULE_URL -def setup_view(hass, url): + +def setup_view(hass): if DATA_EXTRA_MODULE_URL not in hass.data: hass.data[DATA_EXTRA_MODULE_URL] = set() url_set = hass.data[DATA_EXTRA_MODULE_URL] - url_set.add(url) + url_set.add(FRONTEND_SCRIPT_URL) - hass.http.register_view(ModView(hass, url)) + hass.http.register_view(ModView(hass, FRONTEND_SCRIPT_URL)) class ModView(HomeAssistantView): diff --git a/js/main.js b/js/main.js index c04dda6..9dd5ceb 100644 --- a/js/main.js +++ b/js/main.js @@ -29,9 +29,13 @@ class BrowserMod { this.conn.sendMessage({ type: 'browser_mod/update', deviceID: deviceID, - browser: {}, - player: { - state: "idle", + data: { + browser: { + + }, + player: { + state: "idle", + }, }, });