diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-06-09 19:36:00 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-06-09 19:36:00 -0700 |
commit | 7dc90b43ee9ca04d317e7d8f45beab915550adfb (patch) | |
tree | 4efa0a58667b02f1b47ae9f12c6d76dc417d7f31 | |
parent | 9ba7c3f15750afd68f3f8c071a783d40b2e0f0dc (diff) | |
download | trackermap-server-7dc90b43ee9ca04d317e7d8f45beab915550adfb.tar.gz trackermap-server-7dc90b43ee9ca04d317e7d8f45beab915550adfb.tar.bz2 trackermap-server-7dc90b43ee9ca04d317e7d8f45beab915550adfb.zip |
Implement Plugin protocol
-rw-r--r-- | setup/default.xml | 1 | ||||
-rw-r--r-- | src/main/java/org/traccar/protocol/PluginProtocol.java | 39 | ||||
-rw-r--r-- | src/main/java/org/traccar/protocol/PluginProtocolDecoder.java | 86 | ||||
-rw-r--r-- | src/test/java/org/traccar/protocol/PluginProtocolDecoderTest.java | 21 |
4 files changed, 147 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml index f2063c5ed..3d968397f 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -268,5 +268,6 @@ <entry key='techtlt.port'>5189</entry> <entry key='starcom.port'>5190</entry> <entry key='mictrack.port'>5191</entry> + <entry key='plugin.port'>5192</entry> </properties> diff --git a/src/main/java/org/traccar/protocol/PluginProtocol.java b/src/main/java/org/traccar/protocol/PluginProtocol.java new file mode 100644 index 000000000..d5f28da9d --- /dev/null +++ b/src/main/java/org/traccar/protocol/PluginProtocol.java @@ -0,0 +1,39 @@ +/* + * 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.handler.codec.string.StringDecoder; +import io.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.CharacterDelimiterFrameDecoder; +import org.traccar.PipelineBuilder; +import org.traccar.TrackerServer; + +public class PluginProtocol extends BaseProtocol { + + public PluginProtocol() { + addServer(new TrackerServer(false, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new CharacterDelimiterFrameDecoder(1024, '#')); + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new PluginProtocolDecoder(PluginProtocol.this)); + } + }); + } + +} diff --git a/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java b/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java new file mode 100644 index 000000000..d2bb93962 --- /dev/null +++ b/src/main/java/org/traccar/protocol/PluginProtocolDecoder.java @@ -0,0 +1,86 @@ +/* + * 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.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.Protocol; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.helper.UnitsConverter; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class PluginProtocolDecoder extends BaseProtocolDecoder { + + public PluginProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .any() + .number("(d+),") // device id + .number("(dddd)(dd)(dd)") // date (yyyymmdd) + .number("(dd)(dd)(dd),") // time (hhmmss) + .number("(-?d+.d+),") // longitude + .number("(-?d+.d+),") // latitude + .number("(d+),") // speed + .number("(d+),") // course + .number("(-?d+),") // altitude + .number("(-?d+),") // satellites + .number("(d+),") // event + .number("(d+),") // odometer + .number("(d+),") // status + .any() + .compile(); + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.setValid(true); + position.setTime(parser.nextDateTime()); + position.setLongitude(parser.nextDouble()); + position.setLatitude(parser.nextDouble()); + position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt())); + position.setCourse(parser.nextInt()); + position.setAltitude(parser.nextInt()); + + position.set(Position.KEY_SATELLITES, parser.nextInt()); + position.set(Position.KEY_EVENT, parser.nextInt()); + position.set(Position.KEY_ODOMETER, parser.nextInt()); + position.set(Position.KEY_STATUS, parser.nextInt()); + + return position; + } + +} diff --git a/src/test/java/org/traccar/protocol/PluginProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/PluginProtocolDecoderTest.java new file mode 100644 index 000000000..a7cf95618 --- /dev/null +++ b/src/test/java/org/traccar/protocol/PluginProtocolDecoderTest.java @@ -0,0 +1,21 @@ +package org.traccar.protocol; + +import org.junit.Test; +import org.traccar.ProtocolTest; + +public class PluginProtocolDecoderTest extends ProtocolTest { + + @Test + public void testDecode() throws Exception { + + PluginProtocolDecoder decoder = new PluginProtocolDecoder(null); + + verifyPosition(decoder, text( + "$$STATUS801739,20190528143943,28.254086,-25.860665,0,0,0,-1,2,78,11395,0,0,0")); + + verifyPosition(decoder, text( + "50000,20150623184513,113.828759,22.709578,70,190,0,-1,2,155135681,805327235,1.32,-32.1,0")); + + } + +} |