museria 0.2.35 → 0.2.36

package/dist/face/style.css

@@ -1,6 +1,6 @@
 /*!
  * museria face
- * @version 0.2.35
+ * @version 0.2.36
  * {@link https://github.com/ortexx/museria}
  */
 /*!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "museria",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "description": "Decentralized music storage",
   "main": "./src/index.js",
   "bin": {
@@ -77,7 +77,7 @@
     "express": "^4.17.1",
     "fs-extra": "^9.0.1",
     "lodash": "^4.17.20",
-    "metastocle": "^0.2.22",
+    "metastocle": "^0.2.23",
     "music-metadata": "^6.4.0",
     "node-fetch": "^2.6.1",
     "node-id3": "^0.2.2",
@@ -86,8 +86,8 @@
     "serve-favicon": "^2.5.0",
     "sharp": "^0.25.2",
     "splaytree": "^3.1.0",
-    "spreadable": "^0.2.18",
-    "storacle": "^0.2.18",
+    "spreadable": "^0.2.19",
+    "storacle": "^0.2.19",
     "transliteration": "^2.2.0"
   },
   "repository": {

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

@@ -238,6 +238,13 @@
                 Once you are here, then the network is public or you have access. 
                 You can try to find a song in the storage or add your own there.
               </div>
+            </li> 
+            <li>
+              <div>How many songs are in this node?</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>.
+              </div>
             </li>          
             <li>
               <div>How to learn more about all this?</div>

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

@@ -1,6 +1,7 @@
 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 {
@@ -18,6 +19,9 @@ export default class App extends Akili.Component {
   created() {  
     this.captchaWidth = 240;
     this.findingSongsLimit = 10;
+    this.songsCountInterval = 10 * 1000;
+    this.songsCountIntervalObj = null;
+    this.scope.songsCount = 0;
     this.scope.searchInputValue = this.transition.query.f;
     this.scope.showCaptcha = false;
     this.scope.isUploading = false;
@@ -39,11 +43,16 @@ export default class App extends Akili.Component {
     this.scope.checkUploadSongTitle = this.checkUploadSongTitle.bind(this);    
     this.resetSearchEvent();
     this.resetUploadEvent();
-    this.resetSongUploadInfo();    
+    this.resetSongUploadInfo(); 
   }
 
   async compiled() {
     this.scope.searchInputValue && await this.findSongs();
+    await this.enableSongsCountCounter();
+  }
+
+  removed() {
+    clearInterval(this.songsCountIntervalObj);
   }
 
   resetSearchEvent() {
@@ -67,6 +76,16 @@ export default class App extends Akili.Component {
     };
   }
 
+  async enableSongsCountCounter() {
+    this.songsCountIntervalObj = setInterval(() => this.setSongsCount(), this.songsCountInterval);
+    await this.setSongsCount();
+  }
+
+  async setSongsCount() {
+    const data = (await request.get('/status', { json: true })).data;
+    this.scope.songsCount = data.filesCount;
+  }
+
   setFindingValue(val) {
     this.scope.searchInputValue = val;
     router.reload({}, { f: this.scope.searchInputValue || null }, undefined, { reload: false, saveScrollPosition: true });

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

@@ -2,6 +2,7 @@ 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) => {
@@ -18,13 +19,13 @@ module.exports = (Parent) => {
         similarity: this.node.options.music.similarity
       }, options);      
       const fullName = this.createCollectionName('music');
-      const collection = await this.node.getCollection('music');      
+      const collection = await this.node.getCollection('music');
       const documents = this.col[fullName].find();
+      const reader = new ArrayChunkReader(documents, { limit: 1000, log: false });
       let max = null;
 
-      for(let i = 0; i < documents.length; i++) {
-        const doc = documents[i];
-        let score = doc[collection.pk] === title? 1: 0;       
+      await reader.start((doc) => {
+        let score = doc[collection.pk] === title? 1: 0;
 
         if(!score) {
           score = utils.getSongSimilarity(doc[collection.pk], title, { 
@@ -35,18 +36,18 @@ module.exports = (Parent) => {
 
         if(score === 1) {
           max = { score, doc };
-          break;
+          return reader.stop();
         }
 
         if(!max || score > max.score) {
           max = { score, doc };
-          continue;
+          return;
         }
 
         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

@@ -126,7 +126,7 @@ module.exports = (Parent) => {
     async beautifySongTitles() {
       const docs = await this.db.getDocuments('music');
       const reader = new ArrayChunkReader(docs, { size: 1000, log: false });
-      reader.start(async (doc) => {
+      await reader.start(async (doc) => {
         doc.title = utils.beautifySongTitle(doc.title);
         await this.db.updateDocument(doc);
       });

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

@@ -29,7 +29,7 @@ module.exports = (Parent) => {
       const remove = [
         'addDocument', 'updateDocuments', 
         'deleteDocuments', 'getDocumentsCount',
-        'getDocumentByPk'
+        'getDocumentByPk', 'getDocuments'
       ];
       return super.getClientRoutes().filter(r => !remove.includes(r.name)).concat(routesClient);
     }

package/test/node.js

@@ -376,22 +376,6 @@ describe('Node', () => {
       assert.notEqual(title, beauty, 'check the title');
       assert.equal(docs[docs.length - 1].title, beauty, 'check the doc');
     });
-
-    it('should not remove wrong files', async () => {    
-      const filePath = await utils.setSongTags(path.join(tools.tmpPath, 'audio.mp3'), { fullTitle: 'another - song' });  
-      const hash = await utils.getFileHash(filePath);    
-      await node.withAddingFile(hash, async () => {
-        await node.addFileToStorage(filePath, hash, { copy: true });
-        await node.cleanUpMusic();
-      });      
-      assert.isTrue(await node.hasFile(hash));
-    });
-
-    it('should remove wrong files', async () => {  
-      const hash = await utils.getFileHash(path.join(tools.tmpPath, 'audio.mp3'));
-      await node.cleanUpMusic();
-      assert.isFalse(await node.hasFile(hash));
-    });
   });
 
   describe('.getStorageCleaningUpTree()', () => {