From ce829114b191a5fc1c1f4782872879b5c395a5e6 Mon Sep 17 00:00:00 2001
From: Tim Beatham <tcb1@st-andrews.ac.uk>
Date: Tue, 2 Jan 2024 19:41:20 +0000
Subject: [PATCH] bugfix

- on synchornisation node is not leaving mesh
---
 pkg/api/apiserver.go | 18 ++++++++++++++----
 pkg/sync/syncer.go   | 25 ++++++++++++++-----------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/pkg/api/apiserver.go b/pkg/api/apiserver.go
index fbe3a9a..991d59e 100644
--- a/pkg/api/apiserver.go
+++ b/pkg/api/apiserver.go
@@ -235,9 +235,19 @@ func NewSmegServer(conf ApiServerConf) (ApiServer, error) {
 		words:  words,
 	}
 
-	router.GET("/meshes", smegServer.GetMeshes)
-	router.GET("/mesh/:meshid", smegServer.GetMesh)
-	router.POST("/mesh/create", smegServer.CreateMesh)
-	router.POST("/mesh/join", smegServer.JoinMesh)
+	v1 := router.Group("/api/v1")
+	{
+		meshes := v1.Group("/meshes")
+		{
+			meshes.GET("/", smegServer.GetMeshes)
+		}
+		mesh := v1.Group("/mesh")
+		{
+			mesh.GET("/:meshid", smegServer.GetMesh)
+			mesh.POST("/create", smegServer.CreateMesh)
+			mesh.POST("/join", smegServer.JoinMesh)
+		}
+	}
+
 	return smegServer, nil
 }
diff --git a/pkg/sync/syncer.go b/pkg/sync/syncer.go
index deefa6b..ecfcf2a 100644
--- a/pkg/sync/syncer.go
+++ b/pkg/sync/syncer.go
@@ -38,11 +38,10 @@ func (s *SyncerImpl) Sync(correspondingMesh mesh.MeshProvider) error {
 
 	// Self can be nil if the node is removed
 	selfID := s.manager.GetPublicKey()
-	self, _ := correspondingMesh.GetNode(selfID.String())
+	self, err := correspondingMesh.GetNode(selfID.String())
 
-	// Mesh has been removed
-	if self == nil {
-		return fmt.Errorf("mesh %s does not exist", correspondingMesh.GetMeshId())
+	if err != nil {
+		logging.Log.WriteErrorf(err.Error())
 	}
 
 	correspondingMesh.Prune()
@@ -51,7 +50,8 @@ func (s *SyncerImpl) Sync(correspondingMesh mesh.MeshProvider) error {
 		logging.Log.WriteInfof("meshes %s has changes", correspondingMesh.GetMeshId())
 	}
 
-	if self.GetType() == conf.PEER_ROLE && !correspondingMesh.HasChanges() && s.infectionCount == 0 {
+	// If removed sync with other nodes to gossip the node is removed
+	if self != nil && self.GetType() == conf.PEER_ROLE && !correspondingMesh.HasChanges() && s.infectionCount == 0 {
 		logging.Log.WriteInfof("no changes for %s", correspondingMesh.GetMeshId())
 
 		// If not synchronised in certain time pull from random neighbour
@@ -63,16 +63,19 @@ func (s *SyncerImpl) Sync(correspondingMesh mesh.MeshProvider) error {
 	}
 
 	before := time.Now()
-	s.manager.GetRouteManager().UpdateRoutes()
+	err = s.manager.GetRouteManager().UpdateRoutes()
+
+	if err != nil {
+		logging.Log.WriteErrorf(err.Error())
+	}
 
 	publicKey := s.manager.GetPublicKey()
 	nodeNames := correspondingMesh.GetPeers()
 
-	if self != nil {
-		nodeNames = lib.Filter(nodeNames, func(s string) bool {
-			return s != mesh.NodeID(self)
-		})
-	}
+	nodeNames = lib.Filter(nodeNames, func(s string) bool {
+		// Filter our only public key out so we dont sync with ourself
+		return s != publicKey.String()
+	})
 
 	var gossipNodes []string