Navigate, refresh and javascript services

2022-07-19 19:42:27 +00:00 · 2022-07-19 19:42:27 +00:00 · a4085ed3ab
commit a4085ed3ab
parent f12cc164b6
7 changed files with 223 additions and 35 deletions
--- a/custom_components/browser_mod/browser_mod.js
+++ b/custom_components/browser_mod/browser_mod.js
@ -685,7 +685,7 @@ const RequireInteractMixin = (SuperClass) => {
        --mdc-icon-size: 48px;
      }
      ha-icon::before {
-        content: "browser_mod";
+        content: "Browser\\00a0Mod";
        font-size: 0.75rem;
        position: absolute;
        right: 0;
@ -813,6 +813,12 @@ const BrowserStateMixin = (SuperClass) => {
            };
            update();
        }
+        async browser_navigate(path) {
+            if (!path)
+                return;
+            history.pushState(null, "", path);
+            window.dispatchEvent(new CustomEvent("location-changed"));
+        }
    };
 };

@ -850,17 +856,39 @@ const ServicesMixin = (SuperClass) => {
              [timeout: <number>]
              [timeout_action: <service call>]
    
-            Close popup
-              service: browser_mod.close_popup
+          Close popup:
+            service: browser_mod.close_popup
    
-            Javascript console print
-              service: browser_mod.console
-              data:
-                message: <string>
+          Navigate to path:
+            service: browser_mod.navigate
+            data:
+              path: <string>
+    
+          Refresh browser:
+            service: browser_mod.refresh
+    
+          Browser console print:
+            service: browser_mod.console
+            data:
+              message: <string>
+    
+          Run javascript:
+            service: browser_mod.javascript
+            data:
+              code: <string>
        */
        constructor() {
            super();
-            const cmds = ["sequence", "delay", "popup", "close_popup"];
+            const cmds = [
+                "sequence",
+                "delay",
+                "popup",
+                "close_popup",
+                "navigate",
+                "refresh",
+                "console",
+                "javascript",
+            ];
            for (const service of cmds) {
                this.addEventListener(`command-${service}`, (ev) => {
                    this._service_action({
@ -901,9 +929,25 @@ const ServicesMixin = (SuperClass) => {
                case "close_popup":
                    this.closePopup();
                    break;
+                case "navigate":
+                    this.browser_navigate(data.path);
+                    break;
+                case "refresh":
+                    window.location.href = window.location.href;
+                    break;
                case "console":
                    console.log(data.message);
                    break;
+                case "javascript":
+                    const code = `
+          "use strict";
+          // Insert global definitions here
+          const hass = (document.querySelector("home-assistant") || document.querySelector("hc-main")).hass;
+          ${data.code}
+          `;
+                    const fn = new Function(code);
+                    fn();
+                    break;
            }
        }
    };
@ -1302,7 +1346,7 @@ var pjson = {
    - Card-mod integration
    X Timeout
    X Fullscreen
-  - Motion/occupancy tracker
+  x Motion/occupancy tracker
  x Information about interaction requirement
  x Information about fullykiosk
  - Commands
@ -1313,13 +1357,13 @@ var pjson = {
      x popup
      x close_popup
      - more-info
-      - navigate
-      - lovelace-reload
-      - window-reload
+      x navigate
+      - lovelace-reload?
+      x window-reload
      - screensaver
      x sequence
      x delay
-      - javascript eval
+      x javascript eval
      - toast?
    x Redesign services to target devices
  - frontend editor for popup cards
--- a/custom_components/browser_mod/service.py
+++ b/custom_components/browser_mod/service.py
@ -59,5 +59,11 @@ async def async_setup_services(hass):

        call_service(service, browsers, data)

-    hass.services.async_register(DOMAIN, "test", handle_service)
+    hass.services.async_register(DOMAIN, "sequence", handle_service)
+    hass.services.async_register(DOMAIN, "delay", handle_service)
    hass.services.async_register(DOMAIN, "popup", handle_service)
+    hass.services.async_register(DOMAIN, "close_popup", handle_service)
+    hass.services.async_register(DOMAIN, "navigate", handle_service)
+    hass.services.async_register(DOMAIN, "refresh", handle_service)
+    hass.services.async_register(DOMAIN, "console", handle_service)
+    hass.services.async_register(DOMAIN, "javascript", handle_service)
--- a/custom_components/browser_mod/services.yaml
+++ b/custom_components/browser_mod/services.yaml
@ -1,5 +1,5 @@
-test:
-  description: "A debugging service"
+sequence:
+  description: "Run a sequence of services"
  target:
    device:
      integration: "browser_mod"
@ -10,7 +10,32 @@ test:
      device:
        integration: "browser_mod"
      multiple: true
-  fields: {}
+  fields:
+    sequence:
+      name: Actions
+      description: List of services to run
+      selector:
+        object:
+
+delay:
+  description: "Wait for a time"
+  target:
+    device:
+      integration: "browser_mod"
+      multiple: true
+    entity:
+      integration: "browser_mod_none"
+    area:
+      device:
+        integration: "browser_mod"
+      multiple: true
+  fields:
+    time:
+      name: Time
+      description: Time to wait (ms)
+      selector:
+        number:
+          mode: box

 popup:
  description: "Display a popup"
@ -91,3 +116,73 @@ close_popup:
      device:
        integration: "browser_mod"
      multiple: true
+
+navigate:
+  description: "Navigate browser to a different page"
+  target:
+    device:
+      integration: "browser_mod"
+      multiple: true
+    entity:
+      integration: "browser_mod_none"
+    area:
+      device:
+        integration: "browser_mod"
+      multiple: true
+  fields:
+    path:
+      name: Path
+      description: "Target path"
+      selector:
+        text:
+
+refresh:
+  description: "Refresh page"
+  target:
+    device:
+      integration: "browser_mod"
+      multiple: true
+    entity:
+      integration: "browser_mod_none"
+    area:
+      device:
+        integration: "browser_mod"
+      multiple: true
+
+console:
+  description: "Print text to browser console"
+  target:
+    device:
+      integration: "browser_mod"
+      multiple: true
+    entity:
+      integration: "browser_mod_none"
+    area:
+      device:
+        integration: "browser_mod"
+      multiple: true
+  fields:
+    message:
+      name: Message
+      description: "Text to print"
+      selector:
+        text:
+
+javascript:
+  description: "Run arbitrary JavaScript code"
+  target:
+    device:
+      integration: "browser_mod"
+      multiple: true
+    entity:
+      integration: "browser_mod_none"
+    area:
+      device:
+        integration: "browser_mod"
+      multiple: true
+  fields:
+    code:
+      name: Code
+      description: "JavaScript code to run"
+      selector:
+        object:
--- a/js/plugin/browser.ts
+++ b/js/plugin/browser.ts
@ -1,3 +1,5 @@
+import { hass_base_el } from "../helpers";
+
 export const BrowserStateMixin = (SuperClass) => {
  return class BrowserStateMixinClass extends SuperClass {
    constructor() {
@ -38,10 +40,10 @@ export const BrowserStateMixin = (SuperClass) => {
      update();
    }

-    // do_navigate(path) {
-    //   if (!path) return;
-    //   history.pushState(null, "", path);
-    //   fireEvent("location-changed", {}, ha_element());
-    // }
+    async browser_navigate(path) {
+      if (!path) return;
+      history.pushState(null, "", path);
+      window.dispatchEvent(new CustomEvent("location-changed"));
+    }
  };
 };
--- a/js/plugin/main.ts
+++ b/js/plugin/main.ts
@ -24,7 +24,7 @@ import pjson from "../../package.json";
    - Card-mod integration
    X Timeout
    X Fullscreen
-  - Motion/occupancy tracker
+  x Motion/occupancy tracker
  x Information about interaction requirement
  x Information about fullykiosk
  - Commands
@ -35,13 +35,13 @@ import pjson from "../../package.json";
      x popup
      x close_popup
      - more-info
-      - navigate
-      - lovelace-reload
-      - window-reload
+      x navigate
+      - lovelace-reload?
+      x window-reload
      - screensaver
      x sequence
      x delay
-      - javascript eval
+      x javascript eval
      - toast?
    x Redesign services to target devices
  - frontend editor for popup cards
--- a/js/plugin/require-interact.ts
+++ b/js/plugin/require-interact.ts
@ -34,7 +34,7 @@ export const RequireInteractMixin = (SuperClass) => {
        --mdc-icon-size: 48px;
      }
      ha-icon::before {
-        content: "browser_mod";
+        content: "Browser\\00a0Mod";
        font-size: 0.75rem;
        position: absolute;
        right: 0;
--- a/js/plugin/services.ts
+++ b/js/plugin/services.ts
@ -32,18 +32,40 @@ export const ServicesMixin = (SuperClass) => {
          [timeout: <number>]
          [timeout_action: <service call>]

-        Close popup
-          service: browser_mod.close_popup
+      Close popup:
+        service: browser_mod.close_popup

-        Javascript console print
-          service: browser_mod.console
-          data:
-            message: <string>
+      Navigate to path:
+        service: browser_mod.navigate
+        data:
+          path: <string>
+
+      Refresh browser:
+        service: browser_mod.refresh
+
+      Browser console print:
+        service: browser_mod.console
+        data:
+          message: <string>
+
+      Run javascript:
+        service: browser_mod.javascript
+        data:
+          code: <string>
    */

    constructor() {
      super();
-      const cmds = ["sequence", "delay", "popup", "close_popup"];
+      const cmds = [
+        "sequence",
+        "delay",
+        "popup",
+        "close_popup",
+        "navigate",
+        "refresh",
+        "console",
+        "javascript",
+      ];
      for (const service of cmds) {
        this.addEventListener(`command-${service}`, (ev) => {
          this._service_action({
@ -92,9 +114,28 @@ export const ServicesMixin = (SuperClass) => {
          this.closePopup();
          break;

+        case "navigate":
+          this.browser_navigate(data.path);
+          break;
+
+        case "refresh":
+          window.location.href = window.location.href;
+          break;
+
        case "console":
          console.log(data.message);
          break;
+
+        case "javascript":
+          const code = `
+          "use strict";
+          // Insert global definitions here
+          const hass = (document.querySelector("home-assistant") || document.querySelector("hc-main")).hass;
+          ${data.code}
+          `;
+          const fn = new Function(code);
+          fn();
+          break;
      }
    }
  };