meross-cli 0.1.0 → 0.3.0

package/CHANGELOG.md

@@ -5,7 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.3.0] - 2026-01-16
+
+### Changed
+- **BREAKING**: Updated to use simplified device API from `meross-iot` v0.4.0
+  - Updated to use `initializeDevices()` instead of `getDevices()`
+  - Updated to use direct device properties instead of `cachedHttpInfo`
+  - Updated to use camelCase property names consistently
+  - Updated all tests and commands to use new API patterns
+
+## [0.2.0] - 2026-01-15
+
+### Changed
+- **BREAKING**: Updated to use new Manager-prefix naming pattern from `meross-iot` package
+  - `MerossManager` → `ManagerMeross` (internal usage)
+  - `SubscriptionManager` → `ManagerSubscription` (internal usage)
+- **BREAKING**: Updated to use new property-based access patterns from `meross-iot` package
+  - Uses `meross.subscription` instead of `getSubscriptionManager()`
+  - Uses `meross.devices.get()`, `meross.devices.find()`, and `meross.devices.list()` instead of wrapper methods
 
 ## [0.1.0] - 2026-01-10
 

package/README.md

@@ -23,7 +23,7 @@ Command-line interface for controlling and managing Meross smart home devices.
 npm install -g meross-cli@alpha
 
 # Or install specific version
-npm install -g meross-cli@0.1.0
+npm install -g meross-cli@0.3.0
 ```
 
 Or use via npx:
@@ -77,6 +77,28 @@ The CLI supports all devices that are supported by the underlying `meross-iot` l
 
 ## Changelog
 
+### [0.3.0] - 2026-01-16
+
+#### Changed
+- **BREAKING**: Updated to use simplified device API from `meross-iot` v0.4.0
+  - Updated to use `initializeDevices()` instead of `getDevices()`
+  - Updated to use direct device properties instead of `cachedHttpInfo`
+  - Updated to use camelCase property names consistently
+  - Updated all tests and commands to use new API patterns
+
+<details>
+<summary>Older</summary>
+
+### [0.2.0] - 2026-01-15
+
+#### Changed
+- **BREAKING**: Updated to use new Manager-prefix naming pattern from `meross-iot` package
+  - `MerossManager` → `ManagerMeross` (internal usage)
+  - `SubscriptionManager` → `ManagerSubscription` (internal usage)
+- **BREAKING**: Updated to use new property-based access patterns from `meross-iot` package
+  - Uses `meross.subscription` instead of `getSubscriptionManager()`
+  - Uses `meross.devices.get()`, `meross.devices.find()`, and `meross.devices.list()` instead of wrapper methods
+
 ### [0.1.0] - 2026-01-10
 
 #### Added
@@ -97,11 +119,6 @@ The CLI supports all devices that are supported by the underlying `meross-iot` l
 - This is an initial, pre-stable release. Please expect bugs.
 - Some edge cases may not be fully handled yet.
 
-<details>
-<summary>Older</summary>
-
-<!-- Older changelog entries will appear here -->
-
 </details>
 
 ## Disclaimer

package/cli/commands/control/execute.js

@@ -1,7 +1,7 @@
 'use strict';
 
 async function executeControlCommand(manager, uuid, methodName, params) {
-    const device = manager.getDevice(uuid);
+    const device = manager.devices.get(uuid);
 
     if (!device) {
         throw new Error(`Device not found: ${uuid}`);

package/cli/commands/control/menu.js

@@ -23,12 +23,12 @@ async function question(rl, query) {
 
 /**
  * Interactive device control menu.
- * @param {Object} manager - MerossManager instance
+ * @param {Object} manager - ManagerMeross instance
  * @param {Object} rl - Readline interface
  * @param {string|null} currentUser - Current logged in user name
  */
 async function controlDeviceMenu(manager, rl, currentUser = null) {
-    const devices = manager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+    const devices = manager.devices.list().filter(d => !(d instanceof MerossSubDevice));
     if (devices.length === 0) {
         console.log('\nNo devices found.');
         return;
@@ -50,7 +50,7 @@ async function controlDeviceMenu(manager, rl, currentUser = null) {
         choices: deviceChoices
     }]);
 
-    const device = manager.getDevice(uuid);
+    const device = manager.devices.get(uuid);
 
     // Wait for device to connect if needed
     if (!device.deviceConnected) {
@@ -92,11 +92,11 @@ async function controlDeviceMenu(manager, rl, currentUser = null) {
     // Control loop
     while (true) {
         clearScreen();
-        const deviceCount = manager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length;
+        const deviceCount = manager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length;
         renderSimpleHeader(currentUser, deviceCount);
         clearMenuArea(SIMPLE_CONTENT_START_LINE);
 
-        const info = formatDevice(manager.getDevice(uuid));
+        const info = formatDevice(manager.devices.get(uuid));
         console.log(chalk.bold(`=== Control Device: ${info.name} ===\n`));
 
         // Build choices grouped by category

package/cli/commands/dump.js

@@ -3,7 +3,7 @@
 const fs = require('fs');
 
 async function dumpRegistry(manager, filename) {
-    const devices = manager.getAllDevices();
+    const devices = manager.devices.list();
     const registry = devices.map(device => {
         return {
             uuid: device.uuid,

package/cli/commands/info.js

@@ -84,35 +84,41 @@ function _displayChannels(device) {
 }
 
 /**
- * Builds HTTP device info data array.
+ * Extracts HTTP device info properties for display.
+ *
+ * Collects HTTP metadata properties (domain, reservedDomain, subType, region, etc.)
+ * that are now directly accessible on the device instance for formatting in the CLI output.
+ *
+ * @param {Object} device - MerossDevice instance
+ * @returns {Array<Array<string>>} Array of [label, value] pairs for display
  */
-function _buildHttpInfoData(httpInfo) {
+function _buildHttpInfoData(device) {
     const httpInfoData = [];
 
-    if (httpInfo.domain) {
-        httpInfoData.push(['MQTT Domain', httpInfo.domain]);
+    if (device.domain) {
+        httpInfoData.push(['MQTT Domain', device.domain]);
     }
-    if (httpInfo.reservedDomain) {
-        httpInfoData.push(['Reserved Domain', httpInfo.reservedDomain]);
+    if (device.reservedDomain) {
+        httpInfoData.push(['Reserved Domain', device.reservedDomain]);
     }
-    if (httpInfo.subType) {
-        httpInfoData.push(['Sub Type', httpInfo.subType]);
+    if (device.subType) {
+        httpInfoData.push(['Sub Type', device.subType]);
     }
-    if (httpInfo.region) {
-        httpInfoData.push(['Region', httpInfo.region]);
+    if (device.region) {
+        httpInfoData.push(['Region', device.region]);
     }
-    if (httpInfo.skillNumber) {
-        httpInfoData.push(['Skill Number', httpInfo.skillNumber]);
+    if (device.skillNumber) {
+        httpInfoData.push(['Skill Number', device.skillNumber]);
     }
-    if (httpInfo.devIconId) {
-        httpInfoData.push(['Icon ID', httpInfo.devIconId]);
+    if (device.devIconId) {
+        httpInfoData.push(['Icon ID', device.devIconId]);
     }
-    if (httpInfo.bindTime) {
-        httpInfoData.push(['Bind Time', httpInfo.bindTime.toLocaleString()]);
+    if (device.bindTime) {
+        httpInfoData.push(['Bind Time', device.bindTime.toLocaleString()]);
     }
-    if (httpInfo.onlineStatus !== undefined) {
-        const onlineStatusText = httpInfo.onlineStatus === OnlineStatus.ONLINE ? chalk.green('Online') :
-            httpInfo.onlineStatus === OnlineStatus.OFFLINE ? chalk.red('Offline') :
+    if (device.onlineStatus !== undefined) {
+        const onlineStatusText = device.onlineStatus === OnlineStatus.ONLINE ? chalk.green('Online') :
+            device.onlineStatus === OnlineStatus.OFFLINE ? chalk.red('Offline') :
                 chalk.yellow('Unknown');
         httpInfoData.push(['Online Status', onlineStatusText]);
     }
@@ -121,15 +127,12 @@ function _buildHttpInfoData(httpInfo) {
 }
 
 /**
- * Displays HTTP device info if available.
+ * Displays HTTP device info section if properties are available.
+ *
+ * @param {Object} device - MerossDevice instance
  */
 function _displayHttpInfo(device) {
-    if (!device.cachedHttpInfo) {
-        return;
-    }
-
-    const httpInfo = device.cachedHttpInfo;
-    const httpInfoData = _buildHttpInfoData(httpInfo);
+    const httpInfoData = _buildHttpInfoData(device);
 
     if (httpInfoData.length === 0) {
         return;
@@ -197,7 +200,7 @@ function _displayCapabilities(device) {
 }
 
 async function showDeviceInfo(manager, uuid) {
-    const device = manager.getDevice(uuid);
+    const device = manager.devices.get(uuid);
 
     if (!device) {
         console.error(`Device with UUID ${chalk.cyan(uuid)} not found.`);

package/cli/commands/list.js

@@ -6,7 +6,7 @@ const { MerossHubDevice, MerossSubDevice, OnlineStatus, parsePushNotification }
 const { formatDevice } = require('../utils/display');
 
 async function listDevices(manager) {
-    const hubs = manager.getAllDevices().filter(device => device instanceof MerossHubDevice);
+    const hubs = manager.devices.list().filter(device => device instanceof MerossHubDevice);
     if (hubs.length > 0) {
         const spinner = ora('Loading devices and refreshing hub status').start();
         // Refresh hub state to update subdevice online status
@@ -48,7 +48,7 @@ async function listDevices(manager) {
         spinner.stop();
     }
 
-    const allDevices = manager.getAllDevices();
+    const allDevices = manager.devices.list();
     const devices = allDevices.filter(device => !(device instanceof MerossSubDevice));
 
     if (devices.length === 0) {

package/cli/commands/mqtt.js

@@ -42,7 +42,7 @@ async function listMqttConnections(manager, options = {}) {
 
         const namespaces = new Set();
         deviceUuids.forEach(uuid => {
-            const device = manager.getDevice(uuid);
+            const device = manager.devices.get(uuid);
             if (device && device.abilities) {
                 Object.keys(device.abilities).forEach(namespace => {
                     namespaces.add(namespace);
@@ -170,7 +170,7 @@ async function listMqttConnections(manager, options = {}) {
             if (conn.deviceUuids.length > 0) {
                 console.log(`\n  ${chalk.white.bold(`Device UUIDs (${chalk.cyan(conn.deviceUuids.length)}):`)}`);
                 conn.deviceUuids.forEach((uuid) => {
-                    const device = manager.getDevice(uuid);
+                    const device = manager.devices.get(uuid);
                     const deviceName = device ? (device.name || 'Unknown') : 'Unknown';
                     console.log(`    ${chalk.cyan(uuid)} ${chalk.gray(`(${deviceName})`)}`);
                 });

package/cli/commands/sniffer/sniffer-menu.js

@@ -447,7 +447,7 @@ async function _createZipArchive(options) {
 
 /**
  * Main sniffer menu function
- * @param {Object} manager - MerossManager instance
+ * @param {Object} manager - ManagerMeross instance
  * @param {Object} rl - Readline interface
  * @param {string|null} currentUser - Current logged in user name
  */
@@ -464,7 +464,7 @@ async function snifferMenu(manager, rl, currentUser = null) {
         logStream.write(`[${timestamp}] ${msg}\n`);
     };
 
-    const deviceCount = manager.getAllDevices().filter(d => {
+    const deviceCount = manager.devices.list().filter(d => {
         const { MerossSubDevice } = require('meross-iot');
         return !(d instanceof MerossSubDevice);
     }).length;
@@ -473,7 +473,7 @@ async function snifferMenu(manager, rl, currentUser = null) {
         _printWelcomeMessage(currentUser, deviceCount);
 
         // Select device
-        const devices = manager.getAllDevices().filter(d => {
+        const devices = manager.devices.list().filter(d => {
             // Filter out subdevices
             const { MerossSubDevice } = require('meross-iot');
             return !(d instanceof MerossSubDevice);

package/cli/commands/status/device-status.js

@@ -410,7 +410,7 @@ function _mapRollerShutterFeatureNamespace(namespace, device) {
 
 /**
  * Feature namespace mapping registry organized by feature type.
- * Matches the MerossManager class structure where features are organized by type.
+ * Matches the ManagerMeross class structure where features are organized by type.
  */
 const FEATURE_NAMESPACE_MAPPERS = [
     { prefix: 'Appliance.Control.Toggle', mapper: _mapToggleFeatureNamespace },
@@ -433,7 +433,7 @@ const FEATURE_NAMESPACE_MAPPERS = [
 /**
  * Maps a namespace to its feature method and arguments.
  * Returns { featureMethod, featureArgs } or { featureMethod: null, featureArgs: [] } if no feature method exists.
- * Organized by feature type to match MerossManager class structure.
+ * Organized by feature type to match ManagerMeross class structure.
  */
 function _mapNamespaceToFeatureMethod(namespace, device) {
     for (const { prefix, mapper } of FEATURE_NAMESPACE_MAPPERS) {

package/cli/commands/status/index.js

@@ -6,7 +6,7 @@ const { displayHubStatus } = require('./hub-status');
 const { displayDeviceStatus } = require('./device-status');
 
 async function getDeviceStatus(manager, filterUuid = null, filterSubdeviceId = null) {
-    const allDevices = filterUuid ? [manager.getDevice(filterUuid)].filter(Boolean) : manager.getAllDevices();
+    const allDevices = filterUuid ? [manager.devices.get(filterUuid)].filter(Boolean) : manager.devices.list();
     const devices = allDevices.filter(device => !(device instanceof MerossSubDevice));
 
     if (devices.length === 0) {

package/cli/control-registry.js

@@ -762,10 +762,10 @@ function getMethodsByCategory() {
  * @returns {boolean} True if device supports the namespace
  */
 function deviceSupportsNamespace(device, namespace) {
-    if (!device._abilities || typeof device._abilities !== 'object') {
+    if (!device.abilities || typeof device.abilities !== 'object') {
         return false;
     }
-    return !!device._abilities[namespace];
+    return !!device.abilities[namespace];
 }
 
 /**

package/cli/helpers/meross.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const MerossManager = require('meross-iot');
+const ManagerMeross = require('meross-iot');
 const { MerossHttpClient, TransportMode } = require('meross-iot');
 const ora = require('ora');
 
@@ -41,7 +41,7 @@ async function createMerossInstance(optionsOrEmail, password, mfaCode, transport
         });
     }
 
-    const instance = new MerossManager({
+    const instance = new ManagerMeross({
         httpClient,
         transportMode: finalTransportMode,
         timeout: finalTimeout,

package/cli/menu/main.js

@@ -14,7 +14,7 @@ const { showSettingsMenu } = require('./settings');
 // Helper functions
 function _getDeviceCount(manager) {
     if (!manager) {return 0;}
-    return manager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length;
+    return manager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length;
 }
 
 function _renderMainMenuHeader(currentUser, manager) {
@@ -170,7 +170,7 @@ async function _saveCredentialsPrompt(rl, currentCredentials) {
 }
 
 async function _selectDevice(manager, message = 'Select device:') {
-    const devices = manager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+    const devices = manager.devices.list().filter(d => !(d instanceof MerossSubDevice));
     if (devices.length === 0) {
         return null;
     }
@@ -194,7 +194,7 @@ async function _selectDevice(manager, message = 'Select device:') {
 }
 
 async function _selectDeviceOrAll(manager) {
-    const devices = manager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+    const devices = manager.devices.list().filter(d => !(d instanceof MerossSubDevice));
     if (devices.length === 0) {
         return null;
     }
@@ -225,7 +225,7 @@ async function _selectSubdevice(manager, uuid) {
         return null;
     }
 
-    const device = manager.getDevice(uuid);
+    const device = manager.devices.get(uuid);
     if (!(device instanceof MerossHubDevice)) {
         return null;
     }
@@ -262,7 +262,7 @@ async function _handleListCommand(manager, rl) {
 }
 
 async function _handleInfoCommand(manager, rl) {
-    const devices = manager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+    const devices = manager.devices.list().filter(d => !(d instanceof MerossSubDevice));
     if (devices.length === 0) {
         console.log('\nNo devices found.');
         await question(rl, '\nPress Enter to return to menu...');
@@ -277,7 +277,7 @@ async function _handleInfoCommand(manager, rl) {
 }
 
 async function _handleStatusCommand(manager, rl) {
-    const devices = manager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+    const devices = manager.devices.list().filter(d => !(d instanceof MerossSubDevice));
     if (devices.length === 0) {
         console.log('\nNo devices found.');
         await question(rl, '\nPress Enter to return to menu...');

package/cli/menu/settings.js

@@ -25,7 +25,7 @@ async function showSettingsMenu(rl, currentManager, currentUser, timeout, enable
     while (true) {
         // Clear screen and render simple header
         clearScreen();
-        const deviceCount = currentManager ? currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length : 0;
+        const deviceCount = currentManager ? currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length : 0;
         renderSimpleHeader(currentUser, deviceCount);
         clearMenuArea(SIMPLE_CONTENT_START_LINE);
 
@@ -102,7 +102,7 @@ async function showSettingsMenu(rl, currentManager, currentUser, timeout, enable
 async function showTransportModeSettings(rl, currentManager, currentUser, setTransportMode) {
     // Clear screen and render simple header
     clearScreen();
-    const deviceCount = currentManager ? currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length : 0;
+    const deviceCount = currentManager ? currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length : 0;
     renderSimpleHeader(currentUser, deviceCount);
     clearMenuArea(SIMPLE_CONTENT_START_LINE);
 
@@ -135,7 +135,7 @@ async function showTransportModeSettings(rl, currentManager, currentUser, setTra
 async function showStatisticsSettings(rl, currentManager, currentUser, enableStats, setEnableStats) {
     // Clear screen and render simple header
     clearScreen();
-    const deviceCount = currentManager ? currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length : 0;
+    const deviceCount = currentManager ? currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length : 0;
     renderSimpleHeader(currentUser, deviceCount);
     clearMenuArea(SIMPLE_CONTENT_START_LINE);
 
@@ -190,7 +190,7 @@ async function showStatisticsSettings(rl, currentManager, currentUser, enableSta
 // Helper functions for user management menu
 function _renderUserManagementHeader(currentManager, currentUser) {
     clearScreen();
-    const deviceCount = currentManager ? currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length : 0;
+    const deviceCount = currentManager ? currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length : 0;
     renderSimpleHeader(currentUser, deviceCount);
     clearMenuArea(SIMPLE_CONTENT_START_LINE);
     process.stdout.write(chalk.bold('=== User Management ===\n\n'));
@@ -478,7 +478,7 @@ async function showUserManagementMenu(rl, currentManager, currentUser, callbacks
 async function showTimeoutSettings(rl, currentManager, currentUser, timeout, setTimeout) {
     // Clear screen and render simple header
     clearScreen();
-    const deviceCount = currentManager ? currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length : 0;
+    const deviceCount = currentManager ? currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length : 0;
     renderSimpleHeader(currentUser, deviceCount);
     clearMenuArea(SIMPLE_CONTENT_START_LINE);
 
@@ -521,7 +521,7 @@ async function showTimeoutSettings(rl, currentManager, currentUser, timeout, set
 async function showVerboseSettings(rl, currentManager, currentUser, verbose, setVerbose) {
     // Clear screen and render simple header
     clearScreen();
-    const deviceCount = currentManager ? currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length : 0;
+    const deviceCount = currentManager ? currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length : 0;
     renderSimpleHeader(currentUser, deviceCount);
     clearMenuArea(SIMPLE_CONTENT_START_LINE);
 
@@ -574,7 +574,7 @@ async function showErrorBudgetSettings(rl, currentManager, currentUser) {
     while (true) {
         // Clear screen and render simple header
         clearScreen();
-        const deviceCount = currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice)).length;
+        const deviceCount = currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice)).length;
         renderSimpleHeader(currentUser, deviceCount);
         clearMenuArea(SIMPLE_CONTENT_START_LINE);
 
@@ -619,7 +619,7 @@ async function showErrorBudgetSettings(rl, currentManager, currentUser) {
         if (action === 'back') {
             break;
         } else if (action === 'view-all') {
-            const devices = currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+            const devices = currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice));
             if (devices.length === 0) {
                 console.log(chalk.yellow('\n  No devices found.\n'));
             } else {
@@ -642,7 +642,7 @@ async function showErrorBudgetSettings(rl, currentManager, currentUser) {
                 message: 'Press Enter to continue...'
             }]);
         } else if (action === 'view-device') {
-            const devices = currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+            const devices = currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice));
             if (devices.length === 0) {
                 console.log(chalk.yellow('\n  No devices found.\n'));
                 await inquirer.prompt([{
@@ -693,7 +693,7 @@ async function showErrorBudgetSettings(rl, currentManager, currentUser) {
                 message: 'Press Enter to continue...'
             }]);
         } else if (action === 'reset-device') {
-            const devices = currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+            const devices = currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice));
             if (devices.length === 0) {
                 console.log(chalk.yellow('\n  No devices found.\n'));
                 await inquirer.prompt([{
@@ -756,7 +756,7 @@ async function showErrorBudgetSettings(rl, currentManager, currentUser) {
             }]);
 
             if (confirm) {
-                const devices = currentManager.getAllDevices().filter(d => !(d instanceof MerossSubDevice));
+                const devices = currentManager.devices.list().filter(d => !(d instanceof MerossSubDevice));
                 let resetCount = 0;
                 devices.forEach(device => {
                     const uuid = device.uuid;

package/cli/meross-cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 'use strict';
 
-const MerossManager = require('meross-iot');
+const ManagerMeross = require('meross-iot');
 const { MerossHubDevice } = require('meross-iot');
 const path = require('path');
 const testRunner = require('./tests/test-runner');
@@ -85,7 +85,7 @@ Examples:
 
         const { options, config } = processed;
 
-        const manager = new MerossManager(options);
+        const manager = new ManagerMeross(options);
 
         // Handle device events
         manager.on('deviceInitialized', (deviceId) => {
@@ -280,7 +280,7 @@ Examples:
     }
 
     function _resolveDevice(manager, uuid, subdeviceId) {
-        let device = manager.getDevice(uuid.trim());
+        let device = manager.devices.get(uuid.trim());
         if (!device) {
             console.error(chalk.red(`Error: Device not found: ${uuid}`));
             process.exit(1);

package/cli/tests/README.md

@@ -210,7 +210,7 @@ module.exports = {
    - `minDevices`: Minimum number of devices required (default: 1)
 
 2. **runTests Function**: Must accept a `context` object with:
-   - `manager`: MerossManager instance
+   - `manager`: ManagerMeross instance
    - `devices`: Array of pre-selected devices (optional, will auto-discover if not provided)
    - `options`: Test options (timeout, verbose, etc.)
 

package/cli/tests/test-control.js

@@ -26,17 +26,16 @@ async function runTests(context) {
         const multipleDevices = await findDevicesByAbility(manager, 'Appliance.Control.Multiple', OnlineStatus.ONLINE);
         
         // Also get any online device for testing control features
-        const allDevices = manager.getAllDevices();
+        const allDevices = manager.devices.list();
         const onlineDevices = allDevices.filter(device => {
-            const status = device.onlineStatus !== undefined ? device.onlineStatus : (device.dev?.onlineStatus);
-            return status === OnlineStatus.ONLINE;
+            return device.onlineStatus === OnlineStatus.ONLINE;
         });
         
         // Combine and deduplicate
         testDevices = [...multipleDevices];
         for (const device of onlineDevices.slice(0, 2)) {
-            const uuid = device.dev?.uuid || device.uuid;
-            if (!testDevices.find(d => (d.dev?.uuid || d.uuid) === uuid)) {
+            const uuid = device.uuid;
+            if (!testDevices.find(d => d.uuid === uuid)) {
                 testDevices.push(device);
             }
         }

package/cli/tests/test-diffuser.js

@@ -27,10 +27,10 @@ async function runTests(context) {
     if (devices && devices.length > 0) {
         // Use provided devices, filter by capabilities
         lightDevices = devices.filter(d => 
-            d._abilities && d._abilities['Appliance.Control.Diffuser.Light']
+            d.abilities && d.abilities['Appliance.Control.Diffuser.Light']
         );
         sprayDevices = devices.filter(d => 
-            d._abilities && d._abilities['Appliance.Control.Diffuser.Spray']
+            d.abilities && d.abilities['Appliance.Control.Diffuser.Spray']
         );
     } else {
         // Find diffuser light devices

package/cli/tests/test-dnd.js

@@ -24,10 +24,9 @@ async function runTests(context) {
     let testDevices = devices || [];
     if (testDevices.length === 0) {
         // Find devices that support DND mode (most devices support this)
-        const allDevices = manager.getAllDevices();
+        const allDevices = manager.devices.list();
         testDevices = allDevices.filter(d => {
-            const status = d.onlineStatus !== undefined ? d.onlineStatus : (d.dev?.onlineStatus);
-            return status === OnlineStatus.ONLINE &&
+            return d.onlineStatus === OnlineStatus.ONLINE &&
                    typeof d.getDNDMode === 'function' &&
                    typeof d.setDNDMode === 'function';
         });

package/cli/tests/test-encryption.js

@@ -31,7 +31,7 @@ async function runTests(context) {
         // Combine and deduplicate
         const allDevices = [...encryptionDevices];
         for (const device of suiteDevices) {
-            if (!allDevices.find(d => d.dev.uuid === device.dev.uuid)) {
+            if (!allDevices.find(d => d.uuid === device.uuid)) {
                 allDevices.push(device);
             }
         }
@@ -115,8 +115,8 @@ async function runTests(context) {
             const isKeySet = testDevice.isEncryptionKeySet();
             
             // If key is not set and we have the required info, set it
-            if (!isKeySet && testDevice.dev && testDevice.dev.uuid && manager.key && testDevice._macAddress) {
-                testDevice.setEncryptionKey(testDevice.dev.uuid, manager.key, testDevice._macAddress);
+            if (!isKeySet && testDevice.uuid && manager.key && testDevice.macAddress) {
+                testDevice.setEncryptionKey(testDevice.uuid, manager.key, testDevice.macAddress);
                 
                 const keySetAfter = testDevice.isEncryptionKeySet();
                 
@@ -180,8 +180,8 @@ async function runTests(context) {
         } else {
             // Ensure encryption key is set
             if (!testDevice.isEncryptionKeySet()) {
-                if (testDevice.dev && testDevice.dev.uuid && manager.key && testDevice._macAddress) {
-                    testDevice.setEncryptionKey(testDevice.dev.uuid, manager.key, testDevice._macAddress);
+                if (testDevice.uuid && manager.key && testDevice.macAddress) {
+                    testDevice.setEncryptionKey(testDevice.uuid, manager.key, testDevice.macAddress);
                 } else {
                     results.push({
                         name: 'should encrypt and decrypt messages if encryption key is set',

package/cli/tests/test-helper.js

@@ -10,47 +10,47 @@ const { OnlineStatus } = require('meross-iot');
  */
 
 /**
- * Waits for devices to be discovered
- * @param {Object} manager - MerossManager instance
+ * Waits for devices to be discovered.
+ *
+ * Returns an array of MerossDevice instances once they are initialized. Uses
+ * device UUID (or subdevice ID) for deduplication to avoid returning the same
+ * device multiple times.
+ *
+ * @param {Object} manager - ManagerMeross instance
  * @param {number} timeout - Timeout in milliseconds (default: 5000)
- * @returns {Promise<Array>} Array of device objects with structure: { deviceId, deviceDef, device }
+ * @returns {Promise<Array<MerossDevice>>} Array of device instances
  */
 function waitForDevices(manager, timeout = 5000) {
     return new Promise((resolve) => {
         // If devices already exist, return them immediately
-        const existingDevices = manager.getAllDevices();
+        const existingDevices = manager.devices.list();
         if (existingDevices && existingDevices.length > 0) {
             const devices = [];
             const deviceIds = new Set();
             
             for (const device of existingDevices) {
-                // Use unique identifier for subdevices (internalId) or UUID for base devices
+                // Use unique identifier for subdevices (parentUUID:subdeviceId) or UUID for base devices
                 const deviceId = device.subdeviceId 
-                    ? `${device.dev?.uuid || device.uuid}:${device.subdeviceId}` 
-                    : (device.dev?.uuid || device.uuid);
+                    ? `${device.uuid}:${device.subdeviceId}` 
+                    : device.uuid;
                 
                 if (!deviceIds.has(deviceId)) {
                     deviceIds.add(deviceId);
-                    devices.push({ 
-                        deviceId: deviceId, 
-                        deviceDef: device.dev || { uuid: device.uuid }, 
-                        device 
-                    });
+                    devices.push(device);
                 }
             }
             resolve(devices);
             return;
         }
         
-        // Wait for devices to be initialized
         const devices = [];
         const deviceIds = new Set();
         let timeoutId = null;
         
-        const onDeviceInitialized = (deviceId, deviceDef, device) => {
+        const onDeviceInitialized = (deviceId, device) => {
             if (!deviceIds.has(deviceId)) {
                 deviceIds.add(deviceId);
-                devices.push({ deviceId, deviceDef, device });
+                devices.push(device);
             }
         };
         
@@ -61,9 +61,10 @@ function waitForDevices(manager, timeout = 5000) {
             resolve(devices);
         }, timeout);
         
-        // Also check periodically if devices were added (in case event was missed)
+        // Periodic check handles cases where deviceInitialized event was missed
+        // (e.g., devices initialized before event handler was attached)
         const checkInterval = setInterval(() => {
-            const currentDevices = manager.getAllDevices();
+            const currentDevices = manager.devices.list();
             if (currentDevices && currentDevices.length > 0) {
                 clearInterval(checkInterval);
                 if (timeoutId) {
@@ -71,19 +72,14 @@ function waitForDevices(manager, timeout = 5000) {
                 }
                 manager.removeListener('deviceInitialized', onDeviceInitialized);
                 
-                // Add any new devices
                 for (const device of currentDevices) {
                     const deviceId = device.subdeviceId 
-                        ? `${device.dev?.uuid || device.uuid}:${device.subdeviceId}` 
-                        : (device.dev?.uuid || device.uuid);
+                        ? `${device.uuid}:${device.subdeviceId}` 
+                        : device.uuid;
                     
                     if (!deviceIds.has(deviceId)) {
                         deviceIds.add(deviceId);
-                        devices.push({ 
-                            deviceId: deviceId, 
-                            deviceDef: device.dev || { uuid: device.uuid }, 
-                            device 
-                        });
+                        devices.push(device);
                     }
                 }
                 resolve(devices);
@@ -98,13 +94,7 @@ function waitForDevices(manager, timeout = 5000) {
  * @returns {number|null} OnlineStatus value or null if not available
  */
 function getDeviceOnlineStatus(device) {
-    if (device.onlineStatus !== undefined) {
-        return device.onlineStatus;
-    }
-    if (device.dev && device.dev.onlineStatus !== undefined) {
-        return device.dev.onlineStatus;
-    }
-    return null;
+    return device.onlineStatus !== undefined ? device.onlineStatus : null;
 }
 
 /**
@@ -114,12 +104,12 @@ function getDeviceOnlineStatus(device) {
  * @returns {boolean} True if device has the ability
  */
 function deviceHasAbility(device, namespace) {
-    return !!(device._abilities && device._abilities[namespace]);
+    return !!(device.abilities && device.abilities[namespace]);
 }
 
 /**
  * Finds devices by ability namespace
- * @param {Object} manager - MerossManager instance
+ * @param {Object} manager - ManagerMeross instance
  * @param {string} namespace - Ability namespace (e.g., 'Appliance.Control.ToggleX')
  * @param {number|null} onlineStatus - OnlineStatus filter (optional, null = any status)
  * @param {Array<Object>} deviceFilter - Optional pre-filtered device list (for CLI device selection)
@@ -146,7 +136,7 @@ async function findDevicesByAbility(manager, namespace, onlineStatus = null, dev
     const devices = await waitForDevices(manager, 2000);
     const filteredDevices = [];
     
-    for (const { device } of devices) {
+    for (const device of devices) {
         // Check if device has the ability
         if (deviceHasAbility(device, namespace)) {
             // Filter by online status if specified
@@ -166,7 +156,7 @@ async function findDevicesByAbility(manager, namespace, onlineStatus = null, dev
 
 /**
  * Finds devices by device type
- * @param {Object} manager - MerossManager instance
+ * @param {Object} manager - ManagerMeross instance
  * @param {string} deviceType - Device type (e.g., 'mss310', 'msg100')
  * @param {number|null} onlineStatus - OnlineStatus filter (optional, null = any status)
  * @param {Array<Object>} deviceFilter - Optional pre-filtered device list (for CLI device selection)
@@ -176,7 +166,7 @@ async function findDevicesByType(manager, deviceType, onlineStatus = null, devic
     // If device filter is provided, use it instead of discovering devices
     if (deviceFilter && Array.isArray(deviceFilter) && deviceFilter.length > 0) {
         return deviceFilter.filter(device => {
-            const baseDeviceType = device.dev?.deviceType;
+            const baseDeviceType = device.deviceType;
             const subdeviceType = device.type || device._type;
             const matchesType = baseDeviceType === deviceType || subdeviceType === deviceType;
             
@@ -197,9 +187,9 @@ async function findDevicesByType(manager, deviceType, onlineStatus = null, devic
     const devices = await waitForDevices(manager, 2000);
     const filteredDevices = [];
     
-    for (const { device } of devices) {
+    for (const device of devices) {
         // Check both base device type and subdevice type
-        const baseDeviceType = device.dev?.deviceType;
+        const baseDeviceType = device.deviceType;
         const subdeviceType = device.type || device._type;
         const matchesType = baseDeviceType === deviceType || subdeviceType === deviceType;
         

package/cli/tests/test-hub-sensors.js

@@ -36,7 +36,7 @@ async function runTests(context) {
         // Also try finding by hub sensor abilities
         const sensorHubs = await findDevicesByAbility(manager, 'Appliance.Hub.Sensor.All', OnlineStatus.ONLINE);
         for (const device of sensorHubs) {
-            if (!hubDevices.find(d => (d.dev?.uuid || d.uuid) === (device.dev?.uuid || device.uuid))) {
+            if (!hubDevices.find(d => d.uuid === device.uuid)) {
                 hubDevices.push(device);
             }
         }

package/cli/tests/test-light.js

@@ -233,13 +233,13 @@ async function runTests(context) {
     }
     
     // Test 3: RGB Push Notification
-    // Note: This test requires a second MerossManager instance which is complex to set up
+    // Note: This test requires a second ManagerMeross instance which is complex to set up
     // For now, we'll skip this test or simplify it
     results.push({
         name: 'should receive push notification when RGB color changes',
         passed: true,
         skipped: true,
-        error: 'Push notification test requires second MerossManager instance - skipped for simplicity',
+        error: 'Push notification test requires second ManagerMeross instance - skipped for simplicity',
         device: deviceName,
         details: { note: 'Test can be implemented later if needed' }
     });

package/cli/tests/test-runner.js

@@ -157,7 +157,7 @@ async function runTest(testType, context) {
     const { manager, devices = [], options = {} } = context;
     
     if (!manager) {
-        throw new Error('MerossManager instance is required in context');
+        throw new Error('ManagerMeross instance is required in context');
     }
     
     // Resolve test type (handles aliases)
@@ -310,7 +310,7 @@ function getTestFile(testType) {
 /**
  * Finds devices for a given test type
  * @param {string} testType - Test type name or alias
- * @param {Object} manager - MerossManager instance
+ * @param {Object} manager - ManagerMeross instance
  * @returns {Promise<Array>} Array of matching devices
  */
 async function findDevicesForTestType(testType, manager) {
@@ -321,11 +321,11 @@ async function findDevicesForTestType(testType, manager) {
         return [];
     }
     
-    const allDevices = manager.getAllDevices();
+    const allDevices = manager.devices.list();
     if (!allDevices || allDevices.length === 0) {
         const { waitForDevices } = require('./test-helper');
         const deviceList = await waitForDevices(manager, 1000);
-        return deviceList.map(({ device }) => device).filter(d => d);
+        return deviceList.filter(d => d);
     }
     
     const matchingDevices = [];
@@ -340,13 +340,12 @@ async function findDevicesForTestType(testType, manager) {
     }
     
     for (const device of allDevices) {
-        const uuid = device.dev?.uuid || device.uuid;
+        const uuid = device.uuid;
         if (seenUuids.has(uuid)) {
             continue;
         }
         
-        if (device.onlineStatus !== OnlineStatus.ONLINE && 
-            device.dev?.onlineStatus !== OnlineStatus.ONLINE) {
+        if (device.onlineStatus !== OnlineStatus.ONLINE) {
             continue;
         }
         
@@ -371,7 +370,7 @@ async function findDevicesForTestType(testType, manager) {
         }
         
         const hasAbility = abilities.some(ability => 
-            device._abilities && device._abilities[ability]
+            device.abilities && device.abilities[ability]
         );
         
         if (hasAbility) {
@@ -383,17 +382,15 @@ async function findDevicesForTestType(testType, manager) {
     // For garage, also try by device type if no matches found
     if (testType.toLowerCase() === 'garage' && matchingDevices.length === 0) {
         for (const device of allDevices) {
-            const uuid = device.dev?.uuid || device.uuid;
+            const uuid = device.uuid;
             if (seenUuids.has(uuid)) {
                 continue;
             }
             
-            const baseDeviceType = device.dev?.deviceType;
             const subdeviceType = device.type || device._type;
-            const matchesType = baseDeviceType === 'msg100' || subdeviceType === 'msg100';
+            const matchesType = device.deviceType === 'msg100' || subdeviceType === 'msg100';
             
-            if (matchesType && (device.onlineStatus === OnlineStatus.ONLINE || 
-                                device.dev?.onlineStatus === OnlineStatus.ONLINE)) {
+            if (matchesType && device.onlineStatus === OnlineStatus.ONLINE) {
                 seenUuids.add(uuid);
                 matchingDevices.push(device);
             }

package/cli/tests/test-runtime.js

@@ -23,13 +23,12 @@ async function runTests(context) {
     let testDevices = devices || [];
     if (testDevices.length === 0) {
         // Runtime is typically available on most devices, so we'll test with any online device
-        const allDevices = manager.getAllDevices();
+        const allDevices = manager.devices.list();
         testDevices = allDevices.filter(device => {
-            const status = device.onlineStatus !== undefined ? device.onlineStatus : (device.dev?.onlineStatus);
-            if (status !== OnlineStatus.ONLINE) return false;
+            if (device.onlineStatus !== OnlineStatus.ONLINE) return false;
             // Check if device has runtime ability or if it's a common device type
-            return device._abilities && (
-                device._abilities['Appliance.System.Runtime'] ||
+            return device.abilities && (
+                device.abilities['Appliance.System.Runtime'] ||
                 // Most devices support runtime, so we'll test with any online device
                 true
             );

package/cli/tests/test-template.js

@@ -32,7 +32,7 @@ const metadata = {
 /**
  * Runs all tests for this test type
  * @param {Object} context - Test context object
- * @param {Object} context.manager - MerossManager instance (already connected)
+ * @param {Object} context.manager - ManagerMeross instance (already connected)
  * @param {Array<Object>} context.devices - Pre-filtered devices (from CLI selection or auto-discovery)
  * @param {Object} context.options - Test options (timeout, verbose, etc.)
  * @returns {Promise<Array>} Array of test result objects
@@ -52,8 +52,8 @@ async function runTests(context) {
         // Combine and deduplicate
         testDevices = [...toggleXDevices];
         for (const device of toggleDevices) {
-            const uuid = device.dev?.uuid || device.uuid;
-            if (!testDevices.find(d => (d.dev?.uuid || d.uuid) === uuid)) {
+            const uuid = device.uuid;
+            if (!testDevices.find(d => d.uuid === uuid)) {
                 testDevices.push(device);
             }
         }

package/cli/tests/test-toggle.js

@@ -19,7 +19,7 @@ const metadata = {
 
 /**
  * Helper function to find all toggle-capable devices
- * @param {Object} manager - MerossManager instance
+ * @param {Object} manager - ManagerMeross instance
  * @returns {Promise<Array>} Array of toggle devices
  */
 async function findAllToggleDevices(manager) {
@@ -29,8 +29,8 @@ async function findAllToggleDevices(manager) {
     // Combine and deduplicate
     const allToggleDevices = [...toggleXDevices];
     for (const device of toggleDevices) {
-        const uuid = device.dev?.uuid || device.uuid;
-        if (!allToggleDevices.find(d => (d.dev?.uuid || d.uuid) === uuid)) {
+        const uuid = device.uuid;
+        if (!allToggleDevices.find(d => d.uuid === uuid)) {
             allToggleDevices.push(device);
         }
     }
@@ -40,7 +40,7 @@ async function findAllToggleDevices(manager) {
 /**
  * Runs all tests for toggle/switch devices
  * @param {Object} context - Test context object
- * @param {Object} context.manager - MerossManager instance (already connected)
+ * @param {Object} context.manager - ManagerMeross instance (already connected)
  * @param {Array<Object>} context.devices - Pre-filtered devices (from CLI selection or auto-discovery)
  * @param {Object} context.options - Test options (timeout, verbose, etc.)
  * @returns {Promise<Array>} Array of test result objects

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meross-cli",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Command-line interface for controlling Meross smart home devices",
   "author": "Abe Haverkamp",
   "homepage": "https://github.com/Doekse/merossiot#readme",
@@ -24,7 +24,7 @@
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
     "inquirer": "^8.2.6",
-    "meross-iot": "^0.1.0",
+    "meross-iot": "^0.4.0",
     "ora": "^5.4.1"
   },
   "devDependencies": {
@@ -50,4 +50,3 @@
     "lint:fix": "eslint . --fix"
   }
 }
-