node-red-contrib-huemagic 4.0.2 → 4.1.0

package/huemagic/hue-bridge-config.js

@@ -9,8 +9,9 @@ module.exports = function(RED)
 	const diff = require("deep-object-diff").diff;
 	const axios = require('axios');
 	const https = require('https');
+	const fastq = require('fastq');
 
-	// READABLE RESSOURCE MESSAGES
+	// READABLE RESOURCE MESSAGES
 	const { HueBridgeMessage,
 			HueLightMessage,
 			HueGroupMessage,
@@ -28,10 +29,17 @@ module.exports = function(RED)
 		// STATES
 		this.nodeActive = true;
 		this.config = config;
-		this.ressources = {};
-		this.ressourcesInGroups = {};
+		this.resources = {};
+		this.resourcesInGroups = {};
 		this.lastStates = {};
 		this.events = new events.EventEmitter();
+		this.patchQueue = null;
+
+		// RESOURCE ID PATTERN
+		this.validResourceID = /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/gi;
+
+		// FIRMWARE UPDATE TIMEOUT
+		this.firmwareUpdateTimeout = null;
 
 		// CREATE NODE
 		RED.nodes.createNode(scope, config);
@@ -39,24 +47,24 @@ module.exports = function(RED)
 		// INITIALIZE
 		this.start = function()
 		{
-			scope.log("Initializing the bridge…");
-			API.init({ ip: config.bridge, key: config.key })
+			scope.log("Initializing the bridge ("+config.bridge+")…");
+			API.init({ config: config })
 			.then(function(bridge) {
 				scope.log("Connected to bridge");
-				return scope.getAllRessources();
+				return scope.getAllResources();
 			})
-			.then(function(allRessources)
+			.then(function(allResources)
 			{
-				scope.log("Process ressources…");
-				return API.processRessources(allRessources);
+				scope.log("Processing bridge resources…");
+				return API.processResources(allResources);
 			})
-			.then(function(allRessources)
+			.then(function(allResources)
 			{
-				// SAVE CURRENT RESSOURCES
-				scope.ressources = allRessources;
+				// SAVE CURRENT RESOURCES
+				scope.resources = allResources;
 
 				// EMIT INITIAL STATES -> NODES
-				scope.log("Initial emit of ressource states…");
+				scope.log("Initial emit of resource states…");
 				return scope.emitInitialStates();
 			})
 			.then(function(emitted)
@@ -77,22 +85,22 @@ module.exports = function(RED)
 		}
 
 		// FETCH BRIDGE INFORMATION
-		this.getBridgeInformation = function(replaceRessources = false)
+		this.getBridgeInformation = function(replaceResources = false)
 		{
 			return new Promise(function(resolve, reject)
 			{
-				API.request({ ressource: "/config", version: 1 })
+				API.request({ config: config, resource: "/config", version: 1 })
 				.then(function(bridgeInformation)
 				{
-					// PREPARE TO MATCH V2 RESSOURCES
+					// PREPARE TO MATCH V2 RESOURCES
 					bridgeInformation.id = "bridge";
 					bridgeInformation.id_v1 = "/config";
 					bridgeInformation.updated = dayjs().format();
 
-					// ALSO REPLACE CURRENT RESSOURCE?
-					if(replaceRessources === true)
+					// ALSO REPLACE CURRENT RESOURCE?
+					if(replaceResources === true)
 					{
-						scope.ressources[bridgeInformation.id] = bridgeInformation;
+						scope.resources[bridgeInformation.id] = bridgeInformation;
 					}
 
 					// GIVE BACK
@@ -105,30 +113,30 @@ module.exports = function(RED)
 			});
 		}
 
-		// GET ALL RESSOURCES + RULES
-		this.getAllRessources = function()
+		// GET ALL RESOURCES + RULES
+		this.getAllResources = function()
 		{
 			return new Promise(function(resolve, reject)
 			{
-				var allRessources = [];
+				var allResources = [];
 
 				// GET BRIDGE INFORMATION
 				scope.getBridgeInformation()
 				.then(function(bridgeInformation)
 				{
-					// PUSH TO RESSOURCES
-					allRessources.push(bridgeInformation);
+					// PUSH TO RESOURCES
+					allResources.push(bridgeInformation);
 
-					// CONTINUE WITH ALL RESSOURCES
-					return API.request({ ressource: "all" });
+					// CONTINUE WITH ALL RESOURCES
+					return API.request({ config: config, resource: "all" });
 				})
-				.then(function(v2Ressources)
+				.then(function(v2Resources)
 				{
-					// MERGE RESSOURCES
-					allRessources = allRessources.concat(v2Ressources);
+					// MERGE RESOURCES
+					allResources = allResources.concat(v2Resources);
 
 					// GET RULES (LEGACY API)
-					return API.request({ ressource: "/rules", version: 1 });
+					return API.request({ config: config, resource: "/rules", version: 1 });
 				})
 				.then(function(rules)
 				{
@@ -146,17 +154,17 @@ module.exports = function(RED)
 						rule["type"] = "rule";
 
 						// PUSH RULES
-						allRessources.push(rule);
+						allResources.push(rule);
 					}
 
-					resolve(allRessources);
+					resolve(allResources);
 				})
 				.catch(function(error) { reject(error); });
 			});
 		}
 
 		// EMIT INITIAL STATES -> NODES
-		this.emitInitialStates = function(ressources = false)
+		this.emitInitialStates = function(resources = false)
 		{
 			return new Promise(function(resolve, reject)
 			{
@@ -164,9 +172,9 @@ module.exports = function(RED)
 				setTimeout(function()
 				{
 					// PUSH ALL STATES
-					for (const [id, ressource] of Object.entries(scope.ressources))
+					for (const [id, resource] of Object.entries(scope.resources))
 					{
-						scope.pushUpdatedState(ressource, ressource.type, true);
+						scope.pushUpdatedState(resource, resource.type, true);
 					}
 
 					resolve(true);
@@ -190,69 +198,69 @@ module.exports = function(RED)
 		this.refreshStatesSSE = function()
 		{
 			scope.log("Subscribing to bridge events…");
-			API.subscribe(function(updates)
+			API.subscribe(config, function(updates)
 			{
 				const currentDateTime = dayjs().format();
 
-				for(let ressource of updates)
+				for(let resource of updates)
 				{
-					let id = ressource.id;
-					let type = ressource.type;
+					let id = resource.id;
+					let type = resource.type;
 
 					let previousState = false;
 
 					// HAS OWNER?
-					if(ressource["owner"])
+					if(resource["owner"])
 					{
-						let targetId = ressource["owner"]["rid"];
+						let targetId = resource["owner"]["rid"];
 
-						if(scope.ressources[targetId])
+						if(scope.resources[targetId])
 						{
 							// GET PREVIOUS STATE
-							previousState = scope.ressources[targetId]["services"][type][id];
+							previousState = scope.resources[targetId]["services"][type][id];
 
 							// IS BUTTON? -> REMOVE PREVIOUS STATES
 							if(type === "button")
 							{
-								for (const [oneButtonID, oneButton] of Object.entries(scope.ressources[targetId]["services"]["button"]))
+								for (const [oneButtonID, oneButton] of Object.entries(scope.resources[targetId]["services"]["button"]))
 								{
-									delete scope.ressources[targetId]["services"]["button"][oneButtonID]["button"];
+									delete scope.resources[targetId]["services"]["button"][oneButtonID]["button"];
 								}
 							}
 						}
 					}
-					else if(scope.ressources[id])
+					else if(scope.resources[id])
 					{
 						// GET PREVIOUS STATE
-						previousState = scope.ressources[id];
+						previousState = scope.resources[id];
 					}
 
 					// NO PREVIOUS STATE?
 					if(!previousState) { return false; }
 
 					// CHECK DIFFERENCES
-					const mergedState = merge.deep(previousState, ressource);
-					const updatedRessources = diff(previousState, mergedState);
+					const mergedState = merge.deep(previousState, resource);
+					const updatedResources = diff(previousState, mergedState);
 
-					if(Object.values(updatedRessources).length > 0)
+					if(Object.values(updatedResources).length > 0)
 					{
-						if(ressource["owner"])
+						if(resource["owner"])
 						{
-							let targetId = ressource["owner"]["rid"];
+							let targetId = resource["owner"]["rid"];
 
-							scope.ressources[targetId]["services"][type][id] = mergedState;
-							scope.ressources[targetId]["updated"] = currentDateTime;
+							scope.resources[targetId]["services"][type][id] = mergedState;
+							scope.resources[targetId]["updated"] = currentDateTime;
 
 							// PUSH STATE
-							scope.pushUpdatedState(scope.ressources[targetId], ressource.type);
+							scope.pushUpdatedState(scope.resources[targetId], resource.type);
 						}
 						else
 						{
-							scope.ressources[id] = mergedState;
-							scope.ressources[id]["updated"] = currentDateTime;
+							scope.resources[id] = mergedState;
+							scope.resources[id]["updated"] = currentDateTime;
 
 							// PUSH STATE
-							scope.pushUpdatedState(scope.ressources[id], ressource.type);
+							scope.pushUpdatedState(scope.resources[id], resource.type);
 						}
 					}
 				}
@@ -260,42 +268,42 @@ module.exports = function(RED)
 		}
 
 		// PUSH UPDATED STATE
-		this.pushUpdatedState = function(ressource, updatedType, suppressMessage = false)
+		this.pushUpdatedState = function(resource, updatedType, suppressMessage = false)
 		{
-			const msg = { id: ressource.id, type: ressource.type, updatedType: updatedType, services: ressource["services"] ? Object.keys(ressource["services"]) : [], suppressMessage: suppressMessage };
-			this.events.emit(ressource.id, msg);
-			this.events.emit("globalRessourceUpdates", msg);
+			const msg = { id: resource.id, type: resource.type, updatedType: updatedType, services: resource["services"] ? Object.keys(resource["services"]) : [], suppressMessage: suppressMessage };
+			this.events.emit(config.id + "_" + resource.id, msg);
+			this.events.emit(config.id + "_" + "globalResourceUpdates", msg);
 
-			// RESSOURCE CONTAINS SERVICES? -> SERVICE IN GROUP? -> EMIT CHANGES TO GROUPS ALSO
-			if(this.ressources["_groupsOf"][ressource.id])
+			// RESOURCE CONTAINS SERVICES? -> SERVICE IN GROUP? -> EMIT CHANGES TO GROUPS ALSO
+			if(this.resources["_groupsOf"][resource.id])
 			{
-				for (var g = this.ressources["_groupsOf"][ressource.id].length - 1; g >= 0; g--)
+				for (var g = this.resources["_groupsOf"][resource.id].length - 1; g >= 0; g--)
 				{
-					const groupID = this.ressources["_groupsOf"][ressource.id][g];
+					const groupID = this.resources["_groupsOf"][resource.id][g];
 					const groupMessage = { id: groupID, type: "group", updatedType: updatedType, services: [], suppressMessage: suppressMessage };
 
-					this.events.emit(groupID, groupMessage);
-					this.events.emit("globalRessourceUpdates", groupMessage);
+					this.events.emit(config.id + "_" + groupID, groupMessage);
+					this.events.emit(config.id + "_" + "globalResourceUpdates", groupMessage);
 				}
 			}
 		}
 
-		// GET RESSOURCE (FROM NODES)
+		// GET RESOURCE (FROM NODES)
 		this.get = function(type, id = false, options = {})
 		{
-			// GET SPECIFIC RESSOURCE
+			// GET SPECIFIC RESOURCE
 			if(id)
 			{
-				// RESSOURCE EXISTS? -> PROCEED
-				if(scope.ressources[id])
+				// RESOURCE EXISTS? -> PROCEED
+				if(scope.resources[id])
 				{
 					// RESOLVE LINKS
-					const targetRessource = scope.ressources[id];
-					const lastState = scope.lastStates[type+targetRessource.id] ? Object.assign({}, scope.lastStates[type+targetRessource.id]) : false;
+					const targetResource = scope.resources[id];
+					const lastState = scope.lastStates[type+targetResource.id] ? Object.assign({}, scope.lastStates[type+targetResource.id]) : false;
 
 					if(type == "bridge")
 					{
-						const message = new HueBridgeMessage(targetRessource, options);
+						const message = new HueBridgeMessage(targetResource, options);
 
 						// GET CURRENT STATE MESSAGE
 						let currentState = message.msg;
@@ -303,11 +311,11 @@ module.exports = function(RED)
 					}
 					else if(type == "light")
 					{
-						const message = new HueLightMessage(targetRessource, options);
+						const message = new HueLightMessage(targetResource, options);
 
 						// GET & SAVE LAST STATE AND DIFFERENCES
 						let currentState = message.msg;
-						scope.lastStates[type+targetRessource.id] = Object.assign({}, currentState);
+						scope.lastStates[type+targetResource.id] = Object.assign({}, currentState);
 						currentState.updated = (lastState === false) ? {} : diff(lastState, currentState);
 						currentState.lastState = lastState;
 
@@ -316,11 +324,11 @@ module.exports = function(RED)
 					else if(type == "group")
 					{
 						// GET MESSAGE
-						const message = new HueGroupMessage(targetRessource, { ressources: scope.ressources, ...options});
+						const message = new HueGroupMessage(targetResource, { resources: scope.resources, ...options});
 
 						// GET & SAVE LAST STATE AND DIFFERENCES
 						let currentState = message.msg;
-						scope.lastStates[type+targetRessource.id] = Object.assign({}, currentState);
+						scope.lastStates[type+targetResource.id] = Object.assign({}, currentState);
 						currentState.updated = (lastState === false) ? {} : diff(lastState, currentState);
 						currentState.lastState = lastState;
 
@@ -328,11 +336,11 @@ module.exports = function(RED)
 					}
 					else if(type == "button")
 					{
-						const message = new HueButtonsMessage(targetRessource, options);
+						const message = new HueButtonsMessage(targetResource, options);
 
 						// GET & SAVE LAST STATE AND DIFFERENCES
 						let currentState = message.msg;
-						scope.lastStates[type+targetRessource.id] = Object.assign({}, currentState);
+						scope.lastStates[type+targetResource.id] = Object.assign({}, currentState);
 						currentState.updated = (lastState === false) ? {} : diff(lastState, currentState);
 						currentState.lastState = lastState;
 
@@ -340,11 +348,11 @@ module.exports = function(RED)
 					}
 					else if(type == "motion")
 					{
-						const message = new HueMotionMessage(targetRessource, options);
+						const message = new HueMotionMessage(targetResource, options);
 
 						// GET & SAVE LAST STATE AND DIFFERENCES
 						let currentState = message.msg;
-						scope.lastStates[type+targetRessource.id] = Object.assign({}, currentState);
+						scope.lastStates[type+targetResource.id] = Object.assign({}, currentState);
 						currentState.updated = (lastState === false) ? {} : diff(lastState, currentState);
 						currentState.lastState = lastState;
 
@@ -352,11 +360,11 @@ module.exports = function(RED)
 					}
 					else if(type == "temperature")
 					{
-						const message = new HueTemperatureMessage(targetRessource, options);
+						const message = new HueTemperatureMessage(targetResource, options);
 
 						// GET & SAVE LAST STATE AND DIFFERENCES
 						let currentState = message.msg;
-						scope.lastStates[type+targetRessource.id] = Object.assign({}, currentState);
+						scope.lastStates[type+targetResource.id] = Object.assign({}, currentState);
 						currentState.updated = (lastState === false) ? {} : diff(lastState, currentState);
 						currentState.lastState = lastState;
 
@@ -364,11 +372,11 @@ module.exports = function(RED)
 					}
 					else if(type == "light_level")
 					{
-						const message = new HueBrightnessMessage(targetRessource, options);
+						const message = new HueBrightnessMessage(targetResource, options);
 
 						// GET & SAVE LAST STATE AND DIFFERENCES
 						let currentState = message.msg;
-						scope.lastStates[type+targetRessource.id] = Object.assign({}, currentState);
+						scope.lastStates[type+targetResource.id] = Object.assign({}, currentState);
 						currentState.updated = (lastState === false) ? {} : diff(lastState, currentState);
 						currentState.lastState = lastState;
 
@@ -376,11 +384,11 @@ module.exports = function(RED)
 					}
 					else if(type == "rule")
 					{
-						const message = new HueRulesMessage(targetRessource, options);
+						const message = new HueRulesMessage(targetResource, options);
 
 						// GET & SAVE LAST STATE AND DIFFERENCES
 						let currentState = message.msg;
-						scope.lastStates[type+targetRessource.id] = Object.assign({}, currentState);
+						scope.lastStates[type+targetResource.id] = Object.assign({}, currentState);
 						currentState.updated = (lastState === false) ? {} : diff(lastState, currentState);
 						currentState.lastState = lastState;
 
@@ -398,61 +406,78 @@ module.exports = function(RED)
 			}
 			else
 			{
-				// FILTER RESSOURCES BY TYPE
-				let allFilteredRessources = {};
+				// FILTER RESOURCES BY TYPE
+				let allFilteredResources = {};
 
-				for (const [rootID, ressource] of Object.entries(scope.ressources))
+				for (const [rootID, resource] of Object.entries(scope.resources))
 				{
-					const isGroup = (ressource["type"] == "room" || ressource["type"] == "zone" || ressource["type"] == "bridge_home");
+					const isGroup = (resource["type"] == "room" || resource["type"] == "zone" || resource["type"] == "bridge_home");
 
 					// NORMAL DEVICES
-					if(!isGroup && ressource["services"] && ressource["services"][type])
+					if(!isGroup && resource["services"] && resource["services"][type])
 					{
-						for (const [serviceID, targetDevice] of Object.entries(ressource["services"][type]))
+						for (const [serviceID, targetDevice] of Object.entries(resource["services"][type]))
 						{
-							allFilteredRessources[rootID] = scope.get(type, rootID);
+							allFilteredResources[rootID] = scope.get(type, rootID);
 						}
 					}
-					// GROUPED RESSOURCES
+					// GROUPED RESOURCES
 					else if(isGroup && type === "group")
 					{
-						allFilteredRessources[rootID] = scope.get(type, rootID);
+						allFilteredResources[rootID] = scope.get(type, rootID);
 					}
 				}
 
-				return Object.values(allFilteredRessources);
+				return Object.values(allFilteredResources);
 			}
 		}
 
-		// PATCH RESSOURCE (FROM NODES)
+		// PATCH RESOURCE (FROM NODES)
 		this.patch = function(type, id, patch, version = 2)
 		{
 			return new Promise(function(resolve, reject)
 			{
-				// GET SERVICE ID
-				if(version !== 1 && scope.ressources[id] && scope.ressources[id]["services"] && scope.ressources[id]["services"][type])
+				if(!scope.patchQueue) { return false; }
+				scope.patchQueue.push({ type: type, id: id, patch: patch, version: version }, function (error, response)
 				{
-					const targetRessource = Object.values(scope.ressources[id]["services"][type])[0];
-					id = targetRessource.id;
-				}
-
-				// ACTION!
-				API.request({ method: "PUT", ressource: (version === 2) ? (type+"/"+id) : id, data: patch, version: version })
-				.then(function(response) {
-					resolve(response);
-				})
-				.catch(function(error) {
-					reject(error);
+					if(error)
+					{
+						reject(error);
+					}
+					else
+					{
+						resolve(response);
+					}
 				});
 			});
 		}
 
+		// PATCH RESOURCE (WORKER) / 7 PROCESSES IN PARALLEL
+		this.patchQueue = fastq(function({ type, id, patch, version }, callback)
+		{
+			// GET SERVICE ID
+			if(version !== 1 && scope.resources[id] && scope.resources[id]["services"] && scope.resources[id]["services"][type])
+			{
+				const targetResource = Object.values(scope.resources[id]["services"][type])[0];
+				id = targetResource.id;
+			}
+
+			// ACTION!
+			API.request({ config: config, method: "PUT", resource: (version === 2) ? (type+"/"+id) : id, data: patch, version: version })
+			.then(function(response) {
+				callback(null, response);
+			})
+			.catch(function(error) {
+				callback(error, null);
+			});
+		}, config.worker ? parseInt(config.worker) : 10);
+
 		// RE-FETCH RULE (RECEIVES NO UPDATES VIA SSE)
 		this.refetchRule = function(id)
 		{
 			return new Promise(function(resolve, reject)
 			{
-				API.request({ ressource: "/rules/" + id, version: 1 })
+				API.request({ config: config, resource: "/rules/" + id, version: 1 })
 				.then(function(rule)
 				{
 					// "RENAME" OWNER
@@ -469,8 +494,8 @@ module.exports = function(RED)
 					// UPDATED TIME
 					rule["updated"] = dayjs().format();
 
-					// ADD BACK TO RESSOURCES
-					scope.ressources[rule["id"]] = rule;
+					// ADD BACK TO RESOURCES
+					scope.resources[rule["id"]] = rule;
 
 					// PUSH UPDATED STATE
 					scope.pushUpdatedState(rule, "rule");
@@ -505,7 +530,7 @@ module.exports = function(RED)
 			if(!id)
 			{
 				// UNIVERSAL MODE
-				this.events.on("globalRessourceUpdates", function(info)
+				this.events.on(config.id + "_" + "globalResourceUpdates", function(info)
 				{
 					if(type === "bridge")
 					{
@@ -523,8 +548,8 @@ module.exports = function(RED)
 			}
 			else
 			{
-				// SPECIFIC RESSOURCE MODE
-				this.events.on(id, function(info)
+				// SPECIFIC RESOURCE MODE
+				this.events.on(config.id + "_" + id, function(info)
 				{
 					if(type === "bridge" || messageWhitelist[type].includes(info.updatedType))
 					{
@@ -539,10 +564,11 @@ module.exports = function(RED)
 		{
 			if((config.autoupdates && config.autoupdates == true) || typeof config.autoupdates == 'undefined')
 			{
-				scope.log("Checking for Hue Bridge firmware updates…");
+				if(scope.firmwareUpdateTimeout !== null) { clearTimeout(scope.firmwareUpdateTimeout); };
 				API.request({
+					config: config,
 					method: "PUT",
-					ressource: "/config",
+					resource: "/config",
 					version: 1,
 					data: {
 						swupdate2: {
@@ -555,15 +581,15 @@ module.exports = function(RED)
 				{
 					if(scope.nodeActive == true)
 					{
-						setTimeout(function(){ scope.autoUpdateFirmware(); }, 60000 * 5);
+						scope.firmwareUpdateTimeout = setTimeout(function(){ scope.autoUpdateFirmware(); }, 60000 * 720);
 					}
 				})
 				.catch(function(error)
 				{
-					// NO UPDATES AVAILABLE // TRY AGAIN IN 3H
+					// NO UPDATES AVAILABLE // TRY AGAIN IN 12H
 					if(scope.nodeActive == true)
 					{
-						setTimeout(function(){ scope.autoUpdateFirmware(); }, 60000 * 180);
+						scope.firmwareUpdateTimeout = setTimeout(function(){ scope.autoUpdateFirmware(); }, 60000 * 720);
 					}
 				});
 			}
@@ -581,10 +607,16 @@ module.exports = function(RED)
 
 			// UNSUBSCRIBE FROM BRIDGE EVENTS
 			scope.log("Unsubscribing from bridge events…");
-			API.unsubscribe();
+			API.unsubscribe(config);
 
 			// UNSUBSCRIBE FROM "READY" EVENTS
 			scope.events.removeAllListeners();
+
+			// REMOVE FIRMWARE UPDATE TIMEOUT
+			if(scope.firmwareUpdateTimeout !== null) { clearTimeout(scope.firmwareUpdateTimeout); }
+
+			// KILL QUEUE
+			scope.patchQueue.kill();
 		});
 	}
 
@@ -628,7 +660,7 @@ module.exports = function(RED)
 	    }
 	    else
 	    {
-			API.init({ ip: req.query.ip })
+			API.init({ config: { bridge: req.query.ip, key: "huemagic" } })
 			.then(function(bridge) {
 				res.end(bridge.name);
 			})
@@ -656,7 +688,7 @@ module.exports = function(RED)
 					"Content-Type": "application/json; charset=utf-8"
 				},
 				"data": {
-					"devicetype": "huemagic_" + Math.floor((Math.random() * 100) + 1)
+					"devicetype": "HueMagic for Node-RED (" + Math.floor((Math.random() * 100) + 1) + ")"
 				}
 			})
 			.then(function(response)
@@ -678,18 +710,15 @@ module.exports = function(RED)
 	});
 
 	//
-	// DISCOVER RESSOURCES
-	RED.httpAdmin.get('/hue/ressources', function(req, res, next)
+	// DISCOVER RESOURCES
+	RED.httpAdmin.get('/hue/resources', function(req, res, next)
 	{
 		const targetType = req.query.type;
 
 		// GET ALL RULES
 		if(targetType == "rule")
 		{
-			API.init({ ip: req.query.bridge, key: req.query.key })
-			.then(function(bridge) {
-				return API.request({ ressource: "/rules", version: 1 });
-			})
+			API.request({ config: { bridge: req.query.bridge, key: req.query.key }, resource: "/rules", version: 1 })
 			.then(function(rules)
 			{
 				let targetRules = {};
@@ -714,58 +743,55 @@ module.exports = function(RED)
 				res.status(500).send(JSON.stringify(error));
 			});
 		}
-		// GET ALL OTHER RESSOURCES
+		// GET ALL OTHER RESOURCES
 		else
 		{
-			API.init({ ip: req.query.bridge, key: req.query.key })
-			.then(function(bridge) {
-				return API.request({ ressource: "all" });
-			})
-			.then(function(allRessources)
+			API.request({ config: { bridge: req.query.bridge, key: req.query.key }, resource: "all" })
+			.then(function(allResources)
 			{
-				return API.processRessources(allRessources);
+				return API.processResources(allResources);
 			})
-			.then(function(processedRessources)
+			.then(function(processedResources)
 			{
 				let targetDevices = {};
 
-				for (const [id, ressource] of Object.entries(processedRessources))
+				for (const [id, resource] of Object.entries(processedResources))
 				{
-					const isGroup = (ressource["type"] == "room" || ressource["type"] == "zone" || ressource["type"] == "bridge_home");
+					const isGroup = (resource["type"] == "room" || resource["type"] == "zone" || resource["type"] == "bridge_home");
 
 					// NORMAL DEVICES
-					if(!isGroup && ressource["services"] && ressource["services"][targetType])
+					if(!isGroup && resource["services"] && resource["services"][targetType])
 					{
-						for (const [deviceID, targetDevice] of Object.entries(ressource["services"][targetType]))
+						for (const [deviceID, targetDevice] of Object.entries(resource["services"][targetType]))
 						{
 							var oneDevice = {};
 							oneDevice.id = id;
-							oneDevice.name = ressource.metadata ? ressource.metadata.name : false;
-							oneDevice.model = ressource.product_data ? ressource.product_data.product_name : false;
+							oneDevice.name = resource.metadata ? resource.metadata.name : false;
+							oneDevice.model = resource.product_data ? resource.product_data.product_name : false;
 
 							targetDevices[id] = oneDevice;
 						}
 					}
-					// GROUPED (LIGHT) RESSOURCES
+					// GROUPED (LIGHT) RESOURCES
 					else if(isGroup && targetType === "group")
 					{
-						if(ressource["services"] && ressource["services"]["grouped_light"])
+						if(resource["services"] && resource["services"]["grouped_light"])
 						{
 							var oneDevice = {};
 							oneDevice.id = id;
-							oneDevice.name = ressource.metadata ? ressource.metadata.name : false;
-							oneDevice.model = ressource["type"];
+							oneDevice.name = resource.metadata ? resource.metadata.name : false;
+							oneDevice.model = resource["type"];
 
 							targetDevices[id] = oneDevice;
 						}
 					}
 					// SCENES
-					else if(targetType === "scene" && ressource["type"] == "scene")
+					else if(targetType === "scene" && resource["type"] == "scene")
 					{
 						var oneDevice = {};
 						oneDevice.id = id;
-						oneDevice.name = ressource.metadata ? ressource.metadata.name : false;
-						oneDevice.group = processedRessources[ressource["group"]["rid"]].metadata.name;
+						oneDevice.name = resource.metadata ? resource.metadata.name : false;
+						oneDevice.group = processedResources[resource["group"]["rid"]].metadata.name;
 
 						targetDevices[id] = oneDevice;
 					}