Keep messages sorted by timestamp

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index 632956b21b522e6b7cc92c3b06bc15a30fcf8d5e..c3284da03b1480583a40cfb4eb93b0d332d22196 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -79,9 +79,16 @@
   <script type="text/javascript"><!--//--><![CDATA[//><!--
        var servers = ['chkno.net', 'rc2.chkno.net', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
 
   <script type="text/javascript"><!--//--><![CDATA[//><!--
        var servers = ['chkno.net', 'rc2.chkno.net', 'echto.net', 'the-wes.com', 'vibrantlogic.com'];
 

-       var session = Math.random();
-       var since = {};
-       var seen = {};
+       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");


@@ -114,25 +121,78 @@
                }
        }
 
                }
        }
 

+       function rcformattime(t) {
+               var d = t.getDay();
+               d = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"][d];
+               var h = t.getHours();
+               var m = t.getMinutes();
+               var s = t.getSeconds();
+               function pad(x) {
+                       return (x < 10 ? "0" : "") + x;
+               }
+               return d + " " + pad(h) + ":" + pad(m) + ":" + pad(s);
+       }
+

        function rcaddmessagetohistory(message) {
        function rcaddmessagetohistory(message) {

-               var d = document.createElement("div");
-               d.appendChild(document.createTextNode(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;
+               }
+
+               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");
                var h = document.getElementById("history");

-               h.appendChild(d);
+               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);

-               return d;

        }
 
        function make_seen_key(id, text) {
                return id.replace(/@/g, "@@") + "_@_" + text.replace(/@/g, "@@");
        }
 
        }
 
        function make_seen_key(id, text) {
                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();
+               var middle = times.length/2;
+               if (times.length % 2) {
+                       message.Time = times[middle];
+               } else {
+                       var difference = times[middle].getTime() - times[middle-1].getTime();
+                       message.Time = new Date(times[middle-1].getTime() + difference/2);
+               }
+       }
+

        function rcreceivemessages(server, messages) {
                for (var i in messages) {
        function rcreceivemessages(server, messages) {
                for (var i in messages) {

-                       var seen_key = make_seen_key(messages[i]['ID'], messages[i]['Text']);
-                       if (!(seen_key in seen)) {
-                               seen[seen_key] = true;
-                               rcaddmessagetohistory(messages[i]['Text']);
+                       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) {
+                               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) {
                                        rcchangeserverstatus(servers[i], "sad");
                                }
                                for (var i in servers) {
                                        rcchangeserverstatus(servers[i], "sad");
                                }


@@ -151,11 +211,11 @@
                                        if (rtxt != null) {
                                                var messages = JSON.parse(rtxt);
                                                if (messages != null) {
                                        if (rtxt != null) {
                                                var messages = JSON.parse(rtxt);
                                                if (messages != null) {

-                                                       rcreceivemessages(server, messages);

                                                        delay = 40;
                                                        if (messages.length >= 1 && "Time" in messages[messages.length-1]) {
                                                        delay = 40;
                                                        if (messages.length >= 1 && "Time" in messages[messages.length-1]) {

-                                                               since[server] = messages[messages.length-1]["Time"];
+                                                               since[server] = messages[messages.length-1].Time;

                                                        }
                                                        }

+                                                       rcreceivemessages(server, messages);

                                                }
                                        }
                                }
                                                }
                                        }
                                }


@@ -182,11 +242,11 @@
        }
 
        function rcsend(d, message) {
        }
 
        function rcsend(d, message) {

-               var id = new Date().getTime() + "-" + session + "-" + Math.random();
-               seen[make_seen_key(id, message)] = true;
+               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");


@@ -195,36 +255,29 @@
                }
        }
 
                }
        }
 

+       function rcinput(input) {
+               var message;
+               var re = /^\/([a-z]+) (.*)/
+               var match = re.exec(input);
+               if (match && match[1] == 'me') {
+                       message = "* " + rcnick() + "  " + match[2];
+               } else if (match && match[1] == 'nick') {
+                       message = "*** " + rcnick() + " is now known as " + match[2];
+                       rcsetnick(match[2]);
+               } else {
+                       message = "<" + rcnick() + "> " + input;
+               }
+
+               var m = {'Text': message, 'ServerTimes': {}};
+               rcaddmessagetohistory(m);
+               rcsend(m.UI, m);
+       }
+

        function rckeydown(event) {
                if (event.keyCode == 13) {
        function rckeydown(event) {
                if (event.keyCode == 13) {

-                       var input = document.input.say.value;
+                       rcinput(document.input.say.value);

                        document.input.say.value = "";
                        
                        document.input.say.value = "";
                        

-                       // Check nick change
-                       var message;
-                       var re = /^\/nick (.*)/;
-                       var match = re.exec(input);
-                       if (match) {
-                               message = "*** " + rcnick() + " is now known as " + match[1];
-                               rcsetnick(match[1]);
-                       } else {
-                               message = "<" + rcnick() + "> " + input;
-                       }
-
-                       // /me support
-                       var message;
-                       var re = /^\/me (.*)/;
-                       var match = re.exec(input);
-                       var inputme = input.substring(4);
-                       if (match) {
-                               message = "* " + rcnick() + "  " + inputme;
-                       } else {
-                               message = "<" + rcnick() + "> " + input;
-                       }
-
-                       // Say the message
-                       var d = rcaddmessagetohistory(message);
-                       rcsend(d, message);

                }
        }
   //--><!]]></script>
                }
        }
   //--><!]]></script>