node-red-contrib-huemagic 5.0.0 → 5.1.0

package/examples/Nederlands/Hue Bridge.json

@@ -252,5 +252,103 @@
             ]
         ],
         "icon": "node-red/alert.svg"
+    },
+    {
+        "id": "c1a7f4b2d3e08a11",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Naar nieuwe apparaten zoeken",
+        "info": "",
+        "x": 140,
+        "y": 600,
+        "wires": []
+    },
+    {
+        "id": "b2c8e5a1f4d09b22",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Apparaten zoeken starten",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"searchDevices\":true}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 640,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-bridge.svg"
+    },
+    {
+        "id": "d3e9f6b2a5c10c33",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Entertainmentzones",
+        "info": "",
+        "x": 130,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "e4f0a7c3b6d21d44",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Entertainmentzone starten",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"start\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 740,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
+    },
+    {
+        "id": "f5a1b8d4c7e32e55",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Entertainmentzone stoppen",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"stop\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 780,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
     }
 ]

package/examples/Polski/Hue Bridge.json

@@ -252,5 +252,103 @@
             ]
         ],
         "icon": "node-red/alert.svg"
+    },
+    {
+        "id": "c1a7f4b2d3e08a11",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Wyszukiwanie nowych urządzeń",
+        "info": "",
+        "x": 140,
+        "y": 600,
+        "wires": []
+    },
+    {
+        "id": "b2c8e5a1f4d09b22",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Uruchom wyszukiwanie urządzeń",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"searchDevices\":true}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 640,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-bridge.svg"
+    },
+    {
+        "id": "d3e9f6b2a5c10c33",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Strefy rozrywki",
+        "info": "",
+        "x": 130,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "e4f0a7c3b6d21d44",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Uruchom strefę rozrywki",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"start\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 740,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
+    },
+    {
+        "id": "f5a1b8d4c7e32e55",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Zatrzymaj strefę rozrywki",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"stop\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 780,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
     }
 ]

package/examples/Portugu/303/252s/Hue Bridge.json"

@@ -252,5 +252,103 @@
             ]
         ],
         "icon": "node-red/alert.svg"
+    },
+    {
+        "id": "c1a7f4b2d3e08a11",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Procurar novos dispositivos",
+        "info": "",
+        "x": 140,
+        "y": 600,
+        "wires": []
+    },
+    {
+        "id": "b2c8e5a1f4d09b22",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Iniciar a procura de dispositivos",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"searchDevices\":true}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 640,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-bridge.svg"
+    },
+    {
+        "id": "d3e9f6b2a5c10c33",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Zonas de entretenimento",
+        "info": "",
+        "x": 130,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "e4f0a7c3b6d21d44",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Iniciar a zona de entretenimento",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"start\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 740,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
+    },
+    {
+        "id": "f5a1b8d4c7e32e55",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Parar a zona de entretenimento",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"stop\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 780,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
     }
 ]

package/examples/T/303/274rk/303/247e/Hue Bridge.json"

@@ -252,5 +252,103 @@
             ]
         ],
         "icon": "node-red/alert.svg"
+    },
+    {
+        "id": "c1a7f4b2d3e08a11",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Yeni cihaz arama",
+        "info": "",
+        "x": 140,
+        "y": 600,
+        "wires": []
+    },
+    {
+        "id": "b2c8e5a1f4d09b22",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Cihaz aramasını başlat",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"searchDevices\":true}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 640,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-bridge.svg"
+    },
+    {
+        "id": "d3e9f6b2a5c10c33",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Eğlence alanları",
+        "info": "",
+        "x": 130,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "e4f0a7c3b6d21d44",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Eğlence alanını başlat",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"start\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 740,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
+    },
+    {
+        "id": "f5a1b8d4c7e32e55",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Eğlence alanını durdur",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"stop\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 780,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
     }
 ]

package/examples//316/225/316/273/316/273/316/267/316/275/316/271/316/272/316/254/Hue Bridge.json"

@@ -252,5 +252,103 @@
             ]
         ],
         "icon": "node-red/alert.svg"
+    },
+    {
+        "id": "c1a7f4b2d3e08a11",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Αναζήτηση νέων συσκευών",
+        "info": "",
+        "x": 140,
+        "y": 600,
+        "wires": []
+    },
+    {
+        "id": "b2c8e5a1f4d09b22",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Έναρξη αναζήτησης συσκευών",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"searchDevices\":true}",
+        "payloadType": "json",
+        "x": 150,
+        "y": 640,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-bridge.svg"
+    },
+    {
+        "id": "d3e9f6b2a5c10c33",
+        "type": "comment",
+        "z": "bf04a073.be4428",
+        "name": "Ζώνες entertainment",
+        "info": "",
+        "x": 130,
+        "y": 700,
+        "wires": []
+    },
+    {
+        "id": "e4f0a7c3b6d21d44",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Έναρξη ζώνης entertainment",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"start\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 740,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
+    },
+    {
+        "id": "f5a1b8d4c7e32e55",
+        "type": "inject",
+        "z": "bf04a073.be4428",
+        "name": "Διακοπή ζώνης entertainment",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "{\"entertainment\":{\"action\":\"stop\"}}",
+        "payloadType": "json",
+        "x": 160,
+        "y": 780,
+        "wires": [
+            [
+                "ea4668e7.fac4f"
+            ]
+        ],
+        "icon": "node-red-contrib-huemagic/hue-group.svg"
     }
 ]

package/huemagic/hue-bridge-config.js

@@ -7,7 +7,7 @@ module.exports = function(RED)
 	const events = require('events');
 	const dayjs = require('dayjs');
 	const diff = require("deep-object-diff").diff;
-	const axios = require('axios');
+	const httpUtils = require('./utils/http');
 	const https = require('https');
 	const fastq = require('fastq');
 
@@ -408,7 +408,8 @@ module.exports = function(RED)
 					if(type == "bridge")
 					{
 						try {
-							const message = new HueBridgeMessage(targetResource, options);
+							// THE BRIDGE ALSO REPORTS THE RESOURCES THAT HAVE NO NODE OF THEIR OWN
+							const message = new HueBridgeMessage(targetResource, { resources: scope.resources, ...options });
 
 							// GET CURRENT STATE MESSAGE
 							let currentState = message.msg;
@@ -619,6 +620,18 @@ module.exports = function(RED)
 			}
 		}
 
+		// FIND THE DEVICE THAT OFFERS A CERTAIN SERVICE (FROM NODES)
+		this.deviceWithService = function(type)
+		{
+			for (const [id, resource] of Object.entries(scope.resources))
+			{
+				if(id === "_groupsOf") { continue; }
+				if(resource["services"] && resource["services"][type]) { return id; }
+			}
+
+			return false;
+		}
+
 		// PATCH RESOURCE (FROM NODES)
 		this.patch = function(type, id, patch, version = 2)
 		{
@@ -852,7 +865,8 @@ module.exports = function(RED)
 	// DISCOVER HUE BRIDGES ON LOCAL NETWORK
 	RED.httpAdmin.get('/hue/bridges', RED.auth.needsPermission('hue-bridge.read'), async function(req, res, next)
 	{
-		axios({
+		// THE ONLY REQUEST THAT LEAVES THE LOCAL NETWORK, SO THIS ONE MAY GO THROUGH A PROXY
+		httpUtils.request({
 			"method": "GET",
 			"url": "https://discovery.meethue.com",
 			"headers": {
@@ -912,10 +926,10 @@ module.exports = function(RED)
 		else
 		{
 			// MODERN BRIDGES (AND THE BRIDGE PRO) NO LONGER ANSWER ON PLAIN HTTP
-			axios({
+			httpUtils.request({
 				"method": "POST",
 				"url": "https://"+req.query.ip+"/api",
-				"httpsAgent": new https.Agent({ rejectUnauthorized: false }),
+				"agent": new https.Agent({ rejectUnauthorized: false }),
 				"proxy": false, // THE BRIDGE IS ON THE LOCAL NETWORK, NEVER GO THROUGH A PROXY
 				"headers": {
 					"Content-Type": "application/json; charset=utf-8"