Marc/PTS3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch crash serveur

Browse Source
This commit is contained in:
marc barbier
2020-12-16 16:32:10 +01:00
parent d14f5519bc
commit f0871e97b1
5 changed files with 129 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/iutlaval/myapplication/Game/Cards/CardRegistery.java
+4 -1
View File
@@ -97,7 +97,7 @@ import java.util.List;
public class CardRegistery {
public static List<Class<? extends Card>> registry;
public CardRegistery()
private static void initCardRegistery()
{
registry = new ArrayList<>();
@@ -205,6 +205,7 @@ public class CardRegistery {
}
public static int indexOf(Class<? extends Card> class1) {
if(registry == null)initCardRegistery();
int a = registry.indexOf(class1);
if(a == -1){
@@ -216,12 +217,14 @@ public class CardRegistery {
public static Class<? extends Card> get(int index) {
if(registry == null)initCardRegistery();
if(registry.size() <= index || index < 0) return null;
return registry.get(index);
}
public static int indexOf(Card card) {
if(registry == null)initCardRegistery();
return indexOf(card.getClass());
}
}
app/src/main/java/com/iutlaval/myapplication/Game/Command.java
+1
View File
@@ -3,6 +3,7 @@ package com.iutlaval.myapplication.Game;
public final class Command {
public static final String UPDATE = "update";
public static final String PONG = "pong";
private Command(){} // pas de contructor public on ne veut pas instancier cette classe
public static final String YOURTURN="yourturn";
app/src/main/java/com/iutlaval/myapplication/Game/Communication.java
+95
View File
@@ -0,0 +1,95 @@
package com.iutlaval.myapplication.Game;
import android.util.Log;
import com.iutlaval.myapplication.exception.NotAnIntegerException;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.Socket;
import java.net.SocketException;
public class Communication {
private static final short MAX_ACCEPTABLE_PING = 500;
public static final String TIMEOUT = "timeout";
public static final String ERROR = "ERROR";
private ObjectInputStream clientIn;
private ObjectOutputStream clientOut;
private Socket client;
public Communication(Socket client) throws IOException {
clientIn = new ObjectInputStream(client.getInputStream());
clientOut = new ObjectOutputStream(client.getOutputStream());
this.client=client;
}
/**
* on met un delais infini d'attente de réponse
* @throws SocketException
*/
public void setUnlimitedTimeOut() throws SocketException {
//ce n'est pas réelement infini juste trés grand
client.setSoTimeout(Integer.MAX_VALUE);
}
/**
* on met le delais défini par la constante MAX_ACCEPTABLE_PING en tant que delais de reponse
* @throws SocketException
*/
public void setLimitedTimeOut() throws SocketException {
client.setSoTimeout(MAX_ACCEPTABLE_PING);
}
/**
* on envoie que des chaines de caractére car on na pas euh de cours sur le reseau et que l'envoie d'entier a déja causé de nombreux probléme
* @param message
*/
public void send(String message) throws IOException {
clientOut.writeObject(message);
}
/**
* redéfinitoin de send() qui convertie l'entier recu en chaine de caractére
* @param message
* @throws IOException
*/
public void send(int message) throws IOException {
send(""+message);
}
public String recieve(){
try {
return (String) clientIn.readObject();
} catch (ClassNotFoundException e) {
e.printStackTrace();
//on crash
return ERROR;
} catch (IOException e) {
return TIMEOUT;
}
}
public int recieveInt()
{
String message = recieve();
if(message.matches("-?\\d+"))
{
return Integer.parseInt(message);
}else{
if(!(message.equals(TIMEOUT)||message.equals(ERROR)))
{
throw new NotAnIntegerException();
}
return Integer.MIN_VALUE;//retourne la valeur la plus petite en guise de message d'erreur
}
}
public void close() throws IOException {
if(clientOut != null)clientOut.close();
if(clientIn != null)clientIn.close();
if(client != null)client.close();
}
}
app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+25 -48
View File
@@ -39,17 +39,16 @@ public class GameLogicThread extends Thread{
private boolean ready;
private TouchHandler touch;
private GameActivity gameActivity;
private ObjectInputStream clientIn=null;
private ObjectOutputStream clientOut=null;
private NetworkDeck deck;
private Hand hand;
private Board board;
private boolean isYourTurn;
private boolean cancelled;
private Socket client;
private String deckName;
private int mana=0;
private Communication coms;
//ces variable permette la comunication avec le thread android du tactile et le reseau en passant par ce thread
@@ -61,7 +60,6 @@ public class GameLogicThread extends Thread{
public GameLogicThread(GameActivity gameActivity, String deckName, Renderer renderer)
{
new CardRegistery();
this.deckName=deckName;
Log.e("RESOLUTION:",""+GameActivity.screenWidth+"x"+GameActivity.screenHeight);
ready=false;
@@ -92,13 +90,12 @@ public class GameLogicThread extends Thread{
//Rectangle pos = new Rectangle(0F,0F,100F,100F);
ready=true;
final String host = "4.tcp.ngrok.io";//192.168.43.251tcp://2.tcp.ngrok.io:
final int port = 19165;
final String host = "0.tcp.ngrok.io";//192.168.43.251tcp://2.tcp.ngrok.io:
final int port = 13562;
try {
client = new Socket(host, port);
clientIn = new ObjectInputStream(client.getInputStream());
clientOut = new ObjectOutputStream(client.getOutputStream());
Socket client = new Socket(host, port);
coms= new Communication(client);
} catch (IOException e) {
Log.e("ERROR SERVER DEAD","srv");
//TODO display error and don't crash the game;
@@ -113,7 +110,7 @@ public class GameLogicThread extends Thread{
if(!requestDone && requestZone != -1 && requestCard != null)
{
try {//on allonge le delais car sinon on skip l'autorisation serveur
client.setSoTimeout(Integer.MAX_VALUE);
coms.setUnlimitedTimeOut();
} catch (SocketException e) {}
requestResult = onCardPlayed(requestCard,requestZone);
requestZone=-1;
@@ -125,28 +122,20 @@ public class GameLogicThread extends Thread{
try {
//on limite le temps du readobject pour eviter les blockaeg
client.setSoTimeout(1000);
String serveurCmd = (String)clientIn.readObject();
client.setSoTimeout(Integer.MAX_VALUE);
coms.setLimitedTimeOut();
String serveurCmd = coms.recieve();
coms.setUnlimitedTimeOut();
Log.e("command",serveurCmd);
switch (serveurCmd)
{
case Command.GET_DECK:
clientOut.writeObject(deckName);
String deckstr = (String)clientIn.readObject();
coms.send(deckName);
String deckstr = coms.recieve();
deck = new NetworkDeck(deckstr,gameActivity.getBaseContext());
Log.e("got deck",deckstr);
break;
case Command.DRAW:
Object o = clientIn.readObject();
int nbcard;
if(o instanceof String)
{
nbcard = Integer.parseInt((String) o);
}else{
nbcard = (Integer)o;
}
int nbcard = coms.recieveInt();
hand.pickCardFromDeck(deck,nbcard);
Log.e("picked",nbcard+"card");
drawHandPreview();
@@ -160,7 +149,7 @@ public class GameLogicThread extends Thread{
case Command.SETMANA:
renderer.removeToDraw("mana");
mana = (int)clientIn.readObject();
mana = coms.recieveInt();
renderer.addToDraw(new DrawableText("Mana : "+mana,90F,90F,"mana",10F,10F,100,800,200));
break;
@@ -169,7 +158,7 @@ public class GameLogicThread extends Thread{
break;
case Command.POPUP:
String recivedMessage = (String)clientIn.readObject();
String recivedMessage = coms.recieve();
Toast popupToast = new Toast(gameActivity);
popupToast.setText(recivedMessage);
popupToast.setDuration(Toast.LENGTH_LONG);
@@ -195,15 +184,15 @@ public class GameLogicThread extends Thread{
loseToast.show();
break;
case Command.PING:
clientOut.writeObject("pong");
coms.send(Command.PONG);
break;
case Command.UPDATE:
renderer.updateFrame();
case Command.PUT_ENEMY_CARD:
int cardId = (int)clientIn.readObject();
int zone = (int)clientIn.readObject();
int cardId = coms.recieveInt();
int zone = coms.recieveInt();
//on instancie la carte recu
Class<? extends Card> c = CardRegistery.get(cardId);
@@ -272,21 +261,20 @@ public class GameLogicThread extends Thread{
{
try {
//on veut jouer une carte
clientOut.writeObject(Command.PUT_CARD);
coms.send(Command.PUT_CARD);
//on lui dit quelle caret on veut
int cardId = CardRegistery.indexOf(card.getCard());
if (cardId == -1) {
clientOut.writeObject("CLIENT REGISTRY ERROR");
coms.send("CLIENT REGISTRY ERROR");
throw new UnrecognizedCard();
}
clientOut.writeObject(cardId);
clientOut.writeObject(zone);
coms.send(cardId);
coms.send(zone);
Log.e("waiting","for ok");
if (clientIn.readObject().equals(Command.OK)) {
Log.e("waiting","done");
if (coms.recieve().equals(Command.OK)) {
board.setCard(zone, card.getCard());
return true;
}
@@ -315,7 +303,6 @@ public class GameLogicThread extends Thread{
e.printStackTrace();
}
}
Log.e("card play","sending to render");
return requestResult;
}
@@ -366,9 +353,7 @@ public class GameLogicThread extends Thread{
public void terminate() {
ready=false;
try {
if(clientOut != null)clientOut.close();
if(clientIn != null)clientIn.close();
if(client != null)client.close();
if(coms != null)coms.close();
} catch (IOException e) {}
cancelled=true;
@@ -379,7 +364,7 @@ public class GameLogicThread extends Thread{
if(isYourTurn)
{
try {
clientOut.writeObject(Command.PASS_TURN);
coms.send(Command.PASS_TURN);
} catch (IOException e) {
e.printStackTrace();
}
@@ -390,12 +375,4 @@ public class GameLogicThread extends Thread{
t.show();
}
}
public ObjectOutputStream getClientOut() {
return clientOut;
}
public ObjectInputStream getClientIn() {
return clientIn;
}
}
app/src/main/java/com/iutlaval/myapplication/exception/NotAnIntegerException.java
+4
View File
@@ -0,0 +1,4 @@
package com.iutlaval.myapplication.exception;
public class NotAnIntegerException extends RuntimeException{
}