Version: 3.0.2 Update

src/main/java/hae/instances/http/HttpMessageHandler.java

@@ -11,16 +11,19 @@ import hae.component.board.message.MessageTableModel;
 import hae.instances.http.utils.MessageProcessor;
 import hae.utils.string.StringProcessor;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 public class HttpMessageHandler implements HttpHandler {
     private final MontoyaApi api;
-    private MessageTableModel messageTableModel;
+    private final MessageTableModel messageTableModel;
     private final MessageProcessor messageProcessor;
-    private String host;
 
     // Montoya API对HTTP消息的处理分为了请求和响应，因此此处设置高亮和标记需要使用全局变量的方式，以此兼顾请求和响应
     // 同时采用 ThreadLocal 来保证多线程并发的情况下全局变量的安全性
+    private final ThreadLocal<String> host = ThreadLocal.withInitial(() -> "");
     private final ThreadLocal<List<String>> colorList = ThreadLocal.withInitial(ArrayList::new);
     private final ThreadLocal<List<String>> commentList = ThreadLocal.withInitial(ArrayList::new);
     private final ThreadLocal<Boolean> matches = ThreadLocal.withInitial(() -> false);
@@ -41,13 +44,13 @@ public class HttpMessageHandler implements HttpHandler {
 
         httpRequest.set(httpRequestToBeSent);
 
-        host = StringProcessor.getHostByUrl(httpRequestToBeSent.url());
+        host.set(StringProcessor.getHostByUrl(httpRequestToBeSent.url()));
 
         List<String> suffixList = Arrays.asList(Config.suffix.split("\\|"));
         matches.set(suffixList.contains(httpRequestToBeSent.fileExtension()));
 
         if (!matches.get()) {
-            List<Map<String, String>> result = messageProcessor.processRequest(host, httpRequestToBeSent, true);
+            List<Map<String, String>> result = messageProcessor.processRequest(host.get(), httpRequestToBeSent, true);
             setColorAndCommentList(result);
         }
 
@@ -59,7 +62,7 @@ public class HttpMessageHandler implements HttpHandler {
         Annotations annotations = httpResponseReceived.annotations();
 
         if (!matches.get()) {
-            List<Map<String, String>> result = messageProcessor.processResponse(host, httpResponseReceived, true);
+            List<Map<String, String>> result = messageProcessor.processResponse(host.get(), httpResponseReceived, true);
             setColorAndCommentList(result);
             // 设置高亮颜色和注释
             if (!colorList.get().isEmpty() && !commentList.get().isEmpty()) {

src/main/java/hae/instances/http/utils/MessageProcessor.java

@@ -24,6 +24,7 @@ public class MessageProcessor {
 
     public List<Map<String, String>> processMessage(String host, String message, boolean flag) {
         Map<String, Map<String, Object>> obj = null;
+
         try {
             obj = regularMatcher.match(host, "any", message, message, message);
         } catch (Exception ignored) {
@@ -34,6 +35,7 @@ public class MessageProcessor {
 
     public List<Map<String, String>> processResponse(String host, HttpResponse httpResponse, boolean flag) {
         Map<String, Map<String, Object>> obj = null;
+
         try {
             String response = new String(httpResponse.toByteArray().getBytes(), StandardCharsets.UTF_8);
             String body = new String(httpResponse.body().getBytes(), StandardCharsets.UTF_8);
@@ -57,6 +59,7 @@ public class MessageProcessor {
             String header = httpRequest.headers().stream()
                     .map(HttpHeader::toString)
                     .collect(Collectors.joining("\n"));
+
             obj = regularMatcher.match(host, "request", request, header, body);
         } catch (Exception ignored) {
         }
@@ -99,6 +102,7 @@ public class MessageProcessor {
             String data = tempMap.get("data").toString();
             extractedData.put(key, data);
         });
+
         return extractedData;
     }
 
@@ -114,10 +118,11 @@ public class MessageProcessor {
         List<List<String>> result = new ArrayList<>();
         result.add(colorList);
         result.add(commentList);
+
         return result;
     }
 
-    public List<Integer> retrieveColorIndices(List<String> colors){
+    public List<Integer> retrieveColorIndices(List<String> colors) {
         List<Integer> indices = new ArrayList<>();
         String[] colorArray = Config.color;
         int size = colorArray.length;
@@ -129,6 +134,7 @@ public class MessageProcessor {
                 }
             }
         }
+
         return indices;
     }
 
@@ -154,7 +160,7 @@ public class MessageProcessor {
         HashSet tmpList = new HashSet(stack);
         if (stack.size() == tmpList.size()) {
             stack.sort(Comparator.comparingInt(Integer::intValue));
-            if(stack.get(0) < 0) {
+            if (stack.get(0) < 0) {
                 finalColor = colorArray[0];
             } else {
                 finalColor = colorArray[stack.get(0)];

src/main/java/hae/instances/http/utils/RegularMatcher.java

@@ -202,8 +202,8 @@ public class RegularMatcher {
         while (matcher.find()) {
             if (!matcher.group(1).isEmpty()) {
                 Object[] params = indexList.stream().map(i -> {
-                    if (!matcher.group(i+1).isEmpty()) {
-                        return matcher.group(i+1);
+                    if (!matcher.group(i + 1).isEmpty()) {
+                        return matcher.group(i + 1);
                     }
                     return "";
                 }).toArray();