pull API server out of http

Fixes #87.

http/http.go

@@ -2,7 +2,8 @@
 // Use of this source code is governed by the BSD 2-Clause license,
 // which can be found in the LICENSE file.
 
-// Package http implements an http-serving BitTorrent tracker.
+// Package http implements a BitTorrent tracker over the HTTP protocol as per
+// BEP 3.
 package http
 
 import (
@@ -75,26 +76,11 @@ func newRouter(s *Server) *httprouter.Router {
 	if s.config.PrivateEnabled {
 		r.GET("/users/:passkey/announce", makeHandler(s.serveAnnounce))
 		r.GET("/users/:passkey/scrape", makeHandler(s.serveScrape))
-
-		r.PUT("/users/:passkey", makeHandler(s.putUser))
-		r.DELETE("/users/:passkey", makeHandler(s.delUser))
 	} else {
 		r.GET("/announce", makeHandler(s.serveAnnounce))
 		r.GET("/scrape", makeHandler(s.serveScrape))
 	}
 
-	if s.config.ClientWhitelistEnabled {
-		r.GET("/clients/:clientID", makeHandler(s.getClient))
-		r.PUT("/clients/:clientID", makeHandler(s.putClient))
-		r.DELETE("/clients/:clientID", makeHandler(s.delClient))
-	}
-
-	r.GET("/torrents/:infohash", makeHandler(s.getTorrent))
-	r.PUT("/torrents/:infohash", makeHandler(s.putTorrent))
-	r.DELETE("/torrents/:infohash", makeHandler(s.delTorrent))
-	r.GET("/check", makeHandler(s.check))
-	r.GET("/stats", makeHandler(s.stats))
-
 	return r
 }
 
@@ -120,24 +106,24 @@ func (s *Server) connState(conn net.Conn, state http.ConnState) {
 }
 
 // Serve runs an HTTP server, blocking until the server has shut down.
-func (s *Server) Serve(addr string) {
-	glog.V(0).Info("Starting HTTP on ", addr)
+func (s *Server) Serve() {
+	glog.V(0).Info("Starting HTTP on ", s.config.HTTPConfig.ListenAddr)
 
-	if s.config.HTTPListenLimit != 0 {
-		glog.V(0).Info("Limiting connections to ", s.config.HTTPListenLimit)
+	if s.config.HTTPConfig.ListenLimit != 0 {
+		glog.V(0).Info("Limiting connections to ", s.config.HTTPConfig.ListenLimit)
 	}
 
 	grace := &graceful.Server{
-		Timeout:     s.config.HTTPRequestTimeout.Duration,
+		Timeout:     s.config.HTTPConfig.RequestTimeout.Duration,
 		ConnState:   s.connState,
-		ListenLimit: s.config.HTTPListenLimit,
+		ListenLimit: s.config.HTTPConfig.ListenLimit,
 
 		NoSignalHandling: true,
 		Server: &http.Server{
-			Addr:         addr,
+			Addr:         s.config.HTTPConfig.ListenAddr,
 			Handler:      newRouter(s),
-			ReadTimeout:  s.config.HTTPReadTimeout.Duration,
-			WriteTimeout: s.config.HTTPWriteTimeout.Duration,
+			ReadTimeout:  s.config.HTTPConfig.ReadTimeout.Duration,
+			WriteTimeout: s.config.HTTPConfig.WriteTimeout.Duration,
 		},
 	}
 

http/routes.go

@@ -5,11 +5,7 @@
 package http
 
 import (
-	"encoding/json"
-	"io/ioutil"
 	"net/http"
-	"net/url"
-	"runtime"
 
 	"github.com/julienschmidt/httprouter"
 
@@ -17,62 +13,6 @@ import (
 	"github.com/chihaya/chihaya/tracker/models"
 )
 
-const jsonContentType = "application/json; charset=UTF-8"
-
-func handleError(err error) (int, error) {
-	if err == nil {
-		return http.StatusOK, nil
-	} else if _, ok := err.(models.NotFoundError); ok {
-		stats.RecordEvent(stats.ClientError)
-		return http.StatusNotFound, nil
-	} else if _, ok := err.(models.ClientError); ok {
-		stats.RecordEvent(stats.ClientError)
-		return http.StatusBadRequest, nil
-	}
-	return http.StatusInternalServerError, err
-}
-
-func (s *Server) check(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	// Attempt to ping the backend if private tracker is enabled.
-	if s.config.PrivateEnabled {
-		if err := s.tracker.Backend.Ping(); err != nil {
-			return handleError(err)
-		}
-	}
-
-	_, err := w.Write([]byte("STILL-ALIVE"))
-	return handleError(err)
-}
-
-func (s *Server) stats(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	w.Header().Set("Content-Type", jsonContentType)
-
-	var err error
-	var val interface{}
-	query := r.URL.Query()
-
-	stats.DefaultStats.GoRoutines = runtime.NumGoroutine()
-
-	if _, flatten := query["flatten"]; flatten {
-		val = stats.DefaultStats.Flattened()
-	} else {
-		val = stats.DefaultStats
-	}
-
-	if _, pretty := query["pretty"]; pretty {
-		var buf []byte
-		buf, err = json.MarshalIndent(val, "", "  ")
-
-		if err == nil {
-			_, err = w.Write(buf)
-		}
-	} else {
-		err = json.NewEncoder(w).Encode(val)
-	}
-
-	return handleError(err)
-}
-
 func handleTorrentError(err error, w *Writer) (int, error) {
 	if err == nil {
 		return http.StatusOK, nil
@@ -104,96 +44,3 @@ func (s *Server) serveScrape(w http.ResponseWriter, r *http.Request, p httproute
 
 	return handleTorrentError(s.tracker.HandleScrape(scrape, writer), writer)
 }
-
-func (s *Server) getTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	infohash, err := url.QueryUnescape(p.ByName("infohash"))
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-
-	torrent, err := s.tracker.FindTorrent(infohash)
-	if err != nil {
-		return handleError(err)
-	}
-
-	w.Header().Set("Content-Type", jsonContentType)
-	e := json.NewEncoder(w)
-	return handleError(e.Encode(torrent))
-}
-
-func (s *Server) putTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	body, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-
-	var torrent models.Torrent
-	err = json.Unmarshal(body, &torrent)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	s.tracker.PutTorrent(&torrent)
-	return http.StatusOK, nil
-}
-
-func (s *Server) delTorrent(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	infohash, err := url.QueryUnescape(p.ByName("infohash"))
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-
-	s.tracker.DeleteTorrent(infohash)
-	return http.StatusOK, nil
-}
-
-func (s *Server) getUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	user, err := s.tracker.FindUser(p.ByName("passkey"))
-	if err == models.ErrUserDNE {
-		return http.StatusNotFound, err
-	} else if err != nil {
-		return http.StatusInternalServerError, err
-	}
-
-	w.Header().Set("Content-Type", jsonContentType)
-	e := json.NewEncoder(w)
-	return handleError(e.Encode(user))
-}
-
-func (s *Server) putUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	body, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-
-	var user models.User
-	err = json.Unmarshal(body, &user)
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-
-	s.tracker.PutUser(&user)
-	return http.StatusOK, nil
-}
-
-func (s *Server) delUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	s.tracker.DeleteUser(p.ByName("passkey"))
-	return http.StatusOK, nil
-}
-
-func (s *Server) getClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	if err := s.tracker.ClientApproved(p.ByName("clientID")); err != nil {
-		return http.StatusNotFound, err
-	}
-	return http.StatusOK, nil
-}
-
-func (s *Server) putClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	s.tracker.PutClient(p.ByName("clientID"))
-	return http.StatusOK, nil
-}
-
-func (s *Server) delClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	s.tracker.DeleteClient(p.ByName("clientID"))
-	return http.StatusOK, nil
-}