BREAKING - Better calls from frontend

js/connection.js

@@ -27,26 +27,6 @@ export class BrowserModConnection{
 
     set hass(hass) {
         this._hass = hass;
-        if(!hass || this._hass_patched) return;
-
-        this._hass_patched = true;
-        const callService = hass.callService;
-
-        hass.callService = (domain, service, serviceData) => {
-            if(serviceData && serviceData.deviceID) {
-                serviceData = JSON.parse(JSON.stringify(serviceData));
-
-                const orig = JSON.stringify(serviceData.deviceID);
-                const patched = orig.replace('"this"', `"${deviceID}"`);
-                serviceData.deviceID = JSON.parse(patched);
-            }
-            return callService(domain, service, serviceData);
-        }
-
-        if (document.querySelector("hc-main"))
-            document.querySelector("hc-main").hassChanged(hass, hass);
-        else
-            document.querySelector("home-assistant").hassChanged(hass, hass);
     }
 
     get connected() {

js/main.js

@@ -32,6 +32,12 @@ class BrowserMod extends ext(BrowserModConnection, [
     this.cast = document.querySelector("hc-main") !== null;
     this.connect();
 
+    document.body.addEventListener("ll-custom", (ev) => {
+      if(ev.detail.browser_mod) {
+        this.msg_callback(ev.detail.browser_mod);
+      }
+    })
+
     const pjson = require('../package.json');
     console.info(`%cBROWSER_MOD ${pjson.version} IS INSTALLED
     %cDeviceID: ${deviceID}`,
@@ -57,7 +63,7 @@ class BrowserMod extends ext(BrowserModConnection, [
       navigate: (msg) => this.do_navigate(msg.navigation_path),
       "set-theme": (msg) => this.set_theme(msg),
       "lovelace-reload": (msg) => this.lovelace_reload(msg),
-      "window-reload": () => window.location.reload(false),
+      "window-reload": () => window.location.reload(),
 
       blackout: (msg) => this.do_blackout(msg.time ? parseInt(msg.time) : undefined),
       "no-blackout": (msg) => {
@@ -66,9 +72,16 @@ class BrowserMod extends ext(BrowserModConnection, [
         }
         this.no_blackout()
       },
+
+      "call-service": (msg) => this.call_service(msg),
+      "commands": (msg) => {
+        for(const m of msg.commands) {
+          this.msg_callback(m);
+        }
+      },
     };
 
-    handlers[msg.command](msg);
+    handlers[msg.command.replace("_","-")](msg);
   }
 
   debug(msg) {
@@ -87,6 +100,23 @@ class BrowserMod extends ext(BrowserModConnection, [
       fireEvent("config-refresh", {}, ll);
   }
 
+  call_service(msg) {
+    const _replaceThis = (data) => {
+      if (typeof(data) === "string" && data === "this")
+        return deviceID;
+      if (Array.isArray(data))
+        return data.map(_replaceThis);
+      if (data.constructor == Object) {
+        for (const key in data)
+          data[key] = _replaceThis(data[key]);
+      }
+      return data;
+    }
+    const [domain, service] = msg.service.split(".", 2);
+    let service_data = _replaceThis(JSON.parse(JSON.stringify(msg.service_data)));
+    this._hass.callService(domain, service, service_data);
+  }
+
   update(msg=null) {
     if(msg) {
       if(msg.name) {
@@ -108,5 +138,9 @@ class BrowserMod extends ext(BrowserModConnection, [
 
 const bases = [customElements.whenDefined('home-assistant'), customElements.whenDefined('hc-main')];
 Promise.race(bases).then(() => {
-  window.browser_mod = window.browser_mod || new BrowserMod();
+  window.setTimeout(() => {
+    window.browser_mod = window.browser_mod || new BrowserMod();
+    },
+    1000
+  );
 });