matterbridge-roborock-vacuum-plugin 1.0.8-rc03 → 1.0.8-rc05

package/dist/behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.js

@@ -1,5 +1,5 @@
 import { RvcCleanMode, RvcOperationalState, RvcRunMode } from 'matterbridge/matter/clusters';
-export function getDefaultSupportedRunModes() {
+export function getSupportedRunModesA51() {
     return [
         {
             label: 'Idle',
@@ -18,7 +18,7 @@ export function getDefaultSupportedRunModes() {
         },
     ];
 }
-export function getDefaultSupportedCleanModes() {
+export function getSupportedCleanModesA51() {
     return [
         {
             label: 'Mop',
@@ -42,7 +42,7 @@ export function getDefaultSupportedCleanModes() {
         },
     ];
 }
-export function getDefaultOperationalStates() {
+export function getOperationalStatesA51() {
     return [
         {
             operationalStateId: RvcOperationalState.OperationalState.Stopped,

package/dist/initialData/getOperationalStates.js

@@ -4,12 +4,15 @@ import { getDefaultOperationalStates } from '../behaviors/roborock.vacuum/defaul
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { VacuumErrorCode } from '../roborockCommunication/Zenum/vacuumAndDockErrorCode.js';
 import { getOperationalStatesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
+import { getOperationalStatesA51 } from '../behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.js';
 export function getOperationalStates(model) {
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
             return getOperationalStatesA187();
         case DeviceModel.S7_MAXV:
             return getOperationalStatesA27();
+        case DeviceModel.S8_MAXV_ULTRA:
+            return getOperationalStatesA51();
         default:
             return getDefaultOperationalStates();
     }

package/dist/initialData/getSupportedCleanModes.js

@@ -2,12 +2,15 @@ import { getSupportedCleanModesA187 } from '../behaviors/roborock.vacuum/QREVO_E
 import { getDefaultSupportedCleanModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { getSupportedCleanModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
+import { getSupportedCleanModesA51 } from '../behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.js';
 export function getSupportedCleanModes(model) {
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
             return getSupportedCleanModesA187();
         case DeviceModel.S7_MAXV:
             return getSupportedCleanModesA27();
+        case DeviceModel.S8_PRO_ULTRA:
+            return getSupportedCleanModesA51();
         default:
             return getDefaultSupportedCleanModes();
     }

package/dist/initialData/getSupportedRunModes.js

@@ -2,6 +2,7 @@ import { getSupportedRunModesA187 } from '../behaviors/roborock.vacuum/QREVO_EDG
 import { getDefaultSupportedRunModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { getSupportedRunModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
+import { getSupportedRunModesA51 } from '../behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.js';
 export function getRunningMode(model, modeTag) {
     if (!model || !modeTag)
         return null;
@@ -15,6 +16,8 @@ export function getSupportedRunModes(model) {
             return getSupportedRunModesA187();
         case DeviceModel.S7_MAXV:
             return getSupportedRunModesA27();
+        case DeviceModel.S8_MAXV_ULTRA:
+            return getSupportedRunModesA51();
         default:
             return getDefaultSupportedRunModes();
     }

package/dist/model/DockingStationStatus.js

@@ -19,6 +19,5 @@ export function hasDockingStationError(status) {
         status.waterBoxFilterStatus === DockingStationStatusType.Error ||
         status.dustBagStatus === DockingStationStatusType.Error ||
         status.dirtyWaterBoxStatus === DockingStationStatusType.Error ||
-        status.clearWaterBoxStatus === DockingStationStatusType.Error ||
-        status.isUpdownWaterReady === DockingStationStatusType.Error);
+        status.clearWaterBoxStatus === DockingStationStatusType.Error);
 }

package/dist/platform.js

@@ -1,4 +1,3 @@
-import './extensions/index.js';
 import { MatterbridgeDynamicPlatform } from 'matterbridge';
 import * as axios from 'axios';
 import { debugStringify } from 'matterbridge/logger';
@@ -23,8 +22,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     enableExperimentalFeature;
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
-        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.0.4')) {
-            throw new Error(`This plugin requires Matterbridge version >= "3.0.4". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
+        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.0.5')) {
+            throw new Error(`This plugin requires Matterbridge version >= "3.0.5". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`);
         }
         this.log.info('Initializing platform:', this.config.name);
         if (config.whiteList === undefined)

package/matterbridge-roborock-vacuum-plugin.config.json

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.0.8-rc03",
+  "version": "1.0.8-rc05",
   "whiteList": [],
   "blackList": [],
   "useInterval": true,
@@ -33,4 +33,4 @@
   "debug": true,
   "unregisterOnShutdown": false,
   "enableExperimentalFeature": false
-}
+}

package/matterbridge-roborock-vacuum-plugin.schema.json

@@ -1,11 +1,8 @@
 {
   "title": "Matterbridge Roborock Vacuum Plugin",
-  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.8-rc03 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.8-rc05 by https://github.com/RinDevJunior",
   "type": "object",
-  "required": [
-    "username",
-    "password"
-  ],
+  "required": ["username", "password"],
   "properties": {
     "name": {
       "description": "Plugin name",
@@ -60,9 +57,7 @@
                 "const": true
               }
             },
-            "required": [
-              "enableExperimentalFeature"
-            ]
+            "required": ["enableExperimentalFeature"]
           },
           "then": {
             "properties": {
@@ -99,9 +94,7 @@
                           "const": true
                         }
                       },
-                      "required": [
-                        "enableCleanModeMapping"
-                      ]
+                      "required": ["enableCleanModeMapping"]
                     },
                     "then": {
                       "properties": {
@@ -146,9 +139,7 @@
                                     "default": 25
                                   }
                                 },
-                                "required": [
-                                  "distanceOff"
-                                ]
+                                "required": ["distanceOff"]
                               }
                             }
                           ]
@@ -185,9 +176,7 @@
                                     "default": 25
                                   }
                                 },
-                                "required": [
-                                  "distanceOff"
-                                ]
+                                "required": ["distanceOff"]
                               }
                             }
                           ]
@@ -217,36 +206,20 @@
     "fanMode": {
       "type": "string",
       "description": "Suction power mode to use (e.g., 'Quiet', 'Balanced', 'Turbo', 'Max', 'MaxPlus').",
-      "enum": [
-        "Quiet",
-        "Balanced",
-        "Turbo",
-        "Max",
-        "MaxPlus"
-      ],
+      "enum": ["Quiet", "Balanced", "Turbo", "Max", "MaxPlus"],
       "default": "Balanced"
     },
     "waterFlowMode": {
       "type": "string",
       "description": "Water flow mode to use (e.g., 'Low', 'Medium', 'High', 'CustomizeWithDistanceOff').",
-      "enum": [
-        "Low",
-        "Medium",
-        "High",
-        "CustomizeWithDistanceOff"
-      ],
+      "enum": ["Low", "Medium", "High", "CustomizeWithDistanceOff"],
       "default": "Medium"
     },
     "mopRouteMode": {
       "type": "string",
       "description": "Mop route intensity to use (e.g., 'Standard', 'Deep', 'DeepPlus', 'Fast').",
-      "enum": [
-        "Standard",
-        "Deep",
-        "DeepPlus",
-        "Fast"
-      ],
+      "enum": ["Standard", "Deep", "DeepPlus", "Fast"],
       "default": "Standard"
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
-  "version": "1.0.8-rc03",
+  "version": "1.0.8-rc05",
   "description": "Matterbridge Roborock Vacuum Plugin",
   "author": "https://github.com/RinDevJunior",
   "license": "MIT",

package/src/behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.ts

@@ -1,6 +1,6 @@
 import { RvcCleanMode, RvcOperationalState, RvcRunMode } from 'matterbridge/matter/clusters';
 
-export function getDefaultSupportedRunModes(): RvcRunMode.ModeOption[] {
+export function getSupportedRunModesA51(): RvcRunMode.ModeOption[] {
   return [
     {
       label: 'Idle',
@@ -20,7 +20,7 @@ export function getDefaultSupportedRunModes(): RvcRunMode.ModeOption[] {
   ];
 }
 
-export function getDefaultSupportedCleanModes(): RvcCleanMode.ModeOption[] {
+export function getSupportedCleanModesA51(): RvcCleanMode.ModeOption[] {
   return [
     {
       label: 'Mop',
@@ -45,7 +45,7 @@ export function getDefaultSupportedCleanModes(): RvcCleanMode.ModeOption[] {
   ];
 }
 
-export function getDefaultOperationalStates(): RvcOperationalState.OperationalStateStruct[] {
+export function getOperationalStatesA51(): RvcOperationalState.OperationalStateStruct[] {
   return [
     {
       operationalStateId: RvcOperationalState.OperationalState.Stopped,

package/src/initialData/getOperationalStates.ts

@@ -4,6 +4,7 @@ import { getDefaultOperationalStates } from '../behaviors/roborock.vacuum/defaul
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { VacuumErrorCode } from '../roborockCommunication/Zenum/vacuumAndDockErrorCode.js';
 import { getOperationalStatesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
+import { getOperationalStatesA51 } from '../behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.js';
 
 export function getOperationalStates(model: string): RvcOperationalState.OperationalStateStruct[] {
   switch (model) {
@@ -11,6 +12,8 @@ export function getOperationalStates(model: string): RvcOperationalState.Operati
       return getOperationalStatesA187();
     case DeviceModel.S7_MAXV:
       return getOperationalStatesA27();
+    case DeviceModel.S8_MAXV_ULTRA:
+      return getOperationalStatesA51();
     default:
       return getDefaultOperationalStates();
   }

package/src/initialData/getSupportedCleanModes.ts

@@ -3,6 +3,7 @@ import { getSupportedCleanModesA187 } from '../behaviors/roborock.vacuum/QREVO_E
 import { getDefaultSupportedCleanModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { getSupportedCleanModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
+import { getSupportedCleanModesA51 } from '../behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.js';
 
 export function getSupportedCleanModes(model: string): RvcCleanMode.ModeOption[] {
   switch (model) {
@@ -10,6 +11,8 @@ export function getSupportedCleanModes(model: string): RvcCleanMode.ModeOption[]
       return getSupportedCleanModesA187();
     case DeviceModel.S7_MAXV:
       return getSupportedCleanModesA27();
+    case DeviceModel.S8_PRO_ULTRA:
+      return getSupportedCleanModesA51();
     default:
       return getDefaultSupportedCleanModes();
   }

package/src/initialData/getSupportedRunModes.ts

@@ -3,6 +3,7 @@ import { getSupportedRunModesA187 } from '../behaviors/roborock.vacuum/QREVO_EDG
 import { getDefaultSupportedRunModes } from '../behaviors/roborock.vacuum/default/initalData.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 import { getSupportedRunModesA27 } from '../behaviors/roborock.vacuum/S7_MAXV/initalData.js';
+import { getSupportedRunModesA51 } from '../behaviors/roborock.vacuum/S8_PRO_ULTRA/initalData.js';
 
 export function getRunningMode(model: string | undefined, modeTag: RvcRunMode.ModeTag | undefined): number | null {
   if (!model || !modeTag) return null;
@@ -18,6 +19,8 @@ export function getSupportedRunModes(model: string): RvcRunMode.ModeOption[] {
       return getSupportedRunModesA187();
     case DeviceModel.S7_MAXV:
       return getSupportedRunModesA27();
+    case DeviceModel.S8_MAXV_ULTRA:
+      return getSupportedRunModesA51();
     default:
       return getDefaultSupportedRunModes();
   }

package/src/model/DockingStationStatus.ts

@@ -31,7 +31,7 @@ export function hasDockingStationError(status: DockingStationStatus): boolean {
     status.waterBoxFilterStatus === DockingStationStatusType.Error ||
     status.dustBagStatus === DockingStationStatusType.Error ||
     status.dirtyWaterBoxStatus === DockingStationStatusType.Error ||
-    status.clearWaterBoxStatus === DockingStationStatusType.Error ||
-    status.isUpdownWaterReady === DockingStationStatusType.Error
+    status.clearWaterBoxStatus === DockingStationStatusType.Error
+    // || status.isUpdownWaterReady === DockingStationStatusType.Error
   );
 }

package/src/platform.ts

@@ -1,4 +1,3 @@
-import './extensions/index.js';
 import { Matterbridge, MatterbridgeDynamicPlatform, PlatformConfig } from 'matterbridge';
 import * as axios from 'axios';
 import { AnsiLogger, debugStringify, LogLevel } from 'matterbridge/logger';
@@ -30,9 +29,9 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     super(matterbridge, log, config);
 
     // Verify that Matterbridge is the correct version
-    if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.0.4')) {
+    if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.0.5')) {
       throw new Error(
-        `This plugin requires Matterbridge version >= "3.0.4". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`,
+        `This plugin requires Matterbridge version >= "3.0.5". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`,
       );
     }
     this.log.info('Initializing platform:', this.config.name);

package/src/tests/model/DockingStationStatus.test.ts

@@ -31,7 +31,7 @@ describe('DockingStationStatus', () => {
       waterBoxFilterStatus: 2,
       dustBagStatus: 2,
       dirtyWaterBoxStatus: 2,
-      clearWaterBoxStatus: 2,
+      clearWaterBoxStatus: 1, // This means there is a problem with the clear water box
       isUpdownWaterReady: 1, // This means there is a problem with the updown water
     };
     expect(hasDockingStationError(status)).toBe(true);