matterbridge-roborock-vacuum-plugin 1.1.1-rc09 → 1.1.1-rc11

package/README_SUPPORTED.md

@@ -7,6 +7,7 @@
 | Roborock Qrevo Edge 5V1    | `QREVO_EDGE_5V1`       | `roborock.vacuum.a187`        |                  |
 | Roborock S8 Pro Ultra      | `S8_PRO_ULTRA`         | `roborock.vacuum.a70`         |                  |
 | Roborock S7 MaxV           | `S7_MAXV`              | `roborock.vacuum.a27`         |                  |
+| Roborock Qrevo Plus        | `QREVO_PLUS`           | `roborock.vacuum.a123`        |                  |
 
 These devices have been fully tested and are confirmed to work as expected.
 

package/dist/behaviorFactory.js

@@ -9,7 +9,8 @@ export function configurateBehavior(model, duid, roborockService, cleanModeSetti
         return deviceHandler;
     }
     switch (model) {
-        case DeviceModel.QREVO_EDGE_5V1: {
+        case DeviceModel.QREVO_EDGE_5V1:
+        case DeviceModel.QREVO_PLUS: {
             const deviceHandler = new BehaviorDeviceGeneric(logger);
             setCommandHandlerSmart(duid, deviceHandler, logger, roborockService, cleanModeSettings);
             return deviceHandler;

package/dist/initialData/getSupportedCleanModes.js

@@ -7,6 +7,7 @@ export function getSupportedCleanModes(model, enableExperimentalFeature) {
     }
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
+        case DeviceModel.QREVO_PLUS:
             return getSupportedCleanModesSmart(enableExperimentalFeature);
         case DeviceModel.S7_MAXV:
         case DeviceModel.S8_PRO_ULTRA:

package/dist/platform.js

@@ -25,6 +25,11 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     enableExperimentalFeature;
     persist;
     rrHomeId;
+    regionUrls = {
+        US: 'https://usiot.roborock.com',
+        EU: 'https://euiot.roborock.com',
+        CN: 'https://iot.roborock.com',
+    };
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
         if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.3.6')) {
@@ -69,7 +74,10 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
         else {
             this.log.debug('Using cached deviceId:', deviceId);
         }
-        this.roborockService = new RoborockService(() => new RoborockAuthenticateApi(this.log, axiosInstance, deviceId), (logger, ud) => new RoborockIoTApi(ud, logger), this.config.refreshInterval ?? 60, this.clientManager, this.log);
+        const region = this.config.region?.toUpperCase() ?? 'US';
+        const baseUrl = this.regionUrls[region] ?? this.regionUrls['US'];
+        this.log.notice(`Using region: ${region} (${baseUrl})`);
+        this.roborockService = new RoborockService((logger, url) => new RoborockAuthenticateApi(this.log, axiosInstance, deviceId, url), (logger, ud) => new RoborockIoTApi(ud, logger), this.config.refreshInterval ?? 60, this.clientManager, this.log, baseUrl);
         const username = this.config.username;
         this.log.debug(`config: ${debugStringify(this.config)}`);
         const authenticationPayload = this.config.authentication;

package/dist/roborockCommunication/RESTAPI/roborockAuthenticateApi.js

@@ -8,13 +8,15 @@ export class RoborockAuthenticateApi {
     deviceId;
     username;
     authToken;
+    baseUrl;
     cachedBaseUrl;
     cachedCountry;
     cachedCountryCode;
-    constructor(logger, axiosFactory = axios, deviceId) {
+    constructor(logger, axiosFactory = axios, deviceId, baseUrl = 'https://usiot.roborock.com') {
         this.deviceId = deviceId ?? crypto.randomUUID();
         this.axiosFactory = axiosFactory;
         this.logger = logger;
+        this.baseUrl = baseUrl;
     }
     async loginWithUserData(username, userData) {
         this.loginWithAuthToken(username, userData.token);
@@ -56,12 +58,28 @@ export class RoborockAuthenticateApi {
         const api = await this.getAPIFor(email);
         const xMercyKs = this.generateRandomString(16);
         const xMercyK = await this.signKeyV3(api, xMercyKs);
+        let country = this.cachedCountry;
+        let countryCode = this.cachedCountryCode;
+        if (!country || !countryCode) {
+            if (this.baseUrl.includes('euiot')) {
+                country = country || 'Germany';
+                countryCode = countryCode || 'DE';
+            }
+            else if (this.baseUrl.includes('usiot')) {
+                country = country || 'United States';
+                countryCode = countryCode || 'US';
+            }
+            else if (this.baseUrl.includes('iot.roborock.com')) {
+                country = country || 'China';
+                countryCode = countryCode || 'CN';
+            }
+        }
         const response = await api.post('api/v4/auth/email/login/code', null, {
             params: {
                 email: email,
                 code: code,
-                country: this.cachedCountry ?? '',
-                countryCode: this.cachedCountryCode ?? '',
+                country: country ?? '',
+                countryCode: countryCode ?? '',
                 majorVersion: '14',
                 minorVersion: '0',
             },
@@ -117,7 +135,7 @@ export class RoborockAuthenticateApi {
         this.username = username;
         return apiResponse.data.url;
     }
-    async apiForUser(username, baseUrl = 'https://usiot.roborock.com') {
+    async apiForUser(username, baseUrl = this.baseUrl) {
         const instance = this.axiosFactory.create({
             baseURL: baseUrl,
             headers: {

package/dist/roborockCommunication/Zmodel/deviceModel.js

@@ -25,4 +25,5 @@ export var DeviceModel;
     DeviceModel["QREVO_MAXV"] = "roborock.vacuum.a87";
     DeviceModel["QREVO_EDGE_5V1"] = "roborock.vacuum.a187";
     DeviceModel["QREVO_EDGE_5AE"] = "roborock.vacuum.xxxx";
+    DeviceModel["QREVO_PLUS"] = "roborock.vacuum.a123";
 })(DeviceModel || (DeviceModel = {}));

package/dist/roborockService.js

@@ -24,9 +24,9 @@ export default class RoborockService {
     selectedAreas = new Map();
     supportedAreaIndexMaps = new Map();
     vacuumNeedAPIV3 = ['roborock.vacuum.ss07'];
-    constructor(authenticateApiSupplier = (logger) => new RoborockAuthenticateApi(logger), iotApiSupplier = (logger, ud) => new RoborockIoTApi(ud, logger), refreshInterval, clientManager, logger) {
+    constructor(authenticateApiSupplier = (logger, baseUrl) => new RoborockAuthenticateApi(logger, undefined, undefined, baseUrl), iotApiSupplier = (logger, ud) => new RoborockIoTApi(ud, logger), refreshInterval, clientManager, logger, baseUrl = 'https://usiot.roborock.com') {
         this.logger = logger;
-        this.loginApi = authenticateApiSupplier(logger);
+        this.loginApi = authenticateApiSupplier(logger, baseUrl);
         this.iotApiFactory = iotApiSupplier;
         this.refreshInterval = refreshInterval;
         this.clientManager = clientManager;

package/dist/share/runtimeHelper.js

@@ -7,6 +7,7 @@ export function getCurrentCleanModeFunc(model, forceRunAtDefault) {
     }
     switch (model) {
         case DeviceModel.QREVO_EDGE_5V1:
+        case DeviceModel.QREVO_PLUS:
             return getCurrentCleanModeSmart;
         case DeviceModel.S7_MAXV:
         case DeviceModel.S8_PRO_ULTRA:

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.1.1-rc09",
+  "version": "1.1.1-rc11",
   "whiteList": [],
   "blackList": [],
   "useInterval": true,

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

@@ -1,6 +1,6 @@
 {
   "title": "Matterbridge Roborock Vacuum Plugin",
-  "description": "matterbridge-roborock-vacuum-plugin v. 1.1.1-rc09 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.1.1-rc11 by https://github.com/RinDevJunior",
   "type": "object",
   "required": ["username"],
   "properties": {
@@ -29,6 +29,12 @@
       "description": "Roborock account email address",
       "type": "string"
     },
+    "region": {
+      "description": "Roborock account region",
+      "type": "string",
+      "enum": ["US", "EU", "CN"],
+      "default": "US"
+    },
     "authentication": {
       "description": "Authentication method to use",
       "type": "object",
@@ -49,7 +55,7 @@
               "maxLength": 6
             }
           },
-          "required": ["authenticationMethod", "verificationCode"]
+          "required": ["authenticationMethod"]
         },
         {
           "title": "Password",
@@ -70,7 +76,6 @@
         }
       ]
     },
-
     "refreshInterval": {
       "description": "Refresh interval in seconds (default: 60)",
       "type": "number",

package/package.json

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

package/src/behaviorFactory.ts

@@ -23,7 +23,8 @@ export function configurateBehavior(
   }
 
   switch (model) {
-    case DeviceModel.QREVO_EDGE_5V1: {
+    case DeviceModel.QREVO_EDGE_5V1:
+    case DeviceModel.QREVO_PLUS: {
       const deviceHandler = new BehaviorDeviceGeneric<EndpointCommandsSmart>(logger);
       setCommandHandlerSmart(duid, deviceHandler, logger, roborockService, cleanModeSettings);
       return deviceHandler;

package/src/initialData/getSupportedCleanModes.ts

@@ -11,6 +11,7 @@ export function getSupportedCleanModes(model: string, enableExperimentalFeature:
 
   switch (model) {
     case DeviceModel.QREVO_EDGE_5V1:
+    case DeviceModel.QREVO_PLUS:
       return getSupportedCleanModesSmart(enableExperimentalFeature);
 
     case DeviceModel.S7_MAXV:

package/src/platform.ts

@@ -30,6 +30,12 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
   persist: NodePersist.LocalStorage;
   rrHomeId: number | undefined;
 
+  private regionUrls: Record<string, string> = {
+    US: 'https://usiot.roborock.com',
+    EU: 'https://euiot.roborock.com',
+    CN: 'https://iot.roborock.com',
+  };
+
   constructor(matterbridge: PlatformMatterbridge, log: AnsiLogger, config: PlatformConfig) {
     super(matterbridge, log, config);
 
@@ -91,12 +97,18 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
       this.log.debug('Using cached deviceId:', deviceId);
     }
 
+    const region = (this.config.region as string)?.toUpperCase() ?? 'US';
+    // use regionmap to get baseUrl
+    const baseUrl = this.regionUrls[region] ?? this.regionUrls['US'];
+    this.log.notice(`Using region: ${region} (${baseUrl})`);
+
     this.roborockService = new RoborockService(
-      () => new RoborockAuthenticateApi(this.log, axiosInstance, deviceId),
+      (logger, url) => new RoborockAuthenticateApi(this.log, axiosInstance, deviceId, url),
       (logger, ud) => new RoborockIoTApi(ud, logger),
       (this.config.refreshInterval as number) ?? 60,
       this.clientManager,
       this.log,
+      baseUrl,
     );
 
     const username = this.config.username as string;

package/src/roborockCommunication/RESTAPI/roborockAuthenticateApi.ts

@@ -14,15 +14,17 @@ export class RoborockAuthenticateApi {
   private deviceId: string;
   private username?: string;
   private authToken?: string;
+  private readonly baseUrl: string;
   // Cached values from base URL lookup for v4 login
   private cachedBaseUrl?: string;
   private cachedCountry?: string;
   private cachedCountryCode?: string;
 
-  constructor(logger: AnsiLogger, axiosFactory: AxiosStatic = axios, deviceId?: string) {
+  constructor(logger: AnsiLogger, axiosFactory: AxiosStatic = axios, deviceId?: string, baseUrl = 'https://usiot.roborock.com') {
     this.deviceId = deviceId ?? crypto.randomUUID();
     this.axiosFactory = axiosFactory;
     this.logger = logger;
+    this.baseUrl = baseUrl;
   }
 
   public async loginWithUserData(username: string, userData: UserData): Promise<UserData> {
@@ -98,12 +100,28 @@ export class RoborockAuthenticateApi {
     // Get signed key from API
     const xMercyK = await this.signKeyV3(api, xMercyKs);
 
+    // Fallback for missing country info to avoid 1002 parameter error
+    let country = this.cachedCountry;
+    let countryCode = this.cachedCountryCode;
+    if (!country || !countryCode) {
+      if (this.baseUrl.includes('euiot')) {
+        country = country || 'Germany';
+        countryCode = countryCode || 'DE';
+      } else if (this.baseUrl.includes('usiot')) {
+        country = country || 'United States';
+        countryCode = countryCode || 'US';
+      } else if (this.baseUrl.includes('iot.roborock.com')) {
+        country = country || 'China';
+        countryCode = countryCode || 'CN';
+      }
+    }
+
     const response = await api.post('api/v4/auth/email/login/code', null, {
       params: {
         email: email,
         code: code,
-        country: this.cachedCountry ?? '',
-        countryCode: this.cachedCountryCode ?? '',
+        country: country ?? '',
+        countryCode: countryCode ?? '',
         majorVersion: '14',
         minorVersion: '0',
       },
@@ -177,7 +195,7 @@ export class RoborockAuthenticateApi {
     return apiResponse.data.url;
   }
 
-  private async apiForUser(username: string, baseUrl = 'https://usiot.roborock.com'): Promise<AxiosInstance> {
+  private async apiForUser(username: string, baseUrl = this.baseUrl): Promise<AxiosInstance> {
     const instance = this.axiosFactory.create({
       baseURL: baseUrl,
       headers: {

package/src/roborockCommunication/Zmodel/deviceModel.ts

@@ -24,4 +24,5 @@ export enum DeviceModel {
   QREVO_MAXV = 'roborock.vacuum.a87',
   QREVO_EDGE_5V1 = 'roborock.vacuum.a187',
   QREVO_EDGE_5AE = 'roborock.vacuum.xxxx',
+  QREVO_PLUS = 'roborock.vacuum.a123',
 }

package/src/roborockService.ts

@@ -64,14 +64,16 @@ export default class RoborockService {
   private readonly vacuumNeedAPIV3 = ['roborock.vacuum.ss07'];
 
   constructor(
-    authenticateApiSupplier: Factory<void, RoborockAuthenticateApi> = (logger) => new RoborockAuthenticateApi(logger),
+    authenticateApiSupplier: (logger: AnsiLogger, baseUrl: string) => RoborockAuthenticateApi = (logger, baseUrl) =>
+      new RoborockAuthenticateApi(logger, undefined, undefined, baseUrl),
     iotApiSupplier: Factory<UserData, RoborockIoTApi> = (logger, ud) => new RoborockIoTApi(ud, logger),
     refreshInterval: number,
     clientManager: ClientManager,
     logger: AnsiLogger,
+    baseUrl = 'https://usiot.roborock.com',
   ) {
     this.logger = logger;
-    this.loginApi = authenticateApiSupplier(logger);
+    this.loginApi = authenticateApiSupplier(logger, baseUrl);
     this.iotApiFactory = iotApiSupplier;
     this.refreshInterval = refreshInterval;
     this.clientManager = clientManager;

package/src/share/runtimeHelper.ts

@@ -12,6 +12,7 @@ export function getCurrentCleanModeFunc(model: string, forceRunAtDefault: boolea
 
   switch (model) {
     case DeviceModel.QREVO_EDGE_5V1:
+    case DeviceModel.QREVO_PLUS:
       return getCurrentCleanModeSmart;
 
     case DeviceModel.S7_MAXV: