Merge skitch's changes.

[reliable-chat] / server / server.go
diff --git a/server/server.go b/server/server.go

index a328785aa5375ebfd8693b7cc6e44038a8ccfa45..9ca5e619c1a9d18cd53981af2157458e7caa5cac 100644 (file)
--- a/server/server.go
+++ b/server/server.go
@@ -11,6 +11,7 @@ import "time"
  
  var port = flag.Int("port", 21059, "Port to listen on")
  
+var frame_count = expvar.NewInt("frame_count")
  var speak_count = expvar.NewInt("speak_count")
  var fetch_count = expvar.NewInt("fetch_count")
  var fetch_wait_count = expvar.NewInt("fetch_wait_count")
@@ -18,6 +19,7 @@ var fetch_wake_count = expvar.NewInt("fetch_wake_count")
  
  type Message struct {
         Time time.Time
+       ID   string
         Text string
  }
  
@@ -94,6 +96,48 @@ func start_store() Store {
         return store
  }
  
+const frame_html = `<!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">
+<head>
+ <script type="text/javascript"><!--//--><![CDATA[//><!--
+  var since;
+  function go() {
+   var delay = 10000;
+   var xhr = new XMLHttpRequest();
+   xhr.onreadystatechange = function() {
+    if (this.readyState == this.DONE) {
+     if (this.status == 200) {
+      var rtxt = this.responseText;
+      if (rtxt != null) {
+       var r = JSON.parse(rtxt);
+       if (r != null) {
+        window.parent.postMessage(rtxt, "*");
+        delay = 40;
+        if (r.length >= 1 && "Time" in r[r.length-1]) {
+         since = r[r.length-1]["Time"];
+        }
+       }
+      }
+     }
+     window.setTimeout(go, delay);
+    }
+   }
+   var uri = "/fetch";
+   if (since) {
+    uri += '?since="' + since + '"';
+   }
+   xhr.open("GET", uri);
+   xhr.send();
+  }
+  //--><!]]></script>
+</head>
+<body onload="go()">
+</body>
+</html>
+`
+
  func start_server(store Store) {
         http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) {
                 var since time.Time
@@ -117,17 +161,27 @@ func start_server(store Store) {
                         return
                 }
                 w.Header().Add("Content-Type", "application/json")
+               w.Header().Add("Access-Control-Allow-Origin", "*")
                 w.Write(json_encoded)
         })
  
         http.HandleFunc("/speak", func(w http.ResponseWriter, r *http.Request) {
-               store.Add <- &Message{time.Now(), r.FormValue("text")}
+               store.Add <- &Message{
+                       time.Now(),
+                       r.FormValue("id"),
+                       r.FormValue("text")}
+       })
+
+       http.HandleFunc("/frame", func(w http.ResponseWriter, r *http.Request) {
+               frame_count.Add(1)
+               w.Write([]byte(frame_html));
         })
  
-       log.Fatal(http.ListenAndServe(":" + strconv.Itoa(*port), nil))
+       log.Fatal(http.ListenAndServe(":"+strconv.Itoa(*port), nil))
  }
  
  func main() {
+       flag.Parse()
         store := start_store()
         start_server(store)
  }