Add option for controlling reponse from CapHeader. #1541

dotnetcore · Jun 10, 2024 · 1cd3f40 · 1cd3f40
1 parent bce8dc7
commit 1cd3f40
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/DotNetCore.CAP/Internal/ISubscribeInvoker.Default.cs b/src/DotNetCore.CAP/Internal/ISubscribeInvoker.Default.cs
@@ -50,21 +50,19 @@ public async Task<ConsumerExecutedResult> InvokeAsync(ConsumerContext context,
         var message = context.DeliverMessage;
         var parameterDescriptors = context.ConsumerDescriptor.Parameters;
         var executeParameters = new object?[parameterDescriptors.Count];
-        var headerIndex = 0;
         for (var i = 0; i < parameterDescriptors.Count; i++)
         {
             var parameterDescriptor = parameterDescriptors[i];
             if (parameterDescriptor.IsFromCap)
             {
                 executeParameters[i] = GetCapProvidedParameter(parameterDescriptor, message, cancellationToken);
-                headerIndex = i;
             }
             else
             {
                 if (message.Value != null)
                 {
                     // use ISerializer when reading from storage, skip other objects if not Json
-                    if (_serializer.IsJsonType(message.Value)) 
+                    if (_serializer.IsJsonType(message.Value))
                     {
                         executeParameters[i] =
                             _serializer.Deserialize(message.Value, parameterDescriptor.ParameterType);
@@ -125,7 +123,16 @@ public async Task<ConsumerExecutedResult> InvokeAsync(ConsumerContext context,
             }
         }
 
-        return new ConsumerExecutedResult(resultObj, message.GetId(), message.GetCallbackName(), (executeParameters[headerIndex] as CapHeader)?.ResponseHeader);
+        var callbackName = message.GetCallbackName();
+        if (string.IsNullOrEmpty(callbackName))
+        {
+            return new ConsumerExecutedResult(resultObj, message.GetId(), null, null);
+        }
+        else
+        {
+            var capHeader = executeParameters.FirstOrDefault(x => x is CapHeader) as CapHeader;
+            return new ConsumerExecutedResult(resultObj, message.GetId(), callbackName, capHeader?.ResponseHeader);
+        }
     }
 
     private static object GetCapProvidedParameter(ParameterDescriptor parameterDescriptor, Message message,