@switchbot/homebridge-switchbot 5.0.0-beta.153 → 5.0.0-beta.155

package/dist/homebridge-ui/public/js/devices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devices.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/devices.ts"],"names":[],"mappings":"AAMA,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAgF3I;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAUzD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAG3D"}
+{"version":3,"file":"devices.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/devices.ts"],"names":[],"mappings":"AAMA,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAkF3I;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAUzD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAG3D"}

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

@@ -60,6 +60,8 @@ export async function addDeviceToConfig(device, options = {}) {
             }
         }
         if (refresh) {
+            // Force reload of config from disk after add
+            await syncParentPluginConfigFromDisk(true);
             await loadConfiguredDevices();
         }
         return { added: !alreadyExists };

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

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

package/dist/homebridge-ui/public/js/devices.ts

@@ -67,6 +67,8 @@ export async function addDeviceToConfig(device: any, options: { refresh?: boolea
     }
 
     if (refresh) {
+      // Force reload of config from disk after add
+      await syncParentPluginConfigFromDisk(true)
       await loadConfiguredDevices()
     }
 

package/dist/homebridge-ui/public/js/discovery.d.ts

@@ -1,3 +1,8 @@
+declare global {
+    interface Window {
+        _discoverySelectedIds: Set<string>;
+    }
+}
 export declare function initializeDiscoverySettings(): Promise<void>;
 export declare function discoverDevices(): Promise<void>;
 export declare function addDeviceToConfig(device: any): Promise<void>;

package/dist/homebridge-ui/public/js/discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/discovery.ts"],"names":[],"mappings":"AAsRA,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CA8FjE;AAsDD,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CA6qBrD;AA2XD,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../../../src/homebridge-ui/public/js/discovery.ts"],"names":[],"mappings":"AAeA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,qBAAqB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KACnC;CACF;AAmOD,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CA8FjE;AAsDD,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAiuBrD;AAwMD,wBAAsB,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAGlE"}

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

@@ -1,3 +1,4 @@
+// Extend the Window interface to include _discoverySelectedIds for type safety
 // Batch enable/disable helper (true module scope for UI access)
 import { addDevicesInBulk, discoverDevices as apiDiscoverDevices, fetchBluetoothStatus, 
 // fetchDevices, // removed unused import
@@ -7,45 +8,6 @@ import { uiLog } from './logger.js';
 import { hideBusyUi, showBusyUi } from './modal.js';
 import { getDiscoveryPreferences, renderDiscoveredDevices, setDiscoveryPreferences } from './render.js';
 import { toastError, toastInfo, toastSuccess, toastWarning } from './toast.js';
-async function batchSetDeviceEnabled(selectedIds, enabled) {
-    // Fetch current config
-    const resp = await homebridge.request('/platform-config', {});
-    if (!resp || resp.success === false || !resp.data) {
-        throw new Error('Failed to load config');
-    }
-    const config = resp.data;
-    // Homebridge config may be an array of platforms, find SwitchBot
-    const configArr = Array.isArray(config) ? config : [config];
-    const platformIdx = configArr.findIndex((c) => (c.platform || c.name || '').toLowerCase().includes('switchbot'));
-    if (platformIdx === -1) {
-        throw new Error('SwitchBot platform config not found');
-    }
-    const platformConfig = configArr[platformIdx];
-    if (!Array.isArray(platformConfig.devices)) {
-        throw new TypeError('No devices array in config');
-    }
-    let changed = false;
-    for (const dev of platformConfig.devices) {
-        const id = String(dev.deviceId || dev.id || '').trim().toLowerCase();
-        if (selectedIds.has(id)) {
-            if (dev.enabled !== enabled) {
-                dev.enabled = enabled;
-                changed = true;
-            }
-        }
-    }
-    if (changed) {
-        if (typeof homebridge.updatePluginConfig === 'function') {
-            await homebridge.updatePluginConfig(configArr);
-        }
-        else {
-            throw new TypeError('homebridge.updatePluginConfig is not available');
-        }
-        if (typeof homebridge.savePluginConfig === 'function') {
-            await homebridge.savePluginConfig();
-        }
-    }
-}
 function normalizeId(value) {
     return String(value ?? '').trim().toLowerCase();
 }
@@ -325,10 +287,10 @@ function getDiscoveryGroupByPreference() {
         if (stored === 'hub' || stored === 'type') {
             return stored;
         }
-        return 'connection';
+        return 'type'; // Default to Device Type grouping
     }
     catch (_e) {
-        return 'connection';
+        return 'type';
     }
 }
 function setDiscoveryGroupByPreference(groupBy) {
@@ -439,25 +401,23 @@ export async function discoverDevices() {
     const preferences = getDiscoveryPreferences();
     let groupBy = getDiscoveryGroupByPreference();
     let hideAdded = getDiscoveryHideAddedPreference();
-    let controlsInitialized = false;
     // Use persistent selection state across renders
     if (!window._discoverySelectedIds) {
         window._discoverySelectedIds = new Set();
     }
     const selectedIds = window._discoverySelectedIds;
+    let controlsInitialized = false;
     // --- Real-time RSSI polling loop ---
     // (Moved inside main try block after bleSettings is defined)
     // Batch enable/disable helper (moved to module scope for UI access)
     async function batchSetDeviceEnabled(selectedIds, enabled) {
         // Fetch current config
-        const resp = await homebridge.request('/platform-config', {});
-        if (!resp || resp.success === false || !resp.data) {
-            throw new Error('Failed to load config');
+        // Fetch current config using Homebridge UI API
+        if (typeof homebridge.getPluginConfig !== 'function') {
+            throw new TypeError('homebridge.getPluginConfig is not available');
         }
-        const config = resp.data;
-        // Homebridge config may be an array of platforms, find SwitchBot
-        const configArr = Array.isArray(config) ? config : [config];
-        const platformIdx = configArr.findIndex((c) => (c.platform || c.name || '').toLowerCase().includes('switchbot'));
+        const configArr = await homebridge.getPluginConfig();
+        const platformIdx = Array.isArray(configArr) ? configArr.findIndex(c => (c.platform || c.name || '').toLowerCase().includes('switchbot')) : -1;
         if (platformIdx === -1) {
             throw new Error('SwitchBot platform config not found');
         }
@@ -488,14 +448,53 @@ export async function discoverDevices() {
         }
     }
     const ensureDiscoveryControls = async () => {
+        // --- Select All / Deselect All controls ---
+        const selectAllBtn = document.createElement('button');
+        selectAllBtn.textContent = 'Select All';
+        selectAllBtn.style.fontSize = '13px';
+        selectAllBtn.style.padding = '6px 18px';
+        selectAllBtn.style.borderRadius = '6px';
+        selectAllBtn.style.background = '#f3f4f6';
+        selectAllBtn.style.color = '#1d4ed8';
+        selectAllBtn.style.border = '1px solid #d1d5db';
+        selectAllBtn.style.cursor = 'pointer';
+        selectAllBtn.style.marginRight = '8px';
+        selectAllBtn.onclick = () => {
+            // Add all visible device IDs to selectedIds
+            for (const d of discoveredDevices) {
+                selectedIds.add(normalizeId(d.id));
+            }
+            window.dispatchEvent(new Event('discovery-selection-changed'));
+            void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
+        };
+        const deselectAllBtn = document.createElement('button');
+        deselectAllBtn.textContent = 'Deselect All';
+        deselectAllBtn.style.fontSize = '13px';
+        deselectAllBtn.style.padding = '6px 18px';
+        deselectAllBtn.style.borderRadius = '6px';
+        deselectAllBtn.style.background = '#f3f4f6';
+        deselectAllBtn.style.color = '#ef4444';
+        deselectAllBtn.style.border = '1px solid #d1d5db';
+        deselectAllBtn.style.cursor = 'pointer';
+        deselectAllBtn.onclick = () => {
+            // Remove all visible device IDs from selectedIds
+            for (const d of discoveredDevices) {
+                selectedIds.delete(normalizeId(d.id));
+            }
+            window.dispatchEvent(new Event('discovery-selection-changed'));
+            void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
+        };
+        // Insert select/deselect all controls above the action buttons
+        const selectControlsRow = document.createElement('div');
+        selectControlsRow.style.display = 'flex';
+        selectControlsRow.style.gap = '10px';
+        selectControlsRow.style.margin = '0 0 10px 0';
+        selectControlsRow.appendChild(selectAllBtn);
+        selectControlsRow.appendChild(deselectAllBtn);
         if (controlsInitialized) {
             return;
         }
-        // Always use persistent selectedIds
-        if (!window._discoverySelectedIds) {
-            window._discoverySelectedIds = new Set();
-        }
-        const selectedIds = window._discoverySelectedIds;
+        // Always use persistent selectedIds (already defined in outer scope)
         const controlsDiv = document.createElement('div');
         controlsDiv.style.cssText = 'margin-bottom: 12px; display: flex; gap: 12px; flex-wrap: wrap; align-items: center;';
         const filterLabel = document.createElement('label');
@@ -564,16 +563,28 @@ export async function discoverDevices() {
             setDiscoveryPreferences(preferences);
             void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
         };
-        const groupLabel = document.createElement('label');
-        groupLabel.style.fontSize = '12px';
-        groupLabel.style.fontWeight = '500';
-        groupLabel.style.marginLeft = '8px';
-        groupLabel.textContent = 'Group:';
         const groupSelect = document.createElement('select');
         groupSelect.style.fontSize = '11px';
         groupSelect.style.padding = '4px 8px';
         groupSelect.style.borderRadius = '3px';
-        groupSelect.value = groupBy;
+        // Set default value to 'type' if no stored preference
+        if (!localStorage.getItem(DISCOVERY_GROUP_BY_KEY)) {
+            groupSelect.value = 'type';
+        }
+        else {
+            groupSelect.value = groupBy;
+        }
+        const groupLabel = document.createElement('label');
+        groupLabel.style.fontSize = '12px';
+        groupLabel.style.fontWeight = '500';
+        groupLabel.style.marginLeft = '8px';
+        // Set label text to match selected group
+        const groupLabelTextMap = {
+            connection: 'Connection',
+            hub: 'Hub',
+            type: 'Device Type',
+        };
+        groupLabel.textContent = `Group: ${groupLabelTextMap[groupSelect.value] || 'Connection'}`;
         const groupOptions = [
             { label: 'Connection', value: 'connection' },
             { label: 'Hub', value: 'hub' },
@@ -588,6 +599,7 @@ export async function discoverDevices() {
         groupSelect.onchange = () => {
             groupBy = groupSelect.value;
             setDiscoveryGroupByPreference(groupBy);
+            groupLabel.textContent = `Group: ${groupLabelTextMap[groupSelect.value] || 'Connection'}`;
             void updateDiscoveryView(discoveredDevices, preferences, groupBy, hideAdded, selectedIds);
         };
         const hideAddedLabel = document.createElement('label');
@@ -774,6 +786,7 @@ export async function discoverDevices() {
         topActionRow.appendChild(disableSelectedBtn);
         // Clear list and append controls in correct order
         list.innerHTML = '';
+        list.appendChild(selectControlsRow);
         list.appendChild(topActionRow);
         list.appendChild(controlsDiv);
         let deviceListContainer = document.getElementById('discoveredDevices');
@@ -1150,25 +1163,12 @@ async function updateDiscoveryView(allDevices, preferences, groupBy, hideAdded,
             toastError('Discovery UI error: device list container missing. Please reload the page.');
         }
     }
-    // --- Batch Import Controls ---
-    // Remove any duplicate 'Add Selected' buttons from legacy UI
-    // Robust NodeList iteration: classic for loop to avoid formatter and transpiler issues
-    const legacyAddSelectedBtns = [];
-    const allBtns = document.querySelectorAll('button');
-    for (let i = 0; i < allBtns.length; i++) {
-        const btn = allBtns[i];
-        if (btn.textContent && btn.textContent.trim() === 'Add Selected') {
-            legacyAddSelectedBtns.push(btn);
-        }
-    }
-    for (let i = 0; i < legacyAddSelectedBtns.length; i++) {
-        legacyAddSelectedBtns[i].remove();
-    }
-    // Listen for selection changes to update batch button states
+    // Only update the enabled/disabled state of batch action buttons (created in ensureDiscoveryControls)
     function updateBatchButtonStates() {
+        // These buttons are created in ensureDiscoveryControls and should have unique IDs
         const addSelectedBtn = document.getElementById('addSelectedBtn');
-        const enableSelectedBtn = document.querySelector('button')?.parentElement?.querySelector('button[aria-label="Enable Selected"]');
-        const disableSelectedBtn = document.querySelector('button')?.parentElement?.querySelector('button[aria-label="Disable Selected"]');
+        const enableSelectedBtn = document.getElementById('enableSelectedBtn');
+        const disableSelectedBtn = document.getElementById('disableSelectedBtn');
         const hasSelection = selectedIds.size > 0;
         if (addSelectedBtn) {
             addSelectedBtn.disabled = !hasSelection;
@@ -1182,174 +1182,8 @@ async function updateDiscoveryView(allDevices, preferences, groupBy, hideAdded,
     }
     window.removeEventListener('discovery-selection-changed', updateBatchButtonStates);
     window.addEventListener('discovery-selection-changed', updateBatchButtonStates);
-    // Add 'Add Selected to Config' button if not present, and align all red action buttons in a row
-    let batchControls = document.getElementById('batchImportControls');
-    if (!batchControls) {
-        batchControls = document.createElement('div');
-        batchControls.id = 'batchImportControls';
-        batchControls.style.display = 'flex';
-        batchControls.style.flexWrap = 'wrap';
-        batchControls.style.alignItems = 'center';
-        batchControls.style.gap = '18px';
-        batchControls.style.margin = '8px 0 18px 0';
-        batchControls.style.width = '100%';
-        // Button container for horizontal alignment
-        const buttonRow = document.createElement('div');
-        buttonRow.style.display = 'flex';
-        buttonRow.style.flexWrap = 'nowrap';
-        buttonRow.style.alignItems = 'center';
-        buttonRow.style.justifyContent = 'center';
-        buttonRow.style.gap = '16px';
-        buttonRow.style.width = '100%';
-        // Add Selected to Config button
-        const addSelectedBtn = document.createElement('button');
-        addSelectedBtn.id = 'addSelectedBtn';
-        addSelectedBtn.textContent = 'Add Selected to Config';
-        addSelectedBtn.disabled = selectedIds.size === 0;
-        addSelectedBtn.style.fontWeight = '600';
-        // Shared style for all red action buttons
-        const redButtonStyle = {
-            width: '220px',
-            padding: '12px 0',
-            fontSize: '17px',
-            marginBottom: '0',
-            boxShadow: '0 2px 8px 0 rgba(220,38,38,0.10)',
-            borderRadius: '8px',
-        };
-        Object.assign(addSelectedBtn.style, redButtonStyle);
-        addSelectedBtn.style.background = '#ef4444';
-        addSelectedBtn.style.color = 'white';
-        addSelectedBtn.style.transition = 'background 0.2s, box-shadow 0.2s';
-        addSelectedBtn.onmouseenter = function () {
-            addSelectedBtn.style.background = '#dc2626';
-        };
-        addSelectedBtn.onmouseleave = function () {
-            addSelectedBtn.style.background = '#ef4444';
-        };
-        addSelectedBtn.onclick = async () => {
-            if (!selectedIds.size) {
-                return;
-            }
-            addSelectedBtn.disabled = true;
-            addSelectedBtn.textContent = 'Adding...';
-            try {
-                const selectedDevices = visibleDevices.filter(d => selectedIds.has(normalizeId(d.id)));
-                const bulkResult = await addDevicesInBulk(selectedDevices.map(d => ({
-                    deviceId: d.id,
-                    name: d.name,
-                    type: d.type,
-                    rssi: d.rssi,
-                    address: d.address,
-                    model: d.model,
-                })));
-                uiLog.info('Batch add response:', bulkResult);
-                if (!bulkResult || bulkResult.success === false) {
-                    throw new Error(bulkResult?.data?.message || 'Batch add failed');
-                }
-                const addedCount = bulkResult?.addedCount ?? bulkResult?.data?.addedCount ?? 0;
-                const skippedCount = bulkResult?.skippedCount ?? bulkResult?.data?.skippedCount ?? 0;
-                toastSuccess(`Added ${addedCount} device(s)${skippedCount > 0 ? ` (${skippedCount} skipped)` : ''}`);
-                await loadConfiguredDevices();
-                selectedIds.clear();
-                addSelectedBtn.disabled = true;
-                addSelectedBtn.textContent = 'Add Selected to Config';
-                await updateDiscoveryView(allDevices, preferences, groupBy, hideAdded, selectedIds);
-            }
-            catch (e) {
-                uiLog.error('Batch add error:', e);
-                toastError(e instanceof Error ? e.message : 'Failed to add devices');
-                addSelectedBtn.disabled = false;
-                addSelectedBtn.textContent = 'Add Selected to Config';
-            }
-        };
-        // Enable Selected button
-        const enableSelectedBtn = document.createElement('button');
-        enableSelectedBtn.textContent = 'Enable Selected';
-        enableSelectedBtn.style.fontWeight = '600';
-        Object.assign(enableSelectedBtn.style, redButtonStyle);
-        enableSelectedBtn.style.background = '#ef4444';
-        enableSelectedBtn.style.color = 'white';
-        enableSelectedBtn.style.transition = 'background 0.2s, box-shadow 0.2s';
-        enableSelectedBtn.onmouseenter = function () {
-            enableSelectedBtn.style.background = '#dc2626';
-        };
-        enableSelectedBtn.onmouseleave = function () {
-            enableSelectedBtn.style.background = '#ef4444';
-        };
-        enableSelectedBtn.disabled = selectedIds.size === 0;
-        enableSelectedBtn.onclick = async () => {
-            if (!selectedIds.size) {
-                return;
-            }
-            enableSelectedBtn.disabled = true;
-            try {
-                showBusyUi();
-                await batchSetDeviceEnabled(selectedIds, true);
-                toastSuccess('Selected devices enabled');
-                await loadConfiguredDevices();
-                await updateDiscoveryView(allDevices, preferences, groupBy, hideAdded, selectedIds);
-            }
-            catch (e) {
-                uiLog.error('Batch enable error:', e);
-                toastError(e instanceof Error ? e.message : 'Failed to enable devices');
-            }
-            finally {
-                hideBusyUi();
-                enableSelectedBtn.disabled = false;
-            }
-        };
-        // Disable Selected button
-        const disableSelectedBtn = document.createElement('button');
-        disableSelectedBtn.textContent = 'Disable Selected';
-        disableSelectedBtn.style.fontWeight = '600';
-        Object.assign(disableSelectedBtn.style, redButtonStyle);
-        disableSelectedBtn.style.background = '#ef4444';
-        disableSelectedBtn.style.color = 'white';
-        disableSelectedBtn.style.transition = 'background 0.2s, box-shadow 0.2s';
-        disableSelectedBtn.onmouseenter = function () {
-            disableSelectedBtn.style.background = '#dc2626';
-        };
-        disableSelectedBtn.onmouseleave = function () {
-            disableSelectedBtn.style.background = '#ef4444';
-        };
-        disableSelectedBtn.disabled = selectedIds.size === 0;
-        disableSelectedBtn.onclick = async () => {
-            if (!selectedIds.size) {
-                return;
-            }
-            disableSelectedBtn.disabled = true;
-            try {
-                showBusyUi();
-                await batchSetDeviceEnabled(selectedIds, false);
-                toastSuccess('Selected devices disabled');
-                await loadConfiguredDevices();
-                await updateDiscoveryView(allDevices, preferences, groupBy, hideAdded, selectedIds);
-            }
-            catch (e) {
-                uiLog.error('Batch disable error:', e);
-                toastError(e instanceof Error ? e.message : 'Failed to disable devices');
-            }
-            finally {
-                hideBusyUi();
-                disableSelectedBtn.disabled = false;
-            }
-        };
-        buttonRow.appendChild(addSelectedBtn);
-        buttonRow.appendChild(enableSelectedBtn);
-        buttonRow.appendChild(disableSelectedBtn);
-        batchControls.appendChild(buttonRow);
-        const listContainer = document.getElementById('discoveredList');
-        if (listContainer) {
-            listContainer.insertBefore(batchControls, listContainer.firstChild);
-        }
-    }
-    else {
-        // Update button state if already present
-        const addSelectedBtn = document.getElementById('addSelectedBtn');
-        if (addSelectedBtn) {
-            addSelectedBtn.disabled = selectedIds.size === 0;
-        }
-    }
+    // Initial state update
+    updateBatchButtonStates();
     // Update status with count
     const status = document.getElementById('discoverStatus');
     if (status) {