1.0.7

Resolves: #148

lib/api-functions.coffee

@@ -84,7 +84,7 @@ connectionRequest = (deviceId, callback) ->
     )
 
     request.on('socket', (socket) ->
-      socket.setTimeout(2000)
+      socket.setTimeout(config.get('CONNECTION_REQUEST_TIMEOUT', deviceId))
       socket.on('timeout', () ->
         request.abort()
       )

lib/config.coffee

@@ -50,6 +50,7 @@ options = {
   GET_PARAMETER_NAMES_DEPTH_THRESHOLD : {type : 'int', default : 0},
   TASK_PARAMETERS_BATCH_SIZE : {type : 'int', default : 32},
   COOKIES_PATH : {type : 'string'},
+  CONNECTION_REQUEST_TIMEOUT : {type : 'int', default : 2000},
 
   # Libxml related configuration
   XML_PARSE_RECOVER : {type : 'bool'},

lib/custom-commands.coffee

@@ -15,22 +15,31 @@
 # along with GenieACS.  If not, see <http://www.gnu.org/licenses/>.
 ###
 
+path = require 'path'
 config = require './config'
 common = require './common'
 
 
+FILES = {}
+getFile = (filename) ->
+  if filename not of FILES
+    FILES[filename] = require(path.resolve(config.get('CONFIG_DIR'), "custom_commands/#{filename}"))
+
+  return FILES[filename]
+
+
 exports.execute = (deviceId, command, callback) ->
   args = command.split(/\s+/)
   f = args.shift()
   c = args.shift()
 
-  file = require "../config/custom_commands/#{f}"
+  file = getFile(f)
   file[c](deviceId, args.join(' '), callback)
 
 
 exports.getFileCommands = (filename) ->
   commands = []
-  f = require("../config/custom_commands/#{filename}")
+  f = getFile(filename)
   for k,v of f
     commands.push(k)
   return commands

lib/cwmp.coffee

@@ -185,7 +185,7 @@ inform = (currentRequest, cwmpRequest) ->
         deviceCustomCommands[k] = v._timestamp for k,v of device._customCommands
 
         for cmd in customCommands.getDeviceCustomCommandNames(currentRequest.session.deviceId)
-          if not (deviceCustomCommands[cmd]?._timestamp < lastBootstrap)
+          if not deviceCustomCommands[cmd]? or deviceCustomCommands[cmd] < lastBootstrap
             # Increment timestamp by one millisecond to ensure it runs after any refresh task
             _tasks.push({device: currentRequest.session.deviceId, name: 'customCommand', command: "#{cmd} init", timestamp: new Date(now.getTime() + 1)})
           delete deviceCustomCommands[cmd]

lib/nbi.coffee

@@ -290,19 +290,25 @@ listener = (request, response) ->
       action = r[2]
       if not action? or action is '/'
         if request.method == 'DELETE'
-          db.tasksCollection.remove({'_id' : taskId}, (err, removedCount) ->
+          db.tasksCollection.findOne({'_id' : taskId}, {'device' : 1}, (err, task) ->
-            if err
+            throw err if err
-              response.writeHead(500)
-              response.end(errorToString(err))
-              return
 
-            if removedCount == 0
+            if not task
               response.writeHead(404)
               response.end()
               return
 
-            response.writeHead(200)
+            deviceId = task.device
-            response.end()
+            db.tasksCollection.remove({'_id' : taskId}, (err, removedCount) ->
+              throw err if err
+
+              db.redisClient.del("#{deviceId}_presets_hash", (err) ->
+                throw err if err
+
+                response.writeHead(200)
+                response.end()
+              )
+            )
           )
         else
           response.writeHead 405, {'Allow': 'PUT DELETE'}
@@ -421,9 +427,16 @@ listener = (request, response) ->
           sort = {}
           for k,v of s
             if aliases[k]?
-              sort[a] = v for a in aliases[k]
+              for a in aliases[k]
+                if a[a.lastIndexOf('.')+1] != '_' and collectionName is 'devices'
+                  sort["#{a}._value"] = v
+                else
+                  sort[a] = v
             else
-              sort[k] = v
+              if k[k.lastIndexOf('.') + 1] != '_' and collectionName is 'devices'
+                sort["#{k}._value"] = v
+              else
+                sort[k] = v
           cur.sort(sort)
 
         cur.skip(parseInt(urlParts.query.skip)) if urlParts.query.skip?

lib/normalize.coffee

@@ -68,7 +68,7 @@ normalizers.default = (input, normType) ->
 
     r = stringToRegexp(input)
     if r isnt false
-      vals.push({'$regex' : r})
+      vals.push(r)
 
     return vals
   return input
@@ -90,7 +90,7 @@ normalizers.date = (input, normType) ->
 normalizers.string = (input, normType) ->
   if normType is 'query'
     if (m = /^\/(.*?)\/(g?i?m?y?)$/.exec(input))
-      return [{'$regex' : new RegExp(m[1], m[2])}, input]
+      return [new RegExp(m[1], m[2]), input]
   return input
 
 
@@ -124,7 +124,7 @@ normalizers.mac = (input, normType) ->
   if input.length == 17
     return [input, input.toLowerCase()]
 
-  return {'$regex' : new RegExp(input, 'i')}
+  return new RegExp(input, 'i')
 
 
 exports.normalize = (path, value, normType) ->

lib/query.coffee

@@ -51,8 +51,17 @@ expandValue = (param, value) ->
   while i < indices.length
     obj = {}
     for i in [0...keys.length]
+      if common.typeOf(values[i][indices[i]]) is common.REGEXP_TYPE
+        if keys[i] == '$ne'
+          obj['$not'] = values[i][indices[i]]
+          continue
+      else if keys[i] == '$not' and common.typeOf(values[i][indices[i]]) isnt common.OBJECT_TYPE
+        # Only a regex or decoument (object) are allowed within a $not operator.
+        # This is needed in order to discard string from which a regex is generated.
+        continue
+
       obj[keys[i]] = values[i][indices[i]]
-    objs.push(obj)
+    objs.push(obj) if Object.keys(obj).length
 
     for i in [0...indices.length]
       indices[i] += 1
@@ -75,7 +84,7 @@ permute = (param, val, aliases) ->
     values = expandValue(k, val)
     if k[k.lastIndexOf('.') + 1] != '_'
       k += '._value'
-  
+
     for v in values
       obj = {}
       obj[k] = v
@@ -95,10 +104,12 @@ expand = (query, aliases) ->
     else
       conditions = permute(k, v, aliases)
       if conditions.length > 1
-        if new_query['$and']?
+        new_query['$and'] ?= []
-          new_query['$and'].push({'$or' : conditions})
+        if v?['$ne']? or v?['$nin']? or v?['$not']?
+          for c in conditions
+            new_query['$and'].push(c)
         else
-          new_query['$and'] = [{'$or' : conditions}]
+          new_query['$and'].push({'$or' : conditions})
       else
         common.extend(new_query, conditions[0])
 

lib/tasks.coffee

@@ -322,31 +322,39 @@ this.download = (task, methodResponse, callback) ->
     return
 
   if methodResponse.type isnt 'DownloadResponse'
-    db.filesCollection.findOne({_id : mongodb.ObjectID(String(task.file))}, (err, file) ->
+    if task.url?
-      if not file?
+        methodRequest = {
-        callback('File not found')
+          type : 'Download',
-        return
+          fileType : task.fileType or '1 Firmware Upgrade Image',
-      else if err?
+          url : task.url,
-        callback(err)
+          username: task.username,
-        return
+          password: task.password,
+          successUrl : task.successUrl,
+          failureUrl : task.failureUrl
+        }
+        callback(null, STATUS_OK, methodRequest)
+    else
+      db.filesCollection.findOne({_id : mongodb.ObjectID(String(task.file))}, (err, file) ->
+        if err or not file?
+          return callback(err or new Error('File not found'))
 
-      l = {
+        l = {
-        protocol : if config.get('FS_SSL') then 'https' else 'http',
+          protocol : if config.get('FS_SSL') then 'https' else 'http',
-        hostname : config.get('FS_IP'),
+          hostname : config.get('FS_IP'),
-        port : config.get('FS_PORT'),
+          port : config.get('FS_PORT'),
-        pathname : encodeURIComponent(file.filename)
+          pathname : encodeURIComponent(file.filename)
-      }
+        }
 
-      methodRequest = {
+        methodRequest = {
-        type : 'Download',
+          type : 'Download',
-        fileType : file.metadata.fileType,
+          fileType : file.metadata.fileType,
-        fileSize : file.length,
+          fileSize : file.length,
-        url : url.format(l),
+          url : url.format(l),
-        successUrl : task.successUrl,
+          successUrl : task.successUrl,
-        failureUrl : task.failureUrl
+          failureUrl : task.failureUrl
-      }
+        }
-      callback(null, STATUS_OK, methodRequest)
+        callback(null, STATUS_OK, methodRequest)
-    )
+      )
   else
     callback(null, STATUS_COMPLETED)
 

lib/update-device.coffee

@@ -53,8 +53,8 @@ commitUpdates = (deviceId, deviceUpdates, commitQueue, callback) ->
   processBatch = (updatesBatch, cb) ->
     if updatesBatch.informEvents?
       update['$set']['_lastInform'] = now
-      update['$set']['_lastBoot'] if '1 BOOT' in updatesBatch.informEvents
+      update['$set']['_lastBoot'] = now if '1 BOOT' in updatesBatch.informEvents
-      update['$set']['_lastBootstrap'] if '0 BOOTSTRAP' in updatesBatch.informEvents
+      update['$set']['_lastBootstrap'] = now if '0 BOOTSTRAP' in updatesBatch.informEvents
 
     if updatesBatch.parameterValues?
       for p in updatesBatch.parameterValues

package.json

@@ -1,6 +1,6 @@
 {
   "name": "genieacs",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "A blazing fast TR-069 auto configuration server (ACS) built with Node.js, Redis, and MongoDB",
   "repository": {
     "type": "git",