agenda 3.0.0 → 3.1.0

package/History.md

@@ -3,6 +3,22 @@ Next
 
 * https://github.com/agenda/agenda/pulls
 
+3.1.0 / 2020-04-07
+==================
+
+_Stay safe!_
+
+* Fix for skipImmediate resetting nextRunAt to current date ([#860](https://github.com/agenda/agenda/pull/860)) (Thanks @AshlinDuncan!)
+* Fix deprecated reconnect options ([#948](https://github.com/agenda/agenda/pull/948)) (Thanks @ekegodigital!)
+* Add ability to set a skip when querying jobs. ([#898](https://github.com/agenda/agenda/pull/898)) (Thanks @cjolif!)
+
+Internal:
+* Fixed deprecated MongoDB functions in tests ([#928](https://github.com/agenda/agenda/pull/928)) (Thanks @MichielDeMey!)
+* Updated devDependencies
+
+Thank you @koresar, @sampathBlam, and @MichielDeMey helping to review PRs for this release! 👏
+
+
 3.0.0 / 2020-02-13
 ==================
 

package/README.md

@@ -487,12 +487,12 @@ console.log('Job successfully saved');
 ## Managing Jobs
 
 
-### jobs(mongodb-native query, mongodb-native sort, mongodb-native limit)
+### jobs(mongodb-native query, mongodb-native sort, mongodb-native limit, mongodb-native skip)
 
-Lets you query (then sort and limit the result) all of the jobs in the agenda job's database. These are full [mongodb-native](https://github.com/mongodb/node-mongodb-native) `find`, `sort` and `limit` commands. See mongodb-native's documentation for details.
+Lets you query (then sort, limit and skip the result) all of the jobs in the agenda job's database. These are full [mongodb-native](https://github.com/mongodb/node-mongodb-native) `find`, `sort`, `limit` and `skip` commands. See mongodb-native's documentation for details.
 
 ```js
-const jobs = await agenda.jobs({name: 'printAnalyticsReport'}, {data:-1}, 3);
+const jobs = await agenda.jobs({name: 'printAnalyticsReport'}, {data:-1}, 3, 1);
 // Work with jobs (see below)
 ```
 

package/lib/agenda/database.js

@@ -25,8 +25,13 @@ module.exports = function(url, collection, options, cb) {
     url = 'mongodb://' + url;
   }
 
+  let reconnectOptions = {autoReconnect: true, reconnectTries: Number.MAX_SAFE_INTEGER, reconnectInterval: this._processEvery};
+  if (options && options.useUnifiedTopology && options.useUnifiedTopology === true) {
+    reconnectOptions = {};
+  }
+
   collection = collection || 'agendaJobs';
-  options = {autoReconnect: true, reconnectTries: Number.MAX_SAFE_INTEGER, reconnectInterval: this._processEvery, useNewUrlParser: true, ...options};
+  options = {...reconnectOptions, ...options};
   MongoClient.connect(url, options, (error, client) => {
     if (error) {
       debug('error connecting to MongoDB using collection: [%s]', collection);

package/lib/agenda/jobs.js

@@ -8,13 +8,15 @@ const {createJob} = require('../utils');
  * @param {Object} query object for MongoDB
  * @param {Object} sort object for MongoDB
  * @param {Number} limit number of documents to return from MongoDB
+ * @param {Number} number of documents to skip in MongoDB
  * @returns {Promise} resolves when fails or passes
  */
-module.exports = async function(query = {}, sort = {}, limit = 0) {
+module.exports = async function(query = {}, sort = {}, limit = 0, skip = 0) {
   const result = await this._collection
     .find(query)
     .sort(sort)
     .limit(limit)
+    .skip(skip)
     .toArray();
 
   return result.map(job => createJob(this, job));

package/lib/job/repeat-every.js

@@ -13,7 +13,8 @@ module.exports = function(interval, options) {
   this.attrs.repeatInterval = interval;
   this.attrs.repeatTimezone = options.timezone ? options.timezone : null;
   if (options.skipImmediate) {
-    this.attrs.lastRunAt = new Date();
+    // Set the lastRunAt time to the nextRunAt so that the new nextRunAt will be computed in reference to the current value.
+    this.attrs.lastRunAt = this.attrs.nextRunAt || new Date();
     this.computeNextRunAt();
     this.attrs.lastRunAt = undefined;
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agenda",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Light weight job scheduler for Node.js",
   "main": "index.js",
   "files": [
@@ -51,23 +51,23 @@
   },
   "devDependencies": {
     "blanket": "1.2.3",
-    "coveralls": "3.0.9",
+    "coveralls": "3.0.11",
     "delay": "4.3.0",
+    "eslint": "6.8.0",
     "eslint-config-xo": "0.27.2",
-    "eslint-plugin-ava": "10.0.1",
+    "eslint-plugin-ava": "10.2.0",
     "eslint-plugin-eslint-comments": "3.1.2",
-    "eslint-plugin-import": "2.20.1",
-    "eslint-plugin-node": "11.0.0",
+    "eslint-plugin-import": "2.20.2",
+    "eslint-plugin-node": "11.1.0",
     "eslint-plugin-unicorn": "16.1.1",
-    "eslint": "6.8.0",
     "expect.js": "0.3.1",
-    "jsdoc": "3.6.3",
+    "jsdoc": "3.6.4",
     "jsdoc-template": "https://github.com/braintree/jsdoc-template",
-    "mocha": "7.0.1",
+    "mocha": "7.1.1",
     "mocha-lcov-reporter": "1.3.0",
     "q": "1.5.1",
-    "sinon": "8.1.1",
-    "xo": "0.26.0"
+    "sinon": "9.0.1",
+    "xo": "0.27.2"
   },
   "xo": {
     "space": 2,