Hubitat smarthings merge

dashboard/js/app.js

@@ -878,7 +878,7 @@ config.factory('dataService', ['$http', '$location', '$rootScope', '$window', '$
 		if (!si || !si.token) {
 			if ((app.initialInstanceUri && app.initialInstanceUri.length) || (uri && uri.length)) {
 				uri = app.initialInstanceUri ? app.initialInstanceUri : uri;
-				if (!uri.startsWith('https://')) {
+				if (!uri.startsWith('https://') && !uri.startsWith('http://')) {
 					if (uri && (uri.indexOf('tat.comapi') > 0)) {
 						var parts = uri.split('api');
 						if (parts[1].length >= 33) {
@@ -1375,21 +1375,51 @@ config.factory('dataService', ['$http', '$location', '$rootScope', '$window', '$
 	dataService.listFuelStreams = function() {
 		var instance = dataService.getInstance();
 		if (instance) {
-			var iid = instance.id;
-			var si = store[instance.id];
-			if (!si) si = {};
-			var region = (si && si.uri && si.uri.startsWith('https://graph-eu')) ? 'eu' : 'us';
-			var req = {
-				method: 'POST',
-				url: 'https://api-' + region + '-' + iid[32] + '.webcore.co:9287/fuelStreams/list',
-				headers: {
-				'Auth-Token': '|'+ iid
-				},
-				data: { i: iid }
+			var urls = instance.fuelStreamUrls;
+			var jsonp = false;
+			var req;
+
+			if(urls){
+				var params = urls.list;
+
+				if(params.l){
+					jsonp = true;
+					req = params.u;
+				}
+				else {
+					req = {
+						method: params.m,
+						url: params.u,
+						headers: params.h,
+						data: params.d
+					}
+				}
+			}
+			else {
+				var iid = instance.id;
+				var si = store[instance.id];
+				if (!si) si = {};
+				var region = (si && si.uri && si.uri.startsWith('https://graph-eu')) ? 'eu' : 'us';
+				req = {
+					method: 'POST',
+					url: 'https://api-' + region + '-' + iid[32] + '.webcore.co:9287/fuelStreams/list',
+					headers: {
+					'Auth-Token': '|'+ iid
+					},
+					data: { i: iid }
+				}				
+			}
+
+			if(jsonp){
+				return $http.jsonp(req,{jsonpCallbackParam: 'callback'}).then(function(response) {
+						return response.data;
+					});
+			}
+			else {
+				return $http(req).then(function(response) {
+						return response.data;
+					});
 			}
-			return $http(req).then(function(response) {
-					return response.data;
-				});
 		}
 	}
 
@@ -1438,21 +1468,54 @@ config.factory('dataService', ['$http', '$location', '$rootScope', '$window', '$
 	dataService.listFuelStreamData = function(fuelStreamId) {
 		var instance = dataService.getInstance();
 		if (instance) {
-			var iid = instance.id;
-			var si = store[instance.id];
-			if (!si) si = {};
-			var region = (si && si.uri && si.uri.startsWith('https://graph-eu')) ? 'eu' : 'us';
-			var req = {
-				method: 'POST',
-				url: 'https://api-' + region + '-' + iid[32] + '.webcore.co:9287/fuelStreams/get',
-				headers: {
-				'Auth-Token': '|'+iid
-				},
-				data: { i: iid, f: fuelStreamId }
+			var urls = instance.fuelStreamUrls;
+			var jsonp = false;
+			var req;
+
+			if(urls){
+				var params = urls.get;
+
+				if(params.l){
+					jsonp = true;
+					req = params.u.replace("{" + params.p + "}", fuelStreamId);
+				}
+				else {
+					var data = params.d
+					data[params.p] = fuelStreamId;
+
+					req = {
+						method: params.m,
+						url: params.u,
+						headers: params.h,
+						data: data
+					}
+				}
+			}
+			else {
+				var iid = instance.id;
+				var si = store[instance.id];
+				if (!si) si = {};
+				var region = (si && si.uri && si.uri.startsWith('https://graph-eu')) ? 'eu' : 'us';
+				req = {
+					method: 'POST',
+					url: 'https://api-' + region + '-' + iid[32] + '.webcore.co:9287/fuelStreams/get',
+					headers: {
+					'Auth-Token': '|'+iid
+					},
+					data: { i: iid, f: fuelStreamId }
+				}				
+			}
+
+			if(jsonp){
+				return $http.jsonp(req,{jsonpCallbackParam: 'callback'}).then(function(response) {
+						return response.data;
+					});
+			}
+			else {
+				return $http(req).then(function(response) {
+						return response.data;
+					});
 			}
-			return $http(req).then(function(response) {
-					return response.data;
-				});
 		}
 	}
 

dashboard/js/modules/dashboard.module.js

@@ -37,7 +37,7 @@ config.controller('dashboard', ['$scope', '$rootScope', 'dataService', '$timeout
 				if ($scope.$$destroyed) return;
 				if (currentRequestId != $scope.requestId) { return };
 				if (data) {
-					$scope.endpoint=data.endpoint + 'execute/:pistonId:';
+					$scope.endpoint=data.endpoint + 'execute/:pistonId:' + (data.accessToken ? '?access_token=' + data.accessToken : '');
 					$scope.rawEndpoint=data.endpoint;
 					$scope.rawAccessToken=data.accessToken;
 					if (data.error) {

dashboard/js/modules/piston.module.js

@@ -209,7 +209,7 @@ config.controller('piston', ['$scope', '$rootScope', 'dataService', '$timeout',
 		if ($scope.piston) $scope.loading = true;
 		dataService.getPiston($scope.pistonId).then(function (response) {
 			if ($scope.$$destroyed) return;
-			$scope.endpoint = data.endpoint + 'execute/' + $scope.pistonId;
+			$scope.endpoint = data.endpoint + 'execute/' + $scope.pistonId + (si.accessToken ? '?access_token=' + si.accessToken : '');
 			try {
 				var showOptions = $scope.piston ? !!$scope.showOptions : false;
 				if (!response || !response.data || !response.data.piston) {
@@ -853,7 +853,7 @@ config.controller('piston', ['$scope', '$rootScope', 'dataService', '$timeout',
 	$scope.getIFTTTUri = function(eventName) {
 		var uri = dataService.getApiUri();
 		if (!uri) return "An error has occurred retrieving the IFTTT Maker URL";
-		return uri + 'ifttt/' + eventName;
+		return uri + 'ifttt/' + eventName + (si.accessToken ? '?access_token=' + si.accessToken : '');
 	}
 
 	$scope.toggleAdvancedOptions = function() {
@@ -5377,4 +5377,4 @@ function test(value, parseAsString, dataType) {
 	scope.evaluateExpression(scope.parseExpression(value, parseAsString, dataType));
 }
 
-var MAX_STACK_SIZE = 10;
+var MAX_STACK_SIZE = 10;

smartapps/ady624/webcore-dashboard.src/webcore-dashboard.groovy

@@ -21,7 +21,7 @@ public static String version() { return "v0.3.108.20180906" }
 /*** webCoRE DEFINITION														***/
 /******************************************************************************/
 private static String handle() { return "webCoRE" }
-include 'asynchttp_v1'
+if(!isHubitat())include 'asynchttp_v1'
 definition(
 	name: "${handle()} Dashboard",
 	namespace: "ady624",
@@ -147,17 +147,21 @@ private void broadcastEvent(deviceId, eventName, eventValue, eventTime) {
 	def iid = state.instanceId
     def region = state.region ?: 'us'
     if (!iid || !iid.startsWith(':') || !iid.endsWith(':')) return
-    asynchttp_v1.put(null, [
-        uri: "https://api-${region}-${iid[32]}.webcore.co:9237",
-        path: '/event/sink',
-        headers: ['ST' : state.instanceId],
-        body: [
-        	d: deviceId,
-        	n: eventName,
-        	v: eventValue,
-        	t: eventTime
-    	]
-    ])
+
+    def params = [
+            uri: "https://api-${region}-${iid[32]}.webcore.co:9237",
+            path: '/event/sink',
+            requestContentType: "application/json",
+            headers: ['ST' : state.instanceId],
+            body: [d: deviceId, n: eventName, v: eventValue, t: eventTime]
+        ]
+
+    if(asynchttp_v1){
+        asynchttp_v1.put(null, params)
+    }
+    //else {
+    //    asynchttpPut((String)null, params)
+    //}
 }
 
 /******************************************************************************/
@@ -191,8 +195,12 @@ def String hashId(id) {
     return result
 }
 
+private isHubitat(){
+ 	return hubUID != null   
+}
+
 /******************************************************************************/
 /***																		***/
 /*** END OF CODE															***/
 /***																		***/
-/******************************************************************************/
+/******************************************************************************/

smartapps/ady624/webcore-fuel-stream.src/webcore-fuel-stream.groovy

@@ -0,0 +1,111 @@
+private static String handle() { return "webCoRE" }
+definition(
+    namespace:"ady624",
+    name:"${handle()} Fuel Stream",
+    description: "Local container for fuel streams",
+    author:"jp0550",
+    category:"My Apps",
+	iconUrl: "https://cdn.rawgit.com/ady624/${handle()}/master/resources/icons/app-CoRE.png",
+	iconX2Url: "https://cdn.rawgit.com/ady624/${handle()}/master/resources/icons/[email protected]",
+	iconX3Url: "https://cdn.rawgit.com/ady624/${handle()}/master/resources/icons/[email protected]",
+    parent: "ady624:webCoRE"
+)
+
+preferences {
+    page(name: "settingsPage")      
+}
+
+def settingsPage(){
+ 	dynamicPage(name: "settingsPage", title: "Settings", uninstall: true, install: true){
+        section(){
+            input "maxSize", "number", title: "Max size of all fuelStream data in KB", defaultValue: 95  
+
+            def storageSize = (int)(state.toString().size() / 1024.0)
+            paragraph("Current memory usage is ${storageSize}KB")
+        }
+    }    
+}
+
+def installed(){
+    log.debug "Installed with settings $settings"
+    initialize()
+}
+
+def updated(){
+    log.debug "Updated with settings $settings"
+ 	initialize()
+}
+
+def createStream(settings){
+    state.fuelStream = [i: settings.id, c: (settings.canister ?: ""), n: settings.name, w: 1, t: getFormattedDate(new Date())]
+}
+
+def initialize(){
+    unsubscribe()
+    unschedule()    
+
+    if(app.id){
+        getFuelStreamData()
+    	cleanFuelStreams()
+    }
+}
+
+def getFuelStreamData(){
+    if(!state.fuelStreamData){
+     	state.fuelStreamData = []   
+    }
+    return state.fuelStreamData
+}	
+
+def cleanFuelStreams(){    
+    //ensure max size is obeyed
+    def storageSize = (int)(state.toString().size() / 1024.0)
+    def max = (settings.maxSize ?: 95).toInteger()
+
+    if(storageSize > max){
+        log.debug "Trim down fuel stream"     
+        def points = getFuelStreamData().size()
+        def averageSize = points > 0 ? storageSize/(double)points : 0      
+
+        def pointsToRemove = averageSize > 0 ? (int)((storageSize - max) / (double)averageSize) : 0
+        pointsToRemove = pointsToRemove > 0 ? pointsToRemove : 0
+
+        log.debug "Size ${storageSize}KB Points ${points} Avg $averageSize Remove $pointsToRemove"
+        def toBeRemoved = getFuelStreamData().sort { it.i }.take(pointsToRemove)
+        getFuelStreamData().removeAll(toBeRemoved)                
+    }
+
+    getFuelStreamData().each {
+     	it.keySet().remove('t')   
+    }
+}
+
+def updateFuelStream(req){
+    def canister = req.c ?: ""
+    def name = req.n
+    def data = req.d
+    def instance = req.i
+    def source = req.s
+
+    getFuelStreamData().add([d: data, i: (new Date()).getTime()])
+
+    cleanFuelStreams()
+}
+
+def getFormattedDate(date = new Date()){
+    def format = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+    format.setTimeZone(TimeZone.getTimeZone("UTC"));
+    format.format(date)
+}
+
+def getFuelStream(){
+    state.fuelStream
+}
+
+def listFuelStreamData(){
+    getFuelStreamData().collect{ it + [t: getFormattedDate(new Date(it.i))]}
+}
+
+def uninstalled(){
+	parent.resetFuelStreamList()
+}