Backport cloud listener fix

Author: MatteoGheza

UI/src/app/_services/socket.service.ts

@@ -258,6 +258,10 @@ export class SocketService {
           this.closeModals.next();
           this.socket.emit('cloud_clients');
           break;
+        case 'cloud-client-not-removed':
+          alert(response.error);
+          this.closeModals.next();
+          break;
         case 'error':
           alert('Unexpected Error Occurred: ' + response.error);
           break;

index.js

@@ -6846,22 +6846,27 @@ function TallyArbiter_Delete_Cloud_Key(obj) {
 function TallyArbiter_Remove_Cloud_Client(obj) {
 	let ipAddress = null;
 	let key = null;
+	let clientRemoved = false;
 	for (let i = 0; i < cloud_clients.length; i++) {
 		if (cloud_clients[i].id === obj.id) {
 			//disconnect the cloud client
 			ipAddress = cloud_clients[i].ipAddress;
 			key = cloud_clients[i].key;
-			if (io.sockets.connected[cloud_clients[i].socketId]) {
+			if (io.sockets.connected && io.sockets.connected.includes(cloud_clients[i].socketId)) {
 				io.sockets.connected[cloud_clients[i].socketId].disconnect(true);
+				clientRemoved = true;
 			}
 			cloud_clients.splice(i, 1);
 			break;
 		}
 	}
 
-	logger(`Cloud Client Removed: ${obj.id}  ${ipAddress}  ${key}`, 'info');
-
-	return {result: 'cloud-client-removed-successfully'};
+	if(clientRemoved){
+		logger(`Cloud Client Removed: ${obj.id}  ${ipAddress}  ${key}`, 'info');
+		return {result: 'cloud-client-removed-successfully'};
+	} else {
+		return {result: 'cloud-client-not-removed', error: 'Cloud client not found.' };
+	}	
 }
 
 function GetSourceBySourceId(sourceId) {
@@ -7094,7 +7099,7 @@ function FlashListenerClient(listenerClientId) {
 	if (listenerClientObj) {
 		if (listenerClientObj.cloudConnection) {
 			let cloudClientSocketId = GetCloudClientById(listenerClientObj.cloudClientId).socketId;
-			if (io.sockets.connected[cloudClientSocketId]) {
+			if (io.sockets.connected && io.sockets.connected.includes(cloudClientSocketId)) {
 				io.sockets.connected[cloudClientSocketId].emit('flash', listenerClientId);
 			}
 		}
@@ -7128,7 +7133,7 @@ function MessageListenerClient(listenerClientId, type, socketid, message) {
 	if (listenerClientObj) {
 		if (listenerClientObj.cloudConnection) {
 			let cloudClientSocketId = GetCloudClientById(listenerClientObj.cloudClientId).socketId;
-			if (io.sockets.connected[cloudClientSocketId]) {
+			if (io.sockets.connected && io.sockets.connected.includes(cloudClientSocketId)) {
 				io.sockets.connected[cloudClientSocketId].emit('messaging_client', listenerClientId, type, socketid, message);
 			}
 		}
@@ -7173,7 +7178,7 @@ function AddCloudClient(socketId, key, ipAddress, datetimeConnected) {
 function DeleteCloudClients(key) {
 	for (let i = cloud_clients.length - 1; i >= 0; i--) {
 		if (cloud_clients[i].key === key) {
-			if (io.sockets.connected[cloud_clients[i].socketId]) {
+			if (io.sockets.connected && io.sockets.connected.includes(cloud_clients[i].socketId)) {
 				io.sockets.connected[cloud_clients[i].socketId].disconnect(true);
 				cloud_clients.splice(i, 1);
 			}