@switchbot/homebridge-switchbot 5.1.0-beta.0 → 5.1.0-beta.10

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

@@ -8,111 +8,6 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/homebridge-ui/public/js/logger.ts
-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.log(PREFIX, message, ...parameters);
-      },
-      warn: (message, ...parameters) => {
-        console.warn(PREFIX, message, ...parameters);
-      },
-      error: (message, ...parameters) => {
-        console.error(PREFIX, message, ...parameters);
-      },
-      debug: (message, ...parameters) => {
-        console.debug(PREFIX, message, ...parameters);
-      }
-    };
-  }
-});
-
-// src/homebridge-ui/public/js/types.ts
-var init_types = __esm({
-  "src/homebridge-ui/public/js/types.ts"() {
-    "use strict";
-  }
-});
-
-// src/homebridge-ui/public/js/modal.ts
-function callUiMethod(name, ...args) {
-  try {
-    if (typeof homebridge?.[name] === "function") {
-      uiLog.info(`[callUiMethod] Invoking homebridge.${String(name)}()`);
-      const fn = homebridge?.[name];
-      if (typeof fn === "function") {
-        uiLog.info(`[callUiMethod] Invoking homebridge.${String(name)}()`);
-        fn.apply(homebridge, args);
-      } else {
-        uiLog.warn(`[callUiMethod] homebridge[${String(name)}] is not a function.`);
-      }
-    } else {
-      uiLog.warn(`[callUiMethod] homebridge[${String(name)}] is not a function.`);
-    }
-  } catch (e) {
-    uiLog.warn(`Homebridge UI method ${String(name)} failed:`, e);
-  }
-}
-function showBusyUi() {
-  callUiMethod("disableSaveButton");
-  callUiMethod("showSpinner");
-}
-function hideBusyUi() {
-  callUiMethod("hideSpinner");
-  callUiMethod("enableSaveButton");
-}
-var init_modal = __esm({
-  "src/homebridge-ui/public/js/modal.ts"() {
-    "use strict";
-    init_types();
-    init_logger();
-  }
-});
-
-// src/homebridge-ui/public/js/toast.ts
-function showToast(method, message, title = "SwitchBot") {
-  try {
-    const hb = typeof window !== "undefined" ? window.homebridge : void 0;
-    const toast = hb && typeof hb.toast === "object" ? hb.toast : void 0;
-    const fn = toast && typeof toast[method] === "function" ? toast[method] : void 0;
-    if (fn) {
-      try {
-        fn(message, title);
-        return;
-      } catch (err) {
-        uiLog.warn(`Toast ${method} threw:`, err);
-      }
-    }
-    uiLog.info(`[Toast:${method}] ${title} - ${message}`);
-  } catch (e) {
-    uiLog.warn(`Toast ${method} outer error:`, e);
-    uiLog.info(`[Toast:${method}] ${title} - ${message}`);
-  }
-}
-function toastSuccess(message, title) {
-  showToast("success", message, title);
-}
-function toastError(message, title) {
-  showToast("error", message, title);
-}
-function toastWarning(message, title) {
-  showToast("warning", message, title);
-}
-function toastInfo(message, title) {
-  showToast("info", message, title);
-}
-var init_toast = __esm({
-  "src/homebridge-ui/public/js/toast.ts"() {
-    "use strict";
-    init_types();
-    init_logger();
-  }
-});
-
 // src/device-types.js
 function getValidDeviceTypes() {
   const validTypes = /* @__PURE__ */ new Set();
@@ -354,6 +249,90 @@ var init_device_types = __esm({
   }
 });
 
+// src/homebridge-ui/utils/v4-detection.ts
+function isV4Config(platform) {
+  if (!platform || typeof platform !== "object") {
+    return false;
+  }
+  const hasCredentials = platform.credentials !== void 0 && typeof platform.credentials === "object";
+  const hasOptionsDevices = platform.options !== void 0 && typeof platform.options === "object" && Array.isArray(platform.options.devices);
+  return hasCredentials || hasOptionsDevices;
+}
+var init_v4_detection = __esm({
+  "src/homebridge-ui/utils/v4-detection.ts"() {
+    "use strict";
+  }
+});
+
+// src/homebridge-ui/public/js/types.ts
+var init_types = __esm({
+  "src/homebridge-ui/public/js/types.ts"() {
+    "use strict";
+  }
+});
+
+// src/homebridge-ui/public/js/logger.ts
+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.log(PREFIX, message, ...parameters);
+      },
+      warn: (message, ...parameters) => {
+        console.warn(PREFIX, message, ...parameters);
+      },
+      error: (message, ...parameters) => {
+        console.error(PREFIX, message, ...parameters);
+      },
+      debug: (message, ...parameters) => {
+        console.debug(PREFIX, message, ...parameters);
+      }
+    };
+  }
+});
+
+// src/homebridge-ui/public/js/toast.ts
+function showToast(method, message, title = "SwitchBot") {
+  try {
+    const hb = typeof window !== "undefined" ? window.homebridge : void 0;
+    const toast = hb && typeof hb.toast === "object" ? hb.toast : void 0;
+    if (toast && typeof toast[method] === "function") {
+      try {
+        toast[method](message, title);
+        return;
+      } catch (err) {
+        uiLog.warn(`Toast ${method} threw:`, err);
+      }
+    }
+    uiLog.info(`[Toast:${method}] ${title} - ${message}`);
+  } catch (e) {
+    uiLog.warn(`Toast ${method} outer error:`, e);
+    uiLog.info(`[Toast:${method}] ${title} - ${message}`);
+  }
+}
+function toastSuccess(message, title) {
+  showToast("success", message, title);
+}
+function toastError(message, title) {
+  showToast("error", message, title);
+}
+function toastWarning(message, title) {
+  showToast("warning", message, title);
+}
+function toastInfo(message, title) {
+  showToast("info", message, title);
+}
+var init_toast = __esm({
+  "src/homebridge-ui/public/js/toast.ts"() {
+    "use strict";
+    init_types();
+    init_logger();
+  }
+});
+
 // src/homebridge-ui/public/js/api.ts
 var api_exports = {};
 __export(api_exports, {
@@ -361,11 +340,13 @@ __export(api_exports, {
   addDevicesInBulk: () => addDevicesInBulk,
   deleteAllDevices: () => deleteAllDevices,
   deleteDevice: () => deleteDevice,
+  detectV4Config: () => detectV4Config,
   discoverDevices: () => discoverDevices,
   fetchBluetoothStatus: () => fetchBluetoothStatus,
   fetchCredentialStatus: () => fetchCredentialStatus,
   fetchDevices: () => fetchDevices,
-  saveCredentials: () => saveCredentials2,
+  normalizeBulkAddDevicesResponse: () => normalizeBulkAddDevicesResponse,
+  saveCredentials: () => saveCredentials,
   syncParentPluginConfigFromDisk: () => syncParentPluginConfigFromDisk,
   testDeviceConnection: () => testDeviceConnection,
   updateDevice: () => updateDevice,
@@ -388,6 +369,25 @@ async function fetchDevices() {
     return [];
   }
 }
+async function detectV4Config() {
+  try {
+    if (typeof homebridge.getPluginConfig !== "function") {
+      return false;
+    }
+    const configArr = await homebridge.getPluginConfig();
+    if (!Array.isArray(configArr)) {
+      return false;
+    }
+    const config = configArr.find(isSwitchBotPlatformConfig);
+    if (!config || typeof config !== "object") {
+      return false;
+    }
+    return isV4Config(config);
+  } catch (e) {
+    uiLog.warn("Error detecting v4 config:", e);
+    return false;
+  }
+}
 function validateAndFixDeviceTypes(devices) {
   const errors = [];
   for (const d of devices) {
@@ -457,7 +457,7 @@ async function fetchCredentialStatus() {
     return null;
   }
 }
-async function saveCredentials2(token, secret) {
+async function saveCredentials(token, secret) {
   uiLog.info("Saving credentials...");
   const resp = await homebridge.request("/credentials", { token, secret });
   uiLog.info("Save response:", resp);
@@ -563,7 +563,20 @@ async function addDevicesInBulk(devices) {
   if (!resp || resp.success === false) {
     throw new Error(resp?.data?.message || "Bulk add failed");
   }
-  return resp.data || resp;
+  return normalizeBulkAddDevicesResponse(resp);
+}
+function normalizeBulkAddDevicesResponse(resp) {
+  const payload = resp?.data && typeof resp.data === "object" ? resp.data : resp;
+  const addedCount = Number(payload?.addedCount ?? payload?.added ?? 0);
+  const skippedCount = Number(payload?.skippedCount ?? payload?.skipped ?? 0);
+  const updatedCount = Number(payload?.updatedCount ?? payload?.updated ?? 0);
+  return {
+    ...payload,
+    success: resp?.success ?? true,
+    addedCount,
+    skippedCount,
+    updatedCount
+  };
 }
 async function updateDevice(deviceId, configDeviceName, configDeviceType, options) {
   if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
@@ -657,12 +670,48 @@ var init_api = __esm({
   "src/homebridge-ui/public/js/api.ts"() {
     "use strict";
     init_device_types();
+    init_v4_detection();
     init_types();
     init_logger();
     init_toast();
   }
 });
 
+// src/homebridge-ui/public/js/modal.ts
+function callUiMethod(name, ...args) {
+  try {
+    if (typeof homebridge?.[name] === "function") {
+      uiLog.info(`[callUiMethod] Invoking homebridge.${String(name)}()`);
+      const fn = homebridge?.[name];
+      if (typeof fn === "function") {
+        uiLog.info(`[callUiMethod] Invoking homebridge.${String(name)}()`);
+        fn.apply(homebridge, args);
+      } else {
+        uiLog.warn(`[callUiMethod] homebridge[${String(name)}] is not a function.`);
+      }
+    } else {
+      uiLog.warn(`[callUiMethod] homebridge[${String(name)}] is not a function.`);
+    }
+  } catch (e) {
+    uiLog.warn(`Homebridge UI method ${String(name)} failed:`, e);
+  }
+}
+function showBusyUi() {
+  callUiMethod("disableSaveButton");
+  callUiMethod("showSpinner");
+}
+function hideBusyUi() {
+  callUiMethod("hideSpinner");
+  callUiMethod("enableSaveButton");
+}
+var init_modal = __esm({
+  "src/homebridge-ui/public/js/modal.ts"() {
+    "use strict";
+    init_types();
+    init_logger();
+  }
+});
+
 // src/homebridge-ui/public/js/discovery.ts
 var discovery_exports = {};
 __export(discovery_exports, {
@@ -963,7 +1012,6 @@ function setDiscoveryGroupExpanded(groupKey, expanded) {
 }
 async function discoverDevices2() {
   const btn = document.getElementById("discoverBtn");
-  const cancelBtn = document.getElementById("cancelDiscoverBtn");
   const status = document.getElementById("discoverStatus");
   const phaseProgress = document.getElementById("discoverPhaseProgress");
   const phaseFill = document.getElementById("discoverPhaseFill");
@@ -991,7 +1039,6 @@ async function discoverDevices2() {
   const startedAt = Date.now();
   let phaseStartedAt = startedAt;
   let phase = "Preparing discovery...";
-  let cancelled = false;
   const setPhase = (nextPhase) => {
     phase = nextPhase;
     phaseStartedAt = Date.now();
@@ -1428,31 +1475,8 @@ async function discoverDevices2() {
       devicesFoundDisplay.style.display = "none";
       devicesFoundDisplay.classList.remove("discovery-scanning-pulse");
     }
-    if (cancelBtn) {
-      cancelBtn.style.display = "inline-block";
-      cancelBtn.disabled = false;
-      cancelBtn.onclick = () => {
-        cancelled = true;
-        const totalSeconds = Math.max(0, Math.floor((Date.now() - startedAt) / 1e3));
-        status.textContent = `Discovery cancelled (${totalSeconds}s total)`;
-        if (phaseProgress) {
-          phaseProgress.style.display = "none";
-        }
-        if (devicesFoundDisplay) {
-          devicesFoundDisplay.style.display = "none";
-          devicesFoundDisplay.classList.remove("discovery-scanning-pulse");
-        }
-        cancelBtn.style.display = "none";
-        btn.disabled = false;
-        btn.textContent = "\u{1F50D} Discover Devices";
-        hideBusyUi();
-      };
-    }
     if (bleSettings.bleEnabled) {
       const bleDevicesRaw = await discoverDevices("ble", bleSettings);
-      if (cancelled) {
-        return;
-      }
       discoveredDevices = dedupeById(bleDevicesRaw);
       uiLog.info("BLE discover response:", bleDevicesRaw);
       if (devicesFoundDisplay && bleDevicesRaw.length > 0) {
@@ -1473,9 +1497,6 @@ async function discoverDevices2() {
     renderProgress();
     try {
       const openApiDevicesRaw = await discoverDevices("openapi");
-      if (cancelled) {
-        return;
-      }
       uiLog.info("OpenAPI discover response:", openApiDevicesRaw);
       discoveredDevices = mergeDiscoveredDevices(discoveredDevices, openApiDevicesRaw);
       if (devicesFoundDisplay && discoveredDevices.length > 0) {
@@ -1555,9 +1576,6 @@ async function discoverDevices2() {
     setDiscoveryCache(discoveredDevices);
     updateLastScannedStatus();
   } catch (e) {
-    if (cancelled) {
-      return;
-    }
     uiLog.error("Discovery error:", e);
     status.textContent = `Error: ${e instanceof Error ? e.message : "Discovery failed"}`;
     status.classList.add("error");
@@ -1582,11 +1600,6 @@ async function discoverDevices2() {
     }
     btn.disabled = false;
     btn.textContent = "\u{1F50D} Discover Devices";
-    if (cancelBtn) {
-      cancelBtn.disabled = false;
-      cancelBtn.style.display = "none";
-      cancelBtn.onclick = null;
-    }
   }
 }
 async function updateDiscoveryView(allDevices, preferences, groupBy, hideAdded, selectedIds) {
@@ -2714,6 +2727,21 @@ __export(render_exports, {
   setDiscoveryPreferences: () => setDiscoveryPreferences,
   sortDevices: () => sortDevices
 });
+async function copyTextWithFallback(text) {
+  try {
+    await navigator.clipboard.writeText(text);
+  } catch {
+    const textarea = document.createElement("textarea");
+    textarea.value = text;
+    textarea.setAttribute("readonly", "");
+    textarea.style.cssText = "position:fixed;left:-9999px;opacity:0;pointer-events:none";
+    document.body.appendChild(textarea);
+    textarea.select();
+    textarea.setSelectionRange(0, textarea.value.length);
+    document.execCommand("copy");
+    textarea.remove();
+  }
+}
 function getRssiSignalQuality(rssi) {
   if (!rssi || rssi === 0) {
     return {
@@ -2794,7 +2822,6 @@ function renderSignalQualityBadge(rssi) {
     border-radius: 3px;
     font-size: 10px;
     font-weight: 600;
-    margin-left: 8px;
   `;
   badge.title = quality.description;
   return badge;
@@ -3439,6 +3466,7 @@ function renderDeviceList(list) {
   }
   status.textContent = `Found ${list.length} device(s)`;
   ul.classList.add("device-grid");
+  ul.style.padding = "0";
   ul.innerHTML = "";
   if (removeAllContainer) {
     removeAllContainer.style.display = "block";
@@ -3450,6 +3478,7 @@ function renderDeviceList(list) {
     li.style.display = "flex";
     li.style.flexDirection = "column";
     li.style.alignItems = "stretch";
+    li.style.padding = "5px 8px";
     li.style.marginBottom = "0";
     const info = document.createElement("div");
     info.style.flex = "1 1 auto";
@@ -3457,13 +3486,14 @@ function renderDeviceList(list) {
     info.style.minWidth = "0";
     const nameContainer = document.createElement("div");
     nameContainer.style.display = "flex";
-    nameContainer.style.flexDirection = "column";
-    nameContainer.style.alignItems = "flex-start";
-    nameContainer.style.gap = "0";
+    nameContainer.style.alignItems = "center";
+    nameContainer.style.marginBottom = "0";
+    nameContainer.style.flexWrap = "wrap";
+    nameContainer.style.gap = "4px";
     const name = document.createElement("div");
     name.style.fontWeight = "500";
     name.style.fontSize = "13px";
-    name.textContent = d.name || d.id;
+    name.textContent = d.configDeviceName || d.name || d.id;
     const expandedDetails = document.createElement("div");
     expandedDetails.style.display = "none";
     expandedDetails.appendChild(renderDeviceDetailsPanel(d));
@@ -3481,36 +3511,23 @@ function renderDeviceList(list) {
       expandedDetails.style.display = isHidden ? "block" : "none";
       expandBtn.style.transform = isHidden ? "rotate(180deg)" : "rotate(0deg)";
     };
-    const code = document.createElement("code");
-    code.textContent = d.id;
-    code.style.fontSize = "10px";
-    code.style.opacity = "0.75";
-    code.style.marginLeft = "0";
-    code.style.whiteSpace = "normal";
-    code.style.overflowWrap = "anywhere";
-    code.style.wordBreak = "break-word";
-    code.style.maxWidth = "100%";
-    const headerRow = document.createElement("div");
-    headerRow.style.display = "inline-flex";
-    headerRow.style.alignItems = "center";
-    headerRow.style.gap = "4px";
-    headerRow.appendChild(name);
-    headerRow.appendChild(expandBtn);
-    nameContainer.appendChild(headerRow);
-    nameContainer.appendChild(code);
+    nameContainer.appendChild(name);
+    nameContainer.appendChild(expandBtn);
     if (d.rssi !== void 0 && d.rssi !== null && d.rssi !== 0) {
       nameContainer.appendChild(renderSignalBars(d.rssi));
       nameContainer.appendChild(renderSignalQualityBadge(d.rssi));
     }
     const meta = document.createElement("div");
-    meta.style.opacity = "0.75";
-    meta.style.marginTop = "0";
-    meta.style.fontSize = "11px";
-    const typeText = d.type ? `type: ${d.type}` : "";
-    const connText = d.connectionPreference ? `conn: ${d.connectionPreference}` : "";
+    meta.style.opacity = "0.7";
+    meta.style.fontSize = "10px";
+    meta.style.fontFamily = "monospace";
+    const deviceIdentifier = d.deviceId || d.id;
+    const id = `ID: ${deviceIdentifier}`;
+    const typeText = d.configDeviceType || d.type ? `Type: ${d.configDeviceType || d.type}` : "";
+    const connText = d.connectionPreference ? `Conn: ${d.connectionPreference}` : "";
     const extText = d.externalPublishProtocol && d.externalPublishProtocol !== "none" ? `external: ${d.externalPublishProtocol}` : "";
-    const roomText = d.room ? `room: ${d.room}` : "";
-    meta.textContent = [typeText, connText, extText, roomText].filter(Boolean).join(" | ");
+    const roomText = d.room ? `Room: ${d.room}` : "";
+    meta.textContent = [id, typeText, connText, extText, roomText].filter(Boolean).join(" | ");
     info.appendChild(nameContainer);
     info.appendChild(meta);
     info.appendChild(expandedDetails);
@@ -3537,7 +3554,9 @@ function renderDeviceList(list) {
     copyBtn.style.fontSize = "11px";
     copyBtn.addEventListener("click", async () => {
       try {
-        await navigator.clipboard.writeText(d.id);
+        if (deviceIdentifier) {
+          await copyTextWithFallback(deviceIdentifier);
+        }
         copyBtn.textContent = "Copied";
         copyBtn.classList.add("success");
         setTimeout(() => {
@@ -3564,8 +3583,8 @@ function renderDeviceList(list) {
     };
     buttons.appendChild(editBtn);
     buttons.appendChild(copyBtn);
-    buttons.appendChild(createConnectionTestControls(d));
     buttons.appendChild(deleteBtn);
+    buttons.appendChild(createConnectionTestControls(d));
     li.appendChild(info);
     li.appendChild(buttons);
     ul.appendChild(li);
@@ -3685,6 +3704,9 @@ var init_devices = __esm({
   }
 });
 
+// src/homebridge-ui/public/js/app.ts
+init_api();
+
 // src/homebridge-ui/public/js/credentials.ts
 init_logger();
 init_modal();
@@ -3722,7 +3744,7 @@ async function loadCredentialStatus() {
     uiLog.error("Error loading credentials:", e);
   }
 }
-async function saveCredentials() {
+async function saveCredentials2() {
   const token = document.getElementById("token")?.value;
   const secret = document.getElementById("secret")?.value;
   const saveStatus = document.getElementById("saveStatus");
@@ -3744,14 +3766,19 @@ async function saveCredentials() {
     if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
       throw new TypeError("Homebridge UI API not available");
     }
-    const configArr = await homebridge.getPluginConfig();
-    if (!Array.isArray(configArr) || configArr.length === 0) {
-      throw new Error("No plugin config found");
+    let configArr = await homebridge.getPluginConfig();
+    if (!Array.isArray(configArr)) {
+      configArr = [];
     }
-    const config = configArr[0];
+    let idx = configArr.findIndex((c) => (c.platform || c.name || "").toLowerCase() === "switchbot");
+    if (idx === -1) {
+      configArr.push({ platform: "SwitchBot" });
+      idx = configArr.length - 1;
+    }
+    const config = configArr[idx];
     config.openApiToken = token;
     config.openApiSecret = secret;
-    await homebridge.updatePluginConfig([config]);
+    await homebridge.updatePluginConfig(configArr);
     if (typeof homebridge.savePluginConfig === "function") {
       await homebridge.savePluginConfig();
     }
@@ -3781,10 +3808,42 @@ async function saveCredentials() {
 // src/homebridge-ui/public/js/app.ts
 init_devices();
 init_discovery();
+async function ensureSwitchBotConfigBlock() {
+  try {
+    if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
+      return;
+    }
+    let configArr = await homebridge.getPluginConfig();
+    if (!Array.isArray(configArr)) {
+      configArr = [];
+    }
+    const idx = configArr.findIndex((c) => (c.platform || c.name || "").toLowerCase().includes("switchbot"));
+    if (idx === -1) {
+      configArr.push({ platform: "SwitchBot" });
+      await homebridge.updatePluginConfig(configArr);
+      if (typeof homebridge.savePluginConfig === "function") {
+        await homebridge.savePluginConfig();
+      }
+    }
+  } catch (_e) {
+  }
+}
 window.loadCredentialStatus = loadCredentialStatus;
-window.saveCredentials = saveCredentials;
+window.saveCredentials = saveCredentials2;
 window.discoverDevices = discoverDevices2;
+async function checkV4Config() {
+  const banner = document.getElementById("v4ConfigWarning");
+  if (!banner) {
+    return;
+  }
+  const isV4 = await detectV4Config();
+  if (isV4) {
+    banner.style.display = "block";
+  }
+}
 async function init() {
+  await ensureSwitchBotConfigBlock();
+  await checkV4Config();
   await loadCredentialStatus();
   await initializeDiscoverySettings();
   await loadConfiguredDevices();