fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'story77' into story77_lobby

Browse Source
main
David Wu 9 years ago
parent 88782182d7 ca0a3f2a8b
commit d65ce1a897
16 changed files with 607 additions and 0 deletions
Show Stats Download Patch File Download Diff File

82
matchBrowser/pom.xml
Unescape View File

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>team-7</artifactId>
<groupId>seng302</groupId>
<version>2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<name>matchBrowser</name>
<artifactId>matchBrowser</artifactId>
<version>2.0</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.11</version>
<scope>test</scope>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version>
<configuration>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>app.Main</Main-Class>
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
</manifestEntries>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

7
matchBrowser/src/main/java/app/Main.java
Unescape View File

@ -0,0 +1,7 @@
package app;
/**
* Used when starting the matchmaking browser
*/
public class Main {
}

34
matchBrowser/src/main/java/model/MatchTable.java
Unescape View File

@ -0,0 +1,34 @@
package model;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
* Holds a table object that stores current games
*/
public class MatchTable {
private HashMap<TableKey, List> matchTable;
public MatchTable() {
this.matchTable = new HashMap<TableKey, List>();
}
public void addEntry(ArrayList newEntry) {
//create a key from the ip and port
TableKey entryKey = new TableKey((String) newEntry.get(0), (Integer) newEntry.get(1));
//get the rest of the entry and use it as the value
List entryItems = new ArrayList();
for(int i = 2; i<newEntry.size(); i++) {
entryItems.add(newEntry.get(i));
}
this.matchTable.put(entryKey, entryItems);
}
public HashMap<TableKey, List> getMatchTable() {
return matchTable;
}
}

30
matchBrowser/src/main/java/model/TableKey.java
Unescape View File

@ -0,0 +1,30 @@
package model;
/**
* Used to create a key made of an ip and port.
*/
public class TableKey {
private final String ip;
private final int port;
public TableKey(String ip, int port) {
this.ip = ip;
this.port = port;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof TableKey)) return false;
TableKey key = (TableKey) o;
return ip == key.ip && port == key.port;
}
@Override
public int hashCode() {
int result = port;
result = 31 * result + ip.hashCode();
return result;
}
}

46
matchBrowser/src/main/java/networkInterface/InInterface.java
Unescape View File

@ -0,0 +1,46 @@
package networkInterface;
import java.io.*;
import java.net.*;
/**
* Holds the output for the network for
*/
public class InInterface {
private DatagramSocket serverSocket;
private byte[] receiveData = new byte[1024];
private byte[] sendData = new byte[1024];
public InInterface(){
try {
this.serverSocket = new DatagramSocket(3779);
this.run();
} catch (IOException e) {
System.err.println("Error listening on port: " + this.serverSocket.getLocalPort() + ".");
System.exit(-1);
}
}
private void run() throws IOException{
while(true) {
DatagramPacket receivePacket = new DatagramPacket(receiveData, receiveData.length);
serverSocket.receive(receivePacket);
//decode and update table
//client ip and port
InetAddress IPAddress = receivePacket.getAddress();
int port = receivePacket.getPort();
// String capitalizedSentence = sentence.toUpperCase();
// sendData = capitalizedSentence.getBytes();
// DatagramPacket sendPacket =
// new DatagramPacket(sendData, sendData.length, IPAddress, port);
// serverSocket.send(sendPacket);
}
}
}

7
matchBrowser/src/main/java/networkInterface/OutInterface.java
Unescape View File

@ -0,0 +1,7 @@
package networkInterface;
/**
* Holds the connection to the network for output
*/
public class OutInterface {
}

27
matchBrowser/src/test/java/model/MatchTableTest.java
Unescape View File

@ -0,0 +1,27 @@
package model;
import org.junit.Before;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import static org.junit.Assert.assertEquals;
public class MatchTableTest {
private MatchTable testTable;
@Before
public void setUp() {
testTable = new MatchTable();
}
@Test
public void testTable() {
ArrayList entry = new ArrayList(Arrays.asList("127.0.0.1", 4942, 1, 1, 2, 6, 1));
testTable.addEntry(entry);
assertEquals(testTable.getMatchTable().get(new TableKey("127.0.0.1", 4942)), Arrays.asList(1, 1, 2, 6, 1));
}
}

63
racevisionGame/src/main/java/network/MessageDecoders/HostGameMessageDecoder.java
Unescape View File

@ -0,0 +1,63 @@
package network.MessageDecoders;
import network.Exceptions.InvalidMessageException;
import network.Messages.AC35Data;
import network.Messages.CourseWinds;
import network.Messages.Enums.RaceStatusEnum;
import network.Messages.HostGame;
import network.Messages.RaceStatus;
import java.util.Arrays;
import static network.Utils.ByteConverter.bytesToInt;
public class HostGameMessageDecoder implements MessageDecoder {
/**
* The encoded message.
*/
private byte[] encodedMessage;
/**
* The decoded message.
*/
private HostGame message;
/**
* Constructor
*/
public HostGameMessageDecoder() {
}
@Override
public AC35Data decode(byte[] encodedMessage) throws InvalidMessageException {
this.encodedMessage = encodedMessage;
try{
byte ipPart1 = encodedMessage[0];
byte ipPart2 = encodedMessage[1];
byte ipPart3 = encodedMessage[2];
byte ipPart4 = encodedMessage[3];
String ipString = ipPart1 + "." + ipPart2 + "." + ipPart3 + "." + ipPart4;
// System.out.println(ipString);
int port = bytesToInt(Arrays.copyOfRange(encodedMessage, 4, 8));
byte map = encodedMessage[8];
byte speed = encodedMessage[9];
byte status = encodedMessage[10];
byte requiredNumPlayers = encodedMessage[11];
byte currentNumPlayers = encodedMessage[12];
message = new HostGame(ipString, port, map,
speed, RaceStatusEnum.fromByte(status),
requiredNumPlayers, currentNumPlayers);
return message;
} catch (Exception e) {
throw new InvalidMessageException("Could not decode Host game message.", e);
}
}
}

34
racevisionGame/src/main/java/network/MessageDecoders/HostedGamesRequestDecoder.java
Unescape View File

@ -0,0 +1,34 @@
package network.MessageDecoders;
import network.Exceptions.InvalidMessageException;
import network.Messages.AC35Data;
import network.Messages.HostGame;
import network.Messages.HostGamesRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static network.Utils.ByteConverter.bytesToInt;
public class HostedGamesRequestDecoder implements MessageDecoder{
@Override
public AC35Data decode(byte[] encodedMessage) throws InvalidMessageException {
try{
int numberOfGames = bytesToInt(Arrays.copyOfRange(encodedMessage, 0, 4));
HostGameMessageDecoder lineDecoder = new HostGameMessageDecoder();
List<HostGame> knownGames = new ArrayList<>();
int byteIndex = 4;
for (int i = 0; i < numberOfGames; i++){
knownGames.add((HostGame) lineDecoder.decode(Arrays.copyOfRange(encodedMessage, byteIndex, byteIndex+14)));
byteIndex += 14;
}
return new HostGamesRequest(knownGames);
} catch (Exception e) {
throw new InvalidMessageException("Could not decode Host game message.", e);
}
}
}

54
racevisionGame/src/main/java/network/MessageEncoders/HostGameMessageEncoder.java
Unescape View File

@ -0,0 +1,54 @@
package network.MessageEncoders;
import network.Exceptions.InvalidMessageException;
import network.Messages.AC35Data;
import network.Messages.HostGame;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.List;
import static network.Utils.ByteConverter.intToBytes;
public class HostGameMessageEncoder implements MessageEncoder{
/**
* Constructor
*/
public HostGameMessageEncoder() {
}
@Override
public byte[] encode(AC35Data message) throws InvalidMessageException {
try{
//Downcast
HostGame hostGame = (HostGame) message;
ByteBuffer hostGameMessage = ByteBuffer.allocate(14);
ByteBuffer ipBytes = ByteBuffer.allocate(4);
String ip = hostGame.getIp();
String[] ipValues = ip.split("\\.");
for(String value:ipValues){
ipBytes.put(intToBytes(Integer.parseInt(value), 1)[0]);
}
byte raceStatus = hostGame.getStatus().getValue();
hostGameMessage.put(ipBytes.array());
hostGameMessage.put(intToBytes(hostGame.getPort()));
hostGameMessage.put(hostGame.getMap());
hostGameMessage.put(hostGame.getSpeed());
hostGameMessage.put(raceStatus);
hostGameMessage.put(hostGame.getRequiredNumPlayers());
hostGameMessage.put(hostGame.getCurrentNumPlayers());
// System.out.println(hostGameMessage.array()[4]);
return hostGameMessage.array();
} catch (Exception e) {
throw new InvalidMessageException("Could not encode Host game message.", e);
}
}
}

44
racevisionGame/src/main/java/network/MessageEncoders/HostedGamesRequestEncoder.java
Unescape View File

@ -0,0 +1,44 @@
package network.MessageEncoders;
import network.Exceptions.InvalidMessageException;
import network.Messages.AC35Data;
import network.Messages.HostGame;
import network.Messages.HostGamesRequest;
import java.nio.ByteBuffer;
import java.util.List;
import static network.Utils.ByteConverter.intToBytes;
public class HostedGamesRequestEncoder implements MessageEncoder{
/**
* Constructor
*/
public HostedGamesRequestEncoder() {
}
@Override
public byte[] encode(AC35Data message) throws InvalidMessageException {
try{
//Downcast
HostGamesRequest hostGamesRequest = (HostGamesRequest) message;
int numGames = hostGamesRequest.getKnownGames().size();
ByteBuffer hostedGamesRequestMessage = ByteBuffer.allocate(4+14*numGames);
hostedGamesRequestMessage.put(intToBytes(numGames));
HostGameMessageEncoder lineEncoder = new HostGameMessageEncoder();
for (HostGame line: hostGamesRequest.getKnownGames()) {
hostedGamesRequestMessage.put(lineEncoder.encode(line));
}
return hostedGamesRequestMessage.array();
}catch(Exception e){
throw new InvalidMessageException("Could not encode Host game message.", e);
}
}
}

4
racevisionGame/src/main/java/network/Messages/Enums/MessageType.java
Unescape View File

@ -39,6 +39,10 @@ public enum MessageType {
*/
ASSIGN_PLAYER_BOAT(121),
HOST_GAME(108),
HOSTED_GAMES_REQUEST(109),
NOTAMESSAGE(0);

79
racevisionGame/src/main/java/network/Messages/HostGame.java
Unescape View File

@ -0,0 +1,79 @@
package network.Messages;
import network.Messages.Enums.MessageType;
import network.Messages.Enums.RaceStatusEnum;
public class HostGame extends AC35Data {
private String ip;
private int port;
private byte map;
private byte speed;
private RaceStatusEnum status;
private byte requiredNumPlayers;
private byte currentNumPlayers;
public HostGame(String ip, int port, byte map, byte speed,
RaceStatusEnum status, byte requiredNumPlayers,
byte currentNumPlayers) {
super(MessageType.HOST_GAME);
this.ip = ip;
this.port = port;
this.map = map;
this.speed = speed;
this.status = status;
this.requiredNumPlayers = requiredNumPlayers;
this.currentNumPlayers = currentNumPlayers;
}
/**
* @return the ip of host
*/
public String getIp() {
return ip;
}
/**
* @return the port of host
*/
public int getPort() {
return port;
}
/**
* @return the map index
*/
public byte getMap() {
return map;
}
/**
* @return the speed value of game
*/
public byte getSpeed() {
return speed;
}
/**
* @return the status of race
*/
public RaceStatusEnum getStatus() {
return status;
}
/**
* @return required number of players
*/
public byte getRequiredNumPlayers() {
return requiredNumPlayers;
}
/**
* @return current number of players
*/
public byte getCurrentNumPlayers() {
return currentNumPlayers;
}
}

22
racevisionGame/src/main/java/network/Messages/HostGamesRequest.java
Unescape View File

@ -0,0 +1,22 @@
package network.Messages;
import network.Messages.Enums.MessageType;
import java.util.List;
public class HostGamesRequest extends AC35Data{
private List<HostGame> knownGames;
/**
* Constructor
*/
public HostGamesRequest(List knownGames) {
super(MessageType.HOSTED_GAMES_REQUEST);
this.knownGames = knownGames;
}
public List<HostGame> getKnownGames() {
return knownGames;
}
}

36
racevisionGame/src/test/java/network/MessageDecoders/HostGameMessageDecoderTest.java
Unescape View File

@ -0,0 +1,36 @@
package network.MessageDecoders;
import network.MessageEncoders.HostGameMessageEncoder;
import network.Messages.AC35Data;
import network.Messages.Enums.RaceStatusEnum;
import network.Messages.HostGame;
import org.junit.Assert;
import org.junit.Test;
public class HostGameMessageDecoderTest {
@Test
public void hostGameMessageDecoderTest() throws Exception {
HostGame testHost = new HostGame("127.0.0.1", 3779, (byte) 1, (byte) 2, RaceStatusEnum.PRESTART, (byte) 6, (byte) 2);
HostGameMessageEncoder encoder = new HostGameMessageEncoder();
byte[] encodedMessage = encoder.encode(testHost);
HostGameMessageDecoder decoder = new HostGameMessageDecoder();
HostGame decodedTest = (HostGame) decoder.decode(encodedMessage);
compareHostGameMessage(testHost, decodedTest);
}
public static void compareHostGameMessage(HostGame original, HostGame decoded) {
Assert.assertEquals(original.getIp(), decoded.getIp());
Assert.assertEquals(original.getPort(), decoded.getPort());
Assert.assertEquals(original.getSpeed(), decoded.getSpeed());
Assert.assertEquals(original.getStatus(), decoded.getStatus());
Assert.assertEquals(original.getRequiredNumPlayers(), decoded.getRequiredNumPlayers());
Assert.assertEquals(original.getCurrentNumPlayers(), decoded.getCurrentNumPlayers());
}
}

38
racevisionGame/src/test/java/network/MessageDecoders/HostedGamesRequestDecoderTest.java
Unescape View File

@ -0,0 +1,38 @@
package network.MessageDecoders;
import network.MessageEncoders.HostGameMessageEncoder;
import network.MessageEncoders.HostedGamesRequestEncoder;
import network.Messages.Enums.RaceStatusEnum;
import network.Messages.HostGame;
import network.Messages.HostGamesRequest;
import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
import java.util.List;
public class HostedGamesRequestDecoderTest {
@Test
public void hostGamesRequestMessageDecoderTest() throws Exception {
HostGame testHostGame1 = new HostGame("127.0.0.1", 3779, (byte) 1, (byte) 2, RaceStatusEnum.PRESTART, (byte) 6, (byte) 2);
HostGame testHostGame2 = new HostGame("127.0.0.1", 3780, (byte) 1, (byte) 2, RaceStatusEnum.PRESTART, (byte) 6, (byte) 2);
List knownGames = Arrays.asList(testHostGame1, testHostGame2);
HostedGamesRequestEncoder encoder = new HostedGamesRequestEncoder();
byte[] encodedMessage = encoder.encode(new HostGamesRequest(knownGames));
HostedGamesRequestDecoder decoder = new HostedGamesRequestDecoder();
HostGamesRequest decodedTest = (HostGamesRequest) decoder.decode(encodedMessage);
compareHostGamesRequestMessage(knownGames, decodedTest.getKnownGames());
}
public static void compareHostGamesRequestMessage(List<HostGame> original, List<HostGame> decoded) {
Assert.assertEquals(original.get(0).getIp(), decoded.get(0).getIp());
Assert.assertEquals(original.get(1).getPort(), decoded.get(1).getPort());
}
}
Write Preview
Loading…
Cancel
Save