Peer-at-Code/peer-at-code-framework
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix reading Json in WebSocket

Browse source
This commit is contained in:
jeffcheasey88 2023-09-23 11:56:59 +02:00
parent f176f118a3
commit 4999115ca9
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dev/peerat/framework/Client.java
View file

@ -1,7 +1,6 @@
package dev.peerat.framework; package dev.peerat.framework;
import java.net.Socket; import java.net.Socket;
import java.util.Arrays;
import org.jose4j.jwt.consumer.InvalidJwtException; import org.jose4j.jwt.consumer.InvalidJwtException;
@ -32,7 +31,6 @@ public class Client<U extends User> extends Thread{
writer.flush(); writer.flush();
writer.close(); writer.close();
}catch(InvalidJwtException e){ }catch(InvalidJwtException e){
// e.printStackTrace();
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
if(context != null && context.getResponseCode() == 0){ if(context != null && context.getResponseCode() == 0){
@ -53,7 +51,6 @@ public class Client<U extends User> extends Thread{
try{ try{
return this.router.getUser(auth); return this.router.getUser(auth);
}catch(InvalidJwtException e){ }catch(InvalidJwtException e){
e.printStackTrace();
try{ try{
writer.response(401, router.getDefaultHeaders(type)); writer.response(401, router.getDefaultHeaders(type));
writer.flush(); writer.flush();

3
src/dev/peerat/framework/HttpReader.java
View file

@ -6,7 +6,6 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -19,7 +18,7 @@ import dev.peerat.framework.utils.json.JsonParser;
public class HttpReader{ public class HttpReader{
private static Pattern HEADER_PATTERN = Pattern.compile("^([^:]*):\\s+(.*)$"); 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 Socket socket;
private InputStream in; private InputStream in;

6
src/dev/peerat/framework/WebSocketReader.java
View file

@ -2,13 +2,17 @@ package dev.peerat.framework;
import java.io.IOException; import java.io.IOException;
import dev.peerat.framework.utils.json.Json;
public class WebSocketReader extends HttpReader{ public class WebSocketReader extends HttpReader{
public WebSocketReader(HttpReader origin) throws Exception{ public WebSocketReader(HttpReader origin) throws Exception{
super(origin); super(origin);
} }
public <J extends Json> J readJson() throws Exception{
return JSON_PARSER.parse(readLine());
}
@Override @Override
public String readLine() throws IOException{ public String readLine() throws IOException{