* switch to xhr.post() almost everywhere

 * call App.handlerpcjson() automatically on json request (if possible)
 * show net/log indicators in prefs

1 files changed, 68 insertions, 66 deletions

diff --git a/js/App.js b/js/App.js
index 1b0fa7c65..544057101 100644
--- a/js/App.js
+++ b/js/App.js
@@ -2,7 +2,7 @@
 
 /* eslint-disable new-cap */
 /* global __, Article, Headlines, Filters, fox */
-/* global xhrPost, xhr, dojo, dijit, PluginHost, Notify, Feeds, Cookie */
+/* global xhr, dojo, dijit, PluginHost, Notify, Feeds, Cookie */
 /* global CommonDialogs, Plugins */
 
 const App = {
@@ -371,72 +371,57 @@ const App = {
          dialog.show();
       });
    },
-	handleRpcJson: function(transport) {
+	handleRpcJson: function(reply) {
 
-		const netalert = App.findAll("#toolbar .net-alert")[0];
+		const netalert = App.find(".net-alert");
 
-		try {
-			const reply = JSON.parse(transport.responseText);
-
-			if (reply) {
-				const error = reply['error'];
-
-				if (error) {
-					const code = error['code'];
-					const msg = error['message'];
-
-					console.warn("[handleRpcJson] received fatal error ", code, msg);
-
-					if (code != 0) {
-						/* global ERRORS */
-						this.Error.fatal(ERRORS[code], {info: msg, code: code});
-						return false;
-					}
-				}
+      if (reply) {
+         const error = reply['error'];
+         const seq = reply['seq'];
+         const message = reply['message'];
+         const counters = reply['counters'];
+         const runtime_info = reply['runtime-info'];
 
-				const seq = reply['seq'];
+         if (error) {
+            const code = error['code'];
 
-				if (seq && this.get_seq() != seq) {
-					console.log("[handleRpcJson] sequence mismatch: ", seq, '!=', this.get_seq());
-					return true;
-				}
-
-				const message = reply['message'];
-
-				if (message == "UPDATE_COUNTERS") {
-					console.log("need to refresh counters...");
-					Feeds.requestCounters(true);
-				}
+            if (code && code != 0) {
+               const msg = error['message'];
 
-				const counters = reply['counters'];
+               console.warn("[handleRpcJson] received fatal error ", code, msg);
 
-				if (counters)
-					Feeds.parseCounters(counters);
-
-				const runtime_info = reply['runtime-info'];
-
-				if (runtime_info)
-					this.parseRuntimeInfo(runtime_info);
+               /* global ERRORS */
+               this.Error.fatal(ERRORS[code], {info: msg, code: code});
+               return false;
+            }
+         }
 
-				if (netalert) netalert.hide();
+         if (seq && this.get_seq() != seq) {
+            console.warn("[handleRpcJson] sequence mismatch: ", seq, '!=', this.get_seq());
+            return;
+         }
 
-				return reply;
+         // not in preferences
+         if (typeof Feeds != "undefined") {
+            if (message == "UPDATE_COUNTERS") {
+               console.log("need to refresh counters...");
+               Feeds.requestCounters(true);
+            }
 
-			} else {
-				if (netalert) netalert.show();
+            if (counters)
+               Feeds.parseCounters(counters);
+         }
 
-				Notify.error("Communication problem with server.");
-			}
+         if (runtime_info)
+            this.parseRuntimeInfo(runtime_info);
 
-		} catch (e) {
-			if (netalert) netalert.show();
+         if (netalert) netalert.hide();
 
-			Notify.error("Communication problem with server.");
+      } else {
+         if (netalert) netalert.show();
 
-			console.error(e);
+         Notify.error("Communication problem with server.");
 		}
-
-		return false;
 	},
 	parseRuntimeInfo: function(data) {
 		Object.keys(data).forEach((k) => {
@@ -450,7 +435,7 @@ const App = {
          }
 
          if (k == "recent_log_events") {
-            const alert = App.findAll(".log-alert")[0];
+            const alert = App.find(".log-alert");
 
             if (alert) {
                v > 0 ? alert.show() : alert.hide();
@@ -462,10 +447,12 @@ const App = {
             return;
          }
 
-         if (k == "max_feed_id" || k == "num_feeds") {
-            if (this.getInitParam(k) != v) {
-               console.log("feed count changed, need to reload feedlist.");
-               Feeds.reload();
+         if (typeof Feeds != "undefined") {
+            if (k == "max_feed_id" || k == "num_feeds") {
+               if (this.getInitParam(k) && this.getInitParam(k) != v) {
+                  console.log("feed count changed, need to reload feedlist:", this.getInitParam(k), v);
+                  Feeds.reload();
+               }
             }
          }
 
@@ -668,6 +655,11 @@ const App = {
 
       return errorMsg == "";
    },
+   updateRuntimeInfo: function() {
+      xhr.json("backend.php", {op: "rpc", method: "getruntimeinfo"}, () => {
+         // handled by xhr.json()
+      });
+   },
    initSecondStage: function() {
 
       document.onkeydown = (event) => this.hotkeyHandler(event);
@@ -685,14 +677,18 @@ const App = {
             if (tab) {
                dijit.byId("pref-tabs").selectChild(tab);
 
-               switch (this.urlParam('method')) {
-                  case "editfeed":
-                     window.setTimeout(() => {
-                        CommonDialogs.editFeed(this.urlParam('methodparam'))
-                     }, 100);
-                     break;
-                  default:
-                     console.warn("initSecondStage, unknown method:", this.urlParam("method"));
+               const method = this.urlParam("method");
+
+               if (method) {
+                  switch (method) {
+                     case "editfeed":
+                        window.setTimeout(() => {
+                           CommonDialogs.editFeed(this.urlParam('methodparam'))
+                        }, 100);
+                        break;
+                     default:
+                        console.warn("initSecondStage, unknown method:", method);
+                  }
                }
             }
          } else {
@@ -708,8 +704,14 @@ const App = {
 
          dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) {
             localStorage.setItem("ttrss:prefs-tab", elem.id);
+            App.updateRuntimeInfo();
          });
 
+         if (!this.getInitParam("bw_limit"))
+            window.setInterval(() => {
+               App.updateRuntimeInfo();
+            }, 60 * 1000)
+
       } else {
 
          Feeds.reload();