MSA-1181: sdf

devicetypes/smartthings/wattvision.src/wattvision.groovy

@@ -33,7 +33,7 @@ metadata {
 			state "power", label: '${currentValue} W'
 		}
 
-		htmlTile(name: "powerContent", attribute: "powerContent", type: "HTML", whitelist: ["www.wattvision.com"] , url: '${currentValue}', width: 3, height: 2)
+		htmlTile(name: "powerContent", attribute: "powerContent", type: "HTML", whitelist: "www.wattvision.com" , url: '${currentValue}', width: 3, height: 2)
 
 		standardTile("refresh", "device.power", inactiveLabel: false, decoration: "flat") {
 			state "default", label: '', action: "refresh.refresh", icon: "st.secondary.refresh"

devicetypes/swarmx/swarmx2.src/swarmx2.groovy

@@ -0,0 +1,268 @@
+/**
+ *  swarmx2
+ *
+ *  Copyright 2016 Badrinarayanan Rangarajan
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+metadata {
+	definition (name: "swarmx2", namespace: "swarmx", author: "Badrinarayanan Rangarajan") {
+    capability "Actuator"
+		capability "Sensor"
+		capability "Image Capture"
+        
+        command "setAuthToken"
+        command "removeAuthToken"
+	}
+
+        preferences {
+            input("CameraIP", "string", title:"Camera IP Address", description: "Please enter your camera's IP Address", required: true, displayDuringSetup: true)
+            input("CameraPort", "string", title:"Camera Port", description: "Please enter your camera's Port", defaultValue: 80 , required: true, displayDuringSetup: true)
+            input("CameraPath", "string", title:"Camera Path to Image", description: "Please enter the path to the image (default: /cgi-bin/video.cgi?msubmenu=jpg&resolution=2)", defaultValue: "/cgi-bin/video.cgi?msubmenu=jpg&resolution=2", required: true, displayDuringSetup: true)
+            input("CameraPostGet", "string", title:"Does Camera use a Post or Get, normally Get?", description: "Please choose if the camera uses a POST or a GET command to retreive the image", defaultValue: "GET", displayDuringSetup: true)
+            input("CameraUser", "string", title:"Camera User", description: "Please enter your camera's username (default: admin)", defaultValue: "admin", required: false, displayDuringSetup: true)
+            input("CameraPassword", "string", title:"Camera Password", description: "Please enter your camera's password", required: false, displayDuringSetup: true)
+	}
+    
+	simulator {
+	}
+
+	tiles {
+		standardTile("camera", "device.image", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: true) {
+			state "default", label: "", action: "", icon: "st.camera.dropcam-centered", backgroundColor: "#FFFFFF"
+		}
+
+		carouselTile("cameraDetails", "device.image", width: 3, height: 2) { }
+
+		standardTile("take", "device.image", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: false) {
+			state "take", label: "Take", action: "Image Capture.take", icon: "st.camera.camera", backgroundColor: "#FFFFFF", nextState:"taking"
+			state "taking", label:'Taking', action: "", icon: "st.camera.take-photo", backgroundColor: "#53a7c0"
+			state "image", label: "Take", action: "Image Capture.take", icon: "st.camera.camera", backgroundColor: "#FFFFFF", nextState:"taking"
+		}
+        
+        standardTile("authenticate", "device.button", width: 1, height: 1, canChangeIcon: true) {
+            state "DeAuth", label: '${name}', action: "removeAuthToken", icon: "st.switches.light.on", backgroundColor: "#79b821"
+            state "Auth", label: '${name}', action: "setAuthToken", icon: "st.switches.light.off", backgroundColor: "#ffffff"
+        }
+        
+        main "camera"
+		details(["cameraDetails", "take", "error", "authenticate"])
+	}
+}
+
+// method to set digest token
+def setAuthToken() {
+	trace("setAuth")
+	state.auth = "empty"
+	take()
+}
+
+// method to set remove token (a.k.a. logout)
+def removeAuthToken() {
+	trace("removeAuth")
+	sendEvent(name: "authenticate", value: "Auth")
+	state.auth = "empty"
+}
+
+// method called after touching the take button
+def take() {
+	def porthex = convertPortToHex(CameraPort)
+	def hosthex = convertIPtoHex(CameraIP)
+	def path = CameraPath.trim()
+	def request = ""
+
+	// set a proper network Id of the device
+	device.deviceNetworkId = "$hosthex:$porthex"
+
+	trace("The device id configured is: $device.deviceNetworkId")
+	trace("state: " + state)
+
+	if (!state.auth || state.auth == "empty") {
+		// empty request to get nonce token
+		request = """GET ${path} HTTP/1.1\r\nAccept: */*\r\nHost: ${getHostAddress()}\r\n\r\n"""
+	} else {
+		// got nonce token, parsing headers and calculating digest header
+		def auth_headers = calcDigestAuth(state.auth)
+		request = """GET ${path} HTTP/1.1\r\nAccept: */*\r\nHost: ${getHostAddress()}\r\nAuthorization: ${auth_headers}\r\n\r\n"""
+	}
+
+	try {
+		def hubAction = new physicalgraph.device.HubAction(request, physicalgraph.device.Protocol.LAN, "${device.deviceNetworkId}")
+		if (state.auth && state.auth != "empty") {
+			// upload image/jpg output to S3 
+			hubAction.options = [outputMsgToS3: true]
+		}
+		return hubAction
+	} catch (Exception e) {
+		trace("Hit Exception $e on $hubAction")
+	}
+}
+
+// method to parse output from the camera
+def parse(String output) {
+	trace("Parsing output: '${output}'")
+	def headers = ""
+	def parsedHeaders = ""
+	def map = stringToMap(output)
+
+	if (map.headers) {
+		headers = new String(map.headers.decodeBase64())
+		parsedHeaders = parseHttpHeaders(headers)
+
+		if (parsedHeaders.auth) {
+			// set required tokens in the special state variable (see description above)
+			state.auth = parsedHeaders.auth
+			trace("Got 401, send request again (click on 'take' one more time): " + state.auth)
+			sendEvent(name: "authenticate", value: "DeAuth")
+			return result
+		}
+	}
+
+	if (map.body != null) {
+		def bodyString = new String(map.body.decodeBase64())
+		trace(bodyString)
+	}
+
+	if (map.bucket && map.key) {
+		trace("Uploading the picture to amazon S3")
+		putImageInS3(map)
+	}
+
+	return result
+}
+
+
+// parse headers that are returned from the camera
+private parseHttpHeaders(String headers) {
+	def lines = headers.readLines()
+	def status = lines[0].split()
+
+	def result = [
+	  protocol: status[0],
+	  status: status[1].toInteger(),
+	  reason: status[2]
+	]
+
+	if (result.status == 401) {
+		result.auth = stringToMap(lines[1].replaceAll("WWW-Authenticate: Digest ", "").replaceAll("=", ":").replaceAll("\"", ""))
+		trace("It's ok. Press take again" + result.auth)
+	}
+
+	if (result.status == 200) {
+		trace("Authentication successful! :" + result)
+	}
+
+	return result
+}
+
+
+// calculate digest token, more details: http://en.wikipedia.org/wiki/Digest_access_authentication#Overview
+private String calcDigestAuth(headers) {
+	def HA1 = new String("${CameraUser}:" + headers.realm.trim() + ":${CameraPassword}").trim().encodeAsMD5()
+	def HA2 = new String("${CameraPostGet}:${CameraPath}").trim().encodeAsMD5()
+
+	// increase nc every request by one
+	if (!state.nc) {
+		state.nc = 1
+	} else {
+		state.nc = state.nc + 1
+	}
+
+	def cnonce = java.util.UUID.randomUUID().toString().replaceAll('-', '').substring(0, 8)
+	def response = new String("${HA1}:" + headers.nonce.trim() + ":" + state.nc + ":" + cnonce + ":" + "auth" + ":${HA2}")
+	def response_enc = response.encodeAsMD5()
+
+	trace("HA1: " + HA1 + " ===== org:" + "${CameraUser}:" + headers.realm.trim() + ":${CameraPassword}")
+	trace("HA2: " + HA2 + " ===== org:" + "${CameraPostGet}:${CameraPath}")
+	trace("Response: " + response_enc + " =====   org:" + response)
+	
+	def eol = " "
+        
+    return 'Digest username="' + CameraUser.trim() + '",' + eol +
+           'realm="' + headers.realm.trim() + '",' + eol +
+           'qop="' + headers.qop.trim() + '",' + eol +
+           'algorithm="MD5",' + eol +
+           'uri="'+ CameraPath.trim() + '",' +  eol +
+           'nonce="' + headers.nonce.trim() + '",' + eol +
+           'cnonce="' + cnonce.trim() + '",'.trim() + eol +
+           'opaque="",' + eol +
+           'nc=' + state.nc + ',' + eol +
+           'response="' + response_enc.trim() + '"'
+}
+
+private getPictureName() {
+	def pictureUuid = java.util.UUID.randomUUID().toString().replaceAll('-', '')
+	return device.deviceNetworkId + "_$pictureUuid" + ".jpg"
+}
+
+private String convertIPtoHex(ipAddress) { 
+    String hex = ipAddress.tokenize( '.' ).collect {  String.format( '%02x', it.toInteger() ) }.join()
+    trace("IP address entered is $ipAddress and the converted hex code is $hex")
+    return hex
+}
+
+private String convertPortToHex(port) {
+	String hexport = port.toString().format( '%04x', port.toInteger() )
+    return hexport
+}
+
+private Integer convertHexToInt(hex) {
+	Integer.parseInt(hex, 16)
+}
+
+
+private String convertHexToIP(hex) {
+	[convertHexToInt(hex[0..1]), convertHexToInt(hex[2..3]), convertHexToInt(hex[4..5]), convertHexToInt(hex[6..7])].join(".")
+}
+
+private getHostAddress() {
+	def parts = device.deviceNetworkId.split(":")
+	def ip = convertHexToIP(parts[0])
+	def port = convertHexToInt(parts[1])
+	return ip + ":" + port
+}
+
+private hashMD5(String somethingToHash) {
+	java.security.MessageDigest.getInstance("MD5").digest(somethingToHash.getBytes("UTF-8")).encodeHex().toString()
+}
+
+// store image on S3. Hint: if you use your bucket and key maybe you can upload it to your cloud? Never tested, but possible it will work.
+def putImageInS3(map) {
+	def s3ObjectContent
+    
+	try {
+		def imageBytes = getS3Object(map.bucket, map.key + ".jpg")
+
+		if (imageBytes) {
+			s3ObjectContent = imageBytes.getObjectContent()
+			def bytes = new ByteArrayInputStream(s3ObjectContent.bytes)
+			storeImage(getPictureName(), bytes)
+		}
+	} catch (Exception e) {
+		log.error e
+	} finally {
+		if (s3ObjectContent) {
+			s3ObjectContent.close()
+		}
+	}
+}
+
+private def delayHubAction(ms) {
+	return new physicalgraph.device.HubAction("delay ${ms}")
+}
+
+private getCallBackAddress() {
+	device.hub.getDataValue("localIP") + ":" + device.hub.getDataValue("localSrvPortTCP")
+}
+
+private trace(message) {
+  log.debug message
+}

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -60,7 +60,7 @@ def bridgeDiscovery(params=[:])
         app.updateSetting("selectedHue", "")
     }
 
-	ssdpSubscribe()
+	subscribe(location, null, locationHandler, [filterEvents:false])
 
 	//bridge discovery request every 15 //25 seconds
 	if((bridgeRefreshCount % 5) == 0) {
@@ -152,10 +152,6 @@ private discoverBridges() {
 	sendHubCommand(new physicalgraph.device.HubAction("lan discovery urn:schemas-upnp-org:device:basic:1", physicalgraph.device.Protocol.LAN))
 }
 
-void ssdpSubscribe() {
-	subscribe(location, "ssdpTerm.urn:schemas-upnp-org:device:basic:1", ssdpBridgeHandler)
-}
-
 private sendDeveloperReq() {
 	def token = app.id
     def host = getBridgeIP()
@@ -165,7 +161,7 @@ private sendDeveloperReq() {
 		headers: [
 			HOST: host
 		],
-		body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"]))
+		body: [devicetype: "$token-0"]], "${selectedHue}"))
 }
 
 private discoverHueBulbs() {
@@ -175,7 +171,7 @@ private discoverHueBulbs() {
 		path: "/api/${state.username}/lights",
 		headers: [
 			HOST: host
-		]], "${selectedHue}", [callback: "lightsHandler"]))
+		]], "${selectedHue}"))
 }
 
 private verifyHueBridge(String deviceNetworkId, String host) {
@@ -185,7 +181,7 @@ private verifyHueBridge(String deviceNetworkId, String host) {
 		path: "/description.xml",
 		headers: [
 			HOST: host
-		]], deviceNetworkId, [callback: "bridgeDescriptionHandler"]))
+		]], deviceNetworkId))
 }
 
 private verifyHueBridges() {
@@ -297,9 +293,8 @@ def bulbListHandler(hub, data = "") {
         }
     }
     def bridge = null
-	if (selectedHue) {
+	if (selectedHue)
-		bridge = getChildDevice(selectedHue)
+        bridge = getChildDevice(selectedHue)
-	}
     bridge.sendEvent(name: "bulbList", value: hub, data: bulbs, isStateChange: true, displayed: false)
     msg = "${bulbs.size()} bulbs found. ${bulbs}"
 	return msg
@@ -387,9 +382,8 @@ def addBridge() {
                     	def oldDNI = it.deviceNetworkId
                         log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
                         it.setDeviceNetworkId("${newDNI}")
-						if (oldDNI == selectedHue) {
+                        if (oldDNI == selectedHue)
-							app.updateSetting("selectedHue", newDNI)
+                        	app.updateSetting("selectedHue", newDNI)
-						}
                         newbridge = false
                     }
                 }
@@ -418,111 +412,6 @@ def addBridge() {
 	}
 }
 
-def ssdpBridgeHandler(evt) {
-	def description = evt.description
-	log.trace "Location: $description"
-
-	def hub = evt?.hubId
-	def parsedEvent = parseLanMessage(description)
-	parsedEvent << ["hub":hub]
-
-	def bridges = getHueBridges()
-	log.trace bridges.toString()
-	if (!(bridges."${parsedEvent.ssdpUSN.toString()}")) {
-		//bridge does not exist
-		log.trace "Adding bridge ${parsedEvent.ssdpUSN}"
-		bridges << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
-	} else {
-		// update the values
-		def ip = convertHexToIP(parsedEvent.networkAddress)
-		def port = convertHexToInt(parsedEvent.deviceAddress)
-		def host = ip + ":" + port
-		log.debug "Device ($parsedEvent.mac) was already found in state with ip = $host."
-		def dstate = bridges."${parsedEvent.ssdpUSN.toString()}"
-		def dni = "${parsedEvent.mac}"
-		def d = getChildDevice(dni)
-		def networkAddress = null
-		if (!d) {
-			childDevices.each {
-				if (it.getDeviceDataByName("mac")) {
-					def newDNI = "${it.getDeviceDataByName("mac")}"
-					if (newDNI != it.deviceNetworkId) {
-						def oldDNI = it.deviceNetworkId
-						log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
-						it.setDeviceNetworkId("${newDNI}")
-						if (oldDNI == selectedHue) {
-							app.updateSetting("selectedHue", newDNI)
-						}
-						doDeviceSync()
-					}
-				}
-			}
-		} else {
-			if (d.getDeviceDataByName("networkAddress")) {
-				networkAddress = d.getDeviceDataByName("networkAddress")
-			} else {
-				networkAddress = d.latestState('networkAddress').stringValue
-			}
-			log.trace "Host: $host - $networkAddress"
-			if (host != networkAddress) {
-				log.debug "Device's port or ip changed for device $d..."
-				dstate.ip = ip
-				dstate.port = port
-				dstate.name = "Philips hue ($ip)"
-				d.sendEvent(name:"networkAddress", value: host)
-				d.updateDataValue("networkAddress", host)
-			}
-		}
-	}
-}
-
-void bridgeDescriptionHandler(physicalgraph.device.HubResponse hubResponse) {
-	log.trace "description.xml response (application/xml)"
-	def body = hubResponse.xml
-	if (body?.device?.modelName?.text().startsWith("Philips hue bridge")) {
-		def bridges = getHueBridges()
-		def bridge = bridges.find {it?.key?.contains(body?.device?.UDN?.text())}
-		if (bridge) {
-			bridge.value << [name:body?.device?.friendlyName?.text(), serialNumber:body?.device?.serialNumber?.text(), verified: true]
-		} else {
-			log.error "/description.xml returned a bridge that didn't exist"
-		}
-	}
-}
-
-void lightsHandler(physicalgraph.device.HubResponse hubResponse) {
-	if (isValidSource(hubResponse.mac)) {
-		def body = hubResponse.json
-		if (!body?.state?.on) { //check if first time poll made it here by mistake
-			def bulbs = getHueBulbs()
-			log.debug "Adding bulbs to state!"
-			body.each { k, v ->
-				bulbs[k] = [id: k, name: v.name, type: v.type, modelid: v.modelid, hub: hubResponse.hubId]
-			}
-		}
-	}
-}
-
-void usernameHandler(physicalgraph.device.HubResponse hubResponse) {
-	if (isValidSource(hubResponse.mac)) {
-		def body = hubResponse.json
-		if (body.success != null) {
-			if (body.success[0] != null) {
-				if (body.success[0].username)
-					state.username = body.success[0].username
-			}
-		} else if (body.error != null) {
-			//TODO: handle retries...
-			log.error "ERROR: application/json ${body.error}"
-		}
-	}
-}
-
-/**
- * @deprecated This has been replaced by the combination of {@link #ssdpBridgeHandler()}, {@link #bridgeDescriptionHandler()},
- * {@link #lightsHandler()}, and {@link #usernameHandler()}. After a pending event subscription migration, it can be removed.
- */
-@Deprecated
 def locationHandler(evt) {
 	def description = evt.description
     log.trace "Location: $description"
@@ -558,19 +447,17 @@ def locationHandler(evt) {
                             def oldDNI = it.deviceNetworkId
                             log.debug "updating dni for device ${it} with $newDNI - previous DNI = ${it.deviceNetworkId}"
                             it.setDeviceNetworkId("${newDNI}")
-							if (oldDNI == selectedHue) {
+                            if (oldDNI == selectedHue)
-								app.updateSetting("selectedHue", newDNI)
+                                app.updateSetting("selectedHue", newDNI)
-							}
                             doDeviceSync()
                         }
                     }
                 }
 			} else {
-				if (d.getDeviceDataByName("networkAddress")) {
+            	if (d.getDeviceDataByName("networkAddress"))
-					networkAddress = d.getDeviceDataByName("networkAddress")
+                	networkAddress = d.getDeviceDataByName("networkAddress")
-				} else {
+            	else
-					networkAddress = d.latestState('networkAddress').stringValue
+                	networkAddress = d.latestState('networkAddress').stringValue
-				}
                 log.trace "Host: $host - $networkAddress"
                 if(host != networkAddress) {
                     log.debug "Device's port or ip changed for device $d..."
@@ -603,9 +490,8 @@ def locationHandler(evt) {
 			def body = new groovy.json.JsonSlurper().parseText(parsedEvent.body)
 			if (body.success != null) {
 				if (body.success[0] != null) {
-					if (body.success[0].username) {
+					if (body.success[0].username)
 						state.username = body.success[0].username
-					}
 				}
 			} else if (body.error != null) {
 				//TODO: handle retries...
@@ -630,7 +516,11 @@ def doDeviceSync(){
 	log.trace "Doing Hue Device Sync!"
 	convertBulbListToMap()
 	poll()
-	ssdpSubscribe()
+    try {
+		subscribe(location, null, locationHandler, [filterEvents:false])
+    } catch (all) {
+    	log.trace "Subscription already exist"
+ 	}
 	discoverBridges()
 }
 
@@ -857,11 +747,15 @@ private getId(childDevice) {
 private poll() {
 	def host = getBridgeIP()
 	def uri = "/api/${state.username}/lights/"
-	log.debug "GET: $host$uri"
+    try {
-	sendHubCommand(new physicalgraph.device.HubAction("""GET ${uri} HTTP/1.1
+		sendHubCommand(new physicalgraph.device.HubAction("""GET ${uri} HTTP/1.1
 HOST: ${host}
 
 """, physicalgraph.device.Protocol.LAN, selectedHue))
+	} catch (all) {
+        log.warn "Parsing Body failed - trying again..."
+        doDeviceSync()
+    }
 }
 
 private put(path, body) {

smartapps/smartthings/the-flasher.src/the-flasher.groovy

@@ -147,3 +147,4 @@ private flashLights() {
 		}
 	}
 }
+