Keep server timestamps for all copies

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index 5d09dba0a661a1843c15cc39fbf3c51ea1303909..7517d14d38cfac45e2f5e4b7f66177d5dc8c20e8 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -79,9 +79,15 @@
   <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
+       // Messages have these fields:
+       //   Time: The server timestamp of the first copy to arrive 
+       //   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");
@@ -114,13 +120,25 @@
                }
        }
 
+       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) {
-               var d = document.createElement("div");
-               d.appendChild(document.createTextNode(message));
+               message.UI = document.createElement("div");
+               var text = (message.Time ? rcformattime(message.Time) : "") + " " + message.Text;
+               message.UI.appendChild(document.createTextNode(text));
                var h = document.getElementById("history");
-               h.appendChild(d);
+               h.appendChild(message.UI);
                window.scrollTo(0, document.body.scrollHeight);
-               return d;
        }
 
        function make_seen_key(id, text) {
@@ -129,10 +147,15 @@
 
        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;
+                       } else {
+                               m.ServerTimes = {server: m.Time};
+                               seen[seen_key] = m;
+                               rcaddmessagetohistory(m);
                                for (var i in servers) {
                                        rcchangeserverstatus(servers[i], "sad");
                                }
@@ -151,11 +174,11 @@
                                        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]) {
-                                                               since[server] = messages[messages.length-1]["Time"];
+                                                               since[server] = messages[messages.length-1].Time;
                                                        }
+                                                       rcreceivemessages(server, messages);
                                                }
                                        }
                                }
@@ -179,14 +202,11 @@
                        status_indicator.setAttribute("class", "sad");
                        document.getElementById("status").appendChild(status_indicator);
                }
-               if (rcnick() == 'anonymous') {
-                       rcaddmessagetohistory("-!- Set your nick with /nick");
-               }
        }
 
        function rcsend(d, message) {
                var id = new Date().getTime() + "-" + session + "-" + Math.random();
-               seen[make_seen_key(id, message)] = true;
+               seen[make_seen_key(id, message)] = message;
                var path = "/speak" +
                        "?id=" + encodeURIComponent(id) +
                        "&text=" + encodeURIComponent(message);
@@ -198,41 +218,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};
+               rcaddmessagetohistory(m);
+               rcsend(m.UI, m);
+       }
+
        function rckeydown(event) {
                if (event.keyCode == 13) {
-                       var input = document.input.say.value;
+                       rcinput(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);
-
-                       // Remind people to set their nick
-                       if (rcnick() == 'anonymous') {
-                               rcaddmessagetohistory("-!- Set your nick with /nick");
-                       }
                }
        }
   //--><!]]></script>