Decode Eview Pet configuration

3 files changed, 178 insertions, 1 deletions

diff --git a/src/main/java/org/traccar/helper/BufferUtil.java b/src/main/java/org/traccar/helper/BufferUtil.java
index 12c31ba9d..b453c437f 100644
--- a/src/main/java/org/traccar/helper/BufferUtil.java
+++ b/src/main/java/org/traccar/helper/BufferUtil.java
@@ -83,4 +83,8 @@ public final class BufferUtil {
         return printable;
     }
 
+    public static String readString(ByteBuf buf, int length) {
+        return buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+    }
+
 }
diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
index 57ceab4c7..64373e344 100644
--- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 - 2023 Anton Tananaev (anton@traccar.org)
+ * Copyright 2019 - 2024 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.
@@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.BufferUtil;
 import org.traccar.session.DeviceSession;
 import org.traccar.NetworkMessage;
 import org.traccar.Protocol;
@@ -315,6 +316,10 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
 
             return positions;
 
+        } else if (type == MSG_CONFIGURATION) {
+
+            return decodeConfiguration(channel, remoteAddress, buf);
+
         } else if (type == MSG_RESPONSE) {
 
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
@@ -337,4 +342,169 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
         return null;
     }
 
+    private Position decodeConfiguration(Channel channel, SocketAddress remoteAddress, ByteBuf buf) {
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+        if (deviceSession == null) {
+            return null;
+        }
+
+        Position position = new Position(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        getLastLocation(position, null);
+
+        while (buf.isReadable()) {
+            int length = buf.readUnsignedByte() - 1;
+            int endIndex = buf.readerIndex() + length + 1;
+            int key = buf.readUnsignedByte();
+
+            switch (key) {
+                case 0x01:
+                    position.set("moduleNumber", buf.readUnsignedInt());
+                    break;
+                case 0x02:
+                    position.set(Position.KEY_VERSION_FW, String.valueOf(buf.readUnsignedInt()));
+                    break;
+                case 0x03:
+                    position.set("imei", buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
+                    break;
+                case 0x04:
+                    position.set(Position.KEY_ICCID, BufferUtil.readString(buf, length));
+                    break;
+                case 0x05:
+                    position.set("bleMac", ByteBufUtil.hexDump(buf.readSlice(length)));
+                    break;
+                case 0x06:
+                    position.set("settingTime", buf.readUnsignedInt());
+                    break;
+                case 0x07:
+                    position.set("runTimes", buf.readUnsignedInt());
+                    break;
+                case 0x0A:
+                    position.set("interval", buf.readUnsignedMedium());
+                    position.set("petMode", buf.readUnsignedByte());
+                    break;
+                case 0x0D:
+                    position.set("passwordProtect", buf.readUnsignedInt());
+                    break;
+                case 0x0E:
+                    position.set("timeZone", (int) buf.readByte());
+                    break;
+                case 0x0F:
+                    position.set("enableControl", buf.readUnsignedInt());
+                    break;
+                case 0x13:
+                    position.set("deviceName", BufferUtil.readString(buf, length));
+                    break;
+                case 0x14:
+                    position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+                    position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+                    break;
+                case 0x15:
+                    position.set("bleLatitude", buf.readIntLE() * 0.0000001);
+                    position.set("bleLongitude", buf.readIntLE() * 0.0000001);
+                    position.set("bleLocation", BufferUtil.readString(buf, length - 8));
+                    break;
+                case 0x17:
+                    position.set("gpsUrl", BufferUtil.readString(buf, length));
+                    break;
+                case 0x18:
+                    position.set("lbsUrl", BufferUtil.readString(buf, length));
+                    break;
+                case 0x1A:
+                    position.set("firmware", BufferUtil.readString(buf, length));
+                    break;
+                case 0x1B:
+                    position.set("gsmModule", BufferUtil.readString(buf, length));
+                    break;
+                case 0x1D:
+                    position.set("agpsUpdate", buf.readUnsignedByte());
+                    position.set("agpsLatitude", buf.readIntLE() * 0.0000001);
+                    position.set("agpsLongitude", buf.readIntLE() * 0.0000001);
+                    break;
+                case 0x30:
+                    position.set("numberFlag", buf.readUnsignedByte());
+                    position.set("number", BufferUtil.readString(buf, length - 1));
+                    break;
+                case 0x31:
+                    position.set("prefixFlag", buf.readUnsignedByte());
+                    position.set("prefix", BufferUtil.readString(buf, length - 1));
+                    break;
+                case 0x33:
+                    position.set("phoneSwitches", buf.readUnsignedByte());
+                    break;
+                case 0x40:
+                    position.set("apn", BufferUtil.readString(buf, length));
+                    break;
+                case 0x41:
+                    position.set("apnUser", BufferUtil.readString(buf, length));
+                    break;
+                case 0x42:
+                    position.set("apnPassword", BufferUtil.readString(buf, length));
+                    break;
+                case 0x43:
+                    buf.readUnsignedByte(); // flag
+                    position.set("port", buf.readUnsignedShort());
+                    position.set("server", BufferUtil.readString(buf, length - 3));
+                    break;
+                case 0x44:
+                    position.set("heartbeatInterval", buf.readUnsignedInt());
+                    position.set("uploadInterval", buf.readUnsignedInt());
+                    position.set("uploadLazyInterval", buf.readUnsignedInt());
+                    break;
+                case 0x47:
+                    position.set("deviceId", BufferUtil.readString(buf, length));
+                    break;
+                case 0x4E:
+                    position.set("gsmBand", buf.readUnsignedByte());
+                    break;
+                case 0x50:
+                    position.set("powerAlert", buf.readUnsignedInt());
+                    break;
+                case 0x51:
+                    position.set("geoAlert", buf.readUnsignedInt());
+                    break;
+                case 0x53:
+                    position.set("motionAlert", buf.readUnsignedInt());
+                    break;
+                case 0x5C:
+                    position.set("barkLevel", buf.readUnsignedByte());
+                    position.set("barkInterval", buf.readUnsignedInt());
+                    break;
+                case 0x61:
+                    position.set("msisdn", BufferUtil.readString(buf, length));
+                    break;
+                case 0x62:
+                    position.set("wifiWhitelist", buf.readUnsignedByte());
+                    position.set("wifiWhitelistMac", ByteBufUtil.hexDump(buf.readSlice(6)));
+                    break;
+                case 0x64:
+                    position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+                    position.set("networkBand", buf.readUnsignedInt());
+                    position.set(Position.KEY_OPERATOR, BufferUtil.readString(buf, length - 5));
+                    break;
+                case 0x65:
+                    position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+                    position.set("networkStatus", buf.readUnsignedByte());
+                    position.set("serverStatus", buf.readUnsignedByte());
+                    position.set("networkPlmn", ByteBufUtil.hexDump(buf.readSlice(6)));
+                    position.set("homePlmn", ByteBufUtil.hexDump(buf.readSlice(6)));
+                    break;
+                case 0x66:
+                    position.set("imsi", BufferUtil.readString(buf, length));
+                    break;
+                case 0x75:
+                    position.set("extraEnableControl", buf.readUnsignedInt());
+                    break;
+                default:
+                    break;
+            }
+
+            buf.readerIndex(endIndex);
+        }
+
+        return position;
+    }
+
 }
diff --git a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
index 7c6a1de08..126334767 100644
--- a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
@@ -14,6 +14,9 @@ public class Minifinder2ProtocolDecoderTest extends ProtocolTest {
         verifyPositions(decoder, false, binary(
                 "ab105a0512e19404011001383632333131303632373037333735093743c3ec640000000009374dc3ec6400000000093750c3ec6400000080092455c3ec640203935e0f22a318d6c7baacd6a2546751467bd009246ac3ec640203b35e0f22a318d6c7baacd6a2546751467bd009246cc3ec640203b35e0f22a318d6c7baacd6a2546751467bd009247ec3ec640203b35e0f22a318d6c7baacd6a2546751467bd0092492c3ec640203b35e0f22a318d6c7baacd6a2546751467bd00924a6c3ec640203b35e0f22a318d6c7baacd6a2546751467bd00924bac3ec640203b35e0f22a318d6c7baacd6a2546751467bd00924d2c3ec640203b35e0f22a7083a2f201a83a3f8084f84ae560924e7c3ec640203b35e0f22a7083a2f201a83a3f8084f84ae560924fbc3ec640203b35e0f22a7083a2f201a83a3f8084f84ae5609240fc4ec640203b35e0f22a7083a2f201a83a3f8084f84ae56092423c4ec640203b35d0f22a7083a2f201a83a3f8084f84ae56092437c4ec640203cb5d0f22a7083a2f201a83a3f8084f84ae5609244fc4ec640003cb5d092464c4ec640003cb5d092478c4ec640003cb5d09248cc4ec640003cb5d0924a0c4ec640003cb5d0924b4c4ec640003cb5d0924ccc4ec640003cb5d0924e5c4ec640003cb5d0924fec4ec6400037b5d092413c5ec6400037b5d092427c5ec6400017b5d0924b785ed640003cb530924d085ed640003ab530924e985ed640003ab530924fe85ed640003ab5309241286ed640003ab5309242686ed640003ab5309243a86ed640003ab5309244e86ed640003ab5309246786ed640003ab5309248086ed640003ab5309249986ed6400037b530924b286ed6400037b530924c686ed6400037b530924da86ed6400037b530924ee86ed6400037b5309240287ed6400037b5309241687ed6400037b5309242f87ed6400037b5309244787ed640003835309246187ed640003835309247a87ed640003835309249287ed64000383530924ab87ed64000383530924c487ed64000383530924d987ed64000383530924ed87ed640003835309240188ed640003835309241588ed640003835309242988ed640003d35309243a88ed640003d3530d02000000803788ed640000000009374188ed640400000009244188ed640003d35309244288ed640003d35309374b88ed640500000009244b88ed640003d35309375588ed640500000009245588ed640003d35309245788ed640003d35309375f88ed640700000009245f88ed640003d35309376988ed640800000009246988ed640003d35309246b88ed640203d3530f22a502184a2cfba0a42c768af4ab5009247188ed640203d3530f22a502184a2cfba0a42c768af4ab5009377388ed640a00000009247688ed640203d3530f22a502184a2cfba0a42c768af4ab5009247b88ed640203d3530f22a502184a2cfba0a42c768af4ab5009377d88ed640300000009247e88ed640203d3530f22a502184a2cfba0a42c768af4ab5009248088ed640203d3530f22a502184a2cfba0a42c768af4ab5009248588ed640203d3530f22a502184a2cfba0a42c768af4ab5009378788ed640000000009248a88ed640203d3530f22a502184a2cfba0a42c768af4ab5009248f88ed640203d3530f22a502184a2cfba0a42c768af4ab5009379188ed640000000009379288ed640000008009249288ed640203d3530f22a502184a2cfba0a42c768af4ab5009249488ed640203d3530f22a502184a2cfba0a42c768af4ab5009249988ed640203d3530f22a502184a2cfba0a42c768af4ab5009249e88ed640203d3530f22a502184a2cfba0a42c768af4ab500924a388ed640203d3530f22a502184a2cfba0a42c768af4ab500924a688ed640203d3530f22a502184a2cfba0a42c768af4ab50"));
 
+        verifyAttributes(decoder, binary(
+                "ab00cc029c9b0000020501040518200502cf290001100338363233313130363534393538393515043839343632303338303735303031383830343034070539eed3f9cec705064f93a7650507010b00002908cf2900010020050000d0000068915b00ae0000004f637420313920323032330031303a35393a3332261b53494d37353030457c4231315630325f3231303330337c50312e30325f3230323231313034050900000000050a00000003070b000000001e01070b010000001e01070b020000001e01070b030000001e01060c0000000000050d6e600580020e04050f0708008002100002110f02126406134d46303758041404a20e08160000000000000008160100000000000008160200000000000008160300000000000008160400000000000008160500000000000008160600000000000008160700000000000008160800000000000008160900000000000020177777772e676f6f676c652e636f6d2f6d6170733f713d252e37662c252e3766211868747470733a2f2f6c6f632e6d696e6966696e6465722e636f6d2f25732f25730519000001fe101a4d4630372e343631302e3233303300021c640a1d802acee6212966cf0803207b3e03217b040230000230010230020230030230040230050230060230070230080230090231000532580214010533820000000e406d326d2e74656c65322e636f6d014101421c4380431468756e7465726465762e6d696e6966696e6465722e636f6d0d440e01008005000000100e0000054505002c01014705500f1400f00d511002e803b84d7f0d0246f6430d511100f40100000000000000000d511200f40100000000000000000d511300f401000000000000000005527800030005532c0100000354500005551e002d400256050b57201c00002c010000ed61025d01055c890a0000057000000000037100001472000000000000000000000000000000000000000568f0000100057500000000074de36000000000"));
+
         verifyAttribute(decoder, binary(
                 "ab101c00d6f61e000110013836333932313033393939363038300937efd201640c000000"),
                 "barkCount", 12L);