From 8cd571c18392d78d02071584de845ecfba406fc2 Mon Sep 17 00:00:00 2001
From: Niklas <n.neesen@me.com>
Date: Fri, 23 Dec 2016 19:57:34 +0100
Subject: [PATCH 01/24] Added a optional webhook for harmony-activity changes

---
 .../HABridge/HttpRequestHelper.java           | 139 ++++++++++++++++++
 .../java/com/bwssystems/HABridge/NamedIP.java |  11 +-
 .../bwssystems/HABridge/hue/HueMulator.java   | 136 ++---------------
 .../com/bwssystems/harmony/HarmonyServer.java | 127 +++++++++-------
 src/main/java/com/bwssystems/hue/HueInfo.java |  10 +-
 src/main/java/com/bwssystems/hue/HueUtil.java |   6 +-
 src/main/resources/public/scripts/app.js      |  13 +-
 src/main/resources/public/views/system.html   |  19 ++-
 8 files changed, 265 insertions(+), 196 deletions(-)
 create mode 100644 src/main/java/com/bwssystems/HABridge/HttpRequestHelper.java

diff --git a/src/main/java/com/bwssystems/HABridge/HttpRequestHelper.java b/src/main/java/com/bwssystems/HABridge/HttpRequestHelper.java
new file mode 100644
index 0000000..a960f5a
--- /dev/null
+++ b/src/main/java/com/bwssystems/HABridge/HttpRequestHelper.java
@@ -0,0 +1,139 @@
+package com.bwssystems.HABridge;
+
+import com.bwssystems.HABridge.api.NameValue;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContexts;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import javax.net.ssl.SSLContext;
+
+/**
+ * Simple Helper-Class to Call HTTP- and HTTPS-URLs
+ *
+ * Created by CrEaK on 23.12.16 19:34.
+ */
+public enum HttpRequestHelper {
+
+    INSTANCE;
+
+    private static final Logger log = LoggerFactory.getLogger(HttpRequestHelper.class);
+
+
+    private HttpClient httpClient;
+    private CloseableHttpClient httpclientSSL;
+    private SSLContext sslcontext;
+    private SSLConnectionSocketFactory sslsf;
+    private RequestConfig globalConfig;
+
+    HttpRequestHelper() {
+        this.httpClient = HttpClients.createDefault();
+        // Trust own CA and all self-signed certs
+        this.sslcontext = SSLContexts.createDefault();
+        // Allow TLSv1 protocol only
+        this.sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" }, null,
+                                               SSLConnectionSocketFactory.getDefaultHostnameVerifier());
+        this.globalConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
+        this.httpclientSSL = HttpClients.custom().setSSLSocketFactory(sslsf).setDefaultRequestConfig(globalConfig).build();
+    }
+
+
+    // This function executes the url from the device repository against the
+    // target as http or https as defined
+    public String doHttpRequest(String url, String httpVerb, String contentType, String body, NameValue[] headers) {
+        HttpUriRequest request = null;
+        String theContent = null;
+        URI theURI = null;
+        ContentType parsedContentType = null;
+        StringEntity requestBody = null;
+        if (contentType != null && contentType.length() > 0) {
+            parsedContentType = ContentType.parse(contentType);
+            if (body != null && body.length() > 0)
+                requestBody = new StringEntity(body, parsedContentType);
+        }
+        try {
+            theURI = new URI(url);
+        } catch (URISyntaxException e1) {
+            log.warn("Error creating URI http request: " + url + " with message: " + e1.getMessage());
+            return null;
+        }
+        try {
+            if (HttpGet.METHOD_NAME.equalsIgnoreCase(httpVerb) || httpVerb == null) {
+                request = new HttpGet(theURI);
+            } else if (HttpPost.METHOD_NAME.equalsIgnoreCase(httpVerb)) {
+                HttpPost postRequest = new HttpPost(theURI);
+                if (requestBody != null)
+                    postRequest.setEntity(requestBody);
+                request = postRequest;
+            } else if (HttpPut.METHOD_NAME.equalsIgnoreCase(httpVerb)) {
+                HttpPut putRequest = new HttpPut(theURI);
+                if (requestBody != null)
+                    putRequest.setEntity(requestBody);
+                request = putRequest;
+            }
+        } catch (IllegalArgumentException e) {
+            log.warn("Error creating outbound http request: IllegalArgumentException in log", e);
+            return null;
+        }
+        log.debug("Making outbound call in doHttpRequest: " + request);
+        if (headers != null && headers.length > 0) {
+            for (int i = 0; i < headers.length; i++) {
+                request.setHeader(headers[i].getName(), headers[i].getValue());
+            }
+        }
+        try {
+            HttpResponse response;
+            if (url.startsWith("https"))
+                response = httpclientSSL.execute(request);
+            else
+                response = httpClient.execute(request);
+            log.debug((httpVerb == null ? "GET" : httpVerb) + " execute on URL responded: "
+                              + response.getStatusLine().getStatusCode());
+            if (response.getStatusLine().getStatusCode() >= 200 && response.getStatusLine().getStatusCode() < 300) {
+                if (response.getEntity() != null) {
+                    try {
+                        theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
+                        // content
+                        // for
+                        // data
+                        EntityUtils.consume(response.getEntity()); // close out
+                        // inputstream
+                        // ignore
+                        // content
+                    } catch (Exception e) {
+                        log.debug(
+                                "Error ocurred in handling response entity after successful call, still responding success. "
+                                        + e.getMessage(),
+                                e);
+                    }
+                }
+                if (theContent == null)
+                    theContent = "";
+            }
+        } catch (IOException e) {
+            log.warn("Error calling out to HA gateway: IOException in log", e);
+        }
+        return theContent;
+    }
+
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+}
diff --git a/src/main/java/com/bwssystems/HABridge/NamedIP.java b/src/main/java/com/bwssystems/HABridge/NamedIP.java
index 38a6d7f..77e7e51 100644
--- a/src/main/java/com/bwssystems/HABridge/NamedIP.java
+++ b/src/main/java/com/bwssystems/HABridge/NamedIP.java
@@ -2,7 +2,8 @@ package com.bwssystems.HABridge;
 
 public class NamedIP {
 	private String name;
-	private String ip;
+        private String ip;
+        private String webhook;
 	private String port;
 	private String username;
 	private String password;
@@ -19,7 +20,13 @@ public class NamedIP {
 	public void setIp(String ip) {
 		this.ip = ip;
 	}
-	public String getPort() {
+        public String getWebhook() {
+            return webhook;
+        }
+        public void setWebhook(final String webhook) {
+            this.webhook = webhook;
+        }
+        public String getPort() {
 		return port;
 	}
 	public void setPort(String port) {
diff --git a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
index 2e1d66a..27a88d0 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
@@ -2,8 +2,8 @@ package com.bwssystems.HABridge.hue;
 
 import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.DeviceMapTypes;
+import com.bwssystems.HABridge.HttpRequestHelper;
 import com.bwssystems.HABridge.api.CallItem;
-import com.bwssystems.HABridge.api.CallItemDeserializer;
 import com.bwssystems.HABridge.api.NameValue;
 import com.bwssystems.HABridge.api.UserCreateRequest;
 import com.bwssystems.HABridge.api.hue.DeviceResponse;
@@ -34,7 +34,6 @@ import com.bwssystems.nest.controller.Nest;
 import com.bwssystems.util.JsonTransformer;
 import com.bwssystems.util.UDPDatagramSender;
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 
 import net.java.dev.eval.Expression;
 
@@ -43,22 +42,9 @@ import static spark.Spark.options;
 import static spark.Spark.post;
 import static spark.Spark.put;
 
-import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.CookieSpecs;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.EntityUtils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,9 +55,6 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -80,7 +63,6 @@ import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
-import javax.net.ssl.SSLContext;
 import javax.xml.bind.DatatypeConverter;
 
 /**
@@ -101,11 +83,6 @@ public class HueMulator implements HueErrorStringSet {
 	private Nest theNest;
 	private HueHome myHueHome;
 	private MQTTHome mqttHome;
-	private HttpClient httpClient;
-	private CloseableHttpClient httpclientSSL;
-	private SSLContext sslcontext;
-	private SSLConnectionSocketFactory sslsf;
-	private RequestConfig globalConfig;
 	private BridgeSettingsDescriptor bridgeSettings;
 	private UDPDatagramSender theUDPDatagramSender;
 	private byte[] sendData;
@@ -116,15 +93,6 @@ public class HueMulator implements HueErrorStringSet {
 	public HueMulator(BridgeSettingsDescriptor theBridgeSettings, DeviceRepository aDeviceRepository,
 			HarmonyHome theHarmonyHome, NestHome aNestHome, HueHome aHueHome, MQTTHome aMqttHome,
 			UDPDatagramSender aUdpDatagramSender) {
-		httpClient = HttpClients.createDefault();
-		// Trust own CA and all self-signed certs
-		sslcontext = SSLContexts.createDefault();
-		// Allow TLSv1 protocol only
-		sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" }, null,
-				SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-		globalConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
-		httpclientSSL = HttpClients.custom().setSSLSocketFactory(sslsf).setDefaultRequestConfig(globalConfig).build();
-
 		repository = aDeviceRepository;
 		if (theBridgeSettings.isValidHarmony())
 			this.myHarmonyHome = theHarmonyHome;
@@ -309,7 +277,7 @@ public class HueMulator implements HueErrorStringSet {
 				if ((device.getMapType() != null && device.getMapType().equalsIgnoreCase("hueDevice"))) {
 					HueDeviceIdentifier deviceId = new Gson().fromJson(device.getOnUrl(), HueDeviceIdentifier.class);
 					if (myHueHome.getTheHUERegisteredUser() == null) {
-						hueUser = HueUtil.registerWithHue(httpClient, deviceId.getIpAddress(), device.getName(),
+						hueUser = HueUtil.registerWithHue(deviceId.getIpAddress(), device.getName(),
 								myHueHome.getTheHUERegisteredUser(), this);
 						if (hueUser == null) {
 							return errorString;
@@ -317,7 +285,7 @@ public class HueMulator implements HueErrorStringSet {
 						myHueHome.setTheHUERegisteredUser(hueUser);
 					}
 					// make call
-					responseString = doHttpRequest(
+					responseString = HttpRequestHelper.INSTANCE.doHttpRequest(
 							"http://" + deviceId.getIpAddress() + "/api/" + myHueHome.getTheHUERegisteredUser()
 									+ "/lights/" + deviceId.getDeviceId(),
 							HttpGet.METHOD_NAME, device.getContentType(), null, null);
@@ -327,7 +295,7 @@ public class HueMulator implements HueErrorStringSet {
 					} else
 						if (responseString.contains("[{\"error\":") && responseString.contains("unauthorized user")) {
 						myHueHome.setTheHUERegisteredUser(null);
-						hueUser = HueUtil.registerWithHue(httpClient, deviceId.getIpAddress(), device.getName(),
+						hueUser = HueUtil.registerWithHue(deviceId.getIpAddress(), device.getName(),
 								myHueHome.getTheHUERegisteredUser(), this);
 						if (hueUser == null) {
 							return errorString;
@@ -527,7 +495,7 @@ public class HueMulator implements HueErrorStringSet {
 			if ((device.getMapType() != null && device.getMapType().equalsIgnoreCase("hueDevice"))) {
 				HueDeviceIdentifier deviceId = new Gson().fromJson(device.getOnUrl(), HueDeviceIdentifier.class);
 				if (myHueHome.getTheHUERegisteredUser() == null) {
-					hueUser = HueUtil.registerWithHue(httpClient, deviceId.getIpAddress(), device.getName(),
+					hueUser = HueUtil.registerWithHue(deviceId.getIpAddress(), device.getName(),
 							myHueHome.getTheHUERegisteredUser(), this);
 					if (hueUser == null) {
 						return errorString;
@@ -535,15 +503,15 @@ public class HueMulator implements HueErrorStringSet {
 					myHueHome.setTheHUERegisteredUser(hueUser);
 				}
 				// make call
-				responseString = doHttpRequest("http://" + deviceId.getIpAddress() + "/api/"
+				responseString = HttpRequestHelper.INSTANCE.doHttpRequest("http://" + deviceId.getIpAddress() + "/api/"
 						+ myHueHome.getTheHUERegisteredUser() + "/lights/" + deviceId.getDeviceId(),
-						HttpGet.METHOD_NAME, device.getContentType(), null, null);
+                                                                                          HttpGet.METHOD_NAME, device.getContentType(), null, null);
 				if (responseString == null) {
 					log.warn("Error on calling hue device to get state: " + device.getName());
 					lightResponse = DeviceResponse.createResponse(device);
 				} else if (responseString.contains("[{\"error\":") && responseString.contains("unauthorized user")) {
 					myHueHome.setTheHUERegisteredUser(null);
-					hueUser = HueUtil.registerWithHue(httpClient, deviceId.getIpAddress(), device.getName(),
+					hueUser = HueUtil.registerWithHue(deviceId.getIpAddress(), device.getName(),
 							myHueHome.getTheHUERegisteredUser(), this);
 					if (hueUser == null) {
 						return errorString;
@@ -800,7 +768,7 @@ public class HueMulator implements HueErrorStringSet {
 
 						HueDeviceIdentifier deviceId = new Gson().fromJson(callItems[i].getItem(), HueDeviceIdentifier.class);
 						if (myHueHome.getTheHUERegisteredUser() == null) {
-							hueUser = HueUtil.registerWithHue(httpClient, deviceId.getIpAddress(), device.getName(),
+							hueUser = HueUtil.registerWithHue(deviceId.getIpAddress(), device.getName(),
 									myHueHome.getTheHUERegisteredUser(), this);
 							if (hueUser == null) {
 								return errorString;
@@ -817,7 +785,7 @@ public class HueMulator implements HueErrorStringSet {
 								theDelay = callItems[i].getDelay();
 							else
 								theDelay = bridgeSettings.getButtonsleep();
-							responseString = doHttpRequest(
+							responseString = HttpRequestHelper.INSTANCE.doHttpRequest(
 									"http://" + deviceId.getIpAddress() + "/api/" + myHueHome.getTheHUERegisteredUser()
 											+ "/lights/" + deviceId.getDeviceId() + "/state",
 									HttpPut.METHOD_NAME, device.getContentType(), request.body(), null);
@@ -832,7 +800,7 @@ public class HueMulator implements HueErrorStringSet {
 						} else if (responseString.contains("[{\"error\":")) {
 							if(responseString.contains("unauthorized user")) {
 								myHueHome.setTheHUERegisteredUser(null);
-								hueUser = HueUtil.registerWithHue(httpClient, deviceId.getIpAddress(), device.getName(),
+								hueUser = HueUtil.registerWithHue(deviceId.getIpAddress(), device.getName(),
 										myHueHome.getTheHUERegisteredUser(), this);
 								if (hueUser == null) {
 									return errorString;
@@ -1132,8 +1100,8 @@ public class HueMulator implements HueErrorStringSet {
 											calculateIntensity(state, theStateChanges, stateHasBri, stateHasBriInc),
 											false);
 								// make call
-								if (doHttpRequest(anUrl, device.getHttpVerb(), device.getContentType(), body,
-										theHeaders) == null) {
+								if (HttpRequestHelper.INSTANCE.doHttpRequest(anUrl, device.getHttpVerb(), device.getContentType(), body,
+                                                                                                             theHeaders) == null) {
 									log.warn("Error on calling url to change device state: " + anUrl);
 									responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId
 											+ "\",\"description\": \"Error on calling url to change device state\", \"parameter\": \"/lights/"
@@ -1239,84 +1207,6 @@ public class HueMulator implements HueErrorStringSet {
 		return request;
 	}
 
-	// This function executes the url from the device repository against the
-	// target as http or https as defined
-	protected String doHttpRequest(String url, String httpVerb, String contentType, String body, NameValue[] headers) {
-		HttpUriRequest request = null;
-		String theContent = null;
-		URI theURI = null;
-		ContentType parsedContentType = null;
-		StringEntity requestBody = null;
-		if (contentType != null && contentType.length() > 0) {
-			parsedContentType = ContentType.parse(contentType);
-			if (body != null && body.length() > 0)
-				requestBody = new StringEntity(body, parsedContentType);
-		}
-		try {
-			theURI = new URI(url);
-		} catch (URISyntaxException e1) {
-			log.warn("Error creating URI http request: " + url + " with message: " + e1.getMessage());
-			return null;
-		}
-		try {
-			if (HttpGet.METHOD_NAME.equalsIgnoreCase(httpVerb) || httpVerb == null) {
-				request = new HttpGet(theURI);
-			} else if (HttpPost.METHOD_NAME.equalsIgnoreCase(httpVerb)) {
-				HttpPost postRequest = new HttpPost(theURI);
-				if (requestBody != null)
-					postRequest.setEntity(requestBody);
-				request = postRequest;
-			} else if (HttpPut.METHOD_NAME.equalsIgnoreCase(httpVerb)) {
-				HttpPut putRequest = new HttpPut(theURI);
-				if (requestBody != null)
-					putRequest.setEntity(requestBody);
-				request = putRequest;
-			}
-		} catch (IllegalArgumentException e) {
-			log.warn("Error creating outbound http request: IllegalArgumentException in log", e);
-			return null;
-		}
-		log.debug("Making outbound call in doHttpRequest: " + request);
-		if (headers != null && headers.length > 0) {
-			for (int i = 0; i < headers.length; i++) {
-				request.setHeader(headers[i].getName(), headers[i].getValue());
-			}
-		}
-		try {
-			HttpResponse response;
-			if (url.startsWith("https"))
-				response = httpclientSSL.execute(request);
-			else
-				response = httpClient.execute(request);
-			log.debug((httpVerb == null ? "GET" : httpVerb) + " execute on URL responded: "
-					+ response.getStatusLine().getStatusCode());
-			if (response.getStatusLine().getStatusCode() >= 200 && response.getStatusLine().getStatusCode() < 300) {
-				if (response.getEntity() != null) {
-					try {
-						theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
-																											// content
-																											// for
-																											// data
-						EntityUtils.consume(response.getEntity()); // close out
-																	// inputstream
-																	// ignore
-																	// content
-					} catch (Exception e) {
-						log.debug(
-								"Error ocurred in handling response entity after successful call, still responding success. "
-										+ e.getMessage(),
-								e);
-					}
-				}
-				if (theContent == null)
-					theContent = "";
-			}
-		} catch (IOException e) {
-			log.warn("Error calling out to HA gateway: IOException in log", e);
-		}
-		return theContent;
-	}
-
 	private String doExecRequest(String anItem, int intensity, String lightId) {
 		log.debug("Executing request: " + anItem);
 		String responseString = null;
diff --git a/src/main/java/com/bwssystems/harmony/HarmonyServer.java b/src/main/java/com/bwssystems/harmony/HarmonyServer.java
index 2dbf028..4baa7b1 100644
--- a/src/main/java/com/bwssystems/harmony/HarmonyServer.java
+++ b/src/main/java/com/bwssystems/harmony/HarmonyServer.java
@@ -4,6 +4,8 @@ import static java.lang.String.format;
 
 import javax.inject.Inject;
 
+import com.bwssystems.HABridge.HttpRequestHelper;
+import org.apache.http.client.methods.HttpGet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,10 +20,16 @@ import net.whistlingfish.harmony.HarmonyClientModule;
 import net.whistlingfish.harmony.config.Activity;
 import net.whistlingfish.harmony.protocol.OAReplyProvider;
 
+import java.net.URLEncoder;
+
 public class HarmonyServer {
+
+    private static final String ACTIVIY_ID = "${activity.id}";
+    private static final String ACTIVIY_LABEL = "${activity.label}";
+
     @Inject
     private HarmonyClient harmonyClient;
-    
+
     private HarmonyHandler myHarmony;
     private DevModeResponse devResponse;
     private OAReplyProvider dummyProvider;
@@ -29,58 +37,77 @@ public class HarmonyServer {
     private Boolean isDevMode;
     private Logger log = LoggerFactory.getLogger(HarmonyServer.class);
 
-	public HarmonyServer(NamedIP theHarmonyAddress) {
-		super();
-		myHarmony = null;
-		dummyProvider = null;
-		myNameAndIP = theHarmonyAddress;
-		isDevMode = false;
-	}
+    public HarmonyServer(NamedIP theHarmonyAddress) {
+        super();
+        myHarmony = null;
+        dummyProvider = null;
+        myNameAndIP = theHarmonyAddress;
+        isDevMode = false;
+    }
 
-	public static HarmonyServer setup(BridgeSettingsDescriptor bridgeSettings, Boolean harmonyDevMode, NamedIP theHarmonyAddress) throws Exception {
-		if(!bridgeSettings.isValidHarmony() && harmonyDevMode) {
-			return new HarmonyServer(theHarmonyAddress);
-		}
-    	Injector injector = null;
-    	if(!harmonyDevMode)
-    		injector = Guice.createInjector(new HarmonyClientModule());
-        HarmonyServer mainObject = new HarmonyServer(theHarmonyAddress);
-    	if(!harmonyDevMode)
-    		injector.injectMembers(mainObject);
-  		mainObject.execute(bridgeSettings, harmonyDevMode);
-  		return mainObject;
-  	}
-
-	private void execute(BridgeSettingsDescriptor mySettings, Boolean harmonyDevMode) throws Exception {
-        Boolean noopCalls = Boolean.parseBoolean(System.getProperty("noop.calls", "false"));
-		isDevMode = harmonyDevMode;
-       String modeString = "";
-        if(dummyProvider != null)
-        	log.debug("something is very wrong as dummyProvider is not null...");
-        if(isDevMode)
-        	modeString = " (development mode)";
-        else if(noopCalls)
-        	modeString = " (no op calls to harmony)";
-		log.info("setup initiated " + modeString + "....");
-        if(isDevMode)
-        {
-        	harmonyClient = null;
-        	devResponse = new DevModeResponse();
+    public static HarmonyServer setup(
+            BridgeSettingsDescriptor bridgeSettings,
+            Boolean harmonyDevMode,
+            NamedIP theHarmonyAddress
+    ) throws Exception {
+        if (!bridgeSettings.isValidHarmony() && harmonyDevMode) {
+            return new HarmonyServer(theHarmonyAddress);
         }
-        else {
-        	devResponse = null;
-			harmonyClient.addListener(new ActivityChangeListener() {
-				@Override
-				public void activityStarted(Activity activity) {
-					log.info(format("activity changed: [%d] %s", activity.getId(), activity.getLabel()));
-				}
-			});
-			harmonyClient.connect(myNameAndIP.getIp());
+        Injector injector = null;
+        if (!harmonyDevMode) {
+            injector = Guice.createInjector(new HarmonyClientModule());
+        }
+        HarmonyServer mainObject = new HarmonyServer(theHarmonyAddress);
+        if (!harmonyDevMode) {
+            injector.injectMembers(mainObject);
+        }
+        mainObject.execute(bridgeSettings, harmonyDevMode);
+        return mainObject;
+    }
+
+    private void execute(BridgeSettingsDescriptor mySettings, Boolean harmonyDevMode) throws Exception {
+        Boolean noopCalls = Boolean.parseBoolean(System.getProperty("noop.calls", "false"));
+        isDevMode = harmonyDevMode;
+        String modeString = "";
+        if (dummyProvider != null) {
+            log.debug("something is very wrong as dummyProvider is not null...");
+        }
+        if (isDevMode) {
+            modeString = " (development mode)";
+        } else if (noopCalls) {
+            modeString = " (no op calls to harmony)";
+        }
+        log.info("setup initiated " + modeString + "....");
+        if (isDevMode) {
+            harmonyClient = null;
+            devResponse = new DevModeResponse();
+        } else {
+            devResponse = null;
+            harmonyClient.addListener(new ActivityChangeListener() {
+                @Override
+                public void activityStarted(Activity activity) {
+                    String webhook = myNameAndIP.getWebhook();
+                    try {
+                        // Replacing variables
+                        webhook = webhook.replace(ACTIVIY_ID, activity.getId().toString());
+                        webhook = webhook.replace(ACTIVIY_LABEL, URLEncoder.encode(activity.getLabel(), "UTF-8"));
+
+                        log.info(format("calling webhook: %s", webhook));
+
+                        // Calling webhook
+                        HttpRequestHelper.INSTANCE.doHttpRequest(webhook, HttpGet.METHOD_NAME, null, null, null);
+                    } catch (Exception e) {
+                        log.warn("could not call webhook: " + webhook, e);
+                    }
+                    log.info(format("activity changed: [%d] %s", activity.getId(), activity.getLabel()));
+                }
+            });
+            harmonyClient.connect(myNameAndIP.getIp());
         }
         myHarmony = new HarmonyHandler(harmonyClient, noopCalls, devResponse);
-	}
+    }
 
-	public HarmonyHandler getMyHarmony() {
-		return myHarmony;
-	}
+    public HarmonyHandler getMyHarmony() {
+        return myHarmony;
+    }
 }
diff --git a/src/main/java/com/bwssystems/hue/HueInfo.java b/src/main/java/com/bwssystems/hue/HueInfo.java
index 7b9a265..2738291 100644
--- a/src/main/java/com/bwssystems/hue/HueInfo.java
+++ b/src/main/java/com/bwssystems/hue/HueInfo.java
@@ -2,10 +2,10 @@ package com.bwssystems.hue;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+
+import com.bwssystems.HABridge.HttpRequestHelper;
 import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +17,6 @@ import com.google.gson.Gson;
 
 public class HueInfo implements HueErrorStringSet {
     private static final Logger log = LoggerFactory.getLogger(HueInfo.class);
-    private HttpClient httpClient;
     private NamedIP hueAddress;
 	private String theUser;
 	private HueHome theHueHome;
@@ -25,7 +24,6 @@ public class HueInfo implements HueErrorStringSet {
 
     public HueInfo(NamedIP addressName, HueHome aHueHome) {
 		super();
-        httpClient = HttpClients.createDefault();
         hueAddress = addressName;
         theUser = "habridge";
         theHueHome = aHueHome;
@@ -50,7 +48,7 @@ public class HueInfo implements HueErrorStringSet {
 	    		log.debug("GET HueApiResponse - data: " + theData);
 	    		if(theData.contains("[{\"error\":")) {
 	    			if(theData.contains("unauthorized user")) {
-	    				theUser = HueUtil.registerWithHue(httpClient, hueAddress.getIp(), hueAddress.getName(), theHueHome.getTheHUERegisteredUser(), this);
+	    				theUser = HueUtil.registerWithHue(hueAddress.getIp(), hueAddress.getName(), theHueHome.getTheHUERegisteredUser(), this);
 	        			if(theUser == null) {
 	        				log.warn("Register to Hue for " + hueAddress.getName() + " returned error: " + errorString);
 	        				return null;
@@ -84,7 +82,7 @@ public class HueInfo implements HueErrorStringSet {
         log.debug("calling GET on URL: " + url);
         HttpGet httpGet = new HttpGet(url);
         try {
-            HttpResponse response = httpClient.execute(httpGet);
+            HttpResponse response = HttpRequestHelper.INSTANCE.getHttpClient().execute(httpGet);
             log.debug("GET on URL responded: " + response.getStatusLine().getStatusCode());
             if(response.getStatusLine().getStatusCode() == 200){
                 theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); //read content for data
diff --git a/src/main/java/com/bwssystems/hue/HueUtil.java b/src/main/java/com/bwssystems/hue/HueUtil.java
index d2806f0..c196ae7 100644
--- a/src/main/java/com/bwssystems/hue/HueUtil.java
+++ b/src/main/java/com/bwssystems/hue/HueUtil.java
@@ -2,8 +2,8 @@ package com.bwssystems.hue;
 
 import java.io.IOException;
 
+import com.bwssystems.HABridge.HttpRequestHelper;
 import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
@@ -19,7 +19,7 @@ public class HueUtil {
     private static final Logger log = LoggerFactory.getLogger(HueUtil.class);
 	public static final String HUE_REQUEST = "/api";
 
-	public static final String registerWithHue(HttpClient anHttpClient, String ipAddress, String aName, String theUser, HueErrorStringSet errorStringSet) {
+	public static final String registerWithHue(String ipAddress, String aName, String theUser, HueErrorStringSet errorStringSet) {
     	UserCreateRequest theLogin = new UserCreateRequest();
         theLogin.setDevicetype("HABridge#MyMachine");
         HttpPost postRequest = new HttpPost("http://" + ipAddress + HUE_REQUEST);
@@ -28,7 +28,7 @@ public class HueUtil {
         HttpResponse response = null;
         postRequest.setEntity(requestBody);
         try {
-            response = anHttpClient.execute(postRequest);
+            response = HttpRequestHelper.INSTANCE.getHttpClient().execute(postRequest);
             log.debug("POST execute on URL responded: " + response.getStatusLine().getStatusCode());
             if(response.getStatusLine().getStatusCode() >= 200  && response.getStatusLine().getStatusCode() < 300){
             	String theBody = EntityUtils.toString(response.getEntity());
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index 9f47957..8476c4b 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -654,18 +654,21 @@ app.controller('SystemController', function ($scope, $location, $http, $window,
     	    }
     	}    	
     };
-    $scope.addHarmonytoSettings = function (newharmonyname, newharmonyip) {
+    $scope.addHarmonytoSettings = function (newharmonyname, newharmonyip, newharmonywebhook) {
     	if($scope.bridge.settings.harmonyaddress == null) {
 			$scope.bridge.settings.harmonyaddress = { devices: [] };
 		}
-    	var newharmony = {name: newharmonyname, ip: newharmonyip }
+    	var newharmony = {name: newharmonyname, ip: newharmonyip , webhook: newharmonywebhook }
     	$scope.bridge.settings.harmonyaddress.devices.push(newharmony);
     	$scope.newharmonyname = null;
-    	$scope.newharmonyip = null;
+        $scope.newharmonyip = null;
+        $scope.newharmonywebhook = null;
     };
-    $scope.removeHarmonytoSettings = function (harmonyname, harmonyip) {
+    $scope.removeHarmonytoSettings = function (harmonyname, harmonyip, harmonywebhook) {
     	for(var i = $scope.bridge.settings.harmonyaddress.devices.length - 1; i >= 0; i--) {
-    	    if($scope.bridge.settings.harmonyaddress.devices[i].name === harmonyname && $scope.bridge.settings.harmonyaddress.devices[i].ip === harmonyip) {
+    	    if($scope.bridge.settings.harmonyaddress.devices[i].name === harmonyname
+                    && $scope.bridge.settings.harmonyaddress.devices[i].ip === harmonyip
+                    && $scope.bridge.settings.harmonyaddress.devices[i].webhook === harmonywebhook) {
     	    	$scope.bridge.settings.harmonyaddress.devices.splice(i, 1);
     	    }
     	}    	
diff --git a/src/main/resources/public/views/system.html b/src/main/resources/public/views/system.html
index 89a9318..afcc19a 100644
--- a/src/main/resources/public/views/system.html
+++ b/src/main/resources/public/views/system.html
@@ -138,25 +138,30 @@
 							<thead>
 								<tr>
 									<th>Name</th>
-									<th>IP</th>
+                                                                        <th>IP</th>
+                                                                        <th>Webhook</th>
 									<th>Manage</th>
 								</tr>
 							</thead>
 							<tr ng-repeat="harmony in bridge.settings.harmonyaddress.devices">
 								<td>{{harmony.name}}</td>
-								<td>{{harmony.ip}}</td>
+                                                                <td>{{harmony.ip}}</td>
+                                                                <td>{{harmony.webhook}}</td>
 								<td><button class="btn btn-danger" type="submit"
-										ng-click="removeHarmonytoSettings(harmony.name, harmony.ip)">Del</button></td>
+										ng-click="removeHarmonytoSettings(harmony.name, harmony.ip, harmony.webhook)">Del</button></td>
 							</tr>
 							<tr>
 								<td><input id="bridge-settings-next-harmony-name"
 									class="form-control" type="text" ng-model="newharmonyname"
 									placeholder="A Harmony"></td>
-								<td><input id="bridge-settings-next-harmony-ip"
-									class="form-control" type="text" ng-model="newharmonyip"
-									placeholder="192.168.1.3"></td>
+                                                            <td><input id="bridge-settings-next-harmony-ip"
+                                                                       class="form-control" type="text" ng-model="newharmonyip"
+                                                                       placeholder="192.168.1.3"></td>
+                                                            <td><input id="bridge-settings-next-harmony-webhook"
+                                                                       class="form-control" type="text" ng-model="newharmonywebhook"
+                                                                       placeholder="http://hook?a=${activity.label}"></td>
 								<td><button class="btn btn-success" type="submit"
-										ng-click="addHarmonytoSettings(newharmonyname, newharmonyip)">Add</button></td>
+										ng-click="addHarmonytoSettings(newharmonyname, newharmonyip, newharmonywebhook)">Add</button></td>
 							</tr>
 						</table></td>
 				</tr>

From e36145f21621792b510971dd836fefd0138cb60c Mon Sep 17 00:00:00 2001
From: Niklas <n.neesen@me.com>
Date: Tue, 27 Dec 2016 13:33:27 +0100
Subject: [PATCH 02/24] NPE-Check for harmony webhook

---
 .../com/bwssystems/harmony/HarmonyServer.java | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/bwssystems/harmony/HarmonyServer.java b/src/main/java/com/bwssystems/harmony/HarmonyServer.java
index 4baa7b1..59f345d 100644
--- a/src/main/java/com/bwssystems/harmony/HarmonyServer.java
+++ b/src/main/java/com/bwssystems/harmony/HarmonyServer.java
@@ -87,17 +87,19 @@ public class HarmonyServer {
                 @Override
                 public void activityStarted(Activity activity) {
                     String webhook = myNameAndIP.getWebhook();
-                    try {
-                        // Replacing variables
-                        webhook = webhook.replace(ACTIVIY_ID, activity.getId().toString());
-                        webhook = webhook.replace(ACTIVIY_LABEL, URLEncoder.encode(activity.getLabel(), "UTF-8"));
+                    if(webhook != null) {
+                        try {
+                            // Replacing variables
+                            webhook = webhook.replace(ACTIVIY_ID, activity.getId().toString());
+                            webhook = webhook.replace(ACTIVIY_LABEL, URLEncoder.encode(activity.getLabel(), "UTF-8"));
 
-                        log.info(format("calling webhook: %s", webhook));
+                            log.info(format("calling webhook: %s", webhook));
 
-                        // Calling webhook
-                        HttpRequestHelper.INSTANCE.doHttpRequest(webhook, HttpGet.METHOD_NAME, null, null, null);
-                    } catch (Exception e) {
-                        log.warn("could not call webhook: " + webhook, e);
+                            // Calling webhook
+                            HttpRequestHelper.INSTANCE.doHttpRequest(webhook, HttpGet.METHOD_NAME, null, null, null);
+                        } catch (Exception e) {
+                            log.warn("could not call webhook: " + webhook, e);
+                        }
                     }
                     log.info(format("activity changed: [%d] %s", activity.getId(), activity.getLabel()));
                 }

From babf81ea314cb82e6e5636908f998959673f7351 Mon Sep 17 00:00:00 2001
From: BWS Systems <info.bwssystems@gmail.com>
Date: Wed, 1 Feb 2017 11:36:51 -0600
Subject: [PATCH 03/24] Update Version

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index a33b794..e0c06d8 100644
--- a/README.md
+++ b/README.md
@@ -33,23 +33,23 @@ ATTENTION: This requires JDK 1.8 to run
 ATTENTION: Due to port 80 being the default, Linux restricts this to super user. Use the instructions below.
 
 ```
-java -jar ha-bridge-4.1.1.jar
+java -jar ha-bridge-4.1.2.jar
 ```
 ### Automation on Linux systems
 To have this configured and running automatically there are a few resources to use. One is using Docker and a docker container has been built for this and can be gotten here: https://github.com/aptalca/docker-ha-bridge
 
-Create the directory and make sure that ha-bridge-4.1.1.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.1.2.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
 
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.1/ha-bridge-4.1.1.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.2/ha-bridge-4.1.2.jar
 ```
-Create the directory and make sure that ha-bridge-4.1.1.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.1.2.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.1/ha-bridge-4.1.1.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.2/ha-bridge-4.1.2.jar
 ```
 #### System Control Setup on a pi (preferred)
 For next gen Linux systems (this includes the Raspberry Pi), here is a systemctl unit file that you can install. Here is a link on how to do this: https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
@@ -69,7 +69,7 @@ After=network.target
 [Service]
 Type=simple
 
-ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.1.jar
+ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.2.jar
 
 [Install]
 WantedBy=multi-user.target
@@ -104,7 +104,7 @@ Then cut and past this, modify any locations that are not correct
 ```
 cd /home/pi/habridge
 rm /home/pi/habridge/habridge-log.txt
-nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.1.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
+nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.2.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
 
 chmod 777 /home/pi/habridge/habridge-log.txt
 ```

From 16a248ba8e9c7753cd1e612fb347655617c3da10 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Wed, 1 Feb 2017 16:53:08 -0600
Subject: [PATCH 04/24] Starting impl of LIFX devices

---
 pom.xml                                       |   7 +-
 .../bwssystems/HABridge/BridgeSettings.java   |   1 +
 .../HABridge/BridgeSettingsDescriptor.java    |  10 +
 .../bwssystems/HABridge/DeviceMapTypes.java   |   2 +
 .../com/bwssystems/HABridge/HomeManager.java  |   9 +-
 .../bwssystems/HABridge/hue/HueMulator.java   |   1 -
 .../HABridge/plugins/lifx/LifxDevice.java     |  47 +++++
 .../HABridge/plugins/lifx/LifxEntry.java      |  18 ++
 .../HABridge/plugins/lifx/LifxHome.java       | 177 ++++++++++++++++++
 src/main/resources/public/scripts/app.js      | 155 ++++++++++++++-
 src/main/resources/public/views/system.html   |   6 +
 11 files changed, 428 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java
 create mode 100644 src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java
 create mode 100644 src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java

diff --git a/pom.xml b/pom.xml
index 72d092f..077a0c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.2</version>
+	<version>4.1.2a</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -121,6 +121,11 @@
 		    <artifactId>junit</artifactId>
 		    <version>4.11</version>
 		</dependency>
+		<dependency>
+		  <groupId>com.github.bwssytems</groupId>
+		  <artifactId>lifx-sdk-java</artifactId>
+		  <version>2.1.1</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/bwssystems/HABridge/BridgeSettings.java b/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
index 1d67a37..13d84d4 100644
--- a/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
+++ b/src/main/java/com/bwssystems/HABridge/BridgeSettings.java
@@ -148,6 +148,7 @@ public class BridgeSettings extends BackupHandler {
         theBridgeSettings.setMqttconfigured(theBridgeSettings.isValidMQTT());
         theBridgeSettings.setHassconfigured(theBridgeSettings.isValidHass());
         theBridgeSettings.setDomoticzconfigured(theBridgeSettings.isValidDomoticz());
+        // Lifx is either configured or not, so it does not need an update.
        if(serverPortOverride != null)
         	theBridgeSettings.setServerPort(serverPortOverride);
         if(serverIpOverride != null)
diff --git a/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java b/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java
index 442513b..556d85f 100644
--- a/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java
+++ b/src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java
@@ -40,6 +40,7 @@ public class BridgeSettingsDescriptor {
 	private String hubversion;
 	private IpList domoticzaddress;
 	private boolean domoticzconfigured;
+	private boolean lifxconfigured;
 	
 	public BridgeSettingsDescriptor() {
 		super();
@@ -263,6 +264,12 @@ public class BridgeSettingsDescriptor {
 	public void setDomoticzconfigured(boolean domoticzconfigured) {
 		this.domoticzconfigured = domoticzconfigured;
 	}
+	public boolean isLifxconfigured() {
+		return lifxconfigured;
+	}
+	public void setLifxconfigured(boolean lifxconfigured) {
+		this.lifxconfigured = lifxconfigured;
+	}
 	public Boolean isValidVera() {
 		if(this.getVeraAddress() == null || this.getVeraAddress().getDevices().size() <= 0)
 			return false;
@@ -328,4 +335,7 @@ public class BridgeSettingsDescriptor {
 			return false;
 		return true;
 	}
+	public Boolean isValidLifx() {
+		return this.isLifxconfigured();
+	}
 }
diff --git a/src/main/java/com/bwssystems/HABridge/DeviceMapTypes.java b/src/main/java/com/bwssystems/HABridge/DeviceMapTypes.java
index 870fa2c..1ee8125 100644
--- a/src/main/java/com/bwssystems/HABridge/DeviceMapTypes.java
+++ b/src/main/java/com/bwssystems/HABridge/DeviceMapTypes.java
@@ -26,6 +26,7 @@ public class DeviceMapTypes {
 	public final static String[] UDP_DEVICE_COMPAT = { "UDP", "UDP Device"};
 	public final static String[] HTTP_DEVICE = { "httpDevice", "HTTP Device"};
 	public final static String[] DOMOTICZ_DEVICE = { "domoticzDevice", "Domoticz Device"};
+	public final static String[] LIFX_DEVICE = { "lifxDevice", "LIFX Device"};
 
 	public final static int typeIndex = 0;
 	public final static int displayIndex = 1;
@@ -46,6 +47,7 @@ public class DeviceMapTypes {
 		deviceMapTypes.add(HASS_DEVICE);
 		deviceMapTypes.add(HTTP_DEVICE);
 		deviceMapTypes.add(HUE_DEVICE);
+		deviceMapTypes.add(LIFX_DEVICE);
 		deviceMapTypes.add(MQTT_MESSAGE);
 		deviceMapTypes.add(NEST_HOMEAWAY);
 		deviceMapTypes.add(NEST_THERMO_SET);
diff --git a/src/main/java/com/bwssystems/HABridge/HomeManager.java b/src/main/java/com/bwssystems/HABridge/HomeManager.java
index 83b1118..ed51668 100644
--- a/src/main/java/com/bwssystems/HABridge/HomeManager.java
+++ b/src/main/java/com/bwssystems/HABridge/HomeManager.java
@@ -12,6 +12,7 @@ import com.bwssystems.HABridge.plugins.harmony.HarmonyHome;
 import com.bwssystems.HABridge.plugins.hass.HassHome;
 import com.bwssystems.HABridge.plugins.http.HTTPHome;
 import com.bwssystems.HABridge.plugins.hue.HueHome;
+import com.bwssystems.HABridge.plugins.lifx.LifxHome;
 import com.bwssystems.HABridge.plugins.mqtt.MQTTHome;
 import com.bwssystems.HABridge.plugins.tcp.TCPHome;
 import com.bwssystems.HABridge.plugins.udp.UDPHome;
@@ -79,13 +80,17 @@ public class HomeManager {
 		aHome = new UDPHome(bridgeSettings, aUdpDatagramSender);
 		homeList.put(DeviceMapTypes.UDP_DEVICE[DeviceMapTypes.typeIndex], aHome);
 		homeList.put(DeviceMapTypes.UDP_DEVICE_COMPAT[DeviceMapTypes.typeIndex], aHome);
-		
+		// Setup Vera Home if available
 		aHome = new VeraHome(bridgeSettings);
 		resourceList.put(DeviceMapTypes.VERA_DEVICE[DeviceMapTypes.typeIndex], aHome);
 		resourceList.put(DeviceMapTypes.VERA_SCENE[DeviceMapTypes.typeIndex], aHome);
-        //setup the HomeAssistant configuration if available
+        //setup the Domoticz configuration if available
 		aHome = new DomoticzHome(bridgeSettings);
 		resourceList.put(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex], aHome);
+        //setup the Lifx configuration if available
+		aHome = new LifxHome(bridgeSettings);
+		resourceList.put(DeviceMapTypes.LIFX_DEVICE[DeviceMapTypes.typeIndex], aHome);
+		homeList.put(DeviceMapTypes.LIFX_DEVICE[DeviceMapTypes.typeIndex], aHome);
 	}
 	
 	public Home findHome(String type) {
diff --git a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
index 67b3db5..017d8e2 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
@@ -16,7 +16,6 @@ import com.bwssystems.HABridge.api.hue.HuePublicConfig;
 import com.bwssystems.HABridge.api.hue.StateChangeBody;
 import com.bwssystems.HABridge.api.hue.WhitelistEntry;
 import com.bwssystems.HABridge.dao.*;
-import com.bwssystems.HABridge.plugins.hue.HueDeviceIdentifier;
 import com.bwssystems.HABridge.plugins.hue.HueHome;
 import com.bwssystems.HABridge.util.JsonTransformer;
 import com.google.gson.Gson;
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java
new file mode 100644
index 0000000..8ca81f9
--- /dev/null
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java
@@ -0,0 +1,47 @@
+package com.bwssystems.HABridge.plugins.lifx;
+
+import com.github.besherman.lifx.LFXGroup;
+import com.github.besherman.lifx.LFXLight;
+
+public class LifxDevice {
+	private Object lifxObject;
+	private String type;
+	public final static String LIGHT_TYPE = "Light";
+	public final static String GROUP_TYPE = "Group";
+	
+	public LifxDevice(Object lifxObject, String type) {
+		super();
+		this.lifxObject = lifxObject;
+		this.type = type;
+	}
+
+	public LifxEntry toEntry() {
+		LifxEntry anEntry = null;
+		if(type.equals(LIGHT_TYPE)) {
+			anEntry = new LifxEntry();
+			anEntry.setId(((LFXLight)lifxObject).getID());
+			anEntry.setName(((LFXLight)lifxObject).getLabel());
+		}
+		if(type.equals(GROUP_TYPE)) {
+			anEntry = new LifxEntry();
+			anEntry.setId("na");
+			anEntry.setName(((LFXGroup)lifxObject).getLabel());
+		}
+		return anEntry;
+	}
+	public Object getLifxObject() {
+		return lifxObject;
+	}
+
+	public void setLifxObject(Object lifxObject) {
+		this.lifxObject = lifxObject;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java
new file mode 100644
index 0000000..44574d5
--- /dev/null
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java
@@ -0,0 +1,18 @@
+package com.bwssystems.HABridge.plugins.lifx;
+
+public class LifxEntry {
+	private String name;
+	private String id;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+}
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
new file mode 100644
index 0000000..1a03b88
--- /dev/null
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
@@ -0,0 +1,177 @@
+package com.bwssystems.HABridge.plugins.lifx;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
+import com.bwssystems.HABridge.Home;
+import com.bwssystems.HABridge.api.CallItem;
+import com.bwssystems.HABridge.dao.DeviceDescriptor;
+import com.bwssystems.HABridge.hue.BrightnessDecode;
+import com.bwssystems.HABridge.hue.MultiCommandUtil;
+import com.github.besherman.lifx.LFXClient;
+import com.github.besherman.lifx.LFXGroup;
+import com.github.besherman.lifx.LFXGroupCollection;
+import com.github.besherman.lifx.LFXLight;
+import com.github.besherman.lifx.LFXLightCollection;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class LifxHome implements Home {
+    private static final Logger log = LoggerFactory.getLogger(LifxHome.class);
+	private Map<String, LifxDevice> lifxMap;
+	private LFXClient client = new LFXClient();        
+	private Boolean validLifx;
+	private Gson aGsonHandler;
+	
+	public LifxHome(BridgeSettingsDescriptor bridgeSettings) {
+		super();
+		createHome(bridgeSettings);
+	}
+
+	@Override
+	public Home createHome(BridgeSettingsDescriptor bridgeSettings) {
+		lifxMap = null;
+		aGsonHandler = null;
+		validLifx = bridgeSettings.isValidLifx();
+		log.info("LifxDevice Home created." + (validLifx ? "" : " No LifxDevices configured."));
+		if(validLifx) {
+	    	try {
+	    		log.info("Open Lifx client....");
+				client.open(true);
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} catch (InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			aGsonHandler =
+					new GsonBuilder()
+					.create();
+			lifxMap = new HashMap<String, LifxDevice>();
+			this.addLifxLights(client.getLights());
+			this.addLifxGroups(client.getGroups());
+        }
+		return this;
+	}
+
+	public LifxDevice getLifxDevice(String aName) {
+		if(!validLifx)
+			return null;
+		LifxDevice aLifxDevice = null;
+		if(aName == null || aName.equals("")) {
+			log.debug("Cannot get LifxDevice for name as it is empty.");
+		}
+		else {
+			aLifxDevice = lifxMap.get(aName);
+			log.debug("Retrieved a LifxDevice for name: " + aName);
+		}
+		return aLifxDevice;
+	}
+	
+	@Override
+	public Object getItems(String type) {
+		log.debug("consolidating devices for lifx");
+		if(!validLifx)
+			return null;
+		LifxEntry theResponse = null;
+		Iterator<String> keys = lifxMap.keySet().iterator();
+		List<LifxEntry> deviceList = new ArrayList<LifxEntry>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			theResponse = lifxMap.get(key).toEntry();
+			if(theResponse != null)
+				deviceList.add(theResponse);
+			else {
+				log.warn("Cannot get LifxDevice with name: " + key + ", skipping this Lifx.");
+				continue;
+			}
+		}
+		return deviceList;
+	}
+
+	private Boolean addLifxLights(LFXLightCollection theDeviceList) {
+		if(!validLifx)
+			return false;
+		Iterator<LFXLight> devices = theDeviceList.iterator();;
+		while(devices.hasNext()) {
+			LFXLight theDevice = devices.next();
+			LifxDevice aNewLifxDevice = new LifxDevice(theDevice, LifxDevice.LIGHT_TYPE);
+			lifxMap.put(aNewLifxDevice.toEntry().getName(), aNewLifxDevice);
+		}
+		return true;
+	}
+	
+	private Boolean addLifxGroups(LFXGroupCollection theDeviceList) {
+		if(!validLifx)
+			return false;
+		Iterator<LFXGroup> devices = theDeviceList.iterator();;
+		while(devices.hasNext()) {
+			LFXGroup theDevice = devices.next();
+			LifxDevice aNewLifxDevice = new LifxDevice(theDevice, LifxDevice.GROUP_TYPE);
+			lifxMap.put(aNewLifxDevice.toEntry().getName(), aNewLifxDevice);
+		}
+		return true;
+	}
+	
+	@Override
+	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity,
+			Integer targetBri, Integer targetBriInc, DeviceDescriptor device, String body) {
+		String theReturn = null;
+		log.debug("executing HUE api request to send message to LifxDevice: " + anItem.getItem().toString());
+		if(!validLifx) {
+			log.warn("Should not get here, no LifxDevice clients configured");
+			theReturn = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId
+					+ "\",\"description\": \"Should not get here, no LifxDevices configured\", \"parameter\": \"/lights/"
+					+ lightId + "state\"}}]";
+
+		} else {
+			LifxEntry lifxCommand = null;
+			if(anItem.getItem().isJsonObject())
+				lifxCommand = aGsonHandler.fromJson(anItem.getItem(), LifxEntry.class);
+			else
+				lifxCommand = aGsonHandler.fromJson(anItem.getItem().getAsString(), LifxEntry.class);
+			int aBriValue = BrightnessDecode.calculateIntensity(intensity, targetBri, targetBriInc);
+			LifxDevice theDevice = getLifxDevice(lifxCommand.getName());
+			if (theDevice == null) {
+				log.warn("Should not get here, no LifxDevices available");
+				theReturn = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId
+						+ "\",\"description\": \"Should not get here, no Lifx clients available\", \"parameter\": \"/lights/"
+						+ lightId + "state\"}}]";
+			} else {
+					log.debug("calling LifxDevice: " + lifxCommand.getName());
+					if(theDevice.getType().equals(LifxDevice.LIGHT_TYPE)) {
+						LFXLight theLight = (LFXLight)theDevice.getLifxObject();
+						if(body.contains("true"))
+							theLight.setPower(true);
+						if(body.contains("false"))
+							theLight.setPower(false);
+						if(targetBri != null || targetBriInc != null)
+							theLight.setBrightness((float)(aBriValue/254));
+					} else if (theDevice.getType().equals(LifxDevice.GROUP_TYPE)) {
+						LFXGroup theGroup = (LFXGroup)theDevice.getLifxObject();
+						if(body.contains("true"))
+							theGroup.setPower(true);
+						if(body.contains("false"))
+							theGroup.setPower(false);
+					}
+			}
+		}
+		return theReturn;
+	}
+
+	@Override
+	public void closeHome() {
+		if(!validLifx)
+			return;
+		client.close();
+	}
+}
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index e22505a..e6ae6d4 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -45,6 +45,9 @@ app.config (function ($locationProvider, $routeProvider) {
 	}).when ('/domoticzdevices', {
 		templateUrl: 'views/domoticzdevice.html',
 		controller: 'DomoticzController'		
+	}).when ('/lifxdevices', {
+		templateUrl: 'views/lifxdevice.html',
+		controller: 'DomoticzController'		
 	}).otherwise ({
 		templateUrl: 'views/configuration.html',
 		controller: 'ViewingController'
@@ -71,7 +74,7 @@ String.prototype.replaceAll = function (search, replace)
 
 app.service ('bridgeService', function ($http, $window, ngToast) {
 	var self = this;
-	this.state = {base: window.location.origin + "/api/devices", bridgelocation: window.location.origin, systemsbase: window.location.origin + "/system", huebase: window.location.origin + "/api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, habridgeversion: ""};
+	this.state = {base: window.location.origin + "/api/devices", bridgelocation: window.location.origin, systemsbase: window.location.origin + "/system", huebase: window.location.origin + "/api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, showLifx: false, habridgeversion: ""};
 
 	this.displayWarn = function(errorTitle, error) {
 		var toastContent = errorTitle;
@@ -257,6 +260,11 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 		return;
 	}
 
+	this.updateShowLifx = function () {
+		this.state.showDomoticz = self.state.settings.lifxconfigured;
+		return;
+	}
+
 	this.loadBridgeSettings = function () {
 		return $http.get(this.state.systemsbase + "/settings").then(
 				function (response) {
@@ -450,6 +458,19 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 		);
 	};
 
+	this.viewLifxDevices = function () {
+		if (!this.state.showLifx)
+			return;
+		return $http.get(this.state.base + "/lifx/devices").then(
+				function (response) {
+					self.state.lifxdevices = response.data;
+				},
+				function (error) {
+					self.displayWarn("Get Lifx Devices Error: ", error);
+				}
+		);
+	};
+
 	this.formatCallItem = function (currentItem) {
 		if(!currentItem.startsWith("{\"item") && !currentItem.startsWith("[{\"item")) {
 			if (currentItem.startsWith("[") || currentItem.startsWith("{"))
@@ -2295,6 +2316,124 @@ app.controller('DomoticzController', function ($scope, $location, $http, bridgeS
 	};
 });
 
+app.controller('LifxController', function ($scope, $location, $http, bridgeService, ngDialog) {
+	$scope.bridge = bridgeService.state;
+	$scope.device = bridgeService.state.device;
+	$scope.device_dim_control = "";
+	$scope.bulk = { devices: [] };
+	$scope.selectAll = false;
+	bridgeService.viewLifxDevices();
+	$scope.imgButtonsUrl = "glyphicon glyphicon-plus";
+	$scope.buttonsVisible = false;
+
+	$scope.clearDevice = function () {
+		bridgeService.clearDevice();
+		$scope.device = bridgeService.state.device;
+	};
+
+	$scope.buildDeviceUrls = function (lifxdevice, dim_control) {
+		dimpayload = "{\"name\":\"" + lifxdevice.name + "\"}";
+		onpayload = "{\"name\":\"" + lifxdevice.name + "\"}";
+		offpayload = "{\"name\":\"" + lifxdevice.name + "\"}";
+		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, lifxdevice.name,  lifxdevice.name, lifxdevice.name, aDeviceType,  "lifxDevice", null, null);
+		$scope.device = bridgeService.state.device;
+		bridgeService.editNewDevice($scope.device);
+		$location.path('/editdevice');
+	};
+
+	$scope.bulkAddDevices = function(dim_control) {
+		var devicesList = [];
+		for(var i = 0; i < $scope.bulk.devices.length; i++) {
+			for(var x = 0; x < bridgeService.state.lifxdevices.length; x++) {
+				if(bridgeService.state.lifxdevices[x].devicename === $scope.bulk.devices[i]) {
+					$scope.buildDeviceUrls(bridgeService.state.lifxdevices[x],dim_control);
+					devicesList[i] = {
+							name: $scope.device.name,
+							mapId: $scope.device.mapId,
+							mapType: $scope.device.mapType,
+							deviceType: $scope.device.deviceType,
+							targetDevice: $scope.device.targetDevice,
+							onUrl: $scope.device.onUrl,
+							dimUrl: $scope.device.dimUrl,
+							offUrl: $scope.device.offUrl,
+							headers: $scope.device.headers,
+							httpVerb: $scope.device.httpVerb,
+							contentType: $scope.device.contentType,
+							contentBody: $scope.device.contentBody,
+							contentBodyDim: $scope.device.contentBodyDim,
+							contentBodyOff: $scope.device.contentBodyOff
+					};
+				}
+			}
+		}
+		bridgeService.bulkAddDevice(devicesList).then(
+				function () {
+					$scope.clearDevice();
+					bridgeService.viewDevices();
+					bridgeService.viewHalDevices();
+				},
+				function (error) {
+					bridgeService.displayWarn("Error adding HAL devices in bulk.", error)
+				}
+			);
+		$scope.bulk = { devices: [] };
+		$scope.selectAll = false;
+	};
+
+	$scope.toggleSelection = function toggleSelection(deviceId) {
+		var idx = $scope.bulk.devices.indexOf(deviceId);
+
+		// is currently selected
+		if (idx > -1) {
+			$scope.bulk.devices.splice(idx, 1);
+			if($scope.bulk.devices.length === 0 && $scope.selectAll)
+				$scope.selectAll = false;
+		}
+
+		// is newly selected
+		else {
+			$scope.bulk.devices.push(deviceId);
+			$scope.selectAll = true;
+		}
+	};
+
+	$scope.toggleSelectAll = function toggleSelectAll() {
+		if($scope.selectAll) {
+			$scope.selectAll = false;
+			$scope.bulk = { devices: [] };
+		}
+		else {
+			$scope.selectAll = true;
+			for(var x = 0; x < bridgeService.state.haldevices.length; x++) {
+				if($scope.bulk.devices.indexOf(bridgeService.state.haldevices[x]) < 0 && !bridgeService.findDeviceByMapId(bridgeService.state.haldevices[x].haldevicename + "-" +  bridgeService.state.haldevices[x].halname, bridgeService.state.haldevices[x].halname, "halDevice"))
+					$scope.bulk.devices.push(bridgeService.state.haldevices[x].haldevicename);
+			}
+		}
+	};
+
+	$scope.toggleButtons = function () {
+		$scope.buttonsVisible = !$scope.buttonsVisible;
+		if($scope.buttonsVisible)
+			$scope.imgButtonsUrl = "glyphicon glyphicon-minus";
+		else
+			$scope.imgButtonsUrl = "glyphicon glyphicon-plus";
+	};
+
+	$scope.deleteDevice = function (device) {
+		$scope.bridge.device = device;
+		ngDialog.open({
+			template: 'deleteDialog',
+			controller: 'DeleteDialogCtrl',
+			className: 'ngdialog-theme-default'
+		});
+	};
+	
+	$scope.editDevice = function (device) {
+		bridgeService.editDevice(device);
+		$location.path('/editdevice');
+	};
+});
+
 app.controller('EditController', function ($scope, $location, $http, bridgeService) {
 	bridgeService.viewMapTypes();
 	$scope.bridge = bridgeService.state;
@@ -2566,6 +2705,20 @@ app.filter('configuredDomoticzItems', function (bridgeService) {
 	}
 });
 
+app.filter('configuredLifxItems', function (bridgeService) {
+	return function(input) {
+		var out = [];
+		if(input === undefined || input === null || input.length === undefined)
+			return out;
+		for (var i = 0; i < input.length; i++) {
+			if (bridgeService.deviceContainsType(input[i], "lifx")) {
+				out.push(input[i]);
+			}
+		}
+		return out;
+	}
+});
+
 app.controller('VersionController', function ($scope, bridgeService) {
 	$scope.bridge = bridgeService.state;
 });
\ No newline at end of file
diff --git a/src/main/resources/public/views/system.html b/src/main/resources/public/views/system.html
index 6451311..19564fb 100644
--- a/src/main/resources/public/views/system.html
+++ b/src/main/resources/public/views/system.html
@@ -375,6 +375,12 @@
 						ng-model="bridge.settings.farenheit" ng-true-value=true
 						ng-false-value=false> {{bridge.settings.farenheit}}</td>
 				</tr>
+				<tr>
+					<td>LIFX Support</td>
+					<td><input type="checkbox"
+						ng-model="bridge.settings.lifxconfigured" ng-true-value=true
+						ng-false-value=false> {{bridge.settings.lifxconfigured}}</td>
+				</tr>
 				<tr>
 					<td>Emulate Hue Hub Version</td>
 					<td><input id="bridge-settings-hubversion" class="form-control"

From c679548bbd0c9e343a454583e9c1fba7fd336ed2 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Thu, 2 Feb 2017 11:00:50 -0600
Subject: [PATCH 05/24] Beta impl of LIFX complete

---
 pom.xml                                       |   2 +-
 .../devicemanagmeent/DeviceResource.java      |   6 +
 .../HABridge/plugins/lifx/LifxDevice.java     |   2 +
 .../HABridge/plugins/lifx/LifxEntry.java      |   7 +
 src/main/resources/public/scripts/app.js      |  11 +-
 .../resources/public/views/configuration.html |   1 +
 .../public/views/domoticzdevice.html          |   5 +-
 .../resources/public/views/editdevice.html    |   3 +-
 .../resources/public/views/haldevice.html     |   5 +-
 .../public/views/harmonyactivity.html         |   1 +
 .../resources/public/views/harmonydevice.html |   1 +
 .../resources/public/views/hassdevice.html    |   5 +-
 .../resources/public/views/huedevice.html     |   5 +-
 .../resources/public/views/lifxdevice.html    | 122 ++++++++++++++++++
 src/main/resources/public/views/logs.html     |   1 +
 .../resources/public/views/mqttpublish.html   |   1 +
 .../resources/public/views/nestactions.html   |   1 +
 src/main/resources/public/views/system.html   |   1 +
 .../resources/public/views/veradevice.html    |   5 +-
 .../resources/public/views/verascene.html     |   1 +
 20 files changed, 169 insertions(+), 17 deletions(-)
 create mode 100644 src/main/resources/public/views/lifxdevice.html

diff --git a/pom.xml b/pom.xml
index 077a0c8..4e1ff3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.2a</version>
+	<version>4.1.2b</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java b/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
index e4b861b..98aaa63 100644
--- a/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
+++ b/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
@@ -219,6 +219,12 @@ public class DeviceResource {
 	      	return homeManager.findResource(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex]).getItems(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex]);
 	    }, new JsonTransformer());
 
+    	get (API_CONTEXT + "/lifx/devices", "application/json", (request, response) -> {
+	    	log.debug("Get LIFX devices");
+	      	response.status(HttpStatus.SC_OK);
+	      	return homeManager.findResource(DeviceMapTypes.LIFX_DEVICE[DeviceMapTypes.typeIndex]).getItems(DeviceMapTypes.LIFX_DEVICE[DeviceMapTypes.typeIndex]);
+	    }, new JsonTransformer());
+
     	get (API_CONTEXT + "/map/types", "application/json", (request, response) -> {
 	    	log.debug("Get map types");
 	      	return new DeviceMapTypes().getDeviceMapTypes();
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java
index 8ca81f9..ea99d9d 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxDevice.java
@@ -21,11 +21,13 @@ public class LifxDevice {
 			anEntry = new LifxEntry();
 			anEntry.setId(((LFXLight)lifxObject).getID());
 			anEntry.setName(((LFXLight)lifxObject).getLabel());
+			anEntry.setType(LIGHT_TYPE);
 		}
 		if(type.equals(GROUP_TYPE)) {
 			anEntry = new LifxEntry();
 			anEntry.setId("na");
 			anEntry.setName(((LFXGroup)lifxObject).getLabel());
+			anEntry.setType(GROUP_TYPE);
 		}
 		return anEntry;
 	}
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java
index 44574d5..831095d 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxEntry.java
@@ -3,6 +3,7 @@ package com.bwssystems.HABridge.plugins.lifx;
 public class LifxEntry {
 	private String name;
 	private String id;
+	private String type;
 	public String getName() {
 		return name;
 	}
@@ -15,4 +16,10 @@ public class LifxEntry {
 	public void setId(String id) {
 		this.id = id;
 	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
 }
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index e6ae6d4..5226dac 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -261,7 +261,7 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 	}
 
 	this.updateShowLifx = function () {
-		this.state.showDomoticz = self.state.settings.lifxconfigured;
+		this.state.showLifx = self.state.settings.lifxconfigured;
 		return;
 	}
 
@@ -277,6 +277,7 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 					self.updateShowMqtt();
 					self.updateShowHass();
 					self.updateShowDomoticz();
+					self.updateShowLifx();
 				},
 				function (error) {
 					self.displayWarn("Load Bridge Settings Error: ", error);
@@ -2332,10 +2333,10 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 	};
 
 	$scope.buildDeviceUrls = function (lifxdevice, dim_control) {
-		dimpayload = "{\"name\":\"" + lifxdevice.name + "\"}";
-		onpayload = "{\"name\":\"" + lifxdevice.name + "\"}";
-		offpayload = "{\"name\":\"" + lifxdevice.name + "\"}";
-		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, lifxdevice.name,  lifxdevice.name, lifxdevice.name, aDeviceType,  "lifxDevice", null, null);
+		dimpayload = angular.toJson(lifxdevice);
+		onpayload = angular.toJson(lifxdevice);
+		offpayload = angular.toJson(lifxdevice);
+		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, lifxdevice.name,  lifxdevice.name, lifxdevice.name, null,  "lifxDevice", null, null);
 		$scope.device = bridgeService.state.device;
 		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
diff --git a/src/main/resources/public/views/configuration.html b/src/main/resources/public/views/configuration.html
index 07a9962..e24e642 100644
--- a/src/main/resources/public/views/configuration.html
+++ b/src/main/resources/public/views/configuration.html
@@ -20,6 +20,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
diff --git a/src/main/resources/public/views/domoticzdevice.html b/src/main/resources/public/views/domoticzdevice.html
index 100c418..2359739 100644
--- a/src/main/resources/public/views/domoticzdevice.html
+++ b/src/main/resources/public/views/domoticzdevice.html
@@ -18,6 +18,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li role="presentation" class="active"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
@@ -35,7 +36,7 @@
 			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
 			setup. The 'Already Configured Domoticz Devices' list below will show what
 			is already setup for your Domoticz.</p>
-		<p>
+		<p class="text-muted">
 			Also, use this select menu for which type of dim control you would
 			like to be generated: <select name="device-dim-control"
 				id="device-dim-control" ng-model="device_dim_control">
@@ -45,7 +46,7 @@
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>
-		<p>Use the check boxes by the names to use the bulk addition
+		<p class="text-muted">Use the check boxes by the names to use the bulk addition
 			feature. Select your items and dim control type if wanted, then click
 			bulk add below. Your items will be added with on and off or dim and
 			off if selected with the name of the device from the Domoticz.</p>
diff --git a/src/main/resources/public/views/editdevice.html b/src/main/resources/public/views/editdevice.html
index 625a147..9a33a1c 100644
--- a/src/main/resources/public/views/editdevice.html
+++ b/src/main/resources/public/views/editdevice.html
@@ -20,6 +20,7 @@
 	<li ng-if="bridge.showHass" role="presentation"><a
 		href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation" class="active"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
@@ -43,7 +44,7 @@
 			(${intensity..byte},${intensity.percent},${intensity.math(X*1)}) will
 			also work. Also, you can go back to any helper tab and click a build 
 			action button to add another item for a multi-command.</p>
-		<p>When copying, update the name and select the "Add Bridge
+		<p class="text-muted">When copying, update the name and select the "Add Bridge
 			Device" Button.</p>
 
 		<form name="form">
diff --git a/src/main/resources/public/views/haldevice.html b/src/main/resources/public/views/haldevice.html
index 31813ef..a185dbe 100644
--- a/src/main/resources/public/views/haldevice.html
+++ b/src/main/resources/public/views/haldevice.html
@@ -17,6 +17,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
@@ -34,7 +35,7 @@
 			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
 			setup. The 'Already Configured HAL Devices' list below will show what
 			is already setup for your HAL.</p>
-		<p>
+		<p class="text-muted">
 			Also, use this select menu for which type of dim control you would
 			like to be generated: <select name="device-dim-control"
 				id="device-dim-control" ng-model="device_dim_control">
@@ -44,7 +45,7 @@
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>
-		<p>Use the check boxes by the names to use the bulk addition
+		<p class="text-muted">Use the check boxes by the names to use the bulk addition
 			feature. Select your items and dim control type if wanted, then click
 			bulk add below. Your items will be added with on and off or dim and
 			off if selected with the name of the device from the HAL.</p>
diff --git a/src/main/resources/public/views/harmonyactivity.html b/src/main/resources/public/views/harmonyactivity.html
index f933b0b..a82a0c7 100644
--- a/src/main/resources/public/views/harmonyactivity.html
+++ b/src/main/resources/public/views/harmonyactivity.html
@@ -18,6 +18,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
diff --git a/src/main/resources/public/views/harmonydevice.html b/src/main/resources/public/views/harmonydevice.html
index 137df4d..6b01a15 100644
--- a/src/main/resources/public/views/harmonydevice.html
+++ b/src/main/resources/public/views/harmonydevice.html
@@ -18,6 +18,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
diff --git a/src/main/resources/public/views/hassdevice.html b/src/main/resources/public/views/hassdevice.html
index 5d6284e..71d9b19 100644
--- a/src/main/resources/public/views/hassdevice.html
+++ b/src/main/resources/public/views/hassdevice.html
@@ -18,6 +18,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li role="presentation" class="active"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
@@ -35,7 +36,7 @@
 			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
 			setup. The 'Already Configured HomeAssistant Devices' list below will show what
 			is already setup for your HomeAssitant.</p>
-		<p>
+		<p class="text-muted">
 			Also, use this select menu for which type of dim control you would
 			like to be generated, BUT for Home Assistant, the selection should be Pass-thru: <select name="device-dim-control"
 				id="device-dim-control" ng-model="device_dim_control">
@@ -45,7 +46,7 @@
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>
-		<p>Use the check boxes by the names to use the bulk addition
+		<p class="text-muted">Use the check boxes by the names to use the bulk addition
 			feature. Select your items and dim control type if wanted, then click
 			bulk add below. Your items will be added with on and off or dim and
 			off if selected with the name of the device from the HomeAssitant.</p>
diff --git a/src/main/resources/public/views/huedevice.html b/src/main/resources/public/views/huedevice.html
index 36fa45d..e3ae20d 100644
--- a/src/main/resources/public/views/huedevice.html
+++ b/src/main/resources/public/views/huedevice.html
@@ -18,6 +18,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
@@ -35,9 +36,9 @@
 			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
 			setup. The 'Already Configured Hue Devices' list below will show what
 			is already setup for your Hue.</p>
-		<p>Use the check boxes by the names to use the bulk addition
+		<p class="text-muted">Use the check boxes by the names to use the bulk addition
 			feature. Select your items, then click bulk add below. Your items
-			will be added with on and off or dim and off if selected with the
+			will be added with on, off and dim with the
 			name of the device from the Hue.</p>
 	<scrollable-table watch="bridge.huedevices">
 	<table class="table table-bordered table-striped table-hover">
diff --git a/src/main/resources/public/views/lifxdevice.html b/src/main/resources/public/views/lifxdevice.html
new file mode 100644
index 0000000..3973984
--- /dev/null
+++ b/src/main/resources/public/views/lifxdevice.html
@@ -0,0 +1,122 @@
+<ul class="nav nav-pills" role="tablist">
+	<li role="presentation"><a href="#!/">Bridge Devices</a></li>
+	<li role="presentation"><a href="#!/system">Bridge Control</a></li>
+	<li role="presentation"><a href="#!/logs">Logs</a></li>
+	<li ng-if="bridge.showVera" role="presentation"><a href="#!/veradevices">Vera Devices</a></li>
+	<li ng-if="bridge.showVera" role="presentation"><a href="#!/verascenes">Vera Scenes</a></li>
+	<li ng-if="bridge.showHarmony" role="presentation"><a href="#!/harmonyactivities">Harmony Activities</a></li>
+	<li ng-if="bridge.showHarmony" role="presentation"><a href="#!/harmonydevices">Harmony Devices</a></li>
+	<li ng-if="bridge.showNest" role="presentation"><a href="#!/nest">Nest</a></li>
+	<li ng-if="bridge.showHue" role="presentation"><a href="#!/huedevices">Hue Devices</a></li>
+	<li ng-if="bridge.showHal" role="presentation"><a href="#!/haldevices">HAL Devices</a></li>
+	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
+	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
+	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li role="presentation" class="active"><a href="#!/lifxdevices">LIFX Devices</a></li>
+	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
+</ul>
+
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<h2 class="panel-title">LIFX Devices</h2>
+	</div>
+	<div class="panel-body">
+		<p class="text-muted">For any LIFX Device, use the build action buttons
+			to generate the item addition information into the ha-bridge device and this will put you into the edit screen. Then
+			you can modify the name to anything you want that will be the keyword
+			for the Echo or Google Home. Also, you can go back to any helper tab and click a build 
+			action button to add another item for a multi-command. After you are
+			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
+			setup. The 'Already Configured LIFX Devices' list below will show what
+			is already setup for your LIFX.</p>
+
+		<p class="text-muted">Use the check boxes by the names to use the bulk addition
+			feature. Select your items and dim control type if wanted, then click
+			bulk add below. Your items will be added with on, off and dim 
+			with the name of the device from the LIFX device.</p>
+	<scrollable-table watch="bridge.lifxdevices">
+	<table class="table table-bordered table-striped table-hover">
+		<thead>
+			<tr>
+				<th>Row</th>
+				<th sortable-header col="name">
+					<span><input type="checkbox" name="selectAll"
+					value="{{selectAll}}"
+					ng-checked="selectAll"
+					ng-click="toggleSelectAll()"> Name</span></th>
+				<th sortable-header col="id">ID</th>
+				<th sortable-header col="type">Type</th>
+				<th>Build Actions</th>
+			</tr>
+		</thead>
+		<tr ng-repeat="lifxdev in bridge.lifxdevices">
+			<td>{{$index+1}}</td>
+			<td><input type="checkbox" name="bulk.devices[]"
+				value="{{lifxdev.name}}"
+				ng-checked="bulk.devices.indexOf(lifxdev.name) > -1"
+				ng-click="toggleSelection(lifxdev.name)">{{lifxdev.name}}</td>
+			<td>{{lifxdev.id}}</td>
+			<td>{{lifxdev.type}}</td>
+			<td>
+				<button class="btn btn-success" type="submit"
+					ng-click="buildLifxDevice(lifxdev)">Build
+					Item</button>
+			</td>
+		</tr>
+	</table>
+	</scrollable-table>
+	<div class="panel-footer">
+		<button class="btn btn-success" type="submit"
+			ng-click="bulkAddDevices(device_dim_control)">Bulk Add
+			({{bulk.devices.length}})</button>
+	</div>
+	</div>
+</div>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<h2 class="panel-title">
+			Already Configured LIFX Devices <a ng-click="toggleButtons()"><span
+				class={{imgButtonsUrl}} aria-hidden="true"></span></a>
+		</h2>
+	</div>
+	<div ng-if="buttonsVisible" class="panel-body">
+	<scrollable-table watch="bridge.lifxdevices">
+	<table class="table table-bordered table-striped table-hover">
+		<thead>
+			<tr>
+				<th>Row</th>
+				<th sortable-header col="name">Name</th>
+				<th sortable-header col="targetDevice">Light Name</th>
+				<th>Map Id</th>
+				<th>Actions</th>
+			</tr>
+		</thead>
+		<tr
+			ng-repeat="device in bridge.devices | configuredLifxMsgs | orderBy:predicate:reverse">
+			<td>{{$index+1}}</td>
+			<td>{{device.name}}</td>
+			<td>{{device.targetDevice}}</td>
+			<td>{{device.mapId}}</td>
+			<td>
+				<p>
+					<button class="btn btn-warning" type="submit"
+						ng-click="editDevice(device)">Edit</button>
+					<button class="btn btn-danger" type="submit"
+						ng-click="deleteDevice(device)">Delete</button>
+				</p>
+			</td>
+		</tr>
+	</table>
+	</scrollable-table>
+	</div>
+</div>
+<script type="text/ng-template" id="deleteMapandIdDialog">
+		<div class="ngdialog-message">
+			<h2>Device Map and Id?</h2>
+				<p>{{mapandid.mapType}} with  {{mapandid.id}}</p>
+				<p>Are you Sure?</p>
+		</div>
+		<div class="ngdialog-buttons mt">
+			<button type="button" class="ngdialog-button ngdialog-button-error" ng-click="deleteMapandId(mapandid)">Delete</button>
+		</div>
+	</script>
\ No newline at end of file
diff --git a/src/main/resources/public/views/logs.html b/src/main/resources/public/views/logs.html
index 3645df5..a1939e9 100644
--- a/src/main/resources/public/views/logs.html
+++ b/src/main/resources/public/views/logs.html
@@ -18,6 +18,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
diff --git a/src/main/resources/public/views/mqttpublish.html b/src/main/resources/public/views/mqttpublish.html
index 05f977b..6fd06db 100644
--- a/src/main/resources/public/views/mqttpublish.html
+++ b/src/main/resources/public/views/mqttpublish.html
@@ -12,6 +12,7 @@
 	<li role="presentation" class="active"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
diff --git a/src/main/resources/public/views/nestactions.html b/src/main/resources/public/views/nestactions.html
index 574b84b..59cdfbe 100644
--- a/src/main/resources/public/views/nestactions.html
+++ b/src/main/resources/public/views/nestactions.html
@@ -18,6 +18,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
diff --git a/src/main/resources/public/views/system.html b/src/main/resources/public/views/system.html
index 19564fb..62e3bd8 100644
--- a/src/main/resources/public/views/system.html
+++ b/src/main/resources/public/views/system.html
@@ -19,6 +19,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
diff --git a/src/main/resources/public/views/veradevice.html b/src/main/resources/public/views/veradevice.html
index f1eeaec..cba365c 100644
--- a/src/main/resources/public/views/veradevice.html
+++ b/src/main/resources/public/views/veradevice.html
@@ -17,6 +17,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 
@@ -35,7 +36,7 @@
 			 done in the edit tab, click the 'Add Bridge Device' to finish that selection
 			setup. The 'Already Configured Vera Devices' list below will show
 			what is already setup for your Vera.</p>
-		<p>
+		<p class="text-muted">
 			Also, use this select menu for which type of dim control you would
 			like to be generated: <select name="device-dim-control"
 				id="device-dim-control" ng-model="device_dim_control">
@@ -45,7 +46,7 @@
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>
-		<p>Use the check boxes by the names to use the bulk addition
+		<p class="text-muted">Use the check boxes by the names to use the bulk addition
 			feature. Select your items and dim control type if wanted, then click
 			bulk add below. Your items will be added with on and off or dim and
 			off if selected with the name of the device from the Vera.</p>
diff --git a/src/main/resources/public/views/verascene.html b/src/main/resources/public/views/verascene.html
index 9e9f30c..70d8aba 100644
--- a/src/main/resources/public/views/verascene.html
+++ b/src/main/resources/public/views/verascene.html
@@ -17,6 +17,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#!/hassdevices">HomeAssistant Devices</a></li>
 	<li ng-if="bridge.showDomoticz" role="presentation"><a href="#!/domoticzdevices">Domoticz Devices</a></li>
+	<li ng-if="bridge.showLifx" role="presentation"><a href="#!/lifxdevices">LIFX Devices</a></li>
 	<li role="presentation"><a href="#!/editdevice">Add/Edit</a></li>
 </ul>
 

From 0ac8061118c04c6ccce8a29299239cb6fd505dea Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Fri, 3 Feb 2017 09:29:49 -0600
Subject: [PATCH 06/24] Updated LIFX impl

---
 pom.xml                                         | 2 +-
 src/main/resources/public/scripts/app.js        | 4 ++--
 src/main/resources/public/views/lifxdevice.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e1ff3f..e45878c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.2b</version>
+	<version>4.1.2c</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index 5226dac..a6cf1b2 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -47,7 +47,7 @@ app.config (function ($locationProvider, $routeProvider) {
 		controller: 'DomoticzController'		
 	}).when ('/lifxdevices', {
 		templateUrl: 'views/lifxdevice.html',
-		controller: 'DomoticzController'		
+		controller: 'LifxController'		
 	}).otherwise ({
 		templateUrl: 'views/configuration.html',
 		controller: 'ViewingController'
@@ -2336,7 +2336,7 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 		dimpayload = angular.toJson(lifxdevice);
 		onpayload = angular.toJson(lifxdevice);
 		offpayload = angular.toJson(lifxdevice);
-		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, lifxdevice.name,  lifxdevice.name, lifxdevice.name, null,  "lifxDevice", null, null);
+		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, lifxdevice.name,  lifxdevice.name, lifxdevice.name, null,  "lifxDevice", null, null);
 		$scope.device = bridgeService.state.device;
 		bridgeService.editNewDevice($scope.device);
 		$location.path('/editdevice');
diff --git a/src/main/resources/public/views/lifxdevice.html b/src/main/resources/public/views/lifxdevice.html
index 3973984..9383e3a 100644
--- a/src/main/resources/public/views/lifxdevice.html
+++ b/src/main/resources/public/views/lifxdevice.html
@@ -59,7 +59,7 @@
 			<td>{{lifxdev.type}}</td>
 			<td>
 				<button class="btn btn-success" type="submit"
-					ng-click="buildLifxDevice(lifxdev)">Build
+					ng-click="buildDeviceUrls(lifxdev)">Build
 					Item</button>
 			</td>
 		</tr>

From dd0032a5677704503471a72767c0fb49d786c999 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Tue, 7 Feb 2017 15:50:21 -0600
Subject: [PATCH 07/24] updatre lifx

---
 pom.xml                                       |  4 +-
 .../HABridge/plugins/lifx/LifxHome.java       | 65 ++++++++++++++++---
 src/main/resources/public/scripts/app.js      |  2 +-
 .../resources/public/views/lifxdevice.html    |  2 +-
 4 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index e45878c..d016a14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.2c</version>
+	<version>4.1.2e</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -124,7 +124,7 @@
 		<dependency>
 		  <groupId>com.github.bwssytems</groupId>
 		  <artifactId>lifx-sdk-java</artifactId>
-		  <version>2.1.1</version>
+		  <version>2.1.5</version>
 		</dependency>
 	</dependencies>
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
index 1a03b88..924f8de 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
@@ -19,15 +19,17 @@ import com.bwssystems.HABridge.hue.MultiCommandUtil;
 import com.github.besherman.lifx.LFXClient;
 import com.github.besherman.lifx.LFXGroup;
 import com.github.besherman.lifx.LFXGroupCollection;
+import com.github.besherman.lifx.LFXGroupCollectionListener;
 import com.github.besherman.lifx.LFXLight;
 import com.github.besherman.lifx.LFXLightCollection;
+import com.github.besherman.lifx.LFXLightCollectionListener;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 public class LifxHome implements Home {
     private static final Logger log = LoggerFactory.getLogger(LifxHome.class);
 	private Map<String, LifxDevice> lifxMap;
-	private LFXClient client = new LFXClient();        
+	private LFXClient client;        
 	private Boolean validLifx;
 	private Gson aGsonHandler;
 	
@@ -45,20 +47,23 @@ public class LifxHome implements Home {
 		if(validLifx) {
 	    	try {
 	    		log.info("Open Lifx client....");
-				client.open(true);
+	    		lifxMap = new HashMap<String, LifxDevice>();
+	    		client = new LFXClient();
+	    		client.getLights().addLightCollectionListener(new MyLightListener(lifxMap));
+	    		client.getGroups().addGroupCollectionListener(new MyGroupListener(lifxMap));
+				client.open(false);
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				log.warn("Could not open LIFX, with IO Exception", e);
+				client = null;
+				return this;
 			} catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				log.warn("Could not open LIFX, with Interruprted Exception", e);
+				client = null;
+				return this;
 			}
 			aGsonHandler =
 					new GsonBuilder()
 					.create();
-			lifxMap = new HashMap<String, LifxDevice>();
-			this.addLifxLights(client.getLights());
-			this.addLifxGroups(client.getGroups());
         }
 		return this;
 	}
@@ -174,4 +179,46 @@ public class LifxHome implements Home {
 			return;
 		client.close();
 	}
+    private static class MyLightListener implements LFXLightCollectionListener {
+        private static final Logger log = LoggerFactory.getLogger(MyLightListener.class);
+        private Map<String, LifxDevice> aLifxMap;
+    	public MyLightListener(Map<String, LifxDevice> theMap) {
+    		aLifxMap = theMap;
+    	}
+        @Override
+        public void lightAdded(LFXLight light) {
+            log.debug("Light added, label: " + light.getLabel() + " and id: " + light.getID());
+			LifxDevice aNewLifxDevice = new LifxDevice(light, LifxDevice.LIGHT_TYPE);
+			aLifxMap.put(aNewLifxDevice.toEntry().getName(), aNewLifxDevice);
+        }
+
+        @Override
+        public void lightRemoved(LFXLight light) {
+        	log.debug("Light removed, label: " + light.getLabel() + " and id: " + light.getID());
+            aLifxMap.remove(light.getLabel());
+        }
+
+        
+    }
+    private static class MyGroupListener implements LFXGroupCollectionListener {
+        private static final Logger log = LoggerFactory.getLogger(MyLightListener.class);
+        private Map<String, LifxDevice> aLifxMap;
+    	public MyGroupListener(Map<String, LifxDevice> theMap) {
+    		aLifxMap = theMap;
+    	}
+
+        @Override
+        public void groupAdded(LFXGroup group) {
+        	log.debug("Group: " + group.getLabel() + " added: " + group.size());
+			LifxDevice aNewLifxDevice = new LifxDevice(group, LifxDevice.GROUP_TYPE);
+			aLifxMap.put(aNewLifxDevice.toEntry().getName(), aNewLifxDevice);
+        }
+
+        @Override
+        public void groupRemoved(LFXGroup group) {
+        	log.debug("Group: " + group.getLabel() + " removed");
+            aLifxMap.remove(group.getLabel());
+        }
+        
+    }
 }
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index a6cf1b2..9e0cbf6 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -2374,7 +2374,7 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 					bridgeService.viewHalDevices();
 				},
 				function (error) {
-					bridgeService.displayWarn("Error adding HAL devices in bulk.", error)
+					bridgeService.displayWarn("Error adding LIFX devices in bulk.", error)
 				}
 			);
 		$scope.bulk = { devices: [] };
diff --git a/src/main/resources/public/views/lifxdevice.html b/src/main/resources/public/views/lifxdevice.html
index 9383e3a..6278cea 100644
--- a/src/main/resources/public/views/lifxdevice.html
+++ b/src/main/resources/public/views/lifxdevice.html
@@ -92,7 +92,7 @@
 			</tr>
 		</thead>
 		<tr
-			ng-repeat="device in bridge.devices | configuredLifxMsgs | orderBy:predicate:reverse">
+			ng-repeat="device in bridge.devices | configuredLifxItems | orderBy:predicate:reverse">
 			<td>{{$index+1}}</td>
 			<td>{{device.name}}</td>
 			<td>{{device.targetDevice}}</td>

From 3fea7f4f1aad58ccd3580b4d4ddbc1a6a19d56ad Mon Sep 17 00:00:00 2001
From: Niklas <n.neesen@me.com>
Date: Wed, 8 Feb 2017 08:29:37 +0100
Subject: [PATCH 08/24] Change to Generic HTTPClient

---
 .../bwssystems/HABridge/plugins/harmony/HarmonyServer.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyServer.java b/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyServer.java
index b9cb404..521f7ed 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyServer.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyServer.java
@@ -4,7 +4,7 @@ import static java.lang.String.format;
 
 import javax.inject.Inject;
 
-import com.bwssystems.HABridge.HttpRequestHelper;
+import com.bwssystems.HABridge.plugins.http.HTTPHandler;
 import org.apache.http.client.methods.HttpGet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +35,7 @@ public class HarmonyServer {
     private OAReplyProvider dummyProvider;
     private NamedIP myNameAndIP;
     private Boolean isDevMode;
+    private HTTPHandler httpClient;
     private Logger log = LoggerFactory.getLogger(HarmonyServer.class);
 
     public HarmonyServer(NamedIP theHarmonyAddress) {
@@ -43,6 +44,7 @@ public class HarmonyServer {
         dummyProvider = null;
         myNameAndIP = theHarmonyAddress;
         isDevMode = false;
+        httpClient = new HTTPHandler();
     }
 
     public static HarmonyServer setup(
@@ -96,7 +98,7 @@ public class HarmonyServer {
                             log.info(format("calling webhook: %s", webhook));
 
                             // Calling webhook
-                            HttpRequestHelper.INSTANCE.doHttpRequest(webhook, HttpGet.METHOD_NAME, null, null, null);
+                            httpClient.doHttpRequest(webhook, HttpGet.METHOD_NAME, null, null, null);
                         } catch (Exception e) {
                             log.warn("could not call webhook: " + webhook, e);
                         }

From 0305646b4fd4e32e41fa9b356e0e4875de89bb40 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Wed, 8 Feb 2017 15:15:53 -0600
Subject: [PATCH 09/24] Updated LIFX connection for broadcast address and
 changed the item collection to be asynchronous with LIFX.

---
 .../HABridge/plugins/lifx/LifxHome.java       | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
index 924f8de..d83d3ee 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
@@ -1,6 +1,10 @@
 package com.bwssystems.HABridge.plugins.lifx;
 
 import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -28,6 +32,7 @@ import com.google.gson.GsonBuilder;
 
 public class LifxHome implements Home {
     private static final Logger log = LoggerFactory.getLogger(LifxHome.class);
+    private static final float DIM_DIVISOR = (float)254.00;
 	private Map<String, LifxDevice> lifxMap;
 	private LFXClient client;        
 	private Boolean validLifx;
@@ -47,8 +52,21 @@ public class LifxHome implements Home {
 		if(validLifx) {
 	    	try {
 	    		log.info("Open Lifx client....");
+	    		InetAddress configuredAddress = InetAddress.getByName(bridgeSettings.getUpnpConfigAddress());
+	    		NetworkInterface networkInterface = NetworkInterface.getByInetAddress(configuredAddress);
+	    		InetAddress bcastInetAddr = null;
+	            if (networkInterface != null) {
+	                for (InterfaceAddress ifaceAddr : networkInterface.getInterfaceAddresses()) {
+	                    InetAddress addr = ifaceAddr.getAddress();
+	                    if (addr instanceof Inet4Address) {
+	                    	bcastInetAddr = ifaceAddr.getBroadcast();
+	                    	break;
+	                    }
+	                }
+	            }
 	    		lifxMap = new HashMap<String, LifxDevice>();
-	    		client = new LFXClient();
+	    		log.info("Opening LFX Client with broadcast address: " + bcastInetAddr.getHostAddress());
+	    		client = new LFXClient(bcastInetAddr.getHostAddress());
 	    		client.getLights().addLightCollectionListener(new MyLightListener(lifxMap));
 	    		client.getGroups().addGroupCollectionListener(new MyGroupListener(lifxMap));
 				client.open(false);
@@ -131,6 +149,8 @@ public class LifxHome implements Home {
 	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity,
 			Integer targetBri, Integer targetBriInc, DeviceDescriptor device, String body) {
 		String theReturn = null;
+		float aBriValue;
+		float theValue;
 		log.debug("executing HUE api request to send message to LifxDevice: " + anItem.getItem().toString());
 		if(!validLifx) {
 			log.warn("Should not get here, no LifxDevice clients configured");
@@ -144,7 +164,6 @@ public class LifxHome implements Home {
 				lifxCommand = aGsonHandler.fromJson(anItem.getItem(), LifxEntry.class);
 			else
 				lifxCommand = aGsonHandler.fromJson(anItem.getItem().getAsString(), LifxEntry.class);
-			int aBriValue = BrightnessDecode.calculateIntensity(intensity, targetBri, targetBriInc);
 			LifxDevice theDevice = getLifxDevice(lifxCommand.getName());
 			if (theDevice == null) {
 				log.warn("Should not get here, no LifxDevices available");
@@ -159,8 +178,13 @@ public class LifxHome implements Home {
 							theLight.setPower(true);
 						if(body.contains("false"))
 							theLight.setPower(false);
-						if(targetBri != null || targetBriInc != null)
-							theLight.setBrightness((float)(aBriValue/254));
+						if(targetBri != null || targetBriInc != null) {
+							aBriValue = (float)BrightnessDecode.calculateIntensity(intensity, targetBri, targetBriInc);
+							theValue = aBriValue/DIM_DIVISOR;
+							if(theValue > (float)1.0)
+								theValue = (float)0.99;
+							theLight.setBrightness(theValue);
+						}
 					} else if (theDevice.getType().equals(LifxDevice.GROUP_TYPE)) {
 						LFXGroup theGroup = (LFXGroup)theDevice.getLifxObject();
 						if(body.contains("true"))

From 6116d3767558d020aad4f922d1dc87f70d416ba1 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Thu, 9 Feb 2017 08:41:40 -0600
Subject: [PATCH 10/24] update version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d016a14..039648d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.2e</version>
+	<version>4.1.2f</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -124,7 +124,7 @@
 		<dependency>
 		  <groupId>com.github.bwssytems</groupId>
 		  <artifactId>lifx-sdk-java</artifactId>
-		  <version>2.1.5</version>
+		  <version>2.1.6</version>
 		</dependency>
 	</dependencies>
 

From 61156e98209bea8ae81a8f4fc960151b48712526 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Thu, 16 Feb 2017 13:36:23 -0600
Subject: [PATCH 11/24] Updated edit screen field layout with bootstrap grid.
 Added error checking for HTTP handler.

---
 pom.xml                                       |  2 +-
 .../HABridge/plugins/http/HTTPHandler.java    | 12 ++++++--
 .../resources/public/views/editdevice.html    | 28 +++++++++++++++----
 .../resources/public/views/hassdevice.html    |  2 +-
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 039648d..9ee9ce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.2f</version>
+	<version>4.1.2g</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
index 6cab6e0..245b729 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
@@ -125,8 +125,16 @@ public class HTTPHandler {
 										+ e.getMessage(), e);
 					}
 				}
-				if (theContent == null)
-					theContent = "";
+			} else {
+				log.warn("HTTP response code was not an expected successful response of between 200 - 299, the code was: " + response.getStatusLine());
+				try {
+					EntityUtils.consume(response.getEntity()); // close out
+					// inputstream
+					// ignore
+					// content
+				} catch (Exception e) {
+					//noop
+				}
 			}
 		} catch (IOException e) {
 			log.warn("Error calling out to HA gateway: IOException in log", e);
diff --git a/src/main/resources/public/views/editdevice.html b/src/main/resources/public/views/editdevice.html
index 9a33a1c..f380fdd 100644
--- a/src/main/resources/public/views/editdevice.html
+++ b/src/main/resources/public/views/editdevice.html
@@ -130,6 +130,7 @@
 						<table class="table table-bordered table-striped table-hover">
 							<thead>
 								<tr>
+							<div class="col-xs-12 col-md-4">
 									<th>Type</th>
 									<th>Target Item</th>
 									<th>Delay</th>
@@ -140,19 +141,21 @@
 									<th>Http Headers</th>
 									<th>Content Type</th>
 									<th>Manage</th>
+							</div>
 								</tr>
 							</thead>
 							<tr ng-repeat="onItem in onDevices">
+							<div class="col-xs-12 col-md-4">
 								<td><select
 									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
 									ng-model="onItem.type"></select></td>
-								<td><textarea rows="1" cols="20" class="form-control"
+								<td><textarea rows="1" class="form-control"
 										id="item-target" ng-model="onItem.item" placeholder="The Call"></textarea></td>
-								<td><textarea rows="1" cols="4" class="form-control"
+								<td><textarea rows="1" class="form-control"
 										id="item-delay" ng-model="onItem.delay" placeholder="millis"></textarea></td>
-								<td><textarea rows="1" cols="2" class="form-control"
+								<td><textarea rows="1" class="form-control"
 										id="item-count" ng-model="onItem.count" placeholder="number"></textarea></td>
-								<td><textarea rows="1" cols="16" class="form-control"
+								<td><textarea rows="1" class="form-control"
 										id="item-filterIPs" ng-model="onItem.filterIPs"
 										placeholder="restrict IPs"></textarea></td>
 								<td><select name="item-http-verb" id="item-http-verb"
@@ -163,7 +166,7 @@
 										<option value="PUT">PUT</option>
 										<option value="POST">POST</option>
 								</select></td>
-								<td><textarea rows="1" cols="16" class="form-control"
+								<td><textarea rows="1" class="form-control"
 										id="item-httpBody" ng-model="onItem.httpBody"
 										placeholder="body args"></textarea></td>
 								<td><textarea rows="1" cols="16" class="form-control"
@@ -189,8 +192,10 @@
 								</select></td>
 								<td><button class="btn btn-danger" type="submit"
 										ng-click="removeItemOn(onItem)">Del</button></td>
+							</div>
 							</tr>
 							<tr>
+							<div class="col-xs-12 col-md-4">
 								<td><select
 									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
 									ng-model="newOnItem.type"></select></td>
@@ -240,6 +245,7 @@
 								</select></td>
 								<td><button class="btn btn-success" type="submit"
 										ng-click="addItemOn(newOnItem)">Add</button></td>
+							</div>
 							</tr>
 						</table>
 						</scrollable-table></td>
@@ -251,6 +257,7 @@
 						<table class="table table-bordered table-striped table-hover">
 							<thead>
 								<tr>
+							<div class="col-xs-12 col-md-4">
 									<th>Type</th>
 									<th>Target Item</th>
 									<th>Delay</th>
@@ -261,9 +268,11 @@
 									<th>Http Headers</th>
 									<th>Content Type</th>
 									<th>Manage</th>
+							</div>
 								</tr>
 							</thead>
 							<tr ng-repeat="dimItem in dimDevices">
+							<div class="col-xs-12 col-md-4">
 								<td><select
 									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
 									ng-model="dimItem.type"></select></td>
@@ -311,8 +320,10 @@
 								</select></td>
 								<td><button class="btn btn-danger" type="submit"
 										ng-click="removeItemDim(dimItem)">Del</button></td>
+							</div>
 							</tr>
 							<tr>
+							<div class="col-xs-12 col-md-4">
 								<td><select
 									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
 									ng-model="newDimItem.type"></select></td>
@@ -362,6 +373,7 @@
 								</select></td>
 								<td><button class="btn btn-success" type="submit"
 										ng-click="addItemDim(newDimItem)">Add</button></td>
+							</div>
 							</tr>
 						</table>
 						</scrollable-table></td>
@@ -373,6 +385,7 @@
 						<table class="table table-bordered table-striped table-hover">
 							<thead>
 								<tr>
+							<div class="col-xs-12 col-md-4">
 									<th>Type</th>
 									<th>Target Item</th>
 									<th>Delay</th>
@@ -383,9 +396,11 @@
 									<th>Http Headers</th>
 									<th>Content Type</th>
 									<th>Manage</th>
+							</div>
 								</tr>
 							</thead>
 							<tr ng-repeat="offItem in offDevices">
+							<div class="col-xs-12 col-md-4">
 								<td><select
 									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
 									ng-model="offItem.type"></select></td>
@@ -433,8 +448,10 @@
 								</select></td>
 								<td><button class="btn btn-danger" type="submit"
 										ng-click="removeItemOff(offItem)">Del</button></td>
+							</div>
 							</tr>
 							<tr>
+							<div class="col-xs-12 col-md-4">
 								<td><select
 									ng-options="mapType as mapType[1] for mapType in bridge.mapTypes track by mapType[0]"
 									ng-model="newOffItem.type"></select></td>
@@ -484,6 +501,7 @@
 								</select></td>
 								<td><button class="btn btn-success" type="submit"
 										ng-click="addItemOff(newOffItem)">Add</button></td>
+							</div>
 							</tr>
 						</table>
 						</scrollable-table></td>
diff --git a/src/main/resources/public/views/hassdevice.html b/src/main/resources/public/views/hassdevice.html
index 71d9b19..1b5e3bf 100644
--- a/src/main/resources/public/views/hassdevice.html
+++ b/src/main/resources/public/views/hassdevice.html
@@ -13,7 +13,7 @@
 	<li ng-if="bridge.showNest" role="presentation"><a href="#!/nest">Nest</a></li>
 	<li ng-if="bridge.showHue" role="presentation"><a
 		href="#!/huedevices">Hue Devices</a></li>
-	<li ng-if="bridge.showHal" role="presentation" class="active"><a href="#!/haldevices">HAL
+	<li ng-if="bridge.showHal" role="presentation"><a href="#!/haldevices">HAL
 			Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#!/mqttmessages">MQTT Messages</a></li>
 	<li role="presentation" class="active"><a href="#!/hassdevices">HomeAssistant Devices</a></li>

From 6e7b48aa5b9e211f1a50e9fff6ab08c085b21859 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Thu, 16 Feb 2017 15:22:54 -0600
Subject: [PATCH 12/24] updated version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 95c0edc..0294547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.4</version>
+	<version>4.1.4a</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

From adc34ddaa66034b66d96e3a6adc4033478bc0fc5 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Wed, 22 Feb 2017 16:28:31 -0600
Subject: [PATCH 13/24] Fix issue with LIFx bcast being null. Continue fixing
 bulk add.

---
 pom.xml                                       |   2 +-
 .../HABridge/plugins/lifx/LifxHome.java       |  27 ++--
 src/main/resources/public/scripts/app.js      | 115 ++++--------------
 .../resources/public/views/hassdevice.html    |  22 +---
 4 files changed, 47 insertions(+), 119 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0294547..f0e5330 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.4a</version>
+	<version>4.1.4b</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
index d83d3ee..51a002e 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/lifx/LifxHome.java
@@ -64,24 +64,33 @@ public class LifxHome implements Home {
 	                    }
 	                }
 	            }
-	    		lifxMap = new HashMap<String, LifxDevice>();
-	    		log.info("Opening LFX Client with broadcast address: " + bcastInetAddr.getHostAddress());
-	    		client = new LFXClient(bcastInetAddr.getHostAddress());
-	    		client.getLights().addLightCollectionListener(new MyLightListener(lifxMap));
-	    		client.getGroups().addGroupCollectionListener(new MyGroupListener(lifxMap));
-				client.open(false);
+	            if(bcastInetAddr != null) {
+		    		lifxMap = new HashMap<String, LifxDevice>();
+		    		log.info("Opening LFX Client with broadcast address: " + bcastInetAddr.getHostAddress());
+		    		client = new LFXClient(bcastInetAddr.getHostAddress());
+		    		client.getLights().addLightCollectionListener(new MyLightListener(lifxMap));
+		    		client.getGroups().addGroupCollectionListener(new MyGroupListener(lifxMap));
+					client.open(false);
+					aGsonHandler =
+							new GsonBuilder()
+							.create();
+	            } else {
+					log.warn("Could not open LIFX, no bcast addr available, check your upnp config address.");
+					client = null;
+					validLifx = false;
+					return this;
+	            }
 			} catch (IOException e) {
 				log.warn("Could not open LIFX, with IO Exception", e);
 				client = null;
+				validLifx = false;
 				return this;
 			} catch (InterruptedException e) {
 				log.warn("Could not open LIFX, with Interruprted Exception", e);
 				client = null;
+				validLifx = false;
 				return this;
 			}
-			aGsonHandler =
-					new GsonBuilder()
-					.create();
         }
 		return this;
 	}
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index a13642a..e8ea1f0 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -1986,7 +1986,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 		$scope.device = bridgeService.state.device;
 	};
 
-	$scope.buildDeviceUrls = function (hassdevice, dim_control) {
+	$scope.buildDeviceUrls = function (hassdevice, dim_control, buildonly) {
 		onpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
 		if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0))
 			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\",\"bri\":\"" + dim_control + "\"}";
@@ -1996,89 +1996,19 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
-	};
-
-	$scope.buildHassHeatUrls = function (hassdevice) {
-		onpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0))
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\",\"bri\":\"" + dim_control + "\"}";
-		else
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		offpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"off\"}";
-
-		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
-		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
-	};
-
-	$scope.buildHassCoolUrls = function (hassdevice) {
-		onpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0))
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\",\"bri\":\"" + dim_control + "\"}";
-		else
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		offpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"off\"}";
-
-		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
-		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
-	};
-
-	$scope.buildHassAutoUrls = function (hassdevice) {
-		onpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0))
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\",\"bri\":\"" + dim_control + "\"}";
-		else
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		offpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"off\"}";
-
-		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
-		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
-	};
-
-	$scope.buildHassOffUrls = function (hassdevice) {
-		onpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0))
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\",\"bri\":\"" + dim_control + "\"}";
-		else
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		offpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"off\"}";
-
-		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
-		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
-	};
-
-	$scope.buildHassFanUrls = function (hassdevice) {
-		onpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		if((dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0))
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\",\"bri\":\"" + dim_control + "\"}";
-		else
-			dimpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"on\"}";
-		offpayload = "{\"entityId\":\"" + hassdevice.deviceState.entity_id + "\",\"hassName\":\"" + hassdevice.hassname + "\",\"state\":\"off\"}";
-
-		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, hassdevice.hassname + "-" + hassdevice.deviceState.entity_id, hassdevice.deviceState.entity_id, hassdevice.hassname, hassdevice.domain,  "hassDevice", null, null);
-		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
 	$scope.bulkAddDevices = function(dim_control) {
 		var devicesList = [];
+		$scope.clearDevice();
 		for(var i = 0; i < $scope.bulk.devices.length; i++) {
 			for(var x = 0; x < bridgeService.state.hassdevices.length; x++) {
-				if(bridgeService.state.hassdevices[x].deviceName === $scope.bulk.devices[i]) {
-					if(bridgeService.state.hassdevices[x].domain === "climate")
-						$scope.buildHassAutoUrls(bridgeService.state.hassdevices[x]);
-					else
-						$scope.buildDeviceUrls(bridgeService.state.hassdevices[x],dim_control);
+				if(bridgeService.state.hassdevices[x].deviceState.entity_id === $scope.bulk.devices[i] && bridgeService.state.hassdevices[x].domain !== "sensor" && bridgeService.state.hassdevices[x].domain !== "sun") {
+					$scope.buildDeviceUrls(bridgeService.state.hassdevices[x],dim_control,true);
 					devicesList[i] = {
 							name: $scope.device.name,
 							mapId: $scope.device.mapId,
@@ -2095,6 +2025,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 							contentBodyDim: $scope.device.contentBodyDim,
 							contentBodyOff: $scope.device.contentBodyOff
 					};
+					$scope.clearDevice();
 				}
 			}
 		}
@@ -2102,7 +2033,7 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 				function () {
 					$scope.clearDevice();
 					bridgeService.viewDevices();
-					bridgeService.viewhassdevices();
+					bridgeService.viewHassDevices();
 				},
 				function (error) {
 					bridgeService.displayWarn("Error adding Hass devices in bulk.", error)
@@ -2137,8 +2068,8 @@ app.controller('HassController', function ($scope, $location, $http, bridgeServi
 		else {
 			$scope.selectAll = true;
 			for(var x = 0; x < bridgeService.state.hassdevices.length; x++) {
-				if($scope.bulk.devices.indexOf(bridgeService.state.hassdevices[x]) < 0 && !bridgeService.findDeviceByMapId(bridgeService.state.hassdevices[x].hassdevicename + "-" +  bridgeService.state.hassdevices[x].halname, bridgeService.state.hassdevices[x].halname, "hassdevice"))
-					$scope.bulk.devices.push(bridgeService.state.hassdevices[x].hassdevicename);
+				if($scope.bulk.devices.indexOf(bridgeService.state.hassdevices[x].deviceState.entity_id) < 0 && bridgeService.state.hassdevices[x].domain !== "sensor" && bridgeService.state.hassdevices[x].domain !== "sun")
+					$scope.bulk.devices.push(bridgeService.state.hassdevices[x].deviceState.entity_id);
 			}
 		}
 	};
@@ -2181,7 +2112,7 @@ app.controller('DomoticzController', function ($scope, $location, $http, bridgeS
 		$scope.device = bridgeService.state.device;
 	};
 
-	$scope.buildDeviceUrls = function (domoticzdevice, dim_control) {
+	$scope.buildDeviceUrls = function (domoticzdevice, dim_control, buildonly) {
 		var preCmd = "";
 		var postOnCmd = "";
 		var postDimCmd = "";
@@ -2220,16 +2151,19 @@ app.controller('DomoticzController', function ($scope, $location, $http, bridgeS
 		+ postOffCmd;
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, domoticzdevice.devicename + "-" + domoticzdevice.domoticzname,  domoticzdevice.devicename, domoticzdevice.domoticzname, aDeviceType,  "domoticzDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
 	$scope.bulkAddDevices = function(dim_control) {
 		var devicesList = [];
+		$scope.clearDevice();
 		for(var i = 0; i < $scope.bulk.devices.length; i++) {
 			for(var x = 0; x < bridgeService.state.domoticzdevices.length; x++) {
 				if(bridgeService.state.domoticzdevices[x].devicename === $scope.bulk.devices[i]) {
-					$scope.buildDeviceUrls(bridgeService.state.domoticzdevices[x],dim_control);
+					$scope.buildDeviceUrls(bridgeService.state.domoticzdevices[x],dim_control,true);
 					devicesList[i] = {
 							name: $scope.device.name,
 							mapId: $scope.device.mapId,
@@ -2246,6 +2180,7 @@ app.controller('DomoticzController', function ($scope, $location, $http, bridgeS
 							contentBodyDim: $scope.device.contentBodyDim,
 							contentBodyOff: $scope.device.contentBodyOff
 					};
+					$scope.clearDevice();
 				}
 			}
 		}
@@ -2332,14 +2267,16 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 		$scope.device = bridgeService.state.device;
 	};
 
-	$scope.buildDeviceUrls = function (lifxdevice, dim_control) {
+	$scope.buildDeviceUrls = function (lifxdevice, dim_control, buildonly) {
 		dimpayload = angular.toJson(lifxdevice);
 		onpayload = angular.toJson(lifxdevice);
 		offpayload = angular.toJson(lifxdevice);
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, true, lifxdevice.name,  lifxdevice.name, lifxdevice.name, null,  "lifxDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
 	$scope.bulkAddDevices = function(dim_control) {
@@ -2347,7 +2284,7 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 		for(var i = 0; i < $scope.bulk.devices.length; i++) {
 			for(var x = 0; x < bridgeService.state.lifxdevices.length; x++) {
 				if(bridgeService.state.lifxdevices[x].devicename === $scope.bulk.devices[i]) {
-					$scope.buildDeviceUrls(bridgeService.state.lifxdevices[x],dim_control);
+					$scope.buildDeviceUrls(bridgeService.state.lifxdevices[x],dim_control,true);
 					devicesList[i] = {
 							name: $scope.device.name,
 							mapId: $scope.device.mapId,
diff --git a/src/main/resources/public/views/hassdevice.html b/src/main/resources/public/views/hassdevice.html
index 1b5e3bf..bf241ea 100644
--- a/src/main/resources/public/views/hassdevice.html
+++ b/src/main/resources/public/views/hassdevice.html
@@ -73,26 +73,8 @@
 				{{hassdevice.deviceState.entity_id}}</td>
 			<td>{{hassdevice.hassname}}</td>
 			<td>
-				<button ng-if="hassdevice.domain != 'climate' && hassdevice.domain != 'sensor' && hassdevice.domain != 'sun'" class="btn btn-success" type="submit"
-					ng-click="buildDeviceUrls(hassdevice, device_dim_control)">Build Item</button>
-				<ul ng-if="hassdevice.domain == 'climate'" class="list-group">
-					<li class="list-group-item">
-						<p>
-							<button class="btn btn-success" type="submit"
-								ng-click="buildhassHeatUrls(hassdevice)">Heat</button>
-							<button class="btn btn-success" type="submit"
-								ng-click="buildhassCoolUrls(hassdevice)">Cool</button>
-							<button class="btn btn-success" type="submit"
-								ng-click="buildhassAutoUrls(hassdevice)">Auto</button>
-						</p>
-						<p>
-							<button class="btn btn-success" type="submit"
-								ng-click="buildhassOffUrls(hassdevice)">Off</button>
-							<button class="btn btn-success" type="submit"
-								ng-click="buildhassFanUrls(hassdevice)">Fan</button>
-						</p>
-					</li>
-				</ul>
+				<button ng-if="hassdevice.domain != 'sensor' && hassdevice.domain != 'sun'" class="btn btn-success" type="submit"
+					ng-click="buildDeviceUrls(hassdevice, device_dim_control, false)">Build Item</button>
 			</td>
 		</tr>
 	</table>

From c45cb24b2085226f59d46b61b73f1588ab801521 Mon Sep 17 00:00:00 2001
From: Olivier B <hobbe@users.noreply.github.com>
Date: Thu, 23 Feb 2017 21:22:47 +0100
Subject: [PATCH 14/24] Use relative path in URLs

This change allows to use HA-Bridge web app from a sub-folder of the web server, eg. http://example.com/habridge.
---
 src/main/resources/public/scripts/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index e5ebc6c..4b305ed 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -71,7 +71,7 @@ String.prototype.replaceAll = function (search, replace)
 
 app.service ('bridgeService', function ($http, $window, ngToast) {
 	var self = this;
-	this.state = {base: window.location.origin + "/api/devices", bridgelocation: window.location.origin, systemsbase: window.location.origin + "/system", huebase: window.location.origin + "/api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, habridgeversion: ""};
+	this.state = {base: "./api/devices", bridgelocation: ".", systemsbase: "./system", huebase: "./api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, habridgeversion: ""};
 
 	this.displayWarn = function(errorTitle, error) {
 		var toastContent = errorTitle;
@@ -2568,4 +2568,4 @@ app.filter('configuredDomoticzItems', function (bridgeService) {
 
 app.controller('VersionController', function ($scope, bridgeService) {
 	$scope.bridge = bridgeService.state;
-});
\ No newline at end of file
+});

From 5e59b33ed7ed2eda16a8829d3dea4117a2bb2c2f Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Thu, 23 Feb 2017 16:47:06 -0600
Subject: [PATCH 15/24] Fixed hex conversions. Added checks for formats.
 Finished Bulk add issues. Fixing Domoticz home and handler  for user/pwd.

---
 pom.xml                                       |   2 +-
 .../com/bwssystems/HABridge/HomeManager.java  |   2 +-
 .../HABridge/hue/BrightnessDecode.java        |  17 +--
 .../plugins/domoticz/DomoticzHome.java        |  33 +++++-
 .../HABridge/plugins/http/HTTPHome.java       |  41 ++++---
 .../HABridge/plugins/tcp/TCPHome.java         |  72 ++++++------
 .../HABridge/plugins/udp/UDPHome.java         |  67 ++++++-----
 src/main/resources/public/scripts/app.js      | 110 +++++++++++-------
 .../public/views/domoticzdevice.html          |   2 +-
 .../resources/public/views/haldevice.html     |  16 +--
 .../resources/public/views/huedevice.html     |   2 +-
 .../resources/public/views/lifxdevice.html    |   2 +-
 .../resources/public/views/veradevice.html    |   2 +-
 13 files changed, 216 insertions(+), 152 deletions(-)

diff --git a/pom.xml b/pom.xml
index f0e5330..ca0a205 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.4b</version>
+	<version>4.1.4c</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/HomeManager.java b/src/main/java/com/bwssystems/HABridge/HomeManager.java
index 798fbc1..b11c76a 100644
--- a/src/main/java/com/bwssystems/HABridge/HomeManager.java
+++ b/src/main/java/com/bwssystems/HABridge/HomeManager.java
@@ -72,7 +72,6 @@ public class HomeManager {
 		homeList.put(DeviceMapTypes.CUSTOM_DEVICE[DeviceMapTypes.typeIndex], aHome);
 		homeList.put(DeviceMapTypes.VERA_DEVICE[DeviceMapTypes.typeIndex], aHome);
 		homeList.put(DeviceMapTypes.VERA_SCENE[DeviceMapTypes.typeIndex], aHome);
-		homeList.put(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex], aHome);
 		//setup the tcp handler Home
 		aHome = new TCPHome(bridgeSettings);
 		homeList.put(DeviceMapTypes.TCP_DEVICE[DeviceMapTypes.typeIndex], aHome);
@@ -87,6 +86,7 @@ public class HomeManager {
 		resourceList.put(DeviceMapTypes.VERA_SCENE[DeviceMapTypes.typeIndex], aHome);
         //setup the Domoticz configuration if available
 		aHome = new DomoticzHome(bridgeSettings);
+		homeList.put(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex], aHome);
 		resourceList.put(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex], aHome);
         //setup the Lifx configuration if available
 		aHome = new LifxHome(bridgeSettings);
diff --git a/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java b/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
index 55da9dd..7c31f11 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
@@ -1,15 +1,10 @@
 package com.bwssystems.HABridge.hue;
 
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
-
-import javax.xml.bind.DatatypeConverter;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import net.java.dev.eval.Expression;
 
 public class BrightnessDecode {
@@ -49,9 +44,7 @@ public class BrightnessDecode {
 		}
 		if (request.contains(INTENSITY_BYTE)) {
 			if (isHex) {
-				BigInteger bigInt = BigInteger.valueOf(intensity);
-				byte[] theBytes = bigInt.toByteArray();
-				String hexValue = DatatypeConverter.printHexBinary(theBytes);
+				String hexValue = Integer.toHexString(intensity);
 				request = request.replace(INTENSITY_BYTE, hexValue);
 			} else {
 				String intensityByte = String.valueOf(intensity);
@@ -60,9 +53,7 @@ public class BrightnessDecode {
 		} else if (request.contains(INTENSITY_PERCENT)) {
 			int percentBrightness = (int) Math.round(intensity / 255.0 * 100);
 			if (isHex) {
-				BigInteger bigInt = BigInteger.valueOf(percentBrightness);
-				byte[] theBytes = bigInt.toByteArray();
-				String hexValue = DatatypeConverter.printHexBinary(theBytes);
+				String hexValue = Integer.toHexString(percentBrightness);
 				request = request.replace(INTENSITY_PERCENT, hexValue);
 			} else {
 				String intensityPercent = String.valueOf(percentBrightness);
@@ -81,9 +72,7 @@ public class BrightnessDecode {
 				BigDecimal result = exp.eval(variables);
 				Integer endResult = Math.round(result.floatValue());
 				if (isHex) {
-					BigInteger bigInt = BigInteger.valueOf(endResult);
-					byte[] theBytes = bigInt.toByteArray();
-					String hexValue = DatatypeConverter.printHexBinary(theBytes);
+					String hexValue = Integer.toHexString(endResult);
 					request = request.replace(INTENSITY_MATH + mathDescriptor + INTENSITY_MATH_CLOSE, hexValue);
 				} else {
 					request = request.replace(INTENSITY_MATH + mathDescriptor + INTENSITY_MATH_CLOSE,
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
index ebc5af8..ce08ecf 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
@@ -1,5 +1,6 @@
 package com.bwssystems.HABridge.plugins.domoticz;
 
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -13,8 +14,11 @@ import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.Home;
 import com.bwssystems.HABridge.NamedIP;
 import com.bwssystems.HABridge.api.CallItem;
+import com.bwssystems.HABridge.api.hue.HueError;
+import com.bwssystems.HABridge.api.hue.HueErrorResponse;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.hue.MultiCommandUtil;
+import com.google.gson.Gson;
 
 public class DomoticzHome implements Home {
     private static final Logger log = LoggerFactory.getLogger(DomoticzHome.class);
@@ -66,8 +70,28 @@ public class DomoticzHome implements Home {
 	@Override
 	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity,
 			Integer targetBri,Integer targetBriInc, DeviceDescriptor device, String body) {
-		// Not a device handler
-		return null;
+		String responseString = null;
+		
+		String theUrl = anItem.getItem().getAsString();
+		if(theUrl != null && !theUrl.isEmpty () && (theUrl.startsWith("http://") || theUrl.startsWith("https://"))) {
+			String intermediate = theUrl.substring(theUrl.indexOf("://") + 3);
+			String hostPortion = intermediate.substring(0, intermediate.indexOf('/'));
+			String theUrlBody = intermediate.substring(intermediate.indexOf('/') + 1);
+			String hostAddr = null;
+			String port = null;
+			if (hostPortion.contains(":")) {
+				hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
+				port = hostPortion.substring(intermediate.indexOf(':') + 1);
+			} else
+				hostAddr = hostPortion;
+			
+		} else {
+			log.warn("Domoticz Call to be presented as http(s)://<ip_address>(:<port>)/payload, format of request unknown: " + theUrl);
+			responseString = new Gson().toJson(HueErrorResponse.createResponse("6", "/lights/" + lightId,
+					"Error on calling url to change device state", "/lights/"
+					+ lightId + "state", null, null).getTheErrors(), HueError[].class);
+		}
+		return responseString;
 	}
 
 	@Override
@@ -90,6 +114,11 @@ public class DomoticzHome implements Home {
 		return this;
 	}
 
+	private DomoticzHandler findHandlerByAddress(String hostAddress) {
+		DomoticzHandler aHandler = null;
+		
+		return aHandler;
+	}
 	@Override
 	public void closeHome() {
 		// noop
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java
index 97cb753..985fd7e 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHome.java
@@ -29,23 +29,25 @@ public class HTTPHome implements Home {
 			Integer targetBri,Integer targetBriInc, DeviceDescriptor device, String body) {
 		String responseString = null;
 		
-		//Backwards Compatibility Items
-		if(anItem.getHttpVerb() == null || anItem.getHttpVerb().isEmpty())
-		{
-			if(device.getHttpVerb() != null && !device.getHttpVerb().isEmpty())
-				anItem.setHttpVerb(device.getHttpVerb());
-		}
+		String theUrl = anItem.getItem().getAsString();
+		if(theUrl != null && !theUrl.isEmpty () && (theUrl.startsWith("http://") || theUrl.startsWith("https://"))) {
+			//Backwards Compatibility Items
+			if(anItem.getHttpVerb() == null || anItem.getHttpVerb().isEmpty())
+			{
+				if(device.getHttpVerb() != null && !device.getHttpVerb().isEmpty())
+					anItem.setHttpVerb(device.getHttpVerb());
+			}
+	
+			if(anItem.getHttpHeaders() == null || anItem.getHttpHeaders().isEmpty()) {
+				if(device.getHeaders() != null && !device.getHeaders().isEmpty() )
+					anItem.setHttpHeaders(device.getHeaders());
+			}
+	
+			log.debug("executing HUE api request to Http "
+					+ (anItem.getHttpVerb() == null ? "GET" : anItem.getHttpVerb()) + ": "
+					+ anItem.getItem().getAsString());
 
-		if(anItem.getHttpHeaders() == null || anItem.getHttpHeaders().isEmpty()) {
-			if(device.getHeaders() != null && !device.getHeaders().isEmpty() )
-				anItem.setHttpHeaders(device.getHeaders());
-		}
-
-		log.debug("executing HUE api request to Http "
-				+ (anItem.getHttpVerb() == null ? "GET" : anItem.getHttpVerb()) + ": "
-				+ anItem.getItem().getAsString());
-
-			String anUrl = BrightnessDecode.calculateReplaceIntensityValue(anItem.getItem().getAsString(),
+			String anUrl = BrightnessDecode.calculateReplaceIntensityValue(theUrl,
 					intensity, targetBri, targetBriInc, false);
 
 			anUrl = TimeDecode.replaceTimeValue(anUrl);
@@ -63,6 +65,13 @@ public class HTTPHome implements Home {
 						"Error on calling url to change device state", "/lights/"
 						+ lightId + "state", null, null).getTheErrors(), HueError[].class);
 			}
+		} else {
+			log.warn("HTTP Call to be presented as http(s)://<ip_address>(:<port>)/payload, format of request unknown: " + theUrl);
+			responseString = new Gson().toJson(HueErrorResponse.createResponse("6", "/lights/" + lightId,
+					"Error on calling url to change device state", "/lights/"
+					+ lightId + "state", null, null).getTheErrors(), HueError[].class);
+		}
+
 		return responseString;
 	}
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
index 52e94bc..5fb124b 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
@@ -32,41 +32,45 @@ public class TCPHome implements Home {
 	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity,
 			Integer targetBri,Integer targetBriInc, DeviceDescriptor device, String body) {
 		log.debug("executing HUE api request to TCP: " + anItem.getItem().getAsString());
-		String intermediate = anItem.getItem().getAsString().substring(anItem.getItem().getAsString().indexOf("://") + 3);
-		String hostPortion = intermediate.substring(0, intermediate.indexOf('/'));
-		String theUrlBody = intermediate.substring(intermediate.indexOf('/') + 1);
-		String hostAddr = null;
-		String port = null;
-		InetAddress IPAddress = null;
-		if (hostPortion.contains(":")) {
-			hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
-			port = hostPortion.substring(intermediate.indexOf(':') + 1);
+		String theUrl = anItem.getItem().getAsString();
+		if(theUrl != null && !theUrl.isEmpty () && theUrl.startsWith("tcp://")) {
+			String intermediate = theUrl.substring(theUrl.indexOf("://") + 3);
+			String hostPortion = intermediate.substring(0, intermediate.indexOf('/'));
+			String theUrlBody = intermediate.substring(intermediate.indexOf('/') + 1);
+			String hostAddr = null;
+			String port = null;
+			InetAddress IPAddress = null;
+			if (hostPortion.contains(":")) {
+				hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
+				port = hostPortion.substring(intermediate.indexOf(':') + 1);
+			} else
+				hostAddr = hostPortion;
+			try {
+				IPAddress = InetAddress.getByName(hostAddr);
+			} catch (UnknownHostException e) {
+				// noop
+			}
+	
+			theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
+			if (theUrlBody.startsWith("0x")) {
+				theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
+				sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
+			} else {
+				theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
+				sendData = theUrlBody.getBytes();
+			}
+	
+			try {
+				Socket dataSendSocket = new Socket(IPAddress, Integer.parseInt(port));
+				DataOutputStream outToClient = new DataOutputStream(dataSendSocket.getOutputStream());
+				outToClient.write(sendData);
+				outToClient.flush();
+				dataSendSocket.close();
+			} catch (Exception e) {
+				// noop
+			}
 		} else
-			hostAddr = hostPortion;
-		try {
-			IPAddress = InetAddress.getByName(hostAddr);
-		} catch (UnknownHostException e) {
-			// noop
-		}
-
-		theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
-		if (theUrlBody.startsWith("0x")) {
-			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
-			sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
-		} else {
-			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
-			sendData = theUrlBody.getBytes();
-		}
-
-		try {
-			Socket dataSendSocket = new Socket(IPAddress, Integer.parseInt(port));
-			DataOutputStream outToClient = new DataOutputStream(dataSendSocket.getOutputStream());
-			outToClient.write(sendData);
-			outToClient.flush();
-			dataSendSocket.close();
-		} catch (Exception e) {
-			// noop
-		}
+			log.warn("Tcp Call to be presented as tcp://<ip_address>:<port>/payload, format of request unknown: " + theUrl);
 		return null;
 	}
 
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
index 3669081..b93a72e 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
@@ -33,39 +33,44 @@ public class UDPHome implements Home {
 	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity,
 			Integer targetBri,Integer targetBriInc, DeviceDescriptor device, String body) {
 		log.debug("executing HUE api request to UDP: " + anItem.getItem().getAsString());
-		String intermediate = anItem.getItem().getAsString().substring(anItem.getItem().getAsString().indexOf("://") + 3);
-		String hostPortion = intermediate.substring(0, intermediate.indexOf('/'));
-		String theUrlBody = intermediate.substring(intermediate.indexOf('/') + 1);
-		String hostAddr = null;
-		String port = null;
-		InetAddress IPAddress = null;
-		if (hostPortion.contains(":")) {
-			hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
-			port = hostPortion.substring(intermediate.indexOf(':') + 1);
+		String theUrl = anItem.getItem().getAsString();
+		if(theUrl != null && !theUrl.isEmpty () && theUrl.startsWith("udp://")) {
+			String intermediate = theUrl.substring(theUrl.indexOf("://") + 3);
+			String hostPortion = intermediate.substring(0, intermediate.indexOf('/'));
+			String theUrlBody = intermediate.substring(intermediate.indexOf('/') + 1);
+			String hostAddr = null;
+			String port = null;
+			InetAddress IPAddress = null;
+			if (hostPortion.contains(":")) {
+				hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
+				port = hostPortion.substring(intermediate.indexOf(':') + 1);
+			} else
+				hostAddr = hostPortion;
+			try {
+				IPAddress = InetAddress.getByName(hostAddr);
+			} catch (UnknownHostException e) {
+				log.warn("Udp Call, unknown host, continuing...");
+				return null;
+			}
+	
+			theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
+			if (theUrlBody.startsWith("0x")) {
+				theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
+				sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
+			} else {
+				theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
+				sendData = theUrlBody.getBytes();
+			}
+			try {
+				theUDPDatagramSender.sendUDPResponse(sendData, IPAddress, Integer.parseInt(port));
+			} catch (NumberFormatException e) {
+				log.warn("Udp Call, Number format exception on port, continuing...");
+			} catch (IOException e) {
+				log.warn("IO exception on udp call, continuing...");
+			}
 		} else
-			hostAddr = hostPortion;
-		try {
-			IPAddress = InetAddress.getByName(hostAddr);
-		} catch (UnknownHostException e) {
-			log.warn("Udp Call, unknown host, continuing...");
-			return null;
-		}
+			log.warn("Udp Call to be presented as udp://<ip_address>:<port>/payload, format of request unknown: " + theUrl);
 
-		theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
-		if (theUrlBody.startsWith("0x")) {
-			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
-			sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
-		} else {
-			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
-			sendData = theUrlBody.getBytes();
-		}
-		try {
-			theUDPDatagramSender.sendUDPResponse(sendData, IPAddress, Integer.parseInt(port));
-		} catch (NumberFormatException e) {
-			log.warn("Udp Call, Number format exception on port, continuing...");
-		} catch (IOException e) {
-			log.warn("IO exception on udp call, continuing...");
-		}
 		return null;
 	}
 
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index e8ea1f0..612162d 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -1227,7 +1227,7 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
 		$scope.device = bridgeService.state.device;
 	};
 
-	$scope.buildDeviceUrls = function (veradevice, dim_control) {
+	$scope.buildDeviceUrls = function (veradevice, dim_control, buildonly) {
 		if(dim_control.indexOf("byte") >= 0 || dim_control.indexOf("percent") >= 0 || dim_control.indexOf("math") >= 0) {
 				dimpayload = "http://" + veradevice.veraaddress + ":" + $scope.vera.port
 				+ "/data_request?id=action&output_format=json&DeviceNum="
@@ -1248,8 +1248,10 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
 
 			bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, veradevice.id, veradevice.name, veradevice.veraname, "switch", "veraDevice", null, null);
 			$scope.device = bridgeService.state.device;
-			bridgeService.editNewDevice($scope.device);
-			$location.path('/editdevice');
+			if (!buildonly) {
+				bridgeService.editNewDevice($scope.device);
+				$location.path('/editdevice');
+			}
 	};
 
 	$scope.buildSceneUrls = function (verascene) {
@@ -1268,10 +1270,11 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
 
 	$scope.bulkAddDevices = function(dim_control) {
 		var devicesList = [];
+		$scope.clearDevice();
 		for(var i = 0; i < $scope.bulk.devices.length; i++) {
 			for(var x = 0; x < bridgeService.state.veradevices.length; x++) {
 				if(bridgeService.state.veradevices[x].id === $scope.bulk.devices[i]) {
-					$scope.buildDeviceUrls(bridgeService.state.veradevices[x],dim_control);
+					$scope.buildDeviceUrls(bridgeService.state.veradevices[x],dim_control,true);
 					devicesList[i] = {
 							name: $scope.device.name,
 							mapId: $scope.device.mapId,
@@ -1288,6 +1291,7 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
 							contentBodyDim: $scope.device.contentBodyDim,
 							contentBodyOff: $scope.device.contentBodyOff
 					};
+					$scope.clearDevice();
 				}
 			}
 		}
@@ -1331,7 +1335,7 @@ app.controller('VeraController', function ($scope, $location, $http, bridgeServi
 		else {
 			$scope.selectAll = true;
 			for(var x = 0; x < bridgeService.state.veradevices.length; x++) {
-				if($scope.bulk.devices.indexOf(bridgeService.state.veradevices[x]) < 0 && !bridgeService.findDeviceByMapId(bridgeService.state.veradevices[x].id, bridgeService.state.veradevices[x].veraname, "veraDevice"))
+				if($scope.bulk.devices.indexOf(bridgeService.state.veradevices[x]) < 0)
 					$scope.bulk.devices.push(bridgeService.state.veradevices[x].id);
 			}
 		}
@@ -1541,16 +1545,19 @@ app.controller('HueController', function ($scope, $location, $http, bridgeServic
 		offpayload = "{\"ipAddress\":\"" + huedevice.hueaddress + "\",\"deviceId\":\"" + huedevice.huedeviceid +"\",\"hueName\":\"" + huedevice.huename + "\"}";
 		bridgeService.buildUrls(onpayload, null, offpayload, true, huedevice.device.uniqueid,  huedevice.device.name, huedevice.huename, "passthru",  "hueDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
 	$scope.bulkAddDevices = function() {
 		var devicesList = [];
+		$scope.clearDevice();
 		for(var i = 0; i < $scope.bulk.devices.length; i++) {
 			for(var x = 0; x < bridgeService.state.huedevices.length; x++) {
 				if(bridgeService.state.huedevices[x].device.uniqueid === $scope.bulk.devices[i]) {
-					$scope.buildDeviceUrls(bridgeService.state.huedevices[x]);
+					$scope.buildDeviceUrls(bridgeService.state.huedevices[x],true);
 					devicesList[i] = {
 							name: $scope.device.name,
 							mapId: $scope.device.mapId,
@@ -1567,6 +1574,7 @@ app.controller('HueController', function ($scope, $location, $http, bridgeServic
 							contentBodyDim: $scope.device.contentBodyDim,
 							contentBodyOff: $scope.device.contentBodyOff
 					};
+					$scope.clearDevice();
 				}
 			}
 		}
@@ -1654,7 +1662,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		$scope.device = bridgeService.state.device;
 	};
 
-	$scope.buildDeviceUrls = function (haldevice, dim_control) {
+	$scope.buildDeviceUrls = function (haldevice, dim_control, buildonly) {
 		var preOnCmd = "";
 		var preDimCmd = "";
 		var preOffCmd = "";
@@ -1709,11 +1717,13 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ postCmd;
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname,  haldevice.haldevicename, haldevice.halname, aDeviceType,  "halDevice", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
-	$scope.buildButtonUrls = function (haldevice, onbutton, offbutton) {
+	$scope.buildButtonUrls = function (haldevice, onbutton, offbutton, buildonly) {
 		var actionOn = angular.fromJson(onbutton);
 		var actionOff = angular.fromJson(offbutton);
 		onpayload = "http://" + haldevice.haladdress + "/IrService!IrCmd=Set!IrDevice=" + haldevice.haldevicename.replaceAll(" ", "%20") + "!IrButton=" + actionOn.DeviceName.replaceAll(" ", "%20") + "?Token=" + $scope.bridge.settings.haltoken;
@@ -1721,20 +1731,24 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-" + actionOn.DeviceName,  haldevice.haldevicename, haldevice.halname, "button",  "halButton", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
-	$scope.buildHALHomeUrls = function (haldevice) {
+	$scope.buildHALHomeUrls = function (haldevice, buildonly) {
 		onpayload = "http://" + haldevice.haladdress + "/ModeService!ModeCmd=Set!ModeName=Home?Token=" + $scope.bridge.settings.haltoken;
 		offpayload = "http://" + haldevice.haladdress	+ "/ModeService!ModeCmd=Set!ModeName=Away?Token=" + $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-HomeAway",  haldevice.haldevicename, haldevice.halname, "home",  "halHome", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
-	$scope.buildHALHeatUrls = function (haldevice) {
+	$scope.buildHALHeatUrls = function (haldevice, buildonly) {
 		onpayload = "http://" + haldevice.haladdress 
 		+ "/HVACService!HVACCmd=Set!HVACName=" 
 		+ haldevice.haldevicename.replaceAll(" ", "%20") 
@@ -1752,11 +1766,13 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetHeat",  haldevice.haldevicename + " Heat", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
-	$scope.buildHALCoolUrls = function (haldevice) {
+	$scope.buildHALCoolUrls = function (haldevice, buildonly) {
 		onpayload = "http://" + haldevice.haladdress 
 		+ "/HVACService!HVACCmd=Set!HVACName=" 
 		+ haldevice.haldevicename.replaceAll(" ", "%20") 
@@ -1774,11 +1790,13 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, dimpayload, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetCool",  haldevice.haldevicename + " Cool", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
-	$scope.buildHALAutoUrls = function (haldevice) {
+	$scope.buildHALAutoUrls = function (haldevice, buildonly) {
 		onpayload = "http://" + haldevice.haladdress 
 		+ "/HVACService!HVACCmd=Set!HVACName=" 
 		+ haldevice.haldevicename.replaceAll(" ", "%20") 
@@ -1790,11 +1808,13 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		+ "!HVACMode=Off?Token="
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetAuto",  haldevice.haldevicename + " Auto", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
-	$scope.buildHALOffUrls = function (haldevice) {
+	$scope.buildHALOffUrls = function (haldevice, buildonly) {
 		onpayload = "http://" + haldevice.haladdress 
 		+ "/HVACService!HVACCmd=Set!HVACName=" 
 		+ haldevice.haldevicename.replaceAll(" ", "%20") 
@@ -1807,11 +1827,13 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		$scope.device.offUrl = "http://" + haldevice.haladdress 
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-TurnOff",  haldevice.haldevicename + " Thermostat", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
-	$scope.buildHALFanUrls = function (haldevice) {
+	$scope.buildHALFanUrls = function (haldevice, buildonly) {
 		onpayload = "http://" + haldevice.haladdress 
 			+ "/HVACService!HVACCmd=Set!HVACName=" 
 			+ haldevice.haldevicename.replaceAll(" ", "%20") 
@@ -1824,21 +1846,24 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 			+ $scope.bridge.settings.haltoken;
 		bridgeService.buildUrls(onpayload, null, offpayload, false, haldevice.haldevicename + "-" + haldevice.halname + "-SetFan",  haldevice.haldevicename + " Fan", haldevice.halname, "thermo",  "halThermoSet", null, null);
 		$scope.device = bridgeService.state.device;
-		bridgeService.editNewDevice($scope.device);
-		$location.path('/editdevice');
+		if (!buildonly) {
+			bridgeService.editNewDevice($scope.device);
+			$location.path('/editdevice');
+		}
 	};
 
 	$scope.bulkAddDevices = function(dim_control) {
 		var devicesList = [];
+		$scope.clearDevice();
 		for(var i = 0; i < $scope.bulk.devices.length; i++) {
 			for(var x = 0; x < bridgeService.state.haldevices.length; x++) {
 				if(bridgeService.state.haldevices[x].haldevicename === $scope.bulk.devices[i]) {
 					if(bridgeService.state.haldevices[x].haldevicetype === "HVAC")
-						$scope.buildHALAutoUrls(bridgeService.state.haldevices[x]);
+						$scope.buildHALAutoUrls(bridgeService.state.haldevices[x], true);
 					else if(bridgeService.state.haldevices[x].haldevicetype === "HOME")
-						$scope.buildHALHomeUrls(bridgeService.state.haldevices[x]);
+						$scope.buildHALHomeUrls(bridgeService.state.haldevices[x], true);
 					else
-						$scope.buildDeviceUrls(bridgeService.state.haldevices[x],dim_control);
+						$scope.buildDeviceUrls(bridgeService.state.haldevices[x],dim_control, true);
 					devicesList[i] = {
 							name: $scope.device.name,
 							mapId: $scope.device.mapId,
@@ -1855,6 +1880,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 							contentBodyDim: $scope.device.contentBodyDim,
 							contentBodyOff: $scope.device.contentBodyOff
 					};
+					$scope.clearDevice();
 				}
 			}
 		}
@@ -1897,7 +1923,7 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 		else {
 			$scope.selectAll = true;
 			for(var x = 0; x < bridgeService.state.haldevices.length; x++) {
-				if($scope.bulk.devices.indexOf(bridgeService.state.haldevices[x]) < 0 && !bridgeService.findDeviceByMapId(bridgeService.state.haldevices[x].haldevicename + "-" +  bridgeService.state.haldevices[x].halname, bridgeService.state.haldevices[x].halname, "halDevice"))
+				if($scope.bulk.devices.indexOf(bridgeService.state.haldevices[x]) < 0)
 					$scope.bulk.devices.push(bridgeService.state.haldevices[x].haldevicename);
 			}
 		}
@@ -2191,7 +2217,7 @@ app.controller('DomoticzController', function ($scope, $location, $http, bridgeS
 					bridgeService.viewHalDevices();
 				},
 				function (error) {
-					bridgeService.displayWarn("Error adding HAL devices in bulk.", error)
+					bridgeService.displayWarn("Error adding Domoticz devices in bulk.", error)
 				}
 			);
 		$scope.bulk = { devices: [] };
@@ -2223,8 +2249,8 @@ app.controller('DomoticzController', function ($scope, $location, $http, bridgeS
 		else {
 			$scope.selectAll = true;
 			for(var x = 0; x < bridgeService.state.haldevices.length; x++) {
-				if($scope.bulk.devices.indexOf(bridgeService.state.haldevices[x]) < 0 && !bridgeService.findDeviceByMapId(bridgeService.state.haldevices[x].haldevicename + "-" +  bridgeService.state.haldevices[x].halname, bridgeService.state.haldevices[x].halname, "halDevice"))
-					$scope.bulk.devices.push(bridgeService.state.haldevices[x].haldevicename);
+				if($scope.bulk.devices.indexOf(bridgeService.state.domoticzdevices[x]) < 0)
+					$scope.bulk.devices.push(bridgeService.state.domoticzdevices[x].devicename);
 			}
 		}
 	};
@@ -2281,6 +2307,7 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 
 	$scope.bulkAddDevices = function(dim_control) {
 		var devicesList = [];
+		$scope.clearDevice();
 		for(var i = 0; i < $scope.bulk.devices.length; i++) {
 			for(var x = 0; x < bridgeService.state.lifxdevices.length; x++) {
 				if(bridgeService.state.lifxdevices[x].devicename === $scope.bulk.devices[i]) {
@@ -2301,6 +2328,7 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 							contentBodyDim: $scope.device.contentBodyDim,
 							contentBodyOff: $scope.device.contentBodyOff
 					};
+					$scope.clearDevice();
 				}
 			}
 		}
@@ -2343,8 +2371,8 @@ app.controller('LifxController', function ($scope, $location, $http, bridgeServi
 		else {
 			$scope.selectAll = true;
 			for(var x = 0; x < bridgeService.state.haldevices.length; x++) {
-				if($scope.bulk.devices.indexOf(bridgeService.state.haldevices[x]) < 0 && !bridgeService.findDeviceByMapId(bridgeService.state.haldevices[x].haldevicename + "-" +  bridgeService.state.haldevices[x].halname, bridgeService.state.haldevices[x].halname, "halDevice"))
-					$scope.bulk.devices.push(bridgeService.state.haldevices[x].haldevicename);
+				if($scope.bulk.devices.indexOf(bridgeService.state.lifxdevices[x]) < 0)
+					$scope.bulk.devices.push(bridgeService.state.lifxdevices[x].devicename);
 			}
 		}
 	};
diff --git a/src/main/resources/public/views/domoticzdevice.html b/src/main/resources/public/views/domoticzdevice.html
index 2359739..7f4f151 100644
--- a/src/main/resources/public/views/domoticzdevice.html
+++ b/src/main/resources/public/views/domoticzdevice.html
@@ -76,7 +76,7 @@
 			<td>{{domoticzdevice.domoticzname}}</td>
 			<td>
 				<button  class="btn btn-success" type="submit"
-					ng-click="buildDeviceUrls(domoticzdevice, device_dim_control)">Build Item</button>
+					ng-click="buildDeviceUrls(domoticzdevice, device_dim_control,false)">Build Item</button>
 			</td>
 		</tr>
 	</table>
diff --git a/src/main/resources/public/views/haldevice.html b/src/main/resources/public/views/haldevice.html
index a185dbe..13878cf 100644
--- a/src/main/resources/public/views/haldevice.html
+++ b/src/main/resources/public/views/haldevice.html
@@ -89,27 +89,27 @@
 			</td>
 			<td>
 				<button ng-if="haldevice.haldevicetype != 'Home' && haldevice.haldevicetype != 'HVAC' && haldevice.haldevicetype != 'IrData'" class="btn btn-success" type="submit"
-					ng-click="buildDeviceUrls(haldevice, device_dim_control)">Build Item</button>
+					ng-click="buildDeviceUrls(haldevice, device_dim_control, false)">Build Item</button>
 				<button ng-if="haldevice.haldevicetype == 'Home'" class="btn btn-success" type="submit"
-					ng-click="buildHALHomeUrls(haldevice)">Build Home/Away</button>
+					ng-click="buildHALHomeUrls(haldevice, false)">Build Home/Away</button>
 				<button ng-if="haldevice.haldevicetype == 'IrData'" class="btn btn-success" type="submit"
-					ng-click="buildButtonUrls(haldevice, button_on, button_off)">Build
+					ng-click="buildButtonUrls(haldevice, button_on, button_off, false)">Build
 					A Button</button>
 				<ul ng-if="haldevice.haldevicetype == 'HVAC'" class="list-group">
 					<li class="list-group-item">
 						<p>
 							<button class="btn btn-success" type="submit"
-								ng-click="buildHALHeatUrls(haldevice)">Heat</button>
+								ng-click="buildHALHeatUrls(haldevice, false)">Heat</button>
 							<button class="btn btn-success" type="submit"
-								ng-click="buildHALCoolUrls(haldevice)">Cool</button>
+								ng-click="buildHALCoolUrls(haldevice, false)">Cool</button>
 							<button class="btn btn-success" type="submit"
-								ng-click="buildHALAutoUrls(haldevice)">Auto</button>
+								ng-click="buildHALAutoUrls(haldevice, false)">Auto</button>
 						</p>
 						<p>
 							<button class="btn btn-success" type="submit"
-								ng-click="buildHALOffUrls(haldevice)">Off</button>
+								ng-click="buildHALOffUrls(haldevice, false)">Off</button>
 							<button class="btn btn-success" type="submit"
-								ng-click="buildHALFanUrls(haldevice)">Fan</button>
+								ng-click="buildHALFanUrls(haldevice, false)">Fan</button>
 						</p>
 					</li>
 				</ul>
diff --git a/src/main/resources/public/views/huedevice.html b/src/main/resources/public/views/huedevice.html
index e3ae20d..7d9325c 100644
--- a/src/main/resources/public/views/huedevice.html
+++ b/src/main/resources/public/views/huedevice.html
@@ -65,7 +65,7 @@
 			<td>{{huedevice.huename}}</td>
 			<td>
 				<button class="btn btn-success" type="submit"
-					ng-click="buildDeviceUrls(huedevice)">Build Item</button>
+					ng-click="buildDeviceUrls(huedevice, false)">Build Item</button>
 			</td>
 		</tr>
 	</table>
diff --git a/src/main/resources/public/views/lifxdevice.html b/src/main/resources/public/views/lifxdevice.html
index 6278cea..465c557 100644
--- a/src/main/resources/public/views/lifxdevice.html
+++ b/src/main/resources/public/views/lifxdevice.html
@@ -59,7 +59,7 @@
 			<td>{{lifxdev.type}}</td>
 			<td>
 				<button class="btn btn-success" type="submit"
-					ng-click="buildDeviceUrls(lifxdev)">Build
+					ng-click="buildDeviceUrls(lifxdev, false)">Build
 					Item</button>
 			</td>
 		</tr>
diff --git a/src/main/resources/public/views/veradevice.html b/src/main/resources/public/views/veradevice.html
index cba365c..68105af 100644
--- a/src/main/resources/public/views/veradevice.html
+++ b/src/main/resources/public/views/veradevice.html
@@ -80,7 +80,7 @@
 			<td>{{veradevice.veraname}}</td>
 			<td>
 				<button class="btn btn-success" type="submit"
-					ng-click="buildDeviceUrls(veradevice, device_dim_control)">Build Item</button>
+					ng-click="buildDeviceUrls(veradevice, device_dim_control, false)">Build Item</button>
 			</td>
 		</tr>
 	</table>

From 745986f08f538649c26934ee633638c7e996d0f6 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Fri, 24 Feb 2017 15:45:45 -0600
Subject: [PATCH 16/24] Finished Domoticz updates

---
 pom.xml                                       |  2 +-
 .../plugins/domoticz/DomoticzHandler.java     | 62 +++++++++++++++----
 .../plugins/domoticz/DomoticzHome.java        | 56 ++++++++++++++---
 .../HABridge/plugins/http/HTTPHandler.java    | 42 ++++++-------
 4 files changed, 121 insertions(+), 41 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca0a205..b10f483 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.4c</version>
+	<version>4.2.0</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHandler.java b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHandler.java
index 379c7b7..56ada5a 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHandler.java
@@ -3,11 +3,12 @@ package com.bwssystems.HABridge.plugins.domoticz;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
+import java.util.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.bwssystems.HABridge.NamedIP;
+import com.bwssystems.HABridge.api.NameValue;
 import com.bwssystems.HABridge.plugins.http.HTTPHandler;
 import com.google.gson.Gson;
 
@@ -16,32 +17,33 @@ public class DomoticzHandler {
     private static final String GET_REQUEST = "/json.htm?type=";
     private static final String DEVICES_TYPE = "devices";
     private static final String SCENES_TYPE = "scenes";
-    private static final String FILTER_USED = "&used=";
-    private HTTPHandler httpClient;
+    private static final String FILTER_USED = "&used=true";
     private NamedIP domoticzAddress;
 
     public DomoticzHandler(NamedIP addressName) {
 		super();
-        httpClient = new HTTPHandler();
         domoticzAddress = addressName;
 	}
 
-	public List<DomoticzDevice> getDevices() {
-    	return getDomoticzDevices(GET_REQUEST, DEVICES_TYPE, FILTER_USED);
+	public List<DomoticzDevice> getDevices(HTTPHandler httpClient) {
+    	return getDomoticzDevices(GET_REQUEST, DEVICES_TYPE, FILTER_USED, httpClient);
     }
 
-	public List<DomoticzDevice> getScenes() {
-    	return getDomoticzDevices(GET_REQUEST, SCENES_TYPE, null);
+	public List<DomoticzDevice> getScenes(HTTPHandler httpClient) {
+    	return getDomoticzDevices(GET_REQUEST, SCENES_TYPE, null, httpClient);
     }
 
-	private List<DomoticzDevice> getDomoticzDevices(String rootRequest, String type, String postpend) {
+	private List<DomoticzDevice> getDomoticzDevices(String rootRequest, String type, String postpend, HTTPHandler httpClient) {
 		Devices theDomoticzApiResponse = null;
 		List<DomoticzDevice> deviceList = null;
 
 		String theUrl = null;
     	String theData;
-   		theUrl = "http://" + domoticzAddress.getIp() + ":" + domoticzAddress.getPort() + rootRequest + type;
-   		theData = httpClient.doHttpRequest(theUrl, null, null, null, null);
+    	if(postpend != null && !postpend.isEmpty())
+    		theUrl = buildUrl(rootRequest + type + postpend);
+    	else
+    		theUrl = buildUrl(rootRequest + type);
+   		theData = httpClient.doHttpRequest(theUrl, null, null, null, buildHeaders());
     	if(theData != null) {
     		log.debug("GET " + type + " DomoticzApiResponse - data: " + theData);
 	    	theDomoticzApiResponse = new Gson().fromJson(theData, Devices.class);
@@ -70,6 +72,44 @@ public class DomoticzHandler {
     	return deviceList;
     }
 
+	public String buildUrl(String thePayload) {
+		String newUrl = null;
+		
+		if(thePayload != null && !thePayload.isEmpty()) {
+			if(domoticzAddress.getSecure() != null && domoticzAddress.getSecure())
+				newUrl = "https://";
+			else
+				newUrl = "http://";
+			
+			newUrl = newUrl + domoticzAddress.getIp();
+			
+			if(domoticzAddress.getPort() != null && !domoticzAddress.getPort().isEmpty())
+				newUrl = newUrl + ":" + domoticzAddress.getPort();
+
+			if(thePayload.startsWith("/"))
+				newUrl = newUrl + thePayload;
+			else
+				newUrl = newUrl + "/" + thePayload;
+		}
+		
+		return newUrl;
+	}
+	
+	public NameValue[] buildHeaders() {
+		NameValue[] headers = null;
+		
+		if(domoticzAddress.getUsername() != null && !domoticzAddress.getUsername().isEmpty()
+				&& domoticzAddress.getPassword() != null && !domoticzAddress.getPassword().isEmpty()) {
+			NameValue theAuth = new NameValue();
+			theAuth.setName("Authorization");
+			String encoding = Base64.getEncoder().encodeToString((domoticzAddress.getUsername() + ":" + domoticzAddress.getPassword()).getBytes());
+			theAuth.setValue("Basic " + encoding);
+			headers = new NameValue[1];
+			headers[0] = theAuth;
+		}
+		
+		return headers;
+	}
 	public NamedIP getDomoticzAddress() {
 		return domoticzAddress;
 	}
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
index ce08ecf..e03b40a 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
@@ -1,6 +1,5 @@
 package com.bwssystems.HABridge.plugins.domoticz;
 
-import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -17,13 +16,16 @@ import com.bwssystems.HABridge.api.CallItem;
 import com.bwssystems.HABridge.api.hue.HueError;
 import com.bwssystems.HABridge.api.hue.HueErrorResponse;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
+import com.bwssystems.HABridge.hue.BrightnessDecode;
 import com.bwssystems.HABridge.hue.MultiCommandUtil;
+import com.bwssystems.HABridge.plugins.http.HTTPHandler;
 import com.google.gson.Gson;
 
 public class DomoticzHome implements Home {
     private static final Logger log = LoggerFactory.getLogger(DomoticzHome.class);
 	private Map<String, DomoticzHandler> domoticzs;
 	private Boolean validDomoticz;
+    private HTTPHandler httpClient;
 
 	public DomoticzHome(BridgeSettingsDescriptor bridgeSettings) {
 		super();
@@ -40,14 +42,14 @@ public class DomoticzHome implements Home {
 		List<DomoticzDevice> deviceList = new ArrayList<DomoticzDevice>();
 		while(keys.hasNext()) {
 			String key = keys.next();
-			theResponse = domoticzs.get(key).getDevices();
+			theResponse = domoticzs.get(key).getDevices(httpClient);
 			if(theResponse != null)
 				addDomoticzDevices(deviceList, theResponse, key);
 			else {
 				log.warn("Cannot get lights for Domoticz with name: " + key + ", skipping this Domoticz.");
 				continue;
 			}
-			theResponse = domoticzs.get(key).getScenes();
+			theResponse = domoticzs.get(key).getScenes(httpClient);
 			if(theResponse != null)
 				addDomoticzDevices(deviceList, theResponse, key);
 			else
@@ -70,6 +72,7 @@ public class DomoticzHome implements Home {
 	@Override
 	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity,
 			Integer targetBri,Integer targetBriInc, DeviceDescriptor device, String body) {
+		Devices theDomoticzApiResponse = null;
 		String responseString = null;
 		
 		String theUrl = anItem.getItem().getAsString();
@@ -78,13 +81,38 @@ public class DomoticzHome implements Home {
 			String hostPortion = intermediate.substring(0, intermediate.indexOf('/'));
 			String theUrlBody = intermediate.substring(intermediate.indexOf('/') + 1);
 			String hostAddr = null;
-			String port = null;
 			if (hostPortion.contains(":")) {
 				hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
-				port = hostPortion.substring(intermediate.indexOf(':') + 1);
 			} else
 				hostAddr = hostPortion;
-			
+			DomoticzHandler theHandler = findHandlerByAddress(hostAddr);
+			if(theHandler != null){
+		    	String theData;
+				String anUrl = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody,
+						intensity, targetBri, targetBriInc, false);
+		   		theData = httpClient.doHttpRequest(theHandler.buildUrl(anUrl), null, null, null, theHandler.buildHeaders());
+		   		try {
+		   			theDomoticzApiResponse = new Gson().fromJson(theData, Devices.class);
+		   			if(theDomoticzApiResponse.getStatus().equals("OK"))
+		   				responseString = null;
+		   			else {
+		    			log.warn("Call failed for Domoticz " + theHandler.getDomoticzAddress().getName() + " with status " + theDomoticzApiResponse.getStatus() + " for item " + theDomoticzApiResponse.getTitle());
+						responseString = new Gson().toJson(HueErrorResponse.createResponse("6", "/lights/" + lightId,
+								"Error on calling url to change device state", "/lights/"
+								+ lightId + "state", null, null).getTheErrors(), HueError[].class);
+		   			}
+		   		} catch (Exception e) {
+	    			log.warn("Cannot interrpret result from call for Domoticz " + theHandler.getDomoticzAddress().getName() + " as response is not parsable.");
+					responseString = new Gson().toJson(HueErrorResponse.createResponse("6", "/lights/" + lightId,
+							"Error on calling url to change device state", "/lights/"
+							+ lightId + "state", null, null).getTheErrors(), HueError[].class);
+		    	}
+			} else {
+				log.warn("Domoticz Call could not complete, no address found: " + theUrl);
+				responseString = new Gson().toJson(HueErrorResponse.createResponse("6", "/lights/" + lightId,
+						"Error on calling url to change device state", "/lights/"
+						+ lightId + "state", null, null).getTheErrors(), HueError[].class);
+			}
 		} else {
 			log.warn("Domoticz Call to be presented as http(s)://<ip_address>(:<port>)/payload, format of request unknown: " + theUrl);
 			responseString = new Gson().toJson(HueErrorResponse.createResponse("6", "/lights/" + lightId,
@@ -100,6 +128,7 @@ public class DomoticzHome implements Home {
 		log.info("Domoticz Home created." + (validDomoticz ? "" : " No Domoticz devices configured."));
 		if(!validDomoticz)
 			return null;
+        httpClient = new HTTPHandler();
 		domoticzs = new HashMap<String, DomoticzHandler>();
 		Iterator<NamedIP> theList = bridgeSettings.getDomoticzaddress().getDevices().iterator();
 		while(theList.hasNext()) {
@@ -116,12 +145,23 @@ public class DomoticzHome implements Home {
 
 	private DomoticzHandler findHandlerByAddress(String hostAddress) {
 		DomoticzHandler aHandler = null;
-		
+		boolean found = false;
+		Iterator<String> keys = domoticzs.keySet().iterator();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			aHandler = domoticzs.get(key);
+			if(aHandler != null && aHandler.getDomoticzAddress().getIp().equals(hostAddress)) {
+				found = true;
+				break;
+			}	
+		}
+		if(!found)
+			aHandler = null;
 		return aHandler;
 	}
 	@Override
 	public void closeHome() {
-		// noop
+		httpClient.closeHandler();
 		
 	}
 }
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
index 245b729..5a78902 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
+
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 
@@ -11,20 +12,20 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.ssl.SSLContexts;
+
 import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,23 +34,23 @@ import com.bwssystems.HABridge.api.NameValue;
 
 public class HTTPHandler {
 	private static final Logger log = LoggerFactory.getLogger(HTTPHandler.class);
-	private HttpClient httpClient;
-//	private CloseableHttpClient httpclientSSL;
+//	private HttpClient httpClient;
+	private CloseableHttpClient httpClient;
 //	private SSLContext sslcontext;
 //	private SSLConnectionSocketFactory sslsf;
-//	private RequestConfig globalConfig;
+	private RequestConfig globalConfig;
 	
 	
 	public HTTPHandler() {
-		httpClient = HttpClients.createDefault();
+//		httpClient = HttpClients.createDefault();
 		// Removed Specific SSL as Apache HttpClient automatically uses SSL if the URI starts with https://
 		// Trust own CA and all self-signed certs
 //		sslcontext = SSLContexts.createDefault();
 		// Allow TLSv1 protocol only
 //		sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLS" }, null,
 //				SSLConnectionSocketFactory.getDefaultHostnameVerifier());
-//		globalConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
-//		httpclientSSL = HttpClients.custom().setSSLSocketFactory(sslsf).setDefaultRequestConfig(globalConfig).build();
+		globalConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
+		httpClient = HttpClients.custom().setDefaultRequestConfig(globalConfig).build();
 	}
 
 
@@ -142,23 +143,22 @@ public class HTTPHandler {
 		return theContent;
 	}
 	
-	public HttpClient getHttpClient() {
+//	public HttpClient getHttpClient() {
+//		return httpClient;
+//	}
+
+
+	public CloseableHttpClient getHttpClient() {
 		return httpClient;
 	}
 
 
-//	public CloseableHttpClient getHttpclientSSL() {
-//		return httpclientSSL;
-//	}
-
-
 	public void closeHandler() {
+		try {
+			httpClient.close();
+		} catch (IOException e) {
+			// noop
+		}
 		httpClient = null;
-//		try {
-//			httpclientSSL.close();
-//		} catch (IOException e) {
-//			// noop
-//		}
-//		httpclientSSL = null;
 	}
 }

From 54e9303708a1f131959fd744885af6dd318aa19b Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Fri, 24 Feb 2017 15:53:35 -0600
Subject: [PATCH 17/24] merge reqdme

---
 README.md | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 5286e0e..0ef7aef 100644
--- a/README.md
+++ b/README.md
@@ -33,27 +33,23 @@ ATTENTION: This requires JDK 1.8 to run
 ATTENTION: Due to port 80 being the default, Linux restricts this to super user. Use the instructions below.
 
 ```
-java -jar ha-bridge-4.1.4.jar
+java -jar ha-bridge-4.2.0.jar
 ```
 ### Automation on Linux systems
 To have this configured and running automatically there are a few resources to use. One is using Docker and a docker container has been built for this and can be gotten here: https://github.com/aptalca/docker-ha-bridge
 
-Create the directory and make sure that ha-bridge-4.1.2.jar is in your /home/pi/habridge directory.
-Create the directory and make sure that ha-bridge-4.1.4.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.2.0.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
 
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.2/ha-bridge-4.1.2.jar
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.4/ha-bridge-4.1.4.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.2.0/ha-bridge-4.2.0.jar
 ```
-Create the directory and make sure that ha-bridge-4.1.2.jar is in your /home/pi/habridge directory.
-Create the directory and make sure that ha-bridge-4.1.4.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.2.0.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.2/ha-bridge-4.1.2.jar
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.4/ha-bridge-4.1.4.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.2.0/ha-bridge-4.2.0.jar
 ```
 #### System Control Setup on a pi (preferred)
 For next gen Linux systems (this includes the Raspberry Pi), here is a systemctl unit file that you can install. Here is a link on how to do this: https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
@@ -73,8 +69,7 @@ After=network.target
 [Service]
 Type=simple
 
-ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.2.jar
-ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.4.jar
+ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.2.0.jar
 
 [Install]
 WantedBy=multi-user.target
@@ -109,8 +104,7 @@ Then cut and past this, modify any locations that are not correct
 ```
 cd /home/pi/habridge
 rm /home/pi/habridge/habridge-log.txt
-nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.2.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
-nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.4.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
+nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.2.0.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
 
 chmod 777 /home/pi/habridge/habridge-log.txt
 ```

From 4de14217b486b54918b3ab4d4f4800cf6a304d2b Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Thu, 2 Mar 2017 16:36:56 -0600
Subject: [PATCH 18/24] Fixed null http handler issue for close

---
 pom.xml                                                        | 2 +-
 .../com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b10f483..b62cad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.2.0</version>
+	<version>4.2.0a</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
index e03b40a..45f66a7 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/domoticz/DomoticzHome.java
@@ -161,7 +161,8 @@ public class DomoticzHome implements Home {
 	}
 	@Override
 	public void closeHome() {
-		httpClient.closeHandler();
+		if(httpClient != null)
+			httpClient.closeHandler();
 		
 	}
 }

From 7b97bd75aeca8eed6177db576bc899e4fa054063 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Fri, 3 Mar 2017 16:25:45 -0600
Subject: [PATCH 19/24] fixed uniqueid on copy

---
 pom.xml                                  | 2 +-
 src/main/resources/public/scripts/app.js | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b62cad6..af9159c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.2.0a</version>
+	<version>4.2.0b</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index 612162d..484f08b 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -2447,8 +2447,11 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi
 			bridgeService.displayWarn("Error adding device. Name has not been changed from original.", null);
 			return;
 		}
-		if (copy)
+		if (copy) {
 			$scope.device.id = null;
+			$scope.device.uniqueid = null;
+			$scope.device.mapId = $scope.device.mapId + "-copy";
+		}
 		if($scope.mapTypeSelected !== undefined && $scope.mapTypeSelected !== null)
 			$scope.device.mapType = $scope.mapTypeSelected[0];
 		else

From a578aa9fd800314d06585bebc1278535f37c1169 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Mon, 6 Mar 2017 16:30:23 -0600
Subject: [PATCH 20/24] Update TCP handling to save connection. Added debug to
 http handler.

---
 pom.xml                                       |  2 +-
 .../HABridge/plugins/http/HTTPHandler.java    | 97 +++++++++----------
 .../HABridge/plugins/tcp/TCPHome.java         | 49 +++++++---
 3 files changed, 82 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index af9159c..e6f5f92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.2.0b</version>
+	<version>4.2.0c</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
index 5a78902..7c6ef96 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
@@ -5,16 +5,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.ssl.SSLContexts;
-
 import org.apache.http.HttpResponse;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
@@ -34,21 +24,11 @@ import com.bwssystems.HABridge.api.NameValue;
 
 public class HTTPHandler {
 	private static final Logger log = LoggerFactory.getLogger(HTTPHandler.class);
-//	private HttpClient httpClient;
 	private CloseableHttpClient httpClient;
-//	private SSLContext sslcontext;
-//	private SSLConnectionSocketFactory sslsf;
 	private RequestConfig globalConfig;
 	
 	
 	public HTTPHandler() {
-//		httpClient = HttpClients.createDefault();
-		// Removed Specific SSL as Apache HttpClient automatically uses SSL if the URI starts with https://
-		// Trust own CA and all self-signed certs
-//		sslcontext = SSLContexts.createDefault();
-		// Allow TLSv1 protocol only
-//		sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLS" }, null,
-//				SSLConnectionSocketFactory.getDefaultHostnameVerifier());
 		globalConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
 		httpClient = HttpClients.custom().setDefaultRequestConfig(globalConfig).build();
 	}
@@ -101,40 +81,55 @@ public class HTTPHandler {
 				request.setHeader(headers[i].getName(), headers[i].getValue());
 			}
 		}
+		HttpResponse response;
 		try {
-			HttpResponse response;
-			// Removed Specific SSL as Apache HttpClient automatically uses SSL if the URI starts with https://
-//			if (url.startsWith("xyzhttps"))
-//				response = httpclientSSL.execute(request);
-//			else
+			for(int retryCount = 0; retryCount < 2; retryCount++) {
 				response = httpClient.execute(request);
-			log.debug((httpVerb == null ? "GET" : httpVerb) + " execute on URL responded: "
-					+ response.getStatusLine().getStatusCode());
-			if (response.getStatusLine().getStatusCode() >= 200 && response.getStatusLine().getStatusCode() < 300) {
-				if (response.getEntity() != null) {
-					try {
-						theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
-																											// content
-																											// for
-																											// data
-						EntityUtils.consume(response.getEntity()); // close out
-																	// inputstream
-																	// ignore
-																	// content
-					} catch (Exception e) {
-						log.debug("Error ocurred in handling response entity after successful call, still responding success. "
-										+ e.getMessage(), e);
+				log.debug((httpVerb == null ? "GET" : httpVerb) + " execute (" + retryCount + ") on URL responded: "
+						+ response.getStatusLine().getStatusCode());
+				if (response.getStatusLine().getStatusCode() >= 200 && response.getStatusLine().getStatusCode() < 300) {
+					if (response.getEntity() != null) {
+						try {
+							theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
+																												// content
+																												// for
+																												// data
+							EntityUtils.consume(response.getEntity()); // close out
+																		// inputstream
+																		// ignore
+																		// content
+						} catch (Exception e) {
+							log.debug("Error ocurred in handling response entity after successful call, still responding success. "
+											+ e.getMessage(), e);
+						}
+						log.debug("Successfull response - The http response is <<<" + theContent + ">>>");
 					}
-				}
-			} else {
-				log.warn("HTTP response code was not an expected successful response of between 200 - 299, the code was: " + response.getStatusLine());
-				try {
-					EntityUtils.consume(response.getEntity()); // close out
-					// inputstream
-					// ignore
-					// content
-				} catch (Exception e) {
-					//noop
+					retryCount = 2;
+				} else {
+					log.warn("HTTP response code was not an expected successful response of between 200 - 299, the code was: " + response.getStatusLine());
+					try {
+						String someContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
+						// content
+						// for
+						// data
+						EntityUtils.consume(response.getEntity()); // close out
+						// inputstream
+						// ignore
+						// content
+						log.debug("Unsuccessfull response - The http response is <<<" + someContent + ">>>");
+					} catch (Exception e) {
+						//noop
+					}
+					if (response.getStatusLine().getStatusCode() == 504) {
+						log.warn("HTTP response code was 504, retrying...");
+						try {
+							Thread.sleep(1000);
+						} catch (InterruptedException e1) {
+							// noop
+						}
+					}
+					else
+						retryCount = 2;
 				}
 			}
 		} catch (IOException e) {
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
index 5fb124b..aea477c 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
@@ -1,9 +1,13 @@
 package com.bwssystems.HABridge.plugins.tcp;
 
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import javax.xml.bind.DatatypeConverter;
 
@@ -21,6 +25,7 @@ import com.bwssystems.HABridge.hue.TimeDecode;
 public class TCPHome implements Home {
     private static final Logger log = LoggerFactory.getLogger(TCPHome.class);
 	private byte[] sendData;
+	private Map<String, Socket> theSockets;
     
 
 	public TCPHome(BridgeSettingsDescriptor bridgeSettings) {
@@ -31,6 +36,7 @@ public class TCPHome implements Home {
 	@Override
 	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity,
 			Integer targetBri,Integer targetBriInc, DeviceDescriptor device, String body) {
+		Socket dataSendSocket = null;
 		log.debug("executing HUE api request to TCP: " + anItem.getItem().getAsString());
 		String theUrl = anItem.getItem().getAsString();
 		if(theUrl != null && !theUrl.isEmpty () && theUrl.startsWith("tcp://")) {
@@ -40,15 +46,25 @@ public class TCPHome implements Home {
 			String hostAddr = null;
 			String port = null;
 			InetAddress IPAddress = null;
-			if (hostPortion.contains(":")) {
-				hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
-				port = hostPortion.substring(intermediate.indexOf(':') + 1);
-			} else
-				hostAddr = hostPortion;
-			try {
-				IPAddress = InetAddress.getByName(hostAddr);
-			} catch (UnknownHostException e) {
-				// noop
+			dataSendSocket = theSockets.get(hostPortion);
+			if(dataSendSocket == null) {
+				if (hostPortion.contains(":")) {
+					hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
+					port = hostPortion.substring(intermediate.indexOf(':') + 1);
+				} else
+					hostAddr = hostPortion;
+				try {
+					IPAddress = InetAddress.getByName(hostAddr);
+				} catch (UnknownHostException e) {
+					// noop
+				}
+		
+				try {
+					dataSendSocket = new Socket(IPAddress, Integer.parseInt(port));
+					theSockets.put(hostPortion, dataSendSocket);
+				} catch (Exception e) {
+					// noop
+				}
 			}
 	
 			theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
@@ -59,13 +75,10 @@ public class TCPHome implements Home {
 				theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
 				sendData = theUrlBody.getBytes();
 			}
-	
 			try {
-				Socket dataSendSocket = new Socket(IPAddress, Integer.parseInt(port));
 				DataOutputStream outToClient = new DataOutputStream(dataSendSocket.getOutputStream());
 				outToClient.write(sendData);
 				outToClient.flush();
-				dataSendSocket.close();
 			} catch (Exception e) {
 				// noop
 			}
@@ -77,6 +90,7 @@ public class TCPHome implements Home {
 	@Override
 	public Home createHome(BridgeSettingsDescriptor bridgeSettings) {
 		log.info("TCP Home created.");
+		theSockets = new HashMap<String, Socket>();
 		return this;
 	}
 
@@ -88,8 +102,15 @@ public class TCPHome implements Home {
 
 	@Override
 	public void closeHome() {
-		// noop
-		
+		Iterator<?> anIterator = theSockets.entrySet().iterator();
+		while(anIterator.hasNext()) {
+			Socket aSocket = (Socket) anIterator.next();
+			try {
+				aSocket.close();
+			} catch (IOException e) {
+				// noop
+			}
+		}
 	}
 
 }

From f6cb41b8801ec1f22330e7823267f6d0e73f823a Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Tue, 7 Mar 2017 16:36:25 -0600
Subject: [PATCH 21/24] Fixed hex handling of intensity. Added handling for \n,
 \t, \r and so forth in tcp,udp and mqtt.

---
 pom.xml                                       |  7 ++++++-
 .../HABridge/hue/BrightnessDecode.java        | 21 +++++++++++++++----
 .../HABridge/plugins/mqtt/MQTTHandler.java    |  3 ++-
 .../HABridge/plugins/tcp/TCPHome.java         |  2 ++
 .../HABridge/plugins/udp/UDPHome.java         |  2 ++
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6f5f92..e28f6ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.2.0c</version>
+	<version>4.2.0d</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -126,6 +126,11 @@
 		  <artifactId>lifx-sdk-java</artifactId>
 		  <version>2.1.6</version>
 		</dependency>
+		<dependency>
+		  <groupId>org.apache.commons</groupId>
+		  <artifactId>commons-lang3</artifactId>
+		  <version>3.5</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java b/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
index 7c31f11..9c5b7c9 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
@@ -3,6 +3,8 @@ package com.bwssystems.HABridge.hue;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
+
+import org.apache.commons.lang3.Conversion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import net.java.dev.eval.Expression;
@@ -44,7 +46,7 @@ public class BrightnessDecode {
 		}
 		if (request.contains(INTENSITY_BYTE)) {
 			if (isHex) {
-				String hexValue = Integer.toHexString(intensity);
+				String hexValue = convertToHex(intensity);
 				request = request.replace(INTENSITY_BYTE, hexValue);
 			} else {
 				String intensityByte = String.valueOf(intensity);
@@ -53,7 +55,7 @@ public class BrightnessDecode {
 		} else if (request.contains(INTENSITY_PERCENT)) {
 			int percentBrightness = (int) Math.round(intensity / 255.0 * 100);
 			if (isHex) {
-				String hexValue = Integer.toHexString(percentBrightness);
+				String hexValue = convertToHex(percentBrightness);
 				request = request.replace(INTENSITY_PERCENT, hexValue);
 			} else {
 				String intensityPercent = String.valueOf(percentBrightness);
@@ -72,7 +74,7 @@ public class BrightnessDecode {
 				BigDecimal result = exp.eval(variables);
 				Integer endResult = Math.round(result.floatValue());
 				if (isHex) {
-					String hexValue = Integer.toHexString(endResult);
+					String hexValue = convertToHex(endResult);
 					request = request.replace(INTENSITY_MATH + mathDescriptor + INTENSITY_MATH_CLOSE, hexValue);
 				} else {
 					request = request.replace(INTENSITY_MATH + mathDescriptor + INTENSITY_MATH_CLOSE,
@@ -89,4 +91,15 @@ public class BrightnessDecode {
 	public static String calculateReplaceIntensityValue(String request, int theIntensity, Integer targetBri, Integer targetBriInc, boolean isHex) {
 		return replaceIntensityValue(request, calculateIntensity(theIntensity, targetBri, targetBriInc), isHex);
 	}
-}
+	
+	// Apache Commons Conversion utils likes little endian too much
+	private static String convertToHex(int theValue) {
+		String destHex = "00";
+		String hexValue = Conversion.intToHex(theValue, 0, destHex, 0, 2);
+		byte[] theBytes = hexValue.getBytes();
+		byte[] newBytes = new byte[2];
+		newBytes[0] = theBytes[1];
+		newBytes[1] = theBytes[0];
+		return new String(newBytes);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java b/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
index d96ab68..e40001f 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/mqtt/MQTTHandler.java
@@ -1,5 +1,6 @@
 package com.bwssystems.HABridge.plugins.mqtt;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.eclipse.paho.client.mqttv3.MqttClient;
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -47,7 +48,7 @@ public class MQTTHandler {
 	}
 
 	public void publishMessage(String topic, String content) {
-        MqttMessage message = new MqttMessage(content.getBytes());
+        MqttMessage message = new MqttMessage(StringEscapeUtils.unescapeJava(content).getBytes());
         message.setQos(qos);
         try {
 			myClient.publish(topic, message);
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
index aea477c..42e05f9 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
@@ -11,6 +11,7 @@ import java.util.Map;
 
 import javax.xml.bind.DatatypeConverter;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,6 +74,7 @@ public class TCPHome implements Home {
 				sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
 			} else {
 				theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
+				theUrlBody = StringEscapeUtils.unescapeJava(theUrlBody);
 				sendData = theUrlBody.getBytes();
 			}
 			try {
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
index b93a72e..1244bff 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java
@@ -6,6 +6,7 @@ import java.net.UnknownHostException;
 
 import javax.xml.bind.DatatypeConverter;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,6 +60,7 @@ public class UDPHome implements Home {
 				sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
 			} else {
 				theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
+				theUrlBody = StringEscapeUtils.unescapeJava(theUrlBody);
 				sendData = theUrlBody.getBytes();
 			}
 			try {

From ed8fc95782387f4a232ac8e76630b2cb5fb903c0 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Wed, 8 Mar 2017 14:59:04 -0600
Subject: [PATCH 22/24] Fixed HA group support. Added JSON check for new
 devices. Added Device level filtering. Added decimal percentage.

---
 README.md                                     | 20 +++++-----
 pom.xml                                       |  4 +-
 .../HABridge/dao/DeviceDescriptor.java        | 11 ++++++
 .../HABridge/dao/DeviceRepository.java        | 27 +++++++++++++
 .../devicemanagmeent/DeviceResource.java      | 39 ++++++++++++++++++-
 .../HABridge/hue/BrightnessDecode.java        |  6 +++
 .../bwssystems/HABridge/hue/HueMulator.java   |  7 ++--
 .../HABridge/plugins/hass/HomeAssistant.java  |  8 +++-
 .../HABridge/plugins/tcp/TCPHome.java         | 25 ++++++++----
 .../public/views/domoticzdevice.html          |  1 +
 .../resources/public/views/editdevice.html    | 13 +++++--
 .../resources/public/views/haldevice.html     |  1 +
 .../resources/public/views/hassdevice.html    |  1 +
 .../resources/public/views/veradevice.html    |  1 +
 14 files changed, 134 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 0ef7aef..da5977a 100644
--- a/README.md
+++ b/README.md
@@ -33,23 +33,23 @@ ATTENTION: This requires JDK 1.8 to run
 ATTENTION: Due to port 80 being the default, Linux restricts this to super user. Use the instructions below.
 
 ```
-java -jar ha-bridge-4.2.0.jar
+java -jar ha-bridge-4.2.1.jar
 ```
 ### Automation on Linux systems
 To have this configured and running automatically there are a few resources to use. One is using Docker and a docker container has been built for this and can be gotten here: https://github.com/aptalca/docker-ha-bridge
 
-Create the directory and make sure that ha-bridge-4.2.0.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.2.1.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
 
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.2.0/ha-bridge-4.2.0.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.2.1/ha-bridge-4.2.1.jar
 ```
-Create the directory and make sure that ha-bridge-4.2.0.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.2.1.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.2.0/ha-bridge-4.2.0.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.2.1/ha-bridge-4.2.1.jar
 ```
 #### System Control Setup on a pi (preferred)
 For next gen Linux systems (this includes the Raspberry Pi), here is a systemctl unit file that you can install. Here is a link on how to do this: https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
@@ -69,7 +69,7 @@ After=network.target
 [Service]
 Type=simple
 
-ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.2.0.jar
+ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.2.1.jar
 
 [Install]
 WantedBy=multi-user.target
@@ -104,7 +104,7 @@ Then cut and past this, modify any locations that are not correct
 ```
 cd /home/pi/habridge
 rm /home/pi/habridge/habridge-log.txt
-nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.2.0.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
+nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.2.1.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
 
 chmod 777 /home/pi/habridge/habridge-log.txt
 ```
@@ -354,7 +354,7 @@ Headers can be added as well using a Json construct [{"name":"header type name",
 
 Another option that is detected by the bridge is to use UDP or TCP direct calls such as `udp://<ip_address>:<port>/<your stuff here>` to send a UDP request. TCP calls are handled the same way as `tcp://<ip_address>:<port>/<your stuff here>`. If your data for the UDP or TCP request is formatted as "0x00F009B9" lexical hex format, the bridge will convert the data into a binary stream to send.
 
-You can also use the value replacement constructs within these statements. Such as using the expressions "${time.format(Java time format string)}" for inserting a date/time stamp, ${intensity.percent} for 0-100 or ${intensity.byte} for 0-255 for straight pass through of the value or items that require special calculated values using ${intensity.math()} i.e. "${intensity.math(X/4)}". See Value Passing Controls Below.
+You can also use the value replacement constructs within these statements. Such as using the expressions "${time.format(Java time format string)}" for inserting a date/time stamp, ${intensity.percent} for 0-100 or ${intensity.decimal_percent} for 0.00-1.00 or ${intensity.byte} for 0-255 for straight pass through of the value or items that require special calculated values using ${intensity.math()} i.e. "${intensity.math(X/4)}". See Value Passing Controls Below.
 Examples:
 ```
 
@@ -408,7 +408,7 @@ OR
 
 ```
 #### Value Passing Controls
-There are multiple replacement constructs available to be put into any of the calls except Harmony items, Net Items and HAL items. These constructs are: "${time.format(Java time format string)}", "${intensity.percent}", "${intensity.byte}" and "${intensity.math(using X in your calc)}".
+There are multiple replacement constructs available to be put into any of the calls except Harmony items, Net Items and HAL items. These constructs are: "${time.format(Java time format string)}", "${intensity.percent}", "${intensity.decimal_percent}", "${intensity.byte}" and "${intensity.math(using X in your calc)}".
 You can control items that require special calculated values using ${intensity.math(<your expression using "X" as the value to operate on>)} i.e. "${intensity.math(X/4)}".
 For the items that want to have a date time put into the message, utilize ${time.format(yyyy-MM-ddTHH:mm:ssXXX)} where "yyyy-MM-ddTHH:mm:ssXXX" can be any format from the Java SimpleDateFormat documented here: https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html
 e.g.
@@ -518,7 +518,7 @@ contentBodyOff | string | This is the content body that you would like to send w
 }
 ```
 #### Dimming Control Example
-Dimming is also supported by using the expressions ${intensity.percent} for 0-100 or ${intensity.byte} for 0-255 for straight pass through of the value.
+Dimming is also supported by using the expressions ${intensity.percent} for 0-100 or ${intensity.decimal_percent} for 0.00-1.00 or ${intensity.byte} for 0-255 for straight pass through of the value.
 e.g.
 ```
 {
diff --git a/pom.xml b/pom.xml
index e28f6ac..638a919 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.2.0d</version>
+	<version>4.2.1</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.github.bwssytems</groupId>
             <artifactId>nest-controller</artifactId>
-            <version>1.0.13</version>
+            <version>1.0.14</version>
 		    <exclusions>
 		       <exclusion> 
 		          <groupId>org.slf4j</groupId>
diff --git a/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java b/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
index a727c26..547b04e 100644
--- a/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
@@ -62,6 +62,9 @@ public class DeviceDescriptor{
     @SerializedName("noState")
     @Expose
     private boolean noState;
+    @SerializedName("requesterAddress")
+    @Expose
+    private String requesterAddress;
 
     private DeviceState deviceState;
     
@@ -219,6 +222,14 @@ public class DeviceDescriptor{
 		this.noState = noState;
 	}
 
+	public String getRequesterAddress() {
+		return requesterAddress;
+	}
+
+	public void setRequesterAddress(String requesterAddress) {
+		this.requesterAddress = requesterAddress;
+	}
+
 	public boolean containsType(String aType) {
 		if(aType == null)
 			return false;
diff --git a/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java b/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
index a06a8d8..cf44ecb 100644
--- a/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
+++ b/src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
@@ -83,6 +83,33 @@ public class DeviceRepository extends BackupHandler {
 		return list;
 	}
 
+	public List<DeviceDescriptor> findAllByRequester(String anAddress) {
+		List<DeviceDescriptor> list = new ArrayList<DeviceDescriptor>(devices.values());
+		List<DeviceDescriptor> theReturnList = new ArrayList<DeviceDescriptor>();
+		Iterator<DeviceDescriptor> anIterator = list.iterator();
+		DeviceDescriptor theDevice;
+		String theRequesterAddress;
+
+		HashMap<String,String > addressMap;
+		while (anIterator.hasNext()) {
+			theDevice = anIterator.next();
+			theRequesterAddress = theDevice.getRequesterAddress();
+			addressMap = new HashMap<String, String>();
+			if(theRequesterAddress != null) {
+				if (theRequesterAddress.contains(",")) {
+					String[] theArray = theRequesterAddress.split(",");
+					for (String v : theArray) {
+						addressMap.put(v.trim(), v.trim());
+					}
+				} else
+					addressMap.put(theRequesterAddress, theRequesterAddress);
+			}
+			if (theRequesterAddress == null || theRequesterAddress.length() == 0 || addressMap.containsKey(anAddress))
+				theReturnList.add(theDevice);
+		}
+		return theReturnList;
+	}
+
 	public DeviceDescriptor findOne(String id) {
     	return devices.get(id);	
     }
diff --git a/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java b/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
index 98aaa63..e4bb6ca 100644
--- a/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
+++ b/src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java
@@ -18,12 +18,15 @@ import org.slf4j.LoggerFactory;
 import com.bwssystems.HABridge.BridgeSettingsDescriptor;
 import com.bwssystems.HABridge.DeviceMapTypes;
 import com.bwssystems.HABridge.HomeManager;
+import com.bwssystems.HABridge.api.CallItem;
 import com.bwssystems.HABridge.dao.BackupFilename;
 import com.bwssystems.HABridge.dao.DeviceDescriptor;
 import com.bwssystems.HABridge.dao.DeviceRepository;
 import com.bwssystems.HABridge.dao.ErrorMessage;
 import com.bwssystems.HABridge.util.JsonTransformer;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
 
 /**
 	spark core server for bridge configuration
@@ -33,11 +36,13 @@ public class DeviceResource {
     private static final Logger log = LoggerFactory.getLogger(DeviceResource.class);
     private DeviceRepository deviceRepository;
     private HomeManager homeManager;
+	private Gson aGsonHandler;
     private static final Set<String> supportedVerbs = new HashSet<>(Arrays.asList("get", "put", "post"));
 
 	public DeviceResource(BridgeSettingsDescriptor theSettings, HomeManager aHomeManager) {
 		this.deviceRepository = new DeviceRepository(theSettings.getUpnpDeviceDb());
 		homeManager = aHomeManager;
+		aGsonHandler = new GsonBuilder().create();
 		setupEndpoints();
 	}
 
@@ -65,14 +70,44 @@ public class DeviceResource {
 	    	else {
 	    		devices = new Gson().fromJson("[" + request.body() + "]", DeviceDescriptor[].class);
 	    	}
+			CallItem[] callItems = null;
+			String errorMessage = null;
 	    	for(int i = 0; i < devices.length; i++) {
 		    	if(devices[i].getContentBody() != null ) {
 		            if (devices[i].getContentType() == null || devices[i].getHttpVerb() == null || !supportedVerbs.contains(devices[i].getHttpVerb().toLowerCase())) {
 		            	response.status(HttpStatus.SC_BAD_REQUEST);
-						log.debug("Bad http verb in create a Device(s): " + request.body());
-						return new ErrorMessage("Bad http verb in create a Device(s): " + request.body() + " ");
+		            	errorMessage = "Bad http verb in create device(s) for name: " + devices[i].getName() + " with verb: " + devices[i].getHttpVerb();
+						log.debug(errorMessage);
+						return new ErrorMessage(errorMessage);
 		            }
 		        }
+				try {
+					if(devices[i].getOnUrl() != null && !devices[i].getOnUrl().isEmpty())
+						callItems = aGsonHandler.fromJson(devices[i].getOnUrl(), CallItem[].class);
+				} catch(JsonSyntaxException e) {
+	            	response.status(HttpStatus.SC_BAD_REQUEST);
+	            	errorMessage = "Bad on URL JSON in create device(s) for name: " + devices[i].getName() + " with on URL: " + devices[i].getOnUrl();
+					log.debug(errorMessage);
+					return new ErrorMessage(errorMessage);
+				}
+				try {
+					if(devices[i].getDimUrl() != null && !devices[i].getDimUrl().isEmpty())
+						callItems = aGsonHandler.fromJson(devices[i].getDimUrl(), CallItem[].class);
+				} catch(JsonSyntaxException e) {
+	            	response.status(HttpStatus.SC_BAD_REQUEST);
+	            	errorMessage = "Bad dim URL JSON in create device(s) for name: " + devices[i].getName() + " with dim URL: " + devices[i].getDimUrl();
+					log.debug(errorMessage);
+					return new ErrorMessage(errorMessage);
+				}
+				try {
+					if(devices[i].getOffUrl() != null && !devices[i].getOffUrl().isEmpty())
+						callItems = aGsonHandler.fromJson(devices[i].getOffUrl(), CallItem[].class);
+				} catch(JsonSyntaxException e) {
+	            	response.status(HttpStatus.SC_BAD_REQUEST);
+	            	errorMessage = "Bad off URL JSON in create device(s) for name: " + devices[i].getName() + " with off URL: " + devices[i].getOffUrl();
+					log.debug(errorMessage);
+					return new ErrorMessage(errorMessage);
+				}
 	    	}
 
 	    	deviceRepository.save(devices);
diff --git a/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java b/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
index 9c5b7c9..ff6c186 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/BrightnessDecode.java
@@ -12,6 +12,7 @@ import net.java.dev.eval.Expression;
 public class BrightnessDecode {
 	private static final Logger log = LoggerFactory.getLogger(BrightnessDecode.class);
 	private static final String INTENSITY_PERCENT = "${intensity.percent}";
+	private static final String INTENSITY_DECIMAL_PERCENT = "${intensity.decimal_percent}";
 	private static final String INTENSITY_BYTE = "${intensity.byte}";
 	private static final String INTENSITY_MATH = "${intensity.math(";
 	private static final String INTENSITY_MATH_VALUE = "X";
@@ -61,6 +62,11 @@ public class BrightnessDecode {
 				String intensityPercent = String.valueOf(percentBrightness);
 				request = request.replace(INTENSITY_PERCENT, intensityPercent);
 			}
+		} else if (request.contains(INTENSITY_DECIMAL_PERCENT)) {
+			float decimalBrightness = (float) (intensity / 255.0);
+
+			String intensityPercent = String.format("%1.2f", decimalBrightness);
+			request = request.replace(INTENSITY_DECIMAL_PERCENT, intensityPercent);
 		} else if (request.contains(INTENSITY_MATH)) {
 			Map<String, BigDecimal> variables = new HashMap<String, BigDecimal>();
 			String mathDescriptor = request.substring(request.indexOf(INTENSITY_MATH) + INTENSITY_MATH.length(),
diff --git a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
index 017d8e2..dca0dfe 100644
--- a/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
+++ b/src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
@@ -668,7 +668,8 @@ public class HueMulator {
 		log.debug("hue lights list requested: " + userId + " from " + requestIp);
 		theErrors = validateWhitelistUser(userId, false);
 		if (theErrors == null) {
-			List<DeviceDescriptor> deviceList = repository.findActive();
+	        List<DeviceDescriptor> deviceList = repository.findAllByRequester(requestIp);
+//			List<DeviceDescriptor> deviceList = repository.findActive();
 			deviceResponseMap = new HashMap<String, DeviceResponse>();
 			for (DeviceDescriptor device : deviceList) {
 				DeviceResponse deviceResponse = null;
@@ -944,8 +945,8 @@ public class HueMulator {
 			}
 			
 			for (int i = 0; callItems != null && i < callItems.length; i++) {
-				if(!filterByRequester(callItems[i].getFilterIPs(), ipAddress)) {
-					log.debug("filter for requester address not present in list: " + callItems[i].getFilterIPs() + " with request ip of: " + ipAddress);
+				if(!filterByRequester(device.getRequesterAddress(), ipAddress) || !filterByRequester(callItems[i].getFilterIPs(), ipAddress)) {
+					log.warn("filter for requester address not present in: (device)" + device.getRequesterAddress() + " OR then (item)" + callItems[i].getFilterIPs() + " with request ip of: " + ipAddress);
 					continue;
 				}
 				if (callItems[i].getCount() != null && callItems[i].getCount() > 0)
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/hass/HomeAssistant.java b/src/main/java/com/bwssystems/HABridge/plugins/hass/HomeAssistant.java
index 9f6a702..dcf4b54 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/hass/HomeAssistant.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/hass/HomeAssistant.java
@@ -41,7 +41,12 @@ public class HomeAssistant {
 			aUrl = "https";
 		else
 			aUrl = "http";
-		aUrl = aUrl + "://" + hassAddress.getIp() + ":" + hassAddress.getPort() + "/api/services/" + aCommand.getEntityId().substring(0, aCommand.getEntityId().indexOf("."));
+		String domain = aCommand.getEntityId().substring(0, aCommand.getEntityId().indexOf("."));
+		aUrl = aUrl + "://" + hassAddress.getIp() + ":" + hassAddress.getPort() + "/api/services/";
+		if(domain.equals("group"))
+			aUrl = aUrl + "homeassistant";
+		else
+			aUrl = aUrl + domain;
 		String aBody = "{\"entity_id\":\"" + aCommand.getEntityId() + "\"";
 		NameValue[] headers = null;
 		if(hassAddress.getPassword() != null && !hassAddress.getPassword().isEmpty()) {
@@ -62,6 +67,7 @@ public class HomeAssistant {
 			aUrl = aUrl + "/turn_off";
 			aBody = aBody + "}";			
 		}
+		log.debug("Calling HomeAssistant with url: " + aUrl);
    		String theData = anHttpHandler.doHttpRequest(aUrl, HttpPost.METHOD_NAME, "application/json", aBody, headers);
    		log.debug("call Command return is: <" + theData + ">");
 		return true;
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
index 42e05f9..53cb664 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java
@@ -82,7 +82,13 @@ public class TCPHome implements Home {
 				outToClient.write(sendData);
 				outToClient.flush();
 			} catch (Exception e) {
-				// noop
+				log.warn("Could not send data to TCP socket <<<" + e.getMessage() + ">>>, closing socket: " + theUrl);
+				try {
+					dataSendSocket.close();
+				} catch (IOException e1) {
+					// noop
+				}
+				theSockets.remove(hostPortion);
 			}
 		} else
 			log.warn("Tcp Call to be presented as tcp://<ip_address>:<port>/payload, format of request unknown: " + theUrl);
@@ -104,13 +110,16 @@ public class TCPHome implements Home {
 
 	@Override
 	public void closeHome() {
-		Iterator<?> anIterator = theSockets.entrySet().iterator();
-		while(anIterator.hasNext()) {
-			Socket aSocket = (Socket) anIterator.next();
-			try {
-				aSocket.close();
-			} catch (IOException e) {
-				// noop
+		log.debug("Shutting down TCP sockets.");
+		if(theSockets != null && !theSockets.isEmpty()) {
+			Iterator<String> keys = theSockets.keySet().iterator();
+			while(keys.hasNext()) {
+				String key = keys.next();
+				try {
+					theSockets.get(key).close();
+				} catch (IOException e) {
+					// noop
+				}
 			}
 		}
 	}
diff --git a/src/main/resources/public/views/domoticzdevice.html b/src/main/resources/public/views/domoticzdevice.html
index 7f4f151..7629889 100644
--- a/src/main/resources/public/views/domoticzdevice.html
+++ b/src/main/resources/public/views/domoticzdevice.html
@@ -43,6 +43,7 @@
 				<option value="">none</option>
 				<option value="${intensity.byte}">Pass-thru Value</option>
 				<option value="${intensity.percent}">Percentage</option>
+				<option value="${intensity.decimal_percent}">Decimal Percentage</option>
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>
diff --git a/src/main/resources/public/views/editdevice.html b/src/main/resources/public/views/editdevice.html
index f380fdd..ea8df42 100644
--- a/src/main/resources/public/views/editdevice.html
+++ b/src/main/resources/public/views/editdevice.html
@@ -33,7 +33,7 @@
 			fields the bridge uses. Please use care when updating these fields as
 			you may break the settings used by the bridge to call a specific end
 			point device.</p>
-		<p class="text-muted">This area allows you to create any http or
+		<p class="text-muted">This area allows you to create any http, tcp or
 			udp call to an endpoint. You can use the default GET or select the
 			http verb type below and configure a payload for either on, dim or
 			off methods. For Execution of a
@@ -41,7 +41,7 @@
 			can use Json notation of array with [{&quot;item&quot;:&quot;the
 			payload&quot;},{&quot;item&quot;:&quot;another payload&quot;}] to
 			execute multiple entries. Adding the value replacements
-			(${intensity..byte},${intensity.percent},${intensity.math(X*1)}) will
+			(${intensity.byte},${intensity.percent},${intensity.decimal_percent},${intensity.math(X*1)}) will
 			also work. Also, you can go back to any helper tab and click a build 
 			action button to add another item for a multi-command.</p>
 		<p class="text-muted">When copying, update the name and select the "Add Bridge
@@ -65,17 +65,22 @@
 						ng-model="device.name" placeholder="Device Name"></td>
 				</tr>
 				<tr>
-					<td>Inactive</td>
+					<td><label>Inactive</label></td>
 					<td><input type="checkbox"
 						ng-model="device.inactive" ng-true-value=true
 						ng-false-value=false> {{device.inactive}}</td>
 				</tr>
 				<tr>
-					<td>No State (Do not update state for device)</td>
+					<td><label>No State (Do not update state for device)</label></td>
 					<td><input type="checkbox"
 						ng-model="device.noState" ng-true-value=true
 						ng-false-value=false> {{device.noState}}</td>
 				</tr>
+				<tr>
+					<td><label>Filter Address (comma separated list)</label></td>
+					<td><input type="text" class="form-control" id="device-requester-addr"
+						ng-model="device.requesterAddress" placeholder="Only use if you want to restrict this device to a specific caller(s)"></td>
+				</tr>
 				<tr>
 					<td><label>Target</label></td>
 
diff --git a/src/main/resources/public/views/haldevice.html b/src/main/resources/public/views/haldevice.html
index 13878cf..38b2cd3 100644
--- a/src/main/resources/public/views/haldevice.html
+++ b/src/main/resources/public/views/haldevice.html
@@ -42,6 +42,7 @@
 				<option value="">none</option>
 				<option value="${intensity.byte}">Pass-thru Value</option>
 				<option value="${intensity.percent}">Percentage</option>
+				<option value="${intensity.decimal_percent}">Decimal Percentage</option>
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>
diff --git a/src/main/resources/public/views/hassdevice.html b/src/main/resources/public/views/hassdevice.html
index bf241ea..1ff957d 100644
--- a/src/main/resources/public/views/hassdevice.html
+++ b/src/main/resources/public/views/hassdevice.html
@@ -43,6 +43,7 @@
 				<option value="">none</option>
 				<option value="${intensity.byte}">Pass-thru Value</option>
 				<option value="${intensity.percent}">Percentage</option>
+				<option value="${intensity.decimal_percent}">Decimal Percentage</option>
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>
diff --git a/src/main/resources/public/views/veradevice.html b/src/main/resources/public/views/veradevice.html
index 68105af..79c4fe7 100644
--- a/src/main/resources/public/views/veradevice.html
+++ b/src/main/resources/public/views/veradevice.html
@@ -43,6 +43,7 @@
 				<option value="">none</option>
 				<option value="${intensity.byte}">Pass-thru Value</option>
 				<option value="${intensity.percent}">Percentage</option>
+				<option value="${intensity.decimal_percent}">Decimal Percentage</option>
 				<option value="${intensity.math(X*1)}">Custom Math</option>
 			</select>
 		</p>

From 62e366c028d38982dc7124a0603ead846a304dda Mon Sep 17 00:00:00 2001
From: BWS Systems <info.bwssystems@gmail.com>
Date: Wed, 8 Mar 2017 16:03:51 -0600
Subject: [PATCH 23/24] Add pics

---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index da5977a..ae82f42 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,32 @@
 # ha-bridge
 Emulates Philips Hue api to other home automation gateways such as an Amazon Echo or Google Home.  The Bridge handles basic commands such as "On", "Off" and "brightness" commands of the hue protocol.  This bridge can control most devices that have a distinct API.
 
+Here are some diagrams to put this software in perspective.
+
+The Echo Path looks like this:
+```
+                     +------------------------+    +------------------------+
++-------------+      | H A +------------------|    | A +------------------+ |
+| Amazon Echo |----->| U P | ha-bridge core   |--->| P | Device to control| |
++-------------+      | E I +------------------|    | I +------------------+ |
+                     +------------------------+    +------------------------+
+```
+The Google Home Path looks like this:
+```
+                     +------------------------+    +------------------------+
++-------------+      | H A +------------------|    | A +------------------+ |
+| Google Home |----->| U P | ha-bridge core   |--->| P | Device to control| |
++-------------+      | E I +------------------|    | I +------------------+ |
+                     +------------------------+    +------------------------+
+```
+THe Harmony Hub Path looks like this:
+```
+                     +------------------------+    +------------------------+
++-------------+      | H A +------------------|    | A +------------------+ |
+| Harmony Hub |----->| U P | ha-bridge core   |--->| P | Device to control| |
++-------------+      | E I +------------------|    | I +------------------+ |
+                     +------------------------+    +------------------------+
+```
 **SECURITY RISK: If you are unsure on how this software operates and what it exposes to your network, please make sure you understand that it can allow root access to your system. It is best practice to not open this to the Internet through your router as there are no security protocols in place to protect the system. The License agreement states specifically that you use this at your own risk.**
 
 **ATTENTION: This requires a physical Amazon Echo, Dot or Tap and does not work with prototype devices built using the Alexa Voice Service e.g. Amazon's Alexa AVS Sample App and Sam Machin's AlexaPi. The AVS version does not have any capability for Hue Bridge discovery!**

From 1b676632fe4e0f7796fe6f200fe81c82c5b7249a Mon Sep 17 00:00:00 2001
From: Sam Turner <sam@digi.ltd.uk>
Date: Thu, 9 Mar 2017 14:58:25 +0000
Subject: [PATCH 24/24] delete kodivolume.md as there is now a page in the wiki

---
 kodivolume.md | 144 --------------------------------------------------
 1 file changed, 144 deletions(-)
 delete mode 100644 kodivolume.md

diff --git a/kodivolume.md b/kodivolume.md
deleted file mode 100644
index 165278d..0000000
--- a/kodivolume.md
+++ /dev/null
@@ -1,144 +0,0 @@
-# Kodi volume control using dim commands & JSON-RPC
-
-You can use HA Bridge to adjust the Kodi software volume output. This allows you to use dim commands and set the volume level with percentage values.
-
-### What is JSON-RPC?
-
-The short answer is JSON-RPC an interface to communicate with Kodi. [See the official Kodi Wiki for more info](http://kodi.wiki/view/JSON-RPC_API) 
-
-### Setup Kodi to allow control through JSON-RPC
-
-In Kodi navigate to Settings/Services/Control ([screenshot](http://kodi.wiki/view/Settings/Services/Control))
-
-Turn **ON** the following:
-- Allow control of Kodi via HTTP
-- Allow remote control from applications on this system
-- Allow remote control from applications on other systems
-
-Change the **username** to something unique and set a strong **password**. 
-
-Make a note of the **PORT**
-### Adding the device to HA Bridge
-
-Access the HA Bridge Configuration in your browser and open the  **Manual Add** tab.
-#### Name
-
-Give the device a unique name that doesn’t include **“volume”** as it will cause conflicts with the Echo’s built in volume controls. A device name of **“cody sound”** works well.
-#### Device type
-
-Select **TCP** in the dropdown
-### URLs
-
-This section might seem a little long winded and if you know what you are doing then feel free to jump ahead. 
-#### Building the URL
-
-We need to log into the Kodi web server without having to fill in the popup each time. You can do this by putting the username and password in the URL. It is not a good idea to do this on other websites as it does put your password in clear view, but for your local network it is fine. 
-
-Use the example below replacing the relevant sections with the details that you defined in the Kodi settings screen in the first step. Replacing the IP with the address of the machine that Kodi is running on.
-
-```
-http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc
-```
-##### Testing the URL in a browser
-
-Before you continue, open your custom URL in a browser (making sure Kodi is running). If all is working as it should you will see a big page of JSON that starts with:
-
-``` json
-{
-    "description": "JSON-RPC API of XBMC",
-    "id": "http://xbmc.org/jsonrpc/ServiceDescription.json",
-```
-
-If you don’t see something that looks like the code above, then go back and double check your settings.
-#### The JSON request
-
-The URL is what connects you to Kodi, JSON is what is used to communicate with it. The JSON that is used to set the volume level is:
-
-``` json
-{"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
-```
-##### Joining the URL and JSON
-
-Join the two together by adding `?request=` to the end of the URL and then add the JSON to the end of the request. You will end up with something like:
-
-```
-http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
-```
-### Testing the request in a browser
-
-Go ahead and test the combined URL/JSON in a browser changing **100** to whatever level you want to set. Kodi should adjust the volume accordingly, try a few different levels to be sure it is working correctly. 
-
-The browser will reformat the URL each time you press return so don’t build the URL in the browser bar without making a copy first. 
-
-Ideally build the URL in a text document which you can easily edit and then copy/paste each time. 
-
-### Prepare the three URLs
-
-You want to end up with three full URLs in your text file, one for each of the commands.
-
-**ON**
-
-```
-http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
-```
-
-**DIM**
-
-```
-http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":45},"id":1}
-```
-
-**OFF**
-
-```
-http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request={"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":0},"id":1}
-```
-
-### Test the three URLS
-
-You should now be able to control the volume of Kodi using the structured URL you built above in a browser.
-
-If you can’t get it to work in a browser then you won’t be able to get it to work in HA Bridge.
-
-
-### Manually adding the device
-
-Add a new manual device and give it a name e.g. “Cody Sound”
-
-Set `Device type` to `Custom`
-
-Use the same URL for all three (ON, OFF, DIM)
-
-```
-http://KODI_USERNAME:KODI_PASSWORD@192.168.1.123:8080/jsonrpc?request=
-```
-
-* `HTTP Verb` to `POST`
-* `Content type` to `application/json`
-
-**Content body On**
-```json
-{"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":100},"id":1}
-```
-**Content body Dim**
-```json
-{"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":${intensity.percent}},"id":1}
-```
-**Content body Off**
-```json
-{"jsonrpc":"2.0","method":"Application.SetVolume","params":{"volume":0},"id":1}
-```
-
-
-### HA Bridge
-
-Save and test the button in the Bridge Devices tab and hopefully it should turn the volume up in Kodi.
-
-### Controlling the Device
-
-You can use the commands as listed in the [README](https://github.com/bwssytems/ha-bridge#ask-alexa)
-
-“Set Cody Sound to 50 percent”
-“Cody Sound to 70 percent”
-
-Remembering that “Turn on Cody Sound” will set the volume to 100%, and “Turn off Cody Sound” will mute.