Preserve history's in-order invariant

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index 988f1fb558be441382764d7c8e435241309bd397..27dba592d9ba4cc0638cbe385545635c29691c0a 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -82,6 +82,7 @@
        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
@@ -133,11 +134,31 @@
        }
 
        function rcaddmessagetohistory(message) {
-               message.UI = document.createElement("div");
-               var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
-               message.UI.appendChild(document.createTextNode(text));
+               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) {
+                       var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
+                       message.UI = document.createElement("div");
+                       message.UI.appendChild(document.createTextNode(text));
+               }
                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);
        }
 
@@ -159,6 +180,14 @@
                        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);
+               }
        }
 
        function rcreceivemessages(server, messages) {
@@ -170,7 +199,8 @@
                                seen[seen_key].ServerTimes[server] = m.Time;
                                rcupdatemessagetime(seen[seen_key]);
                        } else {
-                               m.ServerTimes = {server: m.Time};
+                               m.ServerTimes = {};
+                               m.ServerTimes[server] = m.Time;
                                seen[seen_key] = m;
                                rcaddmessagetohistory(m);
                                for (var i in servers) {
@@ -222,11 +252,11 @@
        }
 
        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" +
-                       "?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");
@@ -248,7 +278,7 @@
                        message = "<" + rcnick() + "> " + input;
                }
 
-               var m = {'Text': message};
+               var m = {'Text': message, 'ServerTimes': {}};
                rcaddmessagetohistory(m);
                rcsend(m.UI, m);
        }