X-Git-Url: http://git.scottworley.com/reliable-chat/blobdiff_plain/03513e5ce2d22d140752efeb3aefa72266bd9d87..591b51678a352ec65de07c3f4dc79f63156ca605:/server/server.go?ds=sidebyside diff --git a/server/server.go b/server/server.go index a328785..1bb7c9a 100644 --- a/server/server.go +++ b/server/server.go @@ -1,3 +1,20 @@ +/* reliable-chat - multipath chat + * Copyright (C) 2012 Scott Worley + * + * 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 . + */ + package main import "container/list" @@ -11,6 +28,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 +36,7 @@ var fetch_wake_count = expvar.NewInt("fetch_wake_count") type Message struct { Time time.Time + ID string Text string } @@ -94,6 +113,49 @@ func start_store() Store { return store } +const frame_html = ` + + + + + + + + +` + func start_server(store Store) { http.HandleFunc("/fetch", func(w http.ResponseWriter, r *http.Request) { var since time.Time @@ -117,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(":" + strconv.Itoa(*port), nil)) + log.Fatal(http.ListenAndServe(":"+strconv.Itoa(*port), nil)) } func main() { + flag.Parse() store := start_store() start_server(store) }