Refactor Tramigo decoder

2 files changed, 101 insertions, 62 deletions

diff --git a/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java b/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java
index 4b0fe52b3..72cadf21a 100644
--- a/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java
+++ b/src/main/java/org/traccar/protocol/TramigoFrameDecoder.java
@@ -29,11 +29,15 @@ public class TramigoFrameDecoder extends BaseFrameDecoder {
             return null;
         }
 
+        int protocol = buf.getUnsignedByte(buf.readerIndex());
+
         int length;
-        if (buf.getUnsignedByte(buf.readerIndex()) == 0x80) {
+        if (protocol == 0x80) {
             length = buf.getUnsignedShortLE(buf.readerIndex() + 6);
-        } else {
+        } else if (protocol == 0x02 || protocol == 0x04) {
             length = buf.getUnsignedShortLE(buf.readerIndex() + 1);
+        } else {
+            length = buf.getUnsignedShort(buf.readerIndex() + 6);
         }
 
         if (length <= buf.readableBytes()) {
diff --git a/src/main/java/org/traccar/protocol/TramigoProtocolDecoder.java b/src/main/java/org/traccar/protocol/TramigoProtocolDecoder.java
index 21dd78da3..7be2cd092 100644
--- a/src/main/java/org/traccar/protocol/TramigoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TramigoProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2014 - 2023 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import org.traccar.model.Position;
 import java.net.SocketAddress;
 import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -54,28 +55,39 @@ public class TramigoProtocolDecoder extends BaseProtocolDecoder {
         ByteBuf buf = (ByteBuf) msg;
 
         int protocol = buf.readUnsignedByte();
-        boolean legacy = protocol == 0x80;
+
+        if (protocol == 0x01) {
+            return decode01(channel, remoteAddress, buf);
+        } else if (protocol == 0x80) {
+            return decode80(channel, remoteAddress, buf);
+        }
+
+        return null;
+    }
+
+    private Position decode01(Channel channel, SocketAddress remoteAddress, ByteBuf buf) {
 
         buf.readUnsignedByte(); // version id
-        int index = legacy ? buf.readUnsignedShort() : buf.readUnsignedShortLE();
-        int type = legacy ? buf.readUnsignedShort() : buf.readUnsignedShortLE();
-        buf.readUnsignedShort(); // length
-        buf.readUnsignedShort(); // mask
-        buf.readUnsignedShort(); // checksum
-        long id = legacy ? buf.readUnsignedInt() : buf.readUnsignedIntLE();
-        buf.readUnsignedInt(); // time
+        int index = buf.readUnsignedShortLE();
+        int type = buf.readUnsignedShortLE();
 
-        Position position = new Position(getProtocolName());
-        position.set(Position.KEY_INDEX, index);
-        position.setValid(true);
+        if (type == MSG_COMPACT || type == MSG_FULL) {
 
-        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.valueOf(id));
-        if (deviceSession == null) {
-            return null;
-        }
-        position.setDeviceId(deviceSession.getDeviceId());
+            buf.readUnsignedShort(); // length
+            buf.readUnsignedShort(); // mask
+            buf.readUnsignedShort(); // checksum
+            long id = buf.readUnsignedIntLE();
+            buf.readUnsignedInt(); // time
 
-        if (protocol == 0x01 && (type == MSG_COMPACT || type == MSG_FULL)) {
+            Position position = new Position(getProtocolName());
+            position.set(Position.KEY_INDEX, index);
+            position.setValid(true);
+
+            DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.valueOf(id));
+            if (deviceSession == null) {
+                return null;
+            }
+            position.setDeviceId(deviceSession.getDeviceId());
 
             // need to send ack?
 
@@ -105,56 +117,79 @@ public class TramigoProtocolDecoder extends BaseProtocolDecoder {
 
             return position;
 
-        } else if (legacy) {
+        }
 
-            if (channel != null) {
-                channel.writeAndFlush(new NetworkMessage(
-                        Unpooled.copiedBuffer("gprs,ack," + index, StandardCharsets.US_ASCII), remoteAddress));
-            }
+        return null;
 
-            String sentence = buf.toString(StandardCharsets.US_ASCII);
+    }
 
-            Pattern pattern = Pattern.compile("(-?\\d+\\.\\d+), (-?\\d+\\.\\d+)");
-            Matcher matcher = pattern.matcher(sentence);
-            if (!matcher.find()) {
-                return null;
-            }
-            position.setLatitude(Double.parseDouble(matcher.group(1)));
-            position.setLongitude(Double.parseDouble(matcher.group(2)));
-
-            pattern = Pattern.compile("([NSWE]{1,2}) with speed (\\d+) km/h");
-            matcher = pattern.matcher(sentence);
-            if (matcher.find()) {
-                for (int i = 0; i < DIRECTIONS.length; i++) {
-                    if (matcher.group(1).equals(DIRECTIONS[i])) {
-                        position.setCourse(i * 45.0);
-                        break;
-                    }
-                }
-                position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(matcher.group(2))));
-            }
+    private Position decode80(Channel channel, SocketAddress remoteAddress, ByteBuf buf) throws ParseException {
 
-            pattern = Pattern.compile("(\\d{1,2}:\\d{2}(:\\d{2})? \\w{3} \\d{1,2})");
-            matcher = pattern.matcher(sentence);
-            if (!matcher.find()) {
-                return null;
-            }
-            DateFormat dateFormat = new SimpleDateFormat(
-                    matcher.group(2) != null ? "HH:mm:ss MMM d yyyy" : "HH:mm MMM d yyyy", Locale.ENGLISH);
-            position.setTime(DateUtil.correctYear(
-                    dateFormat.parse(matcher.group(1) + " " + Calendar.getInstance().get(Calendar.YEAR))));
-
-            if (sentence.contains("Ignition on detected")) {
-                position.set(Position.KEY_IGNITION, true);
-            } else if (sentence.contains("Ignition off detected")) {
-                position.set(Position.KEY_IGNITION, false);
-            }
+        buf.readUnsignedByte(); // version id
+        int index = buf.readUnsignedShort();
+        buf.readUnsignedShort(); // type
 
-            return position;
+        buf.readUnsignedShort(); // length
+        buf.readUnsignedShort(); // mask
+        buf.readUnsignedShort(); // checksum
+        long id = buf.readUnsignedInt();
+        buf.readUnsignedInt(); // time
+
+        Position position = new Position(getProtocolName());
+        position.set(Position.KEY_INDEX, index);
+        position.setValid(true);
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.valueOf(id));
+        if (deviceSession == null) {
+            return null;
+        }
+        position.setDeviceId(deviceSession.getDeviceId());
 
+        if (channel != null) {
+            channel.writeAndFlush(new NetworkMessage(
+                    Unpooled.copiedBuffer("gprs,ack," + index, StandardCharsets.US_ASCII), remoteAddress));
         }
 
-        return null;
+        String sentence = buf.toString(StandardCharsets.US_ASCII);
+
+        Pattern pattern = Pattern.compile("(-?\\d+\\.\\d+), (-?\\d+\\.\\d+)");
+        Matcher matcher = pattern.matcher(sentence);
+        if (!matcher.find()) {
+            return null;
+        }
+        position.setLatitude(Double.parseDouble(matcher.group(1)));
+        position.setLongitude(Double.parseDouble(matcher.group(2)));
+
+        pattern = Pattern.compile("([NSWE]{1,2}) with speed (\\d+) km/h");
+        matcher = pattern.matcher(sentence);
+        if (matcher.find()) {
+            for (int i = 0; i < DIRECTIONS.length; i++) {
+                if (matcher.group(1).equals(DIRECTIONS[i])) {
+                    position.setCourse(i * 45.0);
+                    break;
+                }
+            }
+            position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(matcher.group(2))));
+        }
+
+        pattern = Pattern.compile("(\\d{1,2}:\\d{2}(:\\d{2})? \\w{3} \\d{1,2})");
+        matcher = pattern.matcher(sentence);
+        if (!matcher.find()) {
+            return null;
+        }
+        DateFormat dateFormat = new SimpleDateFormat(
+                matcher.group(2) != null ? "HH:mm:ss MMM d yyyy" : "HH:mm MMM d yyyy", Locale.ENGLISH);
+        position.setTime(DateUtil.correctYear(
+                dateFormat.parse(matcher.group(1) + " " + Calendar.getInstance().get(Calendar.YEAR))));
+
+        if (sentence.contains("Ignition on detected")) {
+            position.set(Position.KEY_IGNITION, true);
+        } else if (sentence.contains("Ignition off detected")) {
+            position.set(Position.KEY_IGNITION, false);
+        }
+
+        return position;
+
     }
 
 }