Update TCP handling to save connection. Added debug to http handler.

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>

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;
+			for(int retryCount = 0; retryCount < 2; retryCount++) {
-			// Removed Specific SSL as Apache HttpClient automatically uses SSL if the URI starts with https://
-//			if (url.startsWith("xyzhttps"))
-//				response = httpclientSSL.execute(request);
-//			else
 				response = httpClient.execute(request);
-			log.debug((httpVerb == null ? "GET" : httpVerb) + " execute on URL responded: "
+				log.debug((httpVerb == null ? "GET" : httpVerb) + " execute (" + retryCount + ") on URL responded: "
-					+ response.getStatusLine().getStatusCode());
+						+ response.getStatusLine().getStatusCode());
-			if (response.getStatusLine().getStatusCode() >= 200 && response.getStatusLine().getStatusCode() < 300) {
+				if (response.getStatusLine().getStatusCode() >= 200 && response.getStatusLine().getStatusCode() < 300) {
-				if (response.getEntity() != null) {
+					if (response.getEntity() != null) {
-					try {
+						try {
-						theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
+							theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
-																											// content
+																												// content
-																											// for
+																												// for
-																											// data
+																												// data
-						EntityUtils.consume(response.getEntity()); // close out
+							EntityUtils.consume(response.getEntity()); // close out
-																	// inputstream
+																		// inputstream
-																	// ignore
+																		// ignore
-																	// content
+																		// content
-					} catch (Exception e) {
+						} catch (Exception e) {
-						log.debug("Error ocurred in handling response entity after successful call, still responding success. "
+							log.debug("Error ocurred in handling response entity after successful call, still responding success. "
-										+ e.getMessage(), e);
+											+ e.getMessage(), e);
+						}
+						log.debug("Successfull response - The http response is <<<" + theContent + ">>>");
 					}
-				}
+					retryCount = 2;
-			} else {
+				} else {
-				log.warn("HTTP response code was not an expected successful response of between 200 - 299, the code was: " + response.getStatusLine());
+					log.warn("HTTP response code was not an expected successful response of between 200 - 299, the code was: " + response.getStatusLine());
-				try {
+					try {
-					EntityUtils.consume(response.getEntity()); // close out
+						String someContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); // read
-					// inputstream
+						// content
-					// ignore
+						// for
-					// content
+						// data
-				} catch (Exception e) {
+						EntityUtils.consume(response.getEntity()); // close out
-					//noop
+						// 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) {

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(":")) {
+			dataSendSocket = theSockets.get(hostPortion);
-				hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
+			if(dataSendSocket == null) {
-				port = hostPortion.substring(intermediate.indexOf(':') + 1);
+				if (hostPortion.contains(":")) {
-			} else
+					hostAddr = hostPortion.substring(0, intermediate.indexOf(':'));
-				hostAddr = hostPortion;
+					port = hostPortion.substring(intermediate.indexOf(':') + 1);
-			try {
+				} else
-				IPAddress = InetAddress.getByName(hostAddr);
+					hostAddr = hostPortion;
-			} catch (UnknownHostException e) {
+				try {
-				// noop
+					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
+			}
+		}
 	}
 
 }