Revert "fix: fixed issues with module initialize waiting and with tasks module"

Temporary, commit stops stations from loading.

backend/core.js

@@ -2,8 +2,6 @@ const EventEmitter = require('events');
 
 const bus = new EventEmitter();
 
-bus.setMaxListeners(1000);
-
 module.exports = class {
 	constructor(name, moduleManager) {
 		this.name = name;
@@ -71,7 +69,7 @@ module.exports = class {
 	}
 
 	_validateHook() {
-		return Promise.race([this._onInitialize(), this._isInitialized()]).then(
+		return Promise.race([this._onInitialize, this._isInitialized]).then(
 			() => this._isNotLocked()
 		);
 	}

backend/index.js

@@ -66,7 +66,7 @@ class ModuleManager {
 	}
 
 	async printStatus() {
-		try { await Promise.race([this.logger._onInitialize(), this.logger._isInitialized()]); } catch { return; }
+		try { await Promise.race([this.logger._onInitialize, this.logger._isInitialized]); } catch { return; }
 		if (!this.fancyConsole) return;
 		
 		let colors = this.logger.colors;

backend/logic/io.js

@@ -31,9 +31,9 @@ module.exports = class extends coreClass {
 			const SIDname = config.get("cookie.SIDname");
 
 			// TODO: Check every 30s/60s, for all sockets, if they are still allowed to be in the rooms they are in, and on socket at all (permission changing/banning)
-			this._io = socketio(app.server);
+			this.io = socketio(app.server);
 
-			this._io.use(async (socket, next) => {
+			this.io.use(async (socket, next) => {
 				try { await this._validateHook(); } catch { return; }
 
 				let SID;
@@ -95,7 +95,7 @@ module.exports = class extends coreClass {
 				});
 			});
 
-			this._io.on('connection', async socket => {
+			this.io.on('connection', async socket => {
 				try { await this._validateHook(); } catch { return; }
 
 				let sessionInfo = '';
@@ -186,9 +186,4 @@ module.exports = class extends coreClass {
 			resolve();
 		});
 	}
-
-	async io () {
-		try { await this._validateHook(); } catch { return; }
-		return this._io;
-	}
 }

backend/logic/tasks.js

@@ -55,15 +55,13 @@ module.exports = class extends coreClass {
 		try { await this._validateHook(); } catch { return; }
 
 		if (task.timer) task.timer.pause();
-		
-		task.fn.apply(this, [
-			() => {
-				task.lastRan = Date.now();
-				task.timer = new this.utils.Timer(() => {
-					this.handleTask(task);
-				}, task.timeout, false);
-			}
-		]);
+
+		task.fn(() => {
+			task.lastRan = Date.now();
+			task.timer = new utils.Timer(() => {
+				this.handleTask(task);
+			}, task.timeout, false);
+		});
 	}
 
 	/*testTask(callback) {
@@ -76,6 +74,8 @@ module.exports = class extends coreClass {
 	}*/
 
 	async checkStationSkipTask(callback) {
+		try { await this._validateHook(); } catch { return; }
+
 		this.logger.info("TASK_STATIONS_SKIP_CHECK", `Checking for stations to be skipped.`, false);
 		async.waterfall([
 			(next) => {
@@ -101,6 +101,8 @@ module.exports = class extends coreClass {
 	}
 
 	async sessionClearingTask(callback) {
+		try { await this._validateHook(); } catch { return; }
+	
 		this.logger.info("TASK_SESSION_CLEAR", `Checking for sessions to be cleared.`, false);
 		async.waterfall([
 			(next) => {

backend/logic/utils.js

@@ -172,8 +172,7 @@ module.exports = class extends coreClass {
 	async socketFromSession(socketId) {
 		try { await this._validateHook(); } catch { return; }
 
-		let io = await this.io.io();
-		let ns = io.of("/");
+		let ns = this.io.io.of("/");
 		if (ns) {
 			return ns.connected[socketId];
 		}
@@ -182,8 +181,7 @@ module.exports = class extends coreClass {
 	async socketsFromSessionId(sessionId, cb) {
 		try { await this._validateHook(); } catch { return; }
 
-		let io = await this.io.io();
-		let ns = io.of("/");
+		let ns = this.io.io.of("/");
 		let sockets = [];
 		if (ns) {
 			async.each(Object.keys(ns.connected), (id, next) => {
@@ -199,8 +197,7 @@ module.exports = class extends coreClass {
 	async socketsFromUser(userId, cb) {
 		try { await this._validateHook(); } catch { return; }
 
-		let io = await this.io.io();
-		let ns = io.of("/");
+		let ns = this.io.io.of("/");
 		let sockets = [];
 		if (ns) {
 			async.each(Object.keys(ns.connected), (id, next) => {
@@ -218,8 +215,7 @@ module.exports = class extends coreClass {
 	async socketsFromIP(ip, cb) {
 		try { await this._validateHook(); } catch { return; }
 
-		let io = await this.io.io();
-		let ns = io.of("/");
+		let ns = this.io.io.of("/");
 		let sockets = [];
 		if (ns) {
 			async.each(Object.keys(ns.connected), (id, next) => {
@@ -237,8 +233,7 @@ module.exports = class extends coreClass {
 	async socketsFromUserWithoutCache(userId, cb) {
 		try { await this._validateHook(); } catch { return; }
 
-		let io = await this.io.io();
-		let ns = io.of("/");
+		let ns = this.io.io.of("/");
 		let sockets = [];
 		if (ns) {
 			async.each(Object.keys(ns.connected), (id, next) => {
@@ -311,8 +306,7 @@ module.exports = class extends coreClass {
 	async emitToRoom(room, ...args) {
 		try { await this._validateHook(); } catch { return; }
 
-		let io = await this.io.io();
-		let sockets = io.sockets.sockets;
+		let sockets = this.io.io.sockets.sockets;
 		for (let id in sockets) {
 			let socket = sockets[id];
 			if (socket.rooms[room]) {
@@ -324,8 +318,7 @@ module.exports = class extends coreClass {
 	async getRoomSockets(room) {
 		try { await this._validateHook(); } catch { return; }
 
-		let io = await this.io.io();
-		let sockets = io.sockets.sockets;
+		let sockets = this.io.io.sockets.sockets;
 		let roomSockets = [];
 		for (let id in sockets) {
 			let socket = sockets[id];