homebridge-bedjet 0.2.4 → 0.2.5

package/homebridge-ui/public/index.html

@@ -55,11 +55,10 @@
     .spinner {
       width: 13px;
       height: 13px;
-      border: 2px solid rgba(255,255,255,0.15);
+      border: 2px solid rgba(128,128,128,0.3);
       border-top-color: #e25c00;
       border-radius: 50%;
       animation: spin 0.7s linear infinite;
-      flex-shrink: 0;
     }
     @keyframes spin { to { transform: rotate(360deg); } }
 
@@ -89,8 +88,8 @@
       gap: 10px;
     }
 
-    .device-info .device-name  { font-weight: 500; }
-    .device-info .device-addr  {
+    .device-name { font-weight: 500; }
+    .device-addr {
       font-size: 11px;
       opacity: 0.55;
       font-family: 'SF Mono', 'Consolas', monospace;
@@ -101,12 +100,14 @@
       display: flex;
       flex-direction: column;
       align-items: flex-end;
-      gap: 4px;
+      gap: 5px;
       flex-shrink: 0;
+      min-width: 120px;
     }
 
     .add-btn {
-      padding: 6px 15px;
+      width: 100%;
+      padding: 6px 12px;
       border: none;
       border-radius: 5px;
       font-size: 13px;
@@ -115,19 +116,18 @@
       background: #1a7a40;
       color: #fff;
       transition: opacity 0.15s;
-      white-space: nowrap;
     }
     .add-btn:hover:not(:disabled) { opacity: 0.85; }
     .add-btn:disabled { opacity: 0.55; cursor: default; }
-    .add-btn.done { background: #145c30; }
 
-    .inline-msg {
+    .card-msg {
       font-size: 11px;
-      max-width: 140px;
       text-align: right;
+      min-height: 14px;
+      width: 100%;
     }
-    .inline-msg.ok  { color: #4caf50; }
-    .inline-msg.err { color: #f28b82; }
+    .card-msg.ok  { color: #4caf50; }
+    .card-msg.err { color: #f28b82; }
 
     .notice {
       padding: 10px 13px;
@@ -157,41 +157,24 @@
   <script>
     const SCAN_MS = 12000;
     let scanning = false;
-    const addedSet = new Set();
-
-    // Safely get existing configured addresses
-    async function getExistingAddresses() {
-      try {
-        const configs = await homebridge.getPluginConfig();
-        const cfg = configs && configs[0];
-        if (cfg && Array.isArray(cfg.devices)) {
-          cfg.devices.forEach(d => { if (d.address) addedSet.add(d.address.toUpperCase()); });
-        }
-      } catch (e) { /* ignore */ }
-    }
 
-    // Run after homebridge is ready
-    if (typeof homebridge !== 'undefined') {
-      getExistingAddresses();
-    } else {
-      document.addEventListener('DOMContentLoaded', getExistingAddresses);
-    }
+    // ── 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');
+      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');
 
       btn.disabled = true;
       results.innerHTML = '';
       pFill.style.width = '0%';
       pWrap.style.display = 'block';
-      status.innerHTML = '<div class="spinner"></div> Scanning…';
+      status.innerHTML = '<div class="spinner"></div>&nbsp;Scanning…';
 
       let elapsed = 0;
       const tickMs = 200;
@@ -207,19 +190,16 @@
         pFill.style.width = '100%';
         status.innerHTML = '';
 
-        await getExistingAddresses();
-
-        const devices = (res && res.devices) ? res.devices : [];
+        const 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 connected to another app.</div>';
+          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>';
         } else {
-          results.innerHTML = devices.map(d => deviceCard(d)).join('');
+          results.innerHTML = devices.map(renderCard).join('');
         }
       } catch (err) {
         clearInterval(timer);
         status.innerHTML = '';
-        const msg = (err && err.message) ? err.message : String(err);
-        results.innerHTML = `<div class="notice error">Scan failed: ${esc(msg)}</div>`;
+        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;
@@ -227,86 +207,73 @@
       }
     }
 
-    function deviceCard(d) {
-      const already = addedSet.has(d.address.toUpperCase());
-      const id = 'btn_' + d.address.replace(/:/g, '');
-      const mid = 'msg_' + d.address.replace(/:/g, '');
-      return `
-        <div class="device-card">
-          <div class="device-info">
-            <div class="device-name">${esc(d.name)}</div>
-            <div class="device-addr">${esc(d.address)}</div>
-          </div>
-          <div class="device-right">
-            <button id="${id}" class="add-btn${already ? ' done' : ''}"
-              ${already ? 'disabled' : ''}
-              onclick="addDevice(${JSON.stringify(d.name)}, ${JSON.stringify(d.address)}, '${id}', '${mid}')">
-              ${already ? '✓ Already added' : 'Add to Config'}
-            </button>
-            <div id="${mid}" class="inline-msg"></div>
-          </div>
-        </div>`;
+    // ── Card rendering ────────────────────────────────────────────────────────
+
+    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');
     }
 
-    async function addDevice(name, address, btnId, msgId) {
-      const btn = document.getElementById(btnId);
-      const msg = document.getElementById(msgId);
+    // ── 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.
+
+    async function addDevice(name, address, safeid) {
+      const btn = document.getElementById('btn_' + safeid);
+      const msg = document.getElementById('msg_' + safeid);
 
+      // Immediate visual feedback before any async work
       btn.disabled = true;
       btn.textContent = 'Saving…';
       msg.textContent = '';
-      msg.className = 'inline-msg';
+      msg.className = 'card-msg';
 
+      let result;
       try {
-        // Get current config (returns array of platform configs)
-        let configs = [];
-        try { configs = await homebridge.getPluginConfig(); } catch (e) { configs = []; }
-
-        let cfg = (configs && configs.length > 0) ? Object.assign({}, configs[0]) : {};
-        if (!cfg.platform) cfg.platform = 'BedJetPlatform';
-        if (!Array.isArray(cfg.devices)) cfg.devices = [];
-
-        // Deduplicate
-        const already = cfg.devices.some(
-          d => d.address && d.address.toUpperCase() === address.toUpperCase()
-        );
-        if (already) {
-          btn.textContent = '✓ Already added';
-          btn.classList.add('done');
-          msg.textContent = 'Already in config';
-          msg.className = 'inline-msg ok';
-          addedSet.add(address.toUpperCase());
-          return;
-        }
-
-        cfg.devices.push({ name: name, address: address, scanTimeout: 30 });
-
-        await homebridge.updatePluginConfig([cfg]);
-        await homebridge.savePluginConfig();
-
-        addedSet.add(address.toUpperCase());
-        btn.textContent = '✓ Added';
-        btn.classList.add('done');
-        msg.textContent = 'Saved! Restart Homebridge.';
-        msg.className = 'inline-msg ok';
-
-        // Try toast as a bonus (might not be available in all versions)
-        try { homebridge.toast.success(name + ' added. Restart Homebridge to activate.', 'Saved'); } catch (e) { /* ignore */ }
-
+        result = await homebridge.request('/add-device', { name: name, address: address });
       } catch (err) {
+        // Request itself failed — show error and re-enable
         btn.disabled = false;
         btn.textContent = 'Add to Config';
-        btn.classList.remove('done');
-        const errMsg = (err && err.message) ? err.message : String(err);
-        msg.textContent = 'Error: ' + errMsg;
-        msg.className = 'inline-msg err';
+        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';
       }
     }
 
     function esc(s) {
       return String(s)
-        .replace(/&/g, '&amp;').replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;');
     }
   </script>
 </body>

package/homebridge-ui/server.js

@@ -2,20 +2,39 @@
 
 const { HomebridgePluginUiServer } = require('@homebridge/plugin-ui-utils');
 const path = require('path');
+const fs   = require('fs');
+const os   = require('os');
 
-// Resolve node-ble from the plugin root (one level up from homebridge-ui/)
+// node-ble lives one level up in the plugin's own node_modules
 const NodeBle = require(path.join(__dirname, '..', 'node_modules', 'node-ble'));
 const { createBluetooth } = NodeBle;
 
 const SCAN_DURATION_MS = 12000;
 
+// homebridge-config-ui-x sets UIX_CONFIG_PATH when spawning this child process
+function getConfigPath() {
+  if (process.env.UIX_CONFIG_PATH) return process.env.UIX_CONFIG_PATH;
+  // Common fallback locations
+  const candidates = [
+    path.join(os.homedir(), '.homebridge', 'config.json'),
+    '/var/lib/homebridge/config.json',
+  ];
+  for (const c of candidates) {
+    if (fs.existsSync(c)) return c;
+  }
+  return path.join(os.homedir(), '.homebridge', 'config.json');
+}
+
 class BedJetUiServer extends HomebridgePluginUiServer {
   constructor() {
     super();
-    this.onRequest('/scan', this.handleScan.bind(this));
+    this.onRequest('/scan',       this.handleScan.bind(this));
+    this.onRequest('/add-device', this.handleAddDevice.bind(this));
     this.ready();
   }
 
+  // ── BLE scan ────────────────────────────────────────────────────────────────
+
   async handleScan() {
     let destroy = null;
     const found = [];
@@ -25,43 +44,81 @@ class BedJetUiServer extends HomebridgePluginUiServer {
       destroy = ble.destroy;
 
       const adapter = await ble.bluetooth.defaultAdapter();
-
       const wasDiscovering = await adapter.isDiscovering();
-      if (!wasDiscovering) {
-        await adapter.startDiscovery();
-      }
+      if (!wasDiscovering) await adapter.startDiscovery();
 
-      // Scan for SCAN_DURATION_MS
       await new Promise(resolve => setTimeout(resolve, SCAN_DURATION_MS));
 
-      if (!wasDiscovering) {
-        await adapter.stopDiscovery().catch(() => {});
-      }
+      if (!wasDiscovering) await adapter.stopDiscovery().catch(() => {});
 
-      // Query all devices BlueZ discovered
       const addresses = await adapter.devices();
-
       for (const address of addresses) {
         try {
           const device = await adapter.getDevice(address);
-          const name = await device.getName().catch(() => null);
+          const name   = await device.getName().catch(() => null);
           if (name && name.toUpperCase().includes('BEDJET')) {
             found.push({ name, address });
           }
-        } catch {
-          // ignore individual device errors
-        }
+        } catch { /* skip device */ }
       }
     } catch (err) {
       throw new Error(`Bluetooth scan failed: ${err.message || err}`);
     } finally {
-      if (destroy) {
-        try { destroy(); } catch { /* ignore */ }
-      }
+      if (destroy) { try { destroy(); } catch { /* ignore */ } }
     }
 
     return { devices: found };
   }
+
+  // ── Config write ─────────────────────────────────────────────────────────────
+
+  async handleAddDevice(body) {
+    const { name, address } = body || {};
+
+    if (!name || !address) {
+      throw new Error('Missing name or address');
+    }
+
+    const configPath = getConfigPath();
+
+    let raw;
+    try {
+      raw = fs.readFileSync(configPath, 'utf8');
+    } catch (err) {
+      throw new Error(`Cannot read config file (${configPath}): ${err.message}`);
+    }
+
+    let config;
+    try {
+      config = JSON.parse(raw);
+    } catch (err) {
+      throw new Error(`Config file is not valid JSON: ${err.message}`);
+    }
+
+    if (!Array.isArray(config.platforms)) config.platforms = [];
+
+    let platform = config.platforms.find(p => p.platform === 'BedJetPlatform');
+    if (!platform) {
+      platform = { platform: 'BedJetPlatform', name: 'BedJetPlatform', devices: [] };
+      config.platforms.push(platform);
+    }
+    if (!Array.isArray(platform.devices)) platform.devices = [];
+
+    const addrUp = address.toUpperCase();
+    if (platform.devices.some(d => d.address && d.address.toUpperCase() === addrUp)) {
+      return { status: 'already_exists' };
+    }
+
+    platform.devices.push({ name, address, scanTimeout: 30 });
+
+    try {
+      fs.writeFileSync(configPath, JSON.stringify(config, null, 4), 'utf8');
+    } catch (err) {
+      throw new Error(`Cannot write config file: ${err.message}`);
+    }
+
+    return { status: 'ok' };
+  }
 }
 
 new BedJetUiServer();

package/package.json

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