keuss - npm Package Compare versions

Comparing version 1.6.11 to 1.6.12

backends/bucket-mongo-safe.js

@@ -136,7 +136,9 @@ var async =     require ('async');
 
-      if ((res && res.result && res.result.n) != 1) return cb({
-        err: 'Bucket flush: exactly one must be deleted',
-        e: err,
-        q: q
-      });
+      if ((res && res.deletedCount) != 1) {
+        return cb({
+          err: 'Bucket flush: exactly one must be deleted',
+          e: err,
+          q: q
+        });
+      }
 
@@ -220,3 +222,3 @@ debug ('Bucket: deleted whole bucket %o', q);
 
-        if ((res && res.result && res.result.nModified) != 1) return cb({
+        if (res && (res.modifiedCount != 1)) return cb({
           err: 'Bucket flush: exactly one must be updated',
@@ -655,13 +657,11 @@ e: err,
   totalSize (callback) {
-    this._col.aggregate ([
+    const cursor = this._col.aggregate ([
       {$group:{_id:'t', v: {$sum: '$n'}}}
-    ], (err, cursor) => {
+    ]);
+
+    cursor.toArray ((err, res) => {
+      debug ('calculating totalSize: aggregation pipeline returns %o', res);
       if (err) return callback (err);
-
-      cursor.toArray ((err, res) => {
-        debug ('calculating totalSize: aggregation pipeline returns %o', res);
-        if (err) return callback (err);
-        if (res.length == 0) return callback (null, 0);
-        callback (null, res[0].v);
-      });
+      if (res.length == 0) return callback (null, 0);
+      callback (null, res[0].v);
     });
@@ -674,14 +674,12 @@ }
   size (callback) {
-    this._col.aggregate ([
+    const cursor = this._col.aggregate ([
       {$match: {mature: {$lte: Queue.now ()}}},
       {$group:{_id:'t', v: {$sum: '$n'}}}
-    ], (err, cursor) => {
+    ]);
+
+    cursor.toArray ((err, res) => {
+      debug ('calculating size: aggregation pipeline returns %o', res);
       if (err) return callback (err);
-
-      cursor.toArray ((err, res) => {
-        debug ('calculating size: aggregation pipeline returns %o', res);
-        if (err) return callback (err);
-        if (res.length == 0) return callback (null, 0);
-        callback (null, res[0].v);
-      });
+      if (res.length == 0) return callback (null, 0);
+      callback (null, res[0].v);
     });
@@ -694,3 +692,3 @@ }
   schedSize (callback) {
-    this._col.aggregate ([
+    const cursor = this._col.aggregate ([
       {$match: {
@@ -701,18 +699,17 @@ mature: {$gt: Queue.now ()},
       {$group:{_id:'t', v: {$sum: '$n'}}}
-    ], (err, cursor) => {
+    ]);
+
+    cursor.toArray ((err, res) => {
+      debug ('calculating schedSize: aggregation pipeline returns %o', res);
       if (err) return callback (err);
-
-      cursor.toArray ((err, res) => {
-        debug ('calculating schedSize: aggregation pipeline returns %o', res);
-        if (err) return callback (err);
-        if (res.length == 0) return callback (null, 0);
-        callback (null, res[0].v);
-      });
+      if (res.length == 0) return callback (null, 0);
+      callback (null, res[0].v);
     });
   }
 
+
   //////////////////////////////////
   // queue size of non-mature elements only
   resvSize (callback) {
-    this._col.aggregate ([
+    const cursor = this._col.aggregate ([
       {$match: {
@@ -723,11 +720,9 @@ mature: {$gt: Queue.now ()},
       {$group:{_id:'t', v: {$sum: '$n'}}}
-    ], (err, cursor) => {
+    ]);
+
+    cursor.toArray ((err, res) => {
+      debug ('calculating resvSize: aggregation pipeline returns %o', res);
       if (err) return callback (err);
-
-      cursor.toArray ((err, res) => {
-        debug ('calculating resvSize: aggregation pipeline returns %o', res);
-        if (err) return callback (err);
-        if (res.length == 0) return callback (null, 0);
-        callback (null, res[0].v);
-      });
+      if (res.length == 0) return callback (null, 0);
+      callback (null, res[0].v);
     });
@@ -740,3 +735,7 @@ }
   next_t (callback) {
-    this._col.find ({}).limit(1).sort ({mature:1}).project ({mature:1}).next ((err, result) => {
+    this._col.findOne ({}, {
+      sort:       {mature:1},
+      projection: {mature: 1}
+    },
+    (err, result) => {
       if (err) return callback (err);
@@ -749,3 +748,2 @@ debug ('obtaining next_t: got %o', result && result.mature);
 
-
   //////////////////////////////////////////////
@@ -752,0 +750,0 @@ // remove by id

backends/bucket-mongo.js

@@ -208,12 +208,10 @@ var async =     require ('async');
   //////////////////////////////////
-    this._col.aggregate ([
+    const cursor = this._col.aggregate ([
       {$group:{_id:'t', v: {$sum: '$n'}}}
-    ], (err, cursor) => {
+    ]);
+
+    cursor.toArray ((err, res) => {
       if (err) return callback (err);
-
-      cursor.toArray ((err, res) => {
-        if (err) return callback (err);
-        if (res.length == 0) return callback (null, 0);
-        callback (null, res[0].v);
-      });
+      if (res.length == 0) return callback (null, 0);
+      callback (null, res[0].v);
     });
@@ -220,0 +218,0 @@ }

package.json

 {
   "name": "keuss",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "keywords": [
@@ -29,10 +29,10 @@ "queue",
   "dependencies": {
-    "@nodebb/mubsub": "~1.7.1",
+    "@nodebb/mubsub": "~1.8.0",
     "async": "~3.2.3",
     "async-lock": "~1.3.1",
-    "debug": "~4.3.3",
-    "ioredis": "~4.28.5",
+    "debug": "~4.3.4",
+    "ioredis": "~5.0.4",
     "lodash": "~4.17.21",
     "mitt": "~3.0.0",
-    "mongodb": "~3.6.12",
+    "mongodb": "~4.5.0",
     "uuid": "~8.3.2"
@@ -42,3 +42,3 @@ },
     "chance": "~1.1.8",
-    "mocha": "~9.2.1",
+    "mocha": "~9.2.2",
     "should": "~13.2.3"
@@ -45,0 +45,0 @@ },

test/backends_bucket-at-least-once.js

@@ -55,2 +55,3 @@
     ], function(err, results) {
+      if (err) return done (err);
       results.should.eql ([{get: 0, put: 0, reserve: 0, commit: 0, rollback: 0, deadletter: 0}, 0, 0, null])
@@ -71,11 +72,11 @@ done();
         size.should.equal (2);
-        cb();
+        cb(err);
       })},
       function (cb) {q.stats (function (err, res) {
         res.should.eql ({get: 0, put: 2, reserve: 0, commit: 0, rollback: 0, deadletter: 0});
-        cb();
+        cb(err);
       })},
       function (cb) {q.next_t (function (err, res) {
         res.getTime().should.be.approximately(new Date().getTime(), 2000);
-        cb();
+        cb(err);
       })},
@@ -88,7 +89,7 @@ function (cb) {q.pop ('c1', function (err, ret) {
         size.should.equal (0);
-        cb();
+        cb(err);
       })},
       function (cb) {q.stats (function (err, res) {
         res.should.eql ({get: 1, put: 2, reserve: 0, commit: 0, rollback: 0, deadletter: 0});
-        cb();
+        cb(err);
       })},
@@ -101,9 +102,10 @@ function (cb) {q.pop ('c2', function (err, ret) {
         size.should.equal (0);
-        cb();
+        cb(err);
       })},
       function (cb) {q.stats (function (err, res) {
         res.should.eql ({get: 2, put: 2, reserve: 0, commit: 0, rollback: 0, deadletter: 0});
-        cb();
+        cb(err);
       })},
     ], function(err, results) {
+      if (err) return done (err);
       q.drain();
@@ -143,9 +145,10 @@ done();
         size.should.equal (0);
-        cb();
+        cb(err);
       })},
       function (cb) {q.stats (function (err, res) {
         res.should.eql ({get: 2, put: 2, reserve: 0, commit: 0, rollback: 0, deadletter: 0});
-        cb();
+        cb(err);
       })},
     ], function(err, results) {
+      if (err) return done (err);
       q.drain();
@@ -167,4 +170,4 @@ done();
 
-      (cb) => q.size ((err, size) => {size.should.equal (4); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 4, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (4); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 4, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(err); }),
 
@@ -176,6 +179,6 @@ (cb) => q.push ({elem:5, pl:'twetrwte'}, cb),
 
-      (cb) => q.size ((err, size) => {size.should.equal (7); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (7); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(err); }),
 
-      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime(), 2000); cb(); }),
+      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime(), 2000); cb(err); }),
 
@@ -190,5 +193,6 @@ (cb) => {q.pop ('c1', (err, ret) => {ret.payload.should.eql ({elem:1, pl:'twetrwte'}); cb (err); })},
 
-      (cb) => q.size ((err, size) => {size.should.equal (0); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 7, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (0); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 7, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(err); }),
     ], function(err, results) {
+      if (err) return done (err);
       q.drain();
@@ -210,3 +214,3 @@ done();
 
-      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() + 3300, 100); cb(); }),
+      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() + 3300, 100); cb(err); }),
 
@@ -218,8 +222,8 @@ (cb) => q.push ({elem:5, pl:'twetrwte'}, {delay: 2}, cb),
 
-      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() + 1300, 100); cb(); }),
+      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() + 1300, 100); cb(err); }),
 
-      (cb) => q.size ((err, size) => {size.should.equal (0); cb(); }),
-      (cb) => q.totalSize ((err, size) => {size.should.equal (7); cb(); }),
-      (cb) => q.schedSize ((err, size) => {size.should.equal (7); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (0); cb(err); }),
+      (cb) => q.totalSize ((err, size) => {size.should.equal (7); cb(err); }),
+      (cb) => q.schedSize ((err, size) => {size.should.equal (7); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(err); }),
 
@@ -234,5 +238,6 @@ (cb) => {q.pop ('c1', (err, ret) => {ret.payload.should.eql ({elem:5, pl:'twetrwte'}); cb (err); })},
 
-      (cb) => q.size ((err, size) => {size.should.equal (0); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 7, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (0); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 7, put: 7, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(err); }),
     ], function(err, results) {
+      if (err) return done (err);
       q.drain();
@@ -252,4 +257,4 @@ done();
 
-      (cb) => q.size ((err, size) => {size.should.equal (2); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 2, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (2); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 2, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(err); }),
 
@@ -259,9 +264,10 @@ (cb) => q.push ({elem:3, pl:'twetrwte'}, cb),
 
-      (cb) => q.size ((err, size) => {size.should.equal (3); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 3, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (3); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 0, put: 3, reserve: 0, commit: 0, rollback: 0, deadletter: 0}); cb(err); }),
 
-      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() - 1400, 100); cb(); }),
+      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() - 1400, 100); cb(err); }),
 
       (cb) => {
         q.pop ('c1', {reserve: true}, (err, ret) => {
+          if (err) return cb (err);
           ret.payload.should.eql ({elem:1, pl:'twetrwte'});
@@ -279,2 +285,3 @@ q.ko (ret._id, (new Date().getTime() + 5000 ), (err, res) => {
         q.pop ('c1', {reserve: true}, (err, ret) => {
+          if (err) return cb (err);
           ret.payload.should.eql ({elem:3, pl:'twetrwte'});
@@ -290,7 +297,7 @@ q.ko (ret._id, (new Date().getTime() + 3000 ), (err, res) => {
 
-      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() + 2500, 500); cb(); }),
+      (cb) => q.next_t ((err, res) => {res.getTime().should.be.approximately(new Date().getTime() + 2500, 500); cb(err); }),
 
-      (cb) => q.size ((err, size) => {size.should.equal (0); cb(); }),
-      (cb) => q.totalSize ((err, size) => {size.should.equal (2); cb(); }),
-      (cb) => q.schedSize ((err, size) => {size.should.equal (2); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (0); cb(err); }),
+      (cb) => q.totalSize ((err, size) => {size.should.equal (2); cb(err); }),
+      (cb) => q.schedSize ((err, size) => {size.should.equal (2); cb(err); }),
 
@@ -300,5 +307,6 @@ (cb) => {q.pop ('c1', (err, ret) => {ret.payload.should.eql ({elem:3, pl:'twetrwte'}); cb (err); })},
 
-      (cb) => q.size ((err, size) => {size.should.equal (0); cb(); }),
-      (cb) => q.stats ((err, res) => {res.should.eql ({get: 3, put: 3, reserve: 2, commit: 0, rollback: 2, deadletter: 0}); cb(); }),
+      (cb) => q.size ((err, size) => {size.should.equal (0); cb(err); }),
+      (cb) => q.stats ((err, res) => {res.should.eql ({get: 3, put: 3, reserve: 2, commit: 0, rollback: 2, deadletter: 0}); cb(err); }),
     ], function(err, results) {
+      if (err) return done (err);
       q.drain();
@@ -305,0 +313,0 @@ done();

No alert changes

Improved metrics

Total package byte prevSize

374654

increased by0.03%

Lines of code

10242

increased by0.04%

Dependency changes

• + Added@ioredis/commands@1.2.0(transitive)

• + Added@nodebb/mubsub@1.8.0(transitive)

• + Added@types/node@22.0.2(transitive)

• + Added@types/webidl-conversions@7.0.3(transitive)

• + Added@types/whatwg-url@8.2.2(transitive)

• + Addedbase64-js@1.5.1(transitive)

• + Addedbson@4.7.2(transitive)

• + Addedbuffer@5.7.1(transitive)

• + Addeddenque@2.1.0(transitive)

• + Addedieee754@1.2.1(transitive)

• + Addedioredis@5.0.6(transitive)

• + Addedip-address@9.0.5(transitive)

• + Addedjsbn@1.1.0(transitive)

• + Addedmongodb@4.5.0(transitive)

• + Addedmongodb-connection-string-url@2.6.0(transitive)

• + Addedpunycode@2.3.1(transitive)

• + Addedsmart-buffer@4.2.0(transitive)

• + Addedsocks@2.8.3(transitive)

• + Addedsprintf-js@1.1.3(transitive)

• + Addedtr46@3.0.0(transitive)

• + Addedundici-types@6.11.1(transitive)

• + Addedwebidl-conversions@7.0.0(transitive)

• + Addedwhatwg-url@11.0.0(transitive)

• - Removed@nodebb/mubsub@1.7.1(transitive)

• - Removedbl@2.2.1(transitive)

• - Removedbson@1.1.6(transitive)

• - Removedcore-util-is@1.0.3(transitive)

• - Removeddenque@1.5.1(transitive)

• - Removedinherits@2.0.4(transitive)

• - Removedioredis@4.28.5(transitive)

• - Removedisarray@1.0.0(transitive)

• - Removedlodash.flatten@4.4.0(transitive)

• - Removedmongodb@3.6.12(transitive)

• - Removedoptional-require@1.1.8(transitive)

• - Removedp-map@2.1.0(transitive)

• - Removedprocess-nextick-args@2.0.1(transitive)

• - Removedreadable-stream@2.3.8(transitive)

• - Removedredis-commands@1.7.0(transitive)

• - Removedrequire-at@1.0.6(transitive)

• - Removedsafe-buffer@5.1.25.2.1(transitive)

• - Removedstring_decoder@1.1.1(transitive)

• - Removedutil-deprecate@1.0.2(transitive)

• Updated@nodebb/mubsub@~1.8.0

• Updateddebug@~4.3.4

• Updatedioredis@~5.0.4

• Updatedmongodb@~4.5.0