pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-02-08 05:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

add exit node name to logs

Browse Source
This commit is contained in:
miloschwartz
2025-06-16 22:00:39 -04:00
parent bbea9a91da
commit 95d4cb2758
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main.go
View File

@@ -59,7 +59,8 @@ type ExitNodeData struct {
// ExitNode represents an exit node with an ID, endpoint, and weight.
type ExitNode struct {
ID string `json:"exitNodeId"`
ID int `json:"exitNodeId"`
Name string `json:"exitNodeName"`
Endpoint string `json:"endpoint"`
Weight float64 `json:"weight"`
}
@@ -687,23 +688,23 @@ persistent_keepalive_interval=5`, fixKey(privateKey.String()), fixKey(wgData.Pub
}
resp.Body.Close()
results[i] = nodeResult{Node: node, Latency: latency, Err: nil}
logger.Info("Exit node %s latency: %v", node.ID, latency)
// logger.Info("Exit node %s latency: %v", node.Name, latency)
}
// Select the best node based on weighted score
// Select the best node based on weighted score
// weight / latency
// choose highest score
// if same score, choose lowest latency
var bestNode *ExitNode
var bestScore float64 = -1e12 // small value
var bestScore float64 = -1e12 // small value
var bestLatency time.Duration = 1e12 // large value
for _, res := range results {
if res.Err != nil || res.Node.Weight <= 0 {
continue
}
score := res.Node.Weight / float64(res.Latency.Milliseconds())
logger.Info("Exit node %s score: %.2f (latency: %dms, weight: %.2f)", res.Node.ID, score, res.Latency.Milliseconds(), res.Node.Weight)
if score < bestScore {
score := (res.Node.Weight / float64(res.Latency.Milliseconds())) * 1000
logger.Info("Exit node %s with score: %.2f (latency: %dms, weight: %.2f)", res.Node.Name, score, res.Latency.Milliseconds(), res.Node.Weight)
if score > bestScore {
bestScore = score
bestLatency = res.Latency
bestNode = &res.Node
@@ -718,7 +719,7 @@ persistent_keepalive_interval=5`, fixKey(privateKey.String()), fixKey(wgData.Pub
return
}
logger.Info("Selected exit node: %s (%s)", bestNode.ID, bestNode.Endpoint)
logger.Info("Selected exit node: %s (%s)", bestNode.Name, bestNode.Endpoint)
err = client.SendMessage("newt/wg/register", map[string]interface{}{
"publicKey": publicKey.String(),