From 4999115ca913c7e67ba49e7055005628594f2c55 Mon Sep 17 00:00:00 2001
From: jeffcheasey88 <66554203+jeffcheasey88@users.noreply.github.com>
Date: Sat, 23 Sep 2023 11:56:59 +0200
Subject: [PATCH] Fix reading Json in WebSocket

---
 src/dev/peerat/framework/Client.java          | 3 ---
 src/dev/peerat/framework/HttpReader.java      | 3 +--
 src/dev/peerat/framework/WebSocketReader.java | 6 +++++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dev/peerat/framework/Client.java b/src/dev/peerat/framework/Client.java
index 354bda8..58806f9 100644
--- a/src/dev/peerat/framework/Client.java
+++ b/src/dev/peerat/framework/Client.java
@@ -1,7 +1,6 @@
 package dev.peerat.framework;
 
 import java.net.Socket;
-import java.util.Arrays;
 
 import org.jose4j.jwt.consumer.InvalidJwtException;
 
@@ -32,7 +31,6 @@ public class Client<U extends User> extends Thread{
 			writer.flush();
 			writer.close();
 		}catch(InvalidJwtException e){
-//			e.printStackTrace();
 		}catch(Exception e){
 			e.printStackTrace();
 			if(context != null && context.getResponseCode() == 0){
@@ -53,7 +51,6 @@ public class Client<U extends User> extends Thread{
 		try{
 			return this.router.getUser(auth);
 		}catch(InvalidJwtException e){
-			e.printStackTrace();
 			try{
 				writer.response(401, router.getDefaultHeaders(type));
 				writer.flush();
diff --git a/src/dev/peerat/framework/HttpReader.java b/src/dev/peerat/framework/HttpReader.java
index 5f6fe9c..dee1cdd 100644
--- a/src/dev/peerat/framework/HttpReader.java
+++ b/src/dev/peerat/framework/HttpReader.java
@@ -6,7 +6,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.Socket;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,7 +18,7 @@ import dev.peerat.framework.utils.json.JsonParser;
 public class HttpReader{
 	
 	private static Pattern HEADER_PATTERN = Pattern.compile("^([^:]*):\\s+(.*)$");
-	private static JsonParser JSON_PARSER = new JsonParser();
+	static JsonParser JSON_PARSER = new JsonParser();
 
 	private Socket socket;
 	private InputStream in;
diff --git a/src/dev/peerat/framework/WebSocketReader.java b/src/dev/peerat/framework/WebSocketReader.java
index 88ea1ce..cc6f480 100644
--- a/src/dev/peerat/framework/WebSocketReader.java
+++ b/src/dev/peerat/framework/WebSocketReader.java
@@ -2,13 +2,17 @@ package dev.peerat.framework;
 
 import java.io.IOException;
 
+import dev.peerat.framework.utils.json.Json;
+
 public class WebSocketReader extends HttpReader{
 
 	public WebSocketReader(HttpReader origin) throws Exception{
 		super(origin);
 	}
 
-	
+	public <J extends Json> J readJson() throws Exception{
+		return JSON_PARSER.parse(readLine());
+	}
 	
 	@Override
 	public String readLine() throws IOException{