keuss 2.1.0 → 2.2.1

package/Pipeline/Queue.js

@@ -37,7 +37,16 @@ class PipelinedMongoQueue extends Queue {
 
     this._col.insertOne (entry, {})
     .then (res => cb (null, res.insertedId))
-    .catch (cb);
+    .catch (err => {
+      if (err.code == 11000) {
+        const e = new Error (`duplicated entry with _id ${entry._id}`)
+        e.code = 'EDUP';
+        cb(e)
+      }
+      else {
+        cb (err)
+      }
+    });
   }
 
 

package/Queue.js

@@ -321,6 +321,8 @@ class Queue {
       hdrs:    opts.hdrs || {}
     };
 
+    if (opts.id) msg._id = opts.id;
+
     debug ('%s: about to insert %o', this._name, msg);
 
     // insert into queue

package/backends/bucket-mongo-safe.js

@@ -959,7 +959,8 @@ class Factory extends QFactory_MongoDB_defaults {
       reserve:  true,
       pipeline: false,
       tape:     false,
-      remove:   true
+      remove:   true,
+      id:       false,
     };
   }
 }

package/backends/intraorder.js

@@ -364,7 +364,8 @@ class Factory extends QFactory_MongoDB_defaults {
       reserve:  true,
       pipeline: false,
       tape:     false,
-      remove:   false
+      remove:   false,
+      id:       false,
     };
   }
 }

package/backends/mongo.js

@@ -37,7 +37,16 @@ class SimpleMongoQueue extends Queue {
       debug ('inserted entry %j -> %j', entry, res)
       cb (null, res.insertedId);
     })
-    .catch (cb);
+    .catch (err => {
+      if (err.code == 11000) {
+        const e = new Error (`duplicated entry with _id ${entry._id}`)
+        e.code = 'EDUP';
+        cb(e)
+      }
+      else {
+        cb (err)
+      }
+    });
   }
 c
 
@@ -302,7 +311,8 @@ class Factory extends QFactory_MongoDB_defaults {
       reserve:  true,
       pipeline: false,
       tape:     false,
-      remove:   true
+      remove:   true,
+      id:       true,
     };
   }
 }

package/backends/pl-mongo.js

@@ -169,7 +169,8 @@ class Factory extends QFactory_MongoDB_defaults {
       reserve:  true,
       pipeline: true,
       tape:     false,
-      remove:   true
+      remove:   true,
+      id:       true,
     };
   }
 

package/backends/postgres.js

@@ -58,7 +58,7 @@ class PGQueue extends Queue {
   /////////////////////////////////////////
   // add element to queue
   insert (entry, cb) {
-    const _id =     entry.id || uuid.v4();
+    const _id =     entry._id || uuid.v4();
     const tries =   entry.tries || 0;
     const mature =  new Date (entry.mature);
 
@@ -73,7 +73,19 @@ class PGQueue extends Queue {
     }
 
     this._pool.query (`INSERT INTO ${this._tbl_name} VALUES($1, $2, $3, $4)`, [_id, pl, mature, tries], (err, res) => {
-      if (err) return cb (err);
+      if (err) {
+        if (err.code == '23505') {
+          const e = new Error (`duplicated entry with _id ${entry._id}`)
+          e.code = 'EDUP';
+          cb(e)
+        }
+        else {
+          cb (err)
+        }
+
+        return;
+      }
+
       cb (null, _id)
     })
   }
@@ -353,7 +365,8 @@ class Factory extends QFactory {
       reserve:  true,
       pipeline: false,
       tape:     false,
-      remove:   true
+      remove:   true,
+      id:       true,
     };
   }
 }

package/backends/ps-mongo.js

@@ -35,7 +35,16 @@ class PersistentMongoQueue extends Queue {
   insert (entry, cb) {
     this._col.insertOne (entry, {})
     .then (res => cb (null, res.insertedId))
-    .catch (cb);
+    .catch (err => {
+      if (err.code == 11000) {
+        const e = new Error (`duplicated entry with _id ${entry._id}`)
+        e.code = 'EDUP';
+        cb(e)
+      }
+      else {
+        cb (err)
+      }
+    });
   }
 
 
@@ -332,7 +341,8 @@ class Factory extends QFactory_MongoDB_defaults {
       reserve:  true,
       pipeline: false,
       tape:     true,
-      remove:   true
+      remove:   true,
+      id:       true,
     };
   }
 }

package/backends/redis-list.js

@@ -134,7 +134,8 @@ class Factory extends QFactory {
       reserve:  false,
       pipeline: false,
       tape:     false,
-      remove:   true
+      remove:   true,
+      id:       false,
     };
   }
 }

package/backends/redis-oq.js

@@ -156,7 +156,8 @@ class Factory extends QFactory {
       reserve:  true,
       pipeline: false,
       tape:     false,
-      remove:   true
+      remove:   true,
+      id:       true,
     };
   }
 }

package/backends/stream-mongo.js

@@ -469,7 +469,8 @@ class Factory extends QFactory_MongoDB_defaults {
       pipeline: false,
       tape:     true,
       remove:   false,
-      stream:   true
+      stream:   true,
+      id:       false,
     };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keuss",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "keywords": [
     "queue",
     "persistent",
@@ -39,13 +39,13 @@
     "pg": "~8.12.0"
   },
   "devDependencies": {
-    "chance": "~1.1.12",
-    "mocha": "~11.7.4",
+    "chance": "~1.1.13",
+    "mocha": "~11.7.5",
     "should": "~13.2.3",
     "nyc": "~17.1.0"
   },
   "scripts": {
-    "test": "docker compose up -d; sleep 5; mocha --bail --reporter spec --check-leaks --no-timeouts --exit test/ ; docker compose down",
+    "test": "docker compose up -d; sleep 5; mocha --reporter spec --check-leaks --no-timeouts --exit test/ ; docker compose down",
     "test-with-coverage": "docker compose up -d; sleep 5; nyc --reporter=html -- mocha --reporter spec --check-leaks --no-timeouts --exit ; test/docker compose down"
   }
 }

package/utils/RedisOrderedQueue.js

@@ -7,6 +7,13 @@ const _s_lua_code_push = `
   -- mature-t in ARGV[2]
   -- val in ARGV[3]
 
+  -- check id exists
+  local exists = redis.call ('HGET', 'keuss:q:ordered_queue:hash:' .. KEYS[1], ARGV[1])
+
+  if (exists) then
+    return redis.error_reply('EDUP duplicated _id ' .. ARGV[1])
+  end
+
   -- insert obj in hash by id
   redis.call ('HSET', 'keuss:q:ordered_queue:hash:' .. KEYS[1], ARGV[1], ARGV[3])
 
@@ -174,20 +181,33 @@ class RedisOrderedQueue {
   push (entry, done) {
   //////////////////////////////////
     var pl = {
-      _id:     entry.id || uuid.v4(),
+      _id:     entry._id || uuid.v4(),
       payload: entry.payload,
       tries:   entry.tries,
       hdrs:    entry.hdrs || {},
       mature:  (entry.mature || new Date ()).getTime ()
     };
 
-
     if (Buffer.isBuffer (pl.payload)) {
       pl.payload = pl.payload.toString ('base64');
       pl.type = 'buffer';
     }
 
-    this._rediscl.roq_push (this._name, pl._id, pl.mature, JSON.stringify (pl), done);
+    this._rediscl.roq_push (this._name, pl._id, pl.mature, JSON.stringify (pl), (err, res) => {
+      if (err) {
+        if (err.message.startsWith ('EDUP ')) {
+          const e = new Error (`duplicated entry with _id ${pl._id}`)
+          e.code = 'EDUP';
+          done(e);
+        }
+        else {
+          done (err)
+        }
+      }
+      else {
+        done (null, res);
+      }
+    });
   }