homebridge-roborock-vacuum 0.1.1 → 0.1.3

package/config.schema.json

@@ -11,6 +11,7 @@
         },
         "password": {
           "type": "string",
+          "placeholder": "Password",
           "description": "Roborock account password"
         },
         "baseURL": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-roborock-vacuum",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Roborock Vacuum Cleaner - plugin for Homebridge.",
   "license": "MIT",
   "keywords": [

package/roborockLib/data/UserData

@@ -1,4 +1,4 @@
 {
-  "val": "{\"uid\":1466357,\"tokentype\":\"\",\"token\":\"d8fe0bd712334ee585bc2145140f07d1-1JZxT5AINkUhb5JDyL8S+w==\",\"rruid\":\"rr6238c899155830\",\"region\":\"us\",\"countrycode\":\"886\",\"country\":\"TW\",\"nickname\":\"tasict\",\"rriot\":{\"u\":\"1RQsQJ2o8bxMCo6F45pICu\",\"s\":\"cPt6Ps\",\"h\":\"Gm0QssB0Qa\",\"k\":\"R3Z3cNUh\",\"r\":{\"r\":\"US\",\"a\":\"https://api-us.roborock.com\",\"m\":\"ssl://mqtt-us.roborock.com:8883\",\"l\":\"https://wood-us.roborock.com\"}},\"tuyaDeviceState\":0,\"avatarurl\":\"https://files.roborock.com/iottest/default_avatar.png\"}",
+  "val": "{\"uid\":1466357,\"tokentype\":\"\",\"token\":\"d8fe0bd712334ee585bc2145140f07d1-1JZxT5AINkUhb5JDyL8S+w==\",\"rruid\":\"rr6238c899155830\",\"region\":\"us\",\"countrycode\":\"886\",\"country\":\"TW\",\"nickname\":\"tasict\",\"rriot\":{\"u\":\"1RQsQJ2o8bxMCo6F45pICu\",\"s\":\"l5UDP7\",\"h\":\"7h2O8mNvkt\",\"k\":\"kxF1J95i\",\"r\":{\"r\":\"US\",\"a\":\"https://api-us.roborock.com\",\"m\":\"ssl://mqtt-us.roborock.com:8883\",\"l\":\"https://wood-us.roborock.com\"}},\"tuyaDeviceState\":0,\"avatarurl\":\"https://files.roborock.com/iottest/default_avatar.png\"}",
   "ack": true
 }

package/roborockLib/lib/vacuum.js

@@ -2,7 +2,6 @@
 
 const rrMessage = require("./message").message;
 const RRMapParser = require("./RRMapParser");
-const MapCreator = require("./mapCreator");
 const fs = require("fs");
 const zlib = require("zlib");
 
@@ -36,7 +35,6 @@ class vacuum {
 		this.message = new rrMessage(this.adapter);
 
 		this.mapParser = new RRMapParser(this.adapter);
-		this.mapCreator = new MapCreator(this.adapter);
 
 		this.parameterFolders = {
 			get_mop_mode: "deviceStatus",
@@ -50,94 +48,10 @@ class vacuum {
 		};
 	}
 
-	async getMap(duid) {
-		if (this.adapter.config.enable_map_creation) {
-			this.adapter.log.debug(`Update map`);
-
-			try {
-				// const map = await connector.sendRequest(duid, "get_map_v1", [], true);
-				// const map = await this.adapter.rr_mqtt_connector.sendRequest(duid, "get_map_v1", [], true);
-				const map = await this.adapter.messageQueueHandler.sendRequest(duid, "get_map_v1", [], true);
-				// this.adapter.log.debug(`Map received: ${map}`);
-				if (map != "retry") {
-					const mappedRooms = await this.adapter.messageQueueHandler.sendRequest(duid, "get_room_mapping", []);
-
-					// const deviceStatus = await this.adapter.messageQueueHandler.sendRequest(duid, "get_status", []);
-					const deviceStatus = await this.adapter.messageQueueHandler.sendRequest(duid, "get_prop", ["get_status"]);
-					const selectedMap = deviceStatus[0].map_status >> 2 ?? -1; // to get the currently selected map perform bitwise right shift
-
-					// This is for testing and debugging maps. This can't be stored in a state.
-					zlib.gzip(map, (error, buffer) => {
-						if (error) {
-							this.adapter.log.error(`Error compressing map to gz ${error}`);
-						} else {
-							fs.writeFile("./test.rrmap.gz", buffer, (error) => {
-								if (error) {
-									this.adapter.log.error(`Error writing map file ${error}`);
-								}
-							});
-						}
-					});
-
-					const parsedData = await this.mapParser.parsedata(map);
-
-					const [mapBase64, mapBase64Truncated] = this.mapCreator.canvasMap(parsedData, duid, selectedMap, mappedRooms);
-
-					await this.adapter.setStateAsync(`Devices.${duid}.map.mapData`, { val: JSON.stringify(parsedData), ack: true });
-					await this.adapter.setStateAsync(`Devices.${duid}.map.mapBase64`, { val: mapBase64, ack: true });
-					await this.adapter.setStateAsync(`Devices.${duid}.map.mapBase64Truncated`, { val: mapBase64Truncated, ack: true });
-
-					// Send current map with Scale factor
-					const mapToSend = {
-						duid: duid,
-						command: "map",
-						base64: mapBase64,
-						map: parsedData,
-						scale: this.adapter.config.map_scale,
-					};
-
-					if (this.adapter.socket != null) {
-						this.adapter.socket.send(JSON.stringify(mapToSend));
-					}
-				}
-			} catch (error) {
-				this.adapter.catchError(error, "get_map_v1", duid), this.robotModel;
-			}
-		}
-	}
-
-	async getCleaningRecordMap(duid, startTime) {
-		try {
-			const cleaningRecordMap = await this.adapter.messageQueueHandler.sendRequest(duid, "get_clean_record_map", { start_time: startTime }, true);
-			const parsedData = await this.mapParser.parsedata(cleaningRecordMap);
-			const [mapBase64, mapBase64Truncated] = this.mapCreator.canvasMap(parsedData, duid);
-
-			return {
-				mapBase64: mapBase64,
-				mapBase64Truncated: mapBase64Truncated,
-				mapData: JSON.stringify(parsedData),
-			};
-		} catch (error) {
-			this.adapter.catchError(error, "get_clean_record_map", duid, this.robotModel);
-
-			return null;
-		}
-	}
 
 	async command(duid, parameter, value) {
 		try {
 			switch (parameter) {
-				case "load_multi_map": {
-					const result = await this.adapter.messageQueueHandler.sendRequest(duid, "load_multi_map", value);
-
-					if (result[0] == "ok") {
-						await this.getMap(duid).then(async () => {
-							await this.getParameter(duid, "get_room_mapping");
-						});
-					}
-
-					break;
-				}
 				case "app_segment_clean": {
 					this.adapter.log.debug("Start room cleaning");
 
@@ -304,7 +218,6 @@ class vacuum {
 
 											if (mapFromCommand && mapFromCommand.val != currentMap) {
 												await this.adapter.setStateAsync(`Devices.${duid}.commands.load_multi_map`, currentMap, true);
-												await this.adapter.vacuums[duid].getMap(duid);
 											}
 										}
 									}
@@ -549,13 +462,6 @@ class vacuum {
 							});
 						}
 
-						if (this.adapter.config.enable_map_creation == true) {
-							const mapArray = await this.getCleaningRecordMap(duid, cleaningAttributes[cleaningAttribute][cleaningRecord]);
-							for (const mapType in mapArray) {
-								const val = mapArray[mapType];
-								this.adapter.setStateAsync(`Devices.${duid}.cleaningInfo.records.${cleaningRecord}.map.${mapType}`, { val: val, ack: true });
-							}
-						}
 					}
 
 					const objectString = `Devices.${duid}.cleaningInfo.JSON`;

package/roborockLib/roborockAPI.js

@@ -443,8 +443,6 @@ class Roborock {
 
 			await this.vacuums[duid].getCleanSummary(duid);
 
-			// get map once at start of adapter
-			await this.vacuums[duid].getMap(duid);
 		}
 	}
 
@@ -522,28 +520,6 @@ class Roborock {
 		}
 	}
 
-	async startMapUpdater(duid) {
-		if (!this.vacuums[duid].mapUpdater) {
-			this.log.debug(`Started map updater on robot: ${duid}`);
-			this.vacuums[duid].mapUpdater = this.setInterval(() => {
-				this.vacuums[duid].getMap(duid);
-			}, this.config.map_creation_interval * 1000);
-		} else {
-			this.log.debug(`Map updater on robot: ${duid} already running!`);
-		}
-	}
-
-	async stopMapUpdater(duid) {
-		this.log.debug(`Stopping map updater on robot: ${duid}`);
-
-		if (this.vacuums[duid].mapUpdater) {
-			this.clearInterval(this.vacuums[duid].mapUpdater);
-			this.vacuums[duid].mapUpdater = null;
-
-			await this.vacuums[duid].getCleanSummary(duid);
-		}
-	}
-
 	getProductAttribute(duid, attribute) {
 		const products = this.products;
 		const productID = this.devices.find((device) => device.duid == duid).productId;
@@ -642,7 +618,6 @@ class Roborock {
 				if (!onlineState && this.vacuums[duid].mainUpdateInterval) {
 					this.clearInterval(this.vacuums[duid].getStatusIntervall);
 					this.clearInterval(this.vacuums[duid].mainUpdateInterval);
-					this.clearInterval(this.vacuums[duid].mapUpdater);
 				} else if (!this.vacuums[duid].mainUpdateInterval) {
 					this.vacuums[duid].getStatusIntervall();
 					this.startMainUpdateInterval(duid, onlineState);
@@ -722,7 +697,6 @@ class Roborock {
 		for (const duid in this.vacuums) {
 			this.clearInterval(this.vacuums[duid].getStatusIntervall);
 			this.clearInterval(this.vacuums[duid].mainUpdateInterval);
-			this.clearInterval(this.vacuums[duid].mapUpdater);
 		}
 
 		this.messageQueue.forEach(({ timeout102, timeout301 }) => {
@@ -1110,10 +1084,6 @@ class Roborock {
 				this.vacuums[duid].command(duid, command, parameters);
 				break;
 
-			case "getMap":
-				this.vacuums[duid].getMap(duid);
-				break;
-
 			case "get_photo":
 				this.vacuums[duid].getParameter(duid, "get_photo", parameters);
 				break;