refactor http tracker

Author: crimist

go.mod

@@ -2,7 +2,7 @@
 
 module github.com/crimist/trakx
 
-go 1.20
+go 1.21
 
 require (
 	github.com/cbeuw/connutil v0.0.0-20200411215123-966bfaa51ee3

refactoring.md

@@ -8,10 +8,11 @@
 
 ## Future
 
-* Refactor HTTP tracker tests
+* Refactor HTTP tracker tests (commented out rn)
+* Rip out most of the embedded bs, KISS! Leave files in with Caddy reverse proxy example
 * Refactor tracker main()
-* Refactor controller / command line interface
-* Cover all TODOs
+* Refactor controller / command line interface - KISS!
+* Deal w/ every TODO
 * Implement new features
 
 ## Features
@@ -36,3 +37,7 @@
 
 * Throw out pg backups
   * Make backup config setting just an optional path
+
+### Add blacklist
+
+* Maybe?

tracker/http/announce.go

@@ -6,13 +6,11 @@ import (
 	"net/netip"
 	"strconv"
 
-	"github.com/crimist/trakx/config"
 	"github.com/crimist/trakx/pools"
-	"github.com/crimist/trakx/tracker/stats"
-	"github.com/crimist/trakx/tracker/storage"
+	"github.com/crimist/trakx/storage"
 )
 
-type announceParams struct {
+type announceParameters struct {
 	compact  bool
 	nopeerid bool
 	noneleft bool
@@ -23,92 +21,75 @@ type announceParams struct {
 	numwant  string
 }
 
-func (t *Tracker) announce(conn net.Conn, vals *announceParams, ip netip.Addr) {
-	stats.Announces.Add(1)
+func (tracker *Tracker) announce(conn net.Conn, parameters *announceParameters, addr netip.Addr) {
+	tracker.stats.Announces.Add(1)
 
-	// get vars
 	var hash storage.Hash
 	var peerid storage.PeerID
 
-	// hash
-	if len(vals.hash) != 20 {
-		t.clientError(conn, "Invalid infohash")
+	if len(parameters.hash) != 20 {
+		writeFailure(conn, "Invalid infohash")
 		return
 	}
-	copy(hash[:], vals.hash)
+	copy(hash[:], parameters.hash)
 
-	// peerid
-	if len(vals.peerid) != 20 {
-		t.clientError(conn, "Invalid peerid")
+	if len(parameters.peerid) != 20 {
+		writeFailure(conn, "Invalid peerid")
 		return
 	}
-	copy(peerid[:], vals.peerid)
+	copy(peerid[:], parameters.peerid)
 
-	// get if stop before continuing
-	if vals.event == "stopped" {
-		t.peerdb.Drop(hash, peerid)
+	if parameters.event == "stopped" {
+		tracker.peerdb.PeerRemove(hash, peerid)
 		conn.Write(httpSuccessBytes)
 		return
 	}
 
-	// port
-	portInt, err := strconv.Atoi(vals.port)
+	portInt, err := strconv.Atoi(parameters.port)
 	if err != nil || (portInt > 65535 || portInt < 1) {
-		t.clientError(conn, "Invalid port")
+		writeFailure(conn, "Invalid port")
 		return
 	}
 
-	// numwant
-	numwant := config.Config.Numwant.Default
-
-	if vals.numwant != "" {
-		numwantInt, err := strconv.Atoi(vals.numwant)
+	numwant := tracker.config.DefaultNumwant
+	if parameters.numwant != "" {
+		numwantInt, err := strconv.Atoi(parameters.numwant)
 		if err != nil || numwantInt < 0 {
-			t.clientError(conn, "Invalid numwant")
+			writeFailure(conn, "Invalid numwant")
 			return
 		}
-		numwantUint := uint(numwantInt)
 
-		// if numwant is within our limit than listen to the client
-		if numwantUint <= config.Config.Numwant.Limit {
-			numwant = numwantUint
-		} else {
-			numwant = config.Config.Numwant.Limit
-		}
+		numwant = min(uint(numwantInt), tracker.config.MaximumNumwant)
 	}
 
 	peerComplete := false
-	if vals.event == "completed" || vals.noneleft {
+	if parameters.event == "completed" || parameters.noneleft {
 		peerComplete = true
 	}
 
-	t.peerdb.Save(ip, uint16(portInt), peerComplete, hash, peerid)
-	complete, incomplete := t.peerdb.HashStats(hash)
+	tracker.peerdb.PeerAdd(hash, peerid, addr, uint16(portInt), peerComplete)
+	seeds, leeches := tracker.peerdb.TorrentStats(hash)
 
-	interval := int64(config.Config.Announce.Base.Seconds())
-	if int32(config.Config.Announce.Fuzz.Seconds()) > 0 {
-		interval += rand.Int63n(int64(config.Config.Announce.Fuzz.Seconds()))
+	interval := tracker.config.Interval
+	if tracker.config.IntervalVariance > 0 {
+		interval += uint(rand.Int31n(int32(tracker.config.IntervalVariance)))
 	}
 
 	dictionary := pools.Dictionaries.Get()
-	dictionary.Int64("interval", interval)
-	dictionary.Int64("complete", int64(complete))
-	dictionary.Int64("incomplete", int64(incomplete))
-	if vals.compact {
-		peers4, peers6 := t.peerdb.PeerListBytes(hash, numwant)
+	dictionary.Int64("interval", int64(interval))
+	dictionary.Int64("complete", int64(seeds))
+	dictionary.Int64("incomplete", int64(leeches))
+	if parameters.compact {
+		peers4, peers6 := tracker.peerdb.TorrentPeersCompact(hash, uint(numwant), storage.IPv4|storage.IPv6)
 		dictionary.StringBytes("peers", peers4)
 		dictionary.StringBytes("peers6", peers6)
 
 		pools.Peerlists4.Put(peers4)
 		pools.Peerlists6.Put(peers6)
 	} else {
-		dictionary.BytesliceSlice("peers", t.peerdb.PeerList(hash, numwant, vals.nopeerid))
+		dictionary.BytesliceSlice("peers", tracker.peerdb.TorrentPeers(hash, numwant, parameters.nopeerid))
 	}
 
-	// double write no append is more efficient when > ~250 peers in response
-	// conn.Write(httpSuccessBytes)
-	// conn.Write(d.GetBytes())
-
 	conn.Write(append(httpSuccessBytes, dictionary.GetBytes()...))
 	pools.Dictionaries.Put(dictionary)
 }