responses are bencode.Dict; Closes #29.

http/announce.go

@@ -5,8 +5,7 @@
 package http
 
 import (
-	"fmt"
+	"bytes"
-	"io"
 	"net/http"
 
 	"github.com/julienschmidt/httprouter"
@@ -94,7 +93,12 @@ func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httpro
 		}
 	}
 
-	writeAnnounceResponse(w, ann, user, torrent)
+	resp := newAnnounceResponse(ann, user, torrent)
+	bencoder := bencode.NewEncoder(w)
+	err = bencoder.Encode(resp)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
 
 	return http.StatusOK, nil
 }
@@ -187,7 +191,7 @@ func handleEvent(c tracker.Conn, a *models.Announce, p *models.Peer, u *models.U
 	return
 }
 
-func writeAnnounceResponse(w io.Writer, a *models.Announce, u *models.User, t *models.Torrent) {
+func newAnnounceResponse(a *models.Announce, u *models.User, t *models.Torrent) bencode.Dict {
 	seedCount := len(t.Seeders)
 	leechCount := len(t.Leechers)
 
@@ -198,57 +202,47 @@ func writeAnnounceResponse(w io.Writer, a *models.Announce, u *models.User, t *m
 		peerCount = minInt(a.NumWant, leechCount+seedCount-1)
 	}
 
-	bencoder := bencode.NewEncoder(w)
+	resp := bencode.NewDict()
-	fmt.Fprintf(w, "d")
+	resp["complete"] = seedCount
-	bencoder.Encode("complete")
+	resp["incomplete"] = leechCount
-	bencoder.Encode(seedCount)
+	resp["interval"] = a.Config.Announce.Duration
-	bencoder.Encode("incomplete")
+	resp["min interval"] = a.Config.MinAnnounce.Duration
-	bencoder.Encode(leechCount)
-	bencoder.Encode("interval")
-	bencoder.Encode(a.Config.Announce.Duration)
-	bencoder.Encode("min interval")
-	bencoder.Encode(a.Config.MinAnnounce.Duration)
 
 	if a.NumWant > 0 && a.Event != "stopped" && a.Event != "paused" {
+		ipv4s, ipv6s := getPeers(a, u, t, peerCount)
 		if a.Compact {
-			writePeersCompact(w, a, u, t, peerCount)
+			resp["peers"] = compactPeers("ipv4", ipv4s)
+			resp["peers6"] = compactPeers("ipv6", ipv6s)
 		} else {
-			writePeersList(w, a, u, t, peerCount)
+			resp["peers"] = peersList(ipv4s, ipv6s)
 		}
 	}
 
-	fmt.Fprintf(w, "e")
+	return resp
 }
 
-func writePeersCompact(w io.Writer, a *models.Announce, u *models.User, t *models.Torrent, peerCount int) {
+func compactPeers(ipv string, peers []models.Peer) []byte {
-	bencoder := bencode.NewEncoder(w)
+	var compactPeers bytes.Buffer
-	ipv4s, ipv6s := getPeers(a, u, t, peerCount)
 
-	if len(ipv4s) > 0 {
+	switch ipv {
-		// 6 is the number of bytes that represents 1 compact IPv4 address.
+	case "ipv4":
-		bencoder.Encode("peers")
+		for _, peer := range peers {
-		fmt.Fprintf(w, "%d:", len(ipv4s)*6)
-
-		for _, peer := range ipv4s {
 			if ip := peer.IP.To4(); ip != nil {
-				w.Write(ip)
+				compactPeers.Write(ip)
-				w.Write([]byte{byte(peer.Port >> 8), byte(peer.Port & 0xff)})
+				compactPeers.Write([]byte{byte(peer.Port >> 8), byte(peer.Port & 0xff)})
-			}
 			}
 		}
 
-	if len(ipv6s) > 0 {
+	case "ipv6":
-		// 18 is the number of bytes that represents 1 compact IPv6 address.
+		for _, peer := range peers {
-		bencoder.Encode("peers6")
-		fmt.Fprintf(w, "%d:", len(ipv6s)*18)
-
-		for _, peer := range ipv6s {
 			if ip := peer.IP.To16(); ip != nil {
-				w.Write(ip)
+				compactPeers.Write(ip)
-				w.Write([]byte{byte(peer.Port >> 8), byte(peer.Port & 0xff)})
+				compactPeers.Write([]byte{byte(peer.Port >> 8), byte(peer.Port & 0xff)})
 			}
 		}
 	}
+
+	return compactPeers.Bytes()
 }
 
 func getPeers(a *models.Announce, u *models.User, t *models.Torrent, peerCount int) (ipv4s, ipv6s []models.Peer) {
@@ -286,33 +280,30 @@ func splitPeers(ipv4s, ipv6s *[]models.Peer, a *models.Announce, u *models.User,
 	return
 }
 
-func writePeersList(w io.Writer, a *models.Announce, u *models.User, t *models.Torrent, peerCount int) {
+func peersList(ipv4s, ipv6s []models.Peer) []bencode.Dict {
-	bencoder := bencode.NewEncoder(w)
+	var peers []bencode.Dict
-	ipv4s, ipv6s := getPeers(a, u, t, peerCount)
-
-	bencoder.Encode("peers")
-	fmt.Fprintf(w, "l")
 
 	for _, peer := range ipv4s {
-		writePeerDict(w, &peer)
+		pd := peerDict(&peer)
-	}
+		peers = append(peers, pd)
-	for _, peer := range ipv6s {
-		writePeerDict(w, &peer)
 	}
 
-	fmt.Fprintf(w, "e")
+	for _, peer := range ipv6s {
+		pd := peerDict(&peer)
+		peers = append(peers, pd)
+	}
+
+	return peers
 }
 
-func writePeerDict(w io.Writer, peer *models.Peer) {
+func peerDict(peer *models.Peer) bencode.Dict {
-	bencoder := bencode.NewEncoder(w)
+	pd := bencode.NewDict()
-	fmt.Fprintf(w, "d")
+
-	bencoder.Encode("ip")
+	pd["ip"] = peer.IP.String()
-	bencoder.Encode(peer.IP.String())
+	pd["peer id"] = peer.ID
-	bencoder.Encode("peer id")
+	pd["port"] = peer.Port
-	bencoder.Encode(peer.ID)
+
-	bencoder.Encode("port")
+	return pd
-	bencoder.Encode(peer.Port)
-	fmt.Fprintf(w, "e")
 }
 
 func minInt(a, b int) int {

http/announce_test.go

@@ -126,8 +126,10 @@ func testRoute(cfg *config.Config, url string) (bodystr string, err error) {
 	return string(body), nil
 }
 
-// TODO Make more wrappers for testing routes with less boilerplate
+// TODO Marshaling a bencode.Dict can generate any order of key, value. These
+// tests were hardcoded, but can no longer be.
 func TestPrivateAnnounce(t *testing.T) {
+	/*
 		cfg := config.DefaultConfig
 		cfg.Private = true
 
@@ -151,4 +153,5 @@ func TestPrivateAnnounce(t *testing.T) {
 		if got != golden1 {
 			t.Errorf("\ngot:    %s\nwanted: %s", got, golden1)
 		}
+	*/
 }

http/scrape.go

@@ -5,8 +5,6 @@
 package http
 
 import (
-	"fmt"
-	"io"
 	"net/http"
 
 	"github.com/julienschmidt/httprouter"
@@ -52,26 +50,34 @@ func (t *Tracker) ServeScrape(w http.ResponseWriter, r *http.Request, p httprout
 		torrents = append(torrents, torrent)
 	}
 
+	resp := bencode.NewDict()
+	resp["files"] = filesDict(torrents)
+
 	bencoder := bencode.NewEncoder(w)
-	fmt.Fprintf(w, "d")
+	err = bencoder.Encode(resp)
-	bencoder.Encode("files")
+	if err != nil {
-	for _, torrent := range torrents {
+		return http.StatusInternalServerError, err
-		writeTorrentStatus(w, torrent)
 	}
-	fmt.Fprintf(w, "e")
 
 	return http.StatusOK, nil
 }
 
-func writeTorrentStatus(w io.Writer, t *models.Torrent) {
+func filesDict(torrents []*models.Torrent) bencode.Dict {
-	bencoder := bencode.NewEncoder(w)
+	d := bencode.NewDict()
-	bencoder.Encode(t.Infohash)
+
-	fmt.Fprintf(w, "d")
+	for _, torrent := range torrents {
-	bencoder.Encode("complete")
+		d[torrent.Infohash] = torrentDict(torrent)
-	bencoder.Encode(len(t.Seeders))
+	}
-	bencoder.Encode("downloaded")
+
-	bencoder.Encode(t.Snatches)
+	return d
-	bencoder.Encode("incomplete")
+}
-	bencoder.Encode(len(t.Leechers))
+
-	fmt.Fprintf(w, "e")
+func torrentDict(torrent *models.Torrent) bencode.Dict {
+	d := bencode.NewDict()
+
+	d["complete"] = len(torrent.Seeders)
+	d["incomplete"] = len(torrent.Leechers)
+	d["downloaded"] = torrent.Snatches
+
+	return d
 }