wip

Reviewed-on: #17

.drone.yml

@@ -21,3 +21,6 @@ steps:
     when:
       branch:
         - main
+      event:
+        exclude:
+          - pull_request

README.md

@@ -4,7 +4,7 @@
 WebPlay Server provides REST-API for your media files. In then next step, you can use [WebPlay Client](/WebPlay/client) to access your content.
 
 ## How to install your own instance (Docker)
-[Documentation](/WebPlay/docker#requirements)
+[Documentation](/WebPlay/docker#setup-your-own-webplay-instance)
 
 ## Support
 Join our Matrix room: <a href="https://matrix.to/#/#WebPlay:matrix.anufrij.de">#WebPlay:matrix.anufrij.de</a>

config.json

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

package.json

@@ -10,31 +10,31 @@
   },
   "dependencies": {
     "bcryptjs": "^2.4.3",
-    "body-parser": "^1.19.1",
+    "body-parser": "^1.20.1",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "express": "^4.17.2",
-    "express-fileupload": "^1.3.1",
-    "express-session": "^1.17.2",
+    "express": "^4.18.2",
+    "express-fileupload": "^1.4.0",
+    "express-session": "^1.17.3",
     "fluent-ffmpeg": "^2.1.2",
-    "jsonwebtoken": "^8.5.1",
-    "mime-types": "^2.1.34",
-    "mongodb": "^4.3.1",
-    "music-metadata": "^7.11.8",
+    "jsonwebtoken": "^9.0.0",
+    "mime-types": "^2.1.35",
+    "mongodb": "^6.1.0",
+    "music-metadata": "^7.13.3",
     "node-fdkaac": "^1.4.1",
-    "node-id3": "^0.2.3",
+    "node-id3": "^0.2.6",
     "node-lame": "^1.3.2",
-    "passport": "^0.5.2",
-    "passport-jwt": "^4.0.0",
+    "passport": "^0.6.0",
+    "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
-    "redis": "^4.5.1",
+    "redis": "^4.6.4",
     "request": "^2.88.2",
     "sharp": "0.27.2",
-    "socket.io": "^4.4.1",
-    "systeminformation": "^5.11.2"
+    "socket.io": "^4.6.0",
+    "systeminformation": "^5.17.9"
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "nodemon": "^2.0.15"
+    "nodemon": "^2.0.20"
   }
 }

router/album.js

@@ -51,6 +51,12 @@ 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) => {
@@ -120,14 +126,16 @@ router.route("/:id/share")
   .post(passport.authenticate("jwt", { session: false }), (req, res) => {
     let album_id = req.params.id
     process.stdout.write("router/album POST albums share " + album_id + "\n");
-    database.albums.byId(album_id, undefined, (result) => {
-      if (result != undefined && req.user.roles.indexOf("admin") > -1) {
+    database.albums.byId(album_id, undefined, (album) => {
+      if (album != undefined && req.user.roles.indexOf("admin") > -1) {
         database.share.exists(album_id, result => {
           if (result == null) {
             let item = {
               user_id: req.user._id,
               object_id: new ObjectId(album_id),
-              type: "album"
+              title: album.title,
+              type: "album",
+              cover: album.covers.cover32
             }
             database.share.add(item, (result) => {
               res.json(result).status(200).end();

router/box.js

@@ -122,14 +122,16 @@ router.route("/:id/share")
   .post(passport.authenticate("jwt", { session: false }), (req, res) => {
     let box_id = req.params.id
     process.stdout.write("router/box POST box share " + box_id + "\n");
-    database.boxes.byId(box_id, undefined, (result) => {
-      if (result != undefined && req.user.roles.indexOf("admin") > -1) {
+    database.boxes.byId(box_id, undefined, (box) => {
+      if (box != undefined && req.user.roles.indexOf("admin") > -1) {
         database.share.exists(box_id, result => {
           if (result == null) {
             let item = {
               user_id: req.user._id,
               object_id: new ObjectId(box_id),
-              type: "box"
+              title: box.title,
+              type: "box",
+              cover: box.covers.cover32
             }
             database.share.add(item, (result) => {
               res.json(result).status(200).end();

router/radio.js

@@ -56,9 +56,9 @@ router
         if (radio) {
           if (req.files.file) {
             resize_image_for_radio(req.files.file.data, (result) => {
-              radio.cover32 = result.cover32;
-              radio.cover64 = result.cover64;
-              radio.cover128 = result.cover128;
+              radio.covers.cover32 = result.cover32;
+              radio.covers.cover64 = result.cover64;
+              radio.covers.cover128 = result.cover128;
               database.radios.update(radio);
               res.json(radio).end();
             });

router/share.js

@@ -3,10 +3,24 @@ var express = require("express");
 var router = new express.Router();
 const database = require("../services/database");
 
-router.route("/:id").get((req, res) => {
-    database.share.byId(req.params.id, (result) => {
+const server = require("../server");
+var passport = server.passport;
+
+router.route("/")
+  .get(passport.authenticate("jwt", { session: false }), (req, res) => {
+    if (req.user.roles.includes("admin")) {
+      database.share.collection(result => {
         res.json(result).status(200).end();
+      })
+    } else {
+      res.status(403).end();
+    }
+  });
+router.route("/:id")
+  .get((req, res) => {
+    database.share.byId(req.params.id, result => {
+      res.json(result).status(200).end();
     });
-});
+  });
 
 module.exports = router;

router/system.js

@@ -19,7 +19,7 @@ router
     })
   })
   .post(passport.authenticate("jwt", { session: false }), (req, res) => {
-    if (req.user.roles.indexOf("admin") > -1) {
+    if (req.user.roles.includes("admin")) {
       database.system.setAllows(req.body, () => {
         res.status(200).end();
       })
@@ -31,7 +31,7 @@ router
 router
   .route("/domains")
   .get(passport.authenticate("jwt", { session: false }), (req, res) => {
-    if (req.user.roles.indexOf("admin") > -1) {
+    if (req.user.roles.includes("admin")) {
       let domains = {
         const: config.allowed_domains,
         dynamic: []
@@ -47,7 +47,7 @@ router
     }
   })
   .post(passport.authenticate("jwt", { session: false }), (req, res) => {
-    if (req.user.roles.indexOf("admin") > -1) {
+    if (req.user.roles.includes("admin")) {
       database.system.setDomains(req.body, () => {
         res.status(200).end();
       });

router/user.js

@@ -138,11 +138,6 @@ router
 
 router
   .route("/history")
-  .get(passport.authenticate("jwt", { session: false }), (req, res) => {
-    database.historyList(req.user._id, result => {
-      res.json(result).end();
-    });
-  })
   .post(passport.authenticate("jwt", { session: false }), (req, res) => {
     let item = req.body;
     item.userId = req.user._id;
@@ -159,6 +154,31 @@ router
     });
   });
 
+router
+  .route("/progress")
+  .post(passport.authenticate("jwt", { session: false }), (req, res) => {
+    let item = req.body;
+    item.userId = req.user._id;
+    database.progress.update(item);
+    res.status(200).end();
+  });
+
+router
+  .route("/progress/:parent")
+  .get(passport.authenticate("jwt", { session: false }), (req, res) => {
+    database.progress.get(req.params.parent, result => {
+      res.json(result).end();
+    });
+  })
+  .delete(passport.authenticate("jwt", { session: false }), (req, res) => {
+    let item = {
+      parentId: req.params.parent,
+      userId: req.user._id
+    }
+    database.progress.delete(item);
+    res.status(200).end();
+  });
+
 router
   .route("/settings")
   .put(passport.authenticate("jwt", { session: false }), (req, res) => {

server.js

@@ -52,7 +52,7 @@ const status = {
 process.stdout.write("server DEF arrays\n");
 const lists = {
   audio_quality: ["64", "96", "128", "192", "256", "320"],
-  video_quality: ["480", "720", "1080"],
+  video_quality: ["240", "360", "480", "720", "1080"],
   user_role: ["admin", "moderator", "user"],
   lang: ["ENG", "GER", "RUS"],
   visibility: ["global", "instance", "owner", "hidden"]

services/database/CONNECTOR.js

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

services/database/albums.js

@@ -311,3 +311,26 @@ 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/boxes.js

@@ -15,7 +15,6 @@ let box_project = {
     "videos.box_id": false,
     "videos.mime": false,
     path: false,
-    "covers.cover32": false,
   }
 }
 let boxes_project = {

services/database/index.js

@@ -62,6 +62,9 @@ exports.artists = artists;
 const boxes = require("./boxes");
 exports.boxes = boxes;
 
+const progress = require("./progress");
+exports.progress = progress;
+
 const videos = require("./videos");
 exports.videos = videos;
 

services/database/progress.js

@@ -0,0 +1,27 @@
+const { ObjectId } = require('mongodb');
+const connector = require("./CONNECTOR");
+var dbo;
+connector.connect().then((ret) => {
+  dbo = ret;
+});
+
+exports.get = function (parentId, callback) {
+  dbo.collection("progress")
+    .findOne({ parentId: parentId }, (err, result) => {
+      if (err) throw err;
+      callback(result);
+    });
+}
+exports.update = function (item) {
+  dbo.collection("progress").deleteMany({ userId: ObjectId(item.userId), parentId: item.parentId }, () => {
+    dbo.collection("progress").insertOne(item, (err) => {
+      if (err) throw err;
+    });
+  });
+};
+
+exports.delete = function (item) {
+  dbo.collection("progress").deleteMany({ userId: ObjectId(item.userId), parentId: item.parentId }, (err) => {
+    if (err) throw err;
+  });
+}

services/database/radios.js

@@ -13,6 +13,9 @@ exports.collection = function (callback) {
     .toArray((err, result) => {
       result.forEach(item => {
         item.type = "radio";
+        if (!item.covers) {
+          item.covers = {};
+        }
       });
       callback(result);
     });
@@ -23,6 +26,9 @@ exports.byId = function (id, callback) {
     .collection("radios")
     .findOne({ _id: ObjectId(id) }, (err, result) => {
       if (err) throw err;
+      if (!result.covers) {
+        result.covers = {};
+      }
       callback(result);
     });
 };
@@ -63,9 +69,7 @@ exports.update = function (radio, callback) {
       $set: {
         name: radio.name,
         url: radio.url,
-        cover32: radio.cover32,
-        cover64: radio.cover64,
-        cover128: radio.cover128
+        covers: radio.covers
       }
     },
     { upsert: false },

services/database/share.js

@@ -42,11 +42,21 @@ exports.byId = function (id, callback) {
     });
 }
 
+exports.collection = function (callback) {
+  dbo.collection("shares")
+    .find({})
+    .sort({ type: 1 })
+    .toArray((err, result) => {
+      if (err) throw err;
+      cb(callback, result);
+    });
+}
+
 exports.exists = function (object_id, callback) {
   dbo.collection("shares")
     .findOne({ object_id: ObjectId(object_id) })
     .then(result => {
-      callback(result);
+      cb(callback, result);
     });
 }
 
@@ -65,7 +75,7 @@ exports.add = function (item, callback) {
           ])
           .toArray((err, result) => {
             if (err) throw err;
-            callback(result[0]);
+            cb(callback, result[0]);
           })
       }
     });

services/database/tracks.js

@@ -97,17 +97,27 @@ exports.mostListened = function (filter, callback) {
         }
       }, { $match: { "album.visibility": { $in: filter } } });
   } else {
-    aggregate.unshift({ $match: { type: 'track' } });
-  }
-  aggregate.push({ $sort: { counter: -1, _id: -1 } }, { $limit: 6 })
+    dbo.collection("history")
+      .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);
+          });
+      });
+  }
 
-  dbo
-    .collection("history")
-    .aggregate(aggregate, {
-      allowDiskUse: true
-    })
-    .toArray((err, result) => {
-      if (err) throw err;
-      callback(result);
-    });
 };