X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/9b33d8539f2c58d46adfc676bf2a1769af221dfd..c0aac85a6c71927e2bc61d79b8d52f771ff33c1c:/server/server.go?ds=inline

diff --git a/server/server.go b/server/server.go
index 8d4e897..1bb7c9a 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,13 +1,42 @@
+/*  reliable-chat - multipath chat
+ *  Copyright (C) 2012  Scott Worley <sworley@chkno.net>
+ *
+ *  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/>.
+ */
+
 package main
 
 import "container/list"
 import "encoding/json"
+import "expvar"
+import "flag"
 import "log"
 import "net/http"
+import "strconv"
 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")
+var fetch_wake_count = expvar.NewInt("fetch_wake_count")
+
 type Message struct {
 	Time time.Time
+	ID   string
 	Text string
 }
 
@@ -17,8 +46,8 @@ type StoreRequest struct {
 }
 
 type Store struct {
-	Add chan Message
-	Get chan StoreRequest
+	Add chan *Message
+	Get chan *StoreRequest
 }
 
 // TODO: Monotonic clock
@@ -28,38 +57,49 @@ func manage_store(store Store) {
 	message_count := 0
 	max_messages := 1000
 	waiting := list.New()
+main:
 	for {
 		select {
-		case new_message := <-store.Add:
-			messages.PushBack(new_message)
+		case new_message, ok := <-store.Add:
+			if !ok {
+				break main
+			}
+			speak_count.Add(1)
 			for waiter := waiting.Front(); waiter != nil; waiter = waiter.Next() {
-				waiter.Value.(StoreRequest).Messages <- []Message{new_message}
-				close(waiter.Value.(StoreRequest).Messages)
+				waiter.Value.(*StoreRequest).Messages <- []Message{*new_message}
+				close(waiter.Value.(*StoreRequest).Messages)
+				fetch_wake_count.Add(1)
 			}
 			waiting.Init()
+			messages.PushBack(new_message)
 			if message_count < max_messages {
 				message_count++
 			} else {
 				messages.Remove(messages.Front())
 			}
-		case request := <-store.Get:
-			if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(Message).Time) {
+		case request, ok := <-store.Get:
+			if !ok {
+				break main
+			}
+			fetch_count.Add(1)
+			if messages.Back() == nil || !request.StartTime.Before(messages.Back().Value.(*Message).Time) {
 				waiting.PushBack(request)
+				fetch_wait_count.Add(1)
 			} else {
 				start := messages.Back()
 				response_size := 1
-				if messages.Front().Value.(Message).Time.After(request.StartTime) {
+				if messages.Front().Value.(*Message).Time.After(request.StartTime) {
 					start = messages.Front()
 					response_size = message_count
 				} else {
-					for start.Prev().Value.(Message).Time.After(request.StartTime) {
+					for start.Prev().Value.(*Message).Time.After(request.StartTime) {
 						start = start.Prev()
 						response_size++
 					}
 				}
 				response_messages := make([]Message, 0, response_size)
 				for m := start; m != nil; m = m.Next() {
-					response_messages = append(response_messages, m.Value.(Message))
+					response_messages = append(response_messages, *m.Value.(*Message))
 				}
 				request.Messages <- response_messages
 			}
@@ -68,11 +108,54 @@ func manage_store(store Store) {
 }
 
 func start_store() Store {
-	store := Store{make(chan Message, 20), make(chan StoreRequest, 20)}
+	store := Store{make(chan *Message, 20), make(chan *StoreRequest, 20)}
 	go manage_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;
+  window.parent.postMessage('[{"Time":"2000-01-01T00:00:00.000000-00:00","ID":"/frame deprecation warning","Text":"*** You are using an old version of the client.  Please upgrade."}]', "*");
+  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
@@ -87,7 +170,7 @@ func start_server(store Store) {
 			}
 		}
 		messages_from_store := make(chan []Message, 1)
-		store.Get <- StoreRequest{since, messages_from_store}
+		store.Get <- &StoreRequest{since, messages_from_store}
 
 		json_encoded, err := json.Marshal(<-messages_from_store)
 		if err != nil {
@@ -96,17 +179,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(":8080", nil))
+	log.Fatal(http.ListenAndServe(":"+strconv.Itoa(*port), nil))
 }
 
 func main() {
+	flag.Parse()
 	store := start_store()
 	start_server(store)
 }