NMS: Prep for frontend poller-rewrite

The biggest thing here is the addition of a generic poller and a generic
"hash" from the backend so equality can easily be checked.

3 files changed, 67 insertions, 14 deletions

diff --git a/include/nms/web.pm b/include/nms/web.pm
index 184cd90..d22a060 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -7,6 +7,8 @@ use DBI;
 use Data::Dumper;
 use JSON;
 use nms;
+use Digest::SHA qw(sha512_base64);
+use FreezeThaw qw(freeze);
 package nms::web;
 
 use base 'Exporter';
@@ -62,10 +64,12 @@ sub setwhen {
 
 sub finalize_output {
 	my $query;
+	my $hash = Digest::SHA::sha512_base64(FreezeThaw::freeze(%json));
 	$query = $dbh->prepare ('select ' . $now . ' as time;');
 	$query->execute();
 
 	$json{'time'} = $query->fetchrow_hashref()->{'time'};
+	$json{'hash'} = $hash;
 	printcc;
 
 	print "Content-Type: text/jso; charset=utf-8\n\n";
diff --git a/web/nms.gathering.org/api/private/comment-add b/web/nms.gathering.org/api/private/comment-add
index 7ad386e..2f8b0b7 100755
--- a/web/nms.gathering.org/api/private/comment-add
+++ b/web/nms.gathering.org/api/private/comment-add
@@ -2,12 +2,15 @@
 # vim:ts=8:sw=8
 use lib '../../../../include';
 use utf8;
-use nms::web qw($dbh db_safe_quote);
+use nms::web qw($dbh db_safe_quote get_input finalize_output);
 use strict;
 use warnings;
 
-my $data = db_safe_quote('comment');
-my $switch = db_safe_quote('switch');
+my $in = get_input();
+my %tmp = %{JSON::XS::decode_json($in)};
+
+my $data = $dbh->quote($tmp{'comment'});
+my $switch = $dbh->quote($tmp{'switch'});
 my $user = $dbh->quote($ENV{'REMOTE_USER'} || "undefined");
 
 my $q = $nms::web::dbh->prepare("INSERT INTO switch_comments (time,username,switch,comment) values (now(),$user,(select switch from switches where sysname = $switch limit 1),$data)");
diff --git a/web/nms.gathering.org/js/nms.js b/web/nms.gathering.org/js/nms.js
index 87f0788..6061a0f 100644
--- a/web/nms.gathering.org/js/nms.js
+++ b/web/nms.gathering.org/js/nms.js
@@ -1,9 +1,12 @@
 var nms = {
+	stats:{}, // Various internal stats
 	updater:undefined, // Active updater
 	update_time:0, // Client side timestamp for last update
 	switches_management:{switches:{}},
 	switches_now:{switches:{}}, // Most recent data
 	switches_then:{switches:{}}, // 2 minutes old
+	comments:{}, // Switch comments
+	poller:{hashes:{},time:{}}, // Tracks generic poller hashes/timestamps
 	speed:0, // Current aggregated speed
 	ping_data:undefined, // JSON data for ping history.
 	drawn:false, // Set to 'true' when switches are drawn
@@ -448,7 +451,7 @@ function hideSwitch()
 function showSwitch(x)
 {
 		var sw = nms.switches_now["switches"][x];
-		var swm = nms.switches_management["switches"][x];
+		var swm = nms.switches_management[x];
 		var swtop = document.getElementById("info-switch-parent");
 		var swpanel = document.getElementById("info-switch-panel-body");
 		var swtitle = document.getElementById("info-switch-title");
@@ -555,8 +558,12 @@ function showSwitch(x)
 		comments.appendChild(cap);
 	
 		var has_comment = false;
-		for (var c in sw["comments"]) {
-			var comment = sw["comments"][c];
+		if (nms.comments[x] == undefined) {
+			nms.comments[x] = {};
+			nms.comments[x]["comments"] = [];
+		}
+		for (var c in nms.comments[x]["comments"]) {
+			var comment = nms.comments[x]["comments"][c];
 			has_comment = true;
 			if (comment["state"] == "active" || comment["state"] == "persist" || comment["state"] == "inactive") {
 				tr = comments.insertRow(-1);
@@ -837,6 +844,7 @@ function addComment(sw,comment)
 		switch:sw,
 		comment:comment
 	};
+	myData = JSON.stringify(myData);
 	$.ajax({
 		type: "POST",
 		url: "/api/private/comment-add",
@@ -849,26 +857,64 @@ function addComment(sw,comment)
 }
 
 /*
- * Update nms.switches_management
+ * FIXME: Not at all done.
+ *
+ * genericUpdater() should be something one registers for, then it
+ * automatically picks up intervals based on max-age from the backend, and
+ * allows forced updates (E.g.: force polling comments after a comment is
+ * added, force polling switches after switches has been changed).
  *
- * FIXME: This isn't actually called from anywhere, only console at the
- * moment.
  */
-function updateSwitchManagement()
-{
+function doMiscUpdates() {
+	genericUpdater("comments","comments", "/api/private/comments");
+	genericUpdater("switches_management", "switches", "/api/private/switches-management");
+}
+
+function nmsStatsInc(stat) {
+	if (nms.stats[stat] == undefined)
+		nms.stats[stat] = 0;
+	nms.stats[stat]++;
+}
+/*
+ * Updates nms[name] with data fetched from remote target in variable
+ * "remotename". If a callback is provided, it is called with argument meh.
+ *
+ * This also populates nms.pollers[name] with the server-provided hash.
+ * Only if a change is detected is the callback issued.
+ */
+function genericUpdater(name, remotename, target, cb, meh) {
 	if (nms.outstandingAjaxRequests > 5) {
 		nms.ajaxOverflow++;
 		updateAjaxInfo();
 		return;
 	}
 	nms.outstandingAjaxRequests++;
+	var now = "";
+	if (nms.now != false)
+		now = "now=" + nms.now;
+	if (now != "") {
+		if (target.match("\\?"))
+			now = "&" + now;
+		else
+			now = "?" + now;
+	}
+
 	$.ajax({
 		type: "GET",
-		url: "/api/private/switches-management" ,
+		url: target + now,
 		dataType: "text",
 		success: function (data, textStatus, jqXHR) {
-			var  switchdata = JSON.parse(data);
-			nms.switches_management = switchdata;
+			var  indata = JSON.parse(data);
+			if (nms.poller.hashes[name] != indata['hash']) {
+				nms[name] = indata[remotename];
+				nms.poller.hashes[name] = indata['hash'];
+				nms.poller.time[name] = indata['time'];
+				if (cb != undefined) {
+					cb(meh);
+				}
+			} else {
+				nmsStatsInc("identicalFetches");
+			}
 		},
 		complete: function(jqXHR, textStatus) {
 			nms.outstandingAjaxRequests--;