From 2596837c7ef40ea0b0dec9b72e0a8a5745628c60 Mon Sep 17 00:00:00 2001 From: git-sudo-404 Date: Fri, 25 Sep 2026 02:44:52 +0530 Subject: [PATCH] added tracker response handling --- internal/torrent/client.go | 33 +++-- internal/torrent/torrent.go | 104 ++++++++++++--- internal/torrent/trackerRequest_test.go | 2 +- internal/torrent/trackerResponse.go | 81 ------------ internal/torrent/trackerResponseParser.go | 121 ------------------ .../torrent/trackerResponseParser_test.go | 108 ---------------- 6 files changed, 103 insertions(+), 346 deletions(-) delete mode 100644 internal/torrent/trackerResponse.go delete mode 100644 internal/torrent/trackerResponseParser.go delete mode 100644 internal/torrent/trackerResponseParser_test.go diff --git a/internal/torrent/client.go b/internal/torrent/client.go index 48a5beb..c1b0cf5 100644 --- a/internal/torrent/client.go +++ b/internal/torrent/client.go @@ -27,31 +27,34 @@ package torrent import ( "crypto/sha1" "fmt" + "net" "os" "time" ) -type RemotePeer struct { - PeerAddress - peerId [20]byte - amChoking int32 // This client is choking the peer - amInterested int32 // This client is interested in the peer - peerChoking int32 // Peer is choking this client - peerInterested int32 // Peer is interested in this client +type Peer struct { + ip net.IP + port int64 } type Client struct { - peerId [20]byte - PeerAddress // ip & port of the client - remotePeers []RemotePeer - port int64 + clientId [20]byte + port int64 + peers []Peer + trackerInterval int64 + completePeers int64 + incompletePeers int64 } func NewClient() *Client { return &Client{ - peerId: generateClientPeerId(), - port: 6881, + clientId: generateClientPeerId(), + port: 6881, + peers: []Peer{}, + trackerInterval: -1, + completePeers: -1, + incompletePeers: -1, } } @@ -70,7 +73,3 @@ func generateClientPeerId() [20]byte { copy(peerId[8:], hash[:12]) return peerId } - -func (c *Client) GetPeerId() [20]byte { - return c.peerId -} diff --git a/internal/torrent/torrent.go b/internal/torrent/torrent.go index a0f1bc6..1378be5 100644 --- a/internal/torrent/torrent.go +++ b/internal/torrent/torrent.go @@ -28,6 +28,7 @@ import ( "bufio" "fmt" "gotorrent/internal/bencode" + "net" "net/http" "time" ) @@ -35,21 +36,19 @@ import ( func populateInitialTrackerRequestParams(tr *TrackerRequest, mi *MetaInfo, client *Client) { fmt.Println("[LOG] Populating TrackerRequest...") tr.SetInfoHash(mi) - tr.SetPeerId(string(client.peerId[:])) + tr.SetPeerId(string(client.clientId[:])) tr.SetPort(int64(client.port)) tr.SetUploaded(int64(0)) tr.SetDownloaded(int64(0)) tr.SetLeft(mi.length) - tr.SetCompact(1) + tr.SetCompact(int64(0)) tr.SetNoPeerId(int64(1)) tr.SetEvent(STARTED) } -func sendTrackerRequest(trackerRequestURL *string) *TrackerResponse { +func sendTrackerRequest(trackerRequestURL *string, client *Client) { - trackerResponse := NewTrackerResponse() - - client := &http.Client{ + httpClient := &http.Client{ Timeout: 5 * time.Second, } req, err := http.NewRequest(http.MethodGet, *trackerRequestURL, nil) @@ -58,8 +57,7 @@ func sendTrackerRequest(trackerRequestURL *string) *TrackerResponse { } fmt.Println("[LOG] Sending TrackerRequest...") - fmt.Println("TRACKER REQUEST URL : ", *trackerRequestURL) - resp, err := client.Do(req) + resp, err := httpClient.Do(req) if err != nil { fmt.Println(err.Error()) } @@ -68,7 +66,7 @@ func sendTrackerRequest(trackerRequestURL *string) *TrackerResponse { fmt.Println("Error tracker server return : ", resp.Body) } - fmt.Println("STATUS:", resp.Status) + fmt.Println("[LOG] STATUS:", resp.Status) buf := bufio.NewReader(resp.Body) @@ -77,9 +75,80 @@ func sendTrackerRequest(trackerRequestURL *string) *TrackerResponse { panic(err) } - fmt.Println(decodedResponse) + // fmt.Println(decodedResponse) + interval, present := decodedResponse["interval"] + if !present { + panic("interval not present in the tracker response") + } + //NOTE: Tracker Id is optioanl + // trackerId, present := decodedResponse["tracker id"] + // if !present { + // panic("tracker id not present in tracker response") + // } + complete, present := decodedResponse["complete"] + if !present { + panic("complete field not present in tracker response") + } + incomplete, present := decodedResponse["incomplete"] + if !present { + panic("Field : incomplete , not present in tracker response") + } + peers, present := decodedResponse["peers"] + if !present { + panic("peers not present in tracker response") + } + + // fmt.Println("[LOG] Tracker Responded with the following : ....") + // fmt.Println("[LOG] interval : ", interval) + // fmt.Println("[LOG] complete : ", complete) + // fmt.Println("[LOG] incomplete : ", incomplete) + // fmt.Println("[LOG] peers : ", peers) + + if val, ok := interval.(int64); ok { + client.trackerInterval = val + } else { + fmt.Println("[ERROR] : interval of tracker response not of type int64") + } + + if val, ok := complete.(int64); ok { + client.completePeers = val + } else { + fmt.Println("[ERROR] : complete from tracker response is not of type int64") + } + + if val, ok := incomplete.(int64); ok { + client.incompletePeers = val + } else { + fmt.Println("[ERROR] : incomplete of tracker response not of type int64") + } + + if peerList, ok := peers.([]any); ok { + // fmt.Println("[DEBUG PRINT] PEER LIST : ", peerList) + for _, peerListItem := range peerList { + // fmt.Println("[DEBUG PRINT] PEERLISTITEM : ", peerListItem) + if peerMap, ok := peerListItem.(map[string]any); ok { + ip, ok := peerMap["ip"].(string) + // fmt.Println("[DEBUG PRINT] IP : ", peerMap["ip"]) + // fmt.Println("[DEBUG PRINT] PORT : ", peerMap["port"]) + if !ok { + fmt.Println("[ERROR] ip not of type string from tracker response") + } + port, ok := peerMap["port"].(int64) + if !ok { + fmt.Println("[ERROR] port not of type integer from tracker response") + } + client.peers = append(client.peers, Peer{ + ip: net.ParseIP(ip), + port: port, + }) + } + } + } else { + fmt.Println("[ERROR] Wrong data type in peerList") + } + + fmt.Println("[LOG] Updated Client Peers from tracker Response") - return trackerResponse } func StartTorrent(metaInfoFilePath string, destinationFilePath string) { @@ -97,17 +166,16 @@ func StartTorrent(metaInfoFilePath string, destinationFilePath string) { populateInitialTrackerRequestParams(trackerRequest, metaInfo, client) - fmt.Printf("INFO RAW BYTES : % x\n", metaInfo.GetRawInfo()) - fmt.Printf("INFO HASH string: %q\n", metaInfo.GetInfoHash()) - fmt.Printf("INFO HASH bytes: % x\n", trackerRequest.infoHash) - fmt.Printf("INFO HASH string: %q\n", trackerRequest.infoHash) - fmt.Println("PORT:", client.port) - trackerRequestURL, err := trackerRequest.GetURLEncodedRequestString(metaInfo) if err != nil { panic(err) } - sendTrackerRequest(&trackerRequestURL) + sendTrackerRequest(&trackerRequestURL, client) + + // fmt.Println(len(client.peers)) + // for _, peer := range client.peers { + // fmt.Println(peer) + // } } diff --git a/internal/torrent/trackerRequest_test.go b/internal/torrent/trackerRequest_test.go index 6afe74a..019f76d 100644 --- a/internal/torrent/trackerRequest_test.go +++ b/internal/torrent/trackerRequest_test.go @@ -38,7 +38,7 @@ func TestGetURLEncodedRequestString(t *testing.T) { panic(err) } client := NewClient() - peerIdBytes := client.GetPeerId() + peerIdBytes := client.clientId peerId := string(peerIdBytes[:]) port := 8080 uploaded := 1024 diff --git a/internal/torrent/trackerResponse.go b/internal/torrent/trackerResponse.go deleted file mode 100644 index 3fc6d7e..0000000 --- a/internal/torrent/trackerResponse.go +++ /dev/null @@ -1,81 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2026 git-sudo-404 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * Of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * Copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * Copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package torrent - -import "net" - -type PeerAddress struct { // no peerId when in compact mode = 1 - ip net.IP // peer's IP address either IPv6 (hexed) or IPv4 (dotted quad) or DNS name (string) - port int64 // peer's port number (integer) -} - -type TrackerResponse struct { - interval int64 // Interval in seconds that the client should wait between sending regular requests to the tracker - minInterval *int64 // (optional) Minimum announce interval. If present clients must not reannounce more frequently than this. - trackerId string // A string that the client should send back on its next announcements. If absent and a previous announce sent a tracker id, do not discard the old value; keep using it. - complete int64 // number of peers with the entire file, i.e. seeders (integer) - incomplete int64 // number of non-seeder peers, aka "leechers" (integer) - peers []PeerAddress -} - -func NewTrackerResponse() *TrackerResponse { - return &TrackerResponse{ - interval: 1, - trackerId: "", - complete: 0, - incomplete: 0, - peers: []PeerAddress{}, - } -} - -func (tr *TrackerResponse) SetPeers(peers []PeerAddress) *TrackerResponse { - tr.peers = peers - return tr -} - -func (tr *TrackerResponse) SetInterval(interval int64) *TrackerResponse { - tr.interval = interval - return tr -} - -func (tr *TrackerResponse) SetMinInterval(minInterval int64) *TrackerResponse { - tr.minInterval = &minInterval - return tr -} - -func (tr *TrackerResponse) SetTrackerId(trackerId string) *TrackerResponse { - tr.trackerId = trackerId - return tr -} - -func (tr *TrackerResponse) SetComplete(complete int64) *TrackerResponse { - tr.complete = complete - return tr -} - -func (tr *TrackerResponse) SetIncomplete(incomplete int64) *TrackerResponse { - tr.incomplete = incomplete - return tr -} diff --git a/internal/torrent/trackerResponseParser.go b/internal/torrent/trackerResponseParser.go deleted file mode 100644 index 88c91b9..0000000 --- a/internal/torrent/trackerResponseParser.go +++ /dev/null @@ -1,121 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2026 git-sudo-404 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * Of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * Copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * Copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package torrent - -import ( - "encoding/binary" - "fmt" - "gotorrent/internal/bencode" - "io" - "net" -) - -func parsePeersCompactString(peersCompactString string) ([]PeerAddress, error) { - // first 4-bytes -> IP - // next 2-bytes -> port - - data := []byte(peersCompactString) - dataLen := len(data) - if dataLen%6 != 0 { - return nil, fmt.Errorf("The peers compact string length must be a multiple of 6 , but got of length : %d", dataLen) - } - - numberOfPeers := dataLen / 6 - peers := make([]PeerAddress, numberOfPeers) - - for i := 0; i < numberOfPeers; i++ { - offset := i * 6 - - ip := make(net.IP, 4) - copy(ip, data[offset:offset+4]) - - port := int64(binary.BigEndian.Uint16(data[offset+4 : offset+6])) - - peers[i] = PeerAddress{ - ip: ip, - port: port, - } - } - - return peers, nil -} - -func ParseTrackerResponse(r io.Reader) (*TrackerResponse, error) { - - trackerResponse := &TrackerResponse{} - - decodedResponseDict, err := bencode.Decode(r) - if err != nil { - return nil, err - } - if _, exists := decodedResponseDict["failure reason"]; exists { - return nil, fmt.Errorf("Tracker Response Failed") - } - - interval, err := checkFieldPresenceAndType[int64](decodedResponseDict, "interval") - if err != nil { - return nil, err - } - trackerResponse.SetInterval(interval) - - minInterval, minIntervalPresent, err := checkOptionalFieldPresenceAndType[int64](decodedResponseDict, "min interval") - if err != nil { - return nil, err - } - if minIntervalPresent { - trackerResponse.SetMinInterval(minInterval) - } - - trackerId, err := checkFieldPresenceAndType[string](decodedResponseDict, "tracker id") - if err != nil { - return nil, err - } - trackerResponse.SetTrackerId(trackerId) - - complete, err := checkFieldPresenceAndType[int64](decodedResponseDict, "complete") - if err != nil { - return nil, err - } - trackerResponse.SetComplete(complete) - - incomplete, err := checkFieldPresenceAndType[int64](decodedResponseDict, "incomplete") - if err != nil { - return nil, err - } - trackerResponse.SetIncomplete(incomplete) - - peersCompactString, err := checkFieldPresenceAndType[string](decodedResponseDict, "peers") - if err != nil { - return nil, err - } - - peers, err := parsePeersCompactString(peersCompactString) - if err != nil { - return nil, err - } - trackerResponse.SetPeers(peers) - - return trackerResponse, nil -} diff --git a/internal/torrent/trackerResponseParser_test.go b/internal/torrent/trackerResponseParser_test.go deleted file mode 100644 index b28d114..0000000 --- a/internal/torrent/trackerResponseParser_test.go +++ /dev/null @@ -1,108 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2026 git-sudo-404 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * Of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * Copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * Copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package torrent - -import ( - "bytes" - "encoding/binary" - "fmt" - "gotorrent/internal/bencode" - "net" - "testing" -) - -func TestParseTrackerResponse(t *testing.T) { - - trackerResponseDict := map[string]any{} - trackerResponseDict["interval"] = int64(10) - trackerResponseDict["min interval"] = int64(5) - trackerResponseDict["tracker id"] = "tracker_id_1" - trackerResponseDict["complete"] = int64(2) - trackerResponseDict["incomplete"] = int64(3) - - mockPeerIps := new(bytes.Buffer) - mockPeerIps.Write(net.ParseIP("192.2.1.11").To4()) - var port uint16 = 8001 - binary.Write(mockPeerIps, binary.BigEndian, port) - - mockPeerIps.Write(net.ParseIP("192.2.1.12").To4()) - port = 8001 - binary.Write(mockPeerIps, binary.BigEndian, port) - - mockPeerIps.Write(net.ParseIP("192.2.1.13").To4()) - port = 8001 - binary.Write(mockPeerIps, binary.BigEndian, port) - - mockPeerIps.Write(net.ParseIP("192.2.1.14").To4()) - port = 8001 - binary.Write(mockPeerIps, binary.BigEndian, port) - - mockPeerIps.Write(net.ParseIP("192.2.1.15").To4()) - port = 8001 - binary.Write(mockPeerIps, binary.BigEndian, port) - - mockPeerBytes := mockPeerIps.String() - - trackerResponseDict["peers"] = mockPeerBytes - - encoder := bencode.CreateNewEncoder() - encoder.Encode(trackerResponseDict) - bencodedTrackerResponse := encoder.String() - - mockTrackerResponse := new(bytes.Buffer) - mockTrackerResponse.WriteString(bencodedTrackerResponse) - - tr, err := ParseTrackerResponse(mockTrackerResponse) - if err != nil { - panic(err) - } - - if tr.interval != int64(10) { - t.Errorf("\nGOT : %d\nWANT : %d", tr.interval, 10) - } - if *tr.minInterval != int64(5) { - t.Errorf("\nGOT : %d\nWANT : %d", *tr.minInterval, 5) - } - if tr.trackerId != "tracker_id_1" { - t.Errorf("\nGOT : %s\nWANT : tracker_id_1", tr.trackerId) - } - if tr.complete != int64(2) { - t.Errorf("\nGOT : %d\nWANT : %d", tr.complete, 2) - } - if tr.incomplete != int64(3) { - t.Errorf("\nGOT : %d\nWANT : %d", tr.incomplete, 3) - } - - for i := 1; i <= 5; i++ { - wantedIp := net.ParseIP(fmt.Sprintf("192.2.1.1%d", i)) - if !tr.peers[i-1].ip.Equal(wantedIp) { - t.Errorf("expected IP %s, got %s", wantedIp, tr.peers[i-1].ip) - } - if tr.peers[i-1].port != int64(8001) { - t.Errorf("Port mismatch in the tr.peers , wanted 8001") - } - } - -}