feat(proto): ✨ improve message disambiguation logic

Enhances message parsing by adding context parameters for better error reporting and thread-safe handling. Improves disambiguation of similar messages by comparing message names and provides detailed diagnostics when ambiguity remains.

Author: caunt

src/EcoFlow.Mqtt.Api/Extensions/ProtobufExtensions.cs

@@ -26,10 +26,11 @@ public string ToStringWithTitle()
 
     extension(ByteString byteString)
     {
-        public IMessage AsEcoFlowMessage()
+        public IMessage AsEcoFlowMessage(int cmdFunc, int cmdId)
         {
             var sizes = new Dictionary<IMessage, int>();
             var messages = ProtobufMessages.Parsers
+                .AsParallel()
                 .Select(parser =>
                 {
                     IMessage? message = null;
@@ -44,12 +45,21 @@ public IMessage AsEcoFlowMessage()
                     }
 
                     if (message is not null)
-                        sizes[message] = message.UnknownFields.CalculateSize();
+                    {
+                        var unknownFieldsSize = message.UnknownFields?.CalculateSize() ?? 0;
+
+                        lock (sizes)
+                            sizes[message] = unknownFieldsSize;
+                    }
 
                     return message;
                 })
                 .WhereNotNull()
-                .OrderBy(message => sizes[message]);
+                .OrderBy(message =>
+                {
+                    lock (sizes)
+                        return sizes[message];
+                });
 
             var candidates = messages.Take(2).ToArray();
 
@@ -60,8 +70,24 @@ public IMessage AsEcoFlowMessage()
                 return candidates[0];
 
             if (sizes[candidates[0]] * 2 >= sizes[candidates[1]])
+            {
+                var size = sizes[candidates[0]];
+                var sameSizeMessages = messages.TakeWhile(messages => sizes[messages] == size);
+                var messageNames = sameSizeMessages.Select(message => message.GetType().Name.Split('.').Last());
+
+                /*
+                    0 => Ecoflow.Common.Proto.DevAplComm.DisplayPropertyUpload
+                    0 => Ecoflow.Common.Proto.DeviceSys.DisplayPropertyUpload
+                    0 => Ecoflow.EnergyStorageModule.Proto.Pd335Sys.DisplayPropertyUpload
+                    0 => Ecoflow.EnergyStorageModule.Proto.Pr705.DisplayPropertyUpload
+                */
+
+                if (messageNames.Distinct().Count() is 1)
+                    return candidates[0];
+
                 throw new InvalidOperationException($"Multiple messages could be parsed from the payload, and the best match is not significantly better than the second best match:\n" +
-                    $"{string.Join("\n", messages.Take(15).Select(message => $"{sizes[message]} => {message.GetType()}"))}");
+                    $"{string.Join("\n", messages.Take(15).Select(message => $"{sizes[message]} => {message.GetType()}"))}\ncmdFunc: {cmdFunc}, cmdId:{cmdId}\n{Convert.ToHexString(byteString.Span)}");
+            }
 
             return candidates[0];
         }