From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 11 Nov 2010 19:59:01 +0000 (+0300)
Subject: implement sequence numbers for counter rpc requests
X-Git-Tag: 1.5.0~270
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6237ea0537bb06c5ae1a715132f145601cbd71c8;p=tt-rss.git

implement sequence numbers for counter rpc requests
---

diff --git a/feedlist.js b/feedlist.js
index 9032ba02..33fdb891 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -607,7 +607,7 @@ function request_counters_real() {
 
 		console.log("requesting counters...");
 
-		var query = "?op=rpc&subop=getAllCounters";
+		var query = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
 
 		if (tagsAreDisplayed()) {
 			query = query + "&omode=tl";
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 6792fae7..e5c92232 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -2,6 +2,7 @@
 	function handle_rpc_request($link) {
 
 		$subop = $_REQUEST["subop"];
+		$seq = (int) $_REQUEST["seq"];
 
 		if ($subop == "setprofile") {
 			$id = db_escape_string($_REQUEST["id"]);
@@ -285,6 +286,9 @@
 
 			print "<rpc-reply>";
 
+			if ($seq)
+				print "<seq>$seq</seq>";
+
 			if ($last_article_id != getLastArticleId($link)) {
 				print "<counters><![CDATA[";
 				$omode = $_REQUEST["omode"];
diff --git a/tt-rss.js b/tt-rss.js
index e755faf7..4226fd8d 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -15,6 +15,17 @@ var feedlist_sortable_enabled = false;
 var _force_scheduled_update = false;
 var last_scheduled_update = false;
 
+var _rpc_seq = 0;
+
+function next_seq() {
+	_rpc_seq += 1;
+	return _rpc_seq;
+}
+
+function get_seq() {
+	return _rpc_seq;
+}
+
 function activeFeedIsCat() {
 	return _active_feed_is_cat;
 }
@@ -167,7 +178,7 @@ function timeout() {
 
 			window.clearTimeout(counter_timeout_id);
 		
-			var query_str = "?op=rpc&subop=getAllCounters";
+			var query_str = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
 		
 			var omode;
 		
@@ -1263,6 +1274,17 @@ function handle_rpc_reply(transport, scheduled_call) {
 
 			if (!transport_error_check(transport)) return false;
 
+			var seq = transport.responseXML.getElementsByTagName("seq")[0];
+
+			if (seq) {
+				seq = seq.firstChild.nodeValue;
+
+				if (get_seq() != seq) {
+					//console.log("[handle_rpc_reply] sequence mismatch: " + seq);
+					return true;
+				}
+			}
+
 			var message = transport.responseXML.getElementsByTagName("message")[0];
 
 			if (message) {