Playlist refactor (WIP)

.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "es2015-node"
+  ]
+}

.editorconfig

@@ -0,0 +1,11 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.eslintrc.json

@@ -0,0 +1,38 @@
+{
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
+    "env": {
+        "node": true,
+        "mocha": true
+    },
+    "extends": [
+      "eslint:recommended",
+      "google"
+    ],
+    "rules": {
+        "comma-dangle": ["error", "always-multiline"],
+        "quotes": ["error", "single"],
+        "max-len": ["warn", 100, 2],
+        "indent": ["error", 2],
+        "linebreak-style": "error",
+        "no-multiple-empty-lines": ["error", { "max": 1 }],
+        "no-trailing-spaces": "error",
+        "eol-last": "error",
+        "new-cap": ["error", { "properties": false }],
+        "arrow-parens": ["error", "as-needed"],
+        "no-var": "error",
+        "prefer-const": "warn",
+        "space-infix-ops": "error",
+        "space-before-blocks": "error",
+        "padded-blocks": ["error", "never"],
+        "object-curly-spacing": ["error", "always"],
+        "no-multi-spaces": "error",
+        "block-spacing": ["error", "always"],
+        "key-spacing": ["error", { "align": "value" }],
+        "comma-spacing": "error",
+        "computed-property-spacing": "error",
+        "keyword-spacing": "error"
+    }
+}

.gitignore

@@ -31,3 +31,5 @@ node_modules
 songCache
 cache
 settings
+
+dist

.travis.yml

@@ -8,3 +8,9 @@ notifications:
 language: node_js
 node_js:
     - "node"
+cache:
+    directories:
+        - node_modules
+after_script:
+    - "npm run-script coverage"
+    - "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"

db/migrations/000_initial.js

@@ -0,0 +1,24 @@
+/*eslint-disable func-names*/
+'use strict';
+
+exports.up = function(knex) {
+  return knex.schema
+    .createTable('songs', function(table) {
+      table.text('songId').primary();
+      table.text('backendName').notNullable();
+      table.integer('duration').notNullable();
+      table.text('title').notNullable();
+      table.text('artist');
+      table.text('album');
+      table.text('albumArt');
+      table.timestamp('createdAt').defaultTo(knex.fn.now());
+    })
+
+    .then(function() {
+    });
+};
+
+exports.down = function(knex) {
+  return knex.schema
+  .dropTableIfExists('songs');
+};

index.js

@@ -1,107 +1,16 @@
 'use strict';
 
-var _ = require('underscore');
-var npm = require('npm');
-var async = require('async');
-var labeledLogger = require('./lib/logger');
-var Player = require('./lib/player');
-var nodeplayerConfig = require('./lib/config');
-var config = nodeplayerConfig.getConfig();
-
-var logger = labeledLogger('core');
-
-function Core() {
-    this.player = new Player();
+var config = require('./src/config');
+var logger = require('./src/logger');
+
+import Player from './src/player';
+import Backend from './src/backends';
+import Plugin from './src/plugins';
+
+export {
+  Player,
+  Backend,
+  Plugin,
+  config,
+  logger,
 }
-
-Core.prototype.checkModule = function(module) {
-    try {
-        require.resolve(module);
-        return true;
-    } catch (e) {
-        return false;
-    }
-};
-
-Core.prototype.installModule = function(moduleName, callback) {
-    logger.info('installing module: ' + moduleName);
-    npm.load({}, function(err) {
-        npm.commands.install(__dirname, [moduleName], function(err) {
-            if (err) {
-                logger.error(moduleName + ' installation failed:', err);
-                callback();
-            } else {
-                logger.info(moduleName + ' successfully installed');
-                callback();
-            }
-        });
-    });
-};
-
-// make sure all modules are installed, installs missing ones, then calls loadCallback
-Core.prototype.installModules = function(modules, moduleType, update, loadCallback) {
-    async.eachSeries(modules, _.bind(function(moduleShortName, callback) {
-        var moduleName = 'nodeplayer-' + moduleType + '-' + moduleShortName;
-        if (!this.checkModule(moduleName) || update) {
-            // perform install / update
-            this.installModule(moduleName, callback);
-        } else {
-            // skip already installed
-            callback();
-        }
-    }, this), loadCallback);
-};
-
-Core.prototype.initModule = function(moduleShortName, moduleType, callback) {
-    var moduleTypeCapital = moduleType.charAt(0).toUpperCase() + moduleType.slice(1);
-    var moduleName = 'nodeplayer-' + moduleType + '-' + moduleShortName;
-    var module = require(moduleName);
-
-    var moduleLogger = labeledLogger(moduleShortName);
-    module.init(this.player, moduleLogger, _.bind(function(err) {
-        if (!err) {
-            this[moduleType + 's'][moduleShortName] = module;
-            if (moduleType === 'backend') {
-                this.songsPreparing[moduleShortName] = {};
-            }
-
-            moduleLogger.info(moduleType + ' module initialized');
-            this.callHooks('on' + moduleTypeCapital + 'Initialized', [moduleShortName]);
-        } else {
-            moduleLogger.error('while initializing: ' + err);
-            this.callHooks('on' + moduleTypeCapital + 'InitError', [moduleShortName]);
-        }
-        callback(err);
-    }, this.player));
-};
-
-Core.prototype.initModules = function(update, callback) {
-    async.eachSeries(['plugin', 'backend'], _.bind(function(moduleType, installCallback) {
-        // first install missing modules
-        this.installModules(config[moduleType + 's'], moduleType, update, installCallback);
-    }, this), _.bind(function() {
-        // then initialize modules, first all plugins in series, then all backends in parallel
-        async.eachSeries(['plugin', 'backend'], _.bind(function(moduleType, typeCallback) {
-            var moduleTypeCapital = moduleType.charAt(0).toUpperCase() + moduleType.slice(1);
-
-            (moduleType === 'plugin' ? async.eachSeries : async.each)
-                (config[moduleType + 's'], _.bind(function(moduleName, moduleCallback) {
-                if (this.checkModule('nodeplayer-' + moduleType + '-' + moduleName)) {
-                    this.initModule(moduleName, moduleType, moduleCallback);
-                }
-            }, this), _.bind(function(err) {
-                logger.info('all ' + moduleType + ' modules initialized');
-                this.callHooks('on' + moduleTypeCapital + 'sInitialized');
-                typeCallback();
-            }, this.player));
-        }, this), function() {
-            callback();
-        });
-    }, this));
-};
-
-exports.Player = Player;
-exports.labeledLogger = labeledLogger;
-exports.config = nodeplayerConfig;
-
-exports.Core = Core;

knexfile.js

@@ -0,0 +1,28 @@
+//This file is interpreted as ES5 CommonJS module.
+'use strict';
+
+const getConfig = require('./src/config').getConfig;
+
+const ALL_ENVIRONMENTS = Object.assign(getConfig().db, {
+  pool: {
+    min: 1,
+    max: 1
+  },
+  migrations: {
+    tableName: 'nodeplayer_migrations',
+    directory: 'db/migrations'
+  }
+});
+
+// Feel free to create any number of other environments.
+// The ones below are a best attempt at sensible defaults.
+module.exports = {
+  // Developer's local machine
+  development: ALL_ENVIRONMENTS,
+  // Unit and integration test environment
+  test: ALL_ENVIRONMENTS,
+  // Shared test/qa/staging/preproduction
+  staging: ALL_ENVIRONMENTS,
+  // Production environment
+  production: ALL_ENVIRONMENTS
+};