From 153cd47aca303c8387ea42754027a071eb1f135e Mon Sep 17 00:00:00 2001
From: Christoph Wiechert <wio@psitrax.de>
Date: Mon, 7 Aug 2023 23:39:31 +0200
Subject: [PATCH 1/2] html: use const/let; add baseURL constant

---
 html/control.html | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/html/control.html b/html/control.html
index a731801..f600870 100644
--- a/html/control.html
+++ b/html/control.html
@@ -472,9 +472,10 @@ <h1>Release</h1>
 
   <script>
   document.addEventListener('DOMContentLoaded', function (event) {
-    var streamURL = 'stream';
-    var snapshotURL = 'snapshot';
-    var webrtcURL = 'webrtc';
+    const streamURL = 'stream';
+    const snapshotURL = 'snapshot';
+    const webrtcURL = 'webrtc';
+    const baseURL = '';
 
     const header = document.getElementById('logo')
     const settings = document.getElementById('sidebar')
@@ -539,7 +540,7 @@ <h1>Release</h1>
       key = encodeURIComponent(key);
       value = encodeURIComponent(value);
 
-      return fetch(`option?device=${device}&key=${key}&value=${value}`, {
+      return fetch(`${baseURL}option?device=${device}&key=${key}&value=${value}`, {
         method: 'POST'
       }).then(function (response) {
         return response
@@ -603,7 +604,7 @@ <h1>Release</h1>
               selectEl.add(optionEl);
             }
 
-            for (var value in option.menu) {
+            for (let value in option.menu) {
               const optionEl = document.createElement("option");
               optionEl.value = value;
               optionEl.text = option.menu[value];
@@ -695,24 +696,24 @@ <h1>Release</h1>
     }
 
     const createControls = (state) => {
-      for (var device of state.devices) {
+      for (let device of state.devices) {
         const heading = insertControl("h1");
         heading.textContent = device.name;
 
-        for (var key in device.options) {
+        for (let key in device.options) {
           createDeviceOption(device, key, device.options[key]);
         }
       }
     };
 
-    var rtcPeerConfig = {
+    const rtcPeerConfig = {
       sdpSemantics: 'unified-plan'
     };
 
-    rtcPeerConnection = new RTCPeerConnection(rtcPeerConfig);
+    let rtcPeerConnection = new RTCPeerConnection(rtcPeerConfig);
 
     // read initial values
-    fetch(`status`)
+    fetch(`${baseURL}status`)
       .then(function (response) {
         return response.json()
       })
@@ -757,7 +758,7 @@ <h1>Release</h1>
         { urls: ['stun:stun.l.google.com:19302'] }
       ];
 
-      fetch(webrtcURL, {
+      fetch(baseURL + webrtcURL, {
         body: JSON.stringify({type: 'request', iceServers: iceServers}),
         headers: {'Content-Type': 'application/json'},
         method: 'POST'
@@ -780,7 +781,7 @@ <h1>Release</h1>
         });
         rtcPeerConnection.addEventListener("icecandidate", function(e) {
           if (e.candidate) {
-            return fetch(webrtcURL, {
+            return fetch(baseURL + webrtcURL, {
               body: JSON.stringify({
                 type: 'remote_candidate',
                 id: rtcPeerConnection.remote_pc_id,
@@ -800,9 +801,9 @@ <h1>Release</h1>
       }).then(function(answer) {
         return rtcPeerConnection.setLocalDescription(answer);
       }).then(function(answer) {
-        var offer = rtcPeerConnection.localDescription;
+        const offer = rtcPeerConnection.localDescription;
 
-        return fetch(webrtcURL, {
+        return fetch(baseURL + webrtcURL, {
           body: JSON.stringify({
             type: offer.type,
             id: rtcPeerConnection.remote_pc_id,

From 19c1f563e2db3bb9819f4478007bf7dd012c62c5 Mon Sep 17 00:00:00 2001
From: Christoph Wiechert <wio@psitrax.de>
Date: Mon, 7 Aug 2023 23:40:11 +0200
Subject: [PATCH 2/2] html: fix id_key [Object object]

---
 html/control.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/control.html b/html/control.html
index f600870..9ff41d9 100644
--- a/html/control.html
+++ b/html/control.html
@@ -555,7 +555,7 @@ <h1>Release</h1>
     }
 
     const createDeviceOption = (device, key, option) => {
-      const id_key = `${device}_${key}`;
+      const id_key = `${device.name}_${key}`;
       const groupEl = insertControl("div");
       groupEl.className = "input-group";