[Major] Added new module websocket for observer updates over websocket
This commit is contained in:
parent
d3aa114c1b
commit
36f3c54435
|
@ -0,0 +1,5 @@
|
|||
target/
|
||||
.project
|
||||
.settings
|
||||
.classpath
|
||||
.DS_Store
|
|
@ -0,0 +1,202 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
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.
|
|
@ -0,0 +1,4 @@
|
|||
li.strolch.websocket
|
||||
==================
|
||||
|
||||
websocket API for Strolch
|
|
@ -0,0 +1,127 @@
|
|||
<?xml version="1.0"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch</artifactId>
|
||||
<version>1.6.0-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>li.strolch.websocket</artifactId>
|
||||
<name>li.strolch.websocket</name>
|
||||
<description>WebSocket API for Strolch</description>
|
||||
<inceptionYear>2011</inceptionYear>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- Base -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.logback</groupId>
|
||||
<artifactId>logback-classic</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- main -->
|
||||
<dependency>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.model</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.agent</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.service</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.soql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.rest</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- utils -->
|
||||
|
||||
<!-- websocket -->
|
||||
<dependency>
|
||||
<groupId>javax.websocket</groupId>
|
||||
<artifactId>javax.websocket-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.annotation</groupId>
|
||||
<artifactId>javax.annotation-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>li.strolch</groupId>
|
||||
<artifactId>li.strolch.testbase</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hamcrest</groupId>
|
||||
<artifactId>hamcrest-library</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
<filtering>false</filtering>
|
||||
<excludes>
|
||||
<exclude>**/componentVersion.properties</exclude>
|
||||
</excludes>
|
||||
<includes>
|
||||
<include>**/*.properties</include>
|
||||
</includes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
<filtering>true</filtering>
|
||||
<includes>
|
||||
<include>**/componentVersion.properties</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>buildnumber-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-eclipse-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
|
@ -0,0 +1,196 @@
|
|||
package li.strolch.websocket;
|
||||
|
||||
import static li.strolch.model.Tags.Json.*;
|
||||
import static li.strolch.rest.StrolchRestfulConstants.MSG;
|
||||
import static li.strolch.runtime.StrolchConstants.DEFAULT_REALM;
|
||||
import static li.strolch.runtime.StrolchConstants.ROLE_STROLCH_ADMIN;
|
||||
import static li.strolch.utils.helper.ExceptionHelper.getExceptionMessage;
|
||||
import static li.strolch.utils.helper.StringHelper.*;
|
||||
|
||||
import javax.websocket.CloseReason;
|
||||
import javax.websocket.EndpointConfig;
|
||||
import javax.websocket.MessageHandler;
|
||||
import javax.websocket.Session;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import li.strolch.agent.api.ComponentContainer;
|
||||
import li.strolch.agent.api.ObserverHandler;
|
||||
import li.strolch.model.Tags;
|
||||
import li.strolch.privilege.model.Certificate;
|
||||
import li.strolch.rest.RestfulStrolchComponent;
|
||||
import li.strolch.rest.StrolchSessionHandler;
|
||||
import li.strolch.utils.helper.ExceptionHelper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class WebSocketClient implements MessageHandler.Whole<String> {
|
||||
|
||||
public static final Logger logger = LoggerFactory.getLogger(WebSocketClient.class);
|
||||
|
||||
private ComponentContainer container;
|
||||
private final Session session;
|
||||
private final EndpointConfig config;
|
||||
|
||||
private Certificate certificate;
|
||||
private Map<String, WebSocketObserverHandler> observerHandlersByRealm;
|
||||
|
||||
public WebSocketClient(ComponentContainer container, Session session, EndpointConfig config) {
|
||||
this.container = container;
|
||||
this.session = session;
|
||||
this.config = config;
|
||||
this.observerHandlersByRealm = new HashMap<>(1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMessage(String message) {
|
||||
|
||||
JsonObject jsonObject = new JsonParser().parse(message).getAsJsonObject();
|
||||
String msgType = jsonObject.get(MSG_TYPE).getAsString();
|
||||
|
||||
switch (msgType) {
|
||||
|
||||
case "Authenticate":
|
||||
handleAuthenticate(jsonObject);
|
||||
break;
|
||||
|
||||
case "ObserverRegister":
|
||||
assertAuthenticated(msgType);
|
||||
handleRegister(jsonObject);
|
||||
break;
|
||||
case "ObserverUnregister":
|
||||
assertAuthenticated(msgType);
|
||||
handleUnregister(jsonObject);
|
||||
break;
|
||||
|
||||
default:
|
||||
logger.error("Unhandled Event msgType: " + msgType);
|
||||
}
|
||||
}
|
||||
|
||||
private void assertAuthenticated(String type) {
|
||||
|
||||
if (this.certificate == null) {
|
||||
logger.error("Received " + type + " request, but not yet authed!");
|
||||
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Not yet authed!");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler();
|
||||
sessionHandler.validate(this.certificate);
|
||||
} catch (RuntimeException e) {
|
||||
logger.error("Received " + type + " request, but authentication is not valid anymore: " + ExceptionHelper
|
||||
.getExceptionMessage(e));
|
||||
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Not yet authed!");
|
||||
}
|
||||
}
|
||||
|
||||
private void handleRegister(JsonObject jsonObject) {
|
||||
String realmS;
|
||||
if (jsonObject.has(REALM) && isNotEmpty(jsonObject.get(REALM).getAsString())) {
|
||||
realmS = jsonObject.get(Tags.Json.REALM).getAsString();
|
||||
if (isEmpty(this.certificate.getRealm()) && !this.certificate.hasRole(ROLE_STROLCH_ADMIN))
|
||||
throw new IllegalStateException("User is missing realm configuration!");
|
||||
|
||||
if (!this.certificate.hasRole(ROLE_STROLCH_ADMIN) && !realmS.equals(this.certificate.getRealm())) {
|
||||
throw new IllegalStateException("User does not have access to realm " + realmS);
|
||||
}
|
||||
} else if (isNotEmpty(this.certificate.getRealm())) {
|
||||
realmS = this.certificate.getRealm();
|
||||
} else {
|
||||
realmS = DEFAULT_REALM;
|
||||
}
|
||||
|
||||
String realm = realmS;
|
||||
|
||||
String objectType = jsonObject.get(Tags.Json.OBJECT_TYPE).getAsString();
|
||||
String type = jsonObject.get(Tags.Json.TYPE).getAsString();
|
||||
boolean flat = jsonObject.has(FLAT) && jsonObject.get(FLAT).getAsBoolean();
|
||||
|
||||
this.observerHandlersByRealm.computeIfAbsent(objectType, s -> {
|
||||
ObserverHandler observerHandler = this.container.getRealm(realm).getObserverHandler();
|
||||
return new WebSocketObserverHandler(observerHandler, this);
|
||||
}).register(objectType, type, flat);
|
||||
}
|
||||
|
||||
private void handleUnregister(JsonObject jsonObject) {
|
||||
String realm = jsonObject.get(Tags.Json.REALM).getAsString();
|
||||
String objectType = jsonObject.get(Tags.Json.OBJECT_TYPE).getAsString();
|
||||
String type = jsonObject.get(Tags.Json.TYPE).getAsString();
|
||||
WebSocketObserverHandler webSocketObserverHandler = this.observerHandlersByRealm.get(realm);
|
||||
if (webSocketObserverHandler == null) {
|
||||
logger.error(
|
||||
"Client " + this.session.getId() + " for " + this.certificate.getUsername() + " not registered for "
|
||||
+ realm + " " + objectType + " " + type);
|
||||
} else {
|
||||
webSocketObserverHandler.unregister(objectType, type);
|
||||
}
|
||||
}
|
||||
|
||||
private void handleAuthenticate(JsonObject jsonObject) {
|
||||
|
||||
if (!jsonObject.has("authToken") || !jsonObject.has("username")) {
|
||||
logger.error("Received invalid authentication request: " + jsonObject.toString());
|
||||
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication");
|
||||
return;
|
||||
}
|
||||
|
||||
String authToken = jsonObject.get("authToken").getAsString();
|
||||
String username = jsonObject.get("username").getAsString();
|
||||
|
||||
try {
|
||||
StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler();
|
||||
this.certificate = sessionHandler.validate(authToken);
|
||||
if (!this.certificate.getUsername().equals(username)) {
|
||||
logger.error("Invalid authentication for " + username);
|
||||
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication");
|
||||
return;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication");
|
||||
return;
|
||||
}
|
||||
|
||||
jsonObject.addProperty(MSG, DASH);
|
||||
|
||||
sendMessage(jsonObject.toString());
|
||||
}
|
||||
|
||||
private void close(CloseReason.CloseCode code, String reason) {
|
||||
try {
|
||||
this.session.close(new CloseReason(code, reason));
|
||||
} catch (IOException e) {
|
||||
logger.error("Failed to close client after invalid authentication!", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void close() {
|
||||
if (this.observerHandlersByRealm == null || this.observerHandlersByRealm.isEmpty())
|
||||
return;
|
||||
|
||||
this.observerHandlersByRealm.keySet().forEach(realm -> {
|
||||
this.observerHandlersByRealm.get(realm).unregisterAll();
|
||||
});
|
||||
}
|
||||
|
||||
public void onError(Throwable t) {
|
||||
logger.error("Socket error: " + t.getMessage(), t);
|
||||
}
|
||||
|
||||
public synchronized void sendMessage(String data) {
|
||||
try {
|
||||
this.session.getBasicRemote().sendText(data);
|
||||
} catch (Exception e) {
|
||||
logger.error("Failed to communicate with client", e);
|
||||
try {
|
||||
this.session.close(new CloseReason(CloseReason.CloseCodes.CLOSED_ABNORMALLY, getExceptionMessage(e)));
|
||||
} catch (Exception e1) {
|
||||
logger.error("Failed to close", e1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,36 @@
|
|||
package li.strolch.websocket;
|
||||
|
||||
import javax.websocket.*;
|
||||
import javax.websocket.server.ServerEndpoint;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import li.strolch.agent.api.ComponentContainer;
|
||||
import li.strolch.rest.RestfulStrolchComponent;
|
||||
|
||||
@ServerEndpoint("/websocket/strolch")
|
||||
public class WebSocketEndpoint {
|
||||
|
||||
private ConcurrentHashMap<Session, WebSocketClient> clientMap = new ConcurrentHashMap<>();
|
||||
|
||||
@OnOpen
|
||||
public void onOpen(Session session, EndpointConfig config) {
|
||||
ComponentContainer container = RestfulStrolchComponent.getInstance().getContainer();
|
||||
WebSocketClient webSocketClient = new WebSocketClient(container, session, config);
|
||||
this.clientMap.put(session, webSocketClient);
|
||||
session.addMessageHandler(webSocketClient);
|
||||
}
|
||||
|
||||
@OnClose
|
||||
public void onClose(Session session, CloseReason closeReason) {
|
||||
WebSocketClient webSocketClient = this.clientMap.remove(session);
|
||||
if (webSocketClient != null)
|
||||
webSocketClient.close();
|
||||
}
|
||||
|
||||
@OnError
|
||||
public void onError(Session session, Throwable t) {
|
||||
WebSocketClient webSocketClient = this.clientMap.get(session);
|
||||
if (webSocketClient != null)
|
||||
webSocketClient.onError(t);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,33 @@
|
|||
package li.strolch.websocket;
|
||||
|
||||
import static li.strolch.rest.filters.AuthenticationRequestFilter.getRemoteIp;
|
||||
|
||||
import javax.servlet.*;
|
||||
import javax.servlet.annotation.WebFilter;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.io.IOException;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@WebFilter("/websocket/*")
|
||||
public class WebSocketFilter implements Filter {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(WebSocketFilter.class);
|
||||
|
||||
@Override
|
||||
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
|
||||
throws IOException, ServletException {
|
||||
|
||||
HttpServletRequest httpRequest = (HttpServletRequest) request;
|
||||
logger.info("Remote IP: " + getRemoteIp(httpRequest) + ": " + httpRequest.getMethod() + " " + httpRequest
|
||||
.getRequestURI());
|
||||
chain.doFilter(request, response);
|
||||
}
|
||||
|
||||
public void init(FilterConfig config) throws ServletException {
|
||||
}
|
||||
|
||||
public void destroy() {
|
||||
}
|
||||
}
|
|
@ -0,0 +1,98 @@
|
|||
package li.strolch.websocket;
|
||||
|
||||
import static li.strolch.rest.StrolchRestfulConstants.DATA;
|
||||
import static li.strolch.rest.StrolchRestfulConstants.MSG;
|
||||
import static li.strolch.utils.helper.StringHelper.DASH;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
import li.strolch.agent.api.Observer;
|
||||
import li.strolch.agent.api.ObserverHandler;
|
||||
import li.strolch.model.StrolchRootElement;
|
||||
import li.strolch.model.Tags;
|
||||
import li.strolch.utils.collections.MapOfLists;
|
||||
import li.strolch.utils.collections.MapOfSets;
|
||||
|
||||
public class WebSocketObserverHandler implements Observer {
|
||||
|
||||
private ObserverHandler observerHandler;
|
||||
private WebSocketClient client;
|
||||
|
||||
private MapOfSets<String, String> observedTypes;
|
||||
private Map<String, Boolean> asFlat;
|
||||
|
||||
public WebSocketObserverHandler(ObserverHandler observerHandler, WebSocketClient client) {
|
||||
this.observerHandler = observerHandler;
|
||||
this.client = client;
|
||||
this.observedTypes = new MapOfSets<>();
|
||||
this.asFlat = new HashMap<>(1);
|
||||
}
|
||||
|
||||
public void register(String objectType, String type, boolean flat) {
|
||||
if (!this.observedTypes.containsSet(objectType)) {
|
||||
this.observerHandler.registerObserver(objectType, this);
|
||||
}
|
||||
this.observedTypes.addElement(objectType, type);
|
||||
this.asFlat.put(type, flat);
|
||||
}
|
||||
|
||||
public void unregister(String objectType, String type) {
|
||||
this.observedTypes.removeElement(objectType, type);
|
||||
if (!this.observedTypes.containsSet(objectType)) {
|
||||
this.observerHandler.unregisterObserver(objectType, this);
|
||||
}
|
||||
}
|
||||
|
||||
public void unregisterAll() {
|
||||
this.observedTypes.keySet().forEach(key -> this.observerHandler.unregisterObserver(key, this));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(String key, List<StrolchRootElement> elements) {
|
||||
handleUpdate("ObserverAdd", key, elements);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(String key, List<StrolchRootElement> elements) {
|
||||
handleUpdate("ObserverUpdate", key, elements);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void remove(String key, List<StrolchRootElement> elements) {
|
||||
handleUpdate("ObserverRemove", key, elements);
|
||||
}
|
||||
|
||||
private void handleUpdate(String updateType, String key, List<StrolchRootElement> elements) {
|
||||
Set<String> observedTypesSet = this.observedTypes.getSet(key);
|
||||
if (observedTypesSet == null)
|
||||
return;
|
||||
|
||||
MapOfLists<String, JsonObject> data = elements.stream().filter(e -> observedTypesSet.contains(e.getType()))
|
||||
.map(e -> {
|
||||
if (this.asFlat.get(e.getType()))
|
||||
return e.toFlatJsonObject();
|
||||
else
|
||||
return e.toJsonObject();
|
||||
}).collect(MapOfLists::new, (mol, e) -> mol.addElement(e.get(Tags.Json.TYPE).getAsString(), e),
|
||||
MapOfLists::addAll);
|
||||
if (data.isEmpty())
|
||||
return;
|
||||
|
||||
data.keySet().forEach(type -> {
|
||||
JsonObject jsonObject = new JsonObject();
|
||||
jsonObject.addProperty(MSG, DASH);
|
||||
jsonObject.addProperty(Tags.Json.MSG_TYPE, updateType);
|
||||
jsonObject.addProperty(Tags.Json.OBJECT_TYPE, key);
|
||||
jsonObject.addProperty(Tags.Json.TYPE, type);
|
||||
JsonArray elementsJ = new JsonArray();
|
||||
data.getList(type).forEach(elementsJ::add);
|
||||
jsonObject.add(DATA, elementsJ);
|
||||
this.client.sendMessage(jsonObject.toString());
|
||||
});
|
||||
}
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
groupId=${project.groupId}
|
||||
artifactId=${project.artifactId}
|
||||
artifactVersion=${project.version}
|
||||
scmRevision=${buildNumber}
|
||||
scmBranch=${scmBranch}
|
||||
buildTimestamp=${buildTimestamp}
|
10
pom.xml
10
pom.xml
|
@ -87,6 +87,7 @@
|
|||
<javaxmail.version>1.6.0</javaxmail.version>
|
||||
<serverlet.version>3.1.0</serverlet.version>
|
||||
<jaxrs.api.version>2.1</jaxrs.api.version>
|
||||
<websocket.version>1.1</websocket.version>
|
||||
<csv.version>1.4</csv.version>
|
||||
|
||||
<junit.version>4.12</junit.version>
|
||||
|
@ -134,6 +135,7 @@
|
|||
<module>li.strolch.agent</module>
|
||||
<module>li.strolch.service</module>
|
||||
<module>li.strolch.rest</module>
|
||||
<module>li.strolch.websocket</module>
|
||||
|
||||
<module>li.strolch.performancetest</module>
|
||||
<module>strolch_minimal_rest</module>
|
||||
|
@ -282,6 +284,14 @@
|
|||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- websocket -->
|
||||
<dependency>
|
||||
<groupId>javax.websocket</groupId>
|
||||
<artifactId>javax.websocket-api</artifactId>
|
||||
<version>${websocket.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- test -->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
Loading…
Reference in New Issue