meross-cli 0.4.0 → 0.5.0

package/cli/tests/test-toggle.js

@@ -87,22 +87,19 @@ async function runTests(context) {
     
     // Test 2: Get toggle state
     try {
-        if (typeof testDevice.getToggleState === 'function') {
-            const toggleState = await testDevice.getToggleState(0);
+        if (testDevice.toggle) {
+            const toggleState = await testDevice.toggle.get({ channel: 0 });
+            const isOn = testDevice.toggle.isOn({ channel: 0 });
             
             if (!toggleState) {
                 results.push({
                     name: 'should get toggle state',
                     passed: false,
                     skipped: false,
-                    error: 'getToggleState returned null or undefined',
+                    error: 'toggle.get() returned null or undefined',
                     device: deviceName
                 });
             } else {
-                // Check cached toggle state
-                const cachedState = testDevice.getCachedToggleState(0);
-                const isOn = testDevice.isOn(0);
-                
                 results.push({
                     name: 'should get toggle state',
                     passed: true,
@@ -111,7 +108,6 @@ async function runTests(context) {
                     device: deviceName,
                     details: {
                         toggleState: toggleState,
-                        cachedState: cachedState,
                         isOn: isOn
                     }
                 });
@@ -121,7 +117,7 @@ async function runTests(context) {
                 name: 'should get toggle state',
                 passed: false,
                 skipped: true,
-                error: 'Device does not support getToggleState',
+                error: 'Device does not support toggle feature',
                 device: deviceName
             });
         }
@@ -137,141 +133,69 @@ async function runTests(context) {
     
     // Test 3: Control toggle state (turn on/off)
     try {
-        // Get initial state
-        let initialState = undefined;
-        if (typeof testDevice.getToggleState === 'function') {
-            const stateResponse = await testDevice.getToggleState(0);
-            if (stateResponse && stateResponse.togglex) {
-                initialState = stateResponse.togglex[0]?.onoff || stateResponse.togglex.onoff;
-            }
-        } else if (typeof testDevice.isOn === 'function') {
-            initialState = testDevice.isOn(0);
-        }
-        
-        // Test turnOn if available
-        if (typeof testDevice.turnOn === 'function') {
-            const turnOnResult = await testDevice.turnOn(0);
+        if (!testDevice.toggle) {
+            results.push({
+                name: 'should control toggle state',
+                passed: false,
+                skipped: true,
+                error: 'Device does not support toggle feature',
+                device: deviceName
+            });
+        } else {
+            // Get initial state
+            let initialState = testDevice.toggle.isOn({ channel: 0 });
             
-            if (!turnOnResult) {
+            // Test turn on
+            await testDevice.toggle.set({ channel: 0, on: true });
+            await new Promise(resolve => setTimeout(resolve, 2000));
+            
+            const isOnAfter = testDevice.toggle.isOn({ channel: 0 });
+            if (!isOnAfter) {
                 results.push({
                     name: 'should control toggle state (turn on)',
                     passed: false,
                     skipped: false,
-                    error: 'turnOn() returned null or undefined',
+                    error: 'Device did not turn on after set({ on: true })',
                     device: deviceName
                 });
             } else {
-                // Wait a bit for state to update
-                await new Promise(resolve => setTimeout(resolve, 2000));
-                
-                // Verify state
-                if (typeof testDevice.isOn === 'function') {
-                    const isOnAfter = testDevice.isOn(0);
-                    if (!isOnAfter) {
-                        results.push({
-                            name: 'should control toggle state (turn on)',
-                            passed: false,
-                            skipped: false,
-                            error: 'Device did not turn on after turnOn() call',
-                            device: deviceName
-                        });
-                    } else {
-                        results.push({
-                            name: 'should control toggle state (turn on)',
-                            passed: true,
-                            skipped: false,
-                            error: null,
-                            device: deviceName
-                        });
-                    }
-                } else {
-                    // Can't verify, but command succeeded
-                    results.push({
-                        name: 'should control toggle state (turn on)',
-                        passed: true,
-                        skipped: false,
-                        error: null,
-                        device: deviceName,
-                        details: { note: 'turnOn succeeded but cannot verify state (isOn not available)' }
-                    });
-                }
+                results.push({
+                    name: 'should control toggle state (turn on)',
+                    passed: true,
+                    skipped: false,
+                    error: null,
+                    device: deviceName
+                });
             }
-        } else {
-            results.push({
-                name: 'should control toggle state (turn on)',
-                passed: false,
-                skipped: true,
-                error: 'Device does not support turnOn',
-                device: deviceName
-            });
-        }
-        
-        // Test turnOff if available
-        if (typeof testDevice.turnOff === 'function') {
-            const turnOffResult = await testDevice.turnOff(0);
             
-            if (!turnOffResult) {
+            // Test turn off
+            await testDevice.toggle.set({ channel: 0, on: false });
+            await new Promise(resolve => setTimeout(resolve, 2000));
+            
+            const isOffAfter = testDevice.toggle.isOn({ channel: 0 });
+            if (isOffAfter) {
                 results.push({
                     name: 'should control toggle state (turn off)',
                     passed: false,
                     skipped: false,
-                    error: 'turnOff() returned null or undefined',
+                    error: 'Device did not turn off after set({ on: false })',
                     device: deviceName
                 });
             } else {
-                // Wait a bit for state to update
-                await new Promise(resolve => setTimeout(resolve, 2000));
-                
-                // Verify state
-                if (typeof testDevice.isOn === 'function') {
-                    const isOnAfter = testDevice.isOn(0);
-                    if (isOnAfter) {
-                        results.push({
-                            name: 'should control toggle state (turn off)',
-                            passed: false,
-                            skipped: false,
-                            error: 'Device did not turn off after turnOff() call',
-                            device: deviceName
-                        });
-                    } else {
-                        results.push({
-                            name: 'should control toggle state (turn off)',
-                            passed: true,
-                            skipped: false,
-                            error: null,
-                            device: deviceName
-                        });
-                    }
-                } else {
-                    // Can't verify, but command succeeded
-                    results.push({
-                        name: 'should control toggle state (turn off)',
-                        passed: true,
-                        skipped: false,
-                        error: null,
-                        device: deviceName,
-                        details: { note: 'turnOff succeeded but cannot verify state (isOn not available)' }
-                    });
-                }
+                results.push({
+                    name: 'should control toggle state (turn off)',
+                    passed: true,
+                    skipped: false,
+                    error: null,
+                    device: deviceName
+                });
             }
-        } else {
-            results.push({
-                name: 'should control toggle state (turn off)',
-                passed: false,
-                skipped: true,
-                error: 'Device does not support turnOff',
-                device: deviceName
-            });
-        }
-        
-        // Restore initial state if we changed it
-        if (initialState !== undefined && typeof testDevice.turnOn === 'function' && typeof testDevice.turnOff === 'function') {
-            if (initialState === 1 || initialState === true) {
-                await testDevice.turnOn(0);
-            } else {
-                await testDevice.turnOff(0);
+            
+            // Restore initial state if we changed it
+            if (initialState !== undefined) {
+                await testDevice.toggle.set({ channel: 0, on: initialState });
+                await new Promise(resolve => setTimeout(resolve, 2000));
             }
-            await new Promise(resolve => setTimeout(resolve, 2000));
         }
         
     } catch (error) {
@@ -284,54 +208,6 @@ async function runTests(context) {
         });
     }
     
-    // Test 4: Handle toggle push notifications
-    try {
-        const testDeviceForPush = toggleDevices[0];
-        
-        // Set up listener for toggle push notifications
-        let receivedNotification = false;
-        const notificationHandler = (notification) => {
-            if (notification.namespace === 'Appliance.Control.ToggleX' || 
-                notification.namespace === 'Appliance.Control.Toggle') {
-                receivedNotification = true;
-            }
-        };
-        
-        testDeviceForPush.on('pushNotification', notificationHandler);
-        
-        // Get toggle state (may trigger a push notification)
-        if (typeof testDeviceForPush.getToggleState === 'function') {
-            await testDeviceForPush.getToggleState(0);
-        }
-        
-        // Wait a bit for potential push notifications
-        await new Promise(resolve => setTimeout(resolve, 5000));
-        
-        // Remove listener
-        testDeviceForPush.removeListener('pushNotification', notificationHandler);
-        
-        // Note: We don't assert on receivedNotification since push notifications
-        // are device-initiated and may not occur during testing
-        // This test just verifies the listener mechanism works
-        results.push({
-            name: 'should handle toggle push notifications',
-            passed: true,
-            skipped: false,
-            error: null,
-            device: getDeviceName(testDeviceForPush),
-            details: { notificationReceived: receivedNotification }
-        });
-        
-    } catch (error) {
-        results.push({
-            name: 'should handle toggle push notifications',
-            passed: false,
-            skipped: false,
-            error: error.message,
-            device: toggleDevices.length > 0 ? getDeviceName(toggleDevices[0]) : null
-        });
-    }
-    
     return results;
 }
 

package/cli/tests/test-trigger.js

@@ -81,7 +81,7 @@ async function runTests(context) {
                     }
                 }
             };
-            testDevice.on('pushNotification', handler);
+            testDevice.on('pushNotificationReceived', handler);
             
             // Timeout after 5 seconds if no push notification arrives
             setTimeout(() => {
@@ -90,7 +90,7 @@ async function runTests(context) {
             }, 5000);
         });
         
-        const createResult = await testDevice.setTriggerX(testTrigger);
+        const createResult = await testDevice.trigger.set({ triggerx: testTrigger });
         
         if (!createResult) {
             results.push({
@@ -114,7 +114,7 @@ async function runTests(context) {
         } else {
             // Wait a bit and query by alias to find it
             await new Promise(resolve => setTimeout(resolve, 2000));
-            const triggers = await testDevice.getTriggerX(0);
+            const triggers = await testDevice.trigger.get({ channel: 0 });
             const foundTrigger = triggers?.triggerx?.find(t => t.alias === 'Test Trigger - CLI Test');
             if (foundTrigger && foundTrigger.id) {
                 createdTriggerId = foundTrigger.id;
@@ -133,7 +133,7 @@ async function runTests(context) {
         }
         
         // Verify trigger exists by querying it
-        const triggerInfo = await testDevice.getTriggerX(0);
+        const triggerInfo = await testDevice.trigger.get({ channel: 0 });
         const triggerExists = triggerInfo?.triggerx?.some(t => t.id === createdTriggerId);
         
         if (!triggerExists) {
@@ -148,7 +148,8 @@ async function runTests(context) {
         }
         
         // Verify cached trigger state
-        const cachedTriggers = testDevice.getCachedTriggerX(0);
+        const triggerResponse = await testDevice.trigger.get({ channel: 0 });
+        const cachedTriggers = triggerResponse?.triggerx || [];
         
         results.push({
             name: 'should create trigger',
@@ -158,7 +159,7 @@ async function runTests(context) {
             device: deviceName,
             details: { 
                 triggerId: createdTriggerId,
-                cachedTriggerCount: cachedTriggers ? cachedTriggers.length : 0
+                cachedTriggerCount: cachedTriggers.length
             }
         });
     } catch (error) {
@@ -226,50 +227,6 @@ async function runTests(context) {
         }
     }
     
-    // Test 3: Handle trigger push notifications
-    try {
-        // Set up listener for trigger push notifications
-        let receivedNotification = false;
-        const notificationHandler = (notification) => {
-            if (notification.namespace === 'Appliance.Control.TriggerX') {
-                receivedNotification = true;
-            }
-        };
-        
-        testDevice.on('pushNotification', notificationHandler);
-        
-        // Get trigger info (may trigger a push notification)
-        await testDevice.getTriggerX(0);
-        
-        // Wait a bit for potential push notifications
-        await new Promise(resolve => setTimeout(resolve, 2000));
-        
-        // Remove listener
-        testDevice.removeListener('pushNotification', notificationHandler);
-        
-        // Note: We don't assert on receivedNotification since push notifications
-        // are device-initiated and may not occur during testing
-        results.push({
-            name: 'should handle trigger push notifications',
-            passed: true,
-            skipped: false,
-            error: null,
-            device: deviceName,
-            details: { 
-                notificationReceived: receivedNotification,
-                note: 'Push notifications are device-initiated and may not occur during testing'
-            }
-        });
-    } catch (error) {
-        results.push({
-            name: 'should handle trigger push notifications',
-            passed: false,
-            skipped: false,
-            error: error.message,
-            device: deviceName
-        });
-    }
-    
     return results;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meross-cli",
-  "version": "0.4.0",
+  "version": "0.5.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.5.0",
+    "meross-iot": "^0.6.0",
     "ora": "^5.4.1"
   },
   "devDependencies": {