museria 0.2.38 → 0.2.42

package/dist/face/style.css

@@ -1,6 +1,6 @@
 /*!
  * museria face
- * @version 0.2.38
+ * @version 0.2.42
  * {@link https://github.com/ortexx/museria}
  */
 /*!
@@ -17,4 +17,4 @@
  */@font-face{font-display:block;font-family:Font Awesome\ 5 Free;font-style:normal;font-weight:900;src:url(fa-solid-900.eot);src:url(fa-solid-900.eot) format("embedded-opentype"),url(fa-solid-900.woff2) format("woff2"),url(fa-solid-900.woff) format("woff"),url(fa-solid-900.ttf) format("truetype"),url(fa-solid-900.svg) format("svg")}.fa,.fas{font-family:Font Awesome\ 5 Free;font-weight:900}/*!
  * Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */@font-face{font-display:block;font-family:Font Awesome\ 5 Brands;font-style:normal;font-weight:400;src:url(fa-brands-400.eot);src:url(fa-brands-400.eot) format("embedded-opentype"),url(fa-brands-400.woff2) format("woff2"),url(fa-brands-400.woff) format("woff"),url(fa-brands-400.ttf) format("truetype"),url(fa-brands-400.svg) format("svg")}.fab{font-family:Font Awesome\ 5 Brands;font-weight:400}@font-face{font-family:ProximaNova;src:url(proxima-nova.ttf)}@font-face{font-family:OpenSans;src:url(open-sans.ttf)}*{margin:0;padding:0}body{background:#353535;color:#ccc;font-family:OpenSans;height:100%;overflow-y:scroll}.custom-file input{cursor:pointer;text-indent:-1000px}.custom-control-label{cursor:pointer;opacity:.8}.custom-control-label:hover{opacity:1}.btn{font-weight:700;padding:0;text-transform:uppercase}.btn:active,.btn:focus{box-shadow:none!important;outline:none!important}.btn[disabled]{cursor:not-allowed}a{color:#ccc;text-decoration:underline}a:hover{color:#ccc;text-decoration:none}.input-group-lg input[type=text]{height:auto;padding:.42rem 1rem .45rem}.alert-success{background-color:#25301f;border-color:#28a745;color:#aed3b7}.alert-danger{background-color:#301f1f;border-color:#c00;color:#d3aeae}.alert-info{background-color:#1f2730;border-color:#0af;color:#aec7d3}.invalid-feedback{color:#f39595}.close-fa{color:#666;cursor:pointer;opacity:.7;position:absolute;right:.9em;top:50%;transform:translateY(-50%);z-index:2}.close-fa:hover{opacity:1}.app{display:flex;flex-direction:column;height:100vh}.app .wmodal-overlay{align-items:center;background:rgba(34,34,34,.8);cursor:pointer;display:flex;height:100vh;justify-content:center;left:0;position:fixed;top:0;width:100%;z-index:11000}.app .wmodal-close{color:#666;cursor:pointer;font-size:1.8em;opacity:.4;position:absolute;right:.55em;top:.5em}.app .wmodal-close:hover{opacity:1}.app .wmodal-body{background:#000;box-shadow:0 0 4px 2px hsla(0,0%,40%,.6);box-sizing:border-box;cursor:default;padding:3.5em 2.5em;position:relative}.app .upload-events .wmodal-close{font-size:2em;right:1em;top:50%;transform:translateY(-50%)}.app .upload-events .wmodal-body{padding:2em 5em 2em 2em;word-break:break-all}.app .upload-events .wmodal-body.danger{box-shadow:0 0 4px 2px rgba(204,0,0,.6)}.app .upload-events .wmodal-body.success{box-shadow:0 0 4px 2px rgba(40,167,69,.6)}.app .finding-list>*{display:block}.app .finding-list>:not(:first-child){margin-top:.5em}.app .captcha input{background:#151515;border-color:#292929;width:240px}.app .captcha input:focus{background:#151515;border-color:#666}.app .captcha-preloader{color:#666;font-size:1.7em;text-align:center}.app .header{background:#333;background:radial-gradient(#666,#464646,#333);padding:8.2em 0 6.6em;text-shadow:0 0 .8em #333}.app .header .logo{display:flex;font-family:ProximaNova;font-weight:700;text-decoration:none;text-transform:uppercase}.app .header .logo-img{display:inline-block;vertical-align:middle;width:3em}.app .header .logo-title{color:#fff;display:inline-block;font-size:3em;letter-spacing:.05em;margin-left:.1em;vertical-align:middle}.app .header .logo-description-start{color:#d7cf9b;font-size:2em;letter-spacing:.07em;margin-left:.1em;margin-top:-.3em}.app .header .logo-description-end{color:#d7cf9b;font-size:7.2em;letter-spacing:.03em;margin-left:.2em;margin-top:-.21em}.app .header .logo-description-end-lg{color:#d7cf9b;font-size:3.6em;letter-spacing:.06em;margin-top:-.2em}.app .content{flex:1}.app .footer{background:#333;background:radial-gradient(#555,#424242,#333);color:#ccc;padding:1.5em 0 3em}.app .footer h5{color:#d7cf9b;font-weight:700;margin-bottom:.6em;opacity:.7;text-shadow:0 0 1em #000;text-transform:uppercase}.app .footer a{color:#ccc;text-decoration:none}.app .footer a:hover{text-decoration:underline}.app .footer ul.nav>li{font-size:.9em;line-height:1.8em;word-break:break-all}.app .song-search .alert.alert-success a{color:#aed3b7;text-decoration:none}.app .song-search .alert.alert-success a:hover{color:#28a745}.app .song-search-input{position:relative}.app .song-search-input>i{color:#888;left:.7em;position:absolute;top:50%;transform:translateY(-50%);z-index:1}.app .song-search-input>i.song-search-loading{margin-top:-.37em}.app .song-search-input>i.song-search-close{cursor:pointer;left:unset;opacity:.6;right:.7em}.app .song-search-input>i.song-search-close:hover{opacity:1}.app .song-search-input>input{padding-left:2.5em}.app .song-search-input>input:focus{z-index:0}.app .cover-img{height:2.22em;left:2px;object-fit:cover;pointer-events:none;position:absolute;top:1px;width:2.22em;z-index:2}.app .cover-remove{right:4.5em}.app .cover-label.with-img{padding-left:3em}.app .upload-preloader-btn i{color:#ccc;font-size:1.4em;margin-left:.3em;margin-top:-.1em;vertical-align:middle}.app .song-priority{font-size:.9em}.app .image-link{align-items:center;color:#fff;display:inline-flex;flex-direction:row;opacity:.7;text-decoration:none}.app .image-link:hover{opacity:1}.app .image-link-pic{font-size:3em}.app .image-link-title{font-size:3em;margin-left:.5em;text-transform:uppercase}.app #audio-file{left:-10000px}.app .questions{display:inline-block;list-style:none;margin:0;text-align:left}.app .questions>li{opacity:.9}.app .questions>li:not(:last-child){margin-bottom:2em}.app .questions>li>:first-child{color:#fff;font-size:1.5em;font-weight:700;text-transform:uppercase}.app .questions>li>:last-child{color:#ccc;font-size:1.4em}.app .questions>li>:last-child:before{color:#86e29b;content:"↵";display:inline-block;font-weight:700;margin:0 .4em 0 0;transform:scaleX(-1)}
+ */@font-face{font-display:block;font-family:Font Awesome\ 5 Brands;font-style:normal;font-weight:400;src:url(fa-brands-400.eot);src:url(fa-brands-400.eot) format("embedded-opentype"),url(fa-brands-400.woff2) format("woff2"),url(fa-brands-400.woff) format("woff"),url(fa-brands-400.ttf) format("truetype"),url(fa-brands-400.svg) format("svg")}.fab{font-family:Font Awesome\ 5 Brands;font-weight:400}@font-face{font-family:ProximaNova;src:url(proxima-nova.ttf)}@font-face{font-family:OpenSans;src:url(open-sans.ttf)}*{margin:0;padding:0}body{background:#353535;color:#ccc;font-family:OpenSans;height:100%;overflow-y:scroll}.custom-file input{cursor:pointer;text-indent:-1000px}.custom-control-label{cursor:pointer;opacity:.8}.custom-control-label:hover{opacity:1}.btn{font-weight:700;padding:0;text-transform:uppercase}.btn:active,.btn:focus{box-shadow:none!important;outline:none!important}.btn[disabled]{cursor:not-allowed}a{color:#ccc;text-decoration:underline}a:hover{color:#ccc;text-decoration:none}.input-group-lg input[type=text]{height:auto;padding:.42rem 1rem .45rem}.alert-success{background-color:#25301f;border-color:#28a745;color:#aed3b7}.alert-danger{background-color:#301f1f;border-color:#c00;color:#d3aeae}.alert-info{background-color:#1f2730;border-color:#0af;color:#aec7d3}.invalid-feedback{color:#f39595}.close-fa{color:#666;cursor:pointer;opacity:.7;position:absolute;right:.9em;top:50%;transform:translateY(-50%);z-index:2}.close-fa:hover{opacity:1}.app{display:flex;flex-direction:column;height:100vh}.app .wmodal-overlay{align-items:center;background:rgba(34,34,34,.8);cursor:pointer;display:flex;height:100vh;justify-content:center;left:0;position:fixed;top:0;width:100%;z-index:11000}.app .wmodal-close{color:#666;cursor:pointer;font-size:1.8em;opacity:.4;position:absolute;right:.55em;top:.5em}.app .wmodal-close:hover{opacity:1}.app .wmodal-body{background:#000;box-shadow:0 0 4px 2px hsla(0,0%,40%,.6);box-sizing:border-box;cursor:default;padding:3.5em 2.5em;position:relative}.app .upload-events .wmodal-close{font-size:2em;right:1em;top:50%;transform:translateY(-50%)}.app .upload-events .wmodal-body{padding:2em 5em 2em 2em;word-break:break-all}.app .upload-events .wmodal-body.danger{box-shadow:0 0 4px 2px rgba(204,0,0,.6)}.app .upload-events .wmodal-body.success{box-shadow:0 0 4px 2px rgba(40,167,69,.6)}.app .finding-list>*{display:block}.app .finding-list>:not(:first-child){margin-top:.5em}.app .captcha input{background:#151515;border-color:#292929;width:240px}.app .captcha input:focus{background:#151515;border-color:#666}.app .captcha-preloader{color:#666;font-size:1.7em;text-align:center}.app .header{background:#333;background:radial-gradient(#666,#464646,#333);padding:8.2em 0 6.6em;position:relative;text-shadow:0 0 .8em #333}.app .header .songs-counter-text{bottom:1.5em;color:#666;font-weight:700;left:50%;position:absolute;text-align:center;text-transform:uppercase;transform:translateX(-50%)}.app .header .songs-counter-text b{color:#888}.app .header .logo{display:flex;font-family:ProximaNova;font-weight:700;text-decoration:none;text-transform:uppercase}.app .header .logo-img{display:inline-block;vertical-align:middle;width:3em}.app .header .logo-title{color:#fff;display:inline-block;font-size:3em;letter-spacing:.05em;margin-left:.1em;vertical-align:middle}.app .header .logo-description-start{color:#d7cf9b;font-size:2em;letter-spacing:.07em;margin-left:.1em;margin-top:-.3em}.app .header .logo-description-end{color:#d7cf9b;font-size:7.2em;letter-spacing:.03em;margin-left:.2em;margin-top:-.21em}.app .header .logo-description-end-lg{color:#d7cf9b;font-size:3.6em;letter-spacing:.06em;margin-top:-.2em}.app .content{flex:1}.app .footer{background:#333;background:radial-gradient(#555,#424242,#333);color:#ccc;padding:1.5em 0 3em}.app .footer h5{color:#d7cf9b;font-weight:700;margin-bottom:.6em;opacity:.7;text-shadow:0 0 1em #000;text-transform:uppercase}.app .footer a{color:#ccc;text-decoration:none}.app .footer a:hover{text-decoration:underline}.app .footer ul.nav>li{font-size:.9em;line-height:1.8em;word-break:break-all}.app .song-search .alert.alert-success a{color:#aed3b7;text-decoration:none}.app .song-search .alert.alert-success a:hover{color:#28a745}.app .song-search-input{position:relative}.app .song-search-input>i{color:#888;left:.7em;position:absolute;top:50%;transform:translateY(-50%);z-index:1}.app .song-search-input>i.song-search-loading{margin-top:-.37em}.app .song-search-input>i.song-search-close{cursor:pointer;left:unset;opacity:.6;right:.7em}.app .song-search-input>i.song-search-close:hover{opacity:1}.app .song-search-input>input{padding-left:2.5em;padding-right:2em}.app .song-search-input>input:focus{z-index:0}.app .cover-img{height:2.22em;left:2px;object-fit:cover;pointer-events:none;position:absolute;top:1px;width:2.22em;z-index:2}.app .cover-remove{right:4.5em}.app .cover-label.with-img{padding-left:3em}.app .upload-preloader-btn i{color:#ccc;font-size:1.4em;margin-left:.3em;margin-top:-.1em;vertical-align:middle}.app .song-priority{font-size:.9em}.app .image-link{align-items:center;color:#fff;display:inline-flex;flex-direction:row;opacity:.7;text-decoration:none}.app .image-link:hover{opacity:1}.app .image-link-pic{font-size:3em}.app .image-link-title{font-size:3em;margin-left:.5em;text-transform:uppercase}.app #audio-file{left:-10000px}.app .questions{display:inline-block;list-style:none;margin:0;text-align:left}.app .questions>li{opacity:.9}.app .questions>li:not(:last-child){margin-bottom:2em}.app .questions>li>:first-child{color:#fff;font-size:1.5em;font-weight:700;text-transform:uppercase}.app .questions>li>:last-child{color:#ccc;font-size:1.4em}.app .questions>li>:last-child:before{color:#86e29b;content:"↵";display:inline-block;font-weight:700;margin:0 .4em 0 0;transform:scaleX(-1)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "museria",
-  "version": "0.2.38",
+  "version": "0.2.42",
   "description": "Decentralized music storage",
   "main": "./src/index.js",
   "bin": {
@@ -13,7 +13,7 @@
   "homepage": "https://github.com/ortexx/museria",
   "scripts": {
     "eslint": "eslint src bin test",
-    "test": "mocha ./test/index.js --timeout=20000",
+    "test": "mocha ./test/index.js --timeout=30000",
     "build-client": "webpack --config=webpack.client.js",
     "build-client-prod": "cross-env NODE_ENV=production webpack --config=webpack.client.js",
     "build-face": "webpack --config=webpack.face.js",
@@ -69,8 +69,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.0",
-    "akili": "^1.2.17",
-    "array-chunk-reader": "^0.1.15",
+    "akili": "^1.2.19",
     "base64url": "^3.0.1",
     "bootstrap": "^4.5.3",
     "chalk": "^4.1.2",
@@ -78,7 +77,7 @@
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
     "lodash": "^4.17.20",
-    "metastocle": "^0.2.24",
+    "metastocle": "^0.2.26",
     "music-metadata": "^6.4.0",
     "node-fetch": "^2.6.1",
     "node-id3": "^0.2.2",
@@ -86,8 +85,8 @@
     "serve-favicon": "^2.5.0",
     "sharp": "^0.25.2",
     "splaytree": "^3.1.0",
-    "spreadable": "^0.2.20",
-    "storacle": "^0.2.20",
+    "spreadable": "^0.2.22",
+    "storacle": "^0.2.22",
     "transliteration": "^2.2.0"
   },
   "repository": {

package/src/browser/face/controllers/app/app.html

@@ -1,4 +1,4 @@
-<div class="app container-fluid">
+<div class="app container-fluid">  
   <if recreate is="${ this.showCaptcha }" class="captcha wmodal">
     <div 
       class="wmodal-overlay"
@@ -48,6 +48,9 @@
     </div>
   </if>
   <header class="header row">
+    <div class="songs-counter-text">
+      There ${this.songsCount == 1? 'is': 'are'} <b>${ Number(this.songsCount).toLocaleString() }</b> song${this.songsCount == 1? '': 's'} on the network
+    </div>
     <a state="app" class="logo mx-auto px-4">
       <div>
         <img src="./img/logo.svg" class="logo-img">
@@ -55,12 +58,12 @@
         <div class="logo-description-start">decentralized</div>
         <div class="logo-description-end-lg d-lg-none">storage</div>
       </div>
-      <div class="logo-description-end d-none d-lg-block">storage</div>        
+      <div class="logo-description-end d-none d-lg-block">storage</div>
     </a>
   </header>
-  <div class="content">
+  <div class="content">    
     <div class="row pt-5 pb-3">
-      <div class="song-search col-lg-6 col-12 pl-5 pr-5 pr-lg-4 pt-4">
+      <div class="song-search col-lg-6 col-12 pl-5 pr-5 pr-lg-4 pt-4">             
         <div class="song-search-input input-group input-group-lg">
           <i hidden="${ this.isFinding }" class="fas fa-search fa-lg"></i>
           <i hidden="${ !this.isFinding }" class="fas fa-circle-notch fa-spin song-search-loading fa-lg"></i>
@@ -240,10 +243,9 @@
               </div>
             </li> 
             <li>
-              <div>How many songs are in this node?</div>
+              <div>Where can I get the node status?</div>
               <div>
-                There are <b class="text-warning">${ this.songsCount }</b> song(s) at the moment. You also can find more info about the node status 
-                <a href="/status?pretty" target="_blank">here</a>.
+                There is a special route <a href="/status?pretty" target="_blank">here</a>.
               </div>
             </li>          
             <li>

package/src/browser/face/controllers/app/app.js

@@ -1,7 +1,6 @@
 import './app.scss';
 import Akili from 'akili';
 import router from 'akili/src/services/router';
-import request from 'akili/src/services/request';
 import client from '../../client';
 
 export default class App extends Akili.Component {
@@ -19,7 +18,7 @@ export default class App extends Akili.Component {
   created() {  
     this.captchaWidth = 240;
     this.findingSongsLimit = 10;
-    this.songsCountInterval = 10 * 1000;
+    this.songsCountInterval = 15 * 1000;
     this.songsCountIntervalObj = null;
     this.scope.songsCount = 0;
     this.scope.searchInputValue = this.transition.query.f;
@@ -83,8 +82,7 @@ export default class App extends Akili.Component {
   }
 
   async setSongsCount() {
-    const data = (await request.get('/status', { json: true })).data;
-    this.scope.songsCount = data.filesCount;
+    this.scope.songsCount = await client.getNetworkFilesCount();
   }
 
   setFindingValue(val) {

package/src/browser/face/controllers/app/app.scss

@@ -3,7 +3,7 @@
 .app {
   display: flex;
   height: 100vh;
-  flex-direction: column;
+  flex-direction: column;  
 
   .wmodal {
     &-overlay {
@@ -96,11 +96,27 @@
   }
 
   & .header {
+    position: relative;
     background: #333;
     background: radial-gradient(#666,#464646, #333);
     padding: 8.2em 0 6.6em 0;
     text-shadow: 0px 0px 0.8em #333;
 
+    & .songs-counter-text {
+      position: absolute;
+      left: 50%;
+      transform: translateX(-50%);
+      bottom: 1.5em;
+      color: $gray;
+      text-transform: uppercase;
+      font-weight: bold;
+      text-align: center;
+
+      & b {
+        color: $light;
+      }
+    }
+
     & .logo {
       display: flex;
       font-family: ProximaNova;
@@ -197,7 +213,7 @@
     }
 
     &-input {
-      position: relative;
+      position: relative;      
   
       & > i {
         position: absolute;
@@ -224,8 +240,9 @@
       }
     
       & > input { 
-        padding-left: 2.5em;      
-  
+        padding-left: 2.5em;     
+        padding-right: 2em;
+
         &:focus {
           z-index: 0;
         }

package/src/client.js

@@ -24,7 +24,7 @@ module.exports = (Parent) => {
         }
       }, options);
       super(options);
-    }
+    }    
     
     /**
      * Get the song complete info

package/src/db/transports/loki/index.js

@@ -2,7 +2,6 @@ const DatabaseMuseria = require('../database')();
 const DatabaseLoki = require('spreadable/src/db/transports/loki')(DatabaseMuseria);
 const DatabaseLokiMetastocle = require('metastocle/src/db/transports/loki')(DatabaseLoki);
 const DatabaseLokiStoracle = require('storacle/src/db/transports/loki')(DatabaseLokiMetastocle);
-const ArrayChunkReader = require('array-chunk-reader');
 const utils = require('../../../utils');
 
 module.exports = (Parent) => {
@@ -20,10 +19,10 @@ module.exports = (Parent) => {
       }, options);      
       const fullName = this.createCollectionName('music');
       const documents = this.col[fullName].find();
-      const reader = new ArrayChunkReader(documents, { limit: 1000, log: false });
       let max = null;
 
-      await reader.start((doc) => {
+      for(let i = 0; i < documents.length; i++) {
+        const doc = documents[i];
         let score = doc.compTitle === title? 1: 0;
 
         if(!score) {
@@ -35,18 +34,18 @@ module.exports = (Parent) => {
 
         if(score === 1) {
           max = { score, doc };
-          return reader.stop();
+          break;
         }
 
         if(!max || score > max.score) {
           max = { score, doc };
-          return;
+          continue;
         }
 
         if(score == max.score && Math.random() > 0.5) {
           max = { score, doc };
         }
-      });
+      }     
 
       if(max && max.score >= options.similarity) {
         return this.prepareDocumentToGet(max.doc);

package/src/node.js

@@ -5,7 +5,6 @@ const sharp = require('sharp');
 const fse = require('fs-extra');
 const qs = require('querystring');
 const SplayTree = require('splaytree');
-const ArrayChunkReader = require('array-chunk-reader');
 const DatabaseLokiMuseria = require('./db/transports/loki')();
 const ServerExpressMuseria = require('./server/transports/express')();
 const MusicCollection = require('./collection/transports/music')();
@@ -79,8 +78,7 @@ module.exports = (Parent) => {
           ]
         },
         task: {
-          cleanUpMusicInterval: '1m',
-          normalizeSongTitlesInterval: '10m',
+          cleanUpMusicInterval: '1m'
         }
       }, options);
 
@@ -121,10 +119,6 @@ module.exports = (Parent) => {
       if(this.options.task.cleanUpMusicInterval) {
         await this.task.add('cleanUpMusic', this.options.task.cleanUpMusicInterval, () => this.cleanUpMusic());
       }
-
-      if(this.options.task.normalizeSongTitlesInterval) {
-        await this.task.add('normalizeSongTitles', this.options.task.normalizeSongTitlesInterval, () => this.normalizeSongTitles());
-      }     
     }
 
     /** 
@@ -134,11 +128,21 @@ module.exports = (Parent) => {
      */
     async normalizeSongTitles() {
       const docs = await this.db.getDocuments('music');
-      const reader = new ArrayChunkReader(docs, { size: 1000, log: false });
-      await reader.start(async (doc) => {
-        doc.title = utils.beautifySongTitle(doc.title);
+      const titles = {};
+
+      for(let i = 0; i < docs.length; i++) {
+        const doc = docs[i];
+        const title = utils.beautifySongTitle(doc.title);
+
+        if(titles[title] && titles[title] != doc.$loki) {
+          await this.db.deleteDocument(doc);
+          continue;
+        }
+
+        doc.title = title;
+        titles[title] = doc.$loki;
         await this.db.updateMusicDocument(doc, { beautify: false });
-      });
+      }
     }
 
     /** 
@@ -422,8 +426,7 @@ module.exports = (Parent) => {
      * @returns {object[]}
      */
      async getSongInfo(title, options = {}) {  
-      title = utils.beautifySongTitle(title);
-      this.songTitleTest(title);
+      title = utils.prepareComparisonSongTitle(title);
       const collection = await this.getCollection('music');
       const actions = utils.prepareDocumentGettingActions({ 
         offset: 0,
@@ -468,7 +471,7 @@ module.exports = (Parent) => {
      * @returns {object[]}
      */
      async findSongs(str, options = {}) {
-      const title = utils.beautifySongTitle(str);
+      const title = utils.prepareComparisonSongTitle(str);
       str = utils.prepareSongFindingString(str);
 
       if(str.length < this.options.music.findingStringMinLength) {

package/src/server/transports/express/client/controllers.js

@@ -8,7 +8,7 @@ module.exports.requestSong = node => {
   return async (req, res, next) => {
     try {
       const title = req.query.title;
-      node.songTitleTest(title);
+      node.songTitleTest(title);     
       const link = await node.getSongLink(title, req.query.type);
 
       if(!link) {
@@ -131,4 +131,4 @@ module.exports.removeSong = node => {
       next(err);
     }
   }
-};
+};

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

@@ -121,5 +121,5 @@ module.exports = [
       midds.requestQueueClient,
       controllers.removeSong
     ]
-  }
+  }  
 ];

package/src/server/transports/express/index.js

@@ -1,4 +1,5 @@
-const ServerExpressMetastocle = require('metastocle/src/server/transports/express')();
+const ServerExpressStoracle = require('storacle/src/server/transports/express')();
+const ServerExpressMetastocle = require('metastocle/src/server/transports/express')(ServerExpressStoracle);
 const routes = require('./routes');
 const routesClient = require('./client/routes');
 const routesApi = require('./api/routes');
@@ -29,7 +30,7 @@ module.exports = (Parent) => {
       const remove = [
         'addDocument', 'updateDocuments', 
         'deleteDocuments', 'getDocumentsCount',
-        'getDocumentByPk', 'getDocuments'
+        'getDocumentByPk', 'getDocuments', 'removeFile'
       ];
       return super.getClientRoutes().filter(r => !remove.includes(r.name)).concat(routesClient);
     }
@@ -45,7 +46,7 @@ module.exports = (Parent) => {
      * @see ServerExpressMetastocle.prototype.getApiMasterRoutes
      */
     getApiMasterRoutes() {
-      const remove = ['updateDocuments', 'deleteDocuments'];
+      const remove = ['updateDocuments', 'deleteDocuments', 'removeFile'];
       return super.getApiMasterRoutes().filter(r => !remove.includes(r.name)).concat(routesApiMaster);
     }
 
@@ -53,7 +54,7 @@ module.exports = (Parent) => {
      * @see ServerExpressMetastocle.prototype.getApiButlerRoutes
      */
     getApiButlerRoutes() {
-      const remove = ['updateDocuments', 'deleteDocuments'];
+      const remove = ['updateDocuments', 'deleteDocuments', 'removeFile'];
       return super.getApiButlerRoutes().filter(r => !remove.includes(r.name)).concat(routesApiButler);
     }
   
@@ -61,7 +62,7 @@ module.exports = (Parent) => {
      * @see ServerExpressMetastocle.prototype.getApiSlaveRoutes
      */
     getApiSlaveRoutes() {
-      const remove = ['updateDocuments', 'deleteDocuments'];
+      const remove = ['updateDocuments', 'deleteDocuments', 'removeFile'];
       return super.getApiSlaveRoutes().filter(r => !remove.includes(r.name)).concat(routesApiSlave);
     }
 
@@ -69,7 +70,7 @@ module.exports = (Parent) => {
      * @see ServerExpressMetastocle.prototype.getApiNodeRoutes
      */
     getApiNodeRoutes() {
-      const remove = ['addDocument'];
+      const remove = ['addDocument', 'storFile'];
       return super.getApiNodeRoutes().filter(r => !remove.includes(r.name)).concat(routesApiNode);
     }
   }

package/src/server/transports/express/midds.js

@@ -66,7 +66,7 @@ midds.fileAccess = node => {
 
       if(!doc) {
         const titleHash = String(req.params.hash).split('.')[0];
-        const title = utils.decodeSongTitle(titleHash);
+        const title = utils.decodeSongTitle(titleHash);        
         doc = await node.db.getMusicByPk(title);
       }
       

package/src/utils.js

@@ -9,7 +9,7 @@ const mm = require('music-metadata');
 const base64url = require('base64url');
 
 utils.regexSongLinks = /(([a-z]+:\/\/)?[-\p{L}\p{N}]+\.[\p{L}]{2,}|[a-z]+:\/\/(\[:*[\w\d]+:[\w\d:]+\]|\d+\.[\d.]+))\S*/igu;
-utils.regexSongFeats = /[([\s]+((ft\.?|feat\.?|featuring)[\s]+((?!(\s+[-([)\]]+))[^)\]])+)\s*[)\]]*([\s]+[-([]+|$)/i;
+utils.regexSongFeats = /[([\s]+((ft\.|feat\.)[\s]+((?!(\s+[-([)\]]+))[^)\]])+)\s*[)\]]*([\s]+[-([]+|$)/iu;
 
 utils.heritableSongTags = [
   'TALB', 'TCOM', 'TCON', 'TCOP', 'TDAT', 'TEXT', 'TIT1', 'TIT3', 'TLAN', 
@@ -125,11 +125,20 @@ utils.beautifySongTitle = function (title) {
     .replace(/[\sᅠ]+/g, ' ')
     .replace(/([([])\s+/g, '$1')
     .replace(/\s+([)\]])/g, '$1')
+    .replace(/([([]+)(featuring|feat|ft)(\s)/ig, '$1feat.$3')  
+    .replace(/([([\s]+)(feat\.|ft\.)(\s)/ig, '$1feat.$3')
     .toLowerCase();
 
   if(!/[^\s]+ - [^\s]+/.test(title)) {
     return '';
   }
+ 
+  const arr = title.split(/\(?feat\./i);
+  
+  if(arr.length > 2) {
+    arr.splice(2, arr.length - 2);
+    title = arr.join('(feat.').trim();
+  }
 
   const sides = this.splitSongTitle(title);
   let artists = sides[0].split(/,[\s]*/);
@@ -139,26 +148,26 @@ utils.beautifySongTitle = function (title) {
   if(!mainArtist) {
     return '';
   }
-
-  const match = title.match(this.regexSongFeats);
+  
+  const match = sides[1].match(this.regexSongFeats);
   let feats = (match? match[1]: '').replace(/,([^\s])/, ', $1').trim();
   title = `${mainArtist} - ${sides[1]}`;
-  title = title.replace(this.regexSongFeats, '$5');
-  artists = artists.map(a => a.trim());
-  
+  title = title.replace(this.regexSongFeats, '$5'); 
+  feats && (artists = artists.concat(feats.replace(/feat\./i, '').split(',')));
+  artists = [...new Set(artists.map(a => a.trim()).filter(v => v))];
+ 
   if(artists.length) {
-    feats = feats? [feats].concat(artists).join(', '): `ft. ${ artists.join(', ') }`;  
+    feats = `feat. ${ artists.join(', ') }`; 
   }
   
   feats && (title += ` (${feats})`);
-  title = title   
-    .replace(/([([\s]+)(feat\.?|ft\.?|featuring)(\s)/i, '$1feat.$3')
+  title = title
     .replace(/\[\]|\(\)/g, '')
     .replace(/\s+/g, ' ')    
     .split(' ')
     .map(p => p? (p[0].toUpperCase() + p.slice(1)): p)
     .join(' ')
-    .trim()
+    .trim();    
   return title;
 };
 
@@ -234,8 +243,8 @@ utils.getSongArtists = function (title, options = {}) {
   const sides = this.splitSongTitle(title);
   let artists = sides[0].split(/,/);
   const match = title.match(this.regexSongFeats);
-  let feats = (match? match[1]: '').replace(/(feat|ft|featuring)\.?/i, '');
-  return artists.concat(feats.split(',')).map(v => v.trim()).filter(v => v);
+  let feats = (match? match[1]: '').replace(/^feat\./i, '');
+  return [...new Set(artists.concat(feats.split(',')).map(v => v.trim()).filter(v => v))];
 };
 
 /**

package/test/client.js

@@ -336,7 +336,7 @@ describe('Client', () => {
       assert.isNull(await node.db.getMusicByPk(title), 'check the database');
       assert.isFalse(await node.hasFile(doc.fileHash), 'check the file');
     });
-  });
+  }); 
 
   describe('.createRequestedSongAudioLink()', () => {
     it('should return the right link', async () => {

package/test/group.js

@@ -164,5 +164,5 @@ describe('group communication', () => {
 
     assert.isOk(fCount >= length * duplicates, 'check the files');
     assert.isOk(dCount >= length * duplicates, 'check the documents');
-  });
+  });  
 });

package/test/node.js

@@ -108,17 +108,13 @@ describe('Node', () => {
   });
 
   describe('.getSongInfo()', () => {
-    it('should throw an error', async () => {
-      try {
-        await node.getSongInfo('unexistent song');
-        throw new Error('Fail');
-      } 
-      catch (err) {
-        assert.isOk(err.message.match('Wrong song title'));
-      }
+    it('should return an empty array with a wrong title', async () => {
+      const title = 'unexistent';
+      const result = await node.getSongInfo(title);
+      assert.lengthOf(result, 0);
     });
 
-    it('should return an empty array', async () => {
+    it('should return an empty array with a right title', async () => {
       const title = 'unexistent - unexistent';
       const result = await node.getSongInfo(title);
       assert.lengthOf(result, 0);

package/test/routes.js

@@ -361,7 +361,7 @@ describe('routes', () => {
       assert.isNull(await node.db.getMusicByPk(title), 'check the database');
       assert.isFalse(await node.hasFile(doc.fileHash), 'check the file');
     });
-  });
+  });  
 
   describe('/api/master/remove-song/', function () {
     it('should return an auth error', async function () { 

package/test/utils.js

@@ -67,14 +67,13 @@ describe('utils', () => {
 
     it('should place feats together', () => {
       const res = utils.beautifySongTitle('artist1, artist2,artist3 - title (feat. artist4, artist5,artist6)');
-      assert.equal(res, 'Artist1 - Title (feat. Artist4, Artist5, Artist6, Artist2, Artist3)');
+      assert.equal(res, 'Artist1 - Title (feat. Artist2, Artist3, Artist4, Artist5, Artist6)');
     });
 
     it('should bring all feats to a single form', () => {
       assert.equal(utils.beautifySongTitle('artist - title (ft. Artist)'), 'Artist - Title (feat. Artist)', 'check "ft"');
       assert.equal(utils.beautifySongTitle('artist - title (feat. Artist)'), 'Artist - Title (feat. Artist)', 'check "feat"');
-      assert.equal(utils.beautifySongTitle('artist - title (featuring Artist)'), 'Artist - Title (feat. Artist)', 'check "featuring"');
-      assert.equal(utils.beautifySongTitle('artist - title ft Artist'), 'Artist - Title (feat. Artist)', 'check without brackets');
+      assert.equal(utils.beautifySongTitle('artist - title ft. Artist'), 'Artist - Title (feat. Artist)', 'check without brackets');
     });
 
     it('should change the dash type', () => {
@@ -133,8 +132,8 @@ describe('utils', () => {
     }); 
 
     it('should return the right array', () => {
-      const artists = utils.getSongArtists('artist,artist2 - title ft. artist3,  artist4', { beautify: false });
-      assert.equal(artists.join(','), 'artist,artist2,artist3,artist4');
+      const artists = utils.getSongArtists('artist,artist2 - title ft. artist3,  artist4');
+      assert.equal(artists.join(','), 'Artist,Artist2,Artist3,Artist4');
     });
   });