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

package/dist/homebridge-ui/public/js/api.ts

@@ -1,5 +1,6 @@
 // Fetch the list of configured devices from the Homebridge UI API
 import { isValidDeviceType, normalizeDeviceType } from '../../../device-types.js'
+import { isV4Config } from '../../utils/v4-detection.js'
 import './types.js'
 import { uiLog } from './logger.js'
 import { toastError } from './toast.js'
@@ -22,6 +23,35 @@ export async function fetchDevices(): Promise<any[]> {
   }
 }
 
+/**
+ * Detect whether the current plugin config is in the legacy v4 format.
+ *
+ * v4 configs stored credentials under a `credentials` sub-object and devices
+ * under `options.devices`. v5+ flattened these to `openApiToken`,
+ * `openApiSecret`, and a root-level `devices` array.
+ *
+ * Returns true when a v4 config block is found, false otherwise.
+ */
+export async function detectV4Config(): Promise<boolean> {
+  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
+  }
+}
+
 /**
  * Validate and auto-correct device types in the config array before saving.
  * Returns an array of errors for devices that cannot be fixed.

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,91 @@ 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;
+    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/homebridge-ui/public/js/api.ts
 var api_exports = {};
 __export(api_exports, {
@@ -361,11 +341,12 @@ __export(api_exports, {
   addDevicesInBulk: () => addDevicesInBulk,
   deleteAllDevices: () => deleteAllDevices,
   deleteDevice: () => deleteDevice,
+  detectV4Config: () => detectV4Config,
   discoverDevices: () => discoverDevices,
   fetchBluetoothStatus: () => fetchBluetoothStatus,
   fetchCredentialStatus: () => fetchCredentialStatus,
   fetchDevices: () => fetchDevices,
-  saveCredentials: () => saveCredentials2,
+  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);
@@ -657,12 +657,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, {
@@ -3685,6 +3721,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 +3761,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");
@@ -3782,9 +3821,20 @@ async function saveCredentials() {
 init_devices();
 init_discovery();
 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 checkV4Config();
   await loadCredentialStatus();
   await initializeDiscoverySettings();
   await loadConfiguredDevices();