Take UI creation out of rcaddmessagetohistory

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index bb998256ae8c809e379ae57abba904df9de70db6..840851c12f39ecd4be0bcc6944728ec14531e877 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -56,6 +56,13 @@
                padding: 0px 5px 55px 5px;
                vertical-align: bottom
        }
                padding: 0px 5px 55px 5px;
                vertical-align: bottom
        }

+       .servercount {
+               margin-right: 0.5em;
+               font-size: 70%;
+       }
+       .timestamp {
+               margin-right: 0.8em;
+       }

        img { width: 1px; height: 1px; }
        iframe { display: none }
        #status span { margin-right: 10px; }
        img { width: 1px; height: 1px; }
        iframe { display: none }
        #status span { margin-right: 10px; }


@@ -82,6 +89,13 @@
        var session = Math.random();  // For outgoing message IDs
        var since = {};    // server -> time: For fetch?since=
        var seen = {};     // seen_key -> message
        var session = Math.random();  // For outgoing message IDs
        var since = {};    // server -> time: For fetch?since=
        var seen = {};     // seen_key -> message

+       var history = [];  // List of messages sorted by Time
+       // Messages have these fields:
+       //   Time: The timestamp.  Median of ServerTimes
+       //   ID: Some unique string for deduping
+       //   Text: The text of the message
+       //   ServerTimes: server -> timestamp
+       //   UI: The DOM node for this message in the UI

 
        function rcnick() {
                var nick = localStorage.getItem("nick");
 
        function rcnick() {
                var nick = localStorage.getItem("nick");


@@ -126,12 +140,49 @@
                return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
        }
 
                return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
        }
 

-       function rcaddmessagetohistory(message) {
+       function rcmakemessageUI(message) {

                message.UI = document.createElement("div");
                message.UI = document.createElement("div");

-               var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
-               message.UI.appendChild(document.createTextNode(text));
+
+               // Server count
+               var servercount = document.createElement("span");
+               servercount.setAttribute("class", "servercount");
+               servercount.appendChild(document.createTextNode(Object.keys(message.ServerTimes).length));
+               message.UI.appendChild(servercount);
+
+               // Timestamp
+               var timestamp_text = message.Time ? rcformattime(message.Time) : "";
+               var timestamp = document.createElement("span");
+               timestamp.setAttribute("class", "timestamp");
+               timestamp.appendChild(document.createTextNode(timestamp_text));
+               message.UI.appendChild(timestamp);
+
+               message.UI.appendChild(document.createTextNode(message.Text));
+       }
+
+       function rcaddmessagetohistory(message) {
+               var message_i;
+               if (message.Time) {
+                       for (var i = history.length - 1; ; i--) {
+                               if (i < 0 || (history[i].Time && message.Time >= history[i].Time)) {
+                                       message_i = i+1;
+                                       history.splice(message_i, 0, message);
+                                       break;
+                               }
+                       }
+               } else {
+                       history.push(message);
+                       message_i = history.length-1;
+               }
+
+               if (!message.UI) {
+                       rcmakemessageUI(message);
+               }

                var h = document.getElementById("history");
                var h = document.getElementById("history");

-               h.appendChild(message.UI);
+               if (message_i + 1 < history.length) {
+                       h.insertBefore(message.UI, history[message_i + 1].UI);
+               } else {
+                       h.appendChild(message.UI);
+               }

                window.scrollTo(0, document.body.scrollHeight);
        }
 
                window.scrollTo(0, document.body.scrollHeight);
        }
 


@@ -139,12 +190,54 @@
                return id.replace(/@/g, "@@") + "_@_" + text.replace(/@/g, "@@");
        }
 
                return id.replace(/@/g, "@@") + "_@_" + text.replace(/@/g, "@@");
        }
 

+       function rcupdatemessagetime(message) {
+               // Set message.Time to be the median of message.ServerTimes
+               var times = [];
+               for (var i in message.ServerTimes) {
+                       times.push(message.ServerTimes[i]);
+               }
+               times.sort();
+               if (times.length % 2) {
+                       message.Time = times[(times.length-1)/2];
+               } else {
+                       var middle = times.length/2;
+                       var difference = times[middle].getTime() - times[middle-1].getTime();
+                       message.Time = new Date(times[middle-1].getTime() + difference/2);
+               }
+
+               // This may have broken history's in-sorted-order invariant
+               var hi = history.indexOf(message);
+               if ((history[hi-1] && history[hi-1].Time > message.Time) ||
+                   (history[hi+1] && history[hi+1].Time < message.Time)) {
+                       history.splice(hi,1);
+                       rcaddmessagetohistory(message);
+               }
+
+               // Update the UI
+               var spans = message.UI.getElementsByTagName("span");
+               for (var i in spans) {
+                       if (spans[i].getAttribute) {
+                               var type = spans[i].getAttribute("class");
+                               if (type == "servercount") {
+                                       spans[i].firstChild.data = Object.keys(message.ServerTimes).length;
+                               } else if (type == "timestamp") {
+                                       spans[i].firstChild.data = rcformattime(message.Time);
+                               }
+                       }
+               }
+       }
+

        function rcreceivemessages(server, messages) {
                for (var i in messages) {
                        var m = messages[i];
                        m.Time = new Date(m.Time);
                        var seen_key = make_seen_key(m.ID, m.Text);
        function rcreceivemessages(server, messages) {
                for (var i in messages) {
                        var m = messages[i];
                        m.Time = new Date(m.Time);
                        var seen_key = make_seen_key(m.ID, m.Text);

-                       if (!(seen_key in seen)) {
+                       if (seen_key in seen) {
+                               seen[seen_key].ServerTimes[server] = m.Time;
+                               rcupdatemessagetime(seen[seen_key]);
+                       } else {
+                               m.ServerTimes = {};
+                               m.ServerTimes[server] = m.Time;

                                seen[seen_key] = m;
                                rcaddmessagetohistory(m);
                                for (var i in servers) {
                                seen[seen_key] = m;
                                rcaddmessagetohistory(m);
                                for (var i in servers) {


@@ -196,11 +289,11 @@
        }
 
        function rcsend(d, message) {
        }
 
        function rcsend(d, message) {

-               var id = new Date().getTime() + "-" + session + "-" + Math.random();
-               seen[make_seen_key(id, message)] = message;
+               message.ID = new Date().getTime() + "-" + session + "-" + Math.random();
+               seen[make_seen_key(message.ID, message.Text)] = message;

                var path = "/speak" +
                var path = "/speak" +

-                       "?id=" + encodeURIComponent(id) +
-                       "&text=" + encodeURIComponent(message);
+                       "?id=" + encodeURIComponent(message.ID) +
+                       "&text=" + encodeURIComponent(message.Text);

                for (var i in servers) {
                        var uri = rcserverbase(servers[i]) + path;
                        var img = document.createElement("img");
                for (var i in servers) {
                        var uri = rcserverbase(servers[i]) + path;
                        var img = document.createElement("img");


@@ -222,7 +315,7 @@
                        message = "<" + rcnick() + "> " + input;
                }
 
                        message = "<" + rcnick() + "> " + input;
                }
 

-               var m = {'Text': message};
+               var m = {'Text': message, 'ServerTimes': {}};

                rcaddmessagetohistory(m);
                rcsend(m.UI, m);
        }
                rcaddmessagetohistory(m);
                rcsend(m.UI, m);
        }