From 7a164dd1c7a3ba3badf262ec686133a784e6822e Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Thu, 23 May 2019 21:07:40 +0300 Subject: [PATCH 1/4] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= =?UTF-8?q?.=20[FIX]=20AdditionalHash=5Fmodule.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index b5995176..ab2f866a 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit b599517693c9d1c9a9045982ffa8068e1ed620c4 +Subproject commit ab2f866aa71b2cc6cdcf90836e91c222399c995d From aa1be6a23f1c72293a4e19e71e26b2a419276c60 Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 24 May 2019 03:29:03 +0700 Subject: [PATCH 2/4] =?UTF-8?q?[FIX]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=B8=D0=B5=D0=BC=D0=B0=20ping=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D1=83=20=D0=BA?= =?UTF-8?q?=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D1=81=D0=BA=D0=BE=D0=B9=20=D1=87?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D0=B8=20=D0=B2=D0=B5=D0=B1=D1=81=D0=BE=D0=BA?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launcher/request/websockets/WebSocketClientHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java index d9c27341..32ad7cf2 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java @@ -66,6 +66,10 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Except LogHelper.dev("Message: %s", textFrame.text()); // uncomment to print request // logger.info(textFrame.text()); + } else if ((frame instanceof PingWebSocketFrame)) { + frame.content().retain(); + ctx.channel().writeAndFlush(new PongWebSocketFrame(frame.content())); + //return; } else if (frame instanceof PongWebSocketFrame) { } else if (frame instanceof CloseWebSocketFrame) ch.close(); From d0c59790bb0c5b1c140bba7d488ca2166daf0fda Mon Sep 17 00:00:00 2001 From: Gravit Date: Fri, 24 May 2019 04:04:11 +0700 Subject: [PATCH 3/4] =?UTF-8?q?[FIX]=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=85=D0=B0=D0=BD=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=20schedule=20ping=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launcher/request/websockets/WebSocketClientHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java index 32ad7cf2..c7042963 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java @@ -32,9 +32,9 @@ public void handlerAdded(final ChannelHandlerContext ctx) throws Exception { public void channelActive(final ChannelHandlerContext ctx) throws Exception { handshaker.handshake(ctx.channel()); clientJSONPoint.onOpen(); - ctx.executor().schedule(() -> { + ctx.executor().scheduleWithFixedDelay(() -> { ctx.channel().writeAndFlush(new PingWebSocketFrame()); - }, 20L, TimeUnit.SECONDS); + }, 20L, 20L, TimeUnit.SECONDS); } @Override From 1f692330a7dfecaee07c415d218b9e06fb45867f Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Fri, 24 May 2019 12:37:07 +0300 Subject: [PATCH 4/4] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= =?UTF-8?q?.=20[FIX]=20=D0=9F=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D1=82=D1=8C=20JarSigner=5F?= =?UTF-8?q?module.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index ab2f866a..3bec47f6 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit ab2f866aa71b2cc6cdcf90836e91c222399c995d +Subproject commit 3bec47f61ceaf63f8c3de0bafc4a51224dfaddb1