switched everything over to Mongoose

backend/config/express.js

@@ -2,7 +2,6 @@ var path = require("path");
 var express = require("express");
 var bodyParser = require("body-parser");
 
-var cookie_domain = process.env['REACT_APP_COOKIE_DOMAIN'] != null ? process.env['REACT_APP_COOKIE_DOMAIN'] : '.openmhz.com'; //'https://s3.amazonaws.com/robotastic';
 var backend_server = process.env['REACT_APP_BACKEND_SERVER'] != null ? process.env['REACT_APP_BACKEND_SERVER'] : 'https://api.openmhz.com';
 var frontend_server = process.env['REACT_APP_FRONTEND_SERVER'] != null ? process.env['REACT_APP_FRONTEND_SERVER'] : 'https://openmhz.com';
 var socket_server = process.env['REACT_APP_SOCKET_SERVER'] != null ? process.env['REACT_APP_SOCKET_SERVER'] : 'wss://socket.openmhz.com'; //'https://s3.amazonaws.com/robotastic';

backend/config/secrets.js

@@ -1,15 +0,0 @@
-/** Important **/
-/** You should not be committing this file to GitHub **/
-/** Repeat: DO! NOT! COMMIT! THIS! FILE! TO! YOUR! REPO! **/
-var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'localhost';
-var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017;
-var mongoUrl = 'mongodb://' + host + ':' + port + '/scanner';
-
-
-
-const secrets = {
-	db: mongoUrl,
-	sessionSecret: "letthisbeyoursecret"
-}
-
-module.exports = secrets

backend/controllers/calls.js

@@ -1,16 +1,12 @@
 
 const { ObjectId } = require('mongodb');
-var db = require('../db');
-var mongoose = require("mongoose");
 var { callModel: Call } = require("../models/call");
-var Star = require("../models/star");
+const Group = require("../models/group");
 
 var defaultNumResults = 50;
 
-
 var channels = {};
 
-
 async function get_calls(query, numResults, res) {
 
     var calls = [];
@@ -27,12 +23,9 @@ async function get_calls(query, numResults, res) {
         url: true
     };
 
-    const transCollection = db.get().collection('calls');
     const sort = { length: -1 };
     try {
-        let cursor = transCollection.find(query.filter, fields).sort(sort).limit(numResults);
+        for await (const item of Call.find(query.filter, fields).sort(sort).limit(numResults)) {
-        await cursor.forEach(function (item) {
-
             call = {
                 _id: item._id.toHexString(),
                 talkgroupNum: item.talkgroupNum,
@@ -45,8 +38,7 @@ async function get_calls(query, numResults, res) {
                 len: Math.round(item.len)
             };
             calls.push(call);
-
+        }
-        });
 
         res.contentType('json');
         res.send(JSON.stringify({
@@ -105,13 +97,10 @@ async function build_filter(filter_type, code, start_time, direction, shortName,
 
     if (filter_type) {
         if ((filter_type == "group") && code && (code.indexOf(',') == -1)) {
-            const groupCollection = db.get().collection("groups");
             
 
-            const group = await groupCollection.findOne({
+
-                'shortName': shortName,
+            const group = await Group.findOne({ 'shortName': shortName,  '_id': ObjectId.createFromHexString(code)}).exec();
-                '_id': ObjectId.createFromHexString(code)
-            });
             if (!group) {
                 console.warn("[" + shortName + "] Error - build_filter() group is null " + err);
                 res.contentType('json');
@@ -173,8 +162,8 @@ exports.get_card = async function (req, res) {
         }));
         return;
     }
-    const transCollection = db.get().collection('calls');
+    
-    const item = await transCollection.findOne({ '_id': o_id });
+    const item = await Call.findById(o_id).exec();
 
     //console.log(util.inspect(item));
     if (item) {
@@ -297,8 +286,7 @@ exports.get_call = async function (req, res) {
         }));
         return;
     }
-    const transCollection = db.get().collection('calls');
+    const item = await Call.findById(o_id).exec();
-    const item = await transCollection.findOne({ '_id': o_id });
 
     if (item) {
         var call = package_call(item);

backend/controllers/groups.js

@@ -1,10 +1,7 @@
-var db = require('../db');
+const Group = require("../models/group");
 
 exports.get_groups = async function (req, res) {
-
+    const grp_results = await Group.find({ shortName: req.params.shortName.toLowerCase()}).sort("position").exec();
-    const grp_coll = db.get().collection('groups');
-    const cursor = grp_coll.find({ 'shortName': req.params.shortName.toLowerCase() });
-    const grp_results = await cursor.toArray();
 
     res.contentType('json');
     res.send(JSON.stringify(grp_results));

backend/controllers/talkgroups.js

@@ -1,9 +1,7 @@
-var db = require('../db');
+const Talkgroup = require("../models/talkgroup");
 
 exports.get_talkgroups = async function (req, res) {
-    const tg_coll = db.get().collection('talkgroups');
+    const tg_results = await Talkgroup.find({ 'shortName': req.params.shortName.toLowerCase()})
-    const cursor = tg_coll.find({ 'shortName': req.params.shortName.toLowerCase() })
-    const tg_results = await cursor.toArray();
     var talkgroups = {};
     for (var tg in tg_results) {
         talkgroups[tg_results[tg].num] = tg_results[tg];

backend/db.js

@@ -1,11 +1,8 @@
 var MongoClient = require('mongodb').MongoClient;
-var config = require('./config/config.json');
+
-var test = require('assert');
 
 var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'localhost';
 var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017;
-var dbUser = process.env['MONGO_TRUNK_FRONTEND_USER'] != null ? process.env['MONGO_TRUNK_FRONTEND_USER'] : null;
-var dbPass = process.env['MONGO_TRUNK_FRONTEND_PASS'] != null ? process.env['MONGO_TRUNK_FRONTEND_PASS'] : null;
 
 var state = {
   db: null,

backend/index.js

@@ -1,9 +1,5 @@
 
 var express = require("express");
-var passport = require("passport");
-var util = require("util");
-
-var secrets = require("./config/secrets");
 var configureExpress = require("./config/express");
 
 var calls = require("./controllers/calls");
@@ -17,9 +13,8 @@ var config = require('./config/config.json');
 
 var mongoose = require("mongoose");
 const { ObjectId } = require('mongodb');
-var db = require('./db');
+const Group = require("./models/group");
 
-var System = require("./models/system");
 var multer = require('multer');
 
 // -------------------------------------------
@@ -51,9 +46,13 @@ configureExpress(app)
 
 // -------------------------------------------
 
+var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'localhost';
+var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017;
+var mongoUrl = 'mongodb://' + host + ':' + port + '/scanner';
+
 
 const connect = () => {
-  mongoose.connect(secrets.db).then((result) => { // Successfully connected
+  mongoose.connect(mongoUrl).then((result) => { // Successfully connected
     console.log("connected to Mongo");
   })
     .catch((err) => {
@@ -258,32 +257,18 @@ io.sockets.on('connection', function (client) {
       clients[client.id].talkgroupNums = [];
       clients[client.id].timestamp = new Date();
       if ((data.filterType == "group") && (data.filterCode.indexOf(',') == -1)) {
-        const groupCollection = db.get().collection("groups");
-        if (!groupCollection) {
-          console.error("Error - unable to open groups collection: " + err);
-          delete clients[client.id];
-          return;
-        }
         if (!ObjectId.isValid(data.filterCode)) {
           console.error("Error - Socket - Invalid Group ID: " + data.filterCode);
           delete clients[client.id];
           return;
         }
-        let group;
+
-        try {
+        const group = await Group.findOne({ 'shortName': data.shortName.toLowerCase(), '_id': ObjectId.createFromHexString(data.filterCode) });
-          group = await groupCollection.findOne({
+
-            'shortName': data.shortName.toLowerCase(),
+        if (group) {
-            '_id': ObjectId.createFromHexString(data.filterCode)
-          });
-        } catch (err) {
-          console.warn("[" + data.shortName.toLowerCase() + "] Error - WebSocket Group ID not Found! Error: " + err + " Group ID: " + data.filterCode);
-          delete clients[client.id];
-          return;
-        }
-        if (group && clients[client.id]) {
           clients[client.id].talkgroupNums = group.talkgroups;
         } else {
-          console.error("Error - Socket: Invalid group or Client: " + data.filterCode + " Shortname: " + data.shortName + " ClientID: " + client.id);
+          console.error("Error - Socket: Invalid group " + data.filterCode + " Shortname: " + data.shortName + " ClientID: " + client.id);
           delete clients[client.id];
           return;
         }
@@ -309,13 +294,7 @@ io.sockets.on('connection', function (client) {
 });
 
 
-//console.log("stats: " + util.inspect(call_stats));
+
-// Connect to Mongo on start
-db.connect(function (err) {
-  if (err) {
-    console.log('Unable to connect to Mongo.')
-    process.exit(1)
-  } else {
 stats.init_stats();
 
 server.listen(app.get("port"), (err) => {
@@ -326,10 +305,6 @@ db.connect(function (err) {
   }
 })
 
-
-  }
-})
-
 /*
 var calcRule = new schedule.RecurrenceRule();
 calcRule.minute = 4;

backend/models/system_stat.js

@@ -0,0 +1,27 @@
+var mongoose = require('mongoose');
+
+let decodeErrorSchema = mongoose.Schema({
+  errorHistory: [Number],
+  spikeHistory: [Number],
+})
+
+let talkgroupStatsSchema = mongoose.Schema({
+  callCountHistory: [Number],
+  callAvgLenHistory: [Number]
+})
+var systemStatSchema = mongoose.Schema({
+  callTotals: [Number],
+  uploadErrors: [Number],
+  decodeErrorsFreq: {
+    type: Map,
+    of: decodeErrorSchema
+  },
+  talkgroupStats: {
+    type: Map,
+    of: talkgroupStatsSchema
+  },
+  shortName: String
+}, { collection: 'system_stats' });
+
+
+module.exports = mongoose.model('SystemStat', systemStatSchema);

backend/sys_stats.js

@@ -1,5 +1,7 @@
 var util = require("util");
 var db = require('./db');
+const SystemStat = require("./models/system_stat");
+var System = require("./models/system");
 var talkgroupStats = {};
 var callTotals = {};
 var uploadErrors = {};
@@ -11,43 +13,30 @@ var spots = (24*60) / timePeriod; // the number of spots needed to keep track of
 async function updateActiveSystems() {
 
     // Go through all of the Systems
-    const sysCollection = db.get().collection('systems');
+
-        var cursor = sysCollection.find();
+
-        await cursor.forEach(function(item) {
+    for await (const item of System.find()) {
         // go through all the systems
         // if you have recieved some calls during that last period, make the system active
         if ((callTotals[item.shortName] != undefined) && (callTotals[item.shortName][0] > 0)) {
-                    const active = true;
+            item.active = true;
-                    const callAvg = callTotals[item.shortName][0] / timePeriod;
+            item.callAvg = callTotals[item.shortName][0] / timePeriod;
-
+            item.lastActive = new Date();
-                    const query = { shortName: item.shortName};
+            await item.Save();
-                    const update = { $set: {"active": active,"callAvg": callAvg,"lastActive": new Date() }};
-                    const options = {upsert: true};
-
-                    sysCollection.updateOne(query, update, options);
-                        
         } else {
-                    const query = { shortName: item.shortName};
+            item.active = false;
-                    const update = { $set: {"active": false, "callAvg": 0}};
+            item.callAvg = 0;
-                    const options = {upsert: true};
+            await item.save();
-
-                    sysCollection.updateOne(query, update, options);
         }
 
-        });
+    };
 }
 
 exports.initStats = async function () {
     // get the System Stats collection
 
-    db.get().createCollection("system_stats").catch((err)=>{console.log("System Stats collection is ready")});
-    const statsCollection = db.get().collection('system_stats');
-
-        var cursor = statsCollection.find();
-
-        // go through each of the Systems in Stats
-        await cursor.forEach(function(item) {
 
+    for await (const item of SystemStat.find()) {
         // Talkgroup Stats
         if (item.talkgroupStats != undefined) {
             talkgroupStats[item.shortName] = item.talkgroupStats;
@@ -66,7 +55,7 @@ exports.initStats = async function() {
         if (item.callTotals != undefined) {
             callTotals[item.shortName] = item.callTotals;
         }
-        });
+    };
 }
 
 // keeps track of the number of calls that get uploaded with an audio file
@@ -86,9 +75,6 @@ exports.addError = function(call) {
 
 // Keeps track of the number of calls for each talkgroup for a system
 exports.addCall = function (call) {
-
-
-
     // if you haven't started keeping track of stats for the System yet
     if (talkgroupStats[call.shortName] == undefined) {
         talkgroupStats[call.shortName] = {};
@@ -140,7 +126,7 @@ exports.addCall = function(call) {
 
 // This gets called when a Time Period is up
 exports.shiftStats = async function () {
-    const statsCollection = db.get().collection('system_stats');
+
 
     // for all the systems in Error Stats
     for (var shortName in uploadErrors) {
@@ -151,7 +137,7 @@ exports.shiftStats = async function() {
             const update = { $set: { "uploadErrors": uploadErrors[shortName] } };
             const options = { upsert: true };
 
-                statsCollection.updateOne(query, update, options);
+            await SystemStat.updateOne(query, update, options);
             // move everything back one after updating
             for (var j = spots - 1; j > 0; j--) {
                 uploadErrors[shortName][j] = uploadErrors[shortName][j - 1];
@@ -198,7 +184,7 @@ exports.shiftStats = async function() {
             const update = { $set: { "decodeErrorsFreq": decodeErrorsFreq[shortName] } };
             const options = { upsert: true };
 
-                statsCollection.updateOne(query, update, options);
+            await SystemStat.updateOne(query, update, options);
 
         }
     }
@@ -266,7 +252,7 @@ exports.shiftStats = async function() {
             const update = { $set: { "talkgroupStats": talkgroupStats[shortName], "callTotals": callTotals[shortName] } };
             const options = { upsert: true };
 
-                statsCollection.updateOne(query, update, options);
+            await SystemStat.updateOne(query, update, options);
         }
     }
     updateActiveSystems();