Add message to syncproto, fix request handler

Makefile

@@ -21,7 +21,7 @@ protos-go:
 	@$(eval P_TREE_STORAGE_PATH_PB := $(ROOT_PKG)/acl/treestorage/treepb)
 	@$(eval P_ACL_CHANGES_PATH_PB := $(ROOT_PKG)/acl/aclchanges/aclpb)
 	@$(eval P_PLAINTEXT_CHANGES_PATH_PB := $(ROOT_PKG)/acl/testutils/testchanges/testchangepb)
-	@$(eval P_SYNC_CHANGES_PATH_PB := service/sync/syncpb)
+	@$(eval P_SYNC_CHANGES_PATH_PB := syncproto)
 	@$(eval P_TIMESTAMP := Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types)
 	@$(eval P_STRUCT := Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types)
 	@$(eval P_ACL_CHANGES := M$(P_ACL_CHANGES_PATH_PB)/protos/aclchanges.proto=github.com/anytypeio/go-anytype-infrastructure-experiments/$(P_ACL_CHANGES_PATH_PB))
@@ -32,11 +32,7 @@ protos-go:
 	$(GOGO_START) protoc --gogofaster_out=:. $(P_TREE_STORAGE_PATH_PB)/protos/*.proto; mv $(P_TREE_STORAGE_PATH_PB)/protos/*.go $(P_TREE_STORAGE_PATH_PB)
 	$(GOGO_START) protoc --gogofaster_out=:. $(P_PLAINTEXT_CHANGES_PATH_PB)/protos/*.proto; mv $(P_PLAINTEXT_CHANGES_PATH_PB)/protos/*.go $(P_PLAINTEXT_CHANGES_PATH_PB)
 	$(eval PKGMAP := $$(P_ACL_CHANGES),$$(P_TREE_CHANGES))
-	$(GOGO_START) protoc --gogofaster_out=$(PKGMAP):. $(P_SYNC_CHANGES_PATH_PB)/protos/*.proto; mv $(P_SYNC_CHANGES_PATH_PB)/protos/*.go $(P_SYNC_CHANGES_PATH_PB)
+	$(GOGO_START) protoc --gogofaster_out=$(PKGMAP),plugins=grpc:. $(P_SYNC_CHANGES_PATH_PB)/proto/*.proto
-
-protos:
-	GOGO_NO_UNDERSCORE=1 GOGO_EXPORT_ONEOF_INTERFACE=1 protoc --gogofaster_out=plugins=grpc:. syncproto/proto/*.proto
-
 
 build:
 	@$(eval FLAGS := $$(shell govvv -flags -pkg github.com/anytypeio/go-anytype-infrastructure-experiments/app))

service/net/secure/service.go

@@ -6,6 +6,7 @@ import (
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/app"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/app/logger"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/config"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys/asymmetric/signingkey"
 	"github.com/libp2p/go-libp2p-core/crypto"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/sec"
@@ -35,8 +36,9 @@ type service struct {
 }
 
 func (s *service) Init(ctx context.Context, a *app.App) (err error) {
-	peerConf := a.MustComponent(config.CName).(*config.Config).PeerList
+	account := a.MustComponent(config.CName).(*config.Config).Account
-	pkb, err := crypto.ConfigDecodeKey(peerConf.MyId.PrivKey)
+	decoder := signingkey.NewEDPrivKeyDecoder()
+	pkb, err := decoder.DecodeFromStringIntoBytes(account.SigningKey)
 	if err != nil {
 		return
 	}
@@ -44,7 +46,7 @@ func (s *service) Init(ctx context.Context, a *app.App) (err error) {
 		return
 	}
 
-	pid, err := peer.Decode(peerConf.MyId.PeerId)
+	pid, err := peer.Decode(account.PeerId)
 	if err != nil {
 		return
 	}
@@ -66,7 +68,7 @@ func (s *service) Init(ctx context.Context, a *app.App) (err error) {
 		return fmt.Errorf("peerId and privateKey mismatched")
 	}
 
-	log.Info("secure service init", zap.String("peerId", peerConf.MyId.PeerId))
+	log.Info("secure service init", zap.String("peerId", account.PeerId))
 
 	return nil
 }

service/sync/requesthandler/requesthandler.go

@@ -8,8 +8,8 @@ import (
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/treestorage"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/treestorage/treepb"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/account"
-	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/sync/syncpb"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/service/treecache"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/syncproto"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice"
 )
 
@@ -24,11 +24,12 @@ func New() app.Component {
 }
 
 type RequestHandler interface {
-	HandleFullSyncContent(ctx context.Context, senderId string, request *syncpb.SyncContent) (err error)
+	HandleFullSyncContent(ctx context.Context, senderId string, request *syncproto.Sync) (err error)
 }
 
 type MessageSender interface {
-	SendMessage(peerId string, msg *syncpb.SyncContent) error
+	SendMessage(peerId string, msg *syncproto.Sync) error
+	SendSpace(spaceId string, msg *syncproto.Sync) error
 }
 
 const CName = "SyncRequestHandler"
@@ -52,7 +53,7 @@ func (r *requestHandler) Close(ctx context.Context) (err error) {
 	return nil
 }
 
-func (r *requestHandler) HandleFullSyncContent(ctx context.Context, senderId string, content *syncpb.SyncContent) error {
+func (r *requestHandler) HandleFullSyncContent(ctx context.Context, senderId string, content *syncproto.Sync) error {
 	msg := content.GetMessage()
 	switch {
 	case msg.GetFullSyncRequest() != nil:
@@ -65,9 +66,9 @@ func (r *requestHandler) HandleFullSyncContent(ctx context.Context, senderId str
 	return nil
 }
 
-func (r *requestHandler) HandleHeadUpdate(ctx context.Context, senderId string, update *syncpb.SyncHeadUpdate) (err error) {
+func (r *requestHandler) HandleHeadUpdate(ctx context.Context, senderId string, update *syncproto.SyncHeadUpdate) (err error) {
 	var (
-		fullRequest  *syncpb.SyncFullRequest
+		fullRequest  *syncproto.SyncFullRequest
 		snapshotPath []string
 		result       acltree.AddResult
 	)
@@ -91,33 +92,33 @@ func (r *requestHandler) HandleHeadUpdate(ctx context.Context, senderId string,
 	// if there are no such tree
 	if err == treestorage.ErrUnknownTreeId {
 		// TODO: maybe we can optimize this by sending the header and stuff right away, so when the tree is created we are able to add it on first request
-		fullRequest = &syncpb.SyncFullRequest{
+		fullRequest = &syncproto.SyncFullRequest{
 			TreeId:     update.TreeId,
 			TreeHeader: update.TreeHeader,
 		}
 	}
 	// if we have incompatible heads, or we haven't seen the tree at all
 	if fullRequest != nil {
-		return r.messageService.SendMessage(senderId, syncpb.WrapFullRequest(fullRequest))
+		return r.messageService.SendMessage(senderId, syncproto.WrapFullRequest(fullRequest))
 	}
 	// if error or nothing has changed
 	if err != nil || len(result.Added) == 0 {
 		return err
 	}
 	// otherwise sending heads update message
-	newUpdate := &syncpb.SyncHeadUpdate{
+	newUpdate := &syncproto.SyncHeadUpdate{
 		Heads:        result.Heads,
 		Changes:      result.Added,
 		SnapshotPath: snapshotPath,
 		TreeId:       update.TreeId,
 		TreeHeader:   update.TreeHeader,
 	}
-	return r.messageService.SendMessage("", syncpb.WrapHeadUpdate(newUpdate))
+	return r.messageService.SendSpace("", syncproto.WrapHeadUpdate(newUpdate))
 }
 
-func (r *requestHandler) HandleFullSyncRequest(ctx context.Context, senderId string, request *syncpb.SyncFullRequest) (err error) {
+func (r *requestHandler) HandleFullSyncRequest(ctx context.Context, senderId string, request *syncproto.SyncFullRequest) (err error) {
 	var (
-		fullResponse *syncpb.SyncFullResponse
+		fullResponse *syncproto.SyncFullResponse
 		snapshotPath []string
 		result       acltree.AddResult
 	)
@@ -141,24 +142,24 @@ func (r *requestHandler) HandleFullSyncRequest(ctx context.Context, senderId str
 	if err != nil {
 		return err
 	}
-	err = r.messageService.SendMessage(senderId, syncpb.WrapFullResponse(fullResponse))
+	err = r.messageService.SendMessage(senderId, syncproto.WrapFullResponse(fullResponse))
 	// if error or nothing has changed
 	if err != nil || len(result.Added) == 0 {
 		return err
 	}
 
 	// otherwise sending heads update message
-	newUpdate := &syncpb.SyncHeadUpdate{
+	newUpdate := &syncproto.SyncHeadUpdate{
 		Heads:        result.Heads,
 		Changes:      result.Added,
 		SnapshotPath: snapshotPath,
 		TreeId:       request.TreeId,
 		TreeHeader:   request.TreeHeader,
 	}
-	return r.messageService.SendMessage("", syncpb.WrapHeadUpdate(newUpdate))
+	return r.messageService.SendSpace("", syncproto.WrapHeadUpdate(newUpdate))
 }
 
-func (r *requestHandler) HandleFullSyncResponse(ctx context.Context, senderId string, response *syncpb.SyncFullResponse) (err error) {
+func (r *requestHandler) HandleFullSyncResponse(ctx context.Context, senderId string, response *syncproto.SyncFullResponse) (err error) {
 	var (
 		snapshotPath []string
 		result       acltree.AddResult
@@ -185,21 +186,21 @@ func (r *requestHandler) HandleFullSyncResponse(ctx context.Context, senderId st
 		}
 	}
 	// sending heads update message
-	newUpdate := &syncpb.SyncHeadUpdate{
+	newUpdate := &syncproto.SyncHeadUpdate{
 		Heads:        result.Heads,
 		Changes:      result.Added,
 		SnapshotPath: snapshotPath,
 		TreeId:       response.TreeId,
 	}
-	return r.messageService.SendMessage("", syncpb.WrapHeadUpdate(newUpdate))
+	return r.messageService.SendSpace("", syncproto.WrapHeadUpdate(newUpdate))
 }
 
-func (r *requestHandler) prepareFullSyncRequest(treeId string, header *treepb.TreeHeader, theirPath []string, tree acltree.ACLTree) (*syncpb.SyncFullRequest, error) {
+func (r *requestHandler) prepareFullSyncRequest(treeId string, header *treepb.TreeHeader, theirPath []string, tree acltree.ACLTree) (*syncproto.SyncFullRequest, error) {
 	ourChanges, err := tree.ChangesAfterCommonSnapshot(theirPath)
 	if err != nil {
 		return nil, err
 	}
-	return &syncpb.SyncFullRequest{
+	return &syncproto.SyncFullRequest{
 		Heads:        tree.Heads(),
 		Changes:      ourChanges,
 		TreeId:       treeId,
@@ -212,7 +213,7 @@ func (r *requestHandler) prepareFullSyncResponse(
 	treeId string,
 	theirPath []string,
 	theirChanges []*aclpb.RawChange,
-	tree acltree.ACLTree) (*syncpb.SyncFullResponse, error) {
+	tree acltree.ACLTree) (*syncproto.SyncFullResponse, error) {
 	// TODO: we can probably use the common snapshot calculated on the request step from previous peer
 	ourChanges, err := tree.ChangesAfterCommonSnapshot(theirPath)
 	if err != nil {
@@ -231,7 +232,7 @@ func (r *requestHandler) prepareFullSyncResponse(
 		}
 	}
 
-	return &syncpb.SyncFullResponse{
+	return &syncproto.SyncFullResponse{
 		Heads:        tree.Heads(),
 		Changes:      final,
 		TreeId:       treeId,
@@ -240,7 +241,7 @@ func (r *requestHandler) prepareFullSyncResponse(
 	}, nil
 }
 
-func (r *requestHandler) createTree(ctx context.Context, response *syncpb.SyncFullResponse) error {
+func (r *requestHandler) createTree(ctx context.Context, response *syncproto.SyncFullResponse) error {
 	return r.treeCache.Add(
 		ctx,
 		response.TreeId,

service/sync/syncpb/helpers.go

@@ -1,19 +0,0 @@
-package syncpb
-
-func WrapHeadUpdate(update *SyncHeadUpdate) *SyncContent {
-	return &SyncContent{Message: &SyncContentValue{
-		Value: &SyncContentValueValueOfHeadUpdate{HeadUpdate: update},
-	}}
-}
-
-func WrapFullRequest(request *SyncFullRequest) *SyncContent {
-	return &SyncContent{Message: &SyncContentValue{
-		Value: &SyncContentValueValueOfFullSyncRequest{FullSyncRequest: request},
-	}}
-}
-
-func WrapFullResponse(response *SyncFullResponse) *SyncContent {
-	return &SyncContent{Message: &SyncContentValue{
-		Value: &SyncContentValueValueOfFullSyncResponse{FullSyncResponse: response},
-	}}
-}

service/sync/syncpb/protos/sync.proto

@@ -1,47 +0,0 @@
-syntax = "proto3";
-package sync;
-option go_package = "syncpb";
-
-import "pkg/acl/aclchanges/aclpb/protos/aclchanges.proto";
-import "pkg/acl/treestorage/treepb/protos/tree.proto";
-
-message Sync {
-  message Content {
-    ContentValue message = 1;
-  }
-
-  message ContentValue {
-    oneof value {
-      HeadUpdate headUpdate = 1;
-      Full.Request fullSyncRequest = 2;
-      Full.Response fullSyncResponse = 3;
-    }
-  }
-
-  message HeadUpdate {
-    repeated string heads = 1;
-    repeated acl.RawChange changes = 2;
-    string treeId = 3;
-    repeated string snapshotPath = 4;
-    tree.TreeHeader treeHeader = 5;
-  }
-
-  message Full {
-    // here with send the request with all changes we have (we already know sender's snapshot path)
-    message Request {
-      repeated string heads = 1;
-      repeated acl.RawChange changes = 2;
-      string treeId = 3;
-      repeated string snapshotPath = 4;
-      tree.TreeHeader treeHeader = 5;
-    }
-
-    message Response {
-      repeated string heads = 1;
-      repeated acl.RawChange changes = 2;
-      string treeId = 3;
-      repeated string snapshotPath = 4;
-      tree.TreeHeader treeHeader = 5;
-    }
-  }
-}

syncproto/helpers.go

@@ -0,0 +1,19 @@
+package syncproto
+
+func WrapHeadUpdate(update *SyncHeadUpdate) *Sync {
+	return &Sync{Message: &SyncContentValue{
+		Value: &SyncContentValueValueOfHeadUpdate{HeadUpdate: update},
+	}}
+}
+
+func WrapFullRequest(request *SyncFullRequest) *Sync {
+	return &Sync{Message: &SyncContentValue{
+		Value: &SyncContentValueValueOfFullSyncRequest{FullSyncRequest: request},
+	}}
+}
+
+func WrapFullResponse(response *SyncFullResponse) *Sync {
+	return &Sync{Message: &SyncContentValue{
+		Value: &SyncContentValueValueOfFullSyncResponse{FullSyncResponse: response},
+	}}
+}

syncproto/proto/sync.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 package anytype;
 option go_package = "/syncproto";
 
+import "pkg/acl/aclchanges/aclpb/protos/aclchanges.proto";
+import "pkg/acl/treestorage/treepb/protos/tree.proto";
+
 message Message {
     Header header = 1;
     bytes data = 2;
@@ -20,7 +23,6 @@ enum MessageType {
     MessageTypeSync = 2;
 }
 
-
 message System {
     Handshake handshake = 1;
     Ping ping = 2;
@@ -60,5 +62,40 @@ message Subscription {
 
 message Sync {
     string spaceId = 1;
+    ContentValue message = 2;
 
+    message ContentValue {
+        oneof value {
+            HeadUpdate headUpdate = 1;
+            Full.Request fullSyncRequest = 2;
+            Full.Response fullSyncResponse = 3;
+        }
+    }
+
+    message HeadUpdate {
+        repeated string heads = 1;
+        repeated acl.RawChange changes = 2;
+        string treeId = 3;
+        repeated string snapshotPath = 4;
+        tree.TreeHeader treeHeader = 5;
+    }
+
+    message Full {
+        // here with send the request with all changes we have (we already know sender's snapshot path)
+        message Request {
+            repeated string heads = 1;
+            repeated acl.RawChange changes = 2;
+            string treeId = 3;
+            repeated string snapshotPath = 4;
+            tree.TreeHeader treeHeader = 5;
+        }
+
+        message Response {
+            repeated string heads = 1;
+            repeated acl.RawChange changes = 2;
+            string treeId = 3;
+            repeated string snapshotPath = 4;
+            tree.TreeHeader treeHeader = 5;
+        }
+    }
 }