@switchbot/homebridge-switchbot 5.2.7 → 5.2.9-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/.github/npm-version-script-esm.js +103 -0
  2. package/config.schema.json +0 -29
  3. package/dist/SwitchBotMatterPlatform.d.ts +2 -0
  4. package/dist/SwitchBotMatterPlatform.d.ts.map +1 -1
  5. package/dist/SwitchBotMatterPlatform.js +28 -9
  6. package/dist/SwitchBotMatterPlatform.js.map +1 -1
  7. package/dist/devices/genericDevice.d.ts +0 -2
  8. package/dist/devices/genericDevice.d.ts.map +1 -1
  9. package/dist/devices/genericDevice.js +10 -60
  10. package/dist/devices/genericDevice.js.map +1 -1
  11. package/dist/homebridge-ui/endpoints/discovery.d.ts.map +1 -1
  12. package/dist/homebridge-ui/endpoints/discovery.js +0 -2
  13. package/dist/homebridge-ui/endpoints/discovery.js.map +1 -1
  14. package/dist/homebridge-ui/homebridge-ui/endpoints/discovery.js +0 -2
  15. package/dist/homebridge-ui/homebridge-ui/endpoints/discovery.js.map +1 -1
  16. package/dist/homebridge-ui/public/index.html +2 -12
  17. package/dist/homebridge-ui/public/js/advanced-settings.d.ts +1 -4
  18. package/dist/homebridge-ui/public/js/advanced-settings.d.ts.map +1 -1
  19. package/dist/homebridge-ui/public/js/advanced-settings.js +11 -19
  20. package/dist/homebridge-ui/public/js/advanced-settings.js.map +1 -1
  21. package/dist/homebridge-ui/public/js/advanced-settings.ts +11 -21
  22. package/dist/homebridge-ui/public/js/app.js +4 -4
  23. package/dist/homebridge-ui/public/js/app.js.map +2 -2
  24. package/dist/homebridge-ui/public/js/modals.js +4 -4
  25. package/dist/homebridge-ui/public/js/modals.js.map +1 -1
  26. package/dist/homebridge-ui/public/js/modals.ts +4 -4
  27. package/dist/homebridge-ui/settings.js.map +1 -1
  28. package/dist/homebridge-ui/switchbotClient.js +41 -8
  29. package/dist/homebridge-ui/switchbotClient.js.map +1 -1
  30. package/dist/settings.d.ts +0 -1
  31. package/dist/settings.d.ts.map +1 -1
  32. package/dist/settings.js.map +1 -1
  33. package/dist/switchbotClient.d.ts +15 -6
  34. package/dist/switchbotClient.d.ts.map +1 -1
  35. package/dist/switchbotClient.js +41 -8
  36. package/dist/switchbotClient.js.map +1 -1
  37. package/docs/variables/default.html +1 -1
  38. package/package.json +2 -2
  39. package/src/SwitchBotMatterPlatform.ts +27 -8
  40. package/src/devices/genericDevice.ts +10 -57
  41. package/src/homebridge-ui/endpoints/discovery.ts +0 -2
  42. package/src/homebridge-ui/public/index.html +2 -12
  43. package/src/homebridge-ui/public/js/advanced-settings.ts +11 -21
  44. package/src/homebridge-ui/public/js/modals.ts +4 -4
  45. package/src/settings.ts +0 -1
  46. package/src/switchbotClient.ts +52 -9
  47. package/test/client/switchbot-client-keys.spec.ts +59 -0
  48. package/test/platform/matter-registration.spec.ts +68 -0
  49. package/test/device/curtain-ble-position.spec.ts +0 -34
@@ -27,7 +27,6 @@ async function loadAdvancedSettings(): Promise<void> {
27
27
  ;(document.getElementById('enableMatter') as HTMLInputElement).checked = !!config.enableMatter
28
28
  ;(document.getElementById('preferMatter') as HTMLInputElement).checked = !!config.preferMatter
29
29
  ;(document.getElementById('enableBLE') as HTMLInputElement).checked = config.enableBLE !== false
30
- ;(document.getElementById('nodeSwitchBotLogLevel') as HTMLSelectElement).value = String(config.nodeSwitchBotLogLevel ?? 2)
31
30
  ;(document.getElementById('blePollingEnabled') as HTMLInputElement).checked = config.blePollingEnabled !== false
32
31
  ;(document.getElementById('blePollIntervalMs') as HTMLInputElement).value = String(config.blePollIntervalMs ?? 600000)
33
32
  ;(document.getElementById('co2AbnormalThreshold') as HTMLInputElement).value = String(config.co2AbnormalThreshold ?? 1000)
@@ -36,9 +35,9 @@ async function loadAdvancedSettings(): Promise<void> {
36
35
  }
37
36
  }
38
37
 
39
- async function syncAdvancedSettings(): Promise<void> {
38
+ async function saveAdvancedSettings(): Promise<void> {
40
39
  const status = document.getElementById('advancedSettingsStatus') as HTMLElement
41
- status.textContent = 'Updating pending settings...'
40
+ status.textContent = 'Saving...'
42
41
  try {
43
42
  if (typeof homebridge.getPluginConfig !== 'function') {
44
43
  throw new TypeError('homebridge.getPluginConfig is not available')
@@ -67,7 +66,6 @@ async function syncAdvancedSettings(): Promise<void> {
67
66
  config.enableMatter = (document.getElementById('enableMatter') as HTMLInputElement).checked
68
67
  config.preferMatter = (document.getElementById('preferMatter') as HTMLInputElement).checked
69
68
  config.enableBLE = (document.getElementById('enableBLE') as HTMLInputElement).checked
70
- config.nodeSwitchBotLogLevel = Number((document.getElementById('nodeSwitchBotLogLevel') as HTMLSelectElement).value)
71
69
  config.blePollingEnabled = (document.getElementById('blePollingEnabled') as HTMLInputElement).checked
72
70
  config.blePollIntervalMs = Number((document.getElementById('blePollIntervalMs') as HTMLInputElement).value) || 600000
73
71
  config.co2AbnormalThreshold = Number((document.getElementById('co2AbnormalThreshold') as HTMLInputElement).value) || 1000
@@ -78,29 +76,21 @@ async function syncAdvancedSettings(): Promise<void> {
78
76
  } else {
79
77
  throw new TypeError('homebridge.updatePluginConfig is not available')
80
78
  }
81
- status.textContent = 'Changes ready. Click Save to apply them.'
79
+ if (typeof homebridge.savePluginConfig === 'function') {
80
+ await homebridge.savePluginConfig()
81
+ }
82
+ status.textContent = 'Settings saved!'
82
83
  } catch (e: any) {
83
- status.textContent = `Failed to update settings: ${e && e.message ? e.message : e}`
84
- throw e
84
+ status.textContent = `Failed to save: ${e && e.message ? e.message : e}`
85
85
  }
86
86
  }
87
87
 
88
- let pendingUpdate: Promise<void> = Promise.resolve()
89
- let latestChange = 0
90
-
91
- function queueAdvancedSettingsUpdate(): void {
92
- const change = ++latestChange
93
- homebridge.disableSaveButton?.()
94
- pendingUpdate = pendingUpdate.catch(() => {}).then(syncAdvancedSettings).then(() => {
95
- if (change === latestChange) {
96
- homebridge.enableSaveButton?.()
97
- }
98
- }).catch(() => {})
99
- }
100
-
101
88
  document.addEventListener('DOMContentLoaded', () => {
102
89
  if (document.getElementById('advancedSettingsCard')) {
103
90
  loadAdvancedSettings()
104
- document.getElementById('advancedSettingsForm')?.addEventListener('change', queueAdvancedSettingsUpdate)
91
+ const btn = document.getElementById('saveAdvancedSettingsBtn')
92
+ if (btn) {
93
+ btn.onclick = saveAdvancedSettings
94
+ }
105
95
  }
106
96
  })
@@ -1880,7 +1880,7 @@ async function importDiscoveredDevice(device) {
1880
1880
  ["auto", "ble", "openapi"].forEach((val) => {
1881
1881
  const opt = document.createElement("option");
1882
1882
  opt.value = val;
1883
- opt.text = val === "ble" ? "BLE" : val === "openapi" ? "OpenAPI" : "Auto";
1883
+ opt.text = val.charAt(0).toUpperCase() + val.slice(1);
1884
1884
  opt.selected = (device.connectionPreference || "auto") === val;
1885
1885
  connectionPrefSelect.appendChild(opt);
1886
1886
  });
@@ -2179,7 +2179,7 @@ async function editDevice(device) {
2179
2179
  nameLabel.style.color = "#6b7280";
2180
2180
  const nameInput = document.createElement("input");
2181
2181
  nameInput.type = "text";
2182
- nameInput.value = device.configDeviceName || device.name || "";
2182
+ nameInput.value = device.name || device.id;
2183
2183
  nameInput.style.width = "100%";
2184
2184
  nameInput.style.marginBottom = "12px";
2185
2185
  nameInput.style.padding = "8px 10px";
@@ -2237,7 +2237,7 @@ async function editDevice(device) {
2237
2237
  ["auto", "ble", "openapi"].forEach((val) => {
2238
2238
  const opt = document.createElement("option");
2239
2239
  opt.value = val;
2240
- opt.text = val === "ble" ? "BLE" : val === "openapi" ? "OpenAPI" : "Auto";
2240
+ opt.text = val.charAt(0).toUpperCase() + val.slice(1);
2241
2241
  opt.selected = (device.connectionPreference || "auto") === val;
2242
2242
  connectionPrefSelect.appendChild(opt);
2243
2243
  });
@@ -2325,7 +2325,7 @@ async function editDevice(device) {
2325
2325
  const { updateDevice: updateDevice2, syncParentPluginConfigFromDisk: syncParentPluginConfigFromDisk2, fetchDevices: fetchDevices2 } = await Promise.resolve().then(() => (init_api(), api_exports));
2326
2326
  const { renderDeviceList: renderDeviceList2 } = await Promise.resolve().then(() => (init_render(), render_exports));
2327
2327
  const params = {
2328
- deviceId: device.deviceId,
2328
+ deviceId: device.id,
2329
2329
  configDeviceName: nameInput.value || void 0,
2330
2330
  configDeviceType: typeSelect.value,
2331
2331
  connectionPreference: connectionPrefSelect.value,