From b60bdb72fa748ebc7fbe363df7b5e8ebd925514b Mon Sep 17 00:00:00 2001
From: Gravit <gravit.min@ya.ru>
Date: Mon, 1 Oct 2018 17:01:10 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../websocket/WebSocketFrameHandler.java      | 10 ++------
 .../socket/websocket/WebSocketService.java    | 24 +++++++++++++++++--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java
index ec879c5a..ae007545 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java
@@ -1,26 +1,20 @@
 package ru.gravit.launchserver.socket.websocket;
 
-import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.channel.group.ChannelGroup;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
-import io.netty.util.AttributeKey;
-import io.netty.util.AttributeMap;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.socket.Client;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
 public class WebSocketFrameHandler extends SimpleChannelInboundHandler<WebSocketFrame> {
-    public static final ChannelGroup channels = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
     public static LaunchServer server;
     public static GsonBuilder builder = new GsonBuilder();
-    public static WebSocketService service = new WebSocketService(LaunchServer.server,builder);
+    public static WebSocketService service = new WebSocketService(new DefaultChannelGroup(GlobalEventExecutor.INSTANCE), LaunchServer.server,builder);
     private Client client;
     static {
         service.registerResponses();
@@ -29,7 +23,7 @@ public class WebSocketFrameHandler extends SimpleChannelInboundHandler<WebSocket
     public void channelActive(ChannelHandlerContext ctx) {
         LogHelper.debug("New client %s", IOHelper.getIP(ctx.channel().remoteAddress()));
         client = new Client(0);
-        channels.add(ctx.channel());
+        service.registerClient(ctx.channel());
     }
 
     @Override
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java
index 5ffc701c..02f2cd3c 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java
@@ -2,7 +2,9 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.group.ChannelGroup;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.socket.Client;
@@ -15,9 +17,12 @@
 import java.util.HashMap;
 
 public class WebSocketService {
-    public WebSocketService(LaunchServer server, GsonBuilder gson) {
+    public final ChannelGroup channels;
+    public WebSocketService(ChannelGroup channels, LaunchServer server, GsonBuilder gson) {
+        this.channels = channels;
         this.server = server;
         this.gsonBuiler = gson;
+        this.
         gsonBuiler.registerTypeAdapter(JsonResponseInterface.class,new JsonResponseAdapter(this));
         this.gson = gsonBuiler.create();
     }
@@ -47,6 +52,10 @@ public void registerResponse(String key,Class responseInterfaceClass)
     {
         responses.put(key,responseInterfaceClass);
     }
+    public void registerClient(Channel channel)
+    {
+        channels.add(channel);
+    }
     public void registerResponses()
     {
         registerResponse("echo", EchoResponse.class);
@@ -56,6 +65,10 @@ public void sendObject(ChannelHandlerContext ctx, Object obj)
     {
         ctx.channel().writeAndFlush(new TextWebSocketFrame(gson.toJson(obj)));
     }
+    public void sendEvent(EventResult obj)
+    {
+        channels.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj)));
+    }
     public static class ErrorResult
     {
         public ErrorResult(String error) {
@@ -76,7 +89,14 @@ public SuccessResult(String requesttype) {
         public final String requesttype;
         public final String type;
     }
-    public class ExceptionResult
+    public static class EventResult
+    {
+        public EventResult() {
+            this.type = "event";
+        }
+        public final String type;
+    }
+    public static class ExceptionResult
     {
         public ExceptionResult(Exception e) {
             this.message = e.getMessage();