1.0.6

Resolves: #123

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

@@ -421,7 +421,14 @@ 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
+              if k[k.lastIndexOf('.') + 1] != '_' and collectionName is 'devices'
+                sort["#{k}._value"] = v
               else
                 sort[k] = v
           cur.sort(sort)

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.6",
   "description": "A blazing fast TR-069 auto configuration server (ACS) built with Node.js, Redis, and MongoDB",
   "repository": {
     "type": "git",