From aa1ede46d229b2c5ab365d29c519e1b2561238c8 Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Sun, 8 Dec 2019 20:41:54 +0000
Subject: [PATCH] Redesign the XHR architecture by splitting the requests. 
 Separate requests are issued for the status table, then a request is
 triggered when a user clicks on a search.

---
 .../java/com/muwire/webui/SearchResults.java  |  17 ++
 .../java/com/muwire/webui/SearchServlet.java  | 164 ++++++++++-------
 webui/src/main/js/search.js                   | 171 +++++++++---------
 3 files changed, 194 insertions(+), 158 deletions(-)

diff --git a/webui/src/main/java/com/muwire/webui/SearchResults.java b/webui/src/main/java/com/muwire/webui/SearchResults.java
index 68aa568d..0171a70a 100644
--- a/webui/src/main/java/com/muwire/webui/SearchResults.java
+++ b/webui/src/main/java/com/muwire/webui/SearchResults.java
@@ -25,13 +25,19 @@ public class SearchResults {
     private final Map<Persona, Set<UIResultEvent>> bySender = new ConcurrentHashMap<>();
     private final Map<InfoHash, Set<UIResultEvent>> byInfohash = new ConcurrentHashMap<>();
     private final Map<InfoHash, Set<Destination>> possibleSources = new ConcurrentHashMap<>();
+    private volatile long revision;
     
     public SearchResults(UUID uuid, String search) {
         this.uuid = uuid;
         this.search = search;
     }
     
+    long getRevision() {
+        return revision;
+    }
+    
     void addResults(UIResultBatchEvent e) {
+        revision++;
         Persona sender = e.getResults()[0].getSender();
         Set<UIResultEvent> existing = bySender.get(sender);
         if (existing == null) {
@@ -80,5 +86,16 @@ public class SearchResults {
     public Set<Destination> getPossibleSources(InfoHash infoHash) {
         return possibleSources.getOrDefault(infoHash, Collections.emptySet());
     }
+    
+    int getSenderCount() {
+        return bySender.size();
+    }
+    
+    int totalResults() {
+        int total = 0;
+        for(Set<UIResultEvent> results : bySender.values())
+            total += results.size();
+        return total;
+    }
 
 }
diff --git a/webui/src/main/java/com/muwire/webui/SearchServlet.java b/webui/src/main/java/com/muwire/webui/SearchServlet.java
index f0f79467..a46e8c7b 100644
--- a/webui/src/main/java/com/muwire/webui/SearchServlet.java
+++ b/webui/src/main/java/com/muwire/webui/SearchServlet.java
@@ -3,6 +3,7 @@ package com.muwire.webui;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -46,90 +47,117 @@ public class SearchServlet extends HttpServlet {
         }
         StringBuilder sb = new StringBuilder();
         sb.append("<?xml version='1.0' encoding='UTF-8'?>");
-        if (section.equals("groupBySender")) {
+        if (section.equals("status")) {
             if (searchManager == null || downloadManager == null) {
                 resp.sendError(403, "Not initialized");
                 return;
             }
+            
             sb.append("<Searches>");
             for (SearchResults results : searchManager.getResults().values()) {
                 sb.append("<Search>");
-                sb.append("<uuid>").append(results.getUUID()).append("</uuid>");
+                sb.append("<Revision>").append(results.getRevision()).append("</Revision>");
                 sb.append("<Query>").append(Util.escapeHTMLinXML(results.getSearch())).append("</Query>");
-                Map<Persona, Set<UIResultEvent>> bySender = results.getBySender();
-                sb.append("<ResultsBySender>");
-                bySender.forEach((sender, resultsFromSender) -> {
-                    sb.append("<ResultsFromSender>");
-                    sb.append("<Sender>");
-                    sb.append(Util.escapeHTMLinXML(sender.getHumanReadableName()));
-                    sb.append("</Sender>");
-                    sb.append("<SenderB64>").append(sender.toBase64()).append("</SenderB64>");
-                    sb.append("<Browse>").append(resultsFromSender.iterator().next().getBrowse()).append("</Browse>");
-                    sb.append("<Browsing>").append(browseManager.isBrowsing(sender)).append("</Browsing>");
-                    resultsFromSender.forEach(result -> {
-                        sb.append("<Result>");
-                        sb.append("<Name>");
-                        sb.append(Util.escapeHTMLinXML(result.getName()));
-                        sb.append("</Name>");
-                        sb.append("<Size>");
-                        sb.append(DataHelper.formatSize2Decimal(result.getSize(), false)).append("B");
-                        sb.append("</Size>");
-                        String infohash = Base64.encode(result.getInfohash().getRoot());
-                        sb.append("<InfoHash>");
-                        sb.append(infohash);
-                        sb.append("</InfoHash>");
-                        sb.append("<Downloading>").append(downloadManager.isDownloading(result.getInfohash())).append("</Downloading>");
-                        if (result.getComment() != null) {
-                            sb.append("<Comment>")
-                              .append(Util.escapeHTMLinXML(result.getComment()))
-                              .append("</Comment>");
-                        }
-                        sb.append("</Result>");
-                    });
-                    sb.append("</ResultsFromSender>");
-                });
-                sb.append("</ResultsBySender>");
+                sb.append("<uuid>").append(results.getUUID().toString()).append("</uuid>");
+                sb.append("<Senders>").append(results.getSenderCount()).append("</Senders>");
+                sb.append("<Results>").append(results.totalResults()).append("</Results>");
                 sb.append("</Search>");
             }
-            sb.append("</Searches>");  
+            sb.append("</Searches>");
+        } else if (section.equals("groupBySender")) {
+            if (searchManager == null || downloadManager == null) {
+                resp.sendError(403, "Not initialized");
+                return;
+            }
+            
+            String uuidString = req.getParameter("uuid");
+            if (uuidString == null) {
+                resp.sendError(403, "Bad param");
+                return;
+            }
+            
+            UUID uuid = UUID.fromString(uuidString);
+            
+            SearchResults results = searchManager.getResults().get(uuid);
+            if (results == null)
+                return;
+            
+            Map<Persona, Set<UIResultEvent>> bySender = results.getBySender();
+            sb.append("<ResultsBySender>");
+            bySender.forEach((sender, resultsFromSender) -> {
+                sb.append("<ResultsFromSender>");
+                sb.append("<Sender>");
+                sb.append(Util.escapeHTMLinXML(sender.getHumanReadableName()));
+                sb.append("</Sender>");
+                sb.append("<SenderB64>").append(sender.toBase64()).append("</SenderB64>");
+                sb.append("<Browse>").append(resultsFromSender.iterator().next().getBrowse()).append("</Browse>");
+                sb.append("<Browsing>").append(browseManager.isBrowsing(sender)).append("</Browsing>");
+                resultsFromSender.forEach(result -> {
+                    sb.append("<Result>");
+                    sb.append("<Name>");
+                    sb.append(Util.escapeHTMLinXML(result.getName()));
+                    sb.append("</Name>");
+                    sb.append("<Size>");
+                    sb.append(DataHelper.formatSize2Decimal(result.getSize(), false)).append("B");
+                    sb.append("</Size>");
+                    String infohash = Base64.encode(result.getInfohash().getRoot());
+                    sb.append("<InfoHash>");
+                    sb.append(infohash);
+                    sb.append("</InfoHash>");
+                    sb.append("<Downloading>").append(downloadManager.isDownloading(result.getInfohash())).append("</Downloading>");
+                    if (result.getComment() != null) {
+                        sb.append("<Comment>")
+                        .append(Util.escapeHTMLinXML(result.getComment()))
+                        .append("</Comment>");
+                    }
+                    sb.append("</Result>");
+                });
+                sb.append("</ResultsFromSender>");
+            });
+            sb.append("</ResultsBySender>");
         } else if (section.equals("groupByFile")) {
             if (searchManager == null || downloadManager == null) {
                 resp.sendError(403, "Not initialized");
                 return;
             }
-            sb.append("<Searches>");
-            for (SearchResults results : searchManager.getResults().values()) {     
-                sb.append("<Search>");
-                sb.append("<uuid>").append(results.getUUID()).append("</uuid>");
-                sb.append("<Query>").append(Util.escapeHTMLinXML(results.getSearch())).append("</Query>");
-                Map<InfoHash, Set<UIResultEvent>> byInfohash = results.getByInfoHash();
-                sb.append("<ResultsByFile>");
-                byInfohash.forEach((infoHash, resultSet) -> {
-                    sb.append("<ResultsForFile>");
-                    UIResultEvent first = resultSet.iterator().next();
-                    sb.append("<InfoHash>").append(Base64.encode(infoHash.getRoot())).append("</InfoHash>");
-                    sb.append("<Downloading>").append(downloadManager.isDownloading(infoHash)).append("</Downloading>");
-                    sb.append("<Name>").append(Util.escapeHTMLinXML(first.getName())).append("</Name>");
-                    sb.append("<Size>").append(DataHelper.formatSize2Decimal(first.getSize(), false)).append("B").append("</Size>");
-                    resultSet.forEach(result -> {
-                        sb.append("<Result>");
-                        sb.append("<Sender>").append(Util.escapeHTMLinXML(result.getSender().getHumanReadableName())).append("</Sender>");
-                        sb.append("<SenderB64>").append(result.getSender().toBase64()).append("</SenderB64>");
-                        sb.append("<Browse>").append(result.getBrowse()).append("</Browse>");
-                        sb.append("<Browsing>").append(browseManager.isBrowsing(result.getSender())).append("</Browsing>");
-                        if (result.getComment() != null) {
-                            sb.append("<Comment>")
-                              .append(Util.escapeHTMLinXML(result.getComment()))
-                              .append("</Comment>");
-                        }
-                        sb.append("</Result>");
-                    });
-                    sb.append("</ResultsForFile>");
-                });
-                sb.append("</ResultsByFile>");
-                sb.append("</Search>");
+            
+            String uuidString = req.getParameter("uuid");
+            if (uuidString == null) {
+                resp.sendError(403, "Bad param");
+                return;
             }
-            sb.append("</Searches>");
+            
+            UUID uuid = UUID.fromString(uuidString);
+            
+            SearchResults results = searchManager.getResults().get(uuid);
+            if (results == null)
+                return;
+
+            Map<InfoHash, Set<UIResultEvent>> byInfohash = results.getByInfoHash();
+            sb.append("<ResultsByFile>");
+            byInfohash.forEach((infoHash, resultSet) -> {
+                sb.append("<ResultsForFile>");
+                UIResultEvent first = resultSet.iterator().next();
+                sb.append("<InfoHash>").append(Base64.encode(infoHash.getRoot())).append("</InfoHash>");
+                sb.append("<Downloading>").append(downloadManager.isDownloading(infoHash)).append("</Downloading>");
+                sb.append("<Name>").append(Util.escapeHTMLinXML(first.getName())).append("</Name>");
+                sb.append("<Size>").append(DataHelper.formatSize2Decimal(first.getSize(), false)).append("B").append("</Size>");
+                resultSet.forEach(result -> {
+                    sb.append("<Result>");
+                    sb.append("<Sender>").append(Util.escapeHTMLinXML(result.getSender().getHumanReadableName())).append("</Sender>");
+                    sb.append("<SenderB64>").append(result.getSender().toBase64()).append("</SenderB64>");
+                    sb.append("<Browse>").append(result.getBrowse()).append("</Browse>");
+                    sb.append("<Browsing>").append(browseManager.isBrowsing(result.getSender())).append("</Browsing>");
+                    if (result.getComment() != null) {
+                        sb.append("<Comment>")
+                        .append(Util.escapeHTMLinXML(result.getComment()))
+                        .append("</Comment>");
+                    }
+                    sb.append("</Result>");
+                });
+                sb.append("</ResultsForFile>");
+            });
+            sb.append("</ResultsByFile>");
         } else if (section.equals("connectionsCount")) {
             if (connectionCounter == null) {
                 resp.sendError(403, "Not initialized");
diff --git a/webui/src/main/js/search.js b/webui/src/main/js/search.js
index 2b2831af..e0a68383 100644
--- a/webui/src/main/js/search.js
+++ b/webui/src/main/js/search.js
@@ -1,7 +1,15 @@
+class SearchStatus {
+	constructor(xmlNode) {
+		this.revision = xmlNode.getElementsByTagName("Revision")[0].childNodes[0].nodeValue
+		this.query = xmlNode.getElementsByTagName("Query")[0].childNodes[0].nodeValue
+		this.uuid = xmlNode.getElementsByTagName("uuid")[0].childNodes[0].nodeValue
+		this.senders = xmlNode.getElementsByTagName("Senders")[0].childNodes[0].nodeValue
+		this.results = xmlNode.getElementsByTagName("Results")[0].childNodes[0].nodeValue
+	}
+}
+
 class SearchBySender {
 	constructor(xmlNode) {
-		this.uuid = xmlNode.getElementsByTagName("uuid")[0].childNodes[0].nodeValue;
-		this.query = xmlNode.getElementsByTagName("Query")[0].childNodes[0].nodeValue;
 		this.resultBatches = new Map();
 		
 		var resultsBySender = xmlNode.getElementsByTagName("ResultsBySender")[0];
@@ -16,8 +24,6 @@ class SearchBySender {
 
 class SearchByFile {
 	constructor(xmlNode) {
-		this.uuid = xmlNode.getElementsByTagName("uuid")[0].childNodes[0].nodeValue;
-		this.query = xmlNode.getElementsByTagName("Query")[0].childNodes[0].nodeValue;
 		this.resultBatches = new Map();
 		
 		var resultsByFile = xmlNode.getElementsByTagName("ResultsByFile")[0];
@@ -88,7 +94,9 @@ class ResultByFile {
 	}
 }
 
-var searches = new Map();
+var statusByUUID = new Map()
+var currentSearchBySender = null
+var currentSearchByFile = null
 var expandedComments = new Map();
 
 var uuid = null;
@@ -148,7 +156,7 @@ function updateSender(senderName) {
 	
 	var resultsDiv = document.getElementById("bottomTable");
 	var table = "<table><thead><tr><th>Name</th><th>Size</th><th>Download</th></tr></thead><tbody>"
-	var x = searches.get(uuid)
+	var x = currentSearchBySender
 	x = x.resultBatches.get(sender).results;
 	for (var [resultInfoHash, result] of x) {
 		table += "<tr>";
@@ -191,7 +199,7 @@ function updateSender(senderName) {
 function updateFile(fileInfoHash) {
 	infoHash = fileInfoHash;
 	
-	var searchResults = searches.get(uuid).resultBatches.get(infoHash);
+	var searchResults = currentSearchByFile.resultBatches.get(infoHash);
 	
 	var resultsFromSpan = document.getElementById("resultsFrom");
 	resultsFromSpan.innerHTML = "Results For "+searchResults.name;
@@ -238,11 +246,11 @@ function updateUUIDBySender(resultUUID) {
 	uuid = resultUUID;
 	
 	var currentSearchSpan = document.getElementById("currentSearch");
-	currentSearchSpan.innerHTML = searches.get(uuid).query + " Results";
+	currentSearchSpan.innerHTML = currentSearchBySender.query + " Results";
 	
 	var sendersDiv = document.getElementById("topTable");
 	var table = "<table><thead><tr><th>Sender</th><th>Browse</th></tr></thead><tbody>";
-	var x = searches.get(uuid).resultBatches;
+	var x = currentSearchBySender.resultBatches;
 	for (var [senderName, senderBatch] of x) {
 		table += "<tr><td><a href='#' onclick='updateSender(\""+senderName+"\");return false;'>"
 		table += senderName;
@@ -265,12 +273,14 @@ function updateUUIDBySender(resultUUID) {
 function updateUUIDByFile(resultUUID) {
 	uuid = resultUUID;
 	
+	var currentStatus = statusByUUID.get(uuid)
+	
 	var currentSearchSpan = document.getElementById("currentSearch");
-	currentSearchSpan.innerHTML = searches.get(uuid).query + " Results";
+	currentSearchSpan.innerHTML = currentStatus.query + " Results";
 	
 	var topTableDiv = document.getElementById("topTable");
 	var table = "<table><thead><tr><th>Name</th><th>Size</th><th>Download</th></tr></thead><tbody>";
-	var x = searches.get(uuid).resultBatches;
+	var x = currentSearchByFile.resultBatches;
 	for (var [fileInfoHash, file] of x) {
 		table += "<tr><td><a href='#' onclick='updateFile(\""+fileInfoHash+"\");return false;'>";
 		table += file.name;
@@ -292,97 +302,30 @@ function updateUUIDByFile(resultUUID) {
 		updateFile(infoHash);
 }
 
-function refreshGroupBySender() {
+function refreshGroupBySender(searchUUID) {
 	var xmlhttp = new XMLHttpRequest();
 	xmlhttp.onreadystatechange = function () {
 		if (this.readyState == 4 && this.status == 200) {
 			var xmlDoc = this.responseXML;
-			lastXML = xmlDoc;
-			searches.clear();
-			var i;
-			var x = xmlDoc.getElementsByTagName("Search");
-			for (i = 0; i < x.length; i++) {
-				var search = new SearchBySender(x[i]);
-				searches.set(search.uuid, search);
-			}
-			
-			var table = "<table><thead><tr><th>Search</th><th>Senders</th><th>Results</th></tr></thead><tbody>";
-			var activeSearchesDiv = document.getElementById("activeSearches");
-			for (var [resultsUUID, search] of searches) {
-				table += "<tr><td><a href='#' onclick='updateUUIDBySender(\"" + resultsUUID+ "\");return false;'>"
-				table += search.query;
-				table += "</a></td>";
-				table += "<td>"
-				table += search.resultBatches.size;
-				table += "</td>";
-				
-				var map = new Map();
-				for ( var [sender, results] of search.resultBatches ) {
-					for (var [fileInfoHash, resultFromSender] of results.results)
-						map.set(resultFromSender.infoHash, 1);
-				}
-				table += "<td>";
-				table += map.size;
-				table += "</td>"
-				table += "</tr>"
-			}
-			table += "</tbody></table>"
-			if (x.length > 0) 
-				activeSearchesDiv.innerHTML = table;
-			if (uuid != null)
-				updateUUIDBySender(uuid);
-			
+			currentSearchBySender = new SearchBySender(xmlDoc)
+			updateUUIDBySender(searchUUID);
 		}
 	}
-	xmlhttp.open("GET", "/MuWire/Search?section=groupBySender", true);
+	xmlhttp.open("GET", "/MuWire/Search?section=groupBySender&uuid="+searchUUID, true);
 	xmlhttp.send();
 }
 
-function refreshGroupByFile() {
+function refreshGroupByFile(searchUUID) {
 	var xmlhttp = new XMLHttpRequest();
 	xmlhttp.onreadystatechange = function () {
 		if (this.readyState == 4 && this.status == 200) {
 			var xmlDoc = this.responseXML;
-			lastXML = xmlDoc;
-			searches.clear();
-			var i;
-			var x = xmlDoc.getElementsByTagName("Search");
-			for (i = 0; i < x.length; i++) {
-				var search = new SearchByFile(x[i]);
-				searches.set(search.uuid, search);
-			}
-			
-			var table = "<table><thead><tr><th>Search</th><th>Senders</th><th>Results</th></tr></thead><tbody>";
-			var activeSearchesDiv = document.getElementById("activeSearches");
-			for (var [resultsUUID, search] of searches) {
-				table += "<tr><td><a href='#' onclick='updateUUIDByFile(\"" + resultsUUID+ "\");return false;'>"
-				table += search.query;
-				table += "</a></td>";
-				
-				var map = new Map()
-				for (var [fileInfoHash, result] of search.resultBatches) {
-					for (var [senderName, resultFromSender] of result.results)
-						map.set(senderName, 1)
-				}
-				table += "<td>"
-				table += map.size;
-				table += "</td>";
-				
-				
-				table += "<td>";
-				table += search.resultBatches.size;
-				table += "</td>"
-				table += "</tr>"
-			}
-			table += "</tbody></table>"
-			if (x.length > 0) 
-				activeSearchesDiv.innerHTML = table;
-			if (uuid != null)
-				updateUUIDByFile(uuid);
 			
+			currentSearchByFile = new SearchByFile(xmlDoc)
+			updateUUIDByFile(searchUUID)
 		}
 	}
-	xmlhttp.open("GET", "/MuWire/Search?section=groupByFile", true);
+	xmlhttp.open("GET", "/MuWire/Search?section=groupByFile&uuid="+searchUUID, true);
 	xmlhttp.send();
 }
 
@@ -403,12 +346,60 @@ function browse(host) {
 	xmlhttp.send("action=browse&host="+host)
 }
 
+function refreshStatus() {
+	var xmlhttp = new XMLHttpRequest()
+	xmlhttp.onreadystatechange = function() {
+		if (this.readyState == 4 && this.status == 200) {
+			var currentSearch = null
+			if (uuid != null)
+				currentSearch = statusByUUID.get(uuid)
+			statusByUUID.clear()
+			
+			var activeSearches = this.responseXML.getElementsByTagName("Search")
+			var i
+			for(i = 0; i < activeSearches.length; i++) {
+				var searchStatus = new SearchStatus(activeSearches[i])
+				statusByUUID.set(searchStatus.uuid, searchStatus)
+			}
+			
+			
+			var table = "<table><thead><tr><th>Query</th><th>Senders</th><th>Results</th></tr></thead><tbody>"
+			for (var [searchUUID, status] of statusByUUID) {
+				table += "<tr>"
+				table += "<td>" + "<a href='#' onclick='refreshGroupBy" + refreshType + "(\"" + searchUUID + "\");return false;'>" + status.query + "</a></td>"
+				table += "<td>" + status.senders + "</td>"
+				table += "<td>" + status.results + "</td>"
+				table += "</tr>"
+			}
+			table += "</tbody></table>"
+			
+			var activeDiv = document.getElementById("activeSearches")
+			activeDiv.innerHTML = table
+			
+			if (uuid != null) {
+				var newStatus = statusByUUID.get(uuid)
+				if (newStatus.revision > currentSearch.revision)
+					refreshFunction(uuid)
+			}
+		}
+	}
+	xmlhttp.open("GET", "/MuWire/Search?section=status", true)
+	xmlhttp.send()
+}
+
+var refreshFunction = null
+var refreshType = null
+
 function initGroupBySender() {
-	setInterval(refreshGroupBySender, 3000);
-	setTimeout(refreshGroupBySender, 1);
+	refreshFunction = refreshGroupBySender
+	refreshType = "Sender"
+	setInterval(refreshStatus, 3000);
+	setTimeout(refreshStatus, 1);
 }
 
 function initGroupByFile() {
-	setInterval(refreshGroupByFile, 3000);
-	setTimeout(refreshGroupByFile, 1);
+	refreshFunction = refreshGroupByFile
+	refreshType = "File"
+	setInterval ( refreshStatus, 3000);
+	setTimeout ( refreshStatus, 1);
 }