diff --git a/actions/pom.xml b/actions/pom.xml
index 8796857a..09b85908 100644
--- a/actions/pom.xml
+++ b/actions/pom.xml
@@ -23,11 +23,11 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
tools.dynamia.actions
- 5.4.7
+ 5.4.8
DynamiaTools - Actions
https://dynamia.tools/docs/actions
@@ -65,12 +65,12 @@
tools.dynamia
tools.dynamia.integration
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.commons
- 5.4.7
+ 5.4.8
diff --git a/app/pom.xml b/app/pom.xml
index 405887d3..29efa99f 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -23,11 +23,11 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
tools.dynamia.app
- 5.4.7
+ 5.4.8
DynamiaTools - App
https://dynamia.tools/docs/app
@@ -74,58 +74,58 @@
tools.dynamia
tools.dynamia.actions
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.commons
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.crud
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.domain
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.integration
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.io
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.navigation
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.reports
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.templates
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.viewers
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.web
- 5.4.7
+ 5.4.8
org.springframework.data
@@ -208,7 +208,7 @@
tools.dynamia
tools.dynamia.domain.jpa
- 5.4.7
+ 5.4.8
test
diff --git a/commons/pom.xml b/commons/pom.xml
index 59a6058c..300c5761 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -22,11 +22,11 @@
tools.dynamia.commons
jar
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - Commons
https://dynamia.tools/docs/common
diff --git a/crud/pom.xml b/crud/pom.xml
index 82e15b83..c4833691 100644
--- a/crud/pom.xml
+++ b/crud/pom.xml
@@ -23,11 +23,11 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
tools.dynamia.crud
- 5.4.7
+ 5.4.8
DynamiaTools - CRUD
https://dynamia.tools/docs/crud
@@ -62,23 +62,23 @@
tools.dynamia
tools.dynamia.actions
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.viewers
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.navigation
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.domain.jpa
- 5.4.7
+ 5.4.8
test
diff --git a/domain-jpa/pom.xml b/domain-jpa/pom.xml
index fbbd1dbb..3bc57661 100644
--- a/domain-jpa/pom.xml
+++ b/domain-jpa/pom.xml
@@ -23,13 +23,13 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - Domain JPA
https://dynamia.tools/docs/domain
tools.dynamia.domain.jpa
- 5.4.7
+ 5.4.8
jar
diff --git a/domain/pom.xml b/domain/pom.xml
index e0bcb1df..26e16fda 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -21,13 +21,13 @@
4.0.0
tools.dynamia.domain
- 5.4.7
+ 5.4.8
jar
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - Domain
https://dynamia.tools/docs/domain
diff --git a/integration/pom.xml b/integration/pom.xml
index 32f7e8d5..828faad0 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -27,12 +27,12 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - Integration
A set of classes and interfaces that help integrate modules
- 5.4.7
+ 5.4.8
https://dynamia.tools/docs/integration
diff --git a/io/pom.xml b/io/pom.xml
index 4fcd53ed..bcc1ec4d 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -28,11 +28,11 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - IO
- 5.4.7
+ 5.4.8
A set of classes and interfaces that help in any kind io task
https://dynamia.tools/docs/io
diff --git a/navigation/pom.xml b/navigation/pom.xml
index f0bfb99f..d51c2a0d 100644
--- a/navigation/pom.xml
+++ b/navigation/pom.xml
@@ -23,11 +23,11 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
tools.dynamia.navigation
- 5.4.7
+ 5.4.8
DynamiaTools - Navigation
https://dynamia.tools/docs/navigation
@@ -63,17 +63,17 @@
tools.dynamia
tools.dynamia.commons
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.integration
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.actions
- 5.4.7
+ 5.4.8
diff --git a/pom.xml b/pom.xml
index 5ca9d3bb..67abafb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
4.0.0
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
pom
Dynamia Soluciones IT SAS
diff --git a/reports/pom.xml b/reports/pom.xml
index 63611269..51711b9e 100644
--- a/reports/pom.xml
+++ b/reports/pom.xml
@@ -26,11 +26,11 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - Reports
- 5.4.7
+ 5.4.8
A set of classes and interfaces that help building Reports
https://dynamia.tools/docs/reports
diff --git a/starter/pom.xml b/starter/pom.xml
index 6276c279..d27139b1 100644
--- a/starter/pom.xml
+++ b/starter/pom.xml
@@ -4,7 +4,7 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
dynamia-tools-starter
DynamiaTools - Starter
@@ -26,17 +26,17 @@
tools.dynamia
tools.dynamia.app
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.zk
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.domain.jpa
- 5.4.7
+ 5.4.8
org.hibernate.validator
diff --git a/templates/pom.xml b/templates/pom.xml
index c48b760a..2f2c066a 100644
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -23,12 +23,12 @@
tools.dynamia.parent
tools.dynamia
- 5.4.7
+ 5.4.8
tools.dynamia.templates
- 5.4.7
+ 5.4.8
DynamiaTools - Templates
https://dynamia.tools/docs/templates
@@ -64,12 +64,12 @@
tools.dynamia
tools.dynamia.integration
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.commons
- 5.4.7
+ 5.4.8
diff --git a/ui/pom.xml b/ui/pom.xml
index bdea2ad7..c53a218b 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -23,11 +23,11 @@
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
tools.dynamia.ui
- 5.4.7
+ 5.4.8
DynamiaTools - UI
https://dynamia.tools/docs/ui
Helper classes for module integrations and messages
@@ -64,17 +64,17 @@
tools.dynamia
tools.dynamia.integration
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.commons
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.io
- 5.4.7
+ 5.4.8
diff --git a/viewers/pom.xml b/viewers/pom.xml
index e54d2c2b..e6e0f95c 100644
--- a/viewers/pom.xml
+++ b/viewers/pom.xml
@@ -23,13 +23,13 @@
tools.dynamia.viewers
jar
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - Viewers
@@ -67,27 +67,27 @@
tools.dynamia
tools.dynamia.commons
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.integration
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.io
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.domain
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.actions
- 5.4.7
+ 5.4.8
org.yaml
diff --git a/web/pom.xml b/web/pom.xml
index 04f263b3..07aa3bbf 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -23,14 +23,14 @@
tools.dynamia.web
jar
- 5.4.7
+ 5.4.8
A set of common classes and interfaces for web application development
tools.dynamia
tools.dynamia.parent
- 5.4.7
+ 5.4.8
DynamiaTools - Web
@@ -88,27 +88,27 @@
tools.dynamia
tools.dynamia.commons
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.integration
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.navigation
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.viewers
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.crud
- 5.4.7
+ 5.4.8
org.springframework
diff --git a/zk/pom.xml b/zk/pom.xml
index 7b2a2d7b..4755d717 100644
--- a/zk/pom.xml
+++ b/zk/pom.xml
@@ -21,12 +21,12 @@
tools.dynamia.parent
tools.dynamia
- 5.4.7
+ 5.4.8
4.0.0
tools.dynamia.zk
- 5.4.7
+ 5.4.8
jar
DynamiaTools - ZK
https://dynamia.tools/docs/zk
@@ -99,31 +99,31 @@
tools.dynamia
tools.dynamia.web
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.navigation
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.ui
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.domain
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.viewers
- 5.4.7
+ 5.4.8
org.yaml
@@ -134,19 +134,19 @@
tools.dynamia
tools.dynamia.crud
- 5.4.7
+ 5.4.8
tools.dynamia
tools.dynamia.reports
- 5.4.7
+ 5.4.8
compile
tools.dynamia
tools.dynamia.templates
- 5.4.7
+ 5.4.8
compile
diff --git a/zk/src/main/java/tools/dynamia/zk/websocket/WebSocketPushSender.java b/zk/src/main/java/tools/dynamia/zk/websocket/WebSocketPushSender.java
index 38fec0e8..84374625 100644
--- a/zk/src/main/java/tools/dynamia/zk/websocket/WebSocketPushSender.java
+++ b/zk/src/main/java/tools/dynamia/zk/websocket/WebSocketPushSender.java
@@ -58,7 +58,7 @@ public static boolean sendPushCommand(Desktop desktop, String command) {
* @return true if command is sended successfull. Check log for false response
*/
public static boolean sendPushCommand(Desktop desktop, String command, Map payload) {
- WebSocketGlobalCommandHandler handler = Containers.get().findObject(WebSocketGlobalCommandHandler.class);
+ WebSocketGlobalCommandHandler handler = getHandler();
if (handler != null) {
try {
Map data = new HashMap<>();
@@ -99,7 +99,7 @@ public static boolean sendPushCommand(String command) {
*
*/
public static void broadcastCommand(String command) {
- WebSocketGlobalCommandHandler handler = Containers.get().findObject(WebSocketGlobalCommandHandler.class);
+ WebSocketGlobalCommandHandler handler = getHandler();
if (handler != null) {
handler.getAllSessions().forEach(s -> {
try {
@@ -111,8 +111,12 @@ public static void broadcastCommand(String command) {
}
}
+ private static WebSocketGlobalCommandHandler getHandler() {
+ return Containers.get().findObject(WebSocketGlobalCommandHandler.class);
+ }
+
/**
- * Init WS connection with client
+ * Initialize WebSocket connection on client side by requesting it via Clients.evalJavaScript
*/
public static void initWS() {
if (ZKUtil.isInEventListener()) {
@@ -124,4 +128,17 @@ public static void initWS() {
}
}
}
+
+ /**
+ * Check if desktop has an open WS session, if not try to init WS connection
+ */
+ public static void checkDesktop(Desktop desktop) {
+ var handler = getHandler();
+ if (handler != null) {
+ var session = handler.findSession(desktop);
+ if (session == null || !session.isOpen()) {
+ initWS();
+ }
+ }
+ }
}