@switchbot/homebridge-switchbot 5.0.0-beta.133 → 5.0.0-beta.135

package/dist/homebridge-ui/public/js/app.js

@@ -261,19 +261,23 @@ var init_types = __esm({
 });
 
 // src/homebridge-ui/public/js/logger.ts
-var uiLog;
+var PREFIX, uiLog;
 var init_logger = __esm({
   "src/homebridge-ui/public/js/logger.ts"() {
     "use strict";
+    PREFIX = "[SwitchBot UI/html]";
     uiLog = {
       info: (message, ...parameters) => {
-        console.warn("[SwitchBot UI]", message, ...parameters);
+        console.log(PREFIX, message, ...parameters);
       },
       warn: (message, ...parameters) => {
-        console.warn("[SwitchBot UI]", message, ...parameters);
+        console.warn(PREFIX, message, ...parameters);
       },
       error: (message, ...parameters) => {
-        console.error("[SwitchBot UI]", message, ...parameters);
+        console.error(PREFIX, message, ...parameters);
+      },
+      debug: (message, ...parameters) => {
+        console.debug(PREFIX, message, ...parameters);
       }
     };
   }
@@ -443,9 +447,6 @@ async function addDevice(deviceId, name, type, options) {
   if (options?.keyId) {
     payload.keyId = options.keyId;
   }
-  if (options?.matterType !== void 0) {
-    payload.matterType = options.matterType;
-  }
   uiLog.info("Adding device to config:", payload);
   const resp = await homebridge.request("/add-device", payload);
   uiLog.info("Add device response:", resp);
@@ -462,7 +463,7 @@ async function addDevicesInBulk(devices) {
   }
   return resp.data || resp;
 }
-async function updateDevice(deviceId, configDeviceName, configDeviceType, options) {
+async function updateDevice(deviceId, configDeviceName, configDeviceType) {
   const params = { deviceId };
   if (configDeviceName) {
     params.configDeviceName = configDeviceName;
@@ -470,9 +471,6 @@ async function updateDevice(deviceId, configDeviceName, configDeviceType, option
   if (configDeviceType) {
     params.configDeviceType = configDeviceType;
   }
-  if (options?.matterType !== void 0) {
-    params.matterType = options.matterType;
-  }
   uiLog.info("[Update Device] Sending update request with params:", params);
   const resp = await homebridge.request("/update-device", params);
   uiLog.info("[Update Device] Update response:", resp);
@@ -1637,9 +1635,15 @@ async function updateDiscoveryView(allDevices, preferences, groupBy, hideAdded,
     const enableSelectedBtn = document.querySelector("button")?.parentElement?.querySelector('button[aria-label="Enable Selected"]');
     const disableSelectedBtn = document.querySelector("button")?.parentElement?.querySelector('button[aria-label="Disable Selected"]');
     const hasSelection = selectedIds.size > 0;
-    if (addSelectedBtn) addSelectedBtn.disabled = !hasSelection;
-    if (enableSelectedBtn) enableSelectedBtn.disabled = !hasSelection;
-    if (disableSelectedBtn) disableSelectedBtn.disabled = !hasSelection;
+    if (addSelectedBtn) {
+      addSelectedBtn.disabled = !hasSelection;
+    }
+    if (enableSelectedBtn) {
+      enableSelectedBtn.disabled = !hasSelection;
+    }
+    if (disableSelectedBtn) {
+      disableSelectedBtn.disabled = !hasSelection;
+    }
   }
   window.removeEventListener("discovery-selection-changed", updateBatchButtonStates);
   window.addEventListener("discovery-selection-changed", updateBatchButtonStates);
@@ -1925,6 +1929,44 @@ async function importDiscoveredDevice(device) {
       });
       typeSelect.appendChild(optgroup);
     });
+    const connectionPrefLabel = document.createElement("label");
+    connectionPrefLabel.textContent = "Connection Preference";
+    connectionPrefLabel.style.display = "block";
+    connectionPrefLabel.style.marginBottom = "6px";
+    connectionPrefLabel.style.fontWeight = "500";
+    connectionPrefLabel.style.fontSize = "12px";
+    connectionPrefLabel.style.color = "#6b7280";
+    const connectionPrefSelect = document.createElement("select");
+    connectionPrefSelect.style.width = "100%";
+    connectionPrefSelect.style.marginBottom = "12px";
+    connectionPrefSelect.style.padding = "8px 10px";
+    connectionPrefSelect.style.borderRadius = "6px";
+    connectionPrefSelect.style.fontSize = "14px";
+    connectionPrefSelect.style.boxSizing = "border-box";
+    ["auto", "ble", "openapi"].forEach((val) => {
+      const opt = document.createElement("option");
+      opt.value = val;
+      opt.text = val.charAt(0).toUpperCase() + val.slice(1);
+      opt.selected = (device.connectionPreference || "auto") === val;
+      connectionPrefSelect.appendChild(opt);
+    });
+    const roomLabel = document.createElement("label");
+    roomLabel.textContent = "Room";
+    roomLabel.style.display = "block";
+    roomLabel.style.marginBottom = "6px";
+    roomLabel.style.fontWeight = "500";
+    roomLabel.style.fontSize = "12px";
+    roomLabel.style.color = "#6b7280";
+    const roomInput = document.createElement("input");
+    roomInput.type = "text";
+    roomInput.value = device.room || "";
+    roomInput.placeholder = "Optional room/location metadata";
+    roomInput.style.width = "100%";
+    roomInput.style.marginBottom = "12px";
+    roomInput.style.padding = "8px 10px";
+    roomInput.style.borderRadius = "6px";
+    roomInput.style.fontSize = "14px";
+    roomInput.style.boxSizing = "border-box";
     const macLabel = document.createElement("label");
     macLabel.textContent = "BLE MAC Address (optional)";
     macLabel.style.display = "block";
@@ -2003,6 +2045,8 @@ async function importDiscoveredDevice(device) {
       configDeviceName: nameInput.value || device.name || device.id,
       configDeviceType: typeSelect.value || device.type,
       address: macInput.value || void 0,
+      connectionPreference: connectionPrefSelect.value || void 0,
+      room: roomInput.value || void 0,
       encryptionKey: encryptionKeyInput.value || void 0,
       keyId: keyIdInput.value || void 0
     });
@@ -2017,6 +2061,10 @@ async function importDiscoveredDevice(device) {
     contentDiv.appendChild(nameInput);
     contentDiv.appendChild(typeLabel);
     contentDiv.appendChild(typeSelect);
+    contentDiv.appendChild(connectionPrefLabel);
+    contentDiv.appendChild(connectionPrefSelect);
+    contentDiv.appendChild(roomLabel);
+    contentDiv.appendChild(roomInput);
     contentDiv.appendChild(macLabel);
     contentDiv.appendChild(macInput);
     contentDiv.appendChild(encryptionKeyLabel);
@@ -2062,57 +2110,6 @@ async function editDevice(device) {
     });
     typeSelect.appendChild(optgroup);
   });
-  const windowCoveringTypes = ["Roller Shade", "Curtain", "Curtain3", "Blind Tilt"];
-  const showMatterType = windowCoveringTypes.includes(device.configDeviceType || device.deviceType || device.type || "");
-  const matterTypeLabel = document.createElement("label");
-  matterTypeLabel.textContent = "Matter Window Covering Type (Advanced)";
-  matterTypeLabel.style.display = showMatterType ? "block" : "none";
-  matterTypeLabel.style.marginBottom = "6px";
-  matterTypeLabel.style.fontWeight = "500";
-  matterTypeLabel.style.fontSize = "12px";
-  matterTypeLabel.style.color = "#6b7280";
-  matterTypeLabel.style.marginTop = "2px";
-  const matterTypes = [
-    { value: "", label: "Auto-detect (recommended)" },
-    { value: 0, label: "Roller Shade (0)" },
-    { value: 1, label: "Roman Shade (1)" },
-    { value: 2, label: "Balloon Shade (2)" },
-    { value: 3, label: "Woven Wood (3)" },
-    { value: 4, label: "Drapery (4)" },
-    { value: 5, label: "Awning (5)" },
-    { value: 6, label: "Shutter (6)" },
-    { value: 7, label: "Tilt Blind (7)" },
-    { value: 8, label: "Blind Tilt (8)" },
-    { value: 9, label: "Projector Screen (9)" },
-    { value: 15, label: "Other (15)" }
-  ];
-  const matterTypeSelect = document.createElement("select");
-  matterTypeSelect.style.width = "100%";
-  matterTypeSelect.style.marginBottom = "12px";
-  matterTypeSelect.style.padding = "8px 10px";
-  matterTypeSelect.style.borderRadius = "6px";
-  matterTypeSelect.style.fontSize = "14px";
-  matterTypeSelect.style.boxSizing = "border-box";
-  matterTypes.forEach((opt) => {
-    const option = document.createElement("option");
-    option.value = String(opt.value);
-    option.textContent = opt.label;
-    if (device.matterType != null && String(opt.value) === String(device.matterType)) {
-      option.selected = true;
-    }
-    matterTypeSelect.appendChild(option);
-  });
-  function updateMatterTypeVisibility() {
-    if (windowCoveringTypes.includes(typeSelect.value)) {
-      matterTypeLabel.style.display = "block";
-      matterTypeSelect.style.display = "block";
-    } else {
-      matterTypeLabel.style.display = "none";
-      matterTypeSelect.style.display = "none";
-    }
-  }
-  typeSelect.addEventListener("change", updateMatterTypeVisibility);
-  updateMatterTypeVisibility();
   const div = document.createElement("div");
   div.style.position = "fixed";
   div.style.top = "0";
@@ -2195,6 +2192,78 @@ async function editDevice(device) {
     });
     typeSelect.appendChild(optgroup);
   });
+  const connectionPrefLabel = document.createElement("label");
+  connectionPrefLabel.textContent = "Connection Preference";
+  connectionPrefLabel.style.display = "block";
+  connectionPrefLabel.style.marginBottom = "6px";
+  connectionPrefLabel.style.fontWeight = "500";
+  connectionPrefLabel.style.fontSize = "12px";
+  connectionPrefLabel.style.color = "#6b7280";
+  const connectionPrefSelect = document.createElement("select");
+  connectionPrefSelect.style.width = "100%";
+  connectionPrefSelect.style.marginBottom = "12px";
+  connectionPrefSelect.style.padding = "8px 10px";
+  connectionPrefSelect.style.borderRadius = "6px";
+  connectionPrefSelect.style.fontSize = "14px";
+  connectionPrefSelect.style.boxSizing = "border-box";
+  ["auto", "ble", "openapi"].forEach((val) => {
+    const opt = document.createElement("option");
+    opt.value = val;
+    opt.text = val.charAt(0).toUpperCase() + val.slice(1);
+    opt.selected = (device.connectionPreference || "auto") === val;
+    connectionPrefSelect.appendChild(opt);
+  });
+  const roomLabel = document.createElement("label");
+  roomLabel.textContent = "Room";
+  roomLabel.style.display = "block";
+  roomLabel.style.marginBottom = "6px";
+  roomLabel.style.fontWeight = "500";
+  roomLabel.style.fontSize = "12px";
+  roomLabel.style.color = "#6b7280";
+  const roomInput = document.createElement("input");
+  roomInput.type = "text";
+  roomInput.value = device.room || "";
+  roomInput.placeholder = "Optional room/location metadata";
+  roomInput.style.width = "100%";
+  roomInput.style.marginBottom = "12px";
+  roomInput.style.padding = "8px 10px";
+  roomInput.style.borderRadius = "6px";
+  roomInput.style.fontSize = "14px";
+  roomInput.style.boxSizing = "border-box";
+  const encryptionKeyLabel = document.createElement("label");
+  encryptionKeyLabel.textContent = "BLE Encryption Key (optional)";
+  encryptionKeyLabel.style.display = "block";
+  encryptionKeyLabel.style.marginBottom = "6px";
+  encryptionKeyLabel.style.fontWeight = "500";
+  encryptionKeyLabel.style.fontSize = "12px";
+  encryptionKeyLabel.style.color = "#6b7280";
+  const encryptionKeyInput = document.createElement("input");
+  encryptionKeyInput.type = "password";
+  encryptionKeyInput.value = device.encryptionKey || "";
+  encryptionKeyInput.placeholder = "Paste device BLE encryption key";
+  encryptionKeyInput.style.width = "100%";
+  encryptionKeyInput.style.marginBottom = "12px";
+  encryptionKeyInput.style.padding = "8px 10px";
+  encryptionKeyInput.style.borderRadius = "6px";
+  encryptionKeyInput.style.fontSize = "14px";
+  encryptionKeyInput.style.boxSizing = "border-box";
+  const keyIdLabel = document.createElement("label");
+  keyIdLabel.textContent = "BLE Key ID (optional)";
+  keyIdLabel.style.display = "block";
+  keyIdLabel.style.marginBottom = "6px";
+  keyIdLabel.style.fontWeight = "500";
+  keyIdLabel.style.fontSize = "12px";
+  keyIdLabel.style.color = "#6b7280";
+  const keyIdInput = document.createElement("input");
+  keyIdInput.type = "text";
+  keyIdInput.value = device.keyId || "";
+  keyIdInput.placeholder = "e.g. ff";
+  keyIdInput.style.width = "100%";
+  keyIdInput.style.marginBottom = "12px";
+  keyIdInput.style.padding = "8px 10px";
+  keyIdInput.style.borderRadius = "6px";
+  keyIdInput.style.fontSize = "14px";
+  keyIdInput.style.boxSizing = "border-box";
   const errorMessage = document.createElement("div");
   errorMessage.style.color = "var(--switchbot-red, #ef4444)";
   errorMessage.style.marginBottom = "12px";
@@ -2231,9 +2300,29 @@ async function editDevice(device) {
         deviceId: device.id,
         configDeviceName: nameInput.value || void 0,
         configDeviceType: typeSelect.value,
-        matterType: windowCoveringTypes.includes(typeSelect.value) && matterTypeSelect.value !== "" ? Number(matterTypeSelect.value) : void 0
+        connectionPreference: connectionPrefSelect.value,
+        room: roomInput.value || void 0,
+        encryptionKey: encryptionKeyInput.value || void 0,
+        keyId: keyIdInput.value || void 0
       };
-      await updateDevice2(params.deviceId, params.configDeviceName, params.configDeviceType, { matterType: params.matterType });
+      const options = {};
+      if (params.connectionPreference !== void 0) {
+        options.connectionPreference = params.connectionPreference;
+      }
+      if (params.room !== void 0) {
+        options.room = params.room;
+      }
+      if (params.encryptionKey !== void 0) {
+        options.encryptionKey = params.encryptionKey;
+      }
+      if (params.keyId !== void 0) {
+        options.keyId = params.keyId;
+      }
+      await updateDevice2(
+        params.deviceId,
+        params.configDeviceName,
+        params.configDeviceType
+      );
       await syncParentPluginConfigFromDisk2();
       uiLog.info("[Edit Device] Refreshing device list after update");
       const list = await fetchDevices2();
@@ -2253,8 +2342,14 @@ async function editDevice(device) {
   contentDiv.appendChild(apiTypeInput);
   contentDiv.appendChild(typeLabel);
   contentDiv.appendChild(typeSelect);
-  contentDiv.appendChild(matterTypeLabel);
-  contentDiv.appendChild(matterTypeSelect);
+  contentDiv.appendChild(connectionPrefLabel);
+  contentDiv.appendChild(connectionPrefSelect);
+  contentDiv.appendChild(roomLabel);
+  contentDiv.appendChild(roomInput);
+  contentDiv.appendChild(encryptionKeyLabel);
+  contentDiv.appendChild(encryptionKeyInput);
+  contentDiv.appendChild(keyIdLabel);
+  contentDiv.appendChild(keyIdInput);
   contentDiv.appendChild(errorMessage);
   contentDiv.appendChild(buttons);
   modal.appendChild(title);
@@ -2704,18 +2799,22 @@ function renderDeviceDetailsPanel(device) {
   let batteryHistory = [];
   try {
     const raw = localStorage.getItem(batteryHistoryKey);
-    if (raw) batteryHistory = JSON.parse(raw);
-  } catch {
+    if (raw) {
+      batteryHistory = JSON.parse(raw);
+    }
+  } catch (e) {
   }
   const now = Date.now();
   if (typeof device?.battery === "number") {
-    const last = batteryHistory[batteryHistory.length - 1];
+    const last = batteryHistory.at(-1);
     if (!last || last.value !== device.battery || now - last.ts > 60 * 60 * 1e3) {
       batteryHistory.push({ value: device.battery, ts: now });
-      if (batteryHistory.length > 30) batteryHistory = batteryHistory.slice(-30);
+      if (batteryHistory.length > 30) {
+        batteryHistory = batteryHistory.slice(-30);
+      }
       try {
         localStorage.setItem(batteryHistoryKey, JSON.stringify(batteryHistory));
-      } catch {
+      } catch (e) {
       }
     }
   }
@@ -2792,7 +2891,9 @@ function renderDeviceDetailsPanel(device) {
       chart.style.width = "100%";
       chart.style.height = "28px";
       chart.style.display = "flex";
-      const w = 120, h = 24, pad = 2;
+      const w = 120;
+      const h = 24;
+      const pad = 2;
       const min = Math.min(...batteryHistory.map((b) => b.value), 100);
       const max = Math.max(...batteryHistory.map((b) => b.value), 0);
       const range = max - min || 1;
@@ -2864,7 +2965,7 @@ function renderDeviceDetailsPanel(device) {
     "capabilities",
     "state"
   ];
-  const shown = new Set(rows.map((r) => r.label.toLowerCase().replace(/\s/g, "")));
+  const shown = new Set(rows.map((r) => r.label.toLowerCase().replace(SPACES_REGEX, "")));
   for (const key of featureKeys) {
     if (device && device[key] !== void 0 && !shown.has(key.toLowerCase())) {
       const line = document.createElement("div");
@@ -2876,7 +2977,7 @@ function renderDeviceDetailsPanel(device) {
       const label = document.createElement("span");
       label.style.fontWeight = "600";
       label.style.minWidth = "110px";
-      label.textContent = key.replace(/([A-Z])/g, " $1").replace(/^./, (s) => s.toUpperCase()) + ":";
+      label.textContent = `${key.replace(CAMELCASE_REGEX, " $1").replace(FIRST_CHAR_REGEX, (s) => s.toUpperCase())}:`;
       const value = document.createElement("span");
       value.style.fontFamily = "monospace";
       value.style.fontSize = "11px";
@@ -2956,14 +3057,16 @@ async function renderDiscoveredDevices(devices, options = {}) {
       nameContainer.appendChild(fwBadge);
     }
     let offline = false;
-    let lastSeen = d.lastSeen || d.lastseen || d.updatedAt;
+    const lastSeen = d.lastSeen || d.lastseen || d.updatedAt;
     if (typeof d.offline === "boolean") {
       offline = d.offline;
     } else if (lastSeen) {
       try {
         const last = new Date(lastSeen).getTime();
-        if (!isNaN(last) && Date.now() - last > 1e3 * 60 * 60) {
-          offline = true;
+        if (!Number.isNaN(last)) {
+          if (Date.now() - last > 1e3 * 60 * 60) {
+            offline = true;
+          }
         }
       } catch {
       }
@@ -3153,11 +3256,11 @@ function sortDevices(devices, sortBy = "name") {
     }
     case "connection": {
       const connectionOrder = {
-        "Both": 0,
-        "BLE": 1,
-        "OpenAPI": 2,
-        "API": 2,
-        "Unknown": 3
+        Both: 0,
+        BLE: 1,
+        OpenAPI: 2,
+        API: 2,
+        Unknown: 3
       };
       sorted.sort((a, b) => {
         const aOrder = connectionOrder[a.connectionType || "Unknown"] ?? 3;
@@ -3316,7 +3419,12 @@ function renderDeviceList(list) {
           copyBtn.classList.remove("success");
         }, 1200);
       } catch (e) {
-        alert("Failed to copy");
+        copyBtn.textContent = "Failed";
+        copyBtn.classList.add("error");
+        setTimeout(() => {
+          copyBtn.textContent = "Copy ID";
+          copyBtn.classList.remove("error");
+        }, 1200);
       }
     });
     const deleteBtn = document.createElement("button");
@@ -3337,9 +3445,13 @@ function renderDeviceList(list) {
     ul.appendChild(li);
   }
 }
+var SPACES_REGEX, CAMELCASE_REGEX, FIRST_CHAR_REGEX;
 var init_render = __esm({
   "src/homebridge-ui/public/js/render.ts"() {
     "use strict";
+    SPACES_REGEX = /\s/g;
+    CAMELCASE_REGEX = /([A-Z])/g;
+    FIRST_CHAR_REGEX = /^./;
   }
 });
 
@@ -3365,8 +3477,7 @@ async function addDeviceToConfig2(device, options = {}) {
       model: device.model,
       rssi: device.rssi,
       encryptionKey: importValues.encryptionKey,
-      keyId: importValues.keyId,
-      matterType: importValues.matterType
+      keyId: importValues.keyId
     });
     uiLog.info("Add device response:", resp);
     if (!resp || resp.success === false) {
@@ -3510,7 +3621,7 @@ async function saveCredentials2() {
     ;
     document.getElementById("token").value = "";
     document.getElementById("secret").value = "";
-    setTimeout(() => loadCredentialStatus(), 500);
+    setTimeout(loadCredentialStatus, 500);
     setTimeout(() => {
       saveStatus.textContent = "";
       saveStatus.classList.remove("success-msg");
@@ -3536,7 +3647,7 @@ window.discoverDevices = discoverDevices2;
 async function init() {
   await loadCredentialStatus();
   await initializeDiscoverySettings();
-  const list = await loadConfiguredDevices();
+  await loadConfiguredDevices();
   await initRemoveAllButton();
 }
 if (document.readyState === "loading") {