chore: upgrade mongodb driver to v4

hokify · Aug 27, 2021 · b79ddae · b79ddae
1 parent bed4f72
commit b79ddae
Show file tree

Hide file tree

Showing 25 changed files with 251 additions and 245 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
 ## [6.0.0](https://github.com/hokify/agenda/compare/v5.0.1...v6.0.0) (2021-08-27)
+* Upgrade to mongo driver 4
 
 ### [5.0.1](https://github.com/hokify/agenda/compare/v5.0.0...v5.0.1) (2021-02-12)
 

diff --git a/README.md b/README.md
@@ -18,6 +18,7 @@
 # Fork
 This is a fork of agenda js, it differs from the original version in following points:
 - Complete rewrite in Typescript (fully typed!)
+- mongodb4 driver
 - Supports mongoDB sharding by name
 - touch() can have an optional progress parameter (0-100)
 - Bugfixes and improvements for locking & job processing (concurrency, lockLimit,..)

diff --git a/docs/agenda/1.0.3/agenda_find-and-lock-next-job.js.html b/docs/agenda/1.0.3/agenda_find-and-lock-next-job.js.html
@@ -21,7 +21,7 @@
   <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
   <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
 
-  
+
 
   <!-- start Mixpanel -->
   <script type="text/javascript">(function(e,a){if(!a.__SV){var b=window;try{var c,l,i,j=b.location,g=j.hash;c=function(a,b){return(l=a.match(RegExp(b+"=([^&]*)")))?l[1]:null};g&&c(g,"state")&&(i=JSON.parse(decodeURIComponent(c(g,"state"))),"mpeditor"===i.action&&(b.sessionStorage.setItem("_mpcehash",g),history.replaceState(i.desiredHash||"",e.title,j.pathname+j.search)))}catch(m){}var k,h;window.mixpanel=a;a._i=[];a.init=function(b,c,f){function e(b,a){var c=a.split(".");2==c.length&&(b=b[c[0]],a=c[1]);b[a]=function(){b.push([a].concat(Array.prototype.slice.call(arguments,
@@ -52,17 +52,17 @@
     <ul>
       <li >
         <a href="index.html">
-          
+
             <svg fill="#6D6D6D" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
               <path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/>
               <path d="M0 0h24v24H0z" fill="none"/>
             </svg>
-          
-          
+
+
         </a>
       </li>
 
-      
+
 
     </ul>
   </div>
@@ -76,14 +76,14 @@ <h3>Classes</h3><ul><li id="Agenda-nav"><a href="Agenda.html">Agenda</a><ul clas
   </nav>
 
   <div id="main">
-    
+
       <h1 class="page-title">
         agenda/find-and-lock-next-job.js
       </h1>
-
 
-
-
+
+
+
 
 <section>
   <article>
@@ -157,7 +157,7 @@ <h1 class="page-title">
     * Query used to affect what gets returned
     * @type {{returnOriginal: boolean, sort: object}}
     */
-    const JOB_RETURN_QUERY = {returnOriginal: false, sort: this._sort};
+    const JOB_RETURN_QUERY = {returnDocument: 'after', sort: this._sort};
 
     // Find ONE and ONLY ONE job and set the 'lockedAt' time so that job begins to be processed
     this._collection.findOneAndUpdate(JOB_PROCESS_WHERE_QUERY, JOB_PROCESS_SET_QUERY, JOB_RETURN_QUERY, (err, result) => {
@@ -177,7 +177,7 @@ <h1 class="page-title">
   </article>
 </section>
 
-    
+
 
 
   </div>
@@ -191,7 +191,7 @@ <h1 class="page-title">
   <script src="scripts/linenumber.js"></script>
   <script src="scripts/pagelocation.js"></script>
 
-  
-  
+
+
 </body>
 </html>
diff --git a/docs/agenda/1.0.3/agenda_save-job.js.html b/docs/agenda/1.0.3/agenda_save-job.js.html
@@ -21,7 +21,7 @@
   <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
   <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
 
-  
+
 
   <!-- start Mixpanel -->
   <script type="text/javascript">(function(e,a){if(!a.__SV){var b=window;try{var c,l,i,j=b.location,g=j.hash;c=function(a,b){return(l=a.match(RegExp(b+"=([^&]*)")))?l[1]:null};g&&c(g,"state")&&(i=JSON.parse(decodeURIComponent(c(g,"state"))),"mpeditor"===i.action&&(b.sessionStorage.setItem("_mpcehash",g),history.replaceState(i.desiredHash||"",e.title,j.pathname+j.search)))}catch(m){}var k,h;window.mixpanel=a;a._i=[];a.init=function(b,c,f){function e(b,a){var c=a.split(".");2==c.length&&(b=b[c[0]],a=c[1]);b[a]=function(){b.push([a].concat(Array.prototype.slice.call(arguments,
@@ -52,17 +52,17 @@
     <ul>
       <li >
         <a href="index.html">
-          
+
             <svg fill="#6D6D6D" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
               <path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/>
               <path d="M0 0h24v24H0z" fill="none"/>
             </svg>
-          
-          
+
+
         </a>
       </li>
 
-      
+
 
     </ul>
   </div>
@@ -76,14 +76,14 @@ <h3>Classes</h3><ul><li id="Agenda-nav"><a href="Agenda.html">Agenda</a><ul clas
   </nav>
 
   <div id="main">
-    
+
       <h1 class="page-title">
         agenda/save-job.js
       </h1>
-
 
-
-
+
+
+
 
 <section>
   <article>
@@ -168,7 +168,7 @@ <h1 class="page-title">
       const result = await this._collection.findOneAndUpdate(
         {_id: id},
         update,
-        {returnOriginal: false}
+        {returnDocument: 'after'}
       );
       return processDbResult(job, result);
     } else if (props.type === 'single') {
@@ -198,7 +198,7 @@ <h1 class="page-title">
       },
       update, {
         upsert: true,
-        returnOriginal: false
+        returnDocument: 'after'
       });
       return processDbResult(job, result);
     } else if (unique) {
@@ -211,7 +211,7 @@ <h1 class="page-title">
 
       // Use the 'unique' query object to find an existing job or create a new one
       debug('calling findOneAndUpdate() with unique object as query: \n%O', query);
-      const result = await this._collection.findOneAndUpdate(query, update, {upsert: true, returnOriginal: false});
+      const result = await this._collection.findOneAndUpdate(query, update, {upsert: true, returnDocument: 'after'});
       return processDbResult(job, result);
     }
       // If all else fails, the job does not exist yet so we just insert it into MongoDB
@@ -227,7 +227,7 @@ <h1 class="page-title">
   </article>
 </section>
 
-    
+
 
 
   </div>
@@ -241,7 +241,7 @@ <h1 class="page-title">
   <script src="scripts/linenumber.js"></script>
   <script src="scripts/pagelocation.js"></script>
 
-  
-  
+
+
 </body>
 </html>
diff --git a/docs/agenda/1.0.3/utils_process-jobs.js.html b/docs/agenda/1.0.3/utils_process-jobs.js.html
@@ -21,7 +21,7 @@
   <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
   <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
 
-  
+
 
   <!-- start Mixpanel -->
   <script type="text/javascript">(function(e,a){if(!a.__SV){var b=window;try{var c,l,i,j=b.location,g=j.hash;c=function(a,b){return(l=a.match(RegExp(b+"=([^&]*)")))?l[1]:null};g&&c(g,"state")&&(i=JSON.parse(decodeURIComponent(c(g,"state"))),"mpeditor"===i.action&&(b.sessionStorage.setItem("_mpcehash",g),history.replaceState(i.desiredHash||"",e.title,j.pathname+j.search)))}catch(m){}var k,h;window.mixpanel=a;a._i=[];a.init=function(b,c,f){function e(b,a){var c=a.split(".");2==c.length&&(b=b[c[0]],a=c[1]);b[a]=function(){b.push([a].concat(Array.prototype.slice.call(arguments,
@@ -52,17 +52,17 @@
     <ul>
       <li >
         <a href="index.html">
-          
+
             <svg fill="#6D6D6D" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
               <path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/>
               <path d="M0 0h24v24H0z" fill="none"/>
             </svg>
-          
-          
+
+
         </a>
       </li>
 
-      
+
 
     </ul>
   </div>
@@ -76,14 +76,14 @@ <h3>Classes</h3><ul><li id="Agenda-nav"><a href="Agenda.html">Agenda</a><ul clas
   </nav>
 
   <div id="main">
-    
+
       <h1 class="page-title">
         utils/process-jobs.js
       </h1>
-
 
-
-
+
+
+
 
 <section>
   <article>
@@ -244,7 +244,7 @@ <h1 class="page-title">
 
     // Update / options for the MongoDB query
     const update = {$set: {lockedAt: now}};
-    const options = {returnOriginal: false};
+    const options = {returnDocument: 'after'};
 
     // Lock the job in MongoDB!
     self._collection.findOneAndUpdate(criteria, update, options, (err, resp) => {
@@ -427,7 +427,7 @@ <h1 class="page-title">
   </article>
 </section>
 
-    
+
 
 
   </div>
@@ -441,7 +441,7 @@ <h1 class="page-title">
   <script src="scripts/linenumber.js"></script>
   <script src="scripts/pagelocation.js"></script>
 
-  
-  
+
+
 </body>
 </html>
diff --git a/docs/agenda/2.0.0/agenda_find-and-lock-next-job.js.html b/docs/agenda/2.0.0/agenda_find-and-lock-next-job.js.html
@@ -21,7 +21,7 @@
   <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
   <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
 
-  
+
 
   <!-- start Mixpanel -->
   <script type="text/javascript">(function(e,a){if(!a.__SV){var b=window;try{var c,l,i,j=b.location,g=j.hash;c=function(a,b){return(l=a.match(RegExp(b+"=([^&]*)")))?l[1]:null};g&&c(g,"state")&&(i=JSON.parse(decodeURIComponent(c(g,"state"))),"mpeditor"===i.action&&(b.sessionStorage.setItem("_mpcehash",g),history.replaceState(i.desiredHash||"",e.title,j.pathname+j.search)))}catch(m){}var k,h;window.mixpanel=a;a._i=[];a.init=function(b,c,f){function e(b,a){var c=a.split(".");2==c.length&&(b=b[c[0]],a=c[1]);b[a]=function(){b.push([a].concat(Array.prototype.slice.call(arguments,
@@ -52,17 +52,17 @@
     <ul>
       <li >
         <a href="index.html">
-          
+
             <svg fill="#6D6D6D" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
               <path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/>
               <path d="M0 0h24v24H0z" fill="none"/>
             </svg>
-          
-          
+
+
         </a>
       </li>
 
-      
+
 
     </ul>
   </div>
@@ -76,14 +76,14 @@ <h3>Classes</h3><ul><li id="Agenda-nav"><a href="Agenda.html">Agenda</a><ul clas
   </nav>
 
   <div id="main">
-    
+
       <h1 class="page-title">
         agenda/find-and-lock-next-job.js
       </h1>
-
 
-
-
+
+
+
 
 <section>
   <article>
@@ -157,7 +157,7 @@ <h1 class="page-title">
     * Query used to affect what gets returned
     * @type {{returnOriginal: boolean, sort: object}}
     */
-    const JOB_RETURN_QUERY = {returnOriginal: false, sort: this._sort};
+    const JOB_RETURN_QUERY = {returnDocument: 'after', sort: this._sort};
 
     // Find ONE and ONLY ONE job and set the 'lockedAt' time so that job begins to be processed
     this._collection.findOneAndUpdate(JOB_PROCESS_WHERE_QUERY, JOB_PROCESS_SET_QUERY, JOB_RETURN_QUERY, (err, result) => {
@@ -177,7 +177,7 @@ <h1 class="page-title">
   </article>
 </section>
 
-    
+
 
 
   </div>
@@ -191,7 +191,7 @@ <h1 class="page-title">
   <script src="scripts/linenumber.js"></script>
   <script src="scripts/pagelocation.js"></script>
 
-  
-  
+
+
 </body>
 </html>