matterbridge-roborock-vacuum-plugin 1.1.1-rc05 → 1.1.1-rc07

package/dist/model/roomIndexMap.js

@@ -4,8 +4,8 @@ export class RoomIndexMap {
     constructor(roomMap) {
         this.indexMap = roomMap;
         this.roomMap = new Map();
-        for (const [areaId, { roomId, mapId }] of roomMap.entries()) {
-            this.roomMap.set(`${roomId}:${mapId}`, areaId);
+        for (const [areaId, r] of roomMap.entries()) {
+            this.roomMap.set(`${r.roomId}:${r.mapId}`, areaId);
         }
     }
     getAreaId(roomId, mapId) {

package/dist/platform.js

@@ -26,8 +26,8 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
     rrHomeId;
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
-        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.2.2')) {
-            throw new Error(`This plugin requires Matterbridge version >= "3.2.2". 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.3.6')) {
+            throw new Error(`This plugin requires Matterbridge version >= "3.3.6". 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/dist/roborockService.js

@@ -97,7 +97,7 @@ export default class RoborockService {
     }
     async changeCleanMode(duid, { suctionPower, waterFlow, distance_off, mopRoute }) {
         this.logger.notice('RoborockService - changeCleanMode');
-        return this.getMessageProcessor(duid)?.changeCleanMode(duid, suctionPower, waterFlow, mopRoute, distance_off);
+        return this.getMessageProcessor(duid)?.changeCleanMode(duid, suctionPower, waterFlow, mopRoute ?? 0, distance_off);
     }
     async startClean(duid) {
         const supportedRooms = this.supportedAreas.get(duid) ?? [];

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.1.1-rc05",
+  "version": "1.1.1-rc07",
   "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-rc05 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.1.1-rc07 by https://github.com/RinDevJunior",
   "type": "object",
   "required": ["username", "password"],
   "properties": {

package/package.json

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

package/src/behaviors/roborock.vacuum/default/default.ts

@@ -79,7 +79,14 @@ export const RvcCleanMode: Record<number, string> = {
   [99]: 'Go Vacation',
 };
 
-export const CleanSetting: Record<number, { suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number }> = {
+export interface CleanModeSetting {
+  suctionPower: number;
+  waterFlow: number;
+  distance_off: number;
+  mopRoute: number | undefined;
+}
+
+export const CleanSetting: Record<number, CleanModeSetting> = {
   [5]: { suctionPower: VacuumSuctionPower.Balanced, waterFlow: MopWaterFlow.Medium, distance_off: 0, mopRoute: MopRoute.Standard }, // 'Vac & Mop Default'
   [6]: { suctionPower: VacuumSuctionPower.Balanced, waterFlow: MopWaterFlow.Medium, distance_off: 0, mopRoute: MopRoute.Fast }, // 'Vac & Mop Quick'
 
@@ -192,10 +199,7 @@ export function setDefaultCommandHandler(
   });
 }
 
-export const getSettingFromCleanMode = (
-  activity: string,
-  cleanModeSettings?: CleanModeSettings,
-): { suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number } | undefined => {
+export const getSettingFromCleanMode = (activity: string, cleanModeSettings?: CleanModeSettings): CleanModeSetting | undefined => {
   switch (activity) {
     case 'Mop: Default': {
       const mopSetting = cleanModeSettings?.mopping;

package/src/behaviors/roborock.vacuum/default/runtimes.ts

@@ -1,6 +1,6 @@
-import { CleanSetting, MopRoute, MopWaterFlow, VacuumSuctionPower } from './default.js';
+import { CleanModeSetting, CleanSetting, MopRoute, MopWaterFlow, VacuumSuctionPower } from './default.js';
 
-export function getCurrentCleanModeDefault(setting: { suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number | undefined }): number | undefined {
+export function getCurrentCleanModeDefault(setting: CleanModeSetting): number | undefined {
   if (!setting || typeof setting !== 'object') {
     return undefined;
   }

package/src/behaviors/roborock.vacuum/smart/runtimes.ts

@@ -1,7 +1,8 @@
+import { CleanModeSetting } from '../default/default.js';
 import { getCurrentCleanModeDefault } from '../default/runtimes.js';
 import { MopRouteSmart, MopWaterFlowSmart, VacuumSuctionPowerSmart } from './smart.js';
 
-export function getCurrentCleanModeSmart(setting: { suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number | undefined }): number | undefined {
+export function getCurrentCleanModeSmart(setting: CleanModeSetting): number | undefined {
   if (!setting || typeof setting !== 'object') {
     return undefined;
   }

package/src/behaviors/roborock.vacuum/smart/smart.ts

@@ -3,7 +3,7 @@ import { AnsiLogger, debugStringify } from 'matterbridge/logger';
 import { BehaviorDeviceGeneric, BehaviorRoborock, DeviceCommands } from '../../BehaviorDeviceGeneric.js';
 import RoborockService from '../../../roborockService.js';
 import { CleanModeSettings } from '../../../model/ExperimentalFeatureSetting.js';
-import { RvcCleanMode as DefaultRvcCleanMode, CleanSetting as DefaultCleanSetting, getSettingFromCleanMode, RvcRunMode } from '../default/default.js';
+import { RvcCleanMode as DefaultRvcCleanMode, CleanSetting as DefaultCleanSetting, getSettingFromCleanMode, RvcRunMode, CleanModeSetting } from '../default/default.js';
 
 export interface EndpointCommandsSmart extends DeviceCommands {
   selectAreas: (newAreas: number[] | undefined) => MaybePromise;
@@ -61,7 +61,7 @@ export const RvcCleanMode: Record<number, string> = {
 };
 
 // { suctionPower: [ 102 ], waterFlow: 200, distance_off: 0, mopRoute: [ 102 ] }
-export const CleanSetting: Record<number, { suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number }> = {
+export const CleanSetting: Record<number, CleanModeSetting> = {
   [4]: { suctionPower: 0, waterFlow: 0, distance_off: 0, mopRoute: MopRouteSmart.Smart }, // 'Smart Plan'
   ...DefaultCleanSetting,
 };

package/src/initialData/getSupportedAreas.ts

@@ -5,12 +5,13 @@ import { Room } from '../roborockCommunication/Zmodel/room.js';
 import { randomInt } from 'node:crypto';
 import { RoomIndexMap } from '../model/roomIndexMap.js';
 
-export function getSupportedAreas(
-  vacuumRooms: Room[],
-  roomMap: RoomMap | undefined,
-  enableMultipleMap = false,
-  log?: AnsiLogger,
-): { supportedAreas: ServiceArea.Area[]; supportedMaps: ServiceArea.Map[]; roomIndexMap: RoomIndexMap } {
+export interface SupportedAreasResult {
+  supportedAreas: ServiceArea.Area[];
+  supportedMaps: ServiceArea.Map[];
+  roomIndexMap: RoomIndexMap;
+}
+
+export function getSupportedAreas(vacuumRooms: Room[], roomMap: RoomMap | undefined, enableMultipleMap = false, log?: AnsiLogger): SupportedAreasResult {
   log?.debug('getSupportedAreas-vacuum room', debugStringify(vacuumRooms));
   log?.debug('getSupportedAreas-roomMap', roomMap ? debugStringify(roomMap) : 'undefined');
 
@@ -80,9 +81,14 @@ export function getSupportedAreas(
   };
 }
 
+interface SupportedArea {
+  areaId: number;
+  mapId: number;
+}
+
 function findDuplicatedAreaIds(areas: ServiceArea.Area[], log?: AnsiLogger): boolean {
   const seen = new Set<string>();
-  const duplicates: { areaId: number; mapId: number }[] = [];
+  const duplicates: SupportedArea[] = [];
 
   for (const area of areas) {
     const key = `${area.areaId}=${area.mapId}`;
@@ -101,12 +107,18 @@ function findDuplicatedAreaIds(areas: ServiceArea.Area[], log?: AnsiLogger): boo
   return duplicates.length > 0;
 }
 
-function processValidData(
-  enableMultipleMap: boolean,
-  vacuumRooms: Room[],
-  roomMap?: RoomMap,
-): { supportedAreas: ServiceArea.Area[]; indexMap: Map<number, { roomId: number; mapId: number | null }> } {
-  const indexMap = new Map<number, { roomId: number; mapId: number | null }>();
+export interface MapInfo {
+  roomId: number;
+  mapId: number | null;
+}
+
+interface ProcessedData {
+  supportedAreas: ServiceArea.Area[];
+  indexMap: Map<number, MapInfo>;
+}
+
+function processValidData(enableMultipleMap: boolean, vacuumRooms: Room[], roomMap?: RoomMap): ProcessedData {
+  const indexMap = new Map<number, MapInfo>();
   const supportedAreas: ServiceArea.Area[] =
     roomMap?.rooms !== undefined && roomMap.rooms.length > 0
       ? roomMap.rooms.map((room, index) => {

package/src/model/CloudMessageModel.ts

@@ -1,13 +1,11 @@
 import { CloudMessageResult } from '../roborockCommunication/Zmodel/messageResult.js';
 
+interface CloudMessageDpsEntry {
+  id: number;
+  result: CloudMessageResult[];
+}
+
 export interface CloudMessageModel {
   duid: string;
-  dps: Record<
-    string,
-    | number
-    | {
-        id: number;
-        result: CloudMessageResult[];
-      }
-  >;
+  dps: Record<string, number | CloudMessageDpsEntry>;
 }

package/src/model/ExperimentalFeatureSetting.ts

@@ -1,34 +1,42 @@
+export interface AdvancedFeature {
+  showRoutinesAsRoom: boolean;
+  includeDockStationStatus: boolean;
+  forceRunAtDefault: boolean;
+  useVacationModeToSendVacuumToDock: boolean;
+  enableServerMode: boolean;
+  alwaysExecuteAuthentication: boolean;
+  enableMultipleMap: boolean;
+}
+
 export interface ExperimentalFeatureSetting {
   enableExperimentalFeature: boolean;
-  advancedFeature: {
-    showRoutinesAsRoom: boolean;
-    includeDockStationStatus: boolean;
-    forceRunAtDefault: boolean;
-    useVacationModeToSendVacuumToDock: boolean;
-    enableServerMode: boolean;
-    alwaysExecuteAuthentication: boolean;
-    enableMultipleMap: boolean;
-  };
+  advancedFeature: AdvancedFeature;
   cleanModeSettings: CleanModeSettings;
 }
 
+interface VacuumingCleanModeSetting {
+  fanMode: 'Balanced' | string;
+  mopRouteMode: 'Standard' | string;
+}
+
+interface MoppingCleanModeSetting {
+  waterFlowMode: 'Medium' | string;
+  mopRouteMode: 'Standard' | string;
+  distanceOff?: number;
+}
+
+interface VacMopCleanModeSetting {
+  fanMode: 'Balanced' | string;
+  waterFlowMode: 'Medium' | string;
+  mopRouteMode: 'Standard' | string;
+  distanceOff?: number;
+}
+
 export interface CleanModeSettings {
   enableCleanModeMapping: boolean;
-  vacuuming?: {
-    fanMode: 'Balanced' | string;
-    mopRouteMode: 'Standard' | string;
-  };
-  mopping?: {
-    waterFlowMode: 'Medium' | string;
-    mopRouteMode: 'Standard' | string;
-    distanceOff?: number;
-  };
-  vacmop?: {
-    fanMode: 'Balanced' | string;
-    waterFlowMode: 'Medium' | string;
-    mopRouteMode: 'Standard' | string;
-    distanceOff?: number;
-  };
+  vacuuming?: VacuumingCleanModeSetting;
+  mopping?: MoppingCleanModeSetting;
+  vacmop?: VacMopCleanModeSetting;
 }
 
 export function createDefaultExperimentalFeatureSetting(): ExperimentalFeatureSetting {

package/src/model/roomIndexMap.ts

@@ -1,12 +1,14 @@
+import { MapInfo } from '../initialData/getSupportedAreas.js';
+
 export class RoomIndexMap {
-  public indexMap: Map<number, { roomId: number; mapId: number | null }>;
+  public indexMap: Map<number, MapInfo>;
   public roomMap: Map<string, number>;
 
-  constructor(roomMap: Map<number, { roomId: number; mapId: number | null }>) {
+  constructor(roomMap: Map<number, MapInfo>) {
     this.indexMap = roomMap;
     this.roomMap = new Map();
-    for (const [areaId, { roomId, mapId }] of roomMap.entries()) {
-      this.roomMap.set(`${roomId}:${mapId}`, areaId);
+    for (const [areaId, r] of roomMap.entries()) {
+      this.roomMap.set(`${r.roomId}:${r.mapId}`, areaId);
     }
   }
 

package/src/platform.ts

@@ -1,4 +1,4 @@
-import { Matterbridge, MatterbridgeDynamicPlatform, PlatformConfig } from 'matterbridge';
+import { PlatformMatterbridge, MatterbridgeDynamicPlatform, PlatformConfig } from 'matterbridge';
 import * as axios from 'axios';
 import { AnsiLogger, debugStringify, LogLevel } from 'matterbridge/logger';
 import RoborockService from './roborockService.js';
@@ -29,13 +29,13 @@ export class RoborockMatterbridgePlatform extends MatterbridgeDynamicPlatform {
   persist: NodePersist.LocalStorage;
   rrHomeId: number | undefined;
 
-  constructor(matterbridge: Matterbridge, log: AnsiLogger, config: PlatformConfig) {
+  constructor(matterbridge: PlatformMatterbridge, log: AnsiLogger, config: PlatformConfig) {
     super(matterbridge, log, config);
 
     // Verify that Matterbridge is the correct version
-    if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.2.2')) {
+    if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('3.3.6')) {
       throw new Error(
-        `This plugin requires Matterbridge version >= "3.2.2". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`,
+        `This plugin requires Matterbridge version >= "3.3.6". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend.`,
       );
     }
     this.log.info('Initializing platform:', this.config.name);

package/src/roborockCommunication/Zmodel/batteryMessage.ts

@@ -11,4 +11,6 @@ export interface DeviceErrorMessage {
   errorCode: VacuumErrorCode;
 }
 
-export type DeviceStatusNotify = { duid: string } & DeviceStatus & CloudMessageResult;
+export interface DeviceStatusNotify extends DeviceStatus, CloudMessageResult {
+  duid: string;
+}

package/src/roborockCommunication/Zmodel/device.ts

@@ -3,6 +3,22 @@ import { Room } from './room.js';
 import { Scene } from './scene.js';
 import { UserData } from './userData.js';
 
+export interface DeviceData {
+  id: string;
+  firmwareVersion: string;
+  serialNumber: string;
+  model: string;
+  category: string;
+  batteryLevel: number;
+}
+
+interface DeviceInformation {
+  userData: UserData;
+  localKey: string;
+  pv: string;
+  model?: string;
+}
+
 export interface Device {
   duid: string;
   name: string;
@@ -15,40 +31,20 @@ export interface Device {
 
   activeTime: number;
   createTime: number;
-
   localKey: string;
 
   /** The protocol version of the robot. */
   pv: string;
   online: boolean;
-
   productId: string;
-
   rrHomeId: number;
-
   /** The firmware version of the robot. */
   fv: string;
 
   deviceStatus: Record<string, number>;
   rooms: Room[];
-
   schema: DeviceSchema[];
-
-  data: {
-    id: string;
-    firmwareVersion: string;
-    serialNumber: string;
-    model: string;
-    category: string;
-    batteryLevel: number;
-  };
-
-  store?: {
-    userData: UserData;
-    localKey: string;
-    pv: string;
-    model?: string;
-  };
-
+  data: DeviceData;
+  store?: DeviceInformation;
   scenes?: Scene[];
 }

package/src/roborockCommunication/Zmodel/map.ts

@@ -1,10 +1,15 @@
+interface MapBackupInformation {
+  mapFlag: number;
+  add_time: number;
+}
+
 export interface MapInformation {
   mapFlag: number;
   add_time: number;
   length: number;
   name: string;
   rooms?: RoomInformation[] | undefined;
-  bak_maps: { mapFlag: number; add_time: number }[];
+  bak_maps: MapBackupInformation[];
 }
 
 export interface RoomInformation {

package/src/roborockCommunication/Zmodel/messageResult.ts

@@ -54,17 +54,19 @@ export interface CloudMessageResult {
   repeat?: number;
   kct?: number;
   subdivision_sets?: number;
-  cleaning_info?: {
-    target_segment_id: number;
-    segment_id: number;
-    fan_power: number;
-    water_box_status: number;
-    mop_mode: number;
-  };
+  cleaning_info?: CleanInformation;
   exit_dock?: number;
   seq_type?: number;
 }
 
+interface CleanInformation {
+  target_segment_id: number;
+  segment_id: number;
+  fan_power: number;
+  water_box_status: number;
+  mop_mode: number;
+}
+
 export enum CarpetCleanMode {
   Avoid = 0,
   Ignore = 2,

package/src/roborockCommunication/Zmodel/roomInfo.ts

@@ -1,8 +1,13 @@
 import decodeComponent from '../helper/nameDecoder.js';
 import { Room } from './room.js';
 
+interface RoomEntry {
+  id: number;
+  name: string | undefined;
+}
+
 export class RoomInfo {
-  readonly rooms: { id: number; name: string | undefined }[] = [];
+  readonly rooms: RoomEntry[] = [];
 
   constructor(roomInfo: Room[], roomData: number[][]) {
     this.rooms = roomData

package/src/roborockCommunication/Zmodel/scene.ts

@@ -7,12 +7,14 @@ export class Scene {
   type: string | undefined;
 }
 
+interface ActionInformation {
+  type: string;
+  items: SceneItem[];
+}
+
 export interface SceneParam {
   triggers: unknown[];
-  action: {
-    type: string;
-    items: SceneItem[];
-  };
+  action: ActionInformation;
   matchType: string;
 }
 

package/src/roborockCommunication/Zmodel/userData.ts

@@ -10,15 +10,17 @@ export interface UserData {
   rriot: Rriot;
 }
 
+interface r {
+  r: string;
+  a: string;
+  m: string;
+  l: string;
+}
+
 export interface Rriot {
   u: string;
   s: string;
   h: string;
   k: string;
-  r: {
-    r: string;
-    a: string;
-    m: string;
-    l: string;
-  };
+  r: r;
 }

package/src/roborockCommunication/broadcast/messageProcessor.ts

@@ -6,6 +6,7 @@ import { RequestMessage } from './model/requestMessage.js';
 import { DeviceStatus } from '../Zmodel/deviceStatus.js';
 import { Client } from './client.js';
 import { NetworkInfo } from '../Zmodel/networkInfo.js';
+import { CleanModeSetting } from '../../behaviors/roborock.vacuum/default/default.js';
 
 export class MessageProcessor {
   private readonly client: Client;
@@ -108,7 +109,7 @@ export class MessageProcessor {
     return this.client.get(duid, request);
   }
 
-  public async getCleanModeData(duid: string): Promise<{ suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number }> {
+  public async getCleanModeData(duid: string): Promise<CleanModeSetting> {
     const currentMopMode = await this.getCustomMessage(duid, new RequestMessage({ method: 'get_mop_mode' }));
     const suctionPowerRaw = await this.getCustomMessage(duid, new RequestMessage({ method: 'get_custom_mode' }));
     const waterFlowRaw = await this.getCustomMessage(duid, new RequestMessage({ method: 'get_water_box_custom_mode' }));
@@ -145,7 +146,7 @@ export class MessageProcessor {
       waterFlow: waterFlow,
       distance_off: distance_off,
       mopRoute: mopRoute,
-    };
+    } satisfies CleanModeSetting;
   }
 
   public async changeCleanMode(duid: string, suctionPower: number, waterFlow: number, mopRoute: number, distance_off: number): Promise<void> {

package/src/roborockCommunication/broadcast/model/dps.ts

@@ -1,11 +1,13 @@
+interface Security {
+  endpoint: string;
+  nonce: string;
+}
+
 export interface DpsPayload {
   id: number;
   method?: string;
   params?: unknown[] | Record<string, unknown> | undefined;
-  security?: {
-    endpoint: string;
-    nonce: string;
-  };
+  security?: Security;
   result: unknown;
 }
 

package/src/roborockCommunication/broadcast/model/messageContext.ts

@@ -2,9 +2,15 @@ import { randomBytes, randomInt } from 'node:crypto';
 import * as CryptoUtils from '../../helper/cryptoHelper.js';
 import { UserData } from '../../Zmodel/userData.js';
 
+interface DeviceInfo {
+  localKey: string;
+  protocolVersion: string;
+  nonce: number | undefined;
+}
+
 export class MessageContext {
   private readonly endpoint: string;
-  private readonly devices = new Map<string, { localKey: string; protocolVersion: string; nonce: number | undefined }>();
+  private readonly devices = new Map<string, DeviceInfo>();
   public readonly nonce: number;
   public readonly serializeNonce: Buffer;
 

package/src/roborockCommunication/helper/messageSerializer.ts

@@ -7,6 +7,11 @@ import { MessageContext } from '../broadcast/model/messageContext.js';
 import { AnsiLogger } from 'matterbridge/logger';
 import { Protocol } from '../broadcast/model/protocol.js';
 
+interface SerializeResult {
+  messageId: number;
+  buffer: Buffer<ArrayBufferLike>;
+}
+
 export class MessageSerializer {
   private readonly context: MessageContext;
   private readonly logger: AnsiLogger;
@@ -18,7 +23,7 @@ export class MessageSerializer {
     this.logger = logger;
   }
 
-  public serialize(duid: string, request: RequestMessage): { messageId: number; buffer: Buffer<ArrayBufferLike> } {
+  public serialize(duid: string, request: RequestMessage): SerializeResult {
     const messageId = request.messageId;
     const buffer = this.buildBuffer(duid, messageId, request);
     return { messageId: messageId, buffer: buffer };

package/src/roborockService.ts

@@ -26,8 +26,17 @@ import { ServiceArea } from 'matterbridge/matter/clusters';
 import { LocalNetworkClient } from './roborockCommunication/broadcast/client/LocalNetworkClient.js';
 import { RoomIndexMap } from './model/roomIndexMap.js';
 import { DpsPayload } from './roborockCommunication/broadcast/model/dps.js';
+import { CleanModeSetting } from './behaviors/roborock.vacuum/default/default.js';
 export type Factory<A, T> = (logger: AnsiLogger, arg: A) => T;
 
+interface MapRoomResponse {
+  vacuumRoom?: number;
+}
+
+interface Security {
+  nonce: number;
+}
+
 export default class RoborockService {
   private loginApi: RoborockAuthenticateApi;
   private logger: AnsiLogger;
@@ -130,7 +139,7 @@ export default class RoborockService {
     return this.supportedAreaIndexMaps.get(duid);
   }
 
-  public async getCleanModeData(duid: string): Promise<{ suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number }> {
+  public async getCleanModeData(duid: string): Promise<CleanModeSetting> {
     this.logger.notice('RoborockService - getCleanModeData');
     const data = await this.getMessageProcessor(duid)?.getCleanModeData(duid);
     if (!data) {
@@ -140,7 +149,7 @@ export default class RoborockService {
   }
 
   public async getRoomIdFromMap(duid: string): Promise<number | undefined> {
-    const data = (await this.customGet(duid, new RequestMessage({ method: 'get_map_v1' }))) as { vacuumRoom?: number };
+    const data = (await this.customGet(duid, new RequestMessage({ method: 'get_map_v1' }))) as MapRoomResponse;
     return data?.vacuumRoom;
   }
 
@@ -153,12 +162,9 @@ export default class RoborockService {
     });
   }
 
-  public async changeCleanMode(
-    duid: string,
-    { suctionPower, waterFlow, distance_off, mopRoute }: { suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number },
-  ): Promise<void> {
+  public async changeCleanMode(duid: string, { suctionPower, waterFlow, distance_off, mopRoute }: CleanModeSetting): Promise<void> {
     this.logger.notice('RoborockService - changeCleanMode');
-    return this.getMessageProcessor(duid)?.changeCleanMode(duid, suctionPower, waterFlow, mopRoute, distance_off);
+    return this.getMessageProcessor(duid)?.changeCleanMode(duid, suctionPower, waterFlow, mopRoute ?? 0, distance_off);
   }
 
   public async startClean(duid: string): Promise<void> {
@@ -497,7 +503,7 @@ export default class RoborockService {
 
         if (message instanceof ResponseMessage && message.contain(Protocol.hello_response)) {
           const dps = message.dps[Protocol.hello_response] as DpsPayload;
-          const result = dps.result as { nonce: number };
+          const result = dps.result as Security;
           self.messageClient?.updateNonce(message.duid, result.nonce);
         }
       },

package/src/rvc.ts

@@ -8,6 +8,10 @@ import { ModeBase, RvcOperationalState, ServiceArea } from 'matterbridge/matter/
 import { ExperimentalFeatureSetting } from './model/ExperimentalFeatureSetting.js';
 import { DockingStationStatus } from './model/DockingStationStatus.js';
 
+interface IdentifyCommandRequest {
+  identifyTime?: number;
+}
+
 export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
   username: string | undefined;
   device: Device;
@@ -64,7 +68,7 @@ export class RoborockVacuumCleaner extends RoboticVacuumCleaner {
   public configurateHandler(behaviorHandler: BehaviorFactoryResult): void {
     this.addCommandHandler('identify', async ({ request, cluster, attributes, endpoint }) => {
       this.log.info(`Identify command received for endpoint ${endpoint}, cluster ${cluster}, attributes ${debugStringify(attributes)}, request: ${JSON.stringify(request)}`);
-      behaviorHandler.executeCommand('playSoundToLocate', (request as { identifyTime?: number }).identifyTime ?? 0);
+      behaviorHandler.executeCommand('playSoundToLocate', (request as IdentifyCommandRequest).identifyTime ?? 0);
     });
 
     this.addCommandHandler('selectAreas', async ({ request }) => {

package/src/share/runtimeHelper.ts

@@ -1,8 +1,9 @@
+import { CleanModeSetting } from '../behaviors/roborock.vacuum/default/default.js';
 import { getCurrentCleanModeDefault } from '../behaviors/roborock.vacuum/default/runtimes.js';
 import { getCurrentCleanModeSmart } from '../behaviors/roborock.vacuum/smart/runtimes.js';
 import { DeviceModel } from '../roborockCommunication/Zmodel/deviceModel.js';
 
-export type CleanModeFunc = (setting: { suctionPower: number; waterFlow: number; distance_off: number; mopRoute: number | undefined }) => number | undefined;
+export type CleanModeFunc = (setting: CleanModeSetting) => number | undefined;
 
 export function getCurrentCleanModeFunc(model: string, forceRunAtDefault: boolean): CleanModeFunc {
   if (forceRunAtDefault) {

package/src/tests/runtimes/handleHomeDataMessage.test.ts

@@ -1,3 +1,4 @@
+import { DeviceData } from '../../roborockCommunication/Zmodel/device';
 import { updateFromHomeData } from '../../runtimes/handleHomeDataMessage';
 import { homeData } from '../testData/mockData';
 import { PowerSource, RvcRunMode } from 'matterbridge/matter/clusters';
@@ -7,7 +8,7 @@ const mockUpdateAttribute = jest.fn();
 const duid = 'test-duid';
 const robot = {
   updateAttribute: mockUpdateAttribute,
-  device: { data: { model: 'test-model' } as { model: string } | undefined },
+  device: { data: { model: 'test-model' } as DeviceData | undefined },
   dockStationStatus: {},
 };
 const platform = {

package/src/tests/runtimes/handleLocalMessage.test.ts

@@ -196,7 +196,7 @@ describe('handleLocalMessage -- FF OFF', () => {
         [4, 4],
       ]),
 
-      getAreaId(roomId: number): { roomId: number; mapId: number } | undefined {
+      getAreaId(roomId: number): Area | undefined {
         const index = this.roomMap.get(roomId);
         if (index === undefined) {
           return undefined;
@@ -220,3 +220,8 @@ describe('handleLocalMessage -- FF OFF', () => {
     expect(mockUpdateAttribute).toHaveBeenCalledWith(ServiceArea.Cluster.id, 'currentArea', 4, mockLog);
   });
 });
+
+interface Area {
+  roomId: number;
+  mapId: number;
+}