add support for latest mongodb driver

Dockerfile

@@ -14,7 +14,8 @@ RUN npm install && \
     npm install pg@8.0.1 && \
     npm install memcached@2.2.2 && \
     npm install aws-sdk@2.814.0 && \
-    npm install rethinkdbdash@2.3.31
+    npm install rethinkdbdash@2.3.31 && \
+    npm install mongodb@5.7.0
 
 ENV STORAGE_TYPE=memcached \
     STORAGE_HOST=127.0.0.1 \

lib/document_stores/mongo.js

@@ -1,7 +1,5 @@
-
+var MongoClient = require("mongodb").MongoClient,
-
+    winston = require("winston");
-var MongoClient = require('mongodb').MongoClient,
-    winston = require('winston');
 
 var MongoDocumentStore = function (options) {
     this.expire = options.expire;
@@ -12,29 +10,38 @@ MongoDocumentStore.prototype.set = function (key, data, callback, skipExpire) {
     var now = Math.floor(new Date().getTime() / 1000),
         that = this;
 
-    this.safeConnect(function (err, db) {
+    this.safeConnect(function (err, db, close) {
-        if (err)
+        if (err) return callback(false);
-            return callback(false);
 
-        db.collection('entries').update({
+        db.collection("entries")
-            'entry_id': key,
+            .updateOne(
-            $or: [
+                {
-                { expiration: -1 },
+                    entry_id: key,
-                { expiration: { $gt: now } }
+                    $or: [{ expiration: -1 }, { expiration: { $gt: now } }],
-            ]
+                },
-        }, {
+                {
-            'entry_id': key,
+                    $set: {
-            'value': data,
+                        entry_id: key,
-            'expiration': that.expire && !skipExpire ? that.expire + now : -1
+                        value: data,
-        }, {
+                        expiration:
-            upsert: true
+                            that.expire && !skipExpire ? that.expire + now : -1,
-        }, function (err, existing) {
+                    },
+                },
+                {
+                    upsert: true,
+                }
+            )
+            .then(function (existing, err) {
                 if (err) {
-                winston.error('error persisting value to mongodb', { error: err });
+                    winston.error("error persisting value to mongodb", {
+                        error: err,
+                    });
+                    close();
                     return callback(false);
                 }
 
                 callback(true);
+                close();
             });
     });
 };
@@ -43,45 +50,54 @@ MongoDocumentStore.prototype.get = function (key, callback, skipExpire) {
     var now = Math.floor(new Date().getTime() / 1000),
         that = this;
 
-    this.safeConnect(function (err, db) {
+    this.safeConnect(function (err, db, close) {
-        if (err)
+        if (err) return callback(false);
-            return callback(false);
 
-        db.collection('entries').findOne({
+        db.collection("entries")
-            'entry_id': key,
+            .findOne({
-            $or: [
+                entry_id: key,
-                { expiration: -1 },
+                $or: [{ expiration: -1 }, { expiration: { $gt: now } }],
-                { expiration: { $gt: now } }
+            })
-            ]
+            .then(function (entry, err) {
-        }, function (err, entry) {
                 if (err) {
-                winston.error('error persisting value to mongodb', { error: err });
+                    winston.error("error persisting value to mongodb", {
+                        error: err,
+                    });
                     return callback(false);
                 }
 
                 callback(entry === null ? false : entry.value);
 
-            if (entry !== null && entry.expiration !== -1 && that.expire && !skipExpire) {
+                if (
-                db.collection('entries').update({
+                    entry !== null &&
-                    'entry_id': key
+                    entry.expiration !== -1 &&
-                }, {
+                    that.expire &&
+                    !skipExpire
+                ) {
+                    db.collection("entries").update(
+                        {
+                            entry_id: key,
+                        },
+                        {
                             $set: {
-                        'expiration': that.expire + now
+                                expiration: that.expire + now,
-                    }
+                            },
-                }, function (err, result) { });
+                        },
+                        function (err, result) {}
+                    );
                 }
+                close();
             });
     });
 };
 
 MongoDocumentStore.prototype.safeConnect = function (callback) {
-    MongoClient.connect(this.connectionUrl, function (err, db) {
+    const client = new MongoClient(this.connectionUrl);
-        if (err) {
+    let db_name = this.connectionUrl.split("/");
-            winston.error('error connecting to mongodb', { error: err });
+    db_name = db_name[db_name.length - 1];
-            callback(err);
+    const db = client.db(db_name);
-        } else {
+    callback(undefined, db, function () {
-            callback(undefined, db);
+        client.close();
-        }
     });
 };
 

package-lock.json

@@ -12,6 +12,7 @@
         "connect": "^3.7.0",
         "connect-ratelimit": "0.0.7",
         "connect-route": "0.1.5",
+        "mongodb": "^5.8.1",
         "pg": "^8.0.1",
         "redis": "0.8.1",
         "redis-url": "0.1.0",
@@ -26,6 +27,34 @@
         "mocha": "^8.1.3"
       }
     },
+    "node_modules/@mongodb-js/saslprep": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.0.tgz",
+      "integrity": "sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==",
+      "optional": true,
+      "dependencies": {
+        "sparse-bitfield": "^3.0.3"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.5.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.6.tgz",
+      "integrity": "sha512-Gi5wRGPbbyOTX+4Y2iULQ27oUPrefaB0PxGQJnfyWN3kvEDGM3mIB5M/gQLmitZf7A9FmLeaqxD3L1CXpm3VKQ=="
+    },
+    "node_modules/@types/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog=="
+    },
+    "node_modules/@types/whatwg-url": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz",
+      "integrity": "sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/webidl-conversions": "*"
+      }
+    },
     "node_modules/@ungap/promise-all-settled": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
@@ -194,6 +223,14 @@
       "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
       "dev": true
     },
+    "node_modules/bson": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-5.4.0.tgz",
+      "integrity": "sha512-WRZ5SQI5GfUuKnPTNmAYPiKIof3ORXAF4IRU5UcgmivNIon01rWQlw5RUH954dpu8yGL8T59YShVddIPaU/gFA==",
+      "engines": {
+        "node": ">=14.20.1"
+      }
+    },
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -711,6 +748,11 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
+    "node_modules/ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
+    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -840,6 +882,12 @@
         "yallist": "^2.1.2"
       }
     },
+    "node_modules/memory-pager": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz",
+      "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
+      "optional": true
+    },
     "node_modules/mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -936,6 +984,55 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/mongodb": {
+      "version": "5.8.1",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.8.1.tgz",
+      "integrity": "sha512-wKyh4kZvm6NrCPH8AxyzXm3JBoEf4Xulo0aUWh3hCgwgYJxyQ1KLST86ZZaSWdj6/kxYUA3+YZuyADCE61CMSg==",
+      "dependencies": {
+        "bson": "^5.4.0",
+        "mongodb-connection-string-url": "^2.6.0",
+        "socks": "^2.7.1"
+      },
+      "engines": {
+        "node": ">=14.20.1"
+      },
+      "optionalDependencies": {
+        "@mongodb-js/saslprep": "^1.1.0"
+      },
+      "peerDependencies": {
+        "@aws-sdk/credential-providers": "^3.188.0",
+        "@mongodb-js/zstd": "^1.0.0",
+        "kerberos": "^1.0.0 || ^2.0.0",
+        "mongodb-client-encryption": ">=2.3.0 <3",
+        "snappy": "^7.2.2"
+      },
+      "peerDependenciesMeta": {
+        "@aws-sdk/credential-providers": {
+          "optional": true
+        },
+        "@mongodb-js/zstd": {
+          "optional": true
+        },
+        "kerberos": {
+          "optional": true
+        },
+        "mongodb-client-encryption": {
+          "optional": true
+        },
+        "snappy": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mongodb-connection-string-url": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz",
+      "integrity": "sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==",
+      "dependencies": {
+        "@types/whatwg-url": "^8.2.1",
+        "whatwg-url": "^11.0.0"
+      }
+    },
     "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -1186,6 +1283,14 @@
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="
     },
+    "node_modules/punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -1274,6 +1379,28 @@
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+      "dependencies": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -1282,6 +1409,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sparse-bitfield": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz",
+      "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==",
+      "optional": true,
+      "dependencies": {
+        "memory-pager": "^1.0.2"
+      }
+    },
     "node_modules/split2": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
@@ -1401,6 +1537,17 @@
         "node": ">=8.0"
       }
     },
+    "node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/uglify-js": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz",
@@ -1437,6 +1584,26 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

package.json

@@ -18,6 +18,7 @@
     "connect": "^3.7.0",
     "connect-ratelimit": "0.0.7",
     "connect-route": "0.1.5",
+    "mongodb": "^5.8.1",
     "pg": "^8.0.1",
     "redis": "0.8.1",
     "redis-url": "0.1.0",
@@ -43,5 +44,6 @@
   "scripts": {
     "start": "node server.js",
     "test": "mocha --recursive"
-  }
+  },
+  "bundleDependencies": []
 }