From 0295ec5a881e94c40fb855fddf9b38afaf084657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Thu, 27 Jun 2019 00:45:03 +0200 Subject: [PATCH] A basic device --- custom_components/browser_mod/__init__.py | 30 +++++++++++----- custom_components/browser_mod/browser_mod.js | 2 +- custom_components/browser_mod/media_player.py | 36 +++++++++++++++++++ js/main.js | 8 ++++- 4 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 custom_components/browser_mod/media_player.py diff --git a/custom_components/browser_mod/__init__.py b/custom_components/browser_mod/__init__.py index 6cced35..b7519e3 100644 --- a/custom_components/browser_mod/__init__.py +++ b/custom_components/browser_mod/__init__.py @@ -17,24 +17,27 @@ async def async_setup(hass, config): setup_view(hass, FRONTEND_SCRIPT_URL) _LOGGER.error(f"Registered frontend script") - async_register_command(hass, handle_connect) - _LOGGER.error(f"Registered connect ws command") - - _LOGGER.error(f"Config") - _LOGGER.error(config) - aliases = {} for d in config[DOMAIN].get("devices", {}): name = config[DOMAIN]["devices"][d].get("name", None) if name: aliases[name] = d - _LOGGER.error(aliases) hass.data[DOMAIN] = { "devices": {}, "aliases": aliases, + "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"]) + + async_register_command(hass, handle_connect) + async_register_command(hass, handle_update) + _LOGGER.error(f"Registered connect ws command") + return True @@ -46,9 +49,15 @@ async def async_setup(hass, config): def handle_connect(hass, connection, msg): _LOGGER.error(f"Got connection {msg}") + devices = hass.data[DOMAIN]["devices"] + deviceID = msg["deviceID"] + if deviceID in devices: + devices[deviceID].connect(connection, msg["id"]) + else: + adder = hass.data[DOMAIN]["adders"][0] + devices[deviceID] = adder(hass, deviceID, connection, msg["id"]) connection.send_message(result_message(msg["id"])) - connection.send_message(event_message(msg["id"], {"command": "update"})) @websocket_command({ vol.Required("type"): "browser_mod/update", @@ -57,4 +66,7 @@ def handle_connect(hass, connection, msg): vol.Optional("player"): dict, }) def handle_update(hass, connection, msg): - pass + devices = hass.data[DOMAIN]["devices"] + deviceID = msg["deviceID"] + if deviceID in devices: + devices[deviceID].update(msg.get("browser", None), msg.get("player", None)) diff --git a/custom_components/browser_mod/browser_mod.js b/custom_components/browser_mod/browser_mod.js index fed5f95..6f70d90 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(){this.conn&&this.conn.sendMessage({type:"browser_mod/update"})}}}]); \ 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,browser:{},player:{state:"idle"}})}}}]); \ No newline at end of file diff --git a/custom_components/browser_mod/media_player.py b/custom_components/browser_mod/media_player.py new file mode 100644 index 0000000..3e8a1ab --- /dev/null +++ b/custom_components/browser_mod/media_player.py @@ -0,0 +1,36 @@ +import logging +from homeassistant.components.media_player import MediaPlayerDevice + +from homeassistant.components.websocket_api import event_message + +from . import DOMAIN + +_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) + if connection: + player.connect(connection, cid) + _LOGGER.error(player) + return player + hass.data[DOMAIN]["adders"].append(adder) + +class BrowserModPlayer(MediaPlayerDevice): + + def __init__(self, hass, deviceID, alias=None): + self.hass = hass + self.deviceID = deviceID + self.alias = alias + _LOGGER.error(f"Create player {deviceID}") + + def connect(self, connection, cid): + self.cid = cid + self.connection = connection + _LOGGER.error(f"Connecting player {cid}") + connection.send_message(event_message(cid, {"command": "update"})) + pass + + def update(self, browser, player): + _LOGGER.error(f"{self.deviceID}: {browser} {player}") + pass diff --git a/js/main.js b/js/main.js index 6215df2..c04dda6 100644 --- a/js/main.js +++ b/js/main.js @@ -19,6 +19,8 @@ class BrowserMod { callback(msg) { console.log("Got ws message"); console.log(msg); + if(msg.command === "update") + this.update(); } update() { @@ -26,7 +28,11 @@ class BrowserMod { this.conn.sendMessage({ type: 'browser_mod/update', - + deviceID: deviceID, + browser: {}, + player: { + state: "idle", + }, }); }