Added profile support for refreshing param value

acs.coffee

@@ -12,13 +12,7 @@ profiles = require './profiles'
 currentRequest = null
 
 
-applyConfigurations = (configurations) ->
+applyConfigurations = (taskList) ->
-  taskList = []
-  for c of configurations
-    task = {device : currentRequest.deviceId, name : 'setParameterValues', parameterValues: [], timestamp : db.mongo.Timestamp()}
-    task.parameterValues.push([c, configurations[c]])
-    taskList.push task
-
   if taskList.length
     util.log("#{currentRequest.deviceId}: Profiles discrepancy found")
     db.tasksCollection.save(taskList, (err) ->
@@ -132,14 +126,14 @@ nextTask = (cookies) ->
         deviceProfilesHash = results["#{currentRequest.deviceId}_profiles_hash"]
 
         if not deviceProfilesHash or profilesHash != deviceProfilesHash
-          profiles.findDeviceConfigurationDiscrepancy(currentRequest.deviceId, profilesHash, (configurations) ->
+          profiles.findDeviceConfigurationDiscrepancy(currentRequest.deviceId, profilesHash, (taskList) ->
-            applyConfigurations(configurations)
+            applyConfigurations(taskList)
           )
         else if not profilesHash
           profiles.getProfilesHash((hash) ->
             if hash != deviceProfilesHash
-              profiles.findDeviceConfigurationDiscrepancy(currentRequest.deviceId, profilesHash, (configurations) ->
+              profiles.findDeviceConfigurationDiscrepancy(currentRequest.deviceId, profilesHash, (taskList) ->
-                applyConfigurations(configurations)
+                applyConfigurations(taskList)
               )
             else
               # no discrepancy, return empty response

config.coffee

@@ -5,6 +5,7 @@ exports.API_PORT = 7557
 exports.API_INTERFACE = '0.0.0.0'
 exports.CACHE_DURATION = 60 # in seconds
 exports.PROFILES_CACHE_DURATION = 86400
+exports.PROFILES_TIME_PADDING = 1
 exports.MONGODB_SOCKET = '/tmp/mongodb-27017.sock'
 exports.MEMCACHED_SOCKET = '/tmp/memcached.sock'
 exports.WORKER_RESPAWN_TIME = 3000

profiles.coffee

@@ -51,7 +51,8 @@ exports.findDeviceConfigurationDiscrepancy = (deviceId, profilesHash, callback)
     for p of profiles
       profile = profiles[p]
       for c in profile.configurations
-        params[c.name] = 1
+        if c.type == 'get' or c.type == 'set'
+          params[c.name] = 1
 
     db.devicesCollection.findOne({'_id' : deviceId}, params, (err, device) ->
       tags = device['_tags'] or []
@@ -63,19 +64,37 @@ exports.findDeviceConfigurationDiscrepancy = (deviceId, profilesHash, callback)
           deviceProfiles.push(profiles[t])
 
       combinedConfigurations = combineProfileConfigurations(deviceProfiles)
-
+      now = Date.now()
-      discrepency = {}
+      taskList = []
+      expiry = config.PROFILES_CACHE_DURATION
+      getParameterValues = []
+      setParameterValues = []
       for c in combinedConfigurations
-        if c.value != getDeviceParamFromPath(device, "#{c.name}._value")
+        switch c.type
-          discrepency[c.name] = c.value
+          when 'set'
+            if c.value != getDeviceParamFromPath(device, "#{c.name}._value")
+              setParameterValues.push([c.name, c.value])
+          when 'get'
+            timeDiff = (now - getDeviceParamFromPath(device, "#{c.name}._timestamp")) / 1000
+            if (c.age - timeDiff < config.PROFILES_TIME_PADDING)
+              expiry = Math.min(expiry, c.age)
+              getParameterValues.push(c.name)
+            else
+              expiry = Math.min(expiry, c.age - timeDiff)
+          else
+            throw new Error('Unknown configuration type')
+      if getParameterValues.length
+        taskList.push {device : deviceId, name : 'getParameterValues', parameterNames: getParameterValues, timestamp : db.mongo.Timestamp()}
+      if setParameterValues.length
+        taskList.push {device : deviceId, name : 'setParameterValues', parameterValues: getParameterValues, timestamp : db.mongo.Timestamp()}
 
       if not profilesHash
         profilesHash = calculateProfilesHash(profiles)
-        db.memcached.set('profiles_hash', profilesHash, config.PROFILES_CACHE_DURATION, (err, res) ->
+        db.memcached.set('profiles_hash', profilesHash, expiry - config.PROFILES_TIME_PADDING, (err, res) ->
         )
 
-      db.memcached.set("#{deviceId}_profiles_hash", profilesHash, config.PROFILES_CACHE_DURATION, (err, res) ->
+      db.memcached.set("#{deviceId}_profiles_hash", profilesHash, expiry - config.PROFILES_TIME_PADDING, (err, res) ->
-        callback(discrepency)
+        callback(taskList)
       )
     )
   )
@@ -86,9 +105,11 @@ combineProfileConfigurations = (profiles) ->
   configurations = {}
   for p in profiles
     for c in p.configurations
-      if not maxWeights[c.name]? or p.weight > maxWeights[c.name]
+      configurationHash = if c.name? then "#{c.type}_#{c.name}" else c.type
-        configurations[c.name] = c
+
-        maxWeights[c.name] = p.weight
+      if not maxWeights[configurationHash]? or p.weight > maxWeights[configurationHash]
+        configurations[configurationHash] = c
+        maxWeights[configurationHash] = p.weight
 
   configurationsList = (configurations[c] for c of configurations)
   return configurationsList