Working zone cleaning, implemented multiple accesories to have a room per switch in homekit

index.js

@@ -6,6 +6,8 @@ var inherits = require('util').inherits,
 	Service,
 	Characteristic
 
+const uuidv4 = require('uuid/v4');
+
 module.exports = function (homebridge) {
 	Service = homebridge.hap.Service;
 	Characteristic = homebridge.hap.Characteristic;
@@ -39,11 +41,18 @@ NeatoVacuumRobotPlatform.prototype = {
 		this.accessories = [];
 
 		let that = this;
-		this.robots = this.getRobots(function () {
+		this.getRobots(function () {
 			for (var i = 0; i < that.robots.length; i++) {
 				that.log("Found robot #" + (i + 1) + " named \"" + that.robots[i].name + "\" with serial \"" + that.robots[i]._serial + "\"");
 				var robotAccessory = new NeatoVacuumRobotAccessory(that.robots[i], that);
 				that.accessories.push(robotAccessory);
+				that.robots[i].maps.forEach((map) => {
+					map.boundaries.forEach((boundary) => {
+						if (boundary.type === "polygon") {
+							that.accessories.push(new NeatoVacuumRobotAccessory(that.robots[i], that, boundary))
+						}
+					})
+				})
 			}
 			callback(that.accessories);
 		});
@@ -53,14 +62,14 @@ NeatoVacuumRobotPlatform.prototype = {
 		debug("Loading your robots");
 		let client = new botvac.Client();
 		let that = this;
-		client.authorize(this.email, this.password, false, function (error) {
+		client.authorize(this.email, this.password, false, (error) => {
 			if (error) {
 				that.log(error);
 				that.log.error("Can't log on to neato cloud. Please check your credentials.");
 				callback();
 			}
 			else {
-				client.getRobots(function (error, robots) {
+				client.getRobots((error, robots) => {
 					if (error) {
 						that.log(error);
 						that.log.error("Successful login but can't connect to your neato robot.");
@@ -74,8 +83,36 @@ NeatoVacuumRobotPlatform.prototype = {
 						}
 						else {
 							debug("Found " + robots.length + " robots");
+							let updatedRobotCount = 0;
 						    that.robots = robots;
+						    that.robots.forEach((robot) => {
+								robot.getPersistentMaps((error, result) => {
+									if (error) {
+										that.log("Error updating persistent maps: " + error + ": " + result);
 										callback();
+										return;
+									}
+									robot.maps = result;
+									let processedMapCount = 0
+									robot.maps.forEach((map) => {
+										robot.getMapBoundaries(map.id, (error, result) => {
+											if(error) {
+												this.log("error getting boundaries: " + error + ": " + result)
+											} else {
+												map.boundaries = result.boundaries;
+											}
+											processedMapCount++;
+											if(processedMapCount == robot.maps.length) {
+												this.log("Discovered Maps: " + JSON.stringify(robot.maps));
+												updatedRobotCount++
+												if (updatedRobotCount === that.robots.length) {
+													callback();
+												}
+											}
+										})
+									})
+								})
+							})
 						}
 					}
 				});
@@ -84,8 +121,10 @@ NeatoVacuumRobotPlatform.prototype = {
 	}
 }
 
-function NeatoVacuumRobotAccessory(robot, platform) {
+function NeatoVacuumRobotAccessory(robot, platform, boundary) {
+	this.uuid_base = uuidv4();
 	this.platform = platform;
+	this.boundary = boundary;
 	this.log = platform.log;
 	this.refresh = platform.refresh;
 	this.hiddenServices = platform.hiddenServices;
@@ -93,14 +132,26 @@ function NeatoVacuumRobotAccessory(robot, platform) {
 	this.name = robot.name;
 	this.lastUpdate = null;
 
-	this.vacuumRobotCleanService = new Service.Switch(this.name + " Clean", "clean");
+	this.vacuumRobotBatteryService = new Service.BatteryService("Battery", "battery");
+
+	if(!this.boundary) {
+		this.vacuumRobotCleanService = new Service.Switch("Clean", "clean");
 		this.vacuumRobotGoToDockService = new Service.Switch(this.name + " Go to Dock", "goToDock");
 		this.vacuumRobotDockStateService = new Service.OccupancySensor(this.name + " Dock", "dockState");
 		this.vacuumRobotEcoService = new Service.Switch(this.name + " Eco Mode", "eco");
 		this.vacuumRobotNoGoLinesService = new Service.Switch(this.name + " NoGo Lines", "noGoLines");
 		this.vacuumRobotExtraCareService = new Service.Switch(this.name + " Extra Care", "extraCare");
 		this.vacuumRobotScheduleService = new Service.Switch(this.name + " Schedule", "schedule");
-	this.vacuumRobotBatteryService = new Service.BatteryService("Battery", "battery");
+	} else {
+		const splitName = boundary.name.split(' ');
+		let serviceName = "Clean the " + boundary.name;
+		if(splitName.length >= 2 && splitName[splitName.length-2].match(/[']s$/g)){
+			serviceName = "Clean " + boundary.name;
+		}
+	    this.vacuumRobotCleanBoundaryService =
+			new Service.Switch(serviceName, "cleanBoundary:" + boundary.id);
+		this.log("Adding zone cleaning for: " + boundary.name);
+	}
 
 	this.updateRobotTimer();
 }
@@ -118,34 +169,6 @@ NeatoVacuumRobotAccessory.prototype = {
 			that.log(that.robot);
 			that.robot._serial = _serial;
 			that.robot._secret = _secret;
-
-	    this.updatePersistentMaps(() => {
-	    	this.vacuumRobotCleanZoneServices = {};
-	    	this.maps.forEach((map) => {
-	    		map.boundaries.forEach((boundary) => {
-	    			if (boundary.type === "polygone") {
-	    				this.vacuumRobotCleanZoneServices[boundary.id] = new     Service.Switch(this.name + " Clean the " + boundary.name,     "clean");
-	    				this.vacuumRobotCleanZoneServices[boundary.id].getCharacteristic    (Characteristic.On).on('set', (on, serviceCallback) => {
-	    					if(on){
-	    						if(that.robot.canStart) {
-	    							this.robot.startCleaningBoundary(this.eco, this.extraCare,     boundary.id, (error, result) => {
-	    								if (error){
-	    									debug(error+": "+JSON.stringify(result));
-	    									return;
-	    								}
-	    								serviceCallback();
-	    							})
-	    						} else {
-	    							debug("Error, robot is already cleaning");
-	    							serviceCallback();
-	    						}
-	    					}
-	    				})
-	    			}
-	    		})
-	    	})
-	    	callback();
-	    });
 		});
 	},
 
@@ -157,6 +180,12 @@ NeatoVacuumRobotAccessory.prototype = {
 		.setCharacteristic(Characteristic.Model, "Coming soon")
 		.setCharacteristic(Characteristic.SerialNumber, this.robot._serial);
 
+	    this.vacuumRobotBatteryService.getCharacteristic(Characteristic.BatteryLevel).on('get', this.getBatteryLevel.bind(this));
+	    this.vacuumRobotBatteryService.getCharacteristic(Characteristic.ChargingState).on('get', this.getBatteryChargingState.bind(this));
+
+	    this.services = [this.informationService, this.vacuumRobotBatteryService];
+
+	    if(!this.boundary) {
 		this.vacuumRobotCleanService.getCharacteristic(Characteristic.On).on('set', this.setClean.bind(this));
 		this.vacuumRobotCleanService.getCharacteristic(Characteristic.On).on('get', this.getClean.bind(this));
 
@@ -177,10 +206,8 @@ NeatoVacuumRobotAccessory.prototype = {
 		this.vacuumRobotScheduleService.getCharacteristic(Characteristic.On).on('set', this.setSchedule.bind(this));
 		this.vacuumRobotScheduleService.getCharacteristic(Characteristic.On).on('get', this.getSchedule.bind(this));
 
-		this.vacuumRobotBatteryService.getCharacteristic(Characteristic.BatteryLevel).on('get', this.getBatteryLevel.bind(this));
+		this.services.push(this.vacuumRobotCleanService);
-		this.vacuumRobotBatteryService.getCharacteristic(Characteristic.ChargingState).on('get', this.getBatteryChargingState.bind(this));
 
-		this.services = [this.informationService, this.vacuumRobotCleanService, this.vacuumRobotBatteryService];
 		if (this.hiddenServices.indexOf('dock') === -1)
 		    this.services.push(this.vacuumRobotGoToDockService);
 		if (this.hiddenServices.indexOf('dockstate') === -1)
@@ -193,13 +220,56 @@ NeatoVacuumRobotAccessory.prototype = {
 		    this.services.push(this.vacuumRobotExtraCareService);
 		if (this.hiddenServices.indexOf('schedule') === -1)
 		    this.services.push(this.vacuumRobotScheduleService);
+	    }
 
-			this.vacuumRobotCleanZoneServices.forEach((service) => {
+	    if(this.boundary){
-				services.push(service);
+		this.vacuumRobotCleanBoundaryService.getCharacteristic(Characteristic.On).on('set', (on, serviceCallback) => {
+		    this.setCleanBoundary(this.boundary.id, on, serviceCallback)
 		})
+		this.vacuumRobotCleanBoundaryService.getCharacteristic(Characteristic.On).on('get', (serviceCallback) => {
+		    this.getCleanBoundary(this.boundary.id, serviceCallback);
+		})
+		this.services.push(this.vacuumRobotCleanBoundaryService);
+	    }
+
 	    return this.services;
 	},
 
+	setCleanBoundary: function (boundaryId, on, callback) {
+	    this.updateRobot((error, result) => {
+		if(on){
+		    if(this.robot.canStart) {
+			this.log("Starting to clean: "+boundaryId);
+			this.robot.startCleaningBoundary(this.eco, this.extraCare, boundaryId, (error, result) => {
+			    if (error){
+				this.log(error+": "+JSON.stringify(result));
+			    }
+			    callback();
+			})
+			return
+		    } else {
+			this.log("Error, robot is already cleaning");
+		    }
+		} else {
+		    if (this.robot.canPause) {
+			debug(this.name + ": Pause cleaning");
+			this.robot.pauseCleaning(callback);
+			return;
+		    }
+		    else {
+			debug(this.name + ": Already stopped");
+		    }
+		}
+		callback();
+	    });
+	},
+
+	getCleanBoundary: function (boundaryId, callback) {
+	    this.updateRobot((error, result) => {
+		callback(false, this.robot.canPause && (this.robot.cleaningBoundaryId == boundaryId));
+	    });
+	},
+
 	setClean: function (on, callback) {
 		let that = this;
 		this.updateRobot(function (error, result) {
@@ -401,34 +471,11 @@ NeatoVacuumRobotAccessory.prototype = {
 		}
 	},
 
-	updatePersistentMaps: function(callback) {
-		this.robot.getPersistentMaps((error, maps) => {
-			if (error) {
-				this.log.error(error + ": " + result);
-				return;
-			}
-			this.maps = maps;
-			let processedMapsCounter = 0
-			maps.forEach((map) => {
-				this.getMapBoundaries(map.id, (error, result) => {
-					if(error) {
-						this.log.error(error + ": " + result);
-					} else {
-						map.boundaries = result;
-					}
-					processedMapsCounter++;
-					if(processedMapsCounter == this.maps.length) {
-						callback();
-					}
-				})
-			})
-		})
-	},
-
 	updateRobotTimer: function () {
 	    let that = this;
-		this.updateRobot(function (error, result) {
+	    this.updateRobot((error, result) => {
 
+		if (!this.boundary) {
 		    // only update these values if the state is different from the current one, otherwise we might accidentally start an action
 		    if (that.vacuumRobotCleanService.getCharacteristic(Characteristic.On).value !== that.robot.canPause) {
 			that.vacuumRobotCleanService.setCharacteristic(Characteristic.On, that.robot.canPause);
@@ -448,6 +495,13 @@ NeatoVacuumRobotAccessory.prototype = {
 		    that.vacuumRobotEcoService.setCharacteristic(Characteristic.On, that.robot.eco);
 		    that.vacuumRobotNoGoLinesService.setCharacteristic(Characteristic.On, that.robot.noGoLines);
 		    that.vacuumRobotExtraCareService.setCharacteristic(Characteristic.On, that.robot.navigationMode == 2 ? true : false);
+
+		} else {
+		    if(this.vacuumRobotCleanBoundaryService.getCharacteristic(Characteristic.On).value !== that.robot.canPause) {
+			this.vacuumRobotCleanBoundaryService.setCharacteristic(Characteristic.On, that.robot.canPause);
+		    }
+		}
+
 		that.vacuumRobotBatteryService.setCharacteristic(Characteristic.BatteryLevel, that.robot.charge);
 		that.vacuumRobotBatteryService.setCharacteristic(Characteristic.ChargingState, that.robot.isCharging);
 

package.json

@@ -20,7 +20,8 @@
     "url": "git://github.com/naofireblade/homebridge-neato.git"
   },
   "dependencies": {
+    "debug": "^2.2.0",
     "node-botvac": ">=0.1.7",
-    "debug": "^2.2.0"
+    "uuid": "^3.3.2"
   }
 }