Worked on rewriting more functions in stations.js, and fixed issue with hset.

backend/logic/cache/index.js

@@ -69,7 +69,7 @@ const lib = {
 		lib.client.hset(table, key, value, err => {
 			if (cb !== undefined) {
 				if (err) return cb(err);
-				cb(null, value);
+				cb(null, JSON.parse(value));
 			}
 		});
 	},

backend/logic/stations.js

@@ -4,10 +4,10 @@ const cache = require('./cache');
 const db = require('./db');
 const io = require('./io');
 const utils = require('./utils');
+const logger = require('./logger');
 const songs = require('./songs');
 const notifications = require('./notifications');
 const async = require('async');
-let skipTimeout = null;
 
 //TEMP
 cache.sub('station.pause', (stationId) => {
@@ -37,14 +37,48 @@ cache.sub('station.newOfficialPlaylist', (stationId) => {
 module.exports = {
 
 	init: function(cb) {
-		let _this = this;
-		//TODO Add async waterfall
-		db.models.station.find({}, (err, stations) => {
-			if (!err) {
-				stations.forEach((station) => {
-					console.info("Initializing Station: " + station._id);
-					_this.initializeStation(station._id);
-				});
+		async.waterfall([
+			(next) => {
+				cache.hgetall('stations', next);
+			},
+
+			(stations, next) => {
+				if (!stations) return next();
+				let stationIds = Object.keys(stations);
+				async.each(stationIds, (stationId, next) => {
+					db.models.station.findOne({_id: stationId}, (err, station) => {
+						if (err) next(err);
+						else if (!station) {
+							cache.hdel('stations', stationId, next);
+						} else next();
+					});
+				}, next);
+			},
+
+			(next) => {
+				db.models.station.find({}, next);
+			},
+
+			(stations, next) => {
+				async.each(stations, (station, next) => {
+					async.waterfall([
+						(next) => {
+							cache.hset('stations', station._id, cache.schemas.station(station), next);
+						},
+
+						(station, next) => {
+							this.initializeStation(station._id, next);
+						}
+					], (err) => {
+						next(err);
+					});
+				}, next);
+			}
+		], (err) => {
+			if (err) {
+				console.log(`FAILED TO INITIALIZE STATIONS. ABORTING. "${err.message}"`);
+				process.exit();
+			} else {
 				cb();
 			}
 		});
@@ -52,46 +86,66 @@ module.exports = {
 
 	initializeStation: function(stationId, cb) {
 		if (typeof cb !== 'function') cb = ()=>{};
-		let _this = this;
-		_this.getStation(stationId, (err, station) => {
-			if (!err) {
-				if (station) {
+		async.waterfall([
+			(next) => {
+				this.getStation(stationId, next);
+			},
+
+			(station, next) => {
+				if (!station) return next('Station not found.');
+				if (station.type === 'official') {
 					cache.hget('officialPlaylists', stationId, (err, playlist) => {
-						if (err || !playlist) {
-							_this.calculateOfficialPlaylistList(stationId, station.playlist, ()=>{});
-						}
+						if (err) return next(err);
+						if (playlist) return next(null, station, null);
+						next(null, station, playlist);
 					});
+				} else next(null, station, null);
+			},
 
-					let notification = notifications.subscribe(`stations.nextSong?id=${station._id}`, _this.skipStation(station._id), true);
-					if (!station.paused ) {
-						/*if (!station.startedAt) {
-							station.startedAt = Date.now();
-							station.timePaused = 0;
-							cache.hset('stations', stationId, station);
-						}*/
-						if (station.currentSong) {
-							let timeLeft = ((station.currentSong.duration * 1000) - (Date.now() - station.startedAt - station.timePaused));
-							if (isNaN(timeLeft)) timeLeft = -1;
-							timeLeft = Math.floor(timeLeft);
-							if (station.currentSong.duration * 1000 < timeLeft || timeLeft < 0) {
-								this.skipStation(station._id)((err, station) => {
-									cb(err, station);
-								});
-							} else {
-								notifications.schedule(`stations.nextSong?id=${station._id}`, timeLeft);
-								cb(null, station);
-							}
-						} else {
-							_this.skipStation(station._id)((err, station) => {
-								cb(err, station);
-							});
-						}
+			(station, playlist, next) => {
+				if (playlist) {
+					this.calculateOfficialPlaylistList(stationId, station.playlist, () => {
+						next(station);
+					});
+				} else next();
+			},
+
+			(station, next) => {
+				if (!station.paused ) {
+
+				} else {
+					notifications.unschedule(`stations.nextSong?id${station._id}`);
+					next(true, station);
+				}
+			},
+
+			(station, next) => {
+				if (station.currentSong) {
+					let timeLeft = ((station.currentSong.duration * 1000) - (Date.now() - station.startedAt - station.timePaused));
+					if (isNaN(timeLeft)) timeLeft = -1;
+					timeLeft = Math.floor(timeLeft);
+					if (station.currentSong.duration * 1000 < timeLeft || timeLeft < 0) {
+						this.skipStation(station._id)(next);
 					} else {
-						notifications.unschedule(`stations.nextSong?id${station._id}`);
+						notifications.schedule(`stations.nextSong?id=${station._id}`, timeLeft, (err) => {
+							next(err, station);
+						});
 						cb(null, station);
 					}
-				} else cb("Station not found");
-			} else cb(err);
+				} else {
+					this.skipStation(station._id)(next);
+				}
+			}
+		], (err, station) => {
+			if (err && err !== true) {
+				let error = 'An error occurred.';
+				if (typeof err === "string") error = err;
+				else if (err.message) error = err.message;
+				logger.log("INITIALIZE_STATION", "ERROR", `Station initialization failed for "${stationId}". "${error}"`);
+			}
+
+			logger.log("INITIALIZE_STATION", "SUCCESS", `Station "${stationId}" initialized.`);
+			cb(err, station);
 		});
 	},