From a5f7be7eed088b8d9d53b4511b9bd43a3d6722e8 Mon Sep 17 00:00:00 2001
From: Arthur Lu <root@tronnet.net>
Date: Mon, 17 Jul 2023 19:41:20 +0000
Subject: [PATCH] fix bug with socket close handling of poolUserMap, improve
 socket init, improve interrupt sync timing progression issues

---
 src/clientsync.js | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/clientsync.js b/src/clientsync.js
index 486c1cd..dd5fe35 100644
--- a/src/clientsync.js
+++ b/src/clientsync.js
@@ -17,8 +17,8 @@ let timer = null;
 let prevState = {};
 
 export function setupClientSync (app, server, options) {
-	let schemes = options.schemes;
-	let resourceTypes = options.resourcetypes;
+	const schemes = options.schemes;
+	const resourceTypes = options.resourcetypes;
 	/**
 	 * GET - get list of supported synchronization schemes
 	 * responses:
@@ -56,7 +56,7 @@ export function setupClientSync (app, server, options) {
 	// setup interupt scheme
 	if (schemes.interrupt.enabled) {
 		const wsServer = new WebSocketServer({ noServer: true, path: "/api/sync/interrupt" });
-		wsServer.on("connection", (socket, username) => {
+		wsServer.on("connection", (socket, username, pool) => {
 			// add new socket to userSocketmap
 			if (userSocketMap[username]) {
 				const index = Object.keys(userSocketMap[username]).length;
@@ -68,7 +68,6 @@ export function setupClientSync (app, server, options) {
 				socket.userIndex = 0;
 			}
 			// add user to associated pool in poolUserMap
-			const pool = db.getUserConfig(username).cluster.pool;
 			if (poolUserMap[pool]) {
 				poolUserMap[pool][username] = true;
 			}
@@ -84,16 +83,18 @@ export function setupClientSync (app, server, options) {
 			socket.on("error", console.error);
 			// handle socket close
 			socket.on("close", () => {
-				// remove closed socket from userSocketMap
+				// remove closed socket from userSocketMap user entry
 				delete userSocketMap[username][socket.userIndex];
+				// if there are no more sockets for this user, delete the userSocketMap user entry and the poolUserMap user entry
 				if (Object.keys(userSocketMap[username]).length === 0) {
+					// delete the user entry
 					delete userSocketMap[username];
-				}
-				// remove user from poolUserMap
-				const pool = db.getUserConfig(username).cluster.pool;
-				delete poolUserMap[pool][username];
-				if (Object.keys(poolUserMap[pool]).length === 0) {
-					delete poolUserMap[pool];
+					// remove user from poolUserMap pool entry
+					delete poolUserMap[pool][username];
+					// if the poolUserMap pool entry is empty, delete the entry
+					if (Object.keys(poolUserMap[pool]).length === 0) {
+						delete poolUserMap[pool];
+					}
 				}
 				// remove socket entry from requestedRates
 				delete requestedRates[socket.rateIndex];
@@ -148,11 +149,23 @@ export function setupClientSync (app, server, options) {
 			}
 			else {
 				wsServer.handleUpgrade(req, socket, head, (socket) => {
-					wsServer.emit("connection", socket, cookies.username);
+					const pool = db.getUserConfig(cookies.username).cluster.pool;
+					wsServer.emit("connection", socket, cookies.username, pool);
 				});
 			}
 		});
 		const handleInterruptSync = async () => {
+			// queue timeout for next iteration with delay of minimum rate
+			const minRequestedRate = Math.min.apply(null, Object.values(requestedRates));
+			// if the minimum rate is not Infinity, schedule the next timer
+			if (minRequestedRate < Infinity) {
+				timer = setTimeout(handleInterruptSync, minRequestedRate);
+			}
+			// if the minimum rate is Infinity, then don't schedule anything and set timer to null
+			else {
+				timer = null;
+				return;
+			}
 			// get current cluster resources
 			const status = (await requestPVE("/cluster/resources", "GET", null, null, pveAPIToken)).data.data;
 			// filter out just state information of resources that are needed, and hash each one
@@ -208,8 +221,6 @@ export function setupClientSync (app, server, options) {
 			}
 			// set prevState for next iteration
 			prevState = currState;
-			// queue timeout for next iteration with delay of minimum rate
-			timer = setTimeout(handleInterruptSync, Math.min.apply(null, Object.values(requestedRates)));
 		};
 		console.log("clientsync: enabled interrupt sync");
 	}