Support binary Fifotrack messages

3 files changed, 66 insertions, 11 deletions

diff --git a/src/main/java/org/traccar/protocol/FifotrackFrameDecoder.java b/src/main/java/org/traccar/protocol/FifotrackFrameDecoder.java
new file mode 100644
index 000000000..967b17a64
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/FifotrackFrameDecoder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2019 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import org.traccar.BaseFrameDecoder;
+
+import java.nio.charset.StandardCharsets;
+
+public class FifotrackFrameDecoder extends BaseFrameDecoder {
+
+    @Override
+    protected Object decode(
+            ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
+
+        if (buf.readableBytes() < 10) {
+            return null;
+        }
+
+        int index = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ',');
+        if (index != -1) {
+            int length = index - buf.readerIndex() + 3 + Integer.parseInt(
+                    buf.toString(buf.readerIndex() + 2, index - buf.readerIndex() - 2, StandardCharsets.US_ASCII));
+            if (buf.readableBytes() >= length + 2) {
+                ByteBuf frame = buf.readRetainedSlice(length);
+                buf.skipBytes(2); // delimiter
+                return frame;
+            }
+        }
+
+        return null;
+    }
+
+}
diff --git a/src/main/java/org/traccar/protocol/FifotrackProtocol.java b/src/main/java/org/traccar/protocol/FifotrackProtocol.java
index 371e01e55..2c2e6e1d3 100644
--- a/src/main/java/org/traccar/protocol/FifotrackProtocol.java
+++ b/src/main/java/org/traccar/protocol/FifotrackProtocol.java
@@ -16,7 +16,6 @@
 package org.traccar.protocol;
 
 import io.netty.handler.codec.LineBasedFrameDecoder;
-import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
 import org.traccar.BaseProtocol;
 import org.traccar.PipelineBuilder;
@@ -30,7 +29,6 @@ public class FifotrackProtocol extends BaseProtocol {
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new LineBasedFrameDecoder(1024));
                 pipeline.addLast(new StringEncoder());
-                pipeline.addLast(new StringDecoder());
                 pipeline.addLast(new FifotrackProtocolDecoder(FifotrackProtocol.this));
             }
         });
diff --git a/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java
index 35696ee12..2719464c9 100644
--- a/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java
@@ -23,7 +23,6 @@ import org.traccar.DeviceSession;
 import org.traccar.NetworkMessage;
 import org.traccar.Protocol;
 import org.traccar.helper.Checksum;
-import org.traccar.helper.DataConverter;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
 import org.traccar.helper.UnitsConverter;
@@ -32,6 +31,7 @@ import org.traccar.model.Network;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Pattern;
 
 public class FifotrackProtocolDecoder extends BaseProtocolDecoder {
@@ -87,12 +87,11 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder {
             .text("$$")
             .number("d+,")                       // length
             .number("(d+),")                     // imei
-            .expression("([^*]+),")              // photo id
+            .number("x+,")                       // index
+            .expression("[^,]+,")                // type
+            .expression("([^,]+),")              // photo id
             .number("(d+),")                     // offset
             .number("(d+),")                     // size
-            .number("(x+)")                      // data
-            .text("*")
-            .number("xx")
             .compile();
 
     private void requestPhoto(Channel channel, SocketAddress socketAddress, String imei, String file) {
@@ -165,11 +164,14 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder {
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        String sentence = (String) msg;
-        int typeIndex = sentence.indexOf(',', sentence.indexOf(',', sentence.indexOf(',') + 1) + 1) + 1;
-        String type = sentence.substring(typeIndex, typeIndex + 3);
+        ByteBuf buf = (ByteBuf) msg;
+        int typeIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ',') + 1;
+        typeIndex = buf.indexOf(typeIndex, buf.writerIndex(), (byte) ',') + 1;
+        typeIndex = buf.indexOf(typeIndex, buf.writerIndex(), (byte) ',') + 1;
+        String type = buf.toString(typeIndex, 3, StandardCharsets.US_ASCII);
 
         if (type.equals("D05")) {
+            String sentence = buf.toString(StandardCharsets.US_ASCII);
             Parser parser = new Parser(PATTERN_PHOTO, sentence);
             if (parser.matches()) {
                 String imei = parser.next();
@@ -179,16 +181,22 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder {
                 requestPhoto(channel, remoteAddress, imei, photoId);
             }
         } else if (type.equals("D06")) {
+            int dataIndex = buf.indexOf(typeIndex + 4, buf.writerIndex(), (byte) ',') + 1;
+            dataIndex = buf.indexOf(dataIndex, buf.writerIndex(), (byte) ',') + 1;
+            dataIndex = buf.indexOf(dataIndex, buf.writerIndex(), (byte) ',') + 1;
+            String sentence = buf.toString(buf.readerIndex(), dataIndex, StandardCharsets.US_ASCII);
             Parser parser = new Parser(PATTERN_PHOTO_DATA, sentence);
             if (parser.matches()) {
                 String imei = parser.next();
                 String photoId = parser.next();
                 parser.nextInt(); // offset
                 parser.nextInt(); // size
-                photo.writeBytes(DataConverter.parseHex(parser.next()));
+                buf.readerIndex(dataIndex);
+                photo.writeBytes(buf.readBytes(buf.readableBytes() - 3)); // ignore checksum
                 requestPhoto(channel, remoteAddress, imei, photoId);
             }
         } else {
+            String sentence = buf.toString(StandardCharsets.US_ASCII);
             return decodeLocation(channel, remoteAddress, sentence);
         }