修复 MsgCodecImpl 解析以空白字符开头的数据时，未能解析出 Message 的问题

troyzhxu · troyzhxu · commit 020b4160a0cd · 2021-06-22T17:36:58.000+08:00
diff --git a/okhttps-stomp/src/main/java/com/ejlchina/stomp/MsgCodecImpl.java b/okhttps-stomp/src/main/java/com/ejlchina/stomp/MsgCodecImpl.java
@@ -86,10 +86,7 @@ public synchronized void decode(String input, OnCallback<Message> out) {
      * @param start &#24320;&#22987;&#35299;&#26512;&#30340;&#38382;&#39064;
      */
     protected void decode(OnCallback<Message> out, int start) {
-        if (start > 0) {
-            // &#28165;&#31354; start &#20043;&#21069;&#30340;&#25968;&#25454;
-            pending.delete(0, start);
-        }
+        cleanPendingStartData(start);
         // Body &#32467;&#23614;&#31526;&#19979;&#26631;
         int bEndIdx = pending.indexOf(bodyEnd);
         if (bEndIdx < 0) {
@@ -122,13 +119,32 @@ protected void decode(OnCallback<Message> out, int start) {
         decode(out, bEndIdx + bodyEnd.length());
     }
 
+    protected void cleanPendingStartData(int start) {
+        if (start > 0) {
+            // &#28165;&#31354; start &#20043;&#21069;&#30340;&#25968;&#25454;
+            pending.delete(0, start);
+        }
+        // Command &#24320;&#22987;&#31526;&#19979;&#26631;
+        int index = 0;
+        for (int i = 0; i < pending.length(); i++) {
+            char c = pending.charAt(i);
+            if (isCommandChar(c)) {
+                index = i;
+            }
+        }
+        if (index > 0) {
+            // &#28165;&#31354; Command &#20043;&#21069;&#30340;&#25968;&#25454;
+            pending.delete(0, index);
+        }
+    }
+
     /**
      * &#35299;&#26512; Headers
      * @param cEndIdx Command &#32467;&#23614;&#31526;&#19979;&#26631;
      * @param hEndIdx Headers &#32467;&#23614;&#31526;&#19979;&#26631;
      * @return Headers
      */
-    private List<Header> decodeHeaders(int cEndIdx, int hEndIdx) {
+    protected List<Header> decodeHeaders(int cEndIdx, int hEndIdx) {
         String[] strHeaders = pending.substring(cEndIdx + commandEnd.length(), hEndIdx)
                 .split(headerDelimiter);
         List<Header> headers = new ArrayList<>(strHeaders.length);
@@ -145,6 +161,10 @@ protected boolean isCommand(String command) {
         return !command.isEmpty() && command.matches("[A-Z]+");
     }
 
+    protected boolean isCommandChar(char c) {
+        return c >= 'A' && c <= 'Z';
+    }
+
     protected Message createMessage(String command, List<Header> headers, String payload) {
         return new Message(command, headers, payload);
     }
