fix(net): 优化数据包解析及日志记录逻辑

- 在 NewCurrentCollectorParser 中增加正则校验，提高数据包匹配准确性
- 修复 Packet 类中 length 属性的格式问题，确保正确访问
- 调整 PacketParserFactory，修复可能的空数据问题，增强健壮性
- TcpServer 中新增 logMessage 方法拆分日志记录逻辑
- 根据包匹配结果分别记录详细或简化日志，增强调试信息
- 修复 TcpServer 中不匹配数据包时的响应，避免无效处理

app/net/Packet.php

@@ -177,7 +177,7 @@ class Packet
         get => $this->rawText;
     }
 
-    public int $length{
+    public int $length {
         get => strlen($this->rawBytes);
     }
 

app/net/parsers/NewCurrentCollectorParser.php

@@ -15,11 +15,17 @@ class NewCurrentCollectorParser implements PacketParserInterface
 
     public function parse(string $hexString): array
     {
-        return [
-            'hexType' => 4,
-            'isMatched' => true,
-            'detectionDevice' => substr($hexString, 16, 2),
-            'channel1' => substr($hexString, 24, 2),
-        ];
+        $pattern = '/^BBBB([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{8})$/';
+        
+        if (preg_match($pattern, $hexString, $matches)) {
+            return [
+                'hexType' => 4,
+                'isMatched' => true,
+                'detectionDevice' => substr($hexString, 16, 2),
+                'channel1' => substr($hexString, 24, 2),
+            ];
+        }
+        
+        return ['isMatched' => false];
     }
 }

app/net/parsers/PacketParserFactory.php

@@ -30,7 +30,9 @@ class PacketParserFactory
     /**
      * 防止克隆（保障单例唯一性）
      */
-    private function __clone() {}
+    private function __clone()
+    {
+    }
 
     /**
      * 防止反序列化（保障单例唯一性）
@@ -91,7 +93,7 @@ class PacketParserFactory
             }
         }
 
-        return new Packet($rawBytes, $parsedData);
+        return new Packet($rawBytes, $parsedData ?? []);
     }
 
     /**

app/process/TcpServer.php

@@ -82,21 +82,14 @@ class TcpServer
         self::$connections[$ip] = $connection;
         $packet = PacketParserFactory::new($data);
         $context = new PacketContext(self::getConnections(), $connection, $packet);
-        // 格式化输出报文信息文本框
-        Logger::debug(Logger::generateTextBox([
-            "----------------------------  PACKET --------------------------------",
-            "IP Address   : {$ip}",
-            "Packet Length: {$packet->length}",
-            "Hex Packet   : {$packet->hexString}",
-            "Packet Type  : {$packet->hexType->name}",
-            "----------------------------  DATA   --------------------------------",
-            "Reader Info  : {$packet->reader}",
-            "Card Info    : {$packet->card}",
-            "Gateway Info : {$packet->gateway}",
-        ]));
+        $this->logMessage($packet, $ip);
 
-        $result = FlowMain::getInstance()->main($context);
-        $connection->send($result->getFullVoice());
+        if ($packet->isMatched) {
+            $result = FlowMain::getInstance()->main($context);
+            $connection->send($result->getFullVoice());
+        } else {
+            $connection->send("Packet is not matched");
+        }
     }
 
     /**
@@ -107,4 +100,36 @@ class TcpServer
         unset(self::$connections[$connection->getRemoteIp()]);
         Logger::info("客户端已断开连接：{$connection->getRemoteIp()}");
     }
+
+    /**
+     * @param \app\net\Packet $packet
+     * @param string $ip
+     * @return void
+     */
+    public function logMessage(\app\net\Packet $packet, string $ip): void
+    {
+        if ($packet->isMatched) {
+            Logger::debug(Logger::generateTextBox([
+                "----------------------------  PACKET --------------------------------",
+                "IP Address   : {$ip}",
+                "Packet Length: {$packet->length}",
+                "Hex Packet   : {$packet->hexString}",
+                "Packet Type  : {$packet->hexType->name}",
+                "----------------------------  DATA   --------------------------------",
+                "Reader Info  : {$packet->reader}",
+                "Card Info    : {$packet->card}",
+                "Gateway Info : {$packet->gateway}",
+            ]));
+        } else {
+            Logger::debug("Packet is not matched");
+            Logger::debug(Logger::generateTextBox([
+                "----------------------------  PACKET --------------------------------",
+                "IP Address   : {$ip}",
+                "Packet Length: {$packet->length}",
+                "Packet Type  : {$packet->hexType->name}",
+                "----------------------------  DATA   --------------------------------",
+                "Hex Packet   : {$packet->hexString}"
+            ]));
+        }
+    }
 }