Added classes to station.js and global.js

backend/logic/global.js

@@ -1,38 +1,50 @@
-function Timer(callback, delay, paused) {
-	let timerId, start, remaining = delay;
-	let timeWhenPaused = 0;
-	const timePaused = Date.now();
-
-	this.pause = () => {
-		clearTimeout(timerId);
-		remaining -= Date.now() - start;
-		timePaused = Date.now();
-	};
-
-	this.resume = () => {
-		start = Date.now();
-		clearTimeout(timerId);
-		timerId = setTimeout(callback, remaining);
-		timeWhenPaused += Date.now() - timePaused;
-	};
-
-	this.resetTimeWhenPaused = () => {
-		timeWhenPaused = 0;
-	};
-
-	this.timeWhenPaused = () => {
-		return timeWhenPaused;
-	};
-
-	if (paused === false) {
-		this.resume();
+'use strict';
+
+class Timer {
+	constructor(callback, delay, paused) {
+		this.callback = callback;
+		this.delay = delay;
+		this.paused = paused;
+
+		this.timerId = delay;
+		this.start = delay;
+		this.remaining = delay;
+		this.timeWhenPaused = 0;
+		this.timePaused = Date.now();
+	}
+
+	pause() {
+		clearTimeout(this.timerId);
+		this.remaining -= Date.now() - this.start;
+		this.timePaused = Date.now();
+	}
+
+	ifNotPaused() {
+		if (!this.paused) {
+			this.resume();
+		}
+	}
+
+	resume() {
+		this.start = Date.now();
+		clearTimeout(this.timerId);
+		this.timerId = setTimeout(this.callback, this.remaining);
+		this.timeWhenPaused = Date.now() - this.timePaused;
+	}
+
+	resetTimeWhenPaused() {
+		this.timeWhenPaused = 0;
+	}
+
+	timeWhenPaused() {
+		return this.timeWhenPaused;
 	}
 }
 
 module.exports = {
 	io: null, // Socket.io
 	db: null, // Database
-	htmlEntities: function(str) {
+	htmlEntities: (str) => {
 		return String(str).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
 	},
 	Timer

backend/logic/stations.js

@@ -1,185 +1,138 @@
+'use strict';
 
-// custom modules
 const global = require('./global');
-var io = global.io;
-
-function Station (id, data) {
-
-	const self = this;
-
-	//TODO Add startedAt and timePaused
-	let playlist = data.playlist;
-	let currentSong = playlist[0];
-	let currentSongIndex = data.currentSongIndex;
-	let paused = data.paused;
-	let locked = data.locked;
-	let skipVotes = data.skipVotes;
-	let users = data.users;
-	let displayName = data.displayName;
-	let description = data.description;
-	let timer;
-	let nsp = io.of('/' + id);
-	nsp.on('connection', socket => {
-		console.log('someone connected');
-	});
-
-	this.skipSong = () => {
-		if (playlist.length > 0) {
-			if (timer !== undefined) {
-				timer.pause();
-			}
-			if (currentSongIndex+1 < playlist.length) {
-				currentSongIndex++;
-			} else {
-				currentSongIndex = 0;
-			}
-			skipVotes = 0;
-			currentSong = playlist[currentSongIndex];
-			timer = new global.Timer(() => {
+let io = global.io;
+let nsp = io.of('/' + id);
+nsp.on('connection', socket => {
+	console.info('someone connected');
+});
+
+module.exports = class Station {
+	constructor(id, data) {
+		this.id = id;
+		this.data = data;
+
+		this.playlist = data.playlist;
+		this.currentSong = this.playlist[0];
+		this.currentSongIndex = data.currentSongIndex;
+		this.paused = data.paused;
+		this.locked = data.locked;
+		this.skipVotes = data.skipVotes;
+		this.users = data.users;
+		this.displayName = data.displayName;
+		this.description = data.description;
+		this.timer = undefined;
+	}
+
+	skipSong() {
+		if (this.playlist.length > 0) {
+			if (this.timer !== undefined) this.timer.pause();
+
+			if (this.currentSongIndex+1 < this.playlist.length) this.currentSongIndex++;
+			else this.currentSongIndex = 0;
+
+			this.skipVotes = 0;
+			this.currentSong = this.playlist[this.currentSongIndex];
+
+			this.timer = new global.Timer(() => {
 				console.log("Skip!");
 				self.skipSong();
-			}, currentSong.duration, paused);
+			}, this.currentSong.duration, this.paused);
 
-			nsp.emit("skippedSong", currentSong);
-		}
-	};
-	this.toggleVoteSkip = userId => {
-		if (skipVotes.indexOf(userId) === -1) {
-			skipVotes.push(userId);
-		} else {
-			skipVotes = skipVotes.splice(skipVotes.indexOf(userId), 1);
+			nsp.emit("skippedSong", this.currentSong);
 		}
-		//TODO Calculate if enough people voted to skip
-		nsp.emit("voteSkip", skipVotes);
-	};
-	this.retrievePlaylist = () => {
-		//TODO Use Rethink to get the Playlist for this station
-	};
-	this.pause = () => {
-		if (!paused) {
-			paused = true;
-			timer.pause();
+	}
+
+	toggleVoteSkip(userId) {
+		if (this.skipVotes.indexOf(userId) === -1) this.skipVotes.push(userId);
+		else this.skipVotes = this.skipVotes.splice(this.skipVotes.indexOf(userId), 1);
+
+		// TODO: Calculate if enough people voted to skip
+		nsp.emit("voteSkip", this.skipVotes);
+	}
+
+	retrievePlaylist() {
+		// TODO: get the Playlist for this station using db
+	}
+
+	pause() {
+		if (!this.paused) {
+			this.paused = true;
+			this.timer.pause();
 			nsp.emit("pause");
 		}
-	};
-	this.unpause = () => {
-		if (paused) {
-			paused = false;
-			timer.resume();
+	}
+
+	unPause() {
+		if (this.paused) {
+			this.paused = false;
+			this.timer.resume();
 			nsp.emit("unpause");
 		}
-	};
-	this.isPaused = () => {
-		return paused;
-	};
-	this.getCurrentSong = () => {
-		return currentSong;
-	};
-	this.lock = () => {
-		if (!locked) {
-			locked = true;
+	}
+
+	isPaused() {
+		return this.paused;
+	}
+
+	getCurrentSong() {
+		return this.currentSong;
+	}
+
+	lock() {
+		if (!this.locked) {
+			this.locked = true;
 			nsp.emit("lock");
 		}
-	};
-	this.unlock = () => {
-		if (locked) {
-			locked = false;
+	}
+
+	unlock() {
+		if (this.locked) {
+			this.locked = false;
 			nsp.emit("unlocked");
 		}
-	};
-	this.isLocked = () => {
-		return locked;
-	};
-	this.updateDisplayName = newDisplayName => {
-		//TODO Update RethinkDB
-		displayName = newDisplayName;
+	}
+
+	isLocked() {
+		return this.locked;
+	}
+
+	updateDisplayName(newDisplayName) {
+		// TODO: Update db
+		this.displayName = newDisplayName;
 		nsp.emit("updateDisplayName", newDisplayName);
-	};
-	this.updateDescription = newDescription => {
-		//TODO Update RethinkDB
-		description = newDescription;
+	}
+
+	updateDescription(newDescription) {
+		// TODO: Update db
+		this.description = newDescription;
 		nsp.emit("updateDescription", newDescription);
-	};
-	this.getId = () => {
-		return id;
-	};
-	this.getDisplayName = () => {
-		return displayName;
-	};
-	this.getDescription = () => {
-		return description;
-	};
-	this.addUser = user => {
-		users.add(user);
-		nsp.emit("updateUsers", users);
-	};
-	this.removeUser = user => {
-		users.splice(users.indexOf(user), 1);
-		nsp.emit("updateUsers", users);
-	};
-	this.getUsers = () => {
-		return users;
-	};
-	this.skipSong();
-}
+	}
 
-module.exports = {
+	getId() {
+		return this.id;
+	}
 
-	stations: [],
+	getDisplayName() {
+		return this.displayName;
+	}
 
-	initStation: (id, data) => {
-		if (!this.getStation(id)) {
-			let station = new Station(id, data);
-			this.stations.push(station);
-			return station;
-		}
-		else {
-			return false;
-		}
-	},
-
-	getStation: id => {
-		let s = null;
-		this.stations.forEach(function (station) {
-			if (station.id == id) s = station;
-		});
-		return s;
-	},
-
-	getStations: () => {
-		return this.stations;
-	},
-
-	// creates a brand new station
-	createStation: data => {
-		//TODO: add createStation functionality
-		this.initStation(null, data);
-	},
-
-	// loads a station from the database
-	loadStation: id => {
-		//TODO: Get the data from RethinkDB
-		this.initStation(id, {
-			playlist: [
-				{
-					mid: "3498fd83",
-					duration: 20000,
-					title: "Test1"
-				},
-				{
-					mid: "3498fd83434",
-					duration: 10000,
-					title: "Test2"
-				}
-			],
-			currentSongIndex: 0,
-			paused: false,
-			locked: false,
-			skipVotes: [],
-			users: [],
-			displayName: "",
-			description: ""
-		});
-	}
-
-};
+	getDescription() {
+		return this.description;
+	}
+
+	addUser(user) {
+		this.users.add(user);
+		nsp.emit("updateUsers", this.users);
+	}
+
+	removeUser(user) {
+		this.users.splice(this.users.indexOf(user), 1);
+		nsp.emit("updateUsers", this.users);
+	}
+
+	getUsers() {
+		return this.users;
+	}
+
+}