revert change to queue methods (#87)

* revert change to queue methods * claim channel is never queue * test
livekit · Mar 11, 2024 · 9926ccc · 9926ccc
1 parent 459d697
commit 9926ccc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/internal/bus/serialization.go b/internal/bus/serialization.go
@@ -49,7 +49,10 @@ func deserializeChannel(b []byte) (string, error) {
 
 func deserialize(b []byte) (proto.Message, error) {
 	a := &anypb.Any{}
-	err := proto.Unmarshal(b, a)
+	opt := proto.UnmarshalOptions{
+		DiscardUnknown: true,
+	}
+	err := opt.Unmarshal(b, a)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/info/channels.go b/pkg/info/channels.go
@@ -69,7 +69,7 @@ func (i *RequestInfo) GetHandlerKey() string {
 func (i *RequestInfo) GetClaimResponseChannel() bus.Channel {
 	return bus.Channel{
 		Legacy: formatChannel('|', i.Service, i.Method, i.Topic, "RCLAIM"),
-		Server: formatServerChannel(i.Service, i.Topic, i.Queue),
+		Server: formatServerChannel(i.Service, i.Topic, false),
 		Local:  formatLocalChannel(i.Method, "RCLAIM"),
 	}
 }

diff --git a/pkg/info/channels_test.go b/pkg/info/channels_test.go
@@ -67,7 +67,7 @@ func TestChannelFormatters(t *testing.T) {
 	require.Equal(t, "SRV.foo.a.b.c.Q", i.GetRPCChannel().Server)
 	require.Equal(t, "bar.REQ", i.GetRPCChannel().Local)
 	require.Equal(t, "foo|bar|a|b|c|RCLAIM", i.GetClaimResponseChannel().Legacy)
-	require.Equal(t, "SRV.foo.a.b.c.Q", i.GetClaimResponseChannel().Server)
+	require.Equal(t, "SRV.foo.a.b.c", i.GetClaimResponseChannel().Server)
 	require.Equal(t, "bar.RCLAIM", i.GetClaimResponseChannel().Local)
 	require.Equal(t, "foo|bar|a|b|c|STR", i.GetStreamServerChannel().Legacy)
 	require.Equal(t, "SRV.foo.a.b.c", i.GetStreamServerChannel().Server)

diff --git a/pkg/info/info.go b/pkg/info/info.go
@@ -44,9 +44,8 @@ func (s *ServiceDefinition) RegisterMethod(name string, affinityEnabled, multi,
 	s.Methods.Store(name, &MethodInfo{
 		AffinityEnabled: affinityEnabled,
 		Multi:           multi,
-		// TODO: move queue check to generator
-		RequireClaim: requireClaim && !queue,
-		Queue:        queue,
+		RequireClaim:    requireClaim,
+		Queue:           queue,
 	})
 }