From 7f62f1671b38b9ffbeff66aa4ee79e0f875b1c66 Mon Sep 17 00:00:00 2001 From: Jan-Piet Mens Date: Tue, 13 Jun 2017 12:30:49 +0200 Subject: New protocol decoder for OwnTracks - removed comments and try/catch as per request - add existence checks --- src/org/traccar/protocol/OwnTracksProtocol.java | 46 +++++++++ .../traccar/protocol/OwnTracksProtocolDecoder.java | 103 +++++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 src/org/traccar/protocol/OwnTracksProtocol.java create mode 100644 src/org/traccar/protocol/OwnTracksProtocolDecoder.java (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/OwnTracksProtocol.java b/src/org/traccar/protocol/OwnTracksProtocol.java new file mode 100644 index 000000000..c4a6ab163 --- /dev/null +++ b/src/org/traccar/protocol/OwnTracksProtocol.java @@ -0,0 +1,46 @@ +/* + * Copyright 2017 Jan-Piet Mens (jpmens@gmail.com) + * Copyright 2017 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 org.jboss.netty.bootstrap.ServerBootstrap; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.handler.codec.http.HttpRequestDecoder; +import org.jboss.netty.handler.codec.http.HttpResponseEncoder; +import org.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +import java.util.List; + +public class OwnTracksProtocol extends BaseProtocol { + + public OwnTracksProtocol() { + super("owntracks"); + } + + @Override + public void initTrackerServers(List serverList) { + serverList.add(new TrackerServer(new ServerBootstrap(), getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("httpEncoder", new HttpResponseEncoder()); + pipeline.addLast("httpDecoder", new HttpRequestDecoder()); + pipeline.addLast("objectDecoder", new OwnTracksProtocolDecoder(OwnTracksProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java new file mode 100644 index 000000000..60f94db96 --- /dev/null +++ b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java @@ -0,0 +1,103 @@ +/* + * Copyright 2017 Jan-Piet Mens (jpmens@gmail.com) + * Copyright 2013 - 2017 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 org.jboss.netty.channel.Channel; +import org.jboss.netty.handler.codec.http.DefaultHttpResponse; +import org.jboss.netty.handler.codec.http.HttpHeaders; +import org.jboss.netty.handler.codec.http.HttpRequest; +import org.jboss.netty.handler.codec.http.HttpResponse; +import org.jboss.netty.handler.codec.http.HttpResponseStatus; +import org.jboss.netty.handler.codec.http.HttpVersion; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.model.Position; +import org.traccar.helper.UnitsConverter; + +import java.net.SocketAddress; +import java.nio.charset.StandardCharsets; +import java.util.Date; + +import java.io.StringReader; +import javax.json.Json; +import javax.json.JsonObject; + +public class OwnTracksProtocolDecoder extends BaseProtocolDecoder { + + public OwnTracksProtocolDecoder(OwnTracksProtocol protocol) { + super(protocol); + } + + private void sendResponse(Channel channel, HttpResponseStatus status) { + if (channel != null) { + HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, status); + response.headers().add(HttpHeaders.Names.CONTENT_LENGTH, 0); + channel.write(response); + } + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + HttpRequest request = (HttpRequest) msg; + JsonObject root = Json.createReader( + new StringReader(request.getContent().toString(StandardCharsets.US_ASCII))).readObject(); + + Position position = new Position(); + position.setProtocol(getProtocolName()); + position.setValid(true); + + position.setLatitude(root.getJsonNumber("lat").doubleValue()); + position.setLongitude(root.getJsonNumber("lon").doubleValue()); + + if (root.containsKey("vel")) { + position.setSpeed(UnitsConverter.knotsFromCps(root.getInt("vel"))); + } + if (root.containsKey("alt")) { + position.setAltitude(root.getInt("alt")); + } + if (root.containsKey("cog")) { + position.setCourse(root.getInt("cog")); + } + if (root.containsKey("acc")) { + position.setAccuracy(root.getInt("acc")); + } + if (root.containsKey("t")) { + position.set("t", root.getString("t")); + } + if (root.containsKey("batt")) { + position.set(Position.KEY_BATTERY, root.getInt("batt")); + } + + long timestamp = root.getJsonNumber("tst").longValue(); + if (timestamp < Integer.MAX_VALUE) { + timestamp *= 1000; + } + position.setTime(new Date(timestamp)); + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, root.getString("tid")); + if (deviceSession == null) { + sendResponse(channel, HttpResponseStatus.BAD_REQUEST); + return null; + } + position.setDeviceId(deviceSession.getDeviceId()); + + sendResponse(channel, HttpResponseStatus.OK); + return position; + } +} -- cgit v1.2.3 From c9ba2fc87382a5a872cc7a34410f9be31bac6cfe Mon Sep 17 00:00:00 2001 From: Jan-Piet Mens Date: Tue, 13 Jun 2017 22:27:52 +0200 Subject: indentation --- src/org/traccar/protocol/OwnTracksProtocolDecoder.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java index 60f94db96..4baafc118 100644 --- a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java +++ b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java @@ -56,7 +56,7 @@ public class OwnTracksProtocolDecoder extends BaseProtocolDecoder { HttpRequest request = (HttpRequest) msg; JsonObject root = Json.createReader( - new StringReader(request.getContent().toString(StandardCharsets.US_ASCII))).readObject(); + new StringReader(request.getContent().toString(StandardCharsets.US_ASCII))).readObject(); Position position = new Position(); position.setProtocol(getProtocolName()); @@ -66,22 +66,22 @@ public class OwnTracksProtocolDecoder extends BaseProtocolDecoder { position.setLongitude(root.getJsonNumber("lon").doubleValue()); if (root.containsKey("vel")) { - position.setSpeed(UnitsConverter.knotsFromCps(root.getInt("vel"))); + position.setSpeed(UnitsConverter.knotsFromCps(root.getInt("vel"))); } if (root.containsKey("alt")) { - position.setAltitude(root.getInt("alt")); + position.setAltitude(root.getInt("alt")); } if (root.containsKey("cog")) { - position.setCourse(root.getInt("cog")); + position.setCourse(root.getInt("cog")); } if (root.containsKey("acc")) { - position.setAccuracy(root.getInt("acc")); + position.setAccuracy(root.getInt("acc")); } if (root.containsKey("t")) { - position.set("t", root.getString("t")); + position.set("t", root.getString("t")); } if (root.containsKey("batt")) { - position.set(Position.KEY_BATTERY, root.getInt("batt")); + position.set(Position.KEY_BATTERY, root.getInt("batt")); } long timestamp = root.getJsonNumber("tst").longValue(); @@ -92,8 +92,8 @@ public class OwnTracksProtocolDecoder extends BaseProtocolDecoder { DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, root.getString("tid")); if (deviceSession == null) { - sendResponse(channel, HttpResponseStatus.BAD_REQUEST); - return null; + sendResponse(channel, HttpResponseStatus.BAD_REQUEST); + return null; } position.setDeviceId(deviceSession.getDeviceId()); -- cgit v1.2.3 From d4e075a0b285f70d3c9854120f57ce06888f51e4 Mon Sep 17 00:00:00 2001 From: Jan-Piet Mens Date: Wed, 14 Jun 2017 07:51:33 +0200 Subject: indentation wrapped lines=8 --- src/org/traccar/protocol/OwnTracksProtocolDecoder.java | 2 +- test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java index 4baafc118..61950aef8 100644 --- a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java +++ b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java @@ -56,7 +56,7 @@ public class OwnTracksProtocolDecoder extends BaseProtocolDecoder { HttpRequest request = (HttpRequest) msg; JsonObject root = Json.createReader( - new StringReader(request.getContent().toString(StandardCharsets.US_ASCII))).readObject(); + new StringReader(request.getContent().toString(StandardCharsets.US_ASCII))).readObject(); Position position = new Position(); position.setProtocol(getProtocolName()); diff --git a/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java b/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java index 30ae95d03..1eb188421 100644 --- a/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java +++ b/test/org/traccar/protocol/OwnTracksProtocolDecoderTest.java @@ -11,11 +11,11 @@ public class OwnTracksProtocolDecoderTest extends ProtocolTest { OwnTracksProtocolDecoder decoder = new OwnTracksProtocolDecoder(new OwnTracksProtocol()); - verifyPosition(decoder, request(HttpMethod.POST, "/", - buffer(text("{\"lon\":2.29513,\"lat\":48.85833,\"tst\":1497349316,\"_type\":\"location\",\"tid\":\"JJ\"}")))); + verifyPosition(decoder, request(HttpMethod.POST, "/", + buffer(text("{\"lon\":2.29513,\"lat\":48.85833,\"tst\":1497349316,\"_type\":\"location\",\"tid\":\"JJ\"}")))); - verifyPosition(decoder, request(HttpMethod.POST, "/", - buffer(text("{\"cog\":271,\"lon\":2.29513,\"acc\":5,\"vel\":61,\"vac\":21,\"lat\":48.85833,\"tst\":1497349316,\"alt\":167,\"_type\":\"location\",\"tid\":\"JJ\",\"t\":\"u\",\"batt\":67}")))); + verifyPosition(decoder, request(HttpMethod.POST, "/", + buffer(text("{\"cog\":271,\"lon\":2.29513,\"acc\":5,\"vel\":61,\"vac\":21,\"lat\":48.85833,\"tst\":1497349316,\"alt\":167,\"_type\":\"location\",\"tid\":\"JJ\",\"t\":\"u\",\"batt\":67}")))); } -- cgit v1.2.3 From 21a4dbd3150d49d15f48dfcdc38ad2d9e2f37a85 Mon Sep 17 00:00:00 2001 From: Jan-Piet Mens Date: Wed, 14 Jun 2017 09:27:31 +0200 Subject: add OwnTracks topic --- src/org/traccar/protocol/OwnTracksProtocolDecoder.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/org/traccar') diff --git a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java index 61950aef8..a5a9efbb4 100644 --- a/src/org/traccar/protocol/OwnTracksProtocolDecoder.java +++ b/src/org/traccar/protocol/OwnTracksProtocolDecoder.java @@ -83,6 +83,9 @@ public class OwnTracksProtocolDecoder extends BaseProtocolDecoder { if (root.containsKey("batt")) { position.set(Position.KEY_BATTERY, root.getInt("batt")); } + if (root.containsKey("topic")) { + position.set("topic", root.getString("topic")); + } long timestamp = root.getJsonNumber("tst").longValue(); if (timestamp < Integer.MAX_VALUE) { -- cgit v1.2.3