homebridge-bedjet 0.2.5 → 0.2.6

package/homebridge-ui/public/index.html

@@ -144,7 +144,7 @@
   <h6>Bluetooth Discovery</h6>
 
   <div class="scan-row">
-    <button id="scanBtn" onclick="startScan()">Scan for BedJets</button>
+    <button id="scanBtn">Scan for BedJets</button>
     <div id="scanStatus"></div>
   </div>
 
@@ -155,44 +155,57 @@
   <div id="results"></div>
 
   <script>
-    const SCAN_MS = 12000;
-    let scanning = false;
+    var SCAN_MS = 12000;
+    var scanning = false;
 
-    // ── Scan ─────────────────────────────────────────────────────────────────
+    // ── Wire up buttons via addEventListener, never inline onclick ────────────
+
+    document.getElementById('scanBtn').addEventListener('click', startScan);
+
+    // Event delegation for dynamically created Add buttons
+    document.getElementById('results').addEventListener('click', function (e) {
+      var btn = e.target;
+      if (!btn.classList.contains('add-btn') || btn.disabled) return;
+      var name    = btn.getAttribute('data-name');
+      var address = btn.getAttribute('data-address');
+      addDevice(btn, name, address);
+    });
+
+    // ── Scan ──────────────────────────────────────────────────────────────────
 
     async function startScan() {
       if (scanning) return;
       scanning = true;
 
-      const btn     = document.getElementById('scanBtn');
-      const status  = document.getElementById('scanStatus');
-      const pWrap   = document.getElementById('progressWrap');
-      const pFill   = document.getElementById('progressFill');
-      const results = document.getElementById('results');
+      var scanBtn  = document.getElementById('scanBtn');
+      var status   = document.getElementById('scanStatus');
+      var pWrap    = document.getElementById('progressWrap');
+      var pFill    = document.getElementById('progressFill');
+      var results  = document.getElementById('results');
 
-      btn.disabled = true;
+      scanBtn.disabled = true;
       results.innerHTML = '';
       pFill.style.width = '0%';
       pWrap.style.display = 'block';
       status.innerHTML = '<div class="spinner"></div>&nbsp;Scanning…';
 
-      let elapsed = 0;
-      const tickMs = 200;
-      const timer = setInterval(() => {
+      var elapsed = 0;
+      var tickMs  = 200;
+      var timer = setInterval(function () {
         elapsed += tickMs;
         pFill.style.width = Math.min(100, (elapsed / SCAN_MS) * 100) + '%';
         if (elapsed >= SCAN_MS) clearInterval(timer);
       }, tickMs);
 
       try {
-        const res = await homebridge.request('/scan');
+        var res = await homebridge.request('/scan');
         clearInterval(timer);
         pFill.style.width = '100%';
         status.innerHTML = '';
 
-        const devices = (res && Array.isArray(res.devices)) ? res.devices : [];
+        var devices = (res && Array.isArray(res.devices)) ? res.devices : [];
         if (devices.length === 0) {
-          results.innerHTML = '<div class="notice">No BedJet devices found. Make sure your BedJet is powered on and not already connected to another app, then try again.</div>';
+          results.innerHTML = '<div class="notice">No BedJet devices found nearby. Make sure your BedJet is powered on and not connected to another app, then try again.</div>';
         } else {
           results.innerHTML = devices.map(renderCard).join('');
         }
@@ -201,70 +214,81 @@
         status.innerHTML = '';
         results.innerHTML = '<div class="notice error">Scan failed: ' + esc(err && err.message ? err.message : String(err)) + '</div>';
       } finally {
-        setTimeout(() => { pWrap.style.display = 'none'; pFill.style.width = '0%'; }, 500);
-        btn.disabled = false;
+        setTimeout(function () { pWrap.style.display = 'none'; pFill.style.width = '0%'; }, 500);
+        scanBtn.disabled = false;
         scanning = false;
       }
     }
 
-    // ── Card rendering ────────────────────────────────────────────────────────
+    // ── Card ──────────────────────────────────────────────────────────────────
+    // Device name/address stored in data-* attributes — no inline JS strings
 
     function renderCard(d) {
-      // Use address as a safe DOM-id suffix
-      const safeid = d.address.replace(/[^a-zA-Z0-9]/g, '_');
-      return [
-        '<div class="device-card">',
-        '  <div>',
-        '    <div class="device-name">' + esc(d.name) + '</div>',
-        '    <div class="device-addr">' + esc(d.address) + '</div>',
-        '  </div>',
-        '  <div class="device-right">',
-        '    <button class="add-btn" id="btn_' + safeid + '"',
-        '      onclick="addDevice(' + JSON.stringify(d.name) + ',' + JSON.stringify(d.address) + ',' + JSON.stringify(safeid) + ')">',
-        '      Add to Config',
-        '    </button>',
-        '    <div class="card-msg" id="msg_' + safeid + '"></div>',
-        '  </div>',
-        '</div>',
-      ].join('\n');
+      var card = document.createElement('div');
+      card.className = 'device-card';
+
+      var info = document.createElement('div');
+
+      var nameEl = document.createElement('div');
+      nameEl.className = 'device-name';
+      nameEl.textContent = d.name;
+
+      var addrEl = document.createElement('div');
+      addrEl.className = 'device-addr';
+      addrEl.textContent = d.address;
+
+      info.appendChild(nameEl);
+      info.appendChild(addrEl);
+
+      var right = document.createElement('div');
+      right.className = 'device-right';
+
+      var btn = document.createElement('button');
+      btn.className = 'add-btn';
+      btn.textContent = 'Add to Config';
+      btn.setAttribute('data-name',    d.name);
+      btn.setAttribute('data-address', d.address);
+
+      var msgEl = document.createElement('div');
+      msgEl.className = 'card-msg';
+
+      right.appendChild(btn);
+      right.appendChild(msgEl);
+      card.appendChild(info);
+      card.appendChild(right);
+
+      // Store msgEl reference on btn for easy access in handler
+      btn._msgEl = msgEl;
+
+      return card.outerHTML;
     }
 
-    // ── Add device via server endpoint ────────────────────────────────────────
-    // Uses homebridge.request() — same path as the scan, which we know works.
-    // The server reads/writes config.json directly; no client-side config APIs needed.
+    // ── Add device ─────────────────────────────────────────────────────────────
 
-    async function addDevice(name, address, safeid) {
-      const btn = document.getElementById('btn_' + safeid);
-      const msg = document.getElementById('msg_' + safeid);
+    async function addDevice(btn, name, address) {
+      // Find the sibling message element
+      var msg = btn.parentElement ? btn.parentElement.querySelector('.card-msg') : null;
 
-      // Immediate visual feedback before any async work
       btn.disabled = true;
       btn.textContent = 'Saving…';
-      msg.textContent = '';
-      msg.className = 'card-msg';
+      if (msg) { msg.textContent = ''; msg.className = 'card-msg'; }
 
-      let result;
       try {
-        result = await homebridge.request('/add-device', { name: name, address: address });
+        var result = await homebridge.request('/add-device', { name: name, address: address });
+
+        if (result && result.status === 'already_exists') {
+          btn.textContent = '✓ Already added';
+          if (msg) { msg.textContent = 'Already in config.'; msg.className = 'card-msg ok'; }
+        } else {
+          btn.textContent = '✓ Added!';
+          btn.style.background = '#145c30';
+          if (msg) { msg.textContent = 'Saved — restart Homebridge.'; msg.className = 'card-msg ok'; }
+        }
       } catch (err) {
-        // Request itself failed — show error and re-enable
         btn.disabled = false;
         btn.textContent = 'Add to Config';
-        msg.textContent = 'Error: ' + esc(err && err.message ? err.message : String(err));
-        msg.className = 'card-msg err';
-        return;
-      }
-
-      // Request succeeded
-      if (result && result.status === 'already_exists') {
-        btn.textContent = '✓ Already in config';
-        msg.textContent = 'Restart Homebridge to see it.';
-        msg.className = 'card-msg ok';
-      } else {
-        btn.textContent = '✓ Added!';
-        btn.style.background = '#145c30';
-        msg.textContent = 'Saved. Restart Homebridge.';
-        msg.className = 'card-msg ok';
+        var errMsg = err && err.message ? err.message : String(err);
+        if (msg) { msg.textContent = 'Error: ' + errMsg; msg.className = 'card-msg err'; }
       }
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-bedjet",
   "displayName": "BedJet",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Homebridge plugin for BedJet V3 via Bluetooth LE",
   "license": "MIT",
   "main": "dist/index.js",