museria 0.2.49 → 0.3.2

package/src/client.js

@@ -1,22 +1,24 @@
-const fs = require('fs');
-const merge = require('lodash/merge');
-const omit = require('lodash/omit');
-const ClientMetastocle= require('metastocle/src/client')();
-const ClientStoracle = require('storacle/src/client')(ClientMetastocle);
-const utils = require('./utils');
-const errors = require('./errors');
-const pack = require('../package.json');
-
-module.exports = (Parent) => {
+import fse from "fs-extra";
+import { merge, omit } from "lodash-es";
+import clientMetastocle from "metastocle/src/client.js";
+import clientStoracle from "storacle/src/client.js";
+import pack from "../package.json" with { type: "json" };
+import errors from "./errors.js";
+import utils from "./utils.js";
+
+const ClientMetastocle = clientMetastocle();
+const ClientStoracle = clientStoracle(ClientMetastocle);
+
+export default (Parent) => {
   /**
    * Class to manage client requests to the network
    */
   return class ClientMuseria extends (Parent || ClientStoracle) {
-    static get version () { return pack.version }
-    static get codename () { return pack.name }
-    static get utils () { return utils }
-    static get errors () { return errors }
-    
+    static get version() { return pack.version; }
+    static get codename() { return pack.name; }
+    static get utils() { return utils; }
+    static get errors() { return errors; }
+
     constructor(options = {}) {
       options = merge({
         request: {
@@ -25,11 +27,11 @@ module.exports = (Parent) => {
         }
       }, options);
       super(options);
-    }    
-    
+    }
+
     /**
      * Get the song complete info
-     * 
+     *
      * @async
      * @param {string} title
      * @param {object} [options]
@@ -46,14 +48,14 @@ module.exports = (Parent) => {
 
     /**
      * Find songs
-     * 
+     *
      * @async
      * @param {string} str
      * @param {object} [options]
      * @param {number} [options.limit]
      * @returns {object[]}
      */
-     async findSongs(str, options = {}) {
+    async findSongs(str, options = {}) {
       const result = await this.request('find-songs', Object.assign({}, options, {
         body: { str, limit: options.limit },
         timeout: options.timeout || this.options.request.documentGettingTimeout
@@ -64,13 +66,13 @@ module.exports = (Parent) => {
 
     /**
      * Find artist songs
-     * 
+     *
      * @async
      * @param {string} artist
      * @param {object} [options]
      * @returns {object[]}
      */
-     async findArtistSongs(artist, options = {}) {
+    async findArtistSongs(artist, options = {}) {
       const result = await this.request('find-artist-songs', Object.assign({}, options, {
         body: { artist },
         timeout: options.timeout || this.options.request.documentGettingTimeout
@@ -81,7 +83,7 @@ module.exports = (Parent) => {
 
     /**
      * Get the song main info
-     * 
+     *
      * @async
      * @param {string} title
      * @param {object} [options]
@@ -93,18 +95,18 @@ module.exports = (Parent) => {
         timeout: options.timeout || this.options.request.documentGettingTimeout
       }));
 
-      if(!result.info.length) {
+      if (!result.info.length) {
         return null;
       }
 
       let obj = { tags: {} };
 
-      for(let i = result.info.length - 1; i >= 0; i--) {
+      for (let i = result.info.length - 1; i >= 0; i--) {
         const info = result.info[i];
         !info.coverLink && delete info.coverLink;
-        const tags = utils.mergeSongTags(obj.tags, info.tags);  
+        const tags = utils.mergeSongTags(obj.tags, info.tags);
         obj = Object.assign(obj, info);
-        obj.tags = tags; 
+        obj.tags = tags;
       }
 
       return obj;
@@ -112,7 +114,7 @@ module.exports = (Parent) => {
 
     /**
      * Get the song audio link
-     * 
+     *
      * @async
      * @param {string} title
      * @param {object} [options]
@@ -127,7 +129,7 @@ module.exports = (Parent) => {
 
     /**
      * Get the song cover link
-     * 
+     *
      * @async
      * @param {string} title
      * @param {object} [options]
@@ -142,7 +144,7 @@ module.exports = (Parent) => {
 
     /**
      * Get the song to a buffer
-     * 
+     *
      * @param {string} title
      * @param {string} type
      * @param {object} [options]
@@ -150,13 +152,13 @@ module.exports = (Parent) => {
      */
     async getSongToBuffer(title, type, options = {}) {
       this.envTest(false, 'getSongToBuffer');
-      const { result, timer } = await this.getSongLinkAndTimer(title, type, options);      
+      const { result, timer } = await this.getSongLinkAndTimer(title, type, options);
       return await utils.fetchFileToBuffer(result.link, this.createDefaultRequestOptions({ timeout: timer() }));
     }
-    
+
     /**
      * Get the song audio to a buffer
-     * 
+     *
      * @see ClientMuseria.prototype.getSongToBuffer
      */
     async getSongAudioToBuffer(title, options = {}) {
@@ -165,7 +167,7 @@ module.exports = (Parent) => {
 
     /**
      * Get the song cover to a buffer
-     * 
+     *
      * @see ClientMuseria.prototype.getSongToBuffer
      */
     async getSongCoverToBuffer(title, options = {}) {
@@ -174,7 +176,7 @@ module.exports = (Parent) => {
 
     /**
      * Get the song to the path
-     * 
+     *
      * @param {string} title
      * @param {string} filePath
      * @param {string} type
@@ -183,13 +185,13 @@ module.exports = (Parent) => {
      */
     async getSongToPath(title, filePath, type, options = {}) {
       this.envTest(false, 'getSongToPath');
-      const { result, timer } = await this.getSongLinkAndTimer(title, type, options);      
+      const { result, timer } = await this.getSongLinkAndTimer(title, type, options);
       await utils.fetchFileToPath(filePath, result.link, this.createDefaultRequestOptions({ timeout: timer() }));
     }
 
     /**
      * Get the song audio to the path
-     * 
+     *
      * @see ClientMuseria.prototype.getSongToPath
      */
     async getSongAudioToPath(title, filePath, options = {}) {
@@ -198,16 +200,16 @@ module.exports = (Parent) => {
 
     /**
      * Get the song cover to the path
-     * 
+     *
      * @see ClientMuseria.prototype.getSongToPath
      */
     async getSongCoverToPath(title, filePath, options = {}) {
-      return this.getSongToPath(title, filePath,  'cover', options);
+      return this.getSongToPath(title, filePath, 'cover', options);
     }
 
     /**
      * Get the song to a blob
-     * 
+     *
      * @param {string} title
      * @param {string} type
      * @param {object} [options]
@@ -215,13 +217,13 @@ module.exports = (Parent) => {
      */
     async getSongToBlob(title, type, options = {}) {
       this.envTest(true, 'getSongToBlob');
-      const { result, timer } = await this.getSongLinkAndTimer(title, type, options);      
+      const { result, timer } = await this.getSongLinkAndTimer(title, type, options);
       return await utils.fetchFileToBlob(result.link, this.createDefaultRequestOptions({ timeout: timer() }));
     }
 
     /**
      * Get the song audio to a blob
-     * 
+     *
      * @see ClientMuseria.prototype.getSongToBlob
      */
     async getSongAudioToBlob(title, options = {}) {
@@ -230,7 +232,7 @@ module.exports = (Parent) => {
 
     /**
      * Get the song cover to a blob
-     * 
+     *
      * @see ClientMuseria.prototype.getSongToBlob
      */
     async getSongCoverToBlob(title, options = {}) {
@@ -249,51 +251,51 @@ module.exports = (Parent) => {
     async getSongLinkAndTimer(title, type, options) {
       const timeout = options.timeout || this.options.request.fileGettingTimeout;
       const timer = this.createRequestTimer(timeout);
-      const result  = await this.request('get-song-link', Object.assign({}, options, {
+      const result = await this.request('get-song-link', Object.assign({}, options, {
         body: { title, type },
         timeout: timer(this.options.request.fileLinkGettingTimeout)
       }));
-      
-      if(!result.link) {
+
+      if (!result.link) {
         throw new errors.WorkError(`Link for song "${title}" is not found`, 'ERR_MUSERIA_NOT_FOUND_LINK');
       }
 
       return {
         result,
         timer
-      }
+      };
     }
 
     /**
      * Store the file to the storage
-     * 
+     *
      * @async
-     * @param {string|Buffer|fs.ReadStream|Blob|File} file
+     * @param {string|Buffer|fse.ReadStream|Blob|File} file
      * @param {object} [options]
      * @param {boolean} [options.controlled]
      * @param {number} [options.priority]
      */
-    async addSong(file, options = {}) {      
+    async addSong(file, options = {}) {
       const destroyFileStream = () => utils.isFileReadStream(file) && file.destroy();
 
       try {
-        options = Object.assign({ 
+        options = Object.assign({
           priority: 0,
-          controlled: false 
+          controlled: false
         }, options);
         const info = await utils.getFileInfo(file);
         const tags = await utils.getSongTags(file);
-        
-        if(!utils.isSongTitle(tags.fullTitle)) {
+
+        if (!utils.isSongTitle(tags.fullTitle)) {
           throw new errors.WorkError(`Wrong song title "${tags.fullTitle}"`, 'ERR_MUSERIA_SONG_WRONG_TITLE');
         }
 
-        if(typeof file == 'string') {
-          file = fs.createReadStream(file);
+        if (typeof file == 'string') {
+          file = fse.createReadStream(file);
         }
 
         const priority = String(options.priority);
-        const controlled = options.controlled? '1': ''; 
+        const controlled = options.controlled ? '1' : '';
         const result = await this.request('add-song', Object.assign({}, omit(options, ['priority']), {
           formData: {
             priority,
@@ -301,26 +303,25 @@ module.exports = (Parent) => {
             file: {
               value: file,
               options: {
-                filename: info.hash + (info.ext? '.' + info.ext: ''),
+                filename: info.hash + (info.ext ? '.' + info.ext : ''),
                 contentType: info.mime
               }
             }
           },
           timeout: options.timeout || this.options.request.fileStoringTimeout
         }));
-
         destroyFileStream();
         return result;
       }
-      catch(err) {
+      catch (err) {
         destroyFileStream();
         throw err;
       }
-    }    
+    }
 
     /**
      * Remove the song
-     * 
+     *
      * @async
      * @param {string} title
      * @param {object} [options]
@@ -335,38 +336,36 @@ module.exports = (Parent) => {
 
     /**
      * Create a deferred song link
-     * 
-     * @param {string} title 
-     * @param {string} type 
-     * @param {object} options 
+     *
+     * @param {string} title
+     * @param {string} type
+     * @param {object} options
      * @returns {string}
      */
     createRequestedSongLink(title, type, options = {}) {
-      options = Object.assign({ 
+      options = Object.assign({
         query: {
           type,
-          title          
+          title
         }
       }, options);
       return this.createRequestUrl(`request-song`, options);
     }
-
     /**
      * Create a deferred song audio link
-     * 
+     *
      * @see ClientMuseria.prototype.createRequestedSongLink
      */
     createRequestedSongAudioLink(title, options = {}) {
       return this.createRequestedSongLink(title, 'audio', options);
     }
-
     /**
      * Create a deferred song cover link
-     * 
+     *
      * @see ClientMuseria.prototype.createRequestedSongLink
      */
     createRequestedSongCoverLink(title, options = {}) {
       return this.createRequestedSongLink(title, 'cover', options);
     }
-  }
-};
+  };
+};

package/src/collection/transports/music/index.js

@@ -1,14 +1,16 @@
-const _ = require('lodash');
-const Collection = require('metastocle/src/collection/transports/collection')();
-const utils = require('../../../utils');
-const schema = require('../../../schema');
+import omit from "lodash-es/omit.js";
+import collection from "metastocle/src/collection/transports/collection/index.js";
+import schema from "../../../schema.js";
+import utils from "../../../utils.js";
 
-module.exports = (Parent) => {
+const Collection = collection();
+
+export default (Parent) => {
   /**
    * Music collection transport
    */
   return class MusicCollection extends (Parent || Collection) {
-    static get DocumentsHandler () { return utils.MusicDocumentsHandler }
+    static get DocumentsHandler() { return utils.MusicDocumentsHandler; }
 
     /**
      * @see Collection.prototype.actionsGettingTest
@@ -22,33 +24,33 @@ module.exports = (Parent) => {
      * @see Collection.prototype.prepareDocumentFromSlave
      */
     async prepareDocumentFromSlave(doc) {
-      if(!doc.fileHash) {
+      if (!doc.fileHash) {
         return null;
       }
 
-      try {         
+      try {
         const filePath = this.node.getFilePath(doc.fileHash);
         const buff = await this.node.getSongAudioHeadersBuffer(filePath);
 
         try {
-          doc.tags = await utils.getSongTags(buff); 
+            doc.tags = await utils.getSongTags(buff);
         }
-        catch(err) {
-          this.node.logger.warn(err.stack);
-          doc.tags = {};
+        catch (err) {
+            this.node.logger.warn(err.stack);
+            doc.tags = {};
         }
-                  
+
         doc.audioLink = await this.node.createSongAudioLink(doc);
         doc.coverLink = await this.node.createSongCoverLink(doc, doc.tags);
-        doc.tags = _.omit(doc.tags, ['APIC']);
+        doc.tags = omit(doc.tags, ['APIC']);
         doc.priority = doc.priority || 0;
       }
-      catch(err) {
+      catch (err) {
         this.node.logger.warn(err.stack);
         return null;
       }
-
+      
       return doc;
     }
-  }
-};
+  };
+};

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

@@ -1,13 +1,15 @@
-const Database = require('spreadable/src/db/transports/database')();
+import database from "spreadable/src/db/transports/database/index.js";
 
-module.exports = (Parent) => {
+const Database = database();
+
+export default (Parent) => {
   /**
    * Database transport interface
    */
   return class DatabaseMuseria extends (Parent || Database) {
     /**
      * @async
-     * @param {string} title 
+     * @param {string} title
      * @returns {object}
      */
     async getMusicByPk() {
@@ -30,5 +32,5 @@ module.exports = (Parent) => {
     async removeMusicByFileHash() {
       throw new Error('Method "removeMusicByFileHash" is required for database transport');
     }
-  }
-};
+  };
+};

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

@@ -1,10 +1,15 @@
-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 utils = require('../../../utils');
+import database from "../database/index.js";
+import lokiSpreadable from "spreadable/src/db/transports/loki/index.js";
+import lokiMetastocle from "metastocle/src/db/transports/loki/index.js";
+import lokiStoracle from "storacle/src/db/transports/loki/index.js";
+import utils from "../../../utils.js";
 
-module.exports = (Parent) => {
+const DatabaseMuseria = database();
+const DatabaseLoki = lokiSpreadable(DatabaseMuseria);
+const DatabaseLokiMetastocle = lokiMetastocle(DatabaseLoki);
+const DatabaseLokiStoracle = lokiStoracle(DatabaseLokiMetastocle);
+
+export default (Parent) => {
   /**
    * Lokijs database transport
    */
@@ -15,39 +20,39 @@ module.exports = (Parent) => {
     async getMusicByPk(title, options = {}) {
       title = utils.prepareComparisonSongTitle(title);
       options = Object.assign({
-        similarity: this.node.options.music.similarity
-      }, options);      
+          similarity: this.node.options.music.similarity
+      }, options);
       const fullName = this.createCollectionName('music');
       const documents = this.col[fullName].find();
       let max = null;
-
-      for(let i = 0; i < documents.length; i++) {
+      
+      for (let i = 0; i < documents.length; i++) {
         const doc = documents[i];
         let score = doc.compTitle === title? 1: 0;
 
-        if(!score) {
-          score = utils.getSongSimilarity(doc.compTitle, title, { 
-            beautify: false, 
-            min: options.similarity
+        if (!score) {
+          score = utils.getSongSimilarity(doc.compTitle, title, {
+              beautify: false,
+              min: options.similarity
           });
         }
 
-        if(score === 1) {
+        if (score === 1) {
           max = { score, doc };
           break;
         }
 
-        if(!max || score > max.score) {
+        if (!max || score > max.score) {
           max = { score, doc };
           continue;
         }
 
-        if(score == max.score && Math.random() > 0.5) {
+        if (score == max.score && Math.random() > 0.5) {
           max = { score, doc };
         }
-      }     
+      }
 
-      if(max && max.score >= options.similarity) {
+      if (max && max.score >= options.similarity) {
         return this.prepareDocumentToGet(max.doc);
       }
 
@@ -56,9 +61,9 @@ module.exports = (Parent) => {
 
     /**
      * Add music document
-     * 
+     *
      * @async
-     * @param {object} doc 
+     * @param {object} doc
      * @returns {object}
      */
     async addMusicDocument(doc, options = {}) {
@@ -69,9 +74,9 @@ module.exports = (Parent) => {
 
     /**
      * Add music document
-     * 
+     *
      * @async
-     * @param {object} doc 
+     * @param {object} doc
      * @param {object} options
      * @param {object} options.beautify
      * @returns {object}
@@ -98,5 +103,5 @@ module.exports = (Parent) => {
       const fullName = this.createCollectionName('music');
       this.col[fullName].chain().find({ fileHash: hash }).remove();
     }
-  }
-};
+  };
+};

package/src/errors.js

@@ -1 +1,2 @@
-module.exports = Object.assign({}, require('spreadable/src/errors'));
+import * as errors from "spreadable/src/errors.js";
+export default Object.assign({}, errors);

package/src/index.js

@@ -1,7 +1,9 @@
-const Node = require('./node')();
-const Client = require('./client')();
+import node from "./node.js";
+import client from "./client.js";
 
-module.exports = {
-  Client,
-  Node
-};
+const Node = node();
+const Client = client();
+
+export { Client };
+export { Node };
+export default { Client, Node };