From c1df1574026da7a11ad0741dbcd6977dd3f32684 Mon Sep 17 00:00:00 2001
From: parsa <hparsa1378@gmail.com>
Date: Fri, 8 Sep 2023 19:03:26 +0330
Subject: [PATCH] debug and rollback sing-box version

---
 core/singbox.go                   | 3 +--
 foreignusage/api/handlers.go      | 2 +-
 foreignusage/api/testInterface.go | 6 +++++-
 go.mod                            | 2 +-
 go.sum                            | 4 ++--
 raytest/tests.go                  | 5 ++---
 run/bylink.go                     | 2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/singbox.go b/core/singbox.go
index 98b4258..ee523e6 100644
--- a/core/singbox.go
+++ b/core/singbox.go
@@ -75,7 +75,6 @@ func RunByLink(wg *sync.WaitGroup, config *[]byte, ctx context.Context, kills *c
 			select {
 			case <-ctx.Done():
 				// exit gracefully
-				fmt.Println("Context is done3")
 
 				// closeCtx, closed := context.WithCancel(ctx)
 				// go closeMonitor(closeCtx)
@@ -88,7 +87,7 @@ func RunByLink(wg *sync.WaitGroup, config *[]byte, ctx context.Context, kills *c
 			case k := <-*kills:
 
 				if k {
-					fmt.Println("kill")
+
 					// closeCtx, closed := context.WithCancel(ctx)
 					// go closeMonitor(closeCtx)
 
diff --git a/foreignusage/api/handlers.go b/foreignusage/api/handlers.go
index 32e9cde..8a1dcd2 100644
--- a/foreignusage/api/handlers.go
+++ b/foreignusage/api/handlers.go
@@ -20,7 +20,7 @@ func testHandler(c *gin.Context) {
 
 		select {
 		case <-done:
-			fmt.Println("test done")
+
 			cancel()
 			return
 
diff --git a/foreignusage/api/testInterface.go b/foreignusage/api/testInterface.go
index 7489f3d..cab0212 100644
--- a/foreignusage/api/testInterface.go
+++ b/foreignusage/api/testInterface.go
@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"fmt"
 	"sync"
 
 	"github.com/Kawaii-Konnections-KK-Limited/Hayasashiken/run"
@@ -22,7 +23,7 @@ func getTestResultsAsService(links *[]link, timeout *int32, upperBoundPingLimit
 		go func(link *string, port int, i int) {
 			defer wg.Done()
 
-			r, _ := run.SingByLink(link, TestUrl, &port, timeout, &baseBroadcast, *ctx, &kills)
+			r, err := run.SingByLink(link, TestUrl, &port, timeout, &baseBroadcast, *ctx, &kills)
 			if r > 10 && r < *upperBoundPingLimit {
 				pairs = append(pairs, responseLink{
 					Ping: r,
@@ -33,6 +34,9 @@ func getTestResultsAsService(links *[]link, timeout *int32, upperBoundPingLimit
 				kills <- true
 
 			}
+			if err != nil {
+				fmt.Println(err)
+			}
 
 		}(&link, port, id)
 	}
diff --git a/go.mod b/go.mod
index 2bb84ba..6fbb16b 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/gin-contrib/cors v1.4.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/sagernet/sing v0.2.10-0.20230830132630-30bf19f2833c
-	github.com/sagernet/sing-box v1.4.1
+	github.com/sagernet/sing-box v1.4.0
 	gorm.io/gorm v1.25.2
 )
 
diff --git a/go.sum b/go.sum
index fca4a2b..109c38b 100644
--- a/go.sum
+++ b/go.sum
@@ -168,8 +168,8 @@ github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2
 github.com/sagernet/sing v0.1.8/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk=
 github.com/sagernet/sing v0.2.10-0.20230830132630-30bf19f2833c h1:J2ptRncTNy+ZHfcFYSBfTmpvmgNlSEUZz6sDjh1np/Y=
 github.com/sagernet/sing v0.2.10-0.20230830132630-30bf19f2833c/go.mod h1:9uOZwWkhT2Z2WldolLxX34s+1svAX4i4vvz5hy8u1MA=
-github.com/sagernet/sing-box v1.4.1 h1:t1BRLw3eeD/o7ljTeMKiOPq0tF05wAmpxDD3cEDwM9M=
-github.com/sagernet/sing-box v1.4.1/go.mod h1:UYH0rmnh3HCrwuSKs4fsUpaA/X2Nc7xYTLjjiwAlXOo=
+github.com/sagernet/sing-box v1.4.0 h1:2JyykriE5Ve/En6CWKcFG0WfF3djDVZqquzbJ1dMIpM=
+github.com/sagernet/sing-box v1.4.0/go.mod h1:8514tWFN5VhuwSkJ6fB9KC2i7Ys7XXnstE4zSU91XXA=
 github.com/sagernet/sing-dns v0.1.9-0.20230824120133-4d5cbceb40c1 h1:5w+jXz8y/8UQAxO74TjftN5okYkpg5mGvVxXunlKdqI=
 github.com/sagernet/sing-dns v0.1.9-0.20230824120133-4d5cbceb40c1/go.mod h1:Kg98PBJEg/08jsNFtmZWmPomhskn9Ausn50ecNm4M+8=
 github.com/sagernet/sing-mux v0.1.3-0.20230830095209-2a10ebd53ba8 h1:UyUkEUEGqfIGqzOJ7OuJry4slgcT/qb0etDJ+89LTAs=
diff --git a/raytest/tests.go b/raytest/tests.go
index 4c021fa..94f75a0 100644
--- a/raytest/tests.go
+++ b/raytest/tests.go
@@ -79,10 +79,9 @@ func GetTest(InPort *int, Destination *string, TimeOut *int32) (int32, error) {
 		}},
 	}
 
-	// link := Destination
-	link := "http://youtube.com"
+	link := Destination
 	// timeout := int32(5000) // timeout in milliseconds
-	rtt, testerr := urlTest(client, &link, TimeOut)
+	rtt, testerr := urlTest(client, link, TimeOut)
 	if testerr != nil {
 		// fmt.Println("Error:", testerr)
 		return 0, testerr
diff --git a/run/bylink.go b/run/bylink.go
index c37c58d..5cd6d7c 100644
--- a/run/bylink.go
+++ b/run/bylink.go
@@ -34,7 +34,7 @@ func SingByLink(Rawurl *string, Testurl *string, InputPort *int, TimeOut *int32,
 		res, err := raytest.GetTest(InputPort, Testurl, TimeOut)
 
 		if err != nil {
-			fmt.Println(err)
+
 			return 0, err
 		}
 		return res, nil