dallmann-consulting#85 Multiline Json regex

andreasringdal · Nov 29, 2024 · 7c6f340 · 7c6f340
1 parent 6a62e2c
commit 7c6f340
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/OCPP.Core.Server/OCPPMiddleware.cs b/OCPP.Core.Server/OCPPMiddleware.cs
@@ -47,7 +47,7 @@ public partial class OCPPMiddleware
         // RegExp for splitting ocpp message parts
         // ^\[\s*(\d)\s*,\s*\"([^"]*)\"\s*,(?:\s*\"(\w*)\"\s*,)?\s*(.*)\s*\]$
         // Third block is optional, because responses don't have an action
-        private static string MessageRegExp = "^\\[\\s*(\\d)\\s*,\\s*\"([^\"]*)\"\\s*,(?:\\s*\"(\\w*)\"\\s*,)?\\s*(.*)\\s*\\]$";
+        private static string MessageRegExp = "^\\[\\s*(\\d+)\\s*,\\s*\"([^\"]+)\"\\s*,\\s*(?:\\s*\"(\\w+)\"\\s*,)?\\s*(\\{[^}]+\\}|\\{[\\s\\S]*?\\})\\s*\\]$";
 
         private readonly RequestDelegate _next;
         private readonly ILoggerFactory _logFactory;