From 37810b5062a4b5ea7e1b92800186c03a5817471f Mon Sep 17 00:00:00 2001 From: jcardus Date: Wed, 25 Mar 2020 19:09:42 +0000 Subject: compression on jetty --- src/main/java/org/traccar/web/WebServer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java index 70fef4ed3..daa46b926 100644 --- a/src/main/java/org/traccar/web/WebServer.java +++ b/src/main/java/org/traccar/web/WebServer.java @@ -22,6 +22,7 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ErrorHandler; import org.eclipse.jetty.server.handler.HandlerList; +import org.eclipse.jetty.server.handler.gzip.GzipHandler; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; @@ -97,7 +98,9 @@ public class WebServer { HandlerList handlers = new HandlerList(); initClientProxy(config, handlers); handlers.addHandler(servletHandler); - server.setHandler(handlers); + GzipHandler gzipHandler = new GzipHandler(); + gzipHandler.setHandler(handlers); + server.setHandler(gzipHandler); } private void initClientProxy(Config config, HandlerList handlers) { -- cgit v1.2.3 From 2ee38015efa72f384be1a0d66f46b3cbe08d6c88 Mon Sep 17 00:00:00 2001 From: jcardus Date: Wed, 25 Mar 2020 19:19:42 +0000 Subject: falcom protocol --- .../java/org/traccar/protocol/FalcomProtocol.java | 47 +++++++++ .../traccar/protocol/FalcomProtocolDecoder.java | 114 +++++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 src/main/java/org/traccar/protocol/FalcomProtocol.java create mode 100644 src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java (limited to 'src/main/java') diff --git a/src/main/java/org/traccar/protocol/FalcomProtocol.java b/src/main/java/org/traccar/protocol/FalcomProtocol.java new file mode 100644 index 000000000..f8ec31dbf --- /dev/null +++ b/src/main/java/org/traccar/protocol/FalcomProtocol.java @@ -0,0 +1,47 @@ +/* + * Copyright 2015 - 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.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; +import org.traccar.TrackerServer; + +public class FalcomProtocol extends BaseProtocol { + + public FalcomProtocol() { + addServer(new TrackerServer(false, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new LineBasedFrameDecoder(1024)); + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new FalcomProtocolDecoder(FalcomProtocol.this)); + } + }); + addServer(new TrackerServer(true, getName()) { + @Override + protected void addProtocolHandlers(PipelineBuilder pipeline) { + pipeline.addLast(new StringDecoder()); + pipeline.addLast(new StringEncoder()); + pipeline.addLast(new FalcomProtocolDecoder(FalcomProtocol.this)); + } + }); + } + +} diff --git a/src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java b/src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java new file mode 100644 index 000000000..2dc2b09f3 --- /dev/null +++ b/src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java @@ -0,0 +1,114 @@ +/* + * Copyright 2012 - 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 org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.Protocol; +import org.traccar.helper.DateBuilder; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class FalcomProtocolDecoder extends BaseProtocolDecoder { + + public FalcomProtocolDecoder(Protocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .text("$T0001,") + .number("(d+),") // event (int) + .number("(dd).(dd).(dddd),") // date (31.12.2019) + .number("(dd):(dd):(dd),") // time (11:22:33) + .number("(-?d+.d+),") // latitude (d.d) + .number("(-?d+.d+),") // longitude (d.d) + .number("(d+),") // speed (int) + .number("(d+.d+),") // course (double) + .number("(d+),") // fix (int) + .number("(d+),") // satellites (int) + .number("(d+.d+),") // power (double) + .number("(d+),") // ignition (int) + .number("(x+)*") // ignition (int) + //.expression("([0-9a-fA-F]{8})*") // driverkey + .any() + .compile(); + + private Position decodeT0001(DeviceSession deviceSession, String sentence) { + + Parser parser = new Parser(PATTERN, sentence); + + if (!parser.matches()) { + return null; + } + + Position position = new Position(getProtocolName()); + + position.setDeviceId(deviceSession.getDeviceId()); + position.set(Position.KEY_EVENT, parser.nextInt(0)); + DateBuilder dateBuilder = new DateBuilder() + .setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)) + .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)); + position.setTime(dateBuilder.getDate()); + position.setLatitude(parser.nextDouble()); + position.setLongitude(parser.nextDouble()); + position.setSpeed(parser.nextInt(0) * 1.94384449); //m/s to knot + position.setCourse(Math.round(parser.nextDouble())); + position.setValid(parser.nextInt() > 0); + position.set(Position.KEY_SATELLITES, Math.round(parser.nextInt())); + position.set(Position.KEY_POWER, parser.nextDouble()); + position.set(Position.KEY_IGNITION, parser.nextInt() == 1); + position.set(Position.KEY_DRIVER_UNIQUE_ID, parser.next()); + + return position; + } + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + String sentence = (String) msg; + + DeviceSession deviceSession; + + if (!sentence.startsWith("$") && sentence.contains("$")) { + int index = sentence.indexOf("$"); + String id = sentence.substring(0, index); + if (id.endsWith(",")) { + id = id.substring(0, id.length() - 1); + } else if (id.endsWith("/")) { + id = id.substring(id.indexOf('/') + 1, id.length() - 1); + } + deviceSession = getDeviceSession(channel, remoteAddress, id); + sentence = sentence.substring(index); + } else { + deviceSession = getDeviceSession(channel, remoteAddress); + } + + if (sentence.startsWith("$IMEI")) { + getDeviceSession(channel, remoteAddress, sentence.substring(6)); + } else if (sentence.startsWith("$T0001")) { + return decodeT0001(deviceSession, sentence); + } + + return null; + } + +} -- cgit v1.2.3 From bf77eadf252b999d36e6546cf5ccd7852ffaefe0 Mon Sep 17 00:00:00 2001 From: jcardus Date: Wed, 25 Mar 2020 21:14:42 +0000 Subject: compression on jetty --- .../java/org/traccar/protocol/FalcomProtocol.java | 47 --------- .../traccar/protocol/FalcomProtocolDecoder.java | 114 --------------------- 2 files changed, 161 deletions(-) delete mode 100644 src/main/java/org/traccar/protocol/FalcomProtocol.java delete mode 100644 src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java (limited to 'src/main/java') diff --git a/src/main/java/org/traccar/protocol/FalcomProtocol.java b/src/main/java/org/traccar/protocol/FalcomProtocol.java deleted file mode 100644 index f8ec31dbf..000000000 --- a/src/main/java/org/traccar/protocol/FalcomProtocol.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2015 - 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.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; -import org.traccar.TrackerServer; - -public class FalcomProtocol extends BaseProtocol { - - public FalcomProtocol() { - addServer(new TrackerServer(false, getName()) { - @Override - protected void addProtocolHandlers(PipelineBuilder pipeline) { - pipeline.addLast(new LineBasedFrameDecoder(1024)); - pipeline.addLast(new StringDecoder()); - pipeline.addLast(new StringEncoder()); - pipeline.addLast(new FalcomProtocolDecoder(FalcomProtocol.this)); - } - }); - addServer(new TrackerServer(true, getName()) { - @Override - protected void addProtocolHandlers(PipelineBuilder pipeline) { - pipeline.addLast(new StringDecoder()); - pipeline.addLast(new StringEncoder()); - pipeline.addLast(new FalcomProtocolDecoder(FalcomProtocol.this)); - } - }); - } - -} diff --git a/src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java b/src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java deleted file mode 100644 index 2dc2b09f3..000000000 --- a/src/main/java/org/traccar/protocol/FalcomProtocolDecoder.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright 2012 - 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 org.traccar.BaseProtocolDecoder; -import org.traccar.DeviceSession; -import org.traccar.Protocol; -import org.traccar.helper.DateBuilder; -import org.traccar.helper.Parser; -import org.traccar.helper.PatternBuilder; -import org.traccar.model.Position; - -import java.net.SocketAddress; -import java.util.regex.Pattern; - -public class FalcomProtocolDecoder extends BaseProtocolDecoder { - - public FalcomProtocolDecoder(Protocol protocol) { - super(protocol); - } - - private static final Pattern PATTERN = new PatternBuilder() - .text("$T0001,") - .number("(d+),") // event (int) - .number("(dd).(dd).(dddd),") // date (31.12.2019) - .number("(dd):(dd):(dd),") // time (11:22:33) - .number("(-?d+.d+),") // latitude (d.d) - .number("(-?d+.d+),") // longitude (d.d) - .number("(d+),") // speed (int) - .number("(d+.d+),") // course (double) - .number("(d+),") // fix (int) - .number("(d+),") // satellites (int) - .number("(d+.d+),") // power (double) - .number("(d+),") // ignition (int) - .number("(x+)*") // ignition (int) - //.expression("([0-9a-fA-F]{8})*") // driverkey - .any() - .compile(); - - private Position decodeT0001(DeviceSession deviceSession, String sentence) { - - Parser parser = new Parser(PATTERN, sentence); - - if (!parser.matches()) { - return null; - } - - Position position = new Position(getProtocolName()); - - position.setDeviceId(deviceSession.getDeviceId()); - position.set(Position.KEY_EVENT, parser.nextInt(0)); - DateBuilder dateBuilder = new DateBuilder() - .setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)) - .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0)); - position.setTime(dateBuilder.getDate()); - position.setLatitude(parser.nextDouble()); - position.setLongitude(parser.nextDouble()); - position.setSpeed(parser.nextInt(0) * 1.94384449); //m/s to knot - position.setCourse(Math.round(parser.nextDouble())); - position.setValid(parser.nextInt() > 0); - position.set(Position.KEY_SATELLITES, Math.round(parser.nextInt())); - position.set(Position.KEY_POWER, parser.nextDouble()); - position.set(Position.KEY_IGNITION, parser.nextInt() == 1); - position.set(Position.KEY_DRIVER_UNIQUE_ID, parser.next()); - - return position; - } - - @Override - protected Object decode( - Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { - - String sentence = (String) msg; - - DeviceSession deviceSession; - - if (!sentence.startsWith("$") && sentence.contains("$")) { - int index = sentence.indexOf("$"); - String id = sentence.substring(0, index); - if (id.endsWith(",")) { - id = id.substring(0, id.length() - 1); - } else if (id.endsWith("/")) { - id = id.substring(id.indexOf('/') + 1, id.length() - 1); - } - deviceSession = getDeviceSession(channel, remoteAddress, id); - sentence = sentence.substring(index); - } else { - deviceSession = getDeviceSession(channel, remoteAddress); - } - - if (sentence.startsWith("$IMEI")) { - getDeviceSession(channel, remoteAddress, sentence.substring(6)); - } else if (sentence.startsWith("$T0001")) { - return decodeT0001(deviceSession, sentence); - } - - return null; - } - -} -- cgit v1.2.3 From faa35f608eff1225d35794d0a38398897940d802 Mon Sep 17 00:00:00 2001 From: jcardus Date: Wed, 25 Mar 2020 21:33:35 +0000 Subject: compression on jetty --- src/main/java/org/traccar/web/WebServer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java index daa46b926..92548d218 100644 --- a/src/main/java/org/traccar/web/WebServer.java +++ b/src/main/java/org/traccar/web/WebServer.java @@ -95,12 +95,13 @@ public class WebServer { } }); + GzipHandler gzipHandler = new GzipHandler(); + HandlerList handlers = new HandlerList(); initClientProxy(config, handlers); handlers.addHandler(servletHandler); - GzipHandler gzipHandler = new GzipHandler(); - gzipHandler.setHandler(handlers); - server.setHandler(gzipHandler); + handlers.addHandler(gzipHandler); + server.setHandler(handlers); } private void initClientProxy(Config config, HandlerList handlers) { -- cgit v1.2.3 From 02b79df2316d2b463a74edc7a1dc08231b0121f7 Mon Sep 17 00:00:00 2001 From: jcardus Date: Wed, 25 Mar 2020 21:38:53 +0000 Subject: compression on jetty --- src/main/java/org/traccar/web/WebServer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java index 92548d218..d5c4cf71b 100644 --- a/src/main/java/org/traccar/web/WebServer.java +++ b/src/main/java/org/traccar/web/WebServer.java @@ -95,12 +95,10 @@ public class WebServer { } }); - GzipHandler gzipHandler = new GzipHandler(); - HandlerList handlers = new HandlerList(); initClientProxy(config, handlers); handlers.addHandler(servletHandler); - handlers.addHandler(gzipHandler); + handlers.addHandler(new GzipHandler()); server.setHandler(handlers); } -- cgit v1.2.3