@switchbot/homebridge-switchbot 5.1.0-beta.9 → 5.1.1

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

@@ -1,14 +1,123 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// src/device-types.js
+// 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;
+    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/device-types.ts
 function getValidDeviceTypes() {
   const validTypes = /* @__PURE__ */ new Set();
   for (const category of Object.values(DEVICE_TYPES)) {
@@ -43,7 +152,7 @@ function isValidDeviceType(deviceType) {
 }
 var DEVICE_TYPES, DEVICE_TYPE_NORMALIZATION_MAP;
 var init_device_types = __esm({
-  "src/device-types.js"() {
+  "src/device-types.ts"() {
     "use strict";
     DEVICE_TYPES = {
       "Window Coverings": ["Blind Tilt", "Curtain", "Curtain3", "Roller Shade"],
@@ -232,7 +341,17 @@ var init_device_types = __esm({
       "lock touch": "Keypad Touch",
       // Invalid type
       // Additional normalization for new/unknown types from logs
-      "woplugus": "Plug Mini (US)"
+      "woplugus": "Plug Mini (US)",
+      // Product-specific identities reported by node-switchbot 5 (pySwitchbot 3.0.0 parity)
+      "woplugjp": "Plug Mini (JP)",
+      "wocurtain3": "Curtain3",
+      "wometerplus": "Meter Plus",
+      "wothpc": "Meter Pro (CO2)",
+      "woceilingpro": "Ceiling Light Pro",
+      "wolinkmini": "Hub Mini",
+      "woiosensorth": "WoIOSensor",
+      "outdoor meter": "WoIOSensor",
+      "indoor/outdoor thermo-hygrometer": "WoIOSensor"
       // Removed duplicate keys below, only last occurrence kept
       // 'plug mini us': 'plug mini (us)', // duplicate, removed
       // 'plug us': 'plug mini (us)', // duplicate, removed
@@ -249,90 +368,6 @@ 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, {
@@ -340,13 +375,12 @@ __export(api_exports, {
   addDevicesInBulk: () => addDevicesInBulk,
   deleteAllDevices: () => deleteAllDevices,
   deleteDevice: () => deleteDevice,
-  detectV4Config: () => detectV4Config,
   discoverDevices: () => discoverDevices,
   fetchBluetoothStatus: () => fetchBluetoothStatus,
   fetchCredentialStatus: () => fetchCredentialStatus,
   fetchDevices: () => fetchDevices,
   normalizeBulkAddDevicesResponse: () => normalizeBulkAddDevicesResponse,
-  saveCredentials: () => saveCredentials,
+  saveCredentials: () => saveCredentials2,
   syncParentPluginConfigFromDisk: () => syncParentPluginConfigFromDisk,
   testDeviceConnection: () => testDeviceConnection,
   updateDevice: () => updateDevice,
@@ -369,25 +403,6 @@ 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 +472,7 @@ async function fetchCredentialStatus() {
     return null;
   }
 }
-async function saveCredentials(token, secret) {
+async function saveCredentials2(token, secret) {
   uiLog.info("Saving credentials...");
   const resp = await homebridge.request("/credentials", { token, secret });
   uiLog.info("Save response:", resp);
@@ -532,24 +547,6 @@ async function addDevice(deviceId, name, type, options) {
   if (options?.keyId) {
     newDevice.keyId = options.keyId;
   }
-  if (options?.connectionPreference) {
-    newDevice.connectionPreference = options.connectionPreference;
-  }
-  if (options?.externalPublishProtocol) {
-    newDevice.externalPublishProtocol = options.externalPublishProtocol;
-  }
-  if (options?.room) {
-    newDevice.room = options.room;
-  }
-  if (typeof options?.refreshRate === "number" && Number.isFinite(options.refreshRate)) {
-    newDevice.refreshRate = options.refreshRate;
-  }
-  if (typeof options?.blePollingEnabled === "boolean") {
-    newDevice.blePollingEnabled = options.blePollingEnabled;
-  }
-  if (typeof options?.blePollIntervalMs === "number" && Number.isFinite(options.blePollIntervalMs)) {
-    newDevice.blePollIntervalMs = options.blePollIntervalMs;
-  }
   config.devices.push(newDevice);
   await homebridge.updatePluginConfig(configArr);
   if (typeof homebridge.savePluginConfig === "function") {
@@ -670,48 +667,12 @@ 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, {
@@ -1923,27 +1884,6 @@ async function importDiscoveredDevice(device) {
       opt.selected = (device.connectionPreference || "auto") === val;
       connectionPrefSelect.appendChild(opt);
     });
-    const externalPublishLabel = document.createElement("label");
-    externalPublishLabel.textContent = "Publish as External Device";
-    externalPublishLabel.style.display = "block";
-    externalPublishLabel.style.marginBottom = "6px";
-    externalPublishLabel.style.fontWeight = "500";
-    externalPublishLabel.style.fontSize = "12px";
-    externalPublishLabel.style.color = "#6b7280";
-    const externalPublishSelect = document.createElement("select");
-    externalPublishSelect.style.width = "100%";
-    externalPublishSelect.style.marginBottom = "12px";
-    externalPublishSelect.style.padding = "8px 10px";
-    externalPublishSelect.style.borderRadius = "6px";
-    externalPublishSelect.style.fontSize = "14px";
-    externalPublishSelect.style.boxSizing = "border-box";
-    ["none", "hap", "matter"].forEach((val) => {
-      const opt = document.createElement("option");
-      opt.value = val;
-      opt.text = val === "none" ? "None" : val.toUpperCase();
-      opt.selected = (device.externalPublishProtocol || "none") === val;
-      externalPublishSelect.appendChild(opt);
-    });
     const roomLabel = document.createElement("label");
     roomLabel.textContent = "Room";
     roomLabel.style.display = "block";
@@ -2075,7 +2015,6 @@ async function importDiscoveredDevice(device) {
         configDeviceType: typeSelect.value || device.type,
         address: macInput.value || void 0,
         connectionPreference: connectionPrefSelect.value || void 0,
-        externalPublishProtocol: externalPublishSelect.value || "none",
         room: roomInput.value || void 0,
         encryptionKey: encryptionKeyInput.value || void 0,
         keyId: keyIdInput.value || void 0,
@@ -2097,8 +2036,6 @@ async function importDiscoveredDevice(device) {
     contentDiv.appendChild(typeSelect);
     contentDiv.appendChild(connectionPrefLabel);
     contentDiv.appendChild(connectionPrefSelect);
-    contentDiv.appendChild(externalPublishLabel);
-    contentDiv.appendChild(externalPublishSelect);
     contentDiv.appendChild(roomLabel);
     contentDiv.appendChild(roomInput);
     contentDiv.appendChild(macLabel);
@@ -2304,27 +2241,6 @@ async function editDevice(device) {
     opt.selected = (device.connectionPreference || "auto") === val;
     connectionPrefSelect.appendChild(opt);
   });
-  const externalPublishLabel = document.createElement("label");
-  externalPublishLabel.textContent = "Publish as External Device";
-  externalPublishLabel.style.display = "block";
-  externalPublishLabel.style.marginBottom = "6px";
-  externalPublishLabel.style.fontWeight = "500";
-  externalPublishLabel.style.fontSize = "12px";
-  externalPublishLabel.style.color = "#6b7280";
-  const externalPublishSelect = document.createElement("select");
-  externalPublishSelect.style.width = "100%";
-  externalPublishSelect.style.marginBottom = "12px";
-  externalPublishSelect.style.padding = "8px 10px";
-  externalPublishSelect.style.borderRadius = "6px";
-  externalPublishSelect.style.fontSize = "14px";
-  externalPublishSelect.style.boxSizing = "border-box";
-  ["none", "hap", "matter"].forEach((val) => {
-    const opt = document.createElement("option");
-    opt.value = val;
-    opt.text = val === "none" ? "None" : val.toUpperCase();
-    opt.selected = (device.externalPublishProtocol || "none") === val;
-    externalPublishSelect.appendChild(opt);
-  });
   const roomLabel = document.createElement("label");
   roomLabel.textContent = "Room";
   roomLabel.style.display = "block";
@@ -2413,7 +2329,6 @@ async function editDevice(device) {
         configDeviceName: nameInput.value || void 0,
         configDeviceType: typeSelect.value,
         connectionPreference: connectionPrefSelect.value,
-        externalPublishProtocol: externalPublishSelect.value,
         room: roomInput.value || void 0,
         encryptionKey: encryptionKeyInput.value || void 0,
         keyId: keyIdInput.value || void 0,
@@ -2428,9 +2343,6 @@ async function editDevice(device) {
       if (params.room !== void 0) {
         options.room = params.room;
       }
-      if (params.externalPublishProtocol !== void 0) {
-        options.externalPublishProtocol = params.externalPublishProtocol;
-      }
       if (params.encryptionKey !== void 0) {
         options.encryptionKey = params.encryptionKey;
       }
@@ -2475,8 +2387,6 @@ async function editDevice(device) {
   contentDiv.appendChild(typeSelect);
   contentDiv.appendChild(connectionPrefLabel);
   contentDiv.appendChild(connectionPrefSelect);
-  contentDiv.appendChild(externalPublishLabel);
-  contentDiv.appendChild(externalPublishSelect);
   contentDiv.appendChild(roomLabel);
   contentDiv.appendChild(roomInput);
   contentDiv.appendChild(encryptionKeyLabel);
@@ -3525,9 +3435,8 @@ function renderDeviceList(list) {
     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 = [id, typeText, connText, extText, roomText].filter(Boolean).join(" | ");
+    meta.textContent = [id, typeText, connText, roomText].filter(Boolean).join(" | ");
     info.appendChild(nameContainer);
     info.appendChild(meta);
     info.appendChild(expandedDetails);
@@ -3626,14 +3535,8 @@ async function addDeviceToConfig2(device, options = {}) {
       address: importValues.address,
       model: device.model,
       rssi: device.rssi,
-      connectionPreference: importValues.connectionPreference,
-      externalPublishProtocol: importValues.externalPublishProtocol,
-      room: importValues.room,
       encryptionKey: importValues.encryptionKey,
-      keyId: importValues.keyId,
-      refreshRate: importValues.refreshRate,
-      blePollingEnabled: importValues.blePollingEnabled,
-      blePollIntervalMs: importValues.blePollIntervalMs
+      keyId: importValues.keyId
     });
     uiLog.info("Add device response:", resp);
     const alreadyExists = !!resp?.alreadyExists;
@@ -3704,9 +3607,6 @@ var init_devices = __esm({
   }
 });
 
-// src/homebridge-ui/public/js/app.ts
-init_api();
-
 // src/homebridge-ui/public/js/credentials.ts
 init_logger();
 init_modal();
@@ -3744,7 +3644,7 @@ async function loadCredentialStatus() {
     uiLog.error("Error loading credentials:", e);
   }
 }
-async function saveCredentials2() {
+async function saveCredentials() {
   const token = document.getElementById("token")?.value;
   const secret = document.getElementById("secret")?.value;
   const saveStatus = document.getElementById("saveStatus");
@@ -3766,19 +3666,14 @@ async function saveCredentials2() {
     if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
       throw new TypeError("Homebridge UI API not available");
     }
-    let configArr = await homebridge.getPluginConfig();
-    if (!Array.isArray(configArr)) {
-      configArr = [];
-    }
-    let idx = configArr.findIndex((c) => (c.platform || c.name || "").toLowerCase() === "switchbot");
-    if (idx === -1) {
-      configArr.push({ platform: "SwitchBot" });
-      idx = configArr.length - 1;
+    const configArr = await homebridge.getPluginConfig();
+    if (!Array.isArray(configArr) || configArr.length === 0) {
+      throw new Error("No plugin config found");
     }
-    const config = configArr[idx];
+    const config = configArr[0];
     config.openApiToken = token;
     config.openApiSecret = secret;
-    await homebridge.updatePluginConfig(configArr);
+    await homebridge.updatePluginConfig([config]);
     if (typeof homebridge.savePluginConfig === "function") {
       await homebridge.savePluginConfig();
     }
@@ -3808,42 +3703,10 @@ async function saveCredentials2() {
 // 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 = saveCredentials2;
+window.saveCredentials = saveCredentials;
 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();