From dff95c3c8063f158024f2e4d45742975e4bfd8dd Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zaid@genieacs.com>
Date: Sun, 6 Mar 2016 06:19:50 +0300
Subject: [PATCH] Update dependencies

---
 lib/api-functions.coffee |  6 +++---
 lib/db.coffee            |  4 ++--
 lib/nbi.coffee           | 19 +++++++++++--------
 lib/session.coffee       |  2 +-
 package.json             | 10 +++++-----
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/lib/api-functions.coffee b/lib/api-functions.coffee
index ba34e1e..1a1c8a5 100644
--- a/lib/api-functions.coffee
+++ b/lib/api-functions.coffee
@@ -225,7 +225,7 @@ insertTasks = (tasks, aliases, callback) ->
   for task in tasks
     sanitizeTask(task, aliases, (t) ->
       if t.uniqueKey?
-        db.tasksCollection.remove({device : t.device, uniqueKey : t.uniqueKey}, (err, removed) ->
+        db.tasksCollection.remove({device : t.device, uniqueKey : t.uniqueKey}, (err) ->
         )
 
       --counter
@@ -238,9 +238,9 @@ insertTasks = (tasks, aliases, callback) ->
 
 
 deleteDevice = (deviceId, callback) ->
-  db.tasksCollection.remove({'device' : deviceId}, (err, removed) ->
+  db.tasksCollection.remove({'device' : deviceId}, (err) ->
     return callback(err) if err
-    db.devicesCollection.remove({'_id' : deviceId}, (err, removed) ->
+    db.devicesCollection.remove({'_id' : deviceId}, (err) ->
       return callback(err) if err
       db.redisClient.del("#{deviceId}_presets_hash", "#{deviceId}_inform_hash", (err) ->
         callback(err)
diff --git a/lib/db.coffee b/lib/db.coffee
index 1735783..4e91799 100644
--- a/lib/db.coffee
+++ b/lib/db.coffee
@@ -468,8 +468,8 @@ saveDevice = (deviceId, diff, isNew, callback) ->
 
   return callback() if Object.keys(update).length == 0
 
-  devicesCollection.update({'_id' : deviceId}, update, {upsert: isNew}, (err, count) =>
-    if not err and count != 1
+  devicesCollection.update({'_id' : deviceId}, update, {upsert: isNew}, (err, result) ->
+    if not err and result.result.n != 1
       return callback(new Error("Device #{deviceId} not found in database"))
 
     return callback(err)
diff --git a/lib/nbi.coffee b/lib/nbi.coffee
index a0eac4c..6ba49c3 100644
--- a/lib/nbi.coffee
+++ b/lib/nbi.coffee
@@ -103,7 +103,7 @@ listener = (request, response) ->
           response.end()
         )
       else if request.method == 'DELETE'
-        db.presetsCollection.remove({'_id' : presetName}, (err, removedCount) ->
+        db.presetsCollection.remove({'_id' : presetName}, (err) ->
           db.redisClient.del('presets', 'presets_hash', (err) ->
             throw err if err
           )
@@ -135,7 +135,7 @@ listener = (request, response) ->
           response.end()
         )
       else if request.method == 'DELETE'
-        db.objectsCollection.remove({'_id' : objectName}, (err, removedCount) ->
+        db.objectsCollection.remove({'_id' : objectName}, (err) ->
           db.redisClient.del('objects', 'presets_hash', (err) ->
             throw err if err
           )
@@ -253,7 +253,7 @@ 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.remove({'_id' : taskId}, (err) ->
             if err
               response.writeHead(500)
               response.end(errorToString(err))
@@ -385,8 +385,8 @@ listener = (request, response) ->
           cur.sort(sort)
 
         cur.skip(parseInt(urlParts.query.skip)) if urlParts.query.skip?
-        cur.limit(parseInt(urlParts.query.limit)) if urlParts.query.limit?
-        cur.count((err, total) ->
+        cur.limit(limit = parseInt(urlParts.query.limit)) if urlParts.query.limit?
+        cur.count(false, (err, total) ->
           response.writeHead(200, {'Content-Type' : 'application/json', 'total' : total})
           if request.method is 'HEAD'
             response.end()
@@ -394,12 +394,15 @@ listener = (request, response) ->
           response.write("[\n")
           i = 0
           cur.each((err, item) ->
-            if item is null
-              response.end("\n]")
-            else
+            throw err if err
+
+            if item?
               response.write(",\n") if i++
               apiFunctions.addAliases(item, aliases) if collectionName is 'devices'
               response.write(JSON.stringify(item))
+
+            if not item? or (limit? and i >= limit)
+              response.end("\n]")
           )
         )
 
diff --git a/lib/session.coffee b/lib/session.coffee
index 47af807..2df0197 100644
--- a/lib/session.coffee
+++ b/lib/session.coffee
@@ -363,7 +363,7 @@ load = (id, callback) ->
 save = (sessionData, callback) ->
   sessionData.id ?= crypto.randomBytes(8).toString('hex')
 
-  db.redisClient.setex("session_#{sessionData.id}", sessionData.timeout, JSON.stringify(sessionData), (err) =>
+  db.redisClient.setex("session_#{sessionData.id}", sessionData.timeout, JSON.stringify(sessionData), (err) ->
      return callback(err, sessionData.id)
   )
   return
diff --git a/package.json b/package.json
index 1520b40..8b7b0ab 100644
--- a/package.json
+++ b/package.json
@@ -20,13 +20,13 @@
     "bin": "bin"
   },
   "dependencies": {
-    "libxmljs": "~0.11.0",
-    "redis": "~0.12.1",
-    "hiredis": "~0.1.17",
-    "mongodb": "~1.4.8"
+    "libxmljs": "^0.17.1",
+    "redis": "^2.4.2",
+    "hiredis": "^0.4.1",
+    "mongodb": "^2.1.7"
   },
   "devDependencies": {
-    "coffee-script": "~1.7.1"
+    "coffee-script": "^1.10.0"
   },
   "engines": {
     "node": ">=0.10.0 <0.12"