museria 0.2.49 → 0.3.2

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

@@ -1,11 +1,12 @@
-const fs = require('fs');
-const sanitize = require("sanitize-filename");
-const transliteration = require("transliteration");
-const errors = require('../../../errors');
-const utils = require('../../../utils');
-const mtUtils = require("metastocle/src/server/transports/express/midds");
-const stUtils = require("storacle/src/server/transports/express/midds");
-const midds = Object.assign({}, mtUtils, stUtils);
+import fse from "fs-extra";
+import sanitize from "sanitize-filename";
+import * as transliteration from "transliteration";
+import errors from "../../../errors.js";
+import utils from "../../../utils.js";
+import utilsMetastocle from "metastocle/src/server/transports/express/midds.js";
+import utilsStoracle from "storacle/src/server/transports/express/midds.js";
+
+const midds = Object.assign({}, utilsMetastocle, utilsStoracle);
 
 /**
  * Song addition control
@@ -13,20 +14,20 @@ const midds = Object.assign({}, mtUtils, stUtils);
 midds.songAdditionControl = node => {
   return async (req, res, next) => {
     try {
-      if(req.clientAddress != node.address && await node.isAddressTrusted(req.clientAddress)) {
+      if (req.clientAddress != node.address && await node.isAddressTrusted(req.clientAddress)) {
         return next();
       }
-      
-      if(!req.body.controlled) {
+
+      if (!req.body.controlled) {
         return next();
       }
 
       return midds.approval(node)(req, res, next);
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
 /**
@@ -36,19 +37,19 @@ midds.songRemovalControl = node => {
   return async (req, res, next) => {
     try {
       const title = req.body.title;
-      node.songTitleTest(title); 
+      node.songTitleTest(title);
       req.document = await node.db.getMusicByPk(title);
-      
-      if(!req.document || req.document.priority < 1) {
+
+      if (!req.document || req.document.priority < 1) {
         return next();
       }
-     
+
       return midds.approval(node)(req, res, next);
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
 /**
@@ -58,26 +59,26 @@ midds.fileAccess = node => {
   return async (req, res, next) => {
     try {
       let doc;
-      
-      if(req.query.f) {
+
+      if (req.query.f) {
         const fileHash = String(req.query.f);
         doc = await node.db.getMusicByFileHash(fileHash);
       }
 
-      if(!doc) {
+      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);
       }
-      
+
       doc && await node.db.accessDocument(doc);
       req.document = doc;
       next();
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
 /**
@@ -85,57 +86,57 @@ midds.fileAccess = node => {
  */
 midds.audio = node => {
   return async (req, res, next) => {
-    try {  
-      const err404 = new errors.NotFoundError('File not found');   
+    try {
+      const err404 = new errors.NotFoundError('File not found');
 
-      if(!req.document) {
+      if (!req.document) {
         throw err404;
-      }  
-      
+      }
+
       const hash = req.document.fileHash;
 
-      if(!await node.hasFile(hash)) {
+      if (!await node.hasFile(hash)) {
         throw err404;
       }
-      
-      if(req.headers['storacle-cache-check']) {
-        return hash == req.query.f? res.send(''): next(err404);
+
+      if (req.headers['storacle-cache-check']) {
+        return hash == req.query.f ? res.send('') : next(err404);
       }
 
       const cache = Math.ceil(node.options.file.responseCacheLifetime / 1000);
       const filePath = node.getFilePath(hash);
-      const info = await utils.getFileInfo(filePath, { hash: false });  
+      const info = await utils.getFileInfo(filePath, { hash: false });
       const filename = sanitize(transliteration.transliterate(req.document.title));
       const range = String(req.headers.range);
       cache && res.set('Cache-Control', `public, max-age=${cache}`);
       info.mime && res.setHeader('Content-Type', info.mime);
-      res.setHeader('Content-Disposition', `inline; filename="${ filename }.${ info.ext || 'mp3' }"`);       
+      res.setHeader('Content-Disposition', `inline; filename="${filename}.${info.ext || 'mp3'}"`);
 
       if (range.match('bytes=')) {
         const maxEnd = info.size - 1;
         const parts = range.replace(/bytes=/, '').split('-');
-        let start = parseInt(parts[0], 10) || 0;        
-        let end = parts[1]? parseInt(parts[1], 10): maxEnd;
+        let start = parseInt(parts[0], 10) || 0;
+        let end = parts[1] ? parseInt(parts[1], 10) : maxEnd;
         start > maxEnd && (start = maxEnd);
         end > maxEnd && (end = maxEnd);
         const chunkSize = (end - start) + 1;
-        const stream = fs.createReadStream(filePath, { start, end });
-        res.setHeader("Content-Range", `bytes ${ start }-${ end }/${ info.size }`);
+        const stream = fse.createReadStream(filePath, { start, end });
+        res.setHeader("Content-Range", `bytes ${start}-${end}/${info.size}`);
         res.setHeader("Accept-Ranges", 'bytes');
         res.setHeader("Content-Length", chunkSize);
         res.status(206);
         stream.on('error', next).pipe(res);
         return;
-      } 
-      
+      }
+
       res.setHeader("Content-Length", info.size);
-      const stream = fs.createReadStream(filePath);
+      const stream = fse.createReadStream(filePath);
       stream.on('error', next).pipe(res);
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
 
 /**
@@ -143,57 +144,56 @@ midds.audio = node => {
  */
 midds.cover = node => {
   return async (req, res, next) => {
-    try {  
+    try {
       const err404 = new errors.NotFoundError('File not found');
-
-      if(!req.document) {
+      
+      if (!req.document) {
         throw err404;
       }
-      
+
       const hash = req.document.fileHash;
-      const filePath = node.getFilePath(hash);        
+      const filePath = node.getFilePath(hash);
       const tags = await utils.getSongTags(filePath);
       
-      if(!tags.APIC) {
+      if (!tags.APIC) {
         throw err404;
       }
 
-      if(req.headers['storacle-cache-check']) {
-        return hash == req.query.f? res.send(''): next(err404);
+      if (req.headers['storacle-cache-check']) {
+        return hash == req.query.f ? res.send('') : next(err404);
       }
-      
-      const cache = Math.ceil(node.options.file.responseCacheLifetime / 1000);        
+
+      const cache = Math.ceil(node.options.file.responseCacheLifetime / 1000);
       const info = await utils.getFileInfo(tags.APIC, { hash: false });
-      const filename = sanitize(transliteration.transliterate(req.document.title));  
-      info.mime && res.setHeader("Content-Type", info.mime);      
-      res.setHeader('Content-Disposition', `inline; filename="${ filename }.${ info.ext || 'jpg' }"`); 
+      const filename = sanitize(transliteration.transliterate(req.document.title));
+      info.mime && res.setHeader("Content-Type", info.mime);
+      res.setHeader('Content-Disposition', `inline; filename="${filename}.${info.ext || 'jpg'}"`);
       cache && res.set('Cache-Control', `public, max-age=${cache}`);
       res.setHeader("Content-Length", info.size);
       res.end(tags.APIC, 'binary');
     }
-    catch(err) {
+    catch (err) {
       next(err);
     }
-  }
+  };
 };
-
 /**
  * Control song requests limit by a title and hash
  */
 midds.requestQueueSong = (node) => {
   return async (req, res, next) => {
     const options = { limit: 1, fnHash: key => key };
-    const title = String(req.query.title? req.query.title: req.body.title);
+    const title = String(req.query.title ? req.query.title : req.body.title);
     const arr = [title];
     
-    for(let key in node.__requestQueue) {
-      if(utils.getSongSimilarity(key, title) >= node.options.music.similarity) {
+    for (let key in node.__requestQueue) {
+      if (utils.getSongSimilarity(key, title) >= node.options.music.similarity) {
         arr.push(key);
       }
     }
 
     return midds.requestQueue(node, arr, options)(req, res, next);
-  }
+  };
 };
 
-module.exports = midds;
+export default midds;

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

@@ -1,23 +1,23 @@
-const midds = require('./midds');
-const controllers = require('./controllers');
+import midds from "./midds.js";
+import * as controllers from "./controllers.js";
 
-module.exports = [
+export default [
   { name: 'favicon', fn: controllers.favicon },
   { name: 'static', url: '/', fn: controllers.static },
-  { 
-    name: 'audio', 
-    method: 'get', 
-    url: '/audio/:hash', 
+  {
+    name: 'audio',
+    method: 'get',
+    url: '/audio/:hash',
     fn: [
       midds.networkAccess,
       midds.fileAccess,
       midds.audio
     ]
   },
-  { 
-    name: 'cover', 
-    method: 'get', 
-    url: '/cover/:hash', 
+  {
+    name: 'cover',
+    method: 'get',
+    url: '/cover/:hash',
     fn: [
       midds.networkAccess,
       midds.fileAccess,
@@ -25,4 +25,4 @@ module.exports = [
     ]
   },
   { name: 'indexPage', method: 'get', url: '*', fn: [midds.networkAccess, controllers.indexPage] }
-];
+];