@switchbot/homebridge-switchbot 5.0.0-beta.128 → 5.0.0-beta.129

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

@@ -443,6 +443,9 @@ async function addDevice(deviceId, name, type, options) {
   if (options?.keyId) {
     payload.keyId = options.keyId;
   }
+  if (options?.matterType !== void 0) {
+    payload.matterType = options.matterType;
+  }
   uiLog.info("Adding device to config:", payload);
   const resp = await homebridge.request("/add-device", payload);
   uiLog.info("Add device response:", resp);
@@ -459,7 +462,7 @@ async function addDevicesInBulk(devices) {
   }
   return resp.data || resp;
 }
-async function updateDevice(deviceId, configDeviceName, configDeviceType) {
+async function updateDevice(deviceId, configDeviceName, configDeviceType, options) {
   const params = { deviceId };
   if (configDeviceName) {
     params.configDeviceName = configDeviceName;
@@ -467,6 +470,9 @@ async function updateDevice(deviceId, configDeviceName, configDeviceType) {
   if (configDeviceType) {
     params.configDeviceType = configDeviceType;
   }
+  if (options?.matterType !== void 0) {
+    params.matterType = options.matterType;
+  }
   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);
@@ -1919,6 +1925,56 @@ async function importDiscoveredDevice(device) {
       });
       typeSelect.appendChild(optgroup);
     });
+    const windowCoveringTypes = ["Roller Shade", "Curtain", "Curtain3", "Blind Tilt"];
+    const matterTypeLabel = document.createElement("label");
+    matterTypeLabel.textContent = "Matter Window Covering Type (Advanced)";
+    matterTypeLabel.style.display = "block";
+    matterTypeLabel.style.marginBottom = "6px";
+    matterTypeLabel.style.fontWeight = "500";
+    matterTypeLabel.style.fontSize = "12px";
+    matterTypeLabel.style.color = "#6b7280";
+    matterTypeLabel.style.marginTop = "2px";
+    const matterTypes = [
+      { value: "", label: "Auto-detect (recommended)" },
+      { value: 0, label: "Roller Shade (0)" },
+      { value: 1, label: "Roman Shade (1)" },
+      { value: 2, label: "Balloon Shade (2)" },
+      { value: 3, label: "Woven Wood (3)" },
+      { value: 4, label: "Drapery (4)" },
+      { value: 5, label: "Awning (5)" },
+      { value: 6, label: "Shutter (6)" },
+      { value: 7, label: "Tilt Blind (7)" },
+      { value: 8, label: "Blind Tilt (8)" },
+      { value: 9, label: "Projector Screen (9)" },
+      { value: 15, label: "Other (15)" }
+    ];
+    const matterTypeSelect = document.createElement("select");
+    matterTypeSelect.style.width = "100%";
+    matterTypeSelect.style.marginBottom = "12px";
+    matterTypeSelect.style.padding = "8px 10px";
+    matterTypeSelect.style.borderRadius = "6px";
+    matterTypeSelect.style.fontSize = "14px";
+    matterTypeSelect.style.boxSizing = "border-box";
+    matterTypes.forEach((opt) => {
+      const option = document.createElement("option");
+      option.value = String(opt.value);
+      option.textContent = opt.label;
+      if (device.matterType != null && String(opt.value) === String(device.matterType)) {
+        option.selected = true;
+      }
+      matterTypeSelect.appendChild(option);
+    });
+    function updateMatterTypeVisibility() {
+      if (windowCoveringTypes.includes(typeSelect.value)) {
+        matterTypeLabel.style.display = "block";
+        matterTypeSelect.style.display = "block";
+      } else {
+        matterTypeLabel.style.display = "none";
+        matterTypeSelect.style.display = "none";
+      }
+    }
+    typeSelect.addEventListener("change", updateMatterTypeVisibility);
+    updateMatterTypeVisibility();
     const macLabel = document.createElement("label");
     macLabel.textContent = "BLE MAC Address (optional)";
     macLabel.style.display = "block";
@@ -1998,7 +2054,8 @@ async function importDiscoveredDevice(device) {
       configDeviceType: typeSelect.value || device.type,
       address: macInput.value || void 0,
       encryptionKey: encryptionKeyInput.value || void 0,
-      keyId: keyIdInput.value || void 0
+      keyId: keyIdInput.value || void 0,
+      ...windowCoveringTypes.includes(typeSelect.value) && matterTypeSelect.value !== "" ? { matterType: Number(matterTypeSelect.value) } : {}
     });
     div.addEventListener("click", (event) => {
       if (event.target === div) {
@@ -2011,6 +2068,8 @@ async function importDiscoveredDevice(device) {
     contentDiv.appendChild(nameInput);
     contentDiv.appendChild(typeLabel);
     contentDiv.appendChild(typeSelect);
+    contentDiv.appendChild(matterTypeLabel);
+    contentDiv.appendChild(matterTypeSelect);
     contentDiv.appendChild(macLabel);
     contentDiv.appendChild(macInput);
     contentDiv.appendChild(encryptionKeyLabel);
@@ -2026,6 +2085,87 @@ async function importDiscoveredDevice(device) {
   });
 }
 async function editDevice(device) {
+  const typeLabel = document.createElement("label");
+  typeLabel.textContent = "Config Device Type";
+  typeLabel.style.display = "block";
+  typeLabel.style.marginBottom = "6px";
+  typeLabel.style.fontWeight = "500";
+  typeLabel.style.fontSize = "12px";
+  typeLabel.style.color = "#6b7280";
+  const typeSelect = document.createElement("select");
+  typeSelect.style.width = "100%";
+  typeSelect.style.padding = "8px 10px";
+  typeSelect.style.marginBottom = "12px";
+  typeSelect.style.borderRadius = "6px";
+  typeSelect.style.fontSize = "14px";
+  typeSelect.style.background = getComputedStyle(document.body).backgroundColor;
+  typeSelect.style.color = getComputedStyle(document.body).color;
+  typeSelect.style.border = "1px solid #ccc";
+  typeSelect.style.boxSizing = "border-box";
+  Object.keys(DEVICE_TYPES).forEach((categoryName) => {
+    const optgroup = document.createElement("optgroup");
+    optgroup.label = categoryName;
+    DEVICE_TYPES[categoryName].forEach((deviceType) => {
+      const opt = document.createElement("option");
+      opt.value = deviceType;
+      opt.text = deviceType;
+      const currentType = device.configDeviceType || device.deviceType || device.type || "";
+      opt.selected = currentType === deviceType;
+      optgroup.appendChild(opt);
+    });
+    typeSelect.appendChild(optgroup);
+  });
+  const windowCoveringTypes = ["Roller Shade", "Curtain", "Curtain3", "Blind Tilt"];
+  const showMatterType = windowCoveringTypes.includes(device.configDeviceType || device.deviceType || device.type || "");
+  const matterTypeLabel = document.createElement("label");
+  matterTypeLabel.textContent = "Matter Window Covering Type (Advanced)";
+  matterTypeLabel.style.display = showMatterType ? "block" : "none";
+  matterTypeLabel.style.marginBottom = "6px";
+  matterTypeLabel.style.fontWeight = "500";
+  matterTypeLabel.style.fontSize = "12px";
+  matterTypeLabel.style.color = "#6b7280";
+  matterTypeLabel.style.marginTop = "2px";
+  const matterTypes = [
+    { value: "", label: "Auto-detect (recommended)" },
+    { value: 0, label: "Roller Shade (0)" },
+    { value: 1, label: "Roman Shade (1)" },
+    { value: 2, label: "Balloon Shade (2)" },
+    { value: 3, label: "Woven Wood (3)" },
+    { value: 4, label: "Drapery (4)" },
+    { value: 5, label: "Awning (5)" },
+    { value: 6, label: "Shutter (6)" },
+    { value: 7, label: "Tilt Blind (7)" },
+    { value: 8, label: "Blind Tilt (8)" },
+    { value: 9, label: "Projector Screen (9)" },
+    { value: 15, label: "Other (15)" }
+  ];
+  const matterTypeSelect = document.createElement("select");
+  matterTypeSelect.style.width = "100%";
+  matterTypeSelect.style.marginBottom = "12px";
+  matterTypeSelect.style.padding = "8px 10px";
+  matterTypeSelect.style.borderRadius = "6px";
+  matterTypeSelect.style.fontSize = "14px";
+  matterTypeSelect.style.boxSizing = "border-box";
+  matterTypes.forEach((opt) => {
+    const option = document.createElement("option");
+    option.value = String(opt.value);
+    option.textContent = opt.label;
+    if (device.matterType != null && String(opt.value) === String(device.matterType)) {
+      option.selected = true;
+    }
+    matterTypeSelect.appendChild(option);
+  });
+  function updateMatterTypeVisibility() {
+    if (windowCoveringTypes.includes(typeSelect.value)) {
+      matterTypeLabel.style.display = "block";
+      matterTypeSelect.style.display = "block";
+    } else {
+      matterTypeLabel.style.display = "none";
+      matterTypeSelect.style.display = "none";
+    }
+  }
+  typeSelect.addEventListener("change", updateMatterTypeVisibility);
+  updateMatterTypeVisibility();
   const div = document.createElement("div");
   div.style.position = "fixed";
   div.style.top = "0";
@@ -2095,25 +2235,6 @@ async function editDevice(device) {
   apiTypeInput.style.cursor = "not-allowed";
   apiTypeInput.style.boxSizing = "border-box";
   apiTypeInput.style.backgroundColor = "#f9fafb";
-  const typeLabel = document.createElement("label");
-  typeLabel.textContent = "Config Device Type (Override)";
-  typeLabel.style.display = "block";
-  typeLabel.style.marginBottom = "6px";
-  typeLabel.style.fontWeight = "500";
-  typeLabel.style.fontSize = "12px";
-  typeLabel.style.color = "#6b7280";
-  const typeSelect = document.createElement("select");
-  typeSelect.style.width = "100%";
-  typeSelect.style.padding = "8px 10px";
-  typeSelect.style.marginBottom = "12px";
-  typeSelect.style.borderRadius = "6px";
-  typeSelect.style.fontSize = "14px";
-  typeSelect.style.background = getComputedStyle(nameInput).background;
-  typeSelect.style.color = getComputedStyle(nameInput).color;
-  typeSelect.style.border = getComputedStyle(nameInput).border;
-  typeSelect.style.boxSizing = "border-box";
-  typeSelect.style.cursor = "pointer";
-  typeSelect.style.transition = "border-color 0.2s ease";
   Object.keys(DEVICE_TYPES).forEach((categoryName) => {
     const optgroup = document.createElement("optgroup");
     optgroup.label = categoryName;
@@ -2162,9 +2283,10 @@ async function editDevice(device) {
       const params = {
         deviceId: device.id,
         configDeviceName: nameInput.value || void 0,
-        configDeviceType: typeSelect.value
+        configDeviceType: typeSelect.value,
+        matterType: windowCoveringTypes.includes(typeSelect.value) && matterTypeSelect.value !== "" ? Number(matterTypeSelect.value) : void 0
       };
-      await updateDevice2(params.deviceId, params.configDeviceName, params.configDeviceType);
+      await updateDevice2(params.deviceId, params.configDeviceName, params.configDeviceType, { matterType: params.matterType });
       await syncParentPluginConfigFromDisk2();
       uiLog.info("[Edit Device] Refreshing device list after update");
       const list = await fetchDevices2();
@@ -2184,6 +2306,8 @@ async function editDevice(device) {
   contentDiv.appendChild(apiTypeInput);
   contentDiv.appendChild(typeLabel);
   contentDiv.appendChild(typeSelect);
+  contentDiv.appendChild(matterTypeLabel);
+  contentDiv.appendChild(matterTypeSelect);
   contentDiv.appendChild(errorMessage);
   contentDiv.appendChild(buttons);
   modal.appendChild(title);
@@ -3294,7 +3418,8 @@ async function addDeviceToConfig2(device, options = {}) {
       model: device.model,
       rssi: device.rssi,
       encryptionKey: importValues.encryptionKey,
-      keyId: importValues.keyId
+      keyId: importValues.keyId,
+      matterType: importValues.matterType
     });
     uiLog.info("Add device response:", resp);
     if (!resp || resp.success === false) {