@switchbot/homebridge-switchbot 5.0.0-beta.115 → 5.0.0-beta.117

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

@@ -8,6 +8,251 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/device-types.ts
+function getValidDeviceTypes() {
+  const validTypes = /* @__PURE__ */ new Set();
+  for (const category of Object.values(DEVICE_TYPES)) {
+    for (const type of category) {
+      validTypes.add(type);
+    }
+  }
+  return validTypes;
+}
+function normalizeDeviceType(deviceType) {
+  if (!deviceType || typeof deviceType !== "string") {
+    return null;
+  }
+  const trimmed = deviceType.trim();
+  const lowercase = trimmed.toLowerCase();
+  const validTypes = getValidDeviceTypes();
+  if (validTypes.has(trimmed)) {
+    return trimmed;
+  }
+  const normalized = DEVICE_TYPE_NORMALIZATION_MAP[lowercase];
+  if (normalized && validTypes.has(normalized)) {
+    return normalized;
+  }
+  return null;
+}
+function isValidDeviceType(deviceType) {
+  if (!deviceType || typeof deviceType !== "string") {
+    return false;
+  }
+  const validTypes = getValidDeviceTypes();
+  return validTypes.has(deviceType.trim());
+}
+var DEVICE_TYPES, DEVICE_TYPE_NORMALIZATION_MAP;
+var init_device_types = __esm({
+  "src/device-types.ts"() {
+    "use strict";
+    DEVICE_TYPES = {
+      "Window Coverings": ["Blind Tilt", "Curtain", "Curtain3", "Roller Shade"],
+      "Locks & Access": [
+        "Keypad",
+        "Keypad Touch",
+        "Keypad Vision",
+        "Keypad Vision Pro",
+        "Lock Vision Pro",
+        "Lock Lite",
+        "Smart Lock",
+        "Smart Lock Pro",
+        "Smart Lock Ultra",
+        "Video Doorbell"
+      ],
+      "Sensors": ["Contact Sensor", "Motion Sensor", "Presence Sensor", "Water Detector"],
+      "Lighting": [
+        "Candle Warmer Lamp",
+        "Ceiling Light",
+        "Ceiling Light Pro",
+        "Color Bulb",
+        "Floor Lamp",
+        "RGBIC Neon Rope Light",
+        "RGBIC Neon Wire Rope Light",
+        "RGBICWW Floor Lamp",
+        "RGBICWW Strip Light",
+        "Strip Light",
+        "Strip Light 3"
+      ],
+      "Climate Control": [
+        "Air Purifier PM2.5",
+        "Air Purifier Table PM2.5",
+        "Air Purifier VOC",
+        "Air Purifier Table VOC",
+        "Battery Circulator Fan",
+        "Circulator Fan",
+        "Humidifier",
+        "Humidifier2",
+        "Meter",
+        "MeterPlus",
+        "Meter Plus",
+        "MeterPro",
+        "Meter Pro",
+        "MeterPro(CO2)",
+        "Meter Pro (CO2)",
+        "Smart Radiator Thermostat",
+        "Standing Circulator Fan",
+        "WoIOSensor"
+      ],
+      "Plugs & Switches": [
+        "Garage Door Opener",
+        "Plug",
+        "Plug Mini (EU)",
+        "Plug Mini (JP)",
+        "Plug Mini (US)",
+        "Relay Switch 1",
+        "Relay Switch 1PM",
+        "Relay Switch 2PM"
+      ],
+      "Robot Vacuums": [
+        "K10+",
+        "K10+ Pro",
+        "Robot Vacuum Cleaner K10+ Pro Combo",
+        "Robot Vacuum Cleaner K11+",
+        "Robot Vacuum Cleaner K20 Plus Pro",
+        "Robot Vacuum Cleaner S1",
+        "Robot Vacuum Cleaner S1 Plus",
+        "Robot Vacuum Cleaner S10",
+        "Robot Vacuum Cleaner S20"
+      ],
+      "Hubs": ["AI Hub", "Hub", "Hub 2", "Hub 3", "Hub Mini", "Hub Plus"],
+      "Cameras": [
+        "Indoor Cam",
+        "Pan/Tilt Cam",
+        "Pan/Tilt Cam 2K",
+        "Pan/Tilt Cam Plus 2K",
+        "Pan/Tilt Cam Plus 3K"
+      ],
+      "IR Devices": [
+        "Air Conditioner",
+        "Air Purifier",
+        "Camera",
+        "DVD",
+        "Fan",
+        "Light",
+        "Others",
+        "Projector",
+        "Set Top Box",
+        "Speaker",
+        "Streamer",
+        "TV",
+        "Vacuum Cleaner",
+        "Water Heater"
+      ],
+      "Other Devices": ["AI Art Frame", "Bot", "Home Climate Panel", "Remote", "remote with screen"]
+    };
+    DEVICE_TYPE_NORMALIZATION_MAP = {
+      // --- node-switchbot beta new types normalization additions ---
+      "hub mini": "Hub Mini",
+      "hub 3": "Hub 3",
+      "keypad": "Keypad",
+      // node-switchbot beta
+      "plug mini": "Plug Mini (US)",
+      // fallback to US if region not specified
+      "art frame": "AI Art Frame",
+      "rgbicww": "RGBICWW Strip Light",
+      "lock vision": "Lock Vision Pro",
+      // alias for new lock vision
+      "lock pro": "Smart Lock Pro",
+      "lock lite": "Lock Lite",
+      // node-switchbot beta
+      "circulator fan": "Circulator Fan",
+      // node-switchbot beta
+      "smart thermostat radiator": "Smart Radiator Thermostat",
+      "climate panel": "Home Climate Panel",
+      "evaporative humidifier": "Humidifier",
+      // --- end node-switchbot beta additions ---
+      // Only keep the last occurrence for each key, all values canonical
+      "air purifier pm2.5": "Air Purifier PM2.5",
+      "pan/tilt cam plus 3k": "Pan/Tilt Cam Plus 3K",
+      "remote with screen": "Remote with Screen",
+      "ai hub": "AI Hub",
+      "water detector": "Water Detector",
+      "video doorbell": "Video Doorbell",
+      "smart radiator thermostat": "Smart Radiator Thermostat",
+      "woiosensor": "WoIOSensor",
+      "garage door opener": "Garage Door Opener",
+      "air purifier table pm2.5": "Air Purifier Table PM2.5",
+      "air purifier voc": "Air Purifier VOC",
+      "air purifier table voc": "Air Purifier Table VOC",
+      "plug mini (eu)": "Plug Mini (EU)",
+      // Only last occurrence for each key is kept above. Removed duplicates here.
+      // Climate control conversions
+      "humidifier2": "Humidifier2",
+      "battery circulator fan": "Battery Circulator Fan",
+      "standing circulator fan": "Standing Circulator Fan",
+      // Lock/keypad conversions
+      "smart lock": "Smart Lock",
+      "smart lock pro": "Smart Lock Pro",
+      "smart lock ultra": "Smart Lock Ultra",
+      "keypad touch": "Keypad Touch",
+      "keypad vision": "Keypad Vision",
+      "keypad vision pro": "Keypad Vision Pro",
+      // Light conversions
+      "color bulb": "Color Bulb",
+      "ceiling light": "Ceiling Light",
+      "ceiling light pro": "Ceiling Light Pro",
+      "candle warmer lamp": "Candle Warmer Lamp",
+      "floor lamp": "Floor Lamp",
+      "rgbic neon rope light": "RGBIC Neon Rope Light",
+      "rgbic neon wire rope light": "RGBIC Neon Wire Rope Light",
+      "rgbicww floor lamp": "RGBICWW Floor Lamp",
+      "rgbicww strip light": "RGBICWW Strip Light",
+      "strip light": "Strip Light",
+      "strip light 3": "Strip Light 3",
+      // node-switchbot beta
+      // Vacuum conversions
+      "robot vacuum cleaner s1": "Robot Vacuum Cleaner S1",
+      "robot vacuum cleaner s1 plus": "Robot Vacuum Cleaner S1 Plus",
+      "robot vacuum cleaner s10": "Robot Vacuum Cleaner S10",
+      "robot vacuum cleaner s20": "Robot Vacuum Cleaner S20",
+      "robot vacuum cleaner k10+ pro combo": "Robot Vacuum Cleaner K10+ Pro Combo",
+      "robot vacuum cleaner k11+": "Robot Vacuum Cleaner K11+",
+      "robot vacuum cleaner k20 plus pro": "Robot Vacuum Cleaner K20 Plus Pro",
+      // Exact device type mappings (API format → canonical format)
+      "relay switch 1": "Relay Switch 1",
+      "blind tilt": "Blind Tilt",
+      "roller shade": "Roller Shade",
+      "curtain3": "Curtain3",
+      "hub 2": "Hub 2",
+      "meterplus": "MeterPlus",
+      "meterpro": "MeterPro",
+      "meterpro(co2)": "MeterPro(CO2)",
+      "walletfinder": "WalletFinder",
+      "k10+": "K10+",
+      "k10+ pro (wosweeperminipro)": "K10+ Pro (wosweeperminipro)",
+      // Handle spaced variants from config files (normalize back to canonical type)
+      "meter pro": "Meter Pro",
+      "meter pro (co2)": "Meter Pro (CO2)",
+      "meter plus": "Meter Plus",
+      "relay switch 1 pm": "Relay Switch 1PM",
+      "relay switch 2 pm": "Relay Switch 2PM",
+      "plug mini eu": "Plug Mini (EU)",
+      "plug mini jp": "Plug Mini (JP)",
+      "plug mini us": "Plug Mini (US)",
+      // Migration mappings for invalid/legacy device types
+      "lock vision pro": "Lock Vision Pro",
+      // Valid alias; map to canonical
+      // 'lock vision': 'Keypad Vision', // Invalid type (removed, now node-switchbot beta alias above)
+      "lock touch": "Keypad Touch",
+      // Invalid type
+      // Additional normalization for new/unknown types from logs
+      "woplugus": "Plug Mini (US)"
+      // Removed duplicate keys below, only last occurrence kept
+      // 'plug mini us': 'plug mini (us)', // duplicate, removed
+      // 'plug us': 'plug mini (us)', // duplicate, removed
+      // 'plug': 'plug', // duplicate, removed
+      // 'air purifier pm2.5': 'air purifier pm2.5', // duplicate, removed
+      // 'rgbic neon wire rope light': 'rgbic neon wire rope light', // duplicate, removed
+      // 'candle warmer lamp': 'candle warmer lamp', // duplicate, removed
+      // 'pan/tilt cam plus 3k': 'pan/tilt cam plus 3k', // duplicate, removed
+      // 'remote with screen': 'remote with screen', // duplicate, removed
+      // 'ai hub': 'ai hub', // duplicate, removed
+      // 'lock vision pro': 'lock vision pro', // duplicate, remove this line
+      // Add any other device types from logs as needed
+    };
+  }
+});
+
 // src/homebridge-ui/public/js/types.ts
 var init_types = __esm({
   "src/homebridge-ui/public/js/types.ts"() {
@@ -48,8 +293,27 @@ __export(api_exports, {
   saveCredentials: () => saveCredentials,
   syncParentPluginConfigFromDisk: () => syncParentPluginConfigFromDisk,
   testDeviceConnection: () => testDeviceConnection,
-  updateDevice: () => updateDevice
+  updateDevice: () => updateDevice,
+  validateAndFixDeviceTypes: () => validateAndFixDeviceTypes
 });
+function validateAndFixDeviceTypes(devices) {
+  const errors = [];
+  for (const d of devices) {
+    if (!isValidDeviceType(d.configDeviceType)) {
+      const fixed = normalizeDeviceType(d.configDeviceType);
+      if (fixed) {
+        d.configDeviceType = fixed;
+      } else {
+        errors.push({
+          deviceId: d.deviceId,
+          name: d.configDeviceName,
+          type: d.configDeviceType
+        });
+      }
+    }
+  }
+  return errors;
+}
 function isSwitchBotPlatformConfig(block) {
   const platformName = String(block?.platform || block?.name || "").toLowerCase();
   return platformName === "switchbot" || platformName === "@switchbot/homebridge-switchbot" || platformName.includes("switchbot");
@@ -75,6 +339,11 @@ async function syncParentPluginConfigFromDisk(autoSave = false) {
       uiLog.warn("SwitchBot platform block not found in Homebridge plugin config");
       return false;
     }
+    const errors = validateAndFixDeviceTypes(diskResp.data.devices || []);
+    if (errors.length > 0) {
+      homebridge.toast?.error?.(`Invalid device types found: ${errors.map((e) => `${e.name} (${e.type})`).join(", ")}`);
+      return false;
+    }
     pluginConfigBlocks[index] = diskResp.data;
     await homebridge.updatePluginConfig(pluginConfigBlocks);
     if (autoSave && typeof homebridge.savePluginConfig === "function") {
@@ -103,41 +372,35 @@ async function fetchCredentialStatus() {
   }
 }
 async function saveCredentials(token, secret) {
-  try {
-    uiLog.info("Saving credentials...");
-    const resp = await homebridge.request("/credentials", { token, secret });
-    uiLog.info("Save response:", resp);
-    if (!resp || resp.success === false) {
-      throw new Error(resp?.message || "Save failed");
-    }
-    return resp.data || resp;
-  } catch (e) {
-    throw e;
+  uiLog.info("Saving credentials...");
+  const resp = await homebridge.request("/credentials", { token, secret });
+  uiLog.info("Save response:", resp);
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.message || "Save failed");
   }
+  return resp.data || resp;
 }
 async function fetchDevices() {
   try {
     const resp = await homebridge.request("/devices", {});
     if (!resp || resp.success === false) {
-      throw new Error(resp?.data?.message || "request failed");
+      const backendMsg = resp?.data?.message || resp?.message;
+      throw new Error(backendMsg || "request failed");
     }
     return resp.data || [];
   } catch (e) {
-    uiLog.error("Error fetching devices:", e);
+    const msg = e instanceof Error ? e.message : String(e);
+    uiLog.error("Error fetching devices:", msg);
     return [];
   }
 }
 async function discoverDevices(mode = "all", options) {
-  try {
-    const resp = await homebridge.request("/discover", { mode, ...options });
-    uiLog.info("Discover response:", resp);
-    if (!resp || resp.success === false) {
-      throw new Error(resp?.data?.message || "Discovery failed");
-    }
-    return resp.data || [];
-  } catch (e) {
-    throw e;
+  const resp = await homebridge.request("/discover", { mode, ...options });
+  uiLog.info("Discover response:", resp);
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || "Discovery failed");
   }
+  return resp.data || [];
 }
 async function fetchBluetoothStatus() {
   try {
@@ -164,95 +427,76 @@ async function testDeviceConnection(payload) {
   };
 }
 async function addDevice(deviceId, name, type, options) {
-  try {
-    const payload = { deviceId, name, type };
-    if (options?.address) {
-      payload.address = options.address;
-    }
-    if (options?.model) {
-      payload.model = options.model;
-    }
-    if (options?.rssi !== void 0 && options?.rssi !== null && options?.rssi !== 0) {
-      payload.rssi = options.rssi;
-    }
-    if (options?.encryptionKey) {
-      payload.encryptionKey = options.encryptionKey;
-    }
-    if (options?.keyId) {
-      payload.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");
-    }
-    return resp.data || resp;
-  } catch (e) {
-    throw e;
+  const payload = { deviceId, name, type };
+  if (options?.address) {
+    payload.address = options.address;
+  }
+  if (options?.model) {
+    payload.model = options.model;
+  }
+  if (options?.rssi !== void 0 && options?.rssi !== null && options?.rssi !== 0) {
+    payload.rssi = options.rssi;
+  }
+  if (options?.encryptionKey) {
+    payload.encryptionKey = options.encryptionKey;
+  }
+  if (options?.keyId) {
+    payload.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");
   }
+  return resp.data || resp;
 }
 async function addDevicesInBulk(devices) {
-  try {
-    const resp = await homebridge.request("/add-devices", { devices });
-    uiLog.info("Bulk add response:", resp);
-    if (!resp || resp.success === false) {
-      throw new Error(resp?.data?.message || "Bulk add failed");
-    }
-    return resp.data || resp;
-  } catch (e) {
-    throw e;
+  const resp = await homebridge.request("/add-devices", { devices });
+  uiLog.info("Bulk add response:", resp);
+  if (!resp || resp.success === false) {
+    throw new Error(resp?.data?.message || "Bulk add failed");
   }
+  return resp.data || resp;
 }
 async function updateDevice(deviceId, configDeviceName, configDeviceType) {
-  try {
-    const params = { deviceId };
-    if (configDeviceName) {
-      params.configDeviceName = configDeviceName;
-    }
-    if (configDeviceType) {
-      params.configDeviceType = configDeviceType;
-    }
-    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");
-    }
-    return resp.data || resp;
-  } catch (e) {
-    throw e;
+  const params = { deviceId };
+  if (configDeviceName) {
+    params.configDeviceName = configDeviceName;
+  }
+  if (configDeviceType) {
+    params.configDeviceType = configDeviceType;
+  }
+  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");
   }
+  return resp.data || resp;
 }
 async function deleteDevice(deviceId) {
-  try {
-    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");
-    }
-    return resp.data || resp;
-  } catch (e) {
-    throw e;
+  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");
   }
+  return resp.data || resp;
 }
 async function deleteAllDevices() {
-  try {
-    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");
-    }
-    return resp.data || resp;
-  } catch (e) {
-    throw e;
+  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");
   }
+  return resp.data || resp;
 }
 var init_api = __esm({
   "src/homebridge-ui/public/js/api.ts"() {
     "use strict";
+    init_device_types();
     init_types();
     init_logger();
   }
@@ -1581,109 +1825,6 @@ var init_discovery = __esm({
   }
 });
 
-// src/device-types.ts
-var DEVICE_TYPES;
-var init_device_types = __esm({
-  "src/device-types.ts"() {
-    "use strict";
-    DEVICE_TYPES = {
-      "Window Coverings": ["Blind Tilt", "Curtain", "Curtain3", "Roller Shade"],
-      "Locks & Access": [
-        "Keypad",
-        "Keypad Touch",
-        "Keypad Vision",
-        "Keypad Vision Pro",
-        "Lock Vision Pro",
-        "Lock Lite",
-        "Smart Lock",
-        "Smart Lock Pro",
-        "Smart Lock Ultra",
-        "Video Doorbell"
-      ],
-      "Sensors": ["Contact Sensor", "Motion Sensor", "Presence Sensor", "Water Detector"],
-      "Lighting": [
-        "Candle Warmer Lamp",
-        "Ceiling Light",
-        "Ceiling Light Pro",
-        "Color Bulb",
-        "Floor Lamp",
-        "RGBIC Neon Rope Light",
-        "RGBIC Neon Wire Rope Light",
-        "RGBICWW Floor Lamp",
-        "RGBICWW Strip Light",
-        "Strip Light",
-        "Strip Light 3"
-      ],
-      "Climate Control": [
-        "Air Purifier PM2.5",
-        "Air Purifier Table PM2.5",
-        "Air Purifier VOC",
-        "Air Purifier Table VOC",
-        "Battery Circulator Fan",
-        "Circulator Fan",
-        "Humidifier",
-        "Humidifier2",
-        "Meter",
-        "MeterPlus",
-        "Meter Plus",
-        "MeterPro",
-        "Meter Pro",
-        "MeterPro(CO2)",
-        "Meter Pro (CO2)",
-        "Smart Radiator Thermostat",
-        "Standing Circulator Fan",
-        "WoIOSensor"
-      ],
-      "Plugs & Switches": [
-        "Garage Door Opener",
-        "Plug",
-        "Plug Mini (EU)",
-        "Plug Mini (JP)",
-        "Plug Mini (US)",
-        "Relay Switch 1",
-        "Relay Switch 1PM",
-        "Relay Switch 2PM"
-      ],
-      "Robot Vacuums": [
-        "K10+",
-        "K10+ Pro",
-        "Robot Vacuum Cleaner K10+ Pro Combo",
-        "Robot Vacuum Cleaner K11+",
-        "Robot Vacuum Cleaner K20 Plus Pro",
-        "Robot Vacuum Cleaner S1",
-        "Robot Vacuum Cleaner S1 Plus",
-        "Robot Vacuum Cleaner S10",
-        "Robot Vacuum Cleaner S20"
-      ],
-      "Hubs": ["AI Hub", "Hub", "Hub 2", "Hub 3", "Hub Mini", "Hub Plus"],
-      "Cameras": [
-        "Indoor Cam",
-        "Pan/Tilt Cam",
-        "Pan/Tilt Cam 2K",
-        "Pan/Tilt Cam Plus 2K",
-        "Pan/Tilt Cam Plus 3K"
-      ],
-      "IR Devices": [
-        "Air Conditioner",
-        "Air Purifier",
-        "Camera",
-        "DVD",
-        "Fan",
-        "Light",
-        "Others",
-        "Projector",
-        "Set Top Box",
-        "Speaker",
-        "Streamer",
-        "TV",
-        "Vacuum Cleaner",
-        "Water Heater"
-      ],
-      "Other Devices": ["AI Art Frame", "Bot", "Home Climate Panel", "Remote", "remote with screen"]
-    };
-  }
-});
-
 // src/homebridge-ui/public/js/constants.ts
 var init_constants = __esm({
   "src/homebridge-ui/public/js/constants.ts"() {
@@ -3188,13 +3329,14 @@ async function addDeviceToConfig2(device, options = {}) {
     }
     return { added: !alreadyExists };
   } catch (e) {
-    uiLog.error("Add device error:", e);
+    const msg = e instanceof Error ? e.message : String(e);
+    uiLog.error("Add device error:", msg);
     const status = document.getElementById("discoverStatus");
     if (status) {
-      status.textContent = `\u2717 Error: ${e instanceof Error ? e.message : "Failed to add device"}`;
+      status.textContent = `\u2717 Error: ${msg}`;
       status.classList.add("error");
     }
-    toastError(e instanceof Error ? e.message : "Failed to add device");
+    toastError(msg);
     return { added: false };
   } finally {
     hideBusyUi();