Merge pull request #18 from tonutils/test

ANDL&RLDP improvements and fixes & more debug info

Author: xssnick

cmd/proxy/main.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ton-utils/reverse-proxy/config"
 	"github.com/xssnick/tonutils-go/adnl"
 	"github.com/xssnick/tonutils-go/adnl/dht"
+	"github.com/xssnick/tonutils-go/adnl/rldp"
 	rldphttp "github.com/xssnick/tonutils-go/adnl/rldp/http"
 	"github.com/xssnick/tonutils-go/liteclient"
 	"github.com/xssnick/tonutils-go/tlb"
@@ -46,6 +47,14 @@ type Handler struct {
 }
 
 func (h Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
+	if *FlagDebug {
+		reqDump, err := httputil.DumpRequestOut(request, true)
+		if err != nil {
+			return
+		}
+		fmt.Println("REQUEST:", string(reqDump))
+	}
+
 	hdr := http.Header{}
 	for k := range request.Header {
 		// make headers canonical
@@ -57,7 +66,7 @@ func (h Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 
 	log.Println("request:", request.Method, request.Host, request.RequestURI)
 
-	writer.Header().Set("Ton-Reverse-Proxy", "Tonutils Reverse Proxy v0.3.1")
+	writer.Header().Set("Ton-Reverse-Proxy", "Tonutils Reverse Proxy v0.3.2")
 	h.h.ServeHTTP(writer, request)
 }
 
@@ -112,7 +121,11 @@ func main() {
 
 	if *FlagDebug == false {
 		adnl.Logger = func(v ...any) {}
-		// rldphttp.Logger = func(v ...any) {}
+		rldphttp.Logger = func(v ...any) {}
+	} else {
+		rldp.Logger = log.Println
+		rldphttp.Logger = log.Println
+		adnl.Logger = log.Println
 	}
 
 	proxy := httputil.NewSingleHostReverseProxy(u)

go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/mdp/qrterminal/v3 v3.0.0
 	github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3
-	github.com/xssnick/tonutils-go v1.9.9-0.20240726185310-b76c122b8cd6
+	github.com/xssnick/tonutils-go v1.9.9-0.20240729172752-0ce0d252a288
 )
 
 require (

go.sum

@@ -13,6 +13,8 @@ github.com/xssnick/tonutils-go v1.9.2 h1:70s1oqcJ4jOOmqjSik0TmZR05JySfk/PeVuPeXm
 github.com/xssnick/tonutils-go v1.9.2/go.mod h1:p1l1Bxdv9sz6x2jfbuGQUGJn6g5cqg7xsTp8rBHFoJY=
 github.com/xssnick/tonutils-go v1.9.9-0.20240726185310-b76c122b8cd6 h1:po4uMNWZTLZxO0Xms4BEHB8TCar3gLFMUAGgmvDsN9E=
 github.com/xssnick/tonutils-go v1.9.9-0.20240726185310-b76c122b8cd6/go.mod h1:p1l1Bxdv9sz6x2jfbuGQUGJn6g5cqg7xsTp8rBHFoJY=
+github.com/xssnick/tonutils-go v1.9.9-0.20240729172752-0ce0d252a288 h1:nbTy2yUnRob4iCjiQcJ8gQVoc6rtqgIVNKMnl5AvhRo=
+github.com/xssnick/tonutils-go v1.9.9-0.20240729172752-0ce0d252a288/go.mod h1:p1l1Bxdv9sz6x2jfbuGQUGJn6g5cqg7xsTp8rBHFoJY=
 github.com/xssnick/tonutils-go v1.9.9 h1:J0hVJI4LNEFHqgRHzpWTjFuv/Ga89OqLRUc9gxmjCoc=
 github.com/xssnick/tonutils-go v1.9.9/go.mod h1:p1l1Bxdv9sz6x2jfbuGQUGJn6g5cqg7xsTp8rBHFoJY=
 golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=