Merge pull request 'main' (#20) from main into dev

Reviewed-on: #20

config.json

@@ -10,12 +10,12 @@
     "http://localhost"
   ],
   "database": {
-    "host": "localhost",
+    "host": "database",
     "port": 27017,
     "name": "webplay"
   },
   "redis": {
-    "host": "localhost",
+    "host": "redis",
     "port": 6379
   },
   "album_cover_files": [

package.json

@@ -19,7 +19,7 @@
     "fluent-ffmpeg": "^2.1.2",
     "jsonwebtoken": "^9.0.0",
     "mime-types": "^2.1.35",
-    "mongodb": "^6.1.0",
+    "mongodb": "^4.14.0",
     "music-metadata": "^7.13.3",
     "node-fdkaac": "^1.4.1",
     "node-id3": "^0.2.6",

router/album.js

@@ -51,12 +51,6 @@ router.route("/filter/:term")
       res.json(result).status(200).end();
     });
   })
-router.route("/random/:count")
-  .get(passport.authenticate("jwt", { session: false }), (req, res) => {
-    database.albums.randomCovers(req.params.count, 64, (result) => {
-      res.json(result).status(200).end();
-    });
-  })
 
 router.route("/:id")
   .get(checkGuest, (req, res) => {

services/database/CONNECTOR.js

@@ -1,4 +1,4 @@
-const MongoClient = require('mongodb').MongoClient;
+const { MongoClient } = require('mongodb');
 const server = require("../../server");
 const config = server.config;
 
@@ -14,10 +14,7 @@ exports.connect = async function () {
     else {
         try {
             console.log("DB CONNECTING:" + config.database.host + ":" + config.database.port)
-            const client = await MongoClient.connect(url, (err, db)=> {
+            const client = await MongoClient.connect(url);
-                console.log("DB Connected")
-            }
-            );
             dbo = client.db(database);
             return dbo;
         } catch (error) {

services/database/albums.js

@@ -311,26 +311,3 @@ exports.empty = function (callback) {
       callback(result.filter(f => !f.tracks || f.tracks.length == 0));
     });
 };
-
-exports.randomCovers = function (count, size, callback) {
-  dbo
-    .collection("albums")
-    .find({ "covers.cover64": { $exists: true } })
-    .project({ "covers.cover64": true })
-    .toArray((err, result) => {
-      if (result.length > count) {
-        let res = [];
-        while (count-- > 0) {
-          let rnd = randomNumber(0, result.length);
-          res.push(result[rnd]);
-        }
-        callback(res);
-      } else {
-        callback(result);
-      }
-    })
-}
-
-function randomNumber(min, max) {
-  return Math.floor(Math.random() * (max - min) + min);
-}

services/database/tracks.js

@@ -97,27 +97,17 @@ exports.mostListened = function (filter, callback) {
         }
       }, { $match: { "album.visibility": { $in: filter } } });
   } else {
-    dbo.collection("history")
+    aggregate.unshift({ $match: { type: 'track' } });
-      .find()
-      .project({ _id: true })
-      .sort({ _id: -1 })
-      .limit(1000)
-      .toArray((err, ids) => {
-        let arr = ids.map(h => h._id);
-
-        aggregate.unshift({ $match: { type: 'track', _id: { $in: arr } } });
-        aggregate.push({ $sort: { counter: -1 } }, { $limit: 6 })
-
-        dbo
-          .collection("history")
-          .aggregate(aggregate, {
-            allowDiskUse: true
-          })
-          .toArray((err, result) => {
-            if (err) throw err;
-            callback(result);
-          });
-      });
   }
+  aggregate.push({ $sort: { counter: -1, _id: -1 } }, { $limit: 6 })
 
+  dbo
+    .collection("history")
+    .aggregate(aggregate, {
+      allowDiskUse: true
+    })
+    .toArray((err, result) => {
+      if (err) throw err;
+      callback(result);
+    });
 };