@switchbot/homebridge-switchbot 5.2.9-beta.0 → 5.2.9-beta.1
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.
- package/config.schema.json +29 -0
- package/dist/SwitchBotMatterPlatform.js +1 -1
- package/dist/SwitchBotMatterPlatform.js.map +1 -1
- package/dist/deviceFactory.js +1 -1
- package/dist/deviceFactory.js.map +1 -1
- package/dist/devices/genericDevice.d.ts +2 -0
- package/dist/devices/genericDevice.d.ts.map +1 -1
- package/dist/devices/genericDevice.js +46 -6
- package/dist/devices/genericDevice.js.map +1 -1
- package/dist/homebridge-ui/endpoints/discovery.d.ts.map +1 -1
- package/dist/homebridge-ui/endpoints/discovery.js +2 -0
- package/dist/homebridge-ui/endpoints/discovery.js.map +1 -1
- package/dist/homebridge-ui/homebridge-ui/endpoints/discovery.js +2 -0
- package/dist/homebridge-ui/homebridge-ui/endpoints/discovery.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +12 -2
- package/dist/homebridge-ui/public/js/advanced-settings.d.ts +4 -1
- package/dist/homebridge-ui/public/js/advanced-settings.d.ts.map +1 -1
- package/dist/homebridge-ui/public/js/advanced-settings.js +19 -11
- package/dist/homebridge-ui/public/js/advanced-settings.js.map +1 -1
- package/dist/homebridge-ui/public/js/advanced-settings.ts +21 -11
- package/dist/homebridge-ui/public/js/app.js +4 -4
- package/dist/homebridge-ui/public/js/app.js.map +2 -2
- package/dist/homebridge-ui/public/js/modals.js +4 -4
- package/dist/homebridge-ui/public/js/modals.js.map +1 -1
- package/dist/homebridge-ui/public/js/modals.ts +4 -4
- package/dist/homebridge-ui/settings.js.map +1 -1
- package/dist/homebridge-ui/switchbotClient.js +4 -0
- package/dist/homebridge-ui/switchbotClient.js.map +1 -1
- package/dist/settings.d.ts +1 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js.map +1 -1
- package/dist/switchbotClient.d.ts +1 -0
- package/dist/switchbotClient.d.ts.map +1 -1
- package/dist/switchbotClient.js +4 -0
- package/dist/switchbotClient.js.map +1 -1
- package/docs/variables/default.html +1 -1
- package/package.json +1 -1
- package/src/SwitchBotMatterPlatform.ts +1 -1
- package/src/deviceFactory.ts +1 -1
- package/src/devices/genericDevice.ts +44 -6
- package/src/homebridge-ui/endpoints/discovery.ts +2 -0
- package/src/homebridge-ui/public/index.html +12 -2
- package/src/homebridge-ui/public/js/advanced-settings.ts +21 -11
- package/src/homebridge-ui/public/js/modals.ts +4 -4
- package/src/settings.ts +1 -0
- package/src/switchbotClient.ts +5 -0
- package/test/device/curtain-ble-position.spec.ts +34 -0
|
@@ -27,6 +27,7 @@ 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)
|
|
30
31
|
;(document.getElementById('blePollingEnabled') as HTMLInputElement).checked = config.blePollingEnabled !== false
|
|
31
32
|
;(document.getElementById('blePollIntervalMs') as HTMLInputElement).value = String(config.blePollIntervalMs ?? 600000)
|
|
32
33
|
;(document.getElementById('co2AbnormalThreshold') as HTMLInputElement).value = String(config.co2AbnormalThreshold ?? 1000)
|
|
@@ -35,9 +36,9 @@ async function loadAdvancedSettings(): Promise<void> {
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
|
|
38
|
-
async function
|
|
39
|
+
async function syncAdvancedSettings(): Promise<void> {
|
|
39
40
|
const status = document.getElementById('advancedSettingsStatus') as HTMLElement
|
|
40
|
-
status.textContent = '
|
|
41
|
+
status.textContent = 'Updating pending settings...'
|
|
41
42
|
try {
|
|
42
43
|
if (typeof homebridge.getPluginConfig !== 'function') {
|
|
43
44
|
throw new TypeError('homebridge.getPluginConfig is not available')
|
|
@@ -66,6 +67,7 @@ async function saveAdvancedSettings(): Promise<void> {
|
|
|
66
67
|
config.enableMatter = (document.getElementById('enableMatter') as HTMLInputElement).checked
|
|
67
68
|
config.preferMatter = (document.getElementById('preferMatter') as HTMLInputElement).checked
|
|
68
69
|
config.enableBLE = (document.getElementById('enableBLE') as HTMLInputElement).checked
|
|
70
|
+
config.nodeSwitchBotLogLevel = Number((document.getElementById('nodeSwitchBotLogLevel') as HTMLSelectElement).value)
|
|
69
71
|
config.blePollingEnabled = (document.getElementById('blePollingEnabled') as HTMLInputElement).checked
|
|
70
72
|
config.blePollIntervalMs = Number((document.getElementById('blePollIntervalMs') as HTMLInputElement).value) || 600000
|
|
71
73
|
config.co2AbnormalThreshold = Number((document.getElementById('co2AbnormalThreshold') as HTMLInputElement).value) || 1000
|
|
@@ -76,21 +78,29 @@ async function saveAdvancedSettings(): Promise<void> {
|
|
|
76
78
|
} else {
|
|
77
79
|
throw new TypeError('homebridge.updatePluginConfig is not available')
|
|
78
80
|
}
|
|
79
|
-
|
|
80
|
-
await homebridge.savePluginConfig()
|
|
81
|
-
}
|
|
82
|
-
status.textContent = 'Settings saved!'
|
|
81
|
+
status.textContent = 'Changes ready. Click Save to apply them.'
|
|
83
82
|
} catch (e: any) {
|
|
84
|
-
status.textContent = `Failed to
|
|
83
|
+
status.textContent = `Failed to update settings: ${e && e.message ? e.message : e}`
|
|
84
|
+
throw 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
|
+
|
|
88
101
|
document.addEventListener('DOMContentLoaded', () => {
|
|
89
102
|
if (document.getElementById('advancedSettingsCard')) {
|
|
90
103
|
loadAdvancedSettings()
|
|
91
|
-
|
|
92
|
-
if (btn) {
|
|
93
|
-
btn.onclick = saveAdvancedSettings
|
|
94
|
-
}
|
|
104
|
+
document.getElementById('advancedSettingsForm')?.addEventListener('change', queueAdvancedSettingsUpdate)
|
|
95
105
|
}
|
|
96
106
|
})
|
|
@@ -149,7 +149,7 @@ export async function importDiscoveredDevice(device: any): Promise<ImportDiscove
|
|
|
149
149
|
['auto', 'ble', 'openapi'].forEach((val) => {
|
|
150
150
|
const opt = document.createElement('option')
|
|
151
151
|
opt.value = val
|
|
152
|
-
opt.text = val
|
|
152
|
+
opt.text = val === 'ble' ? 'BLE' : val === 'openapi' ? 'OpenAPI' : 'Auto'
|
|
153
153
|
opt.selected = (device.connectionPreference || 'auto') === val
|
|
154
154
|
connectionPrefSelect.appendChild(opt)
|
|
155
155
|
})
|
|
@@ -496,7 +496,7 @@ export async function editDevice(device: any): Promise<void> {
|
|
|
496
496
|
|
|
497
497
|
const nameInput = document.createElement('input')
|
|
498
498
|
nameInput.type = 'text'
|
|
499
|
-
nameInput.value = device.
|
|
499
|
+
nameInput.value = device.configDeviceName || device.name || ''
|
|
500
500
|
nameInput.style.width = '100%'
|
|
501
501
|
nameInput.style.marginBottom = '12px'
|
|
502
502
|
nameInput.style.padding = '8px 10px'
|
|
@@ -568,7 +568,7 @@ export async function editDevice(device: any): Promise<void> {
|
|
|
568
568
|
;['auto', 'ble', 'openapi'].forEach((val) => {
|
|
569
569
|
const opt = document.createElement('option')
|
|
570
570
|
opt.value = val
|
|
571
|
-
opt.text = val
|
|
571
|
+
opt.text = val === 'ble' ? 'BLE' : val === 'openapi' ? 'OpenAPI' : 'Auto'
|
|
572
572
|
opt.selected = (device.connectionPreference || 'auto') === val
|
|
573
573
|
connectionPrefSelect.appendChild(opt)
|
|
574
574
|
})
|
|
@@ -670,7 +670,7 @@ export async function editDevice(device: any): Promise<void> {
|
|
|
670
670
|
const { renderDeviceList } = await import('./render.js')
|
|
671
671
|
|
|
672
672
|
const params = {
|
|
673
|
-
deviceId: device.
|
|
673
|
+
deviceId: device.deviceId,
|
|
674
674
|
configDeviceName: nameInput.value || undefined,
|
|
675
675
|
configDeviceType: typeSelect.value,
|
|
676
676
|
connectionPreference: connectionPrefSelect.value,
|
package/src/settings.ts
CHANGED
package/src/switchbotClient.ts
CHANGED
|
@@ -81,6 +81,7 @@ export class SwitchBotClient implements ISwitchBotClient {
|
|
|
81
81
|
enableBLE: this.cfg.enableBLE !== false, // Use config value, default true
|
|
82
82
|
scanTimeout,
|
|
83
83
|
...rawNodeClientConfig,
|
|
84
|
+
logLevel: this.cfg.nodeSwitchBotLogLevel ?? rawNodeClientConfig.logLevel,
|
|
84
85
|
})
|
|
85
86
|
this.lastDiscoveryAt = 0
|
|
86
87
|
this.logger?.info?.('SwitchBot client initialized with native resilience features')
|
|
@@ -159,6 +160,10 @@ export class SwitchBotClient implements ISwitchBotClient {
|
|
|
159
160
|
throw new SwitchbotOperationError('No SwitchBot client available', 'no_client')
|
|
160
161
|
}
|
|
161
162
|
|
|
163
|
+
getCachedDevice(id: string): any {
|
|
164
|
+
return this.getManagedDevice(id)
|
|
165
|
+
}
|
|
166
|
+
|
|
162
167
|
async getDevices(): Promise<any[]> {
|
|
163
168
|
if (this.client) {
|
|
164
169
|
try {
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest'
|
|
2
|
+
|
|
3
|
+
import { CurtainDevice } from '../../src/devices/genericDevice'
|
|
4
|
+
|
|
5
|
+
describe('curtain BLE position', () => {
|
|
6
|
+
it('keeps a commanded position when an old advertisement reappears', async () => {
|
|
7
|
+
let advertisement = { position: 39 }
|
|
8
|
+
const nodeDevice = {
|
|
9
|
+
hasBLE: () => true,
|
|
10
|
+
getInfo: () => ({ bleServiceData: advertisement }),
|
|
11
|
+
}
|
|
12
|
+
const client = { getCachedDevice: () => nodeDevice }
|
|
13
|
+
const log = { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() }
|
|
14
|
+
const curtain = new CurtainDevice({ id: 'curtain', type: 'Curtain', log, blePollingEnabled: false }, { _client: client, log } as any)
|
|
15
|
+
const getState = vi.spyOn(curtain, 'getState')
|
|
16
|
+
vi.spyOn(curtain, 'setState').mockResolvedValue(true)
|
|
17
|
+
const characteristics = curtain.createHAPAccessory({}).services[0].characteristics
|
|
18
|
+
|
|
19
|
+
expect(await characteristics.CurrentPosition.get()).toBe(61)
|
|
20
|
+
await characteristics.TargetPosition.set(69)
|
|
21
|
+
expect(await characteristics.CurrentPosition.get()).toBe(69)
|
|
22
|
+
|
|
23
|
+
advertisement = { position: 39 }
|
|
24
|
+
expect(await characteristics.CurrentPosition.get()).toBe(69)
|
|
25
|
+
expect(await characteristics.TargetPosition.get()).toBe(69)
|
|
26
|
+
|
|
27
|
+
advertisement = { position: 31 }
|
|
28
|
+
expect(await characteristics.CurrentPosition.get()).toBe(69)
|
|
29
|
+
|
|
30
|
+
advertisement = { position: 39 }
|
|
31
|
+
expect(await characteristics.CurrentPosition.get()).toBe(69)
|
|
32
|
+
expect(getState).not.toHaveBeenCalled()
|
|
33
|
+
})
|
|
34
|
+
})
|