museria 0.2.49 → 0.3.2

package/src/schema.js

@@ -1,11 +1,12 @@
-const _ = require('lodash');
-const mtSchema = require('metastocle/src/schema');
-const stSchema = require('storacle/src/schema');
-const utils = require('./utils');
+import merge from "lodash-es/merge.js";
+import mtSchema from "metastocle/src/schema.js";
+import stSchema from "storacle/src/schema.js";
+import utils from "./utils.js";
+
 const schema = Object.assign({}, mtSchema, stSchema);
 
 schema.getStatusResponse = function () {
-  return _.merge(mtSchema.getStatusResponse(), stSchema.getStatusResponse(), {
+  return merge(mtSchema.getStatusResponse(), stSchema.getStatusResponse(), {
     props: {
       collectionLimit: 'number',
     }
@@ -17,10 +18,10 @@ schema.getSongPriority = function () {
     type: 'number',
     value: utils.isValidSongPriority.bind(utils)
   };
-}
+};
 
 schema.getStatusPrettyResponse = function () {
-  return _.merge(this.getStatusResponse(), mtSchema.getStatusPrettyResponse(), stSchema.getStatusPrettyResponse());
+  return merge(this.getStatusResponse(), mtSchema.getStatusPrettyResponse(), stSchema.getStatusPrettyResponse());
 };
 
 schema.getMusicCollectionGetting = function (options = {}) {
@@ -28,7 +29,6 @@ schema.getMusicCollectionGetting = function (options = {}) {
     type: 'object',
     value: null
   };
-
   const musicType = {
     type: 'object',
     strict: true,
@@ -38,56 +38,54 @@ schema.getMusicCollectionGetting = function (options = {}) {
       beautify: 'boolean'
     }
   };
-
   const titleType = [
     {
       type: 'object',
-      strict: true,        
-      props: { 
+      strict: true,
+      props: {
         $mus: musicType
       }
     },
     {
       type: 'object',
-      strict: true,        
+      strict: true,
       props: {
         $art: 'string'
       }
     },
     {
       type: 'object',
-      strict: true,        
-      props: { 
+      strict: true,
+      props: {
         $or: {
           type: 'array',
           items: [
-            { 
+            {
               type: 'object',
               strict: true,
               props: {
                 $mus: musicType
               }
             },
-            { 
+            {
               type: 'object',
               strict: true,
               props: {
                 $milk: {
                   type: 'string',
                   value: val => (!options.findingStringMinLength || val.length >= options.findingStringMinLength)
-                }              
+                }
               }
             }
           ]
-        }       
+        }
       }
     }
   ];
-  
   return {
     type: 'object',
     strict: true,
-    props: {          
+    props: {
       offset: {
         type: 'number',
         value: 0
@@ -113,11 +111,11 @@ schema.getMusicCollectionGetting = function (options = {}) {
         type: 'object',
         strict: true,
         props: {
-          compTitle: titleType       
+          compTitle: titleType
         }
       }
     }
-  }
+  };
 };
 
 schema.getSongAudioLink = function () {
@@ -137,13 +135,13 @@ schema.getSongCoverLink = function () {
 schema.getSongInfo = function () {
   return {
     type: 'object',
-    props: {     
+    props: {
       address: this.getAddress(),
       title: 'string',
       fileHash: 'string',
-      tags: 'object',      
+      tags: 'object',
       audioLink: this.getSongAudioLink(),
-      coverLink: this.getSongCoverLink(), 
+      coverLink: this.getSongCoverLink(),
       priority: this.getSongPriority()
     },
     strict: true
@@ -156,7 +154,7 @@ schema.getSongAdditionResponse = function () {
 
 schema.getSongInfoMasterResponse = function () {
   return this.getSongInfoButlerResponse();
-}
+};
 
 schema.getSongInfoButlerResponse = function () {
   return {
@@ -169,7 +167,7 @@ schema.getSongInfoButlerResponse = function () {
       }
     },
     strict: true
-  }
+  };
 };
 
 schema.getSongInfoSlaveResponse = function () {
@@ -178,7 +176,7 @@ schema.getSongInfoSlaveResponse = function () {
 
 schema.getSongRemovalMasterResponse = function () {
   return this.getSongRemovalButlerResponse();
-}
+};
 
 schema.getSongRemovalButlerResponse = function () {
   return this.getFileRemovalMasterResponse();
@@ -195,4 +193,4 @@ schema.getMusicCollection = function () {
   return songInfo;
 };
 
-module.exports = schema;
+export default schema;

package/src/server/transports/express/api/butler/controllers.js

@@ -1,11 +1,8 @@
-const schema = require('../../../../../schema');
+import schema from "../../../../../schema.js";
 
-/**
- * Remove the song
- */
-module.exports.removeSong = node => {
+export const removeSong = node => {
   return async (req, res, next) => {
-    try {      
+    try {
       const title = req.body.title;
       node.songTitleTest(title);
       const options = node.createRequestNetworkOptions(req.body, {
@@ -15,8 +12,8 @@ module.exports.removeSong = node => {
       const removed = results.reduce((p, c) => p + c.removed, 0);
       return res.send({ removed });
     }
-    catch(err) {
+    catch (err) {
       next(err);
-    } 
-  }   
-};
+    }
+  };
+};

package/src/server/transports/express/api/butler/routes.js

@@ -1,15 +1,15 @@
-const controllers = require('./controllers');
+import * as controllers from "./controllers.js";
 
-module.exports = [
+export default [
   /**
    * Remove the song
-   * 
+   *
    * @api {post} /api/butler/remove-song
    * @apiParam {string} title - song title
    */
-  { 
+  {
     name: 'removeSong',
-    method: 'post', 
+    method: 'post',
     url: '/remove-song',
     fn: controllers.removeSong
   }

package/src/server/transports/express/api/master/controllers.js

@@ -1,11 +1,8 @@
-const schema = require('../../../../../schema');
+import schema from "../../../../../schema.js";
 
-/**
- * Remove the song
- */
-module.exports.removeSong = node => {
+export const removeSong = node => {
   return async (req, res, next) => {
-    try {      
+    try {
       const title = req.body.title;
       node.songTitleTest(title);
       const options = node.createRequestNetworkOptions(req.body, {
@@ -15,8 +12,8 @@ module.exports.removeSong = node => {
       const removed = results.reduce((p, c) => p + c.removed, 0);
       return res.send({ removed });
     }
-    catch(err) {
+    catch (err) {
       next(err);
-    } 
-  }   
-};
+    }
+  };
+};

package/src/server/transports/express/api/master/routes.js

@@ -1,15 +1,15 @@
-const controllers = require('./controllers');
+import * as controllers from "./controllers.js";
 
-module.exports = [
+export default [
   /**
    * Remove the song
-   * 
+   *
    * @api {post} /api/master/remove-song
    * @apiParam {string} title - song title
    */
-  { 
+  {
     name: 'removeSong',
-    method: 'post', 
+    method: 'post',
     url: '/remove-song',
     fn: controllers.removeSong
   }

package/src/server/transports/express/api/node/controllers.js

@@ -1,61 +1,53 @@
-const utils = require('../../../../../utils');
-const fs = require('fs');
-const fse = require('fs-extra');
-const path = require('path');
-const crypto = require('crypto');
-const _ = require('lodash');
+import utils from "../../../../../utils.js";
+import fse from "fs-extra";
+import path from "path";
+import crypto from "crypto";
+import omit from "lodash-es/omit.js";
 
-/**
- * Add the song
- */
-module.exports.addSong = node => {  
+export const addSong = node => {
   return async (req, res, next) => {
     let file;
     let dupFile;
     let dupFileInfo;
     let filePath = '';
-
     const cleanUp = async () => {
       utils.isFileReadStream(file) && file.destroy();
-
-      if(!filePath) {
+      if (!filePath) {
         return;
       }
 
       try {
         await fse.remove(filePath);
       }
-      catch(err) {
-        if(err.code != 'ENOENT') {
+      catch (err) {
+        if (err.code != 'ENOENT') {
           throw err;
         }
       }
     };
-
     const cleanUpDuplicate = async () => {
-      if(!dupFile) {
+      if (!dupFile) {
         return;
       }
 
-      dupFile.destroy();      
+      dupFile.destroy();
 
       try {
         await fse.remove(dupFile.path);
       }
-      catch(err) {
-        if(err.code != 'ENOENT') {
+      catch (err) {
+        if (err.code != 'ENOENT') {
           throw err;
         }
       }
 
       dupFile = null;
     };
-    
     const prepareApprovalInfo = () => {
       try {
         return JSON.parse(req.body.approvalInfo);
       }
-      catch(err) {
+      catch (err) {
         return null;
       }
     };
@@ -70,7 +62,7 @@ module.exports.addSong = node => {
       const priority = parseInt(req.body.priority || 0);
       node.songPriorityTest({ priority, controlled, exported });
       let tags = await utils.getSongTags(file);
-      node.songTitleTest(tags.fullTitle);           
+      node.songTitleTest(tags.fullTitle);
       let fileInfo = await utils.getFileInfo(file);
       dupFileInfo = fileInfo;
       await node.fileAvailabilityTest(fileInfo);
@@ -78,9 +70,9 @@ module.exports.addSong = node => {
       let fileHashToRemove = '';
       let addFile = true;
       let document;
-      
-      HANDLE_MUSIC_DOCUMENT: if(existent) {
-        if(typeof existent.fileHash != 'string' || !await node.hasFile(existent.fileHash)) {
+
+      HANDLE_MUSIC_DOCUMENT: if (existent) {
+        if (typeof existent.fileHash != 'string' || !await node.hasFile(existent.fileHash)) {
           await node.db.deleteDocument(existent);
           existent = null;
           break HANDLE_MUSIC_DOCUMENT;
@@ -91,11 +83,9 @@ module.exports.addSong = node => {
         const newFilePath = file.path;
         const currentPriority = existent.priority || 0;
         
-        if(
-          (controlled && !exported) ||
+        if ((controlled && !exported) ||
           priority > currentPriority ||
-          (priority == currentPriority && !await node.checkSongRelevance(currentFilePath, newFilePath))
-        ) {
+          (priority == currentPriority && !await node.checkSongRelevance(currentFilePath, newFilePath))) {
           filePath = newFilePath;
           tags = utils.mergeSongTags(await utils.getSongTags(currentFilePath), tags);
           existent.priority = priority;
@@ -109,23 +99,23 @@ module.exports.addSong = node => {
         filePath = await utils.setSongTags(filePath, tags);
         fileInfo = await utils.getFileInfo(filePath);
         await node.fileAvailabilityTest(fileInfo);
-        existent.title = tags.fullTitle;               
-
-        if(existent.fileHash != fileInfo.hash) {
+        existent.title = tags.fullTitle;
+        
+        if (existent.fileHash != fileInfo.hash) {
           fileHashToRemove = existent.fileHash;
           existent.fileHash = fileInfo.hash;
-        }   
+        }
         else {
           addFile = false;
         }
       }
-      
+
       await node.withAddingFile(fileInfo.hash, async () => {
-        if(addFile) {
+        if (addFile) {
           await node.addFileToStorage(filePath, fileInfo.hash, { copy: true });
         }
-  
-        if(!existent) {
+
+        if (!existent) {
           document = await node.db.addMusicDocument({
             title: tags.fullTitle,
             fileHash: fileInfo.hash,
@@ -135,42 +125,43 @@ module.exports.addSong = node => {
         else {
           document = await node.db.updateMusicDocument(existent);
         }
-  
-        if(fileHashToRemove) {
+
+        if (fileHashToRemove) {
           await node.removeFileFromStorage(fileHashToRemove);
         }
-      });      
+      });
+
       const audioLink = await node.createSongAudioLink(document);
       const coverLink = await node.createSongCoverLink(document);
-      
-      if(duplicates.length) {       
+
+      if (duplicates.length) {
         const dupPath = path.join(node.tempPath, crypto.randomBytes(21).toString('hex'));
         await fse.copy(file.path, dupPath);
-        dupFile = await fs.createReadStream(dupPath);     
+        dupFile = await fse.createReadStream(dupPath);
         node.duplicateSong(duplicates, dupFile, dupFileInfo, { controlled, priority, approvalInfo })
-        .then(cleanUpDuplicate)
-        .catch(err => {
-          node.logger.error(err.stack);
-          return cleanUpDuplicate();
-        })
-        .catch(err => {
-          node.logger.error(err.stack);
-        });
+          .then(cleanUpDuplicate)
+          .catch(err => {
+            node.logger.error(err.stack);
+            return cleanUpDuplicate();
+          })
+          .catch(err => {
+            node.logger.error(err.stack);
+          });
       }
 
       await cleanUp();
-      res.send({ 
+      res.send({
         fileHash: document.fileHash,
-        audioLink, 
-        coverLink, 
+        audioLink,
+        coverLink,
         title: tags.fullTitle,
-        tags: _.omit(tags, 'APIC'),
+        tags: omit(tags, 'APIC'),
         priority: document.priority || 0
-      });      
+      });
     }
-    catch(err) {
+    catch (err) {
       await cleanUp();
       next(err);
-    }    
-  }
-};
+    }
+  };
+};

package/src/server/transports/express/api/node/routes.js

@@ -1,23 +1,23 @@
-const controllers = require('./controllers');
-const midds = require('../../midds');
+import * as controllers from "./controllers.js";
+import midds from "../../midds.js";
 
-module.exports = [
+export default [
   /**
    * Add the song
-   * 
+   *
    * @api {post} /api/node/add-song/
-   * @apiParam {fs.ReadStream|string} file
+   * @apiParam {fse.ReadStream|string} file
    */
-  { 
+  {
     name: 'addSong',
-    method: 'post', 
+    method: 'post',
     url: '/add-song',
     fn: [
-      midds.requestQueueSong,      
-      midds.filesFormData,   
+      midds.requestQueueSong,
+      midds.filesFormData,
       midds.songAdditionControl,
       midds.prepareFileToStore,
       controllers.addSong
     ]
   }
-];
+];

package/src/server/transports/express/api/routes.js

@@ -1 +1 @@
-module.exports = [];
+export default [];

package/src/server/transports/express/api/slave/controllers.js

@@ -1,20 +1,17 @@
-/**
- * Remove the song
- */
-module.exports.removeSong = node => {
+export const removeSong = node => {
   return async (req, res, next) => {
     try {
       let removed = false;
 
-      if(req.document && req.document.fileHash && await node.hasFile(req.document.fileHash)) {
+      if (req.document && req.document.fileHash && await node.hasFile(req.document.fileHash)) {
         await node.removeFileFromStorage(req.document.fileHash);
         removed = true;
       }
-
+      
       res.send({ removed: +removed });
     }
-    catch(err) {
+    catch (err) {
       next(err);
-    } 
-  }   
-};
+    }
+  };
+};

package/src/server/transports/express/api/slave/routes.js

@@ -1,16 +1,16 @@
-const controllers = require('./controllers');
-const midds = require('../../midds');
+import * as controllers from "./controllers.js";
+import midds from "../../midds.js";
 
-module.exports = [
+export default [
   /**
    * Remove the song
-   * 
+   *
    * @api {post} /api/slave/remove-song
    * @apiParam {string} title - song title
    */
-  { 
+  {
     name: 'removeSong',
-    method: 'post', 
+    method: 'post',
     url: '/remove-song',
     fn: [
       midds.requestQueueSong,