@switchbot/homebridge-switchbot 5.0.0-beta.98 → 5.0.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.
- package/.changeset/config.json +14 -0
- package/.github/copilot-instructions.md +39 -0
- package/.github/workflows/ci.yml +4 -1
- package/.github/workflows/manual-e2e.yml +6 -3
- package/.github/workflows/release.yml +64 -15
- package/.github/workflows/stale.yml +2 -4
- package/.husky/pre-push +15 -0
- package/CHANGELOG.md +126 -134
- package/MIGRATION.md +16 -6
- package/README.md +84 -3
- package/TODO.md +263 -0
- package/config.schema.json +229 -36
- package/dist/SwitchBotHAPPlatform.d.ts +133 -0
- package/dist/SwitchBotHAPPlatform.d.ts.map +1 -0
- package/dist/SwitchBotHAPPlatform.js +555 -0
- package/dist/SwitchBotHAPPlatform.js.map +1 -0
- package/dist/SwitchBotMatterPlatform.d.ts +141 -0
- package/dist/SwitchBotMatterPlatform.d.ts.map +1 -0
- package/dist/SwitchBotMatterPlatform.js +536 -0
- package/dist/SwitchBotMatterPlatform.js.map +1 -0
- package/dist/device-types.d.ts +31 -0
- package/dist/device-types.d.ts.map +1 -0
- package/dist/device-types.js +246 -0
- package/dist/device-types.js.map +1 -0
- package/dist/deviceCommandMapper.d.ts +10 -0
- package/dist/deviceCommandMapper.d.ts.map +1 -0
- package/dist/deviceCommandMapper.js +319 -0
- package/dist/deviceCommandMapper.js.map +1 -0
- package/dist/deviceFactory.d.ts +3 -2
- package/dist/deviceFactory.d.ts.map +1 -1
- package/dist/deviceFactory.js +107 -29
- package/dist/deviceFactory.js.map +1 -1
- package/dist/devices/genericDevice.d.ts +59 -37
- package/dist/devices/genericDevice.d.ts.map +1 -1
- package/dist/devices/genericDevice.js +376 -78
- package/dist/devices/genericDevice.js.map +1 -1
- package/dist/errors.d.ts +38 -0
- package/dist/errors.d.ts.map +1 -0
- package/dist/errors.js +32 -0
- package/dist/errors.js.map +1 -0
- package/dist/homebridge-ui/device-types.js +246 -0
- package/dist/homebridge-ui/device-types.js.map +1 -0
- package/dist/homebridge-ui/deviceCommandMapper.js +319 -0
- package/dist/homebridge-ui/deviceCommandMapper.js.map +1 -0
- package/dist/homebridge-ui/endpoints/config.d.ts +3 -0
- package/dist/homebridge-ui/endpoints/config.d.ts.map +1 -0
- package/dist/homebridge-ui/endpoints/config.js +90 -0
- package/dist/homebridge-ui/endpoints/config.js.map +1 -0
- package/dist/homebridge-ui/endpoints/devices.d.ts +6 -0
- package/dist/homebridge-ui/endpoints/devices.d.ts.map +1 -0
- package/dist/homebridge-ui/endpoints/devices.js +144 -0
- package/dist/homebridge-ui/endpoints/devices.js.map +1 -0
- package/dist/homebridge-ui/endpoints/discovery.d.ts +7 -0
- package/dist/homebridge-ui/endpoints/discovery.d.ts.map +1 -0
- package/dist/homebridge-ui/endpoints/discovery.js +219 -0
- package/dist/homebridge-ui/endpoints/discovery.js.map +1 -0
- package/dist/homebridge-ui/errors.js +32 -0
- package/dist/homebridge-ui/errors.js.map +1 -0
- package/dist/homebridge-ui/homebridge-ui/endpoints/config.js +90 -0
- package/dist/homebridge-ui/homebridge-ui/endpoints/config.js.map +1 -0
- package/dist/homebridge-ui/homebridge-ui/endpoints/devices.js +144 -0
- package/dist/homebridge-ui/homebridge-ui/endpoints/devices.js.map +1 -0
- package/dist/homebridge-ui/homebridge-ui/endpoints/discovery.js +219 -0
- package/dist/homebridge-ui/homebridge-ui/endpoints/discovery.js.map +1 -0
- package/dist/homebridge-ui/homebridge-ui/server.js +11 -0
- package/dist/homebridge-ui/homebridge-ui/server.js.map +1 -0
- package/dist/homebridge-ui/homebridge-ui/utils/config-parser.js +108 -0
- package/dist/homebridge-ui/homebridge-ui/utils/config-parser.js.map +1 -0
- package/dist/homebridge-ui/homebridge-ui/utils/device-migration.js +111 -0
- package/dist/homebridge-ui/homebridge-ui/utils/device-migration.js.map +1 -0
- package/dist/homebridge-ui/homebridge-ui/utils/logger.js +17 -0
- package/dist/homebridge-ui/homebridge-ui/utils/logger.js.map +1 -0
- package/dist/homebridge-ui/public/css/styles.css +483 -0
- package/dist/homebridge-ui/public/index.html +197 -621
- package/dist/homebridge-ui/public/js/advanced-settings.d.ts +3 -0
- package/dist/homebridge-ui/public/js/advanced-settings.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/advanced-settings.js +95 -0
- package/dist/homebridge-ui/public/js/advanced-settings.js.map +1 -0
- package/dist/homebridge-ui/public/js/advanced-settings.ts +94 -0
- package/dist/homebridge-ui/public/js/api.d.ts +66 -0
- package/dist/homebridge-ui/public/js/api.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/api.js +295 -0
- package/dist/homebridge-ui/public/js/api.js.map +1 -0
- package/dist/homebridge-ui/public/js/api.ts +355 -0
- package/dist/homebridge-ui/public/js/app.d.ts +2 -0
- package/dist/homebridge-ui/public/js/app.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/app.js +3722 -0
- package/dist/homebridge-ui/public/js/app.js.map +7 -0
- package/dist/homebridge-ui/public/js/app.ts +22 -0
- package/dist/homebridge-ui/public/js/constants.d.ts +2 -0
- package/dist/homebridge-ui/public/js/constants.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/constants.js +2 -0
- package/dist/homebridge-ui/public/js/constants.js.map +1 -0
- package/dist/homebridge-ui/public/js/constants.ts +1 -0
- package/dist/homebridge-ui/public/js/credentials.d.ts +3 -0
- package/dist/homebridge-ui/public/js/credentials.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/credentials.js +99 -0
- package/dist/homebridge-ui/public/js/credentials.js.map +1 -0
- package/dist/homebridge-ui/public/js/credentials.ts +105 -0
- package/dist/homebridge-ui/public/js/devices-delete.d.ts +3 -0
- package/dist/homebridge-ui/public/js/devices-delete.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/devices-delete.js +199 -0
- package/dist/homebridge-ui/public/js/devices-delete.js.map +1 -0
- package/dist/homebridge-ui/public/js/devices-delete.ts +227 -0
- package/dist/homebridge-ui/public/js/devices.d.ts +9 -0
- package/dist/homebridge-ui/public/js/devices.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/devices.js +98 -0
- package/dist/homebridge-ui/public/js/devices.js.map +1 -0
- package/dist/homebridge-ui/public/js/devices.ts +106 -0
- package/dist/homebridge-ui/public/js/discovery.d.ts +9 -0
- package/dist/homebridge-ui/public/js/discovery.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/discovery.js +1201 -0
- package/dist/homebridge-ui/public/js/discovery.js.map +1 -0
- package/dist/homebridge-ui/public/js/discovery.ts +1335 -0
- package/dist/homebridge-ui/public/js/logger.d.ts +7 -0
- package/dist/homebridge-ui/public/js/logger.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/logger.js +17 -0
- package/dist/homebridge-ui/public/js/logger.js.map +1 -0
- package/dist/homebridge-ui/public/js/logger.ts +17 -0
- package/dist/homebridge-ui/public/js/modal.d.ts +5 -0
- package/dist/homebridge-ui/public/js/modal.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/modal.js +35 -0
- package/dist/homebridge-ui/public/js/modal.js.map +1 -0
- package/dist/homebridge-ui/public/js/modal.ts +35 -0
- package/dist/homebridge-ui/public/js/modals.d.ts +15 -0
- package/dist/homebridge-ui/public/js/modals.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/modals.js +675 -0
- package/dist/homebridge-ui/public/js/modals.js.map +1 -0
- package/dist/homebridge-ui/public/js/modals.ts +765 -0
- package/dist/homebridge-ui/public/js/render.d.ts +71 -0
- package/dist/homebridge-ui/public/js/render.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/render.js +960 -0
- package/dist/homebridge-ui/public/js/render.js.map +1 -0
- package/dist/homebridge-ui/public/js/render.ts +1084 -0
- package/dist/homebridge-ui/public/js/toast.d.ts +6 -0
- package/dist/homebridge-ui/public/js/toast.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/toast.js +38 -0
- package/dist/homebridge-ui/public/js/toast.js.map +1 -0
- package/dist/homebridge-ui/public/js/toast.ts +44 -0
- package/dist/homebridge-ui/public/js/types.d.ts +23 -0
- package/dist/homebridge-ui/public/js/types.d.ts.map +1 -0
- package/dist/homebridge-ui/public/js/types.js +2 -0
- package/dist/homebridge-ui/public/js/types.js.map +1 -0
- package/dist/homebridge-ui/public/js/types.ts +26 -0
- package/dist/homebridge-ui/server.d.ts +1 -3
- package/dist/homebridge-ui/server.d.ts.map +1 -1
- package/dist/homebridge-ui/server.js +8 -450
- package/dist/homebridge-ui/server.js.map +1 -1
- package/dist/homebridge-ui/settings.js +8 -0
- package/dist/homebridge-ui/settings.js.map +1 -0
- package/dist/homebridge-ui/switchbotClient.js +247 -0
- package/dist/homebridge-ui/switchbotClient.js.map +1 -0
- package/dist/homebridge-ui/utils/config-parser.d.ts +39 -0
- package/dist/homebridge-ui/utils/config-parser.d.ts.map +1 -0
- package/dist/homebridge-ui/utils/config-parser.js +108 -0
- package/dist/homebridge-ui/utils/config-parser.js.map +1 -0
- package/dist/homebridge-ui/utils/device-migration.d.ts +35 -0
- package/dist/homebridge-ui/utils/device-migration.d.ts.map +1 -0
- package/dist/homebridge-ui/utils/device-migration.js +111 -0
- package/dist/homebridge-ui/utils/device-migration.js.map +1 -0
- package/dist/homebridge-ui/utils/logger.d.ts +7 -0
- package/dist/homebridge-ui/utils/logger.d.ts.map +1 -0
- package/dist/homebridge-ui/utils/logger.js +17 -0
- package/dist/homebridge-ui/utils/logger.js.map +1 -0
- package/dist/index.d.ts +10 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -2
- package/dist/index.js.map +1 -1
- package/dist/settings.d.ts +1 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +1 -0
- package/dist/settings.js.map +1 -1
- package/dist/switchbotClient.d.ts +12 -10
- package/dist/switchbotClient.d.ts.map +1 -1
- package/dist/switchbotClient.js +156 -103
- package/dist/switchbotClient.js.map +1 -1
- package/dist/utils.d.ts +76 -1
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +1121 -4
- package/dist/utils.js.map +1 -1
- package/docs/assets/highlight.css +16 -2
- package/docs/assets/main.js +1 -1
- package/docs/index.html +82 -5
- package/docs/variables/default.html +3 -1
- package/eslint.config.js +9 -5
- package/nodemon.json +2 -2
- package/package.json +34 -21
- package/scripts/build-ui.js +37 -0
- package/scripts/free-dev-ports.mjs +105 -0
- package/scripts/generate-matter-maps.js +34 -17
- package/scripts/sync-device-types.mjs +31 -0
- package/src/SwitchBotHAPPlatform.ts +558 -0
- package/src/SwitchBotMatterPlatform.ts +538 -0
- package/src/device-types.js +246 -0
- package/src/device-types.js.map +1 -0
- package/src/device-types.ts +261 -0
- package/src/deviceCommandMapper.js +319 -0
- package/src/deviceCommandMapper.js.map +1 -0
- package/src/deviceCommandMapper.ts +333 -0
- package/src/deviceFactory.ts +125 -45
- package/src/devices/genericDevice.ts +411 -69
- package/src/errors.js +32 -0
- package/src/errors.js.map +1 -0
- package/src/errors.ts +35 -0
- package/src/homebridge-ui/endpoints/config.ts +110 -0
- package/src/homebridge-ui/endpoints/devices.ts +153 -0
- package/src/homebridge-ui/endpoints/discovery.ts +240 -0
- package/src/homebridge-ui/public/css/styles.css +483 -0
- package/src/homebridge-ui/public/index.html +197 -621
- package/src/homebridge-ui/public/js/advanced-settings.ts +94 -0
- package/src/homebridge-ui/public/js/api.ts +355 -0
- package/src/homebridge-ui/public/js/app.ts +22 -0
- package/src/homebridge-ui/public/js/constants.ts +1 -0
- package/src/homebridge-ui/public/js/credentials.ts +105 -0
- package/src/homebridge-ui/public/js/devices-delete.ts +227 -0
- package/src/homebridge-ui/public/js/devices.ts +106 -0
- package/src/homebridge-ui/public/js/discovery.ts +1335 -0
- package/src/homebridge-ui/public/js/logger.ts +17 -0
- package/src/homebridge-ui/public/js/modal.ts +35 -0
- package/src/homebridge-ui/public/js/modals.ts +765 -0
- package/src/homebridge-ui/public/js/render.ts +1084 -0
- package/src/homebridge-ui/public/js/toast.ts +44 -0
- package/src/homebridge-ui/public/js/types.ts +26 -0
- package/src/homebridge-ui/server.ts +9 -526
- package/src/homebridge-ui/utils/config-parser.ts +125 -0
- package/src/homebridge-ui/utils/device-migration.ts +144 -0
- package/src/homebridge-ui/utils/logger.ts +17 -0
- package/src/index.ts +12 -2
- package/src/settings.js +8 -0
- package/src/settings.js.map +1 -0
- package/src/settings.ts +2 -0
- package/src/switchbotClient.js +247 -0
- package/src/switchbotClient.js.map +1 -0
- package/src/switchbotClient.ts +177 -114
- package/src/utils.ts +1133 -5
- package/test/client/switchbot-client-debounce.spec.ts +35 -0
- package/test/client/switchbot-client-openapi.spec.ts +19 -0
- package/test/client/switchbotClient.spec.ts +64 -0
- package/test/device/device-mapping.spec.ts +23 -0
- package/test/device/deviceBase.spec.ts +26 -0
- package/test/device/deviceFactory-edge.spec.ts +15 -0
- package/test/device/deviceFactory.spec.ts +33 -0
- package/test/device/fan-swing.spec.ts +34 -0
- package/test/device/genericDevice-blepoll.spec.ts +47 -0
- package/test/device/irdevice.spec.ts +9 -0
- package/test/device/lock-users.spec.ts +35 -0
- package/test/device/matter-descriptors.spec.ts +22 -0
- package/test/device/matter-device-state.spec.ts +37 -0
- package/test/e2e/run-e2e.spec.ts +18 -19
- package/test/errors/errors.spec.ts +10 -0
- package/test/helpers/matter-harness.ts +20 -9
- package/test/homebridge-ui/server.spec.ts +9 -0
- package/test/platform/accessory-restore.spec.ts +37 -0
- package/test/platform/matter-childbridge.spec.ts +34 -0
- package/test/platform/matter-integration.spec.ts +33 -0
- package/test/platform/platform-edge.spec.ts +73 -0
- package/test/platform/platform.integration.spec.ts +34 -0
- package/test/utils/utils-extra.spec.ts +10 -0
- package/test/utils/utils.spec.ts +53 -0
- package/todo/TODO.md +80 -0
- package/tsconfig.ui.json +11 -0
- package/.github/npm-version-script-esm.js +0 -97
- package/.github/workflows/beta-release.yml +0 -52
- package/dist/platform.d.ts +0 -35
- package/dist/platform.d.ts.map +0 -1
- package/dist/platform.js +0 -850
- package/dist/platform.js.map +0 -1
- package/src/platform.ts +0 -867
- package/test/accessory-restore.spec.ts +0 -73
- package/test/device-mapping.spec.ts +0 -37
- package/test/deviceFactory.spec.ts +0 -18
- package/test/fan-swing.spec.ts +0 -29
- package/test/lock-users.spec.ts +0 -44
- package/test/matter-childbridge.spec.ts +0 -55
- package/test/matter-descriptors.spec.ts +0 -97
- package/test/matter-device-state.spec.ts +0 -101
- package/test/matter-integration.spec.ts +0 -70
- package/test/platform.integration.spec.ts +0 -55
- package/test/switchbot-client-debounce.spec.ts +0 -131
- package/test/switchbot-client-openapi.spec.ts +0 -56
- package/test/switchbotClient.spec.ts +0 -10
- package/test/utils.spec.ts +0 -20
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import { RequestError } from '@homebridge/plugin-ui-utils';
|
|
2
|
+
import { getCredential, getSwitchBotPlatformConfig } from '../utils/config-parser.js';
|
|
3
|
+
import { uiLog } from '../utils/logger.js';
|
|
4
|
+
/**
|
|
5
|
+
* Register discovery endpoint
|
|
6
|
+
* Discovers SwitchBot devices via BLE and OpenAPI
|
|
7
|
+
*/
|
|
8
|
+
export function registerDiscoveryEndpoint(server) {
|
|
9
|
+
server.onRequest('/ble-status', async () => {
|
|
10
|
+
try {
|
|
11
|
+
const { platform } = await getSwitchBotPlatformConfig(server);
|
|
12
|
+
const token = getCredential(platform, 'openApiToken') || platform.token;
|
|
13
|
+
const secret = getCredential(platform, 'openApiSecret') || platform.secret;
|
|
14
|
+
const { SwitchBot } = await import('node-switchbot');
|
|
15
|
+
const switchbot = new SwitchBot({
|
|
16
|
+
token: token || undefined,
|
|
17
|
+
secret: secret || undefined,
|
|
18
|
+
enableBLE: true,
|
|
19
|
+
enableFallback: true,
|
|
20
|
+
enableRetry: true,
|
|
21
|
+
enableCircuitBreaker: true,
|
|
22
|
+
enableConnectionIntelligence: true,
|
|
23
|
+
});
|
|
24
|
+
await switchbot.discover({ timeout: 1000 });
|
|
25
|
+
return { success: true, data: { available: true, message: 'adapter ready' } };
|
|
26
|
+
}
|
|
27
|
+
catch (e) {
|
|
28
|
+
const message = e instanceof Error ? e.message : String(e);
|
|
29
|
+
uiLog.warn(`GET /ble-status failed: ${message}`);
|
|
30
|
+
return { success: true, data: { available: false, message } };
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
server.onRequest('/discover', async (payload) => {
|
|
34
|
+
uiLog.debug(`[SwitchBot UI/Server] /discover incoming payload: ${JSON.stringify(payload)}`);
|
|
35
|
+
try {
|
|
36
|
+
const { platform } = await getSwitchBotPlatformConfig(server);
|
|
37
|
+
const mode = String(payload?.mode || 'all').toLowerCase();
|
|
38
|
+
// Only run BLE if mode is all/ble AND bleEnabled is not false (default true if missing)
|
|
39
|
+
const bleEnabled = payload?.bleEnabled !== false;
|
|
40
|
+
const runBle = (mode === 'all' || mode === 'ble') && bleEnabled;
|
|
41
|
+
const runOpenApi = mode === 'all' || mode === 'openapi';
|
|
42
|
+
const bleScanDurationSeconds = Math.max(3, Math.min(15, Number(payload?.bleScanDurationSeconds || 5)));
|
|
43
|
+
const bleTimeoutSeconds = Math.max(3, Math.min(30, Number(payload?.bleTimeoutSeconds || 8)));
|
|
44
|
+
uiLog.debug(`GET /discover - Platform config keys: ${Object.keys(platform).join(', ')}`);
|
|
45
|
+
const token = getCredential(platform, 'openApiToken') || platform.token;
|
|
46
|
+
const secret = getCredential(platform, 'openApiSecret') || platform.secret;
|
|
47
|
+
const hasOpenAPICredentials = !!(token && secret);
|
|
48
|
+
if (!hasOpenAPICredentials) {
|
|
49
|
+
uiLog.warn('GET /discover - No OpenAPI credentials found, will attempt BLE-only discovery');
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
uiLog.info('GET /discover - Using OpenAPI credentials for discovery');
|
|
53
|
+
}
|
|
54
|
+
// Import and initialize node-switchbot
|
|
55
|
+
const { SwitchBot } = await import('node-switchbot');
|
|
56
|
+
const switchbot = new SwitchBot({
|
|
57
|
+
token: token || undefined,
|
|
58
|
+
secret: secret || undefined,
|
|
59
|
+
enableBLE: true,
|
|
60
|
+
enableFallback: true,
|
|
61
|
+
enableRetry: true,
|
|
62
|
+
enableCircuitBreaker: true,
|
|
63
|
+
enableConnectionIntelligence: true,
|
|
64
|
+
});
|
|
65
|
+
const deviceMap = new Map();
|
|
66
|
+
// 1. Try BLE discovery first (with timeout)
|
|
67
|
+
if (runBle) {
|
|
68
|
+
uiLog.info('GET /discover - Starting BLE scan...');
|
|
69
|
+
try {
|
|
70
|
+
const bleTimeout = bleTimeoutSeconds * 1000;
|
|
71
|
+
const bleDiscoveryPromise = switchbot.discover({ timeout: bleScanDurationSeconds * 1000 });
|
|
72
|
+
const bleDevices = await Promise.race([
|
|
73
|
+
bleDiscoveryPromise,
|
|
74
|
+
new Promise(resolve => setTimeout(resolve, bleTimeout, [])),
|
|
75
|
+
]);
|
|
76
|
+
if (Array.isArray(bleDevices) && bleDevices.length > 0) {
|
|
77
|
+
uiLog.info(`GET /discover - Found ${bleDevices.length} BLE devices`);
|
|
78
|
+
for (const [index, d] of bleDevices.entries()) {
|
|
79
|
+
const info = typeof d?.getInfo === 'function' ? d.getInfo() : undefined;
|
|
80
|
+
const id = d?.id
|
|
81
|
+
|| (typeof d?.getId === 'function' ? d.getId() : undefined)
|
|
82
|
+
|| info?.id;
|
|
83
|
+
const mac = d?.mac
|
|
84
|
+
|| (typeof d?.getMAC === 'function' ? d.getMAC() : undefined)
|
|
85
|
+
|| info?.mac;
|
|
86
|
+
if (!id) {
|
|
87
|
+
uiLog.warn(`GET /discover - BLE device at index ${index} has no id, skipping`);
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
const connectionTypes = Array.isArray(info?.connectionTypes) ? info.connectionTypes : [];
|
|
91
|
+
const isHybrid = connectionTypes.includes('api');
|
|
92
|
+
deviceMap.set(id, {
|
|
93
|
+
id,
|
|
94
|
+
name: d?.name || (typeof d?.getName === 'function' ? d.getName() : undefined) || info?.name || d?.deviceName || id,
|
|
95
|
+
type: d?.deviceType || (typeof d?.getDeviceType === 'function' ? d.getDeviceType() : undefined) || info?.deviceType || d?.type || d?.model || 'unknown',
|
|
96
|
+
model: info?.model || d?.model || d?.deviceModel,
|
|
97
|
+
address: mac,
|
|
98
|
+
connectionType: isHybrid ? 'Both' : 'BLE',
|
|
99
|
+
rssi: info?.rssi || d?.rssi,
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
uiLog.info('GET /discover - No BLE devices found or scan timed out');
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
catch (bleErr) {
|
|
108
|
+
uiLog.warn(`GET /discover - BLE discovery failed: ${bleErr instanceof Error ? bleErr.message : String(bleErr)}`);
|
|
109
|
+
// Continue with OpenAPI even if BLE fails
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
// 2. Get devices from OpenAPI (only if credentials are available)
|
|
113
|
+
if (runOpenApi && hasOpenAPICredentials) {
|
|
114
|
+
uiLog.info('GET /discover - Fetching devices from OpenAPI...');
|
|
115
|
+
try {
|
|
116
|
+
const apiClient = switchbot.getAPIClient();
|
|
117
|
+
if (!apiClient) {
|
|
118
|
+
throw new Error('API client not available - token/secret may be missing');
|
|
119
|
+
}
|
|
120
|
+
const apiData = await apiClient.getDevices();
|
|
121
|
+
uiLog.debug(`GET /discover - OpenAPI response: ${JSON.stringify(apiData)}`);
|
|
122
|
+
// Parse physical devices - apiData is DeviceListResponse with deviceList and infraredRemoteList
|
|
123
|
+
const devices = apiData.deviceList || [];
|
|
124
|
+
const irDevices = apiData.infraredRemoteList || [];
|
|
125
|
+
uiLog.info(`GET /discover - Found ${devices.length} OpenAPI physical devices and ${irDevices.length} IR devices`);
|
|
126
|
+
// Process physical devices from OpenAPI
|
|
127
|
+
for (const d of devices) {
|
|
128
|
+
const id = d.deviceId;
|
|
129
|
+
if (!id) {
|
|
130
|
+
continue;
|
|
131
|
+
}
|
|
132
|
+
const existing = deviceMap.get(id);
|
|
133
|
+
if (existing) {
|
|
134
|
+
// Device found via both BLE and OpenAPI
|
|
135
|
+
existing.connectionType = 'Both';
|
|
136
|
+
existing.name = d.deviceName || existing.name;
|
|
137
|
+
existing.type = d.deviceType || existing.type;
|
|
138
|
+
// Note: APIDevice doesn't have a model property
|
|
139
|
+
existing.enabled = d.enableCloudService !== false;
|
|
140
|
+
existing.hubDeviceId = d.hubDeviceId;
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
// Device only found via OpenAPI
|
|
144
|
+
deviceMap.set(id, {
|
|
145
|
+
id,
|
|
146
|
+
name: d.deviceName || id,
|
|
147
|
+
type: d.deviceType || 'unknown',
|
|
148
|
+
enabled: d.enableCloudService !== false,
|
|
149
|
+
hubDeviceId: d.hubDeviceId,
|
|
150
|
+
connectionType: 'OpenAPI',
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
// Process IR devices (OpenAPI only)
|
|
155
|
+
for (const d of irDevices) {
|
|
156
|
+
const id = d.deviceId;
|
|
157
|
+
if (!id) {
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
deviceMap.set(id, {
|
|
161
|
+
id,
|
|
162
|
+
name: d.deviceName || id,
|
|
163
|
+
type: d.remoteType || 'unknown',
|
|
164
|
+
enabled: true,
|
|
165
|
+
hubDeviceId: d.hubDeviceId,
|
|
166
|
+
connectionType: 'OpenAPI',
|
|
167
|
+
isIR: true,
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
catch (apiErr) {
|
|
172
|
+
uiLog.error(`GET /discover - OpenAPI discovery failed: ${apiErr instanceof Error ? apiErr.message : String(apiErr)}`);
|
|
173
|
+
// If we have BLE devices, we can still return those
|
|
174
|
+
if (deviceMap.size === 0) {
|
|
175
|
+
throw apiErr;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
else if (runOpenApi) {
|
|
180
|
+
uiLog.info('GET /discover - Skipping OpenAPI discovery (no credentials configured)');
|
|
181
|
+
}
|
|
182
|
+
const normalizedBleDevices = [...deviceMap.values()].filter(d => d.connectionType === 'BLE' || d.connectionType === 'Both');
|
|
183
|
+
const firstNormalizedBleId = normalizedBleDevices[0]?.id || 'none';
|
|
184
|
+
uiLog.info(`GET /discover - Normalized BLE devices: ${normalizedBleDevices.length} (firstId: ${firstNormalizedBleId})`);
|
|
185
|
+
// Check if we found any devices
|
|
186
|
+
if (deviceMap.size === 0 && mode === 'openapi' && !hasOpenAPICredentials) {
|
|
187
|
+
return { success: true, data: [] };
|
|
188
|
+
}
|
|
189
|
+
if (deviceMap.size === 0) {
|
|
190
|
+
const errorMsg = hasOpenAPICredentials
|
|
191
|
+
? 'No devices found via BLE or OpenAPI. Make sure devices are powered on and in range.'
|
|
192
|
+
: 'No devices found via BLE. OpenAPI credentials not configured. Please save your credentials in settings to discover cloud-connected devices, or ensure BLE devices are powered on and in range.';
|
|
193
|
+
uiLog.error(`GET /discover - ${errorMsg}`);
|
|
194
|
+
throw new Error(errorMsg);
|
|
195
|
+
}
|
|
196
|
+
// Convert map to array
|
|
197
|
+
const allDiscovered = [...deviceMap.values()];
|
|
198
|
+
const bleCount = allDiscovered.filter(d => d.connectionType === 'BLE').length;
|
|
199
|
+
const apiCount = allDiscovered.filter(d => d.connectionType === 'OpenAPI').length;
|
|
200
|
+
const bothCount = allDiscovered.filter(d => d.connectionType === 'Both').length;
|
|
201
|
+
uiLog.info(`GET /discover - Total: ${allDiscovered.length} devices (BLE: ${bleCount}, OpenAPI: ${apiCount}, Both: ${bothCount})`);
|
|
202
|
+
return { success: true, data: allDiscovered };
|
|
203
|
+
}
|
|
204
|
+
catch (e) {
|
|
205
|
+
if (e instanceof Error) {
|
|
206
|
+
uiLog.error(`Error in /discover: ${e.message}`);
|
|
207
|
+
if (e.stack) {
|
|
208
|
+
uiLog.error(`[Stack] ${e.stack}`);
|
|
209
|
+
}
|
|
210
|
+
uiLog.error(`[Object]`, e);
|
|
211
|
+
}
|
|
212
|
+
else {
|
|
213
|
+
uiLog.error(`Error in /discover: ${String(e)}`);
|
|
214
|
+
}
|
|
215
|
+
throw new RequestError(`Failed to discover devices: ${e instanceof Error ? e.message : String(e)}`, e);
|
|
216
|
+
}
|
|
217
|
+
});
|
|
218
|
+
}
|
|
219
|
+
//# sourceMappingURL=discovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/homebridge-ui/endpoints/discovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
// Error classes for node-switchbot v4 compatibility
|
|
2
|
+
// Always use local fallback classes for compatibility; upstream error classes are not guaranteed to exist
|
|
3
|
+
const SwitchbotOperationError = class extends Error {
|
|
4
|
+
code;
|
|
5
|
+
cause;
|
|
6
|
+
constructor(message, code, cause) {
|
|
7
|
+
super(message);
|
|
8
|
+
this.name = 'SwitchbotOperationError';
|
|
9
|
+
this.code = code;
|
|
10
|
+
this.cause = cause;
|
|
11
|
+
}
|
|
12
|
+
};
|
|
13
|
+
const SwitchbotAuthenticationError = class extends Error {
|
|
14
|
+
code;
|
|
15
|
+
cause;
|
|
16
|
+
constructor(message, code, cause) {
|
|
17
|
+
super(message);
|
|
18
|
+
this.name = 'SwitchbotAuthenticationError';
|
|
19
|
+
this.code = code;
|
|
20
|
+
this.cause = cause;
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
const CharacteristicMissingError = class extends Error {
|
|
24
|
+
characteristic;
|
|
25
|
+
constructor(message, characteristic) {
|
|
26
|
+
super(message);
|
|
27
|
+
this.name = 'CharacteristicMissingError';
|
|
28
|
+
this.characteristic = characteristic;
|
|
29
|
+
}
|
|
30
|
+
};
|
|
31
|
+
export { CharacteristicMissingError, SwitchbotAuthenticationError, SwitchbotOperationError };
|
|
32
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,0GAA0G;AAE1G,MAAM,uBAAuB,GAAG,KAAM,SAAQ,KAAK;IACjD,IAAI,CAAS;IACb,KAAK,CAAQ;IACb,YAAY,OAAe,EAAE,IAAa,EAAE,KAAa;QACvD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAA;QACrC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;CACF,CAAA;AAED,MAAM,4BAA4B,GAAG,KAAM,SAAQ,KAAK;IACtD,IAAI,CAAS;IACb,KAAK,CAAQ;IACb,YAAY,OAAe,EAAE,IAAa,EAAE,KAAa;QACvD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAA;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACpB,CAAC;CACF,CAAA;AAED,MAAM,0BAA0B,GAAG,KAAM,SAAQ,KAAK;IACpD,cAAc,CAAQ;IACtB,YAAY,OAAe,EAAE,cAAsB;QACjD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAA;QACxC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;IACtC,CAAC;CACF,CAAA;AAED,OAAO,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,CAAA"}
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
import { RequestError } from '@homebridge/plugin-ui-utils';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
|
+
import { isValidDeviceType } from '../../device-types.js';
|
|
4
|
+
import { getAllDevices, SWITCHBOT_PLATFORM_REGEX } from '../utils/config-parser.js';
|
|
5
|
+
import { validateAndMigrateDeviceType } from '../utils/device-migration.js';
|
|
6
|
+
import { uiLog } from '../utils/logger.js';
|
|
7
|
+
export function registerConfigEndpoints(server) {
|
|
8
|
+
/**
|
|
9
|
+
* GET /devices - List all configured devices from Homebridge config
|
|
10
|
+
*/
|
|
11
|
+
server.onRequest('/devices', async () => {
|
|
12
|
+
try {
|
|
13
|
+
const cfgPath = server.homebridgeConfigPath;
|
|
14
|
+
if (!cfgPath) {
|
|
15
|
+
throw new Error('HOMEBRIDGE_CONFIG_PATH not set');
|
|
16
|
+
}
|
|
17
|
+
const raw = await fs.readFile(cfgPath, 'utf8');
|
|
18
|
+
const cfg = JSON.parse(raw);
|
|
19
|
+
const found = [];
|
|
20
|
+
const invalidTypeDevices = [];
|
|
21
|
+
const platforms = Array.isArray(cfg.platforms) ? cfg.platforms : [];
|
|
22
|
+
for (const p of platforms) {
|
|
23
|
+
try {
|
|
24
|
+
const platformName = p.platform || p.name || '';
|
|
25
|
+
// Match known SwitchBot platform identifiers
|
|
26
|
+
if (!platformName || !SWITCHBOT_PLATFORM_REGEX.test(String(platformName))) {
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
const devices = getAllDevices(p);
|
|
30
|
+
for (const d of devices) {
|
|
31
|
+
const id = d.deviceId ?? d.id;
|
|
32
|
+
if (!id) {
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
const deviceType = d.configDeviceType ?? d.type ?? d.deviceType;
|
|
36
|
+
const deviceName = d.configDeviceName ?? d.name ?? d.deviceName;
|
|
37
|
+
// Validate device type
|
|
38
|
+
const deviceObj = { configDeviceType: deviceType, configDeviceName: deviceName, deviceId: id };
|
|
39
|
+
const validationResult = validateAndMigrateDeviceType(deviceObj, false);
|
|
40
|
+
const deviceEntry = {
|
|
41
|
+
id,
|
|
42
|
+
name: deviceName,
|
|
43
|
+
type: deviceType,
|
|
44
|
+
connectionPreference: d.connectionPreference ?? d.connection ?? 'auto',
|
|
45
|
+
room: d.room || d.location || undefined,
|
|
46
|
+
};
|
|
47
|
+
if (!isValidDeviceType(deviceType)) {
|
|
48
|
+
deviceEntry.typeValidationWarning = `Invalid type "${deviceType}"`;
|
|
49
|
+
if (validationResult.correctedType) {
|
|
50
|
+
deviceEntry.typeValidationWarning += ` - should be "${validationResult.correctedType}"`;
|
|
51
|
+
invalidTypeDevices.push({
|
|
52
|
+
name: deviceName,
|
|
53
|
+
type: deviceType,
|
|
54
|
+
suggestion: validationResult.correctedType,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
invalidTypeDevices.push({
|
|
59
|
+
name: deviceName,
|
|
60
|
+
type: deviceType,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
found.push(deviceEntry);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
catch (e) {
|
|
68
|
+
// ignore malformed platform entries
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
// Log validation issues
|
|
72
|
+
if (invalidTypeDevices.length > 0) {
|
|
73
|
+
uiLog.warn(`Found ${invalidTypeDevices.length} device(s) with invalid types:\n${invalidTypeDevices.map(d => ` - "${d.name}": "${d.type}"${d.suggestion ? ` → should be "${d.suggestion}"` : ''}`).join('\n')}`);
|
|
74
|
+
}
|
|
75
|
+
uiLog.info(`GET /devices - Found ${found.length} devices in ${cfgPath}${invalidTypeDevices.length > 0 ? ` (${invalidTypeDevices.length} with validation warnings)` : ''}`);
|
|
76
|
+
return {
|
|
77
|
+
success: true,
|
|
78
|
+
data: found,
|
|
79
|
+
...(invalidTypeDevices.length > 0 && { validationWarnings: invalidTypeDevices }),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
catch (e) {
|
|
83
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
84
|
+
uiLog.error(`Error in /devices: ${msg}`);
|
|
85
|
+
// Pass the real error message to the frontend for better diagnostics
|
|
86
|
+
throw new RequestError(msg || 'Failed to read Homebridge config', e);
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/homebridge-ui/endpoints/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,144 @@
|
|
|
1
|
+
import { SwitchBotClient } from '../../switchbotClient.js';
|
|
2
|
+
import { getAllDevices, getDevicesRef, getSwitchBotPlatformConfig } from '../utils/config-parser.js';
|
|
3
|
+
import { uiLog } from '../utils/logger.js';
|
|
4
|
+
/**
|
|
5
|
+
* Register device CRUD endpoints
|
|
6
|
+
*/
|
|
7
|
+
export function registerDeviceEndpoints(server) {
|
|
8
|
+
/**
|
|
9
|
+
* POST /add-devices - Add or update multiple devices in the Homebridge config
|
|
10
|
+
* Expects: { devices: Array<{ deviceId, configDeviceType, configDeviceName, ... }> }
|
|
11
|
+
*/
|
|
12
|
+
server.onRequest('/add-devices', async (body) => {
|
|
13
|
+
try {
|
|
14
|
+
if (!body || !Array.isArray(body.devices) || body.devices.length === 0) {
|
|
15
|
+
throw new Error('No devices provided');
|
|
16
|
+
}
|
|
17
|
+
const { platform, cfg, cfgPath } = await getSwitchBotPlatformConfig(server);
|
|
18
|
+
const devicesRef = getDevicesRef(platform);
|
|
19
|
+
const incomingDevices = body.devices;
|
|
20
|
+
let added = 0;
|
|
21
|
+
let updated = 0;
|
|
22
|
+
for (const newDev of incomingDevices) {
|
|
23
|
+
const id = String(newDev.deviceId || newDev.id || '').trim().toLowerCase();
|
|
24
|
+
if (!id) {
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
const idx = devicesRef.findIndex((d) => String(d.deviceId || d.id || '').trim().toLowerCase() === id);
|
|
28
|
+
if (idx >= 0) {
|
|
29
|
+
// Update existing device
|
|
30
|
+
devicesRef[idx] = { ...devicesRef[idx], ...newDev };
|
|
31
|
+
updated++;
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
// Add new device
|
|
35
|
+
devicesRef.push({ ...newDev });
|
|
36
|
+
added++;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
// Log devicesRef and cfgPath before saving
|
|
40
|
+
uiLog.info(`[DEBUG] devicesRef before save:`, JSON.stringify(devicesRef, null, 2));
|
|
41
|
+
uiLog.info(`[DEBUG] cfgPath:`, cfgPath);
|
|
42
|
+
await import('../utils/config-parser.js').then(m => m.saveConfig(cfgPath, cfg));
|
|
43
|
+
// Log the config file contents after saving for debugging
|
|
44
|
+
try {
|
|
45
|
+
const fs = await import('node:fs/promises');
|
|
46
|
+
const raw = await fs.readFile(cfgPath, 'utf-8');
|
|
47
|
+
uiLog.info(`[DEBUG] Config after add-devices save:`, raw);
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
uiLog.warn(`[DEBUG] Could not read config after save:`, e);
|
|
51
|
+
}
|
|
52
|
+
uiLog.info(`POST /add-devices - Added: ${added}, Updated: ${updated}`);
|
|
53
|
+
return {
|
|
54
|
+
success: true,
|
|
55
|
+
data: {
|
|
56
|
+
added,
|
|
57
|
+
updated,
|
|
58
|
+
total: devicesRef.length,
|
|
59
|
+
},
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
64
|
+
uiLog.error(`POST /add-devices failed: ${msg}`);
|
|
65
|
+
return {
|
|
66
|
+
success: false,
|
|
67
|
+
error: msg,
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
/**
|
|
72
|
+
* POST /test-connection - Test connectivity and basic read for a device
|
|
73
|
+
*/
|
|
74
|
+
server.onRequest('/test-connection', async (body) => {
|
|
75
|
+
let client = null;
|
|
76
|
+
try {
|
|
77
|
+
const deviceId = String(body?.deviceId || '').trim();
|
|
78
|
+
if (!deviceId) {
|
|
79
|
+
throw new Error('Device ID is required');
|
|
80
|
+
}
|
|
81
|
+
const { platform } = await getSwitchBotPlatformConfig(server);
|
|
82
|
+
const allDevices = getAllDevices(platform);
|
|
83
|
+
const normalizedDeviceId = deviceId.toLowerCase();
|
|
84
|
+
const configuredDevice = allDevices.find((d) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId);
|
|
85
|
+
const startedAt = Date.now();
|
|
86
|
+
client = new SwitchBotClient({
|
|
87
|
+
...platform,
|
|
88
|
+
logger: uiLog,
|
|
89
|
+
});
|
|
90
|
+
await client.init();
|
|
91
|
+
const raw = await client.getDevice(deviceId);
|
|
92
|
+
const latencyMs = Date.now() - startedAt;
|
|
93
|
+
const state = raw?.body ?? raw;
|
|
94
|
+
const stateConnection = String(state?.connectionType || state?.source || body?.connectionType || '').toLowerCase();
|
|
95
|
+
const method = stateConnection.includes('ble')
|
|
96
|
+
? 'BLE'
|
|
97
|
+
: stateConnection.includes('api')
|
|
98
|
+
? 'OpenAPI'
|
|
99
|
+
: 'Auto';
|
|
100
|
+
return {
|
|
101
|
+
success: true,
|
|
102
|
+
data: {
|
|
103
|
+
success: true,
|
|
104
|
+
deviceId,
|
|
105
|
+
method,
|
|
106
|
+
latencyMs,
|
|
107
|
+
message: configuredDevice
|
|
108
|
+
? `Connected to "${configuredDevice.configDeviceName || configuredDevice.deviceId || deviceId}"`
|
|
109
|
+
: 'Connected successfully',
|
|
110
|
+
state: {
|
|
111
|
+
online: state?.online,
|
|
112
|
+
power: state?.power,
|
|
113
|
+
battery: state?.battery,
|
|
114
|
+
version: state?.version,
|
|
115
|
+
deviceType: state?.deviceType,
|
|
116
|
+
},
|
|
117
|
+
},
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
catch (e) {
|
|
121
|
+
const message = e instanceof Error ? e.message : String(e);
|
|
122
|
+
uiLog.warn(`POST /test-connection failed: ${message}`);
|
|
123
|
+
return {
|
|
124
|
+
success: true,
|
|
125
|
+
data: {
|
|
126
|
+
success: false,
|
|
127
|
+
deviceId: String(body?.deviceId || ''),
|
|
128
|
+
method: 'Auto',
|
|
129
|
+
latencyMs: 0,
|
|
130
|
+
message,
|
|
131
|
+
},
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
finally {
|
|
135
|
+
try {
|
|
136
|
+
await client?.destroy();
|
|
137
|
+
}
|
|
138
|
+
catch (_e) {
|
|
139
|
+
// Ignore client shutdown errors
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
//# sourceMappingURL=devices.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"devices.js","sourceRoot":"","sources":["../../../../src/homebridge-ui/endpoints/devices.ts"],"names":[],"mappings":"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"}
|