Documentation: What's in a message

[reliable-chat] / webclient / rc.html

diff --git a/webclient/rc.html b/webclient/rc.html
index 2bb1610ac7930e2c03f0a46fcc5345dc15814589..8094f41669c8e1402c79fcd4aa21356d01ab7461 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -79,9 +79,14 @@
   <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
+       // 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
+       //   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,13 +119,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) {
        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");
                var h = document.getElementById("history");

-               h.appendChild(d);
+               h.appendChild(message.UI);

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

-               return d;

        }
 
        function make_seen_key(id, text) {
        }
 
        function make_seen_key(id, text) {


@@ -129,10 +146,12 @@
 
        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']);
+                       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] = true;
-                               rcaddmessagetohistory(messages[i]['Text']);
+                               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 +170,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);

                                                }
                                        }
                                }
                                                }
                                        }
                                }


@@ -183,7 +202,7 @@
 
        function rcsend(d, message) {
                var id = new Date().getTime() + "-" + session + "-" + Math.random();
 
        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);
                var path = "/speak" +
                        "?id=" + encodeURIComponent(id) +
                        "&text=" + encodeURIComponent(message);


@@ -208,8 +227,9 @@
                        message = "<" + rcnick() + "> " + input;
                }
 
                        message = "<" + rcnick() + "> " + input;
                }
 

-               var d = rcaddmessagetohistory(message);
-               rcsend(d, message);
+               var m = {'Text': message};
+               rcaddmessagetohistory(m);
+               rcsend(m.UI, m);

        }
 
        function rckeydown(event) {
        }
 
        function rckeydown(event) {