museria 0.2.49 → 0.3.2

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

@@ -1,32 +1,26 @@
-const errors = require('../../../../errors');
-const utils = require('../../../../utils');
+import errors from "../../../../errors.js";
+import utils from "../../../../utils.js";
 
-/**
- * Request the song
- */
-module.exports.requestSong = node => {
+export const 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) {
+      if (!link) {
         throw new errors.NotFoundError('File not found');
       }
 
       res.redirect(link);
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
-/**
- * Get the song info
- */
-module.exports.getSongInfo = node => {
+export const getSongInfo = node => {
   return async (req, res, next) => {
     try {
       const title = req.body.title;
@@ -34,51 +28,42 @@ module.exports.getSongInfo = node => {
       const info = await node.getSongInfo(title, node.prepareClientMessageOptions(req.body));
       res.send({ info });
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
-/*
- * Find songs
- */
-module.exports.findSongs = node => {
- return async (req, res, next) => {
-   try {
-     const str = req.body.str;
-     const limit = req.body.limit;
-     const songs = await node.findSongs(str, node.prepareClientMessageOptions(req.body, {
-       limit
-     }));
-     res.send({ songs });
-   }
-   catch(err) {
-     next(err);
-   }
- }
+export const findSongs = node => {
+  return async (req, res, next) => {
+    try {
+      const str = req.body.str;
+      const limit = req.body.limit;
+      const songs = await node.findSongs(str, node.prepareClientMessageOptions(req.body, {
+        limit
+      }));
+      res.send({ songs });
+    }
+    catch (err) {
+      next(err);
+    }
+  };
 };
 
-/*
- * Find artist songs
- */
-module.exports.findArtistSongs = node => {
+export const findArtistSongs = node => {
   return async (req, res, next) => {
     try {
       const artist = req.body.artist;
       const songs = await node.findArtistSongs(artist, node.prepareClientMessageOptions(req.body));
       res.send({ songs });
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
- };
+  };
+};
 
-/**
- * Get the song link
- */
-module.exports.getSongLink = node => {
+export const getSongLink = node => {
   return async (req, res, next) => {
     try {
       const title = req.body.title;
@@ -86,40 +71,34 @@ module.exports.getSongLink = node => {
       const link = await node.getSongLink(title, req.body.type, node.prepareClientMessageOptions(req.body));
       res.send({ link });
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
-/**
- * Add the song
- */
-module.exports.addSong = node => {
+export const addSong = node => {
   return async (req, res, next) => {
     try {
       const file = req.body.file;
-
-      if(!utils.isFileReadStream(file)) {
+      
+      if (!utils.isFileReadStream(file)) {
         throw new errors.WorkError('"file" field is invalid', 'ERR_MUSERIA_INVALID_FILE_FIELD');
       }
 
-      const result = await node.addSong(file, node.prepareClientMessageOptions(req.body, { 
+      const result = await node.addSong(file, node.prepareClientMessageOptions(req.body, {
         controlled: !!req.body.controlled,
         priority: parseInt(req.body.priority || 0)
       }));
       res.send(result);
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
-/**
- * Remove the song
- */
-module.exports.removeSong = node => {
+export const removeSong = node => {
   return async (req, res, next) => {
     try {
       const title = req.body.title;
@@ -127,8 +106,8 @@ module.exports.removeSong = node => {
       const result = await node.removeSong(title, node.prepareClientMessageOptions(req.body));
       res.send(result);
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };

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

@@ -1,15 +1,15 @@
-const controllers = require('./controllers');
-const midds = require('../midds');
+import * as controllers from "./controllers.js";
+import midds from "../midds.js";
 
-module.exports = [
+export default [
   /**
    * Request the song
-   * 
+   *
    * @api {get} /client/request-song/
    * @apiParam {string} title
    * @apiParam {string} type
    */
-  { 
+  {
     name: 'requestSong',
     method: 'get',
     url: '/request-song',
@@ -18,108 +18,102 @@ module.exports = [
       controllers.requestSong
     ]
   },
-
   /**
    * Get the song info
-   * 
+   *
    * @api {post} /client/get-song-info
    * @apiParam {string} title - song title
    * @apiSuccess {object} - { info: [{...}] }
    */
-  { 
-    name: 'getSongInfo', 
-    method: 'post', 
+  {
+    name: 'getSongInfo',
+    method: 'post',
     url: '/get-song-info',
     fn: [
       midds.requestQueueClient,
       controllers.getSongInfo
     ]
   },
-
   /**
    * Find songs
-   * 
+   *
    * @api {post} /client/find-songs
    * @apiParam {string} str
    * @apiSuccess {object} - { songs: [{...}] }
    */
-   { 
-    name: 'findSongs', 
-    method: 'post', 
+  {
+    name: 'findSongs',
+    method: 'post',
     url: '/find-songs',
     fn: [
       midds.requestQueueClient,
       controllers.findSongs
     ]
   },
-
   /**
    * Find artist songs
-   * 
+   *
    * @api {post} /client/find-artist-songs
    * @apiParam {string} artist
    * @apiSuccess {object} - { songs: [{...}] }
    */
-   { 
-    name: 'findArtistSongs', 
-    method: 'post', 
+  {
+    name: 'findArtistSongs',
+    method: 'post',
     url: '/find-artist-songs',
     fn: [
       midds.requestQueueClient,
       controllers.findArtistSongs
     ]
   },
-
   /**
    * Get the song link
-   * 
+   *
    * @api {post} /client/get-song-link
    * @apiParam {string} title - song title
    * @apiParam {string} type - file type
    * @apiSuccess {object} - { link: '' }
    */
-  { 
-    name: 'getSongLink', 
-    method: 'post', 
+  {
+    name: 'getSongLink',
+    method: 'post',
     url: '/get-song-link',
     fn: [
       midds.requestQueueClient,
       controllers.getSongLink
     ]
   },
-  
   /**
    * Add the song
-   * 
+   *
    * @api {post} /client/add-song/
-   * @apiParam {fs.ReadStream|string} file 
+   * @apiParam {fs.ReadStream|string} file
    * @apiSuccess {object} - { title: '', audioLink: '', coverLink: '', tags: {...} }
    */
-  { 
-    name: 'addSong', 
+  {
+    name: 'addSong',
     method: 'post',
-    url: '/add-song', 
+    url: '/add-song',
     fn: (node) => [
       midds.requestQueueClient(node, { limit: node.options.request.clientStoringConcurrency }),
-      midds.filesFormData(node), 
-      controllers.addSong(node)   
+      midds.filesFormData(node),
+      controllers.addSong(node)
     ]
   },
-
   /**
    * Remove the song
-   * 
+   *
    * @api {post} /client/remove-song
    * @apiParam {string} title - song title
    * @apiSuccess {object} - { removed: 0 }
    */
-  { 
+  {
     name: 'removeSong',
-    method: 'post', 
+    method: 'post',
     url: '/remove-song',
     fn: [
       midds.requestQueueClient,
       controllers.removeSong
     ]
-  }  
-];
+  }
+];

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

@@ -1,24 +1,13 @@
-const express = require('express');
-const favicon = require('serve-favicon');
-const path = require('path');
+import * as express from "express";
+import faviconLib from "serve-favicon";
+import path from "path";
 
-/**
- * Server index page handler
- */
-module.exports.indexPage = () => {
-  return (req, res) => res.sendFile(path.resolve(__dirname, '../../../browser/face/index.html'));
-};
+const __dirname = new URL('.', import.meta.url).pathname;
+const favicon = () => faviconLib(path.resolve(__dirname, '../../../browser/face/favicon.png'));
+const stat = () => express.static(path.resolve(__dirname, '../../../../dist/face'));
 
-/**
- * Server favicon handler
- */
-module.exports.favicon = () => {
-  return favicon(path.resolve(__dirname, '../../../browser/face/favicon.png'));
+export const indexPage = () => {
+  return (req, res) => res.sendFile(path.resolve(__dirname, '../../../browser/face/index.html'));
 };
-
-/**
- * Server static handler
- */
-module.exports.static = () => {
-  return express.static(path.resolve(__dirname, '../../../../dist/face'));
-};
+export { favicon };
+export { stat as static };

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

@@ -1,16 +1,19 @@
-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');
-const routesApiMaster = require('./api/master/routes');
-const routesApiButler = require('./api/butler/routes');
-const routesApiSlave = require('./api/slave/routes');
-const routesApiNode = require('./api/node/routes');
+import expressStoracle from "storacle/src/server/transports/express/index.js";
+import expressMetastocle from "metastocle/src/server/transports/express/index.js";
+import routes from "./routes.js";
+import routesClient from "./client/routes.js";
+import routesApi from "./api/routes.js";
+import routesApiMaster from "./api/master/routes.js";
+import routesApiButler from "./api/butler/routes.js";
+import routesApiSlave from "./api/slave/routes.js";
+import routesApiNode from "./api/node/routes.js";
 
-module.exports = (Parent) => {
+const ServerExpressStoracle = expressStoracle();
+const ServerExpressMetastocle = expressMetastocle(ServerExpressStoracle);
+
+export default (Parent) => {
   return class ServerExpressMuseria extends (Parent || ServerExpressMetastocle) {
-   /**
+    /**
      * @see ServerExpressMetastocle.prototype.getMainRoutes
      */
     getMainRoutes() {
@@ -22,26 +25,26 @@ module.exports = (Parent) => {
       arr.splice(arr.findIndex(r => r.name == 'notFound'), 0, ...end);
       return arr;
     }
-  
+
     /**
      * @see ServerExpressMetastocle.prototype.getClientRoutes
      */
     getClientRoutes() {
       const remove = [
-        'addDocument', 'updateDocuments', 
+        'addDocument', 'updateDocuments',
         'deleteDocuments', 'getDocumentsCount',
         'getDocumentByPk', 'getDocuments', 'removeFile'
       ];
       return super.getClientRoutes().filter(r => !remove.includes(r.name)).concat(routesClient);
     }
-  
+
     /**
      * @see ServerExpressMetastocle.prototype.getApiRoutes
      */
-    getApiRoutes() {      
+    getApiRoutes() {
       return super.getApiRoutes().concat(routesApi);
     }
-  
+
     /**
      * @see ServerExpressMetastocle.prototype.getApiMasterRoutes
      */
@@ -57,7 +60,7 @@ module.exports = (Parent) => {
       const remove = ['updateDocuments', 'deleteDocuments', 'removeFile'];
       return super.getApiButlerRoutes().filter(r => !remove.includes(r.name)).concat(routesApiButler);
     }
-  
+
     /**
      * @see ServerExpressMetastocle.prototype.getApiSlaveRoutes
      */
@@ -65,7 +68,7 @@ module.exports = (Parent) => {
       const remove = ['updateDocuments', 'deleteDocuments', 'removeFile'];
       return super.getApiSlaveRoutes().filter(r => !remove.includes(r.name)).concat(routesApiSlave);
     }
-
+    
     /**
      * @see ServerExpressMetastocle.prototype.getApiNodeRoutes
      */
@@ -73,5 +76,5 @@ module.exports = (Parent) => {
       const remove = ['addDocument', 'storFile'];
       return super.getApiNodeRoutes().filter(r => !remove.includes(r.name)).concat(routesApiNode);
     }
-  }
-};
+  };
+};