Merge pull request #91 from mrpalide/fix/solve-minhop-issue

Fix minhop issue
skycoin · Jan 26, 2025 · 0f29312 · 0f29312
2 parents f0b7a58 + facd003
commit 0f29312
Show file tree

Hide file tree

Showing 23 changed files with 215 additions and 250 deletions.
diff --git a/cmd/route-finder/README.md b/cmd/route-finder/README.md
@@ -1,5 +1,8 @@
 # Route finder
 
+## Definitions of `hop` term
+In general graph theory, a **hop** refers to the traversal from one vertex to another via an edge. But here, we consider hop as visors between source and destination. For example, for A -> B -> C -> D -> E, number of hops from visor A to E is 3.
+
 ## API endpoints
 
 ### GET `/health`
@@ -27,4 +30,4 @@ Body:
             "max_hops": 0
         }
     }
-```
+```
diff --git a/docker/config/dmsg-monitor.json b/docker/config/dmsg-monitor.json
@@ -5,7 +5,8 @@
 	"dmsg": {
 		"discovery": "http://dmsg-discovery:9090",
 		"sessions_count": 1,
-		"servers": []
+		"servers": [],
+		"servers_type": "all"
 	},
 	"transport": {
 		"discovery": "http://transport-discovery:9091",

diff --git a/docker/config/network-monitor.json b/docker/config/network-monitor.json
@@ -5,7 +5,8 @@
 	"dmsg": {
 		"discovery": "http://dmsg-discovery:9090",
 		"sessions_count": 1,
-		"servers": []
+		"servers": [],
+		"servers_type": "all"
 	},
 	"transport": {
 		"discovery": "http://transport-discovery:9091",

diff --git a/docker/config/public-visor-monitor.json b/docker/config/public-visor-monitor.json
@@ -5,7 +5,8 @@
 	"dmsg": {
 		"discovery": "http://dmsg-discovery:9090",
 		"sessions_count": 1,
-		"servers": []
+		"servers": [],
+		"servers_type": "all"
 	},
 	"transport": {
 		"discovery": "http://transport-discovery:9091",

diff --git a/docker/config/skysocks-monitor.json b/docker/config/skysocks-monitor.json
@@ -5,7 +5,8 @@
 	"dmsg": {
 		"discovery": "http://dmsg-discovery:9090",
 		"sessions_count": 1,
-		"servers": []
+		"servers": [],
+		"servers_type": "all"
 	},
 	"transport": {
 		"discovery": "http://transport-discovery:9091",

diff --git a/docker/config/tpd-monitor.json b/docker/config/tpd-monitor.json
@@ -5,7 +5,8 @@
 	"dmsg": {
 		"discovery": "http://dmsg-discovery:9090",
 		"sessions_count": 1,
-		"servers": []
+		"servers": [],
+		"servers_type": "all"
 	},
 	"transport": {
 		"discovery": "http://transport-discovery:9091",

diff --git a/docker/config/vpn-monitor.json b/docker/config/vpn-monitor.json
@@ -5,7 +5,8 @@
 	"dmsg": {
 		"discovery": "http://dmsg-discovery:9090",
 		"sessions_count": 1,
-		"servers": []
+		"servers": [],
+		"servers_type": "all"
 	},
 	"transport": {
 		"discovery": "http://transport-discovery:9091",

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -357,7 +357,7 @@ services:
         ipv4_address: 174.0.0.17
     ports:
       - "9089:9089"
-    entrypoint: "/release/node-visualizer --ut-url http://uptime-tracker:9096 --tpd-url  http://transport-discovery:9091"
+    entrypoint: "/release/node-visualizer --ut-url http://uptime-tracker:9096/uptimes?status=on --tpd-url  http://transport-discovery:9091/all-transports?selfTransports=hide"
     depends_on:
       - transport-discovery
       - uptime-tracker
@@ -451,7 +451,7 @@ services:
       - visor-a
     restart: always
     entrypoint: /release/skywire visor -c /opt/skywire/skywire-visor.json
-
+    
   network-monitor:
     image: "${REGISTRY}/network-monitor:${DOCKER_TAG}"
     hostname: network-monitor

diff --git a/docker/images/service-discovery/Dockerfile b/docker/images/service-discovery/Dockerfile
@@ -8,8 +8,6 @@ RUN apk --no-cache add bash curl
 
 ARG CGO_ENABLED=0
 ENV CGO_ENABLED=${CGO_ENABLED} \
-    GOOS=linux  \
-    GOARCH=amd64 \
     GO111MODULE=on
 
 COPY /docker/common/install-prequisites.sh /install-prequisites.sh

diff --git a/docker/integration/visorA.json b/docker/integration/visorA.json
@@ -93,6 +93,6 @@
 	"stun_servers": null,
 	"shutdown_timeout": "30s",
 	"restart_check_delay": "1s",
-	"is_public": true,
+	"is_public": false,
 	"persistent_transports": null
 }
diff --git a/docker/integration/visorC.json b/docker/integration/visorC.json
@@ -5,7 +5,8 @@
 	"dmsg": {
 		"discovery": "http://dmsg-discovery:9090",
 		"sessions_count": 1,
-		"servers": []
+		"servers": [],
+		"servers_type": "all"
 	},
 	"dmsgpty": {
 		"dmsg_port": 22,
@@ -22,8 +23,8 @@
 		"address_resolver": "http://address-resolver:9093",
 		"public_autoconnect": false,
 		"transport_setup_nodes": [
-			"0277dda8a284d43b4d5ee2a4152771e76131e9437c47be5d8e835aafe02c45a9ae"
-		],
+ 			"0277dda8a284d43b4d5ee2a4152771e76131e9437c47be5d8e835aafe02c45a9ae"
+ 		],
 		"log_store": {
 			"type": "file",
 			"location": "./local/transport_logs",
@@ -85,6 +86,16 @@
 				"auto_start": true,
 				"port": 13
 			},
+			{
+				"name": "skysocks",
+				"binary": "skywire",
+				"args": [
+					"app",
+					"skysocks"
+				],
+				"auto_start": true,
+				"port": 3
+			},
 			{
 				"name": "vpn-server",
 				"binary": "skywire",
@@ -110,7 +121,6 @@
 	"dmsghttp_server_path": "./local/custom",
 	"stun_servers": null,
 	"shutdown_timeout": "30s",
-	"restart_check_delay": "1s",
 	"is_public": false,
 	"persistent_transports": null
 }
diff --git a/pkg/node-visualizer/api/api.go b/pkg/node-visualizer/api/api.go
@@ -154,7 +154,7 @@ func fetchNodes(utURL string) error {
 }
 
 // createGraph creates a graph from the transport data
-func createGraph() ([]map[string]interface{}, error) {
+func createGraph(debug bool) ([]map[string]interface{}, error) {
 	mu.Lock()
 	defer mu.Unlock()
 
@@ -171,18 +171,26 @@ func createGraph() ([]map[string]interface{}, error) {
 		if !exist {
 			nodeMap[edgeA] = nodeID
 			nodeID++
+			label := ""
+			if debug {
+				label = edgeA
+			}
 			nodes = append(nodes, map[string]interface{}{
 				"id":    edgeA,
-				"label": "",
+				"label": label,
 			})
 		}
 		_, exist = nodeMap[edgeB]
 		if !exist {
 			nodeMap[edgeB] = nodeID
 			nodeID++
+			label := ""
+			if debug {
+				label = edgeB
+			}
 			nodes = append(nodes, map[string]interface{}{
 				"id":    edgeB,
-				"label": "",
+				"label": label,
 			})
 		}
 
@@ -197,9 +205,13 @@ func createGraph() ([]map[string]interface{}, error) {
 		if !exist {
 			nodeMap[utItem.Key] = nodeID
 			nodeID++
+			label := ""
+			if debug {
+				label = utItem.Key
+			}
 			nodes = append(nodes, map[string]interface{}{
 				"id":    utItem.Key,
-				"label": "",
+				"label": label,
 			})
 		}
 	}
@@ -223,8 +235,14 @@ func graphHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	var debug bool
+	query := r.URL.Query()
+	selfTransportsParam := query.Get("debug")
+	if selfTransportsParam == "true" {
+		debug = true
+	}
 	// Create the graph
-	graph, err := createGraph()
+	graph, err := createGraph(debug)
 	if err != nil {
 		http.Error(w, fmt.Sprintf("Failed to create graph: %v", err), http.StatusInternalServerError)
 		return

diff --git a/pkg/route-finder/api/api.go b/pkg/route-finder/api/api.go
@@ -21,7 +21,7 @@ import (
 	"github.com/skycoin/skywire-services/pkg/transport-discovery/store"
 )
 
-const maxNumberOfRoutes = 5
+const maxNumberOfRoutes = 3
 
 // API represents the api of the route-finder service.
 type API struct {
@@ -139,7 +139,7 @@ func (a *API) getPairedRoutes(w http.ResponseWriter, r *http.Request) {
 		dstPK := edge[1]
 		graph := graphs[srcPK]
 
-		forwardRoutes, err := graph.Shortest(r.Context(), srcPK, dstPK, minHops, maxHops, maxNumberOfRoutes)
+		forwardRoutes, err := graph.GetRoute(r.Context(), srcPK, dstPK, minHops, maxHops, maxNumberOfRoutes)
 		if err != nil {
 			a.handleError(w, r, http.StatusNotFound, err)
 			return