feat: add remote control to integration view

refactor: improve command constants
feat: add get remotes in web interface
2025-04-14 23:39:34 +02:00 · 2025-04-14 23:38:51 +02:00 · 2025-04-14 23:37:07 +02:00 · 2025-04-14 23:34:59 +02:00 · 2025-04-14 13:59:59 +02:00
13 changed files with 500 additions and 99 deletions
--- a/data/remote_database.go
+++ b/data/remote_database.go
@ -97,6 +97,22 @@ func (db *RemoteDatabase) CreateRemoteCommands(remoteId string, commandIds []str
 	return nil
 }

+func (db *RemoteDatabase) GetRemote(remoteId string) (Remote, error) {
+	var remote Remote
+	queryString := "SELECT id, title FROM Remotes WHERE id = ?"
+	row := db.Connection.QueryRow(queryString, remoteId)
+	error := row.Scan(&remote.Id, &remote.Title)
+	if error != nil {
+		return Remote{}, fmt.Errorf("error scanning remote: %s", error)
+	}
+	commands, error := db.GetCommandsByRemoteId(remoteId)
+	if error != nil {
+		return Remote{}, error
+	}
+	remote.Commands = commands
+	return remote, nil
+}
+
 func (db *RemoteDatabase) GetRemotes() ([]Remote, error) {
 	rows, error := db.Connection.Query("SELECT id, title FROM Remotes")
 	if error != nil {
--- a/management/remote_manager.go
+++ b/management/remote_manager.go
@ -17,6 +17,14 @@ func (rm *RemoteManager) CreateRemote(remote d.Remote) (string, error) {
 	return rm.remoteDatabase.CreateRemote(remote)
 }

+func (rm *RemoteManager) GetRemote(remoteID string) (d.Remote, error) {
+	remote, err := rm.remoteDatabase.GetRemote(remoteID)
+	if err != nil {
+		return d.Remote{}, err
+	}
+	return remote, nil
+}
+
 func (rm *RemoteManager) GetRemotes() ([]d.Remote, error) {
 	remotes, err := rm.remoteDatabase.GetRemotes()
 	if err != nil {
--- a/server/remote_api_handler.go
+++ b/server/remote_api_handler.go
@ -5,6 +5,7 @@ import (
 	m "playback-device-server/management"

 	"github.com/labstack/echo/v4"
+	"github.com/rs/zerolog/log"
 )

 type RemoteApiHandler struct {
@ -16,6 +17,7 @@ func (r *RemoteApiHandler) Initialize(authenticator *Authenticator) {
 	r.router.Use(authenticator.Authenticate("/api/remotes", []string{}))
 	remotesApi := r.router.Group("/api/remotes")
 	remotesApi.GET("", r.handleGetRemotes)
+	remotesApi.GET("/:id", r.handleGetRemote)
 	remotesApi.POST("", r.handleCreateRemote)
 	remotesApi.DELETE("/:id", r.handleDelteRemote)

@ -42,6 +44,17 @@ func (r *RemoteApiHandler) handleCreateRemote(context echo.Context) error {
 	return context.JSON(200, remote)
 }

+func (r *RemoteApiHandler) handleGetRemote(context echo.Context) error {
+	id := context.Param("id")
+	remote, err := r.remoteManager.GetRemote(id)
+	if err != nil {
+		SendError(500, context, err.Error())
+		log.Error().Err(err)
+		return err
+	}
+	return context.JSON(200, remote)
+}
+
 func (r *RemoteApiHandler) handleGetRemotes(context echo.Context) error {
 	remotes, err := r.remoteManager.GetRemotes()
 	if err != nil {
--- a/www/src/components/list-manager.jsx
+++ b/www/src/components/list-manager.jsx
@ -36,10 +36,6 @@ function ListManager(props) {
      })
  );

-  createEffect(() =>
-    console.log(availableItemsFuse().search(availableItemsSearchString()))
-  );
-
  const selectableAvailableItems = createMemo(() =>
    (availableItemsSearchString()
      ? availableItemsFuse()
--- a/www/src/components/remote-control.jsx
+++ b/www/src/components/remote-control.jsx
@ -0,0 +1,180 @@
+import { createEffect, createMemo, mergeProps } from "solid-js";
+import Remote from "../data/remote";
+import Command from "../data/command";
+
+function RemoteControl(props) {
+  props = mergeProps(
+    {
+      remote: new Remote(),
+      onCommand: () => {},
+    },
+    props
+  );
+
+  const BUTTON_SIZE_REGULAR = "regular";
+  const BUTTON_SIZE_SMALL = "small";
+
+  const BUTTON_HEIGHT = 2;
+  const BUTTON_WIDTH = BUTTON_HEIGHT * 1.4;
+  const SMALL_BUTTON_HEIGHT = 1.5;
+  const SMALL_BUTTON_WIDTH = SMALL_BUTTON_HEIGHT * 1.3334;
+  const TYPES = Command.TYPES;
+
+  const commandMap = createMemo(() =>
+    props.remote
+      .getCommands()
+      .reduce(
+        (map, command) => ({ ...map, [command.getCommandType()]: command }),
+        {}
+      )
+  );
+
+  let layout = [
+    [TYPES.POWER, null, TYPES.INPUT],
+    [TYPES.ONE, TYPES.TWO, TYPES.THREE],
+    [TYPES.FOUR, TYPES.FIVE, TYPES.SIX],
+    [TYPES.SEVEN, TYPES.EIGHT, TYPES.NINE],
+    [TYPES.VOLUME_UP, TYPES.ZERO, TYPES.CHANNEL_UP],
+    [TYPES.VOLUME_DOWN, TYPES.MUTE, TYPES.CHANNEL_DOWN],
+    [TYPES.MENU, TYPES.HOME, TYPES.SETTINGS],
+    [TYPES.OPTIONS, TYPES.UP, TYPES.INFO],
+    [TYPES.LEFT, TYPES.ENTER, TYPES.RIGHT],
+    [TYPES.RETURN, TYPES.DOWN, TYPES.EXIT],
+    [TYPES.RED, TYPES.GREEN, TYPES.YELLOW, TYPES.BLUE],
+    [TYPES.PLAY, TYPES.PAUSE, TYPES.STOP],
+    [TYPES.REWIND, null, TYPES.FORWARD],
+  ];
+
+  function toButtonProps(type) {
+    let mapping = {
+      [TYPES.POWER]: () => ({ icon: "bi-power", text: "" }),
+      [TYPES.INPUT]: () => ({ icon: "bi-box-arrow-in-right", text: "" }),
+      [TYPES.VOLUME_UP]: () => ({ icon: "bi-volume-up", text: "" }),
+      [TYPES.VOLUME_DOWN]: () => ({ icon: "bi-volume-down", text: "" }),
+      [TYPES.MUTE]: () => ({ icon: "bi-volume-mute", text: "" }),
+      [TYPES.CHANNEL_UP]: () => ({ icon: "bi-chevron-up", text: "" }),
+      [TYPES.CHANNEL_DOWN]: () => ({ icon: "bi-chevron-down", text: "" }),
+      [TYPES.HOME]: () => ({ icon: "bi-house-door", text: "" }),
+      [TYPES.SETTINGS]: () => ({ icon: "bi-gear", text: "" }),
+      [TYPES.INFO]: () => ({ icon: "bi-info-circle", text: "" }),
+      [TYPES.UP]: () => ({ icon: "bi-arrow-up", text: "" }),
+      [TYPES.DOWN]: () => ({ icon: "bi-arrow-down", text: "" }),
+      [TYPES.LEFT]: () => ({ icon: "bi-arrow-left", text: "" }),
+      [TYPES.RIGHT]: () => ({ icon: "bi-arrow-right", text: "" }),
+      [TYPES.ENTER]: () => ({ icon: "", text: "OK" }),
+      [TYPES.EXIT]: () => ({ icon: "", text: "EXIT" }),
+      [TYPES.OPTIONS]: () => ({ icon: "bi-list-task", text: "" }),
+      [TYPES.RETURN]: () => ({ icon: "bi-arrow-return-left", text: "" }),
+      [TYPES.ONE]: () => ({ icon: "", text: "1" }),
+      [TYPES.TWO]: () => ({ icon: "", text: "2" }),
+      [TYPES.THREE]: () => ({ icon: "", text: "3" }),
+      [TYPES.FOUR]: () => ({ icon: "", text: "4" }),
+      [TYPES.FIVE]: () => ({ icon: "", text: "5" }),
+      [TYPES.SIX]: () => ({ icon: "", text: "6" }),
+      [TYPES.SEVEN]: () => ({ icon: "", text: "7" }),
+      [TYPES.EIGHT]: () => ({ icon: "", text: "8" }),
+      [TYPES.NINE]: () => ({ icon: "", text: "9" }),
+      [TYPES.ZERO]: () => ({ icon: "", text: "0" }),
+      [TYPES.MENU]: () => ({ icon: "", text: "MENU" }),
+      [TYPES.PLAY]: () => ({ icon: "bi-play", text: "" }),
+      [TYPES.PAUSE]: () => ({ icon: "bi-pause", text: "" }),
+      [TYPES.STOP]: () => ({ icon: "bi-stop", text: "" }),
+      [TYPES.REWIND]: () => ({ icon: "bi-rewind", text: "" }),
+      [TYPES.FORWARD]: () => ({ icon: "bi-fast-forward", text: "" }),
+      [TYPES.RED]: () => ({
+        class: "bg-danger",
+        buttonSize: BUTTON_SIZE_SMALL,
+      }),
+      [TYPES.GREEN]: () => ({
+        class: "bg-success",
+        buttonSize: BUTTON_SIZE_SMALL,
+      }),
+      [TYPES.YELLOW]: () => ({
+        class: "bg-warning",
+        buttonSize: BUTTON_SIZE_SMALL,
+      }),
+      [TYPES.BLUE]: () => ({
+        class: "bg-primary",
+        buttonSize: BUTTON_SIZE_SMALL,
+      }),
+    };
+
+    if (!(type in mapping)) return {};
+    let props = mapping[type]();
+    props.type = type;
+    props.text = props.text || "";
+    return props;
+  }
+
+  function PlaceholderButton() {
+    return (
+      <div
+        style={`width: ${BUTTON_WIDTH}em; height: ${BUTTON_HEIGHT}em; margin: 0.2em;`}
+      ></div>
+    );
+  }
+
+  function RemoteButton(props) {
+    props = mergeProps(
+      {
+        onClick: () => {},
+        disabled: false,
+        class: "",
+        buttonSize: BUTTON_SIZE_REGULAR,
+        icon: "",
+        text: "",
+      },
+      props
+    );
+
+    let buttonWidth = BUTTON_WIDTH;
+    let buttonHeight = BUTTON_HEIGHT;
+    if (props.buttonSize === BUTTON_SIZE_SMALL) {
+      buttonWidth = SMALL_BUTTON_WIDTH;
+      buttonHeight = SMALL_BUTTON_HEIGHT;
+    }
+    let buttonFontSize = buttonHeight * 0.4;
+    let iconSize = buttonHeight * 0.5;
+    return (
+      <button
+        class={
+          "btn btn-dark d-flex justify-content-center align-items-center " +
+          props.class
+        }
+        style={`width: ${buttonWidth}em; height: ${buttonHeight}em; margin: 0.2em;`}
+        onClick={props.onClick}
+        disabled={props.disabled}
+      >
+        <i style={`font-size: ${iconSize}em;`} class={"bi " + props.icon} />
+        <span style={`font-size: ${buttonFontSize}em;`}>{props.text}</span>
+      </button>
+    );
+  }
+
+  return (
+    <div class="d-flex flex-column justify-content-center align-items-center p-1 bg-secondary rounded">
+      {layout.map((row) => (
+        <div class="d-flex flex-row justify-content-center align-items-center">
+          {row
+            .map(toButtonProps)
+            .map(({ type, class: className, buttonSize, icon, text }) =>
+              !type ? (
+                <PlaceholderButton />
+              ) : (
+                <RemoteButton
+                  class={className}
+                  buttonSize={buttonSize}
+                  onClick={() => props.onCommand(commandMap()[type])}
+                  disabled={!commandMap()[type]}
+                  icon={icon}
+                  text={text}
+                />
+              )
+            )}
+        </div>
+      ))}
+    </div>
+  );
+}
+
+export default RemoteControl;
--- a/www/src/data/command.js
+++ b/www/src/data/command.js
@ -61,7 +61,7 @@ function Command({

  function getTitle() {
    if (_title) return _title;
-    return `${Command.CommandTypes[commandType]} (${Command.Protocols[protocol]})`;
+    return `${Command.getTypeString(_commandType)} (${Command.getProtocolString(_protocol)})`;
  }

  function setTitle(title) {
@ -84,73 +84,148 @@ function Command({
  };
 }

-Command.Protocols = {
-  samsung: "Samsung",
-  nec: "NEC",
-  onkyo: "Onkyo",
-  apple: "Apple",
-  denon: "Denon",
-  sharp: "Sharp",
-  panasonic: "Panasonic",
-  kaseikyo: "Kaseikyo",
-  jvc: "JVC",
-  lg: "LG",
-  sony: "Sony",
-  rc5: "RC5",
-  rc6: "RC6",
-  universal_pulse_distance: "Universal Pulse Distance",
-  universal_pulse_width: "Universal Pulse Width",
-  universal_pulse_distance_width: "Universal Pulse Distance Width",
-  hash: "Hash",
-  pronto: "Pronto",
-  bose_wave: "BoseWave",
-  bang_olufsen: "Bang & Olufsen",
-  lego: "Lego",
-  fast: "FAST",
-  whynter: "Whynter",
-  magiquest: "MagiQuest",
-};
+Command.PROTOCOLS = {
+  SAMSUNG: "samsung",
+  NEC: "nec",
+  ONKYO: "onkyo",
+  APPLE: "apple",
+  DENON: "denon",
+  SHARP: "sharp",
+  PANASONIC: "panasonic",
+  KASEIKYO: "kaseikyo",
+  JVC: "jvc",
+  LG: "lg",
+  SONY: "sony",
+  RC5: "rc5",
+  RC6: "rc6",
+  UNIVERSAL_PULSE_DISTANCE: "universal_pulse_distance",
+  UNIVERSAL_PULSE_WIDTH: "universal_pulse_width",
+  UNIVERSAL_PULSE_DISTANCE_WIDTH: "universal_pulse_distance_width",
+  HASH: "hash",
+  PRONTO: "pronto",
+  BOSE_WAVE: "bose_wave",
+  BANG_OLUFSEN: "bang_olufsen",
+  LEGO: "lego",
+  FAST: "fast",
+  WHYNTER: "whynter",
+  MAGIQUEST: "magiquest",
+}

-Command.CommandTypes = {
-  power: "Power",
-  input: "Input",
-  one: "1",
-  two: "2",
-  three: "3",
-  four: "4",
-  five: "5",
-  six: "6",
-  seven: "7",
-  eight: "8",
-  nine: "9",
-  zero: "0",
-  volume_up: "Volume Up",
-  volume_down: "Volume Down",
-  mute: "Mute",
-  channel_up: "Channel Up",
-  channel_down: "Channel Down",
-  menu: "Menu",
-  home: "Home",
-  settings: "Settings",
-  options: "Options",
-  up: "Up",
-  down: "Down",
-  left: "Left",
-  right: "Right",
-  enter: "Enter",
-  info: "Info",
-  return: "Return",
-  exit: "Exit",
-  red: "Red",
-  green: "Green",
-  yellow: "Yellow",
-  blue: "Blue",
-  rewind: "Rewind",
-  play: "Play",
-  pause: "Pause",
-  stop: "Stop",
-  forward: "Forward",
-  other: "Other",
-};
+Command.getProtocolString = (protocol) => {
+  let mapping = {
+    [Command.PROTOCOLS.SAMSUNG]: "Samsung",
+    [Command.PROTOCOLS.NEC]: "NEC",
+    [Command.PROTOCOLS.ONKYO]: "Onkyo",
+    [Command.PROTOCOLS.APPLE]: "Apple",
+    [Command.PROTOCOLS.DENON]: "Denon",
+    [Command.PROTOCOLS.SHARP]: "Sharp",
+    [Command.PROTOCOLS.PANASONIC]: "Panasonic",
+    [Command.PROTOCOLS.KASEIKYO]: "Kaseikyo",
+    [Command.PROTOCOLS.JVC]: "JVC",
+    [Command.PROTOCOLS.LG]: "LG",
+    [Command.PROTOCOLS.SONY]: "Sony",
+    [Command.PROTOCOLS.RC5]: "RC5",
+    [Command.PROTOCOLS.RC6]: "RC6",
+    [Command.PROTOCOLS.UNIVERSAL_PULSE_DISTANCE]: "Universal Pulse Distance",
+    [Command.PROTOCOLS.UNIVERSAL_PULSE_WIDTH]: "Universal Pulse Width",
+    [Command.PROTOCOLS.UNIVERSAL_PULSE_DISTANCE_WIDTH]: "Universal Pulse Distance Width",
+    [Command.PROTOCOLS.HASH]: "Hash",
+    [Command.PROTOCOLS.PRONTO]: "Pronto",
+    [Command.PROTOCOLS.BOSE_WAVE]: "BoseWave",
+    [Command.PROTOCOLS.BANG_OLUFSEN]: "Bang & Olufsen",
+    [Command.PROTOCOLS.LEGO]: "Lego",
+    [Command.PROTOCOLS.FAST]: "FAST",
+    [Command.PROTOCOLS.WHYNTER]: "Whynter",
+    [Command.PROTOCOLS.MAGIQUEST]: "MagiQuest",
+  }
+  return mapping[protocol]
+}
+
+Command.TYPES = {
+  POWER: "power",
+  INPUT: "input",
+  ONE: "one",
+  TWO: "two",
+  THREE: "three",
+  FOUR: "four",
+  FIVE: "five",
+  SIX: "six",
+  SEVEN: "seven",
+  EIGHT: "eight",
+  NINE: "nine",
+  ZERO: "zero",
+  VOLUME_UP: "volume_up",
+  VOLUME_DOWN: "volume_down",
+  MUTE: "mute",
+  CHANNEL_UP: "channel_up",
+  CHANNEL_DOWN: "channel_down",
+  MENU: "menu",
+  HOME: "home",
+  SETTINGS: "settings",
+  OPTIONS: "options",
+  UP: "up",
+  DOWN: "down",
+  LEFT: "left",
+  RIGHT: "right",
+  ENTER: "enter",
+  INFO: "info",
+  RETURN: "return",
+  EXIT: "exit",
+  RED: "red",
+  GREEN: "green",
+  YELLOW: "yellow",
+  BLUE: "blue",
+  REWIND: "rewind",
+  PLAY: "play",
+  PAUSE: "pause",
+  STOP: "stop",
+  FORWARD: "forward",
+  OTHER: "other",
+}
+
+Command.getTypeString = (type) => {
+  let mapping = {
+    [Command.TYPES.POWER]: "Power",
+    [Command.TYPES.INPUT]: "Input",
+    [Command.TYPES.ONE]: "1",
+    [Command.TYPES.TWO]: "2",
+    [Command.TYPES.THREE]: "3",
+    [Command.TYPES.FOUR]: "4",
+    [Command.TYPES.FIVE]: "5",
+    [Command.TYPES.SIX]: "6",
+    [Command.TYPES.SEVEN]: "7",
+    [Command.TYPES.EIGHT]: "8",
+    [Command.TYPES.NINE]: "9",
+    [Command.TYPES.ZERO]: "0",
+    [Command.TYPES.VOLUME_UP]: "Volume Up",
+    [Command.TYPES.VOLUME_DOWN]: "Volume Down",
+    [Command.TYPES.MUTE]: "Mute",
+    [Command.TYPES.CHANNEL_UP]: "Channel Up",
+    [Command.TYPES.CHANNEL_DOWN]: "Channel Down",
+    [Command.TYPES.MENU]: "Menu",
+    [Command.TYPES.HOME]: "Home",
+    [Command.TYPES.SETTINGS]: "Settings",
+    [Command.TYPES.OPTIONS]: "Options",
+    [Command.TYPES.UP]: "Up",
+    [Command.TYPES.DOWN]: "Down",
+    [Command.TYPES.LEFT]: "Left",
+    [Command.TYPES.RIGHT]: "Right",
+    [Command.TYPES.ENTER]: "Enter",
+    [Command.TYPES.INFO]: "Info",
+    [Command.TYPES.RETURN]: "Return",
+    [Command.TYPES.EXIT]: "Exit",
+    [Command.TYPES.RED]: "Red",
+    [Command.TYPES.GREEN]: "Green",
+    [Command.TYPES.YELLOW]: "Yellow",
+    [Command.TYPES.BLUE]: "Blue",
+    [Command.TYPES.REWIND]: "Rewind",
+    [Command.TYPES.PLAY]: "Play",
+    [Command.TYPES.PAUSE]: "Pause",
+    [Command.TYPES.STOP]: "Stop",
+    [Command.TYPES.FORWARD]: "Forward",
+    [Command.TYPES.OTHER]: "Other",
+  }
+  return mapping[type]
+}

 export default Command;
--- a/www/src/data/remote.js
+++ b/www/src/data/remote.js
@ -1,4 +1,4 @@
-function Remote({ id, title, commands } = {}) {
+function Remote({ id, title, commands = [] } = {}) {
  let _id = id;
  let _title = title;
  let _commands = commands;
--- a/www/src/data/serializer.js
+++ b/www/src/data/serializer.js
@ -68,7 +68,11 @@ const Serializer = (function () {
  }

  function deserializeRemote(object) {
-    return new Remote(object);
+    return new Remote({
+      id: object.id,
+      title: object.title,
+      commands: deserializeCommands(object.commands),
+    });
  }

  function deserializeRemotes(objects) {
--- a/www/src/modals/create-command-modal.jsx
+++ b/www/src/modals/create-command-modal.jsx
@ -92,8 +92,10 @@ function CreateCommandModal(props) {
              <option value="" selected>
                Please select
              </option>
-              {Object.keys(Command.Protocols).map((protocol) => (
-                <option value={protocol}>{Command.Protocols[protocol]}</option>
+              {Object.values(Command.PROTOCOLS).map((protocol) => (
+                <option value={protocol}>
+                  {Command.getProtocolString(protocol)}
+                </option>
              ))}
            </select>
          </div>
@ -139,9 +141,9 @@ function CreateCommandModal(props) {
              <option value="" selected>
                Please select
              </option>
-              {Object.keys(Command.CommandTypes).map((commandType) => (
+              {Object.values(Command.TYPES).map((commandType) => (
                <option value={commandType}>
-                  {Command.CommandTypes[commandType]}
+                  {Command.getTypeString(commandType)}
                </option>
              ))}
            </select>
--- a/www/src/modals/import-commands-modal.jsx
+++ b/www/src/modals/import-commands-modal.jsx
@ -35,8 +35,14 @@ FieldTitles[COMMAND_TYPE_FIELD] = "Type";
 FieldTitles[TITLE_FIELD] = "Title";

 const CommandFieldsRequiringValueMapping = ["protocol", "commandType"];
-const commandTypeFuse = new Fuse(Object.values(Command.CommandTypes));
-const protocolsFuse = new Fuse(Object.values(Command.Protocols));
+const commandTypeFuse = new Fuse(
+  Object.values(Command.TYPES).map((type) => Command.getTypeString(type))
+);
+const protocolsFuse = new Fuse(
+  Object.values(Command.PROTOCOLS).map((protocol) =>
+    Command.getProtocolString(protocol)
+  )
+);

 function ImportCommandsModal(props) {
  const [csvString, setCsvString] = createSignal("");
@ -246,7 +252,7 @@ function ImportCommandsModal(props) {
                                <option value="" selected>
                                  Please select
                                </option>
-                                {Object.keys(Command.Protocols).map(
+                                {Object.values(Command.PROTOCOLS).map(
                                  (protocol) => (
                                    <option
                                      value={protocol}
@ -256,7 +262,7 @@ function ImportCommandsModal(props) {
                                        ] === protocol
                                      }
                                    >
-                                      {Command.Protocols[protocol]}
+                                      {Command.getProtocolString(protocol)}
                                    </option>
                                  )
                                )}
@ -272,7 +278,7 @@ function ImportCommandsModal(props) {
                                <option value="" selected>
                                  Please select
                                </option>
-                                {Object.keys(Command.CommandTypes).map(
+                                {Object.values(Command.TYPES).map(
                                  (commandType) => (
                                    <option
                                      value={commandType}
@ -282,7 +288,7 @@ function ImportCommandsModal(props) {
                                        ] === commandType
                                      }
                                    >
-                                      {Command.CommandTypes[commandType]}
+                                      {Command.getTypeString(commandType)}
                                    </option>
                                  )
                                )}
@ -318,8 +324,8 @@ function ImportCommandsModal(props) {
        if (!valueMapping[PROTOCOL_FIELD][protocolValue]) {
          let result = protocolsFuse.search(protocolValue).shift();
          if (result) {
-            let protocol = Object.keys(Command.Protocols).find(
-              (protocol) => Command.Protocols[protocol] === result.item
+            let protocol = Object.values(Command.PROTOCOLS).find(
+              (protocol) => Command.getProtocolString(protocol) === result.item
            );
            valueMapping[PROTOCOL_FIELD][protocolValue] = protocol;
          }
@ -327,8 +333,9 @@ function ImportCommandsModal(props) {
        if (!valueMapping[COMMAND_TYPE_FIELD][commandTypeValue]) {
          let result = commandTypeFuse.search(commandTypeValue).shift();
          if (result) {
-            let commandType = Object.keys(Command.CommandTypes).find(
-              (commandType) => Command.CommandTypes[commandType] === result.item
+            let commandType = Object.values(Command.TYPES).find(
+              (commandType) =>
+                Command.getTypeString(commandType) === result.item
            );
            valueMapping[COMMAND_TYPE_FIELD][commandTypeValue] = commandType;
          }
--- a/www/src/services/remotes-service.js
+++ b/www/src/services/remotes-service.js
@ -1,9 +1,25 @@
 import Command from "../data/command";
 import Serializer from "../data/serializer";
 import Net from "../tools/net";
+import WebRTCService from "./webrtc-service";
+
+const MESSAGE_TYPE_COMMAND = "command";

 function RemoteService() {
-  let remotes = [];
+  async function getRemote(remoteId) {
+    let response = await Net.sendRequest({
+      method: "GET",
+      url: "/api/remotes/" + remoteId,
+    });
+
+    if (response.status !== 200) {
+      let responseData = JSON.parse(response.data);
+      throw new Error(responseData.error);
+    }
+
+    let remoteObject = JSON.parse(response.data);
+    return Serializer.deserializeRemote(remoteObject);
+  }

  async function getRemotes() {
    let response = await Net.sendRequest({
@ -91,7 +107,13 @@ function RemoteService() {
    }
  }

+  function sendCommand(command) {
+    let commandObject = Serializer.serializeCommand(command);
+    WebRTCService.sendDataJson({type: MESSAGE_TYPE_COMMAND, data: commandObject});
+  }
+
  return {
+    getRemote,
    getRemotes,
    createRemote,
    deleteRemote,
@ -99,6 +121,7 @@ function RemoteService() {
    createCommand,
    createCommands,
    deleteCommand,
+    sendCommand,
  };
 }

--- a/www/src/services/webrtc-service.js
+++ b/www/src/services/webrtc-service.js
@ -8,10 +8,12 @@ function WebRTCService() {
  const STATE_CLOSED = "closed";
  const STATE_FAILED = "failed";
  const ICE_CONNECTION_STATE_CHANGE_EVENT = "iceconnectionstatechange";
+  const DATA_CHANNEL_OPEN_EVENT = "datachannelopen";

  let videoElement;
  let peerConnection;
  let peerId;
+  let dataChannel;

  let eventEmitter = new EventEmitter();

@ -57,12 +59,19 @@ function WebRTCService() {
      console.log("Negotiation needed");
      negotiate(targetId);
    };
+    dataChannel = peerConnection.createDataChannel("data");
+    dataChannel.addEventListener("open", () => {
+      eventEmitter.dispatchEvent(DATA_CHANNEL_OPEN_EVENT);
+    });
    negotiate(targetId);
  }
-  
+
  function disconnect() {
    peerConnection.close();
-    eventEmitter.dispatchEvent(ICE_CONNECTION_STATE_CHANGE_EVENT, peerConnection.iceConnectionState);
+    eventEmitter.dispatchEvent(
+      ICE_CONNECTION_STATE_CHANGE_EVENT,
+      peerConnection.iceConnectionState
+    );
  }

  async function negotiate(targetId) {
@ -125,12 +134,27 @@ function WebRTCService() {
    peerConnection.addIceCandidate(iceCandidate);
  }

+  function sendDataString(data) {
+    if (!dataChannel) return;
+    if (dataChannel.readyState !== "open") return;
+    dataChannel.send(data);
+  }
+
+  function sendDataJson(data) {
+    let dataJson = JSON.stringify(data);
+    sendDataString(dataJson);
+  }
+
  function onStateChanged(callback) {
    eventEmitter.on(ICE_CONNECTION_STATE_CHANGE_EVENT, () => {
      callback(peerConnection.iceConnectionState);
    });
  }

+  function onDataChannelOpen(callback) {
+    eventEmitter.on(DATA_CHANNEL_OPEN_EVENT, callback);
+  }
+
  function getConfiguration() {
    return {
      iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
@ -155,7 +179,10 @@ function WebRTCService() {
    disconnect,
    setVideoElement,
    getVideoElement,
+    sendDataString,
+    sendDataJson,
    onStateChanged,
+    onDataChannelOpen,
  };
 }

--- a/www/src/views/devices/integration-view.jsx
+++ b/www/src/views/devices/integration-view.jsx
@ -1,8 +1,16 @@
-import { createEffect, createMemo, createSignal, onCleanup } from "solid-js";
+import {
+  createEffect,
+  createMemo,
+  createResource,
+  createSignal,
+  onCleanup,
+} from "solid-js";
 import WebRTCService from "../../services/webrtc-service";
 import Integration from "../../data/integration";
 import DeviceService from "../../services/device-service";
 import UrlUtils from "../../tools/url-utils";
+import RemoteControl from "../../components/remote-control";
+import RemoteService from "../../services/remotes-service";

 const [integration, setIntegration] = createSignal(new Integration());

@ -22,8 +30,16 @@ function IntegrationView(props) {
      connectionState() === WebRTCService.STATE_CLOSED
  );
  WebRTCService.onStateChanged(handleConnectionStateChanged);
+  WebRTCService.onDataChannelOpen(handleDataChannelOpen);
  let videoElement = null;

+  const [availableRemotes] = createResource(RemoteService.getRemotes, {
+    initialValue: [],
+  });
+  const [selectedRemote, setSelectedRemote] = createSignal();
+
+  createEffect(() => handleRemoteSelected(availableRemotes().shift()?.getId()));
+
  createEffect(() => {
    let url = UrlUtils.getUrl();
    url = UrlUtils.addQueryParameter(url, "id", integration()?.getId());
@ -40,7 +56,7 @@ function IntegrationView(props) {
  async function setIntegrationFromUrl() {
    let integrationId = UrlUtils.getQueryParameter("id");
    if (!integrationId) return;
-    let integration = await DeviceService.getIntegration(integrationId)
+    let integration = await DeviceService.getIntegration(integrationId);
    setIntegration(integration);
  }

@ -58,6 +74,22 @@ function IntegrationView(props) {
    setConnectionState(state);
  }

+  function handleDataChannelOpen() {
+    setInterval(() => {
+      WebRTCService.sendDataJson({ message: "ping" });
+    }, 1000);
+  }
+
+  async function handleRemoteSelected(remoteId) {
+    if (!remoteId) return;
+    let remote = await RemoteService.getRemote(remoteId);
+    setSelectedRemote(remote);
+  }
+
+  function handleRemoteButtonPressed(command) {
+    RemoteService.sendCommand(command);
+  }
+
  return (
    <div
      class={
@ -92,12 +124,30 @@ function IntegrationView(props) {
          </Show>
        </div>
      </div>
-      <div class="flex-fill d-flex flex-column justify-content-center align-items-center rounded overflow-hidden">
-        <video
-          ref={videoElement}
-          class="w-100 h-100"
-          style="background-color: #000"
-        ></video>
+      <div class="flex-fill d-flex flex-row overflow-hidden">
+        <div class="flex-fill rounded overflow-hidden">
+          <video
+            ref={videoElement}
+            class="w-100 h-100"
+            style="background-color: #000"
+          ></video>
+        </div>
+        <div class="d-flex flex-column ps-3">
+          <select
+            class="form-select mb-3"
+            onChange={(e) => handleRemoteSelected(e.target.value)}
+          >
+            {availableRemotes().map((remote, index) => (
+              <option value={remote.getId()} selected={index === 0}>
+                {remote.getTitle()}
+              </option>
+            ))}
+          </select>
+          <RemoteControl
+            onCommand={handleRemoteButtonPressed}
+            remote={selectedRemote()}
+          />
+        </div>
      </div>
    </div>
  );
Author	SHA1	Message	Date
Fritz Heiden	23245dd549	feat: add remote control to integration view	2025-04-14 23:39:34 +02:00
Fritz Heiden	b0c3a48da6	refactor: improve command constants	2025-04-14 23:38:51 +02:00
Fritz Heiden	f83ffac0ce	feat: add get remotes in web interface	2025-04-14 23:37:07 +02:00
Fritz Heiden	83ab71f845	feat: add get remote api endpoint	2025-04-14 23:34:59 +02:00
Fritz Heiden	6940782024	feat: add data channel to webrtc connection	2025-04-14 13:59:59 +02:00