Added calling of custom disconnect events, also fixed a few websocket…

… close issues
mixer · Jan 30, 2020 · 8a20835 · 8a20835
1 parent 927d8d1
commit 8a20835
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/src/main/java/com/mixer/api/resource/chat/ws/MixerChatConnection.java b/src/main/java/com/mixer/api/resource/chat/ws/MixerChatConnection.java
@@ -3,6 +3,8 @@
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
@@ -136,6 +138,17 @@ public void onMessage(String s) {
     }
 
     @Override public void onClose(int i, String s, boolean b) {
+		Class<? extends AbstractChatEvent> type = AbstractChatEvent.EventType.fromSerializedName("disconnect").getCorrespondingClass();
+		Gson gson = null;
+		gson = new GsonBuilder().create();
+		JsonObject json = new JsonObject();
+		JsonObject obj = new JsonObject();
+		obj.addProperty("code", i);
+		obj.addProperty("reason", s);
+		obj.addProperty("remote", b);
+		json.add("data", obj);
+		this.dispatchEvent(this.mixer.gson.fromJson(json, type));
+    	this.close(i);
         this.producer.notifyClose(i, s, b);
     }
 

diff --git a/src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnection.java b/src/main/java/com/mixer/api/resource/constellation/ws/MixerConstellationConnection.java
@@ -3,6 +3,8 @@
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
@@ -122,9 +124,21 @@ public void onMessage(String s) {
     }
 
     @Override public void onClose(int i, String s, boolean b) {
-        this.producer.notifyClose(i, s, b);
+		Class<? extends AbstractConstellationEvent> type = AbstractConstellationEvent.EventType
+				.fromSerializedName("disconnect").getCorrespondingClass();
+		Gson gson = null;
+		gson = new GsonBuilder().create();
+		JsonObject obj = new JsonObject();
+		obj.addProperty("code", i);
+		obj.addProperty("reason", s);
+		obj.addProperty("remote", b);
+		JsonObject json = new JsonObject();
+		json.add("data", obj);
+		this.dispatchEvent(this.mixer.gson.fromJson(json, type));
+		this.close(i);
+		this.producer.notifyClose(i, s, b);
     }
-
+    
     private <T extends AbstractConstellationEvent> void dispatchEvent(T event) {
         Class<? extends AbstractConstellationEvent> eventType = event.getClass();