]> git.scottworley.com Git - reliable-chat/blobdiff - webclient/rc.html
projects / reliable-chat / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rcaddmessagetohistory() accepts a message object
[reliable-chat] / webclient / rc.html
diff --git a/webclient/rc.html b/webclient/rc.html
index 9460159064b4e56ed21c131b2b2e5b42a2d33316..8f69921f4241c678fc0d565045b6abb6699b882d 100644 (file)
--- a/webclient/rc.html
+++ b/webclient/rc.html
@@ -1,7 +1,24 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml">
 <html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+ reliable-chat - multipath chat
+ Copyright (C) 2012  Scott Worley <sworley@chkno.net>
+ Copyright (C) 2012  Jason Hibbs <skitch@gmail.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <head>
  <title>Reliable Chat</title>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/
 <head>
  <title>Reliable Chat</title>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/
@@ -62,8 +79,9 @@
   <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 seen = {};
+       var session = Math.random();  // For outgoing message IDs
+       var since = {};  // server -> time: For fetch?since=
+       var seen = {};  // seen_key -> true
 
        function rcnick() {
                var nick = localStorage.getItem("nick");
 
        function rcnick() {
                var nick = localStorage.getItem("nick");
@@ -98,7 +116,7 @@
 
        function rcaddmessagetohistory(message) {
                var d = document.createElement("div");
 
        function rcaddmessagetohistory(message) {
                var d = document.createElement("div");
-               d.appendChild(document.createTextNode(message));
+               d.appendChild(document.createTextNode(message.Text));
                var h = document.getElementById("history");
                h.appendChild(d);
                window.scrollTo(0, document.body.scrollHeight);
                var h = document.getElementById("history");
                h.appendChild(d);
                window.scrollTo(0, document.body.scrollHeight);
@@ -109,50 +127,58 @@
                return id.replace(/@/g, "@@") + "_@_" + text.replace(/@/g, "@@");
        }
 
                return id.replace(/@/g, "@@") + "_@_" + text.replace(/@/g, "@@");
        }
 
-       function receiveMessage(server, time, id, text) {
-               var seen_key = make_seen_key(id, text);
-               if (!(seen_key in seen)) {
-                       seen[seen_key] = true;
-                       rcaddmessagetohistory(text);
-                       for (var i in servers) {
-                               rcchangeserverstatus(servers[i], "sad");
+       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]);
+                               for (var i in servers) {
+                                       rcchangeserverstatus(servers[i], "sad");
+                               }
                        }
                        }
+                       rcchangeserverstatus(server, "happy");
                }
                }
-               rcchangeserverstatus(server, "happy");
        }
 
        }
 
-       function receiveMessageEvent(event)  
-       {  
-               for (var i in servers) {
-                       if (event.origin === rcserverbase(servers[i])) {
-                               messages = JSON.parse(event.data);
-                               for (var j in messages) {
-                                       if ('Time' in messages[j] &&
-                                           'ID'   in messages[j] &&
-                                           'Text' in messages[j]) {
-                                               receiveMessage(servers[i], messages[j]['Time'], messages[j]['ID'], messages[j]['Text']);
+       function rcfetch(server) {
+               var delay = 10000;  // TODO: Exponential backoff
+               var xhr = new XMLHttpRequest();
+               xhr.onreadystatechange = function() {
+                       if (this.readyState == this.DONE) {
+                               if (this.status == 200) {
+                                       var rtxt = this.responseText;
+                                       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"];
+                                                       }
+                                               }
                                        }
                                }
                                        }
                                }
+                               window.setTimeout(rcfetch, delay, server);
                        }
                }
                        }
                }
+               var uri = rcserverbase(server) + "/fetch";
+               if (server in since) {
+                       uri += '?since="' + since[server] + '"';
+               }
+               xhr.open("GET", uri);
+               xhr.send();
        }
 
        function rcconnect() {
        }
 
        function rcconnect() {
-               window.addEventListener("message", receiveMessageEvent, false);  
                for (var i in servers) {
                for (var i in servers) {
-                       // Create a hidden iframe for same-origin workaround
-                       var iframe = document.createElement("iframe");
-                       iframe.setAttribute("src", rcserverbase(servers[i]) + "/frame");
-                       document.body.insertBefore(iframe, document.body.firstChild);
+                       rcfetch(servers[i]);
                        // Status bar entry
                        var status_indicator = document.createElement("span");
                        status_indicator.appendChild(document.createTextNode(servers[i]));
                        status_indicator.setAttribute("class", "sad");
                        document.getElementById("status").appendChild(status_indicator);
                }
                        // Status bar entry
                        var status_indicator = document.createElement("span");
                        status_indicator.appendChild(document.createTextNode(servers[i]));
                        status_indicator.setAttribute("class", "sad");
                        document.getElementById("status").appendChild(status_indicator);
                }
-               if (rcnick() == 'anonymous') {
-                       rcaddmessagetohistory("-!- Set your nick with /nick");
-               }
        }
 
        function rcsend(d, message) {
        }
 
        function rcsend(d, message) {
@@ -169,41 +195,28 @@
                }
        }
 
                }
        }
 
+       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 d = rcaddmessagetohistory({'Text': message});
+               rcsend(d, message);
+       }
+
        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;
-                       }
-
-                       // Remind people to set their nick
-                       if (rcnick() == 'anonymous') {
-                               rcaddmessagetohistory("-!- Set your nick with /nick");
-                       }
-
-                       // Say the message
-                       var d = rcaddmessagetohistory(message);
-                       rcsend(d, message);
                }
        }
   //--><!]]></script>
                }
        }
   //--><!]]></script>
Reliable Chat