Update mongodb node module (#913)

Author: starwarfan

source/management_api/SchemaUpdate3to4.js

@@ -11,11 +11,32 @@ if (!databaseUrl) {
   databaseUrl = 'localhost/owtdb';
 }
 
-var db = require('mongojs')(databaseUrl, ['rooms', 'services']);
+var MongoClient = require('mongodb').MongoClient;
+var connectOption = {
+  useUnifiedTopology: true,
+};
+var db;
 var Fraction = require('fraction.js');
 var DefaultUtil = require('./data_access/defaults');
 var Room = require('./data_access/model/roomModel');
 
+function prepareDB(next) {
+  if (dbURL.indexOf('mongodb://') !== 0) {
+    dbURL = 'mongodb://' + dbURL;
+  }
+  MongoClient.connect(dbURL, connectOption, function(err, client) {
+    if (!err) {
+      db = client.db();
+      db.close = client.close;
+      db.rooms = db.collection('rooms');
+      db.services = db.collection('services');
+      next();
+    } else {
+      console.error('Failed to connect mongodb:', err);
+    }
+  });
+}
+
 function fracString(num) {
   var frac = Fraction(0);
   try {
@@ -143,7 +164,7 @@ function processRoom(rooms, i, onFinishRoom) {
   }
 
   var room = upgradeRoom(rooms[i]);
-  db.rooms.save(room, function (err, saved) {
+  db.rooms.updateOne({_id: room._id}, room, function (err, saved) {
     if (err) {
       console.log('Error in updating room:', room._id, err.message);
     } else {
@@ -167,7 +188,7 @@ function processServices(services, i, onFinishService) {
   var processNext = function() {
     service.__v = 0;
     service.rooms = service.rooms.map((room) => (room._id ? room._id : room));
-    db.services.save(service, function (e, saved) {
+    db.services.updateOne({_id: service._id}, service, function (e, saved) {
       if (e) {
         console.log('Error in updating service:', service._id, e.message);
       } else {
@@ -195,17 +216,19 @@ function processServices(services, i, onFinishService) {
 }
 
 function processAll(finishCb) {
-  db.services.find({}).toArray(function (err, services) {
-    console.log('Starting');
-    if (err) {
-      console.log('Error in getting services:', err.message);
-      db.close();
-      return;
-    }
-    processServices(services, 0, function() {
-      db.close();
-      if (typeof finishCb === 'function')
-        finishCb();
+  prepareDB(function() {
+    db.services.find({}).toArray(function (err, services) {
+      console.log('Starting');
+      if (err) {
+        console.log('Error in getting services:', err.message);
+        db.close();
+        return;
+      }
+      processServices(services, 0, function() {
+        db.close();
+        if (typeof finishCb === 'function')
+          finishCb();
+      });
     });
   });
 }

source/management_api/initdb.js

@@ -15,6 +15,11 @@ var currentVersion = '1.0';
 var fs = require('fs');
 var path = require('path');
 
+var MongoClient = require('mongodb').MongoClient;
+var connectOption = {
+  useUnifiedTopology: true,
+};
+var client;
 var db;
 var cipher = require('./cipher');
 
@@ -29,6 +34,9 @@ var sampleEntryName = (require(samplePackageJson).main || DEFAULT_SAMPLE_ENTRY);
 var sampleServiceFile = path.resolve(dirName, SAMPLE_RELATED_PATH, sampleEntryName);
 
 function prepareDB(next) {
+  if (dbURL.indexOf('mongodb://') !== 0) {
+    dbURL = 'mongodb://' + dbURL;
+  }
   if (fs.existsSync(cipher.astore)) {
     cipher.unlock(cipher.k, cipher.astore, function cb (err, authConfig) {
       if (!err) {
@@ -38,22 +46,36 @@ function prepareDB(next) {
             + '@' + dbURL;
         }
       } else {
-        log.error('Failed to get mongodb auth:', err);
+        console.error('Failed to get mongodb auth:', err);
       }
-      db = require('mongojs')(dbURL, ['services', 'infos', 'rooms']);
-      next();
+      MongoClient.connect(dbURL, connectOption, function(err, cli) {
+        if (!err) {
+          client = cli;
+          db = client.db();
+          next();
+        } else {
+          console.error('Failed to connect mongodb:', err);
+        }
+      });
     });
   } else {
-    db = require('mongojs')(dbURL, ['services', 'infos', 'rooms']);
-    next();
+    MongoClient.connect(dbURL, connectOption, function(err, cli) {
+      if (!err) {
+        client = cli;
+        db = client.db();
+        next();
+      } else {
+        console.error('Failed to connect mongodb:', err);
+      }
+    });
   }
 }
 
 function upgradeH264(next) {
-  db.rooms.find({}).toArray(function (err, rooms) {
+  db.collection('rooms').find({}).toArray(function (err, rooms) {
     if (err) {
       console.log('Error in getting rooms:', err.message);
-      db.close();
+      client.close();
       return;
     }
     if (!rooms || rooms.length === 0) {
@@ -89,7 +111,7 @@ function upgradeH264(next) {
         }
       });
 
-      db.rooms.save(room, function (e, saved) {
+      db.collection('rooms').updateOne({_id: room._id}, room, function (e, saved) {
         if (e) {
           console.log('Error in upgrading room:', room._id, e.message);
         }
@@ -103,28 +125,28 @@ function upgradeH264(next) {
 }
 
 function checkVersion (next) {
-  db.infos.findOne({_id: 1}, function cb (err, info) {
+  db.collection('infos').findOne({_id: 1}, function cb (err, info) {
     if (err) {
       console.log('mongodb: error in query info');
-      return db.close();
+      return client.close();
     }
     if (info) {
       if (info.version === '1.0') {
         next();
       }
     } else {
-      db.services.findOne({}, function cb (err, service) {
+      db.collection('services').findOne({}, function cb (err, service) {
         if (err) {
           console.log('mongodb: error in query service');
           return db.close();
         }
         var upgradeNext = function(next) {
           upgradeH264(function() {
             info = {_id: 1, version: currentVersion};
-            db.infos.save(info, function cb (e, s) {
+            db.collection('infos').save(info, function cb (e, s) {
               if (e) {
                 console.log('mongodb: error in updating version');
-                return db.close();
+                return client.close();
               }
               next();
             });
@@ -162,15 +184,15 @@ function checkVersion (next) {
 }
 
 function prepareService (serviceName, next) {
-  db.services.findOne({name: serviceName}, function cb (err, service) {
+  db.collection('services').findOne({name: serviceName}, function cb (err, service) {
     if (err || !service) {
       var crypto = require('crypto');
       var key = crypto.pbkdf2Sync(crypto.randomBytes(64).toString('hex'), crypto.randomBytes(32).toString('hex'), 4000, 128, 'sha256').toString('base64');
       service = {name: serviceName, key: cipher.encrypt(cipher.k, key), encrypted: true, rooms: [], __v: 0};
-      db.services.save(service, function cb (err, saved) {
+      db.collection('services').save(service, function cb (err, saved) {
         if (err) {
           console.log('mongodb: error in adding', serviceName);
-          return db.close();
+          return client.close();
         }
         saved.key = key;
         next(saved);
@@ -228,7 +250,7 @@ prepareDB(function() {
         var sampleServiceKey = service.key;
         console.log('sampleServiceId:', sampleServiceId);
         console.log('sampleServiceKey:', sampleServiceKey);
-        db.close();
+        client.close();
 
         writeSampleFile(sampleServiceId, sampleServiceKey);
       });

source/management_api/package.json

@@ -5,7 +5,7 @@
     "amqp": "*",
     "log4js": "^1.1.1",
     "express": "*",
-    "mongojs": "",
+    "mongodb": "^3.6.4",
     "toml": "*",
     "ajv": "^6.12.3",
     "body-parser": "*",