GO-5401: Add object type to message for ignore purposes

commonspace/object/acl/syncacl/headupdate.go

@@ -1,6 +1,7 @@
 package syncacl
 
 import (
+	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 	"github.com/anyproto/any-sync/commonspace/sync/objectsync/objectmessages"
 	"github.com/anyproto/any-sync/consensus/consensusproto"
 )
@@ -24,6 +25,10 @@ func (h *InnerHeadUpdate) MsgSize() uint64 {
 	return size + uint64(len(h.head)) + uint64(len(h.root.Id)) + uint64(len(h.root.Payload))
 }
 
+func (h *InnerHeadUpdate) ObjectType() spacesyncproto.ObjectType {
+	return spacesyncproto.ObjectType_Acl
+}
+
 func (h *InnerHeadUpdate) Prepare() error {
 	logMsg := consensusproto.WrapHeadUpdate(&consensusproto.LogHeadUpdate{
 		Head:    h.head,

commonspace/object/tree/synctree/headupdate.go

@@ -4,6 +4,7 @@ import (
 	"slices"
 
 	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 	"github.com/anyproto/any-sync/commonspace/sync/objectsync/objectmessages"
 )
 
@@ -21,6 +22,10 @@ func (h *InnerHeadUpdate) MsgSize() (size uint64) {
 	return uint64(len(h.prepared))
 }
 
+func (h *InnerHeadUpdate) ObjectType() spacesyncproto.ObjectType {
+	return spacesyncproto.ObjectType_Tree
+}
+
 func (h *InnerHeadUpdate) Prepare() error {
 	treeMsg := treechangeproto.WrapHeadUpdate(&treechangeproto.TreeHeadUpdate{
 		Heads:        h.heads,

commonspace/spacesyncproto/protos/spacesync.proto

@@ -79,6 +79,7 @@ message ObjectSyncMessage {
     string replyId = 3;
     bytes payload = 4;
     string objectId = 5;
+    ObjectType objectType = 6;
 }
 
 // SpacePushRequest is a request to add space on a node containing only one acl record
@@ -201,4 +202,11 @@ enum DiffType {
     Initial = 0;
     V1 = 1;
     V2 = 2;
-}
+}
+
+// ObjectType is a type of object
+enum ObjectType {
+    Tree = 0;
+    Acl = 1;
+    KeyValue = 2;
+}

commonspace/sync/objectsync/objectmessages/headupdate.go

@@ -39,6 +39,7 @@ type InnerHeadUpdate interface {
 	Prepare() error
 	Heads() []string
 	MsgSize() uint64
+	ObjectType() spacesyncproto.ObjectType
 }
 
 type ObjectMeta struct {
@@ -48,10 +49,11 @@ type ObjectMeta struct {
 }
 
 type HeadUpdate struct {
-	Meta   ObjectMeta
-	Bytes  []byte
-	Update InnerHeadUpdate
-	msg    *spacesyncproto.ObjectSyncMessage
+	Meta       ObjectMeta
+	Bytes      []byte
+	Update     InnerHeadUpdate
+	objectType spacesyncproto.ObjectType
+	msg        *spacesyncproto.ObjectSyncMessage
 }
 
 func (h *HeadUpdate) MsgSize() uint64 {
@@ -84,6 +86,7 @@ func (h *HeadUpdate) SetProtoMessage(message proto.Message) error {
 	h.Bytes = msg.GetPayload()
 	h.Meta.SpaceId = msg.SpaceId
 	h.Meta.ObjectId = msg.ObjectId
+	h.objectType = msg.GetObjectType()
 	return nil
 }
 
@@ -94,14 +97,19 @@ func (h *HeadUpdate) ProtoMessage() (proto.Message, error) {
 			return nil, err
 		}
 		return &spacesyncproto.ObjectSyncMessage{
-			SpaceId:  h.Meta.SpaceId,
-			Payload:  payload,
-			ObjectId: h.Meta.ObjectId,
+			SpaceId:    h.Meta.SpaceId,
+			Payload:    payload,
+			ObjectId:   h.Meta.ObjectId,
+			ObjectType: h.Update.ObjectType(),
 		}, nil
 	}
 	return NewMessage(), nil
 }
 
+func (h *HeadUpdate) ObjectType() spacesyncproto.ObjectType {
+	return h.objectType
+}
+
 func (h *HeadUpdate) SpaceId() string {
 	return h.Meta.SpaceId
 }
@@ -116,9 +124,10 @@ func (h *HeadUpdate) ObjectId() string {
 
 func (h *HeadUpdate) Copy() drpc.Message {
 	return &HeadUpdate{
-		Meta:   h.Meta,
-		Bytes:  h.Bytes,
-		Update: h.Update,
-		msg:    h.msg,
+		Meta:       h.Meta,
+		Bytes:      h.Bytes,
+		Update:     h.Update,
+		msg:        h.msg,
+		objectType: h.objectType,
 	}
 }

commonspace/sync/sync.go

@@ -12,6 +12,7 @@ import (
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/commonspace/peermanager"
 	"github.com/anyproto/any-sync/commonspace/spacestate"
+	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 	"github.com/anyproto/any-sync/commonspace/sync/syncdeps"
 	"github.com/anyproto/any-sync/metric"
 	"github.com/anyproto/any-sync/nodeconf"
@@ -117,6 +118,9 @@ func (s *syncService) HandleMessage(ctx context.Context, msg drpc.Message) error
 	if !ok {
 		return ErrUnexpectedMessage
 	}
+	if idMsg.ObjectType() == spacesyncproto.ObjectType_KeyValue {
+		return nil
+	}
 	objectId := idMsg.ObjectId()
 	err := s.receiveQueue.Add(ctx, objectId, msgCtx{
 		ctx:      ctx,

commonspace/sync/sync_test.go

@@ -115,6 +115,14 @@ func TestSyncService(t *testing.T) {
 		}
 		require.Equal(t, headUpdate, f.syncHandler.headUpdate)
 	})
+	t.Run("handle key value message no op", func(t *testing.T) {
+		f := newFixture(t)
+		headUpdate := &testMessage{objectId: "objectId", objectType: spacesyncproto.ObjectType_KeyValue}
+		err := f.HandleMessage(ctx, headUpdate)
+		require.NoError(t, err)
+		f.Close(t)
+		require.Nil(t, f.syncHandler.headUpdate)
+	})
 	t.Run("handle message", func(t *testing.T) {
 		f := newFixture(t)
 		f.syncHandler.toReceiveData = map[string][]*testResponse{
@@ -386,7 +394,12 @@ func (r *testRequest) MsgSize() uint64 {
 }
 
 type testMessage struct {
-	objectId string
+	objectId   string
+	objectType spacesyncproto.ObjectType
+}
+
+func (t *testMessage) ObjectType() spacesyncproto.ObjectType {
+	return t.objectType
 }
 
 func (t *testMessage) ObjectId() string {

commonspace/sync/syncdeps/message.go

@@ -1,6 +1,9 @@
 package syncdeps
 
+import "github.com/anyproto/any-sync/commonspace/spacesyncproto"
+
 type Message interface {
 	ObjectId() string
 	MsgSize() uint64
+	ObjectType() spacesyncproto.ObjectType
 }

net/secureservice/secureservice.go

@@ -30,12 +30,14 @@ var (
 	// ProtoVersion 3 - acl with breaking changes / multiplayer
 	// ProtoVersion 4 - new sync compatible version
 	// ProtoVersion 5 - sync with no entry space
+	// ProtoVersion 6 - sync with key value messages
 	CompatibleVersion = uint32(4)
 	ProtoVersion      = uint32(5)
+	KeyValueVersion   = uint32(6)
 )
 
 var (
-	compatibleVersions = []uint32{CompatibleVersion, ProtoVersion}
+	compatibleVersions = []uint32{CompatibleVersion, ProtoVersion, KeyValueVersion}
 )
 
 func New() SecureService {