Checkpoint 2

godoor_server/godoor_server.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"time"
 )
 
 type DoorBoyServer struct {
@@ -36,7 +37,7 @@ func getAllowed(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 	keys := cardList{
 		AllowedUids: []cardToken{
-			{card{UidHash: "0a0b0c0d0e0f"}},
+			{card{UidHash: "d72c87d0f077c7766f2985dfab30e8955c373a13a1e93d315203939f542ff86e73ee37c31f4c4b571f4719fa8e3589f12db8dcb57ea9f56764bb7d58f64cf705"}},
 			{card{UidHash: "112233445566"}},
 			{card{UidHash: "aabbccddeeff"}},
 		},
@@ -66,29 +67,42 @@ func (doorboyserver *DoorBoyServer) getLongPoll(w http.ResponseWriter, r *http.R
 	}
 	events := make(chan string)
 	doorboyserver.longPollers[r.RemoteAddr] = events
+	defer delete(doorboyserver.longPollers, r.RemoteAddr)
+
 	err = writeAndFlush(w, []byte("data: watch-stream-opened\n\n"))
 	if err != nil {
-		delete(doorboyserver.longPollers, r.RemoteAddr)
 		return
 	}
 	d := <-events // get door open event
 	_, err = w.Write([]byte("data: "))
 	if err != nil {
-		delete(doorboyserver.longPollers, r.RemoteAddr)
 		return
 	}
 	_, err = w.Write([]byte(d))
 	if err != nil {
-		delete(doorboyserver.longPollers, r.RemoteAddr)
 		return
 	}
 	err = writeAndFlush(w, []byte("\n\n"))
 	if err != nil {
-		delete(doorboyserver.longPollers, r.RemoteAddr)
 		return
 	}
-	delete(doorboyserver.longPollers, r.RemoteAddr)
+}
 
+func (doorboyserver *DoorBoyServer) getLongPollJson(w http.ResponseWriter, r *http.Request) {
+	flusher, ok := w.(http.Flusher)
+	if !ok {
+		fmt.Println("Failed to get flusher for http response")
+	}
+	w.WriteHeader(http.StatusOK)
+	flusher.Flush()
+	respJson, _ := json.Marshal([]string{"123456789", "aabbccddeeff", "aabbcc"})
+	for i := 1; i <= 10; i++ {
+		w.Write(respJson)
+		w.Write([]byte("\n"))
+		fmt.Println("send")
+		flusher.Flush() // Trigger "chunked" encoding and send a chunk...
+		time.Sleep(500 * time.Millisecond)
+	}
 }
 
 func (doobserver *DoorBoyServer) postOpenDoor(w http.ResponseWriter, r *http.Request) {
@@ -105,6 +119,7 @@ func main() {
 	http.HandleFunc("/", getRoot)
 	http.HandleFunc("/allowed", getAllowed)
 	http.HandleFunc("/longpoll", doorboyserver.getLongPoll)
+	http.HandleFunc("/jspoll", doorboyserver.getLongPollJson)
 	http.HandleFunc("/open", doorboyserver.postOpenDoor)
 
 	err := http.ListenAndServe(":3333", nil)