Add Transistor Software geolocation

6 files changed, 119 insertions, 80 deletions

diff --git a/setup/default.xml b/setup/default.xml
index c80961df9..20bf515d2 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -239,7 +239,7 @@
     <entry key='autotrack.port'>5172</entry>
     <entry key='tek.port'>5173</entry>
     <entry key='wristband.port'>5174</entry>
-    <entry key='applet.port'>5175</entry>
+    <entry key='lacak.port'>5175</entry>
     <entry key='milesmate.port'>5176</entry>
     <entry key='anytrek.port'>5177</entry>
     <entry key='smartsole.port'>5178</entry>
diff --git a/src/main/java/org/traccar/protocol/AppletProtocolDecoder.java b/src/main/java/org/traccar/protocol/AppletProtocolDecoder.java
deleted file mode 100644
index 7a995cc24..000000000
--- a/src/main/java/org/traccar/protocol/AppletProtocolDecoder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2018 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.channel.Channel;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import org.traccar.BaseHttpProtocolDecoder;
-import org.traccar.DeviceSession;
-import org.traccar.Protocol;
-
-import java.net.SocketAddress;
-
-public class AppletProtocolDecoder extends BaseHttpProtocolDecoder {
-
-    public AppletProtocolDecoder(Protocol protocol) {
-        super(protocol);
-    }
-
-    @Override
-    protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
-
-        FullHttpRequest request = (FullHttpRequest) msg;
-
-        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, request.headers().get("From"));
-        if (deviceSession != null) {
-            sendResponse(channel, HttpResponseStatus.OK);
-        } else {
-            sendResponse(channel, HttpResponseStatus.BAD_REQUEST);
-        }
-
-        return null;
-    }
-
-}
diff --git a/src/main/java/org/traccar/protocol/AppletProtocol.java b/src/main/java/org/traccar/protocol/LacakProtocol.java
index 2297dca03..0a0499ad7 100644
--- a/src/main/java/org/traccar/protocol/AppletProtocol.java
+++ b/src/main/java/org/traccar/protocol/LacakProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2021 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.
@@ -22,16 +22,16 @@ import org.traccar.BaseProtocol;
 import org.traccar.PipelineBuilder;
 import org.traccar.TrackerServer;
 
-public class AppletProtocol extends BaseProtocol {
+public class LacakProtocol extends BaseProtocol {
 
-    public AppletProtocol() {
+    public LacakProtocol() {
         addServer(new TrackerServer(false, getName()) {
             @Override
             protected void addProtocolHandlers(PipelineBuilder pipeline) {
                 pipeline.addLast(new HttpResponseEncoder());
                 pipeline.addLast(new HttpRequestDecoder());
                 pipeline.addLast(new HttpObjectAggregator(16384));
-                pipeline.addLast(new AppletProtocolDecoder(AppletProtocol.this));
+                pipeline.addLast(new LacakProtocolDecoder(LacakProtocol.this));
             }
         });
     }
diff --git a/src/main/java/org/traccar/protocol/LacakProtocolDecoder.java b/src/main/java/org/traccar/protocol/LacakProtocolDecoder.java
new file mode 100644
index 000000000..132087c8f
--- /dev/null
+++ b/src/main/java/org/traccar/protocol/LacakProtocolDecoder.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2021 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.channel.Channel;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.traccar.BaseHttpProtocolDecoder;
+import org.traccar.DeviceSession;
+import org.traccar.Protocol;
+import org.traccar.helper.DateUtil;
+import org.traccar.model.Position;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import java.io.StringReader;
+import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
+
+public class LacakProtocolDecoder extends BaseHttpProtocolDecoder {
+
+    public LacakProtocolDecoder(Protocol protocol) {
+        super(protocol);
+    }
+
+    @Override
+    protected Object decode(
+            Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+        FullHttpRequest request = (FullHttpRequest) msg;
+        JsonObject root = Json.createReader(
+                new StringReader(request.content().toString(StandardCharsets.US_ASCII))).readObject();
+
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, root.getString("device_id"));
+        if (deviceSession == null) {
+            sendResponse(channel, HttpResponseStatus.BAD_REQUEST);
+            return null;
+        }
+
+        Position position = new Position(getProtocolName());
+        position.setDeviceId(deviceSession.getDeviceId());
+
+        JsonObject location = root.getJsonObject("location");
+
+        position.setTime(DateUtil.parseDate(location.getString("timestamp")));
+
+        if (location.containsKey("coords")) {
+            JsonObject coordinates = location.getJsonObject("coords");
+            position.setLatitude(coordinates.getJsonNumber("latitude").doubleValue());
+            position.setLongitude(coordinates.getJsonNumber("longitude").doubleValue());
+            position.setAccuracy(coordinates.getJsonNumber("accuracy").doubleValue());
+            position.setSpeed(coordinates.getJsonNumber("speed").doubleValue());
+            position.setCourse(coordinates.getJsonNumber("heading").doubleValue());
+            position.setAltitude(coordinates.getJsonNumber("altitude").doubleValue());
+        }
+
+        if (location.containsKey("event")) {
+            position.set(Position.KEY_EVENT, location.getString("event"));
+        }
+        if (location.containsKey("is_moving")) {
+            position.set(Position.KEY_MOTION, location.getBoolean("is_moving"));
+        }
+        if (location.containsKey("odometer")) {
+            position.set(Position.KEY_ODOMETER, location.getInt("odometer"));
+        }
+        if (location.containsKey("mock")) {
+            position.set("mock", location.getBoolean("mock"));
+        }
+        if (location.containsKey("activity")) {
+            position.set("activity", location.getJsonObject("activity").getString("type"));
+        }
+        if (location.containsKey("battery")) {
+            JsonObject battery = location.getJsonObject("battery");
+            position.set(Position.KEY_BATTERY_LEVEL, (int) (battery.getJsonNumber("level").doubleValue() * 100));
+            position.set(Position.KEY_CHARGE, battery.getBoolean("is_charging"));
+        }
+
+        sendResponse(channel, HttpResponseStatus.OK);
+        return position;
+    }
+
+}
diff --git a/src/test/java/org/traccar/protocol/AppletProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AppletProtocolDecoderTest.java
deleted file mode 100644
index 11c9c65d8..000000000
--- a/src/test/java/org/traccar/protocol/AppletProtocolDecoderTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.traccar.protocol;
-
-import io.netty.handler.codec.http.DefaultHttpHeaders;
-import io.netty.handler.codec.http.HttpMethod;
-import org.junit.Test;
-import org.traccar.ProtocolTest;
-
-public class AppletProtocolDecoderTest extends ProtocolTest {
-
-    @Test
-    public void testDecode() throws Exception {
-
-        var decoder = new AppletProtocolDecoder(null);
-
-        DefaultHttpHeaders headers = new DefaultHttpHeaders();
-
-        headers.add("HOST", "192.168.0.1:8080");
-        headers.add("X-Admin-Protocol", "globalplatform-remote-admin/1.0");
-        headers.add("X-Admin-From", "8943170080001406197F");
-        headers.add("User-Agent", "oma-scws-admin-agent/1.1");
-        headers.add("From", "8943170080001406197F");
-
-        verifyNull(decoder, request(HttpMethod.POST, "/pli?=", headers));
-
-    }
-
-}
diff --git a/src/test/java/org/traccar/protocol/LacakProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/LacakProtocolDecoderTest.java
new file mode 100644
index 000000000..c407d1e64
--- /dev/null
+++ b/src/test/java/org/traccar/protocol/LacakProtocolDecoderTest.java
@@ -0,0 +1,19 @@
+package org.traccar.protocol;
+
+import io.netty.handler.codec.http.HttpMethod;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class LacakProtocolDecoderTest extends ProtocolTest {
+
+    @Test
+    public void testDecode() throws Exception {
+
+        var decoder = new LacakProtocolDecoder(null);
+
+        verifyPosition(decoder, request(HttpMethod.POST, "/",
+                buffer("{\"location\":{\"event\":\"motionchange\",\"is_moving\":false,\"uuid\":\"0e9a2473-a9a7-4c00-997b-fb97d2154e75\",\"timestamp\":\"2021-07-21T08:06:34.444Z\",\"odometer\":0,\"coords\":{\"latitude\":-6.1148096,\"longitude\":106.6837015,\"accuracy\":3.8,\"speed\":18.67,\"speed_accuracy\":0.26,\"heading\":63,\"heading_accuracy\":0.28,\"altitude\":35.7,\"altitude_accuracy\":3.8},\"activity\":{\"type\":\"still\",\"confidence\":100},\"battery\":{\"is_charging\":false,\"level\":0.79},\"extras\":{}},\"device_id\":\"8737767034\"}")));
+
+    }
+
+}