From 782a1441c1bc33045b341c77e1a2394052bd16e8 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 8 Dec 2015 10:18:26 +1300 Subject: Add basic websocket servlet to the server --- src/org/traccar/api/AsyncSocket.java | 30 ++++++++++++++++++++++++++++ src/org/traccar/api/AsyncSocketServlet.java | 31 +++++++++++++++++++++++++++++ src/org/traccar/web/WebServer.java | 2 ++ 3 files changed, 63 insertions(+) create mode 100644 src/org/traccar/api/AsyncSocket.java create mode 100644 src/org/traccar/api/AsyncSocketServlet.java (limited to 'src/org') diff --git a/src/org/traccar/api/AsyncSocket.java b/src/org/traccar/api/AsyncSocket.java new file mode 100644 index 000000000..ea28fb283 --- /dev/null +++ b/src/org/traccar/api/AsyncSocket.java @@ -0,0 +1,30 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * 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.api; + +import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.api.annotations.WebSocket; + +@WebSocket +public class AsyncSocket { + + @OnWebSocketMessage + public void onWebSocketText(Session session, String message) { + session.getRemote().sendString(message, null); // TODO: actual implementation + } + +} diff --git a/src/org/traccar/api/AsyncSocketServlet.java b/src/org/traccar/api/AsyncSocketServlet.java new file mode 100644 index 000000000..3b02bcfcd --- /dev/null +++ b/src/org/traccar/api/AsyncSocketServlet.java @@ -0,0 +1,31 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * 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.api; + +import org.eclipse.jetty.websocket.servlet.WebSocketServlet; +import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; + +public class AsyncSocketServlet extends WebSocketServlet { + + private static final long ASYNC_TIMEOUT = 60000; + + @Override + public void configure(WebSocketServletFactory factory) { + factory.getPolicy().setIdleTimeout(ASYNC_TIMEOUT); + factory.register(AsyncSocket.class); + } + +} diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index e7c0057e4..cd01d04b4 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -33,6 +33,7 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.traccar.Config; +import org.traccar.api.AsyncSocketServlet; import org.traccar.api.CorsResponseFilter; import org.traccar.api.ResourceErrorHandler; import org.traccar.api.SecurityRequestFilter; @@ -133,6 +134,7 @@ public class WebServer { PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class); servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/rest/*"); } + servletHandler.addServlet(new ServletHolder(new AsyncSocketServlet()), "/socket"); servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*"); servletHandler.addServlet(new ServletHolder(new ServerServlet()), "/server/*"); servletHandler.addServlet(new ServletHolder(new UserServlet()), "/user/*"); -- cgit v1.2.3