@switchbot/homebridge-switchbot 5.0.0-beta.146 → 5.0.0-beta.148

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

@@ -8,6 +8,98 @@ 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) {
+  try {
+    const value = homebridge?.[name];
+    if (typeof value === "function") {
+      const fn = value;
+      fn();
+    }
+  } 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 toast = homebridge?.toast;
+    const fn = toast?.[method];
+    if (typeof fn === "function") {
+      fn(message, title);
+      return;
+    }
+    uiLog.info(`[Toast:${method}] ${title} - ${message}`);
+  } catch (e) {
+    uiLog.warn(`Toast ${method} failed:`, e);
+  }
+}
+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();
@@ -253,36 +345,6 @@ var init_device_types = __esm({
   }
 });
 
-// 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/api.ts
 var api_exports = {};
 __export(api_exports, {
@@ -294,12 +356,29 @@ __export(api_exports, {
   fetchBluetoothStatus: () => fetchBluetoothStatus,
   fetchCredentialStatus: () => fetchCredentialStatus,
   fetchDevices: () => fetchDevices,
-  saveCredentials: () => saveCredentials,
+  saveCredentials: () => saveCredentials2,
   syncParentPluginConfigFromDisk: () => syncParentPluginConfigFromDisk,
   testDeviceConnection: () => testDeviceConnection,
   updateDevice: () => updateDevice,
   validateAndFixDeviceTypes: () => validateAndFixDeviceTypes
 });
+async function fetchDevices() {
+  try {
+    if (typeof homebridge.getPluginConfig !== "function") {
+      throw new TypeError("Homebridge UI API not available");
+    }
+    const configArr = await homebridge.getPluginConfig();
+    const config = Array.isArray(configArr) && configArr.length > 0 ? configArr.find(isSwitchBotPlatformConfig) : null;
+    if (!config || !Array.isArray(config.devices)) {
+      return [];
+    }
+    return config.devices;
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    uiLog.error("Error fetching devices:", msg);
+    return [];
+  }
+}
 function validateAndFixDeviceTypes(devices) {
   const errors = [];
   for (const d of devices) {
@@ -375,7 +454,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);
@@ -384,20 +463,6 @@ async function saveCredentials(token, secret) {
   }
   return resp.data || resp;
 }
-async function fetchDevices() {
-  try {
-    const resp = await homebridge.request("/devices", {});
-    if (!resp || resp.success === false) {
-      const backendMsg = resp?.data?.message || resp?.message;
-      throw new Error(backendMsg || "request failed");
-    }
-    return resp.data || [];
-  } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
-    uiLog.error("Error fetching devices:", msg);
-    return [];
-  }
-}
 async function discoverDevices(mode = "all", options) {
   const resp = await homebridge.request("/discover", { mode, ...options });
   uiLog.info("Discover response:", resp);
@@ -431,29 +496,45 @@ async function testDeviceConnection(payload) {
   };
 }
 async function addDevice(deviceId, name, type, options) {
-  const payload = { deviceId, name, type };
+  if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
+    throw new TypeError("Homebridge UI API not available");
+  }
+  const configArr = await homebridge.getPluginConfig();
+  const idx = Array.isArray(configArr) ? configArr.findIndex(isSwitchBotPlatformConfig) : -1;
+  if (idx === -1) {
+    throw new Error("SwitchBot config not found");
+  }
+  const config = configArr[idx];
+  if (!Array.isArray(config.devices)) {
+    config.devices = [];
+  }
+  const normalizedDeviceId = String(deviceId).trim().toLowerCase();
+  const exists = config.devices.some((d) => String(d.deviceId ?? d.id ?? "").trim().toLowerCase() === normalizedDeviceId);
+  if (exists) {
+    return { alreadyExists: true, message: "Device already in config" };
+  }
+  const newDevice = { deviceId, configDeviceName: name, configDeviceType: type };
   if (options?.address) {
-    payload.address = options.address;
+    newDevice.address = options.address;
   }
   if (options?.model) {
-    payload.model = options.model;
+    newDevice.model = options.model;
   }
   if (options?.rssi !== void 0 && options?.rssi !== null && options?.rssi !== 0) {
-    payload.rssi = options.rssi;
+    newDevice.rssi = options.rssi;
   }
   if (options?.encryptionKey) {
-    payload.encryptionKey = options.encryptionKey;
+    newDevice.encryptionKey = options.encryptionKey;
   }
   if (options?.keyId) {
-    payload.keyId = options.keyId;
+    newDevice.keyId = options.keyId;
   }
-  uiLog.info("Adding device to config:", payload);
-  const resp = await homebridge.request("/add-device", payload);
-  uiLog.info("Add device response:", resp);
-  if (!resp || resp.success === false) {
-    throw new Error(resp?.data?.message || "Failed to add device");
+  config.devices.push(newDevice);
+  await homebridge.updatePluginConfig(configArr);
+  if (typeof homebridge.savePluginConfig === "function") {
+    await homebridge.savePluginConfig();
   }
-  return resp.data || resp;
+  return { added: true, message: `Device "${name}" added successfully` };
 }
 async function addDevicesInBulk(devices) {
   const resp = await homebridge.request("/add-devices", { devices });
@@ -464,108 +545,88 @@ async function addDevicesInBulk(devices) {
   return resp.data || resp;
 }
 async function updateDevice(deviceId, configDeviceName, configDeviceType, options) {
-  const params = { deviceId };
+  if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
+    throw new TypeError("Homebridge UI API not available");
+  }
+  const configArr = await homebridge.getPluginConfig();
+  const idx = Array.isArray(configArr) ? configArr.findIndex(isSwitchBotPlatformConfig) : -1;
+  if (idx === -1) {
+    throw new Error("SwitchBot config not found");
+  }
+  const config = configArr[idx];
+  if (!Array.isArray(config.devices)) {
+    throw new TypeError("No devices array in config");
+  }
+  const normalizedDeviceId = String(deviceId).trim().toLowerCase();
+  const device = config.devices.find((d) => String(d.deviceId ?? d.id ?? "").trim().toLowerCase() === normalizedDeviceId);
+  if (!device) {
+    throw new Error("Device not found in config");
+  }
   if (configDeviceName) {
-    params.configDeviceName = configDeviceName;
+    device.configDeviceName = configDeviceName;
   }
   if (configDeviceType) {
-    params.configDeviceType = configDeviceType;
+    device.configDeviceType = configDeviceType;
   }
   if (options) {
-    Object.assign(params, options);
+    Object.assign(device, options);
   }
-  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);
-  if (!resp || resp.success === false) {
-    throw new Error(resp?.data?.message || "Failed to update device");
+  await homebridge.updatePluginConfig(configArr);
+  if (typeof homebridge.savePluginConfig === "function") {
+    await homebridge.savePluginConfig();
   }
-  return resp.data || resp;
+  return { updated: true, message: `Device updated successfully` };
 }
 async function deleteDevice(deviceId) {
-  uiLog.info("Sending delete request for deviceId:", deviceId);
-  const resp = await homebridge.request("/delete-device", { deviceId });
-  uiLog.info("Delete response:", resp);
-  if (!resp || resp.success === false) {
-    throw new Error(resp?.data?.message || "Failed to delete device");
+  if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
+    throw new TypeError("Homebridge UI API not available");
   }
-  return resp.data || resp;
-}
-async function deleteAllDevices() {
-  uiLog.info("Sending delete all devices request");
-  const resp = await homebridge.request("/delete-all-devices", {});
-  uiLog.info("Delete all response:", resp);
-  if (!resp || resp.success === false) {
-    throw new Error(resp?.data?.message || "Failed to delete all devices");
+  const configArr = await homebridge.getPluginConfig();
+  const idx = Array.isArray(configArr) ? configArr.findIndex(isSwitchBotPlatformConfig) : -1;
+  if (idx === -1) {
+    throw new Error("SwitchBot config not found");
   }
-  return resp.data || resp;
-}
-var init_api = __esm({
-  "src/homebridge-ui/public/js/api.ts"() {
-    "use strict";
-    init_device_types();
-    init_types();
-    init_logger();
+  const config = configArr[idx];
+  if (!Array.isArray(config.devices)) {
+    throw new TypeError("No devices array in config");
   }
-});
-
-// src/homebridge-ui/public/js/modal.ts
-function callUiMethod(name) {
-  try {
-    const value = homebridge?.[name];
-    if (typeof value === "function") {
-      const fn = value;
-      fn();
-    }
-  } catch (e) {
-    uiLog.warn(`Homebridge UI method ${String(name)} failed:`, e);
+  const normalizedDeviceId = String(deviceId).trim().toLowerCase();
+  const before = config.devices.length;
+  config.devices = config.devices.filter((d) => String(d.deviceId ?? d.id ?? "").trim().toLowerCase() !== normalizedDeviceId);
+  if (config.devices.length === before) {
+    throw new Error("Device not found in config");
   }
+  await homebridge.updatePluginConfig(configArr);
+  if (typeof homebridge.savePluginConfig === "function") {
+    await homebridge.savePluginConfig();
+  }
+  return { deleted: true, message: `Device removed from config` };
 }
-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();
+async function deleteAllDevices() {
+  if (typeof homebridge.getPluginConfig !== "function" || typeof homebridge.updatePluginConfig !== "function") {
+    throw new TypeError("Homebridge UI API not available");
   }
-});
-
-// src/homebridge-ui/public/js/toast.ts
-function showToast(method, message, title = "SwitchBot") {
-  try {
-    const toast = homebridge?.toast;
-    const fn = toast?.[method];
-    if (typeof fn === "function") {
-      fn(message, title);
-      return;
-    }
-    uiLog.info(`[Toast:${method}] ${title} - ${message}`);
-  } catch (e) {
-    uiLog.warn(`Toast ${method} failed:`, e);
+  const configArr = await homebridge.getPluginConfig();
+  const idx = Array.isArray(configArr) ? configArr.findIndex(isSwitchBotPlatformConfig) : -1;
+  if (idx === -1) {
+    throw new Error("SwitchBot config not found");
   }
+  const config = configArr[idx];
+  if (!Array.isArray(config.devices)) {
+    throw new TypeError("No devices array in config");
+  }
+  const deletedCount = config.devices.length;
+  config.devices = [];
+  await homebridge.updatePluginConfig(configArr);
+  if (typeof homebridge.savePluginConfig === "function") {
+    await homebridge.savePluginConfig();
+  }
+  return { deleted: true, deletedCount, message: `Removed ${deletedCount} device(s) from config` };
 }
-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"() {
+var init_api = __esm({
+  "src/homebridge-ui/public/js/api.ts"() {
     "use strict";
+    init_device_types();
     init_types();
     init_logger();
   }
@@ -2569,12 +2630,9 @@ async function deleteDeviceFromConfig(deviceId, deviceName) {
   }
   try {
     showBusyUi();
-    uiLog.info("Sending delete request for deviceId:", deviceId);
+    uiLog.info("Deleting device from config:", deviceId);
     const resp = await deleteDevice(deviceId);
     uiLog.info("Delete response:", resp);
-    if (!resp || resp.success === false) {
-      throw new Error(resp?.data?.message || "Failed to delete device");
-    }
     uiLog.info("Syncing parent config from disk...");
     const synced = await syncParentPluginConfigFromDisk(true);
     if (!synced) {
@@ -2672,12 +2730,9 @@ async function deleteAllDevicesFromConfig() {
       return;
     }
     showBusyUi();
-    uiLog.info("Sending delete all devices request");
+    uiLog.info("Deleting all devices from config");
     const resp = await deleteAllDevices();
     uiLog.info("Delete all response:", resp);
-    if (!resp || resp.success === false) {
-      throw new Error(resp?.data?.message || "Failed to delete all devices");
-    }
     uiLog.info("Syncing parent config from disk...");
     const synced = await syncParentPluginConfigFromDisk(true);
     if (!synced) {
@@ -2687,7 +2742,7 @@ async function deleteAllDevicesFromConfig() {
     const updatedList = await fetchDevices();
     uiLog.info("Rendering devices:", updatedList.length);
     renderDeviceList(updatedList);
-    const deletedCount = resp?.deletedCount || list.length;
+    const deletedCount = resp?.deletedCount || 0;
     uiLog.info(`\u2713 Removed ${deletedCount} device(s) successfully`);
     toastSuccess(`Removed ${deletedCount} device(s) successfully`);
   } catch (e) {
@@ -3611,9 +3666,6 @@ async function addDeviceToConfig2(device, options = {}) {
       keyId: importValues.keyId
     });
     uiLog.info("Add device response:", resp);
-    if (!resp || resp.success === false) {
-      throw new Error(resp?.data?.message || "Failed to add device");
-    }
     const alreadyExists = !!resp?.alreadyExists;
     const message = resp?.message || (alreadyExists ? `Device "${importValues.configDeviceName}" already in config` : `Device "${importValues.configDeviceName}" added successfully!`);
     if (alreadyExists) {
@@ -3682,31 +3734,33 @@ var init_devices = __esm({
 });
 
 // src/homebridge-ui/public/js/credentials.ts
-init_api();
 init_logger();
 init_modal();
 init_toast();
 async function loadCredentialStatus() {
   try {
-    const creds = await fetchCredentialStatus();
-    if (!creds) {
-      uiLog.error("Failed to load credentials");
+    if (typeof homebridge.getPluginConfig !== "function") {
+      uiLog.error("Homebridge UI API not available");
       return;
     }
+    const configArr = await homebridge.getPluginConfig();
+    const config = Array.isArray(configArr) && configArr.length > 0 ? configArr[0] : {};
+    const token = config.openApiToken || "";
+    const secret = config.openApiSecret || "";
     const tokenStatus = document.getElementById("tokenStatus");
     const secretStatus = document.getElementById("secretStatus");
     if (!tokenStatus || !secretStatus) {
       return;
     }
-    if (creds.hasToken) {
-      tokenStatus.textContent = `\u2713 Configured (${creds.tokenLength} characters)`;
+    if (token) {
+      tokenStatus.textContent = `\u2713 Configured (${token.length} characters)`;
       tokenStatus.classList.add("ok");
     } else {
       tokenStatus.textContent = "Not configured";
       tokenStatus.classList.remove("ok");
     }
-    if (creds.hasSecret) {
-      secretStatus.textContent = `\u2713 Configured (${creds.secretLength} characters)`;
+    if (secret) {
+      secretStatus.textContent = `\u2713 Configured (${secret.length} characters)`;
       secretStatus.classList.add("ok");
     } else {
       secretStatus.textContent = "Not configured";
@@ -3716,7 +3770,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");
@@ -3735,21 +3789,24 @@ async function saveCredentials2() {
     saveBtn.disabled = true;
     saveBtn.textContent = "Saving...";
     uiLog.info("Saving credentials...");
-    const result = await saveCredentials(token, secret);
-    uiLog.info("Save response:", result);
-    const message = result?.message || "Credentials saved successfully";
-    saveStatus.textContent = `\u2713 ${message}`;
+    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");
+    }
+    const config = configArr[0];
+    config.openApiToken = token;
+    config.openApiSecret = secret;
+    await homebridge.updatePluginConfig([config]);
+    if (typeof homebridge.savePluginConfig === "function") {
+      await homebridge.savePluginConfig();
+    }
+    saveStatus.textContent = `\u2713 Credentials saved successfully`;
     saveStatus.classList.remove("error");
     saveStatus.classList.add("success-msg");
-    toastSuccess(message);
-    const synced = await syncParentPluginConfigFromDisk(true);
-    if (synced) {
-      saveStatus.textContent += " - Config saved automatically.";
-      toastSuccess("Configuration synced and saved automatically");
-    } else {
-      toastWarning("Credentials saved, but configuration sync failed");
-    }
-    ;
+    toastSuccess("Credentials saved successfully");
     document.getElementById("token").value = "";
     document.getElementById("secret").value = "";
     setTimeout(loadCredentialStatus, 500);
@@ -3773,7 +3830,7 @@ async function saveCredentials2() {
 init_devices();
 init_discovery();
 window.loadCredentialStatus = loadCredentialStatus;
-window.saveCredentials = saveCredentials2;
+window.saveCredentials = saveCredentials;
 window.discoverDevices = discoverDevices2;
 async function init() {
   await loadCredentialStatus();