mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-19 16:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finished testing and refactoring for udp/tcp and http

Browse Source
This commit is contained in:
Admin
2016-04-26 10:12:36 -05:00
parent aecd589308
commit 60239bad82
1 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/com/bwssystems/HABridge/hue/HueMulator.java
View File

@@ -540,7 +540,7 @@ public class HueMulator implements HueErrorStringSet {
} }
} }
} }
else if(url.contains("udp://") || url.contains("tcp://")) else // This section allows the usage of http/tcp/udp calls in a given set of items
{ {
log.debug("executing HUE api request for network call: " + url); log.debug("executing HUE api request for network call: " + url);
if(!url.startsWith("[")) { if(!url.startsWith("[")) {
@@ -555,7 +555,7 @@ public class HueMulator implements HueErrorStringSet {
Thread.sleep(bridgeSettings.getButtonsleep()); Thread.sleep(bridgeSettings.getButtonsleep());
} }
try { try {
String intermediate = callItems[i].getItem().substring(6); String intermediate = callItems[i].getItem().substring(callItems[i].getItem().indexOf("://") + 3);
String ipAddr = intermediate.substring(0, intermediate.indexOf(':')); String ipAddr = intermediate.substring(0, intermediate.indexOf(':'));
String port = intermediate.substring(intermediate.indexOf(':') + 1, intermediate.indexOf('/')); String port = intermediate.substring(intermediate.indexOf(':') + 1, intermediate.indexOf('/'));
String theBody = replaceIntensityValue(intermediate.substring(intermediate.indexOf('/')+1), state.getBri()); String theBody = replaceIntensityValue(intermediate.substring(intermediate.indexOf('/')+1), state.getBri());
@@ -566,6 +566,7 @@ public class HueMulator implements HueErrorStringSet {
sendData = theBody.getBytes(); sendData = theBody.getBytes();
InetAddress IPAddress = InetAddress.getByName(ipAddr); InetAddress IPAddress = InetAddress.getByName(ipAddr);
if(callItems[i].getItem().contains("udp://")) { if(callItems[i].getItem().contains("udp://")) {
log.debug("executing HUE api request to UDP: " + callItems[i].getItem());
DatagramSocket responseSocket = new DatagramSocket(Integer.parseInt(port)); DatagramSocket responseSocket = new DatagramSocket(Integer.parseInt(port));
DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, IPAddress, Integer.parseInt(port)); DatagramPacket sendPacket = new DatagramPacket(sendData, sendData.length, IPAddress, Integer.parseInt(port));
responseSocket.send(sendPacket); responseSocket.send(sendPacket);
@@ -573,33 +574,16 @@ public class HueMulator implements HueErrorStringSet {
} }
else if(callItems[i].getItem().contains("tcp://")) else if(callItems[i].getItem().contains("tcp://"))
{ {
log.debug("executing HUE api request to TCP: " + callItems[i].getItem());
Socket dataSendSocket = new Socket(IPAddress, Integer.parseInt(port)); Socket dataSendSocket = new Socket(IPAddress, Integer.parseInt(port));
DataOutputStream outToClient = new DataOutputStream(dataSendSocket.getOutputStream()); DataOutputStream outToClient = new DataOutputStream(dataSendSocket.getOutputStream());
outToClient.write(sendData); outToClient.write(sendData);
outToClient.flush();
dataSendSocket.close(); dataSendSocket.close();
} }
} catch (IOException e) { else {
log.warn("Could not send data for network request.", e); log.debug("executing HUE api request to Http " + (device.getHttpVerb() == null?"GET":device.getHttpVerb()) + ": " + callItems[i].getItem());
responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Error on calling out to device\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
i = callItems.length+1;
}
}
}
else
{
if(!url.startsWith("[")) {
if(url.startsWith("{\"item"))
url = "[" + url + "]";
else
url = "[{\"item\":\"" + url +"\"}]";
}
CallItem[] callItems = new Gson().fromJson(url, CallItem[].class);
log.debug("executing HUE api request to Http " + (device.getHttpVerb() == null?"GET":device.getHttpVerb()) + ": " + url);
for(int i = 0; i < callItems.length; i++) {
if( i > 0) {
Thread.sleep(bridgeSettings.getButtonsleep());
}
// quick template
String body; String body;
String anUrl = replaceIntensityValue(callItems[i].getItem(), state.getBri()); String anUrl = replaceIntensityValue(callItems[i].getItem(), state.getBri());
if (state.isOn()) if (state.isOn())
@@ -613,6 +597,12 @@ public class HueMulator implements HueErrorStringSet {
i = callItems.length+1; i = callItems.length+1;
} }
} }
} catch (Exception e) {
log.warn("Change device state, Could not send data for network request: " + callItems[i].getItem() + " with Message: " + e.getMessage());
responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId + "\",\"description\": \"Error on calling out to device\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
i = callItems.length+1;
}
}
} }
if(!responseString.contains("[{\"error\":")) { if(!responseString.contains("[{\"error\":")) {