@switchbot/homebridge-switchbot 5.0.0-beta.11 → 5.0.0-beta.111

package/dist/homebridge-ui/endpoints/devices.js

@@ -0,0 +1,351 @@
+import { RequestError } from '@homebridge/plugin-ui-utils';
+import fs from 'node:fs/promises';
+import { getAllDevices, getDeviceArrays, getSwitchBotPlatformConfig } from '../utils/config-parser.js';
+import { uiLog } from '../utils/logger.js';
+/**
+ * Register device CRUD endpoints
+ */
+export function registerDeviceEndpoints(server) {
+    /**
+     * POST /add-device - Add a single device to config
+     */
+    server.onRequest('/add-device', async (body) => {
+        try {
+            const { deviceId, name, type, address, model, rssi } = body;
+            if (!deviceId) {
+                throw new Error('Device ID is required');
+            }
+            const { cfg, platform, cfgPath } = await getSwitchBotPlatformConfig(server);
+            uiLog.info('POST /add-device - Request received');
+            uiLog.debug(`POST /add-device - Request body: ${JSON.stringify(body)}`);
+            uiLog.debug(`POST /add-device - Config file path: ${cfgPath}`);
+            const deviceArrays = getDeviceArrays(platform);
+            const allDevices = getAllDevices(platform);
+            const normalizedDeviceId = String(deviceId).trim().toLowerCase();
+            const exists = allDevices.some((d) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId);
+            if (exists) {
+                uiLog.info(`POST /add-device - Device already exists: ${deviceId}`);
+                return {
+                    success: true,
+                    data: {
+                        message: 'Device already in config',
+                        alreadyExists: true,
+                    },
+                };
+            }
+            let addCount = 0;
+            for (const ref of deviceArrays) {
+                const refHasDevice = ref.some((d) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId);
+                if (!refHasDevice) {
+                    const newDevice = {
+                        deviceId,
+                        configDeviceName: name,
+                        configDeviceType: type,
+                    };
+                    if (address) {
+                        newDevice.address = address;
+                    }
+                    if (model) {
+                        newDevice.model = model;
+                    }
+                    if (rssi !== undefined && rssi !== null && rssi !== 0) {
+                        newDevice.rssi = rssi;
+                    }
+                    ref.push(newDevice);
+                    addCount++;
+                }
+            }
+            if (!addCount) {
+                return {
+                    success: false,
+                    data: { message: 'Failed to add device to config' },
+                };
+            }
+            const configJson = JSON.stringify(cfg, null, 2);
+            const fileHandle = await fs.open(cfgPath, 'w');
+            try {
+                await fileHandle.writeFile(configJson, 'utf8');
+                await fileHandle.sync();
+            }
+            finally {
+                await fileHandle.close();
+            }
+            // Notify Homebridge UI that config changed
+            server.pushEvent('configChanged', { source: 'switchbot-plugin' });
+            uiLog.debug('POST /add-device - Sent configChanged event to UI');
+            return {
+                success: true,
+                data: {
+                    message: `Device "${name}" added successfully`,
+                    alreadyExists: false,
+                    added: true,
+                },
+            };
+        }
+        catch (e) {
+            uiLog.error(`Error in /add-device: ${e instanceof Error ? e.message : String(e)}`);
+            throw new RequestError(`Failed to add device: ${e instanceof Error ? e.message : String(e)}`, e);
+        }
+    });
+    /**
+     * POST /add-devices - Add multiple devices to config (bulk add)
+     */
+    server.onRequest('/add-devices', async (body) => {
+        try {
+            const { devices } = body;
+            if (!Array.isArray(devices) || devices.length === 0) {
+                throw new Error('Devices array is required and must not be empty');
+            }
+            const { cfg, platform, cfgPath } = await getSwitchBotPlatformConfig(server);
+            uiLog.debug(`POST /add-devices - Received ${devices.length} device(s) to add`);
+            uiLog.debug(`POST /add-devices - Config path: ${cfgPath}`);
+            const deviceArrays = getDeviceArrays(platform);
+            const allDevices = getAllDevices(platform);
+            uiLog.debug(`POST /add-devices - Device arrays count: ${deviceArrays.length}, existing devices: ${allDevices.length}`);
+            uiLog.debug(`POST /add-devices - Platform.devices exists: ${!!platform.devices}, length: ${platform.devices?.length || 0}`);
+            let addedCount = 0;
+            let skippedCount = 0;
+            const results = [];
+            for (const { deviceId, name, type, rssi, address, model } of devices) {
+                if (!deviceId) {
+                    results.push({ deviceId: '?', success: false, message: 'Device ID is required' });
+                    skippedCount++;
+                    continue;
+                }
+                const normalizedDeviceId = String(deviceId).trim().toLowerCase();
+                const exists = allDevices.some((d) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId);
+                if (exists) {
+                    uiLog.debug(`POST /add-devices - Device already exists: ${deviceId}`);
+                    results.push({ deviceId, success: true, message: 'Already in config', alreadyExists: true });
+                    skippedCount++;
+                    continue;
+                }
+                let addedToArray = false;
+                for (const ref of deviceArrays) {
+                    const refHasDevice = ref.some((d) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId);
+                    if (!refHasDevice) {
+                        const newDevice = {
+                            deviceId,
+                            configDeviceName: name,
+                            configDeviceType: type,
+                        };
+                        // Store RSSI, address, and model if available
+                        if (rssi !== undefined && rssi !== null && rssi !== 0) {
+                            newDevice.rssi = rssi;
+                        }
+                        if (address) {
+                            newDevice.address = address;
+                        }
+                        if (model) {
+                            newDevice.model = model;
+                        }
+                        ref.push(newDevice);
+                        addedToArray = true;
+                        uiLog.debug(`POST /add-devices - Added device to array: ${deviceId} (${name}, ${type}, RSSI: ${rssi})`);
+                    }
+                }
+                if (addedToArray) {
+                    results.push({ deviceId, success: true, message: `Device "${name}" added` });
+                    addedCount++;
+                }
+                else {
+                    uiLog.warn(`POST /add-devices - Failed to add device: ${deviceId}`);
+                    results.push({ deviceId, success: false, message: 'Failed to add device' });
+                    skippedCount++;
+                }
+            }
+            uiLog.info(`POST /add-devices - Adding ${addedCount} devices to config: ${cfgPath}`);
+            const configJson = JSON.stringify(cfg, null, 2);
+            const fileHandle = await fs.open(cfgPath, 'w');
+            try {
+                await fileHandle.writeFile(configJson, 'utf8');
+                await fileHandle.sync();
+                uiLog.info(`POST /add-devices - Config file written successfully`);
+            }
+            finally {
+                await fileHandle.close();
+            }
+            // Notify Homebridge UI that config changed to prevent cache overwrite
+            server.pushEvent('configChanged', { source: 'switchbot-plugin' });
+            uiLog.debug('POST /add-devices - Sent configChanged event to UI');
+            return {
+                success: true,
+                data: {
+                    message: `Added ${addedCount} device(s)${skippedCount > 0 ? ` (${skippedCount} skipped)` : ''}`,
+                    addedCount,
+                    skippedCount,
+                    results,
+                },
+            };
+        }
+        catch (e) {
+            const errorMsg = e instanceof Error ? e.message : String(e);
+            uiLog.error(`Error in /add-devices: ${errorMsg}`);
+            if (e instanceof Error && e.stack) {
+                uiLog.debug(`Stack trace: ${e.stack}`);
+            }
+            throw new RequestError(`Failed to add devices: ${errorMsg}`, e);
+        }
+    });
+    /**
+     * POST /update-device - Update existing device in config
+     */
+    server.onRequest('/update-device', async (body) => {
+        try {
+            const { deviceId, configDeviceName, configDeviceType, connectionPreference, room } = body;
+            if (!deviceId) {
+                throw new Error('Device ID is required');
+            }
+            const { cfg, platform, cfgPath } = await getSwitchBotPlatformConfig(server);
+            const deviceArrays = getDeviceArrays(platform);
+            const devices = getAllDevices(platform);
+            const normalizedDeviceId = String(deviceId).trim().toLowerCase();
+            const device = devices.find((d) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId);
+            if (!device) {
+                throw new Error('Device not found in config');
+            }
+            for (const ref of deviceArrays) {
+                for (const entry of ref) {
+                    const entryId = String(entry.deviceId ?? entry.id ?? '').trim().toLowerCase();
+                    if (entryId !== normalizedDeviceId) {
+                        continue;
+                    }
+                    if (configDeviceName !== undefined && configDeviceName !== null && String(configDeviceName).trim() !== '') {
+                        entry.configDeviceName = configDeviceName;
+                    }
+                    if (configDeviceType !== undefined && configDeviceType !== null && String(configDeviceType).trim() !== '') {
+                        entry.configDeviceType = configDeviceType;
+                    }
+                    if (connectionPreference !== undefined) {
+                        entry.connectionPreference = connectionPreference;
+                    }
+                    if (room !== undefined) {
+                        entry.room = room || undefined;
+                    }
+                }
+            }
+            const configJson = JSON.stringify(cfg, null, 2);
+            const fileHandle = await fs.open(cfgPath, 'w');
+            try {
+                await fileHandle.writeFile(configJson, 'utf8');
+                await fileHandle.sync();
+            }
+            finally {
+                await fileHandle.close();
+            }
+            // Notify Homebridge UI that config changed
+            server.pushEvent('configChanged', { source: 'switchbot-plugin' });
+            uiLog.debug('POST /update-device - Sent configChanged event to UI');
+            return {
+                success: true,
+                data: { message: `Device updated successfully - type: ${configDeviceType || device.configDeviceType}` },
+            };
+        }
+        catch (e) {
+            uiLog.error(`Error in /update-device: ${e instanceof Error ? e.message : String(e)}`);
+            throw new RequestError(`Failed to update device: ${e instanceof Error ? e.message : String(e)}`, e);
+        }
+    });
+    /**
+     * POST /delete-device - Remove device from config
+     */
+    server.onRequest('/delete-device', async (body) => {
+        try {
+            const { deviceId } = body;
+            uiLog.info(`POST /delete-device - Requested deviceId: ${deviceId ?? 'undefined'}`);
+            if (!deviceId) {
+                throw new Error('Device ID is required');
+            }
+            const { cfg, platform, cfgPath } = await getSwitchBotPlatformConfig(server);
+            const deviceArrays = getDeviceArrays(platform);
+            const normalizedDeviceId = String(deviceId).trim().toLowerCase();
+            const allDevices = getAllDevices(platform);
+            const existing = allDevices.find((d) => String(d.deviceId ?? d.id ?? '').trim().toLowerCase() === normalizedDeviceId);
+            if (!existing) {
+                throw new Error('Device not found in config');
+            }
+            const deviceName = existing.configDeviceName || deviceId;
+            let removedCount = 0;
+            for (const ref of deviceArrays) {
+                for (let i = ref.length - 1; i >= 0; i--) {
+                    const id = String(ref[i]?.deviceId ?? ref[i]?.id ?? '').trim().toLowerCase();
+                    if (id === normalizedDeviceId) {
+                        ref.splice(i, 1);
+                        removedCount++;
+                    }
+                }
+            }
+            if (!removedCount) {
+                throw new Error('Device not found in config');
+            }
+            const configJson = JSON.stringify(cfg, null, 2);
+            const fileHandle = await fs.open(cfgPath, 'w');
+            try {
+                await fileHandle.writeFile(configJson, 'utf8');
+                await fileHandle.sync();
+            }
+            finally {
+                await fileHandle.close();
+            }
+            // Notify Homebridge UI that config changed
+            server.pushEvent('configChanged', { source: 'switchbot-plugin' });
+            uiLog.debug('DELETE /delete-device - Sent configChanged event to UI');
+            return {
+                success: true,
+                data: { message: `Device "${deviceName}" removed from config` },
+            };
+        }
+        catch (e) {
+            uiLog.error(`Error in /delete-device: ${e instanceof Error ? e.message : String(e)}`);
+            throw new RequestError('Failed to delete device', e);
+        }
+    });
+    /**
+     * POST /delete-all-devices - Remove all devices from config
+     */
+    server.onRequest('/delete-all-devices', async () => {
+        try {
+            uiLog.info('POST /delete-all-devices - Request received');
+            const { cfg, platform, cfgPath } = await getSwitchBotPlatformConfig(server);
+            const deviceArrays = getDeviceArrays(platform);
+            const allDevices = getAllDevices(platform);
+            if (allDevices.length === 0) {
+                return {
+                    success: true,
+                    data: { message: 'No devices to delete', deletedCount: 0 },
+                };
+            }
+            const deviceCount = allDevices.length;
+            uiLog.info(`POST /delete-all-devices - Removing ${deviceCount} device(s)`);
+            // Clear all device arrays
+            for (const ref of deviceArrays) {
+                ref.length = 0; // Clear array in place
+            }
+            const configJson = JSON.stringify(cfg, null, 2);
+            const fileHandle = await fs.open(cfgPath, 'w');
+            try {
+                await fileHandle.writeFile(configJson, 'utf8');
+                await fileHandle.sync();
+                uiLog.info('POST /delete-all-devices - Config file written successfully');
+            }
+            finally {
+                await fileHandle.close();
+            }
+            // Notify Homebridge UI that config changed
+            server.pushEvent('configChanged', { source: 'switchbot-plugin' });
+            uiLog.debug('DELETE /delete-all-devices - Sent configChanged event to UI');
+            return {
+                success: true,
+                data: {
+                    message: `Removed ${deviceCount} device(s) from config`,
+                    deletedCount: deviceCount,
+                },
+            };
+        }
+        catch (e) {
+            uiLog.error(`Error in /delete-all-devices: ${e instanceof Error ? e.message : String(e)}`);
+            throw new RequestError(`Failed to delete all devices: ${e instanceof Error ? e.message : String(e)}`, e);
+        }
+    });
+}
+//# sourceMappingURL=devices.js.map

package/dist/homebridge-ui/endpoints/devices.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"devices.js","sourceRoot":"","sources":["../../../src/homebridge-ui/endpoints/devices.ts"],"names":[],"mappings":"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"}

package/dist/homebridge-ui/endpoints/discovery.d.ts

@@ -0,0 +1,7 @@
+import type { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils';
+/**
+ * Register discovery endpoint
+ * Discovers SwitchBot devices via BLE and OpenAPI
+ */
+export declare function registerDiscoveryEndpoint(server: HomebridgePluginUiServer): void;
+//# sourceMappingURL=discovery.d.ts.map

package/dist/homebridge-ui/endpoints/discovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../src/homebridge-ui/endpoints/discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAA;AAO3E;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,wBAAwB,QAmLzE"}

package/dist/homebridge-ui/endpoints/discovery.js

@@ -0,0 +1,171 @@
+import { RequestError } from '@homebridge/plugin-ui-utils';
+import { getCredential, getSwitchBotPlatformConfig } from '../utils/config-parser.js';
+import { uiLog } from '../utils/logger.js';
+/**
+ * Register discovery endpoint
+ * Discovers SwitchBot devices via BLE and OpenAPI
+ */
+export function registerDiscoveryEndpoint(server) {
+    server.onRequest('/discover', async () => {
+        try {
+            const { platform } = await getSwitchBotPlatformConfig(server);
+            uiLog.debug(`GET /discover - Platform config keys: ${Object.keys(platform).join(', ')}`);
+            const token = getCredential(platform, 'openApiToken') || platform.token;
+            const secret = getCredential(platform, 'openApiSecret') || platform.secret;
+            const hasOpenAPICredentials = !!token;
+            if (!hasOpenAPICredentials) {
+                uiLog.warn('GET /discover - No OpenAPI credentials found, will attempt BLE-only discovery');
+            }
+            else {
+                uiLog.info('GET /discover - Using OpenAPI credentials for discovery');
+            }
+            // Import and initialize node-switchbot
+            const { SwitchBot } = await import('node-switchbot');
+            const switchbot = new SwitchBot({
+                token: token || undefined,
+                secret: secret || undefined,
+                enableBLE: true,
+                enableFallback: true,
+                enableRetry: true,
+            });
+            const deviceMap = new Map();
+            // 1. Try BLE discovery first (with timeout)
+            uiLog.info('GET /discover - Starting BLE scan...');
+            try {
+                const bleTimeout = 8000; // 8 second timeout for BLE scan
+                const bleDiscoveryPromise = switchbot.discover({ timeout: 5000 }); // 5 second scan timeout
+                const bleDevices = await Promise.race([
+                    bleDiscoveryPromise,
+                    new Promise(resolve => setTimeout(resolve, bleTimeout, [])),
+                ]);
+                if (Array.isArray(bleDevices) && bleDevices.length > 0) {
+                    uiLog.info(`GET /discover - Found ${bleDevices.length} BLE devices`);
+                    for (const [index, d] of bleDevices.entries()) {
+                        const info = typeof d?.getInfo === 'function' ? d.getInfo() : undefined;
+                        const id = d?.id
+                            || (typeof d?.getId === 'function' ? d.getId() : undefined)
+                            || info?.id;
+                        const mac = d?.mac
+                            || (typeof d?.getMAC === 'function' ? d.getMAC() : undefined)
+                            || info?.mac;
+                        if (!id) {
+                            uiLog.warn(`GET /discover - BLE device at index ${index} has no id, skipping`);
+                            continue;
+                        }
+                        const connectionTypes = Array.isArray(info?.connectionTypes) ? info.connectionTypes : [];
+                        const isHybrid = connectionTypes.includes('api');
+                        deviceMap.set(id, {
+                            id,
+                            name: d?.name || (typeof d?.getName === 'function' ? d.getName() : undefined) || info?.name || d?.deviceName || id,
+                            type: d?.deviceType || (typeof d?.getDeviceType === 'function' ? d.getDeviceType() : undefined) || info?.deviceType || d?.type || d?.model || 'unknown',
+                            model: info?.model || d?.model || d?.deviceModel,
+                            address: mac,
+                            connectionType: isHybrid ? 'Both' : 'BLE',
+                            rssi: info?.rssi || d?.rssi,
+                        });
+                    }
+                }
+                else {
+                    uiLog.info('GET /discover - No BLE devices found or scan timed out');
+                }
+            }
+            catch (bleErr) {
+                uiLog.warn(`GET /discover - BLE discovery failed: ${bleErr instanceof Error ? bleErr.message : String(bleErr)}`);
+                // Continue with OpenAPI even if BLE fails
+            }
+            // 2. Get devices from OpenAPI (only if credentials are available)
+            if (hasOpenAPICredentials) {
+                uiLog.info('GET /discover - Fetching devices from OpenAPI...');
+                try {
+                    const apiClient = switchbot.getAPIClient();
+                    if (!apiClient) {
+                        throw new Error('API client not available - token/secret may be missing');
+                    }
+                    const apiData = await apiClient.getDevices();
+                    uiLog.debug(`GET /discover - OpenAPI response: ${JSON.stringify(apiData)}`);
+                    // Parse physical devices - apiData is DeviceListResponse with deviceList and infraredRemoteList
+                    const devices = apiData.deviceList || [];
+                    const irDevices = apiData.infraredRemoteList || [];
+                    uiLog.info(`GET /discover - Found ${devices.length} OpenAPI physical devices and ${irDevices.length} IR devices`);
+                    // Process physical devices from OpenAPI
+                    for (const d of devices) {
+                        const id = d.deviceId;
+                        if (!id) {
+                            continue;
+                        }
+                        const existing = deviceMap.get(id);
+                        if (existing) {
+                            // Device found via both BLE and OpenAPI
+                            existing.connectionType = 'Both';
+                            existing.name = d.deviceName || existing.name;
+                            existing.type = d.deviceType || existing.type;
+                            // Note: APIDevice doesn't have a model property
+                            existing.enabled = d.enableCloudService !== false;
+                            existing.hubDeviceId = d.hubDeviceId;
+                        }
+                        else {
+                            // Device only found via OpenAPI
+                            deviceMap.set(id, {
+                                id,
+                                name: d.deviceName || id,
+                                type: d.deviceType || 'unknown',
+                                enabled: d.enableCloudService !== false,
+                                hubDeviceId: d.hubDeviceId,
+                                connectionType: 'OpenAPI',
+                            });
+                        }
+                    }
+                    // Process IR devices (OpenAPI only)
+                    for (const d of irDevices) {
+                        const id = d.deviceId;
+                        if (!id) {
+                            continue;
+                        }
+                        deviceMap.set(id, {
+                            id,
+                            name: d.deviceName || id,
+                            type: d.remoteType || 'unknown',
+                            enabled: true,
+                            hubDeviceId: d.hubDeviceId,
+                            connectionType: 'OpenAPI',
+                            isIR: true,
+                        });
+                    }
+                }
+                catch (apiErr) {
+                    uiLog.error(`GET /discover - OpenAPI discovery failed: ${apiErr instanceof Error ? apiErr.message : String(apiErr)}`);
+                    // If we have BLE devices, we can still return those
+                    if (deviceMap.size === 0) {
+                        throw apiErr;
+                    }
+                }
+            }
+            else {
+                uiLog.info('GET /discover - Skipping OpenAPI discovery (no credentials configured)');
+            }
+            const normalizedBleDevices = [...deviceMap.values()].filter(d => d.connectionType === 'BLE' || d.connectionType === 'Both');
+            const firstNormalizedBleId = normalizedBleDevices[0]?.id || 'none';
+            uiLog.info(`GET /discover - Normalized BLE devices: ${normalizedBleDevices.length} (firstId: ${firstNormalizedBleId})`);
+            // Check if we found any devices
+            if (deviceMap.size === 0) {
+                const errorMsg = hasOpenAPICredentials
+                    ? 'No devices found via BLE or OpenAPI. Make sure devices are powered on and in range.'
+                    : '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.';
+                uiLog.error(`GET /discover - ${errorMsg}`);
+                throw new Error(errorMsg);
+            }
+            // Convert map to array
+            const allDiscovered = [...deviceMap.values()];
+            const bleCount = allDiscovered.filter(d => d.connectionType === 'BLE').length;
+            const apiCount = allDiscovered.filter(d => d.connectionType === 'OpenAPI').length;
+            const bothCount = allDiscovered.filter(d => d.connectionType === 'Both').length;
+            uiLog.info(`GET /discover - Total: ${allDiscovered.length} devices (BLE: ${bleCount}, OpenAPI: ${apiCount}, Both: ${bothCount})`);
+            return { success: true, data: allDiscovered };
+        }
+        catch (e) {
+            uiLog.error(`Error in /discover: ${e instanceof Error ? e.message : String(e)}`);
+            throw new RequestError(`Failed to discover devices: ${e instanceof Error ? e.message : String(e)}`, e);
+        }
+    });
+}
+//# sourceMappingURL=discovery.js.map

package/dist/homebridge-ui/endpoints/discovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discovery.js","sourceRoot":"","sources":["../../../src/homebridge-ui/endpoints/discovery.ts"],"names":[],"mappings":"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"}