mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 14:28:43 +00:00
Implemented server to manage a list of available servers on the internet.
- Implemented a server manager that keeps track of servers & room codes, and removes old servers - Implemented queries to find a server with a specific room code - Implemented protocol to register servers #story[1281]
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
package seng302.gameServer;
|
||||
|
||||
import com.sun.org.apache.xpath.internal.operations.Bool;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.jmdns.JmDNS;
|
||||
import javax.jmdns.ServiceInfo;
|
||||
import java.io.IOException;
|
||||
@@ -27,7 +31,7 @@ public class ServerAdvertiser {
|
||||
*/
|
||||
private static String SERVICE = "_partyatsea";
|
||||
private static String PROTOCOL = "_tcp";
|
||||
public static String SERVICE_TYPE = SERVICE + "." + PROTOCOL + ".local.";
|
||||
public static String SERVICE_TYPE = SERVICE + "." + PROTOCOL + ".homekit.bonjour.michaelrausch.nz.";
|
||||
|
||||
private static ServerAdvertiser instance = null;
|
||||
private static JmDNS jmdnsInstance = null;
|
||||
|
||||
@@ -7,6 +7,10 @@ public class ServerDescription {
|
||||
private String serverName;
|
||||
private String mapName;
|
||||
private Integer numPlayers;
|
||||
private Long lastUpdated;
|
||||
private Long lastRefreshed;
|
||||
|
||||
private static Long EXPIRY_INTERVAL = 5000L;
|
||||
|
||||
public ServerDescription(String serverName, String mapName, Integer numPlayers, Integer capacity, String address, Integer portNum){
|
||||
this.serverName = serverName;
|
||||
@@ -15,6 +19,7 @@ public class ServerDescription {
|
||||
this.address = address;
|
||||
this.portNum = portNum;
|
||||
this.capacity = capacity;
|
||||
lastUpdated = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
|
||||
@@ -80,4 +85,20 @@ public class ServerDescription {
|
||||
return this.getName().hashCode() + this.getAddress().hashCode() +
|
||||
this.portNumber().hashCode() + this.getMapName().hashCode();
|
||||
}
|
||||
|
||||
public Boolean hasExpired(){
|
||||
return System.currentTimeMillis() - lastUpdated > EXPIRY_INTERVAL;
|
||||
}
|
||||
|
||||
public Boolean serverShouldBeRemoved() {
|
||||
if (lastRefreshed == null) return false;
|
||||
|
||||
System.out.println("SBR" + (System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL));
|
||||
return System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL;
|
||||
}
|
||||
|
||||
public void hasBeenRefreshed(){
|
||||
System.out.println("Was refreshed");
|
||||
lastRefreshed = System.currentTimeMillis();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,10 @@ public enum MessageType {
|
||||
REGISTRATION_REQUEST(101),
|
||||
REGISTRATION_RESPONSE(102),
|
||||
CUSTOMIZATION_REQUEST(103),
|
||||
CUSTOMIZATION_RESPONSE(104);
|
||||
CUSTOMIZATION_RESPONSE(104),
|
||||
REPO_REGISTRATION_REQUEST(201),
|
||||
ROOM_CODE_REQUEST(202),
|
||||
LOBBY_REQUEST(203);
|
||||
|
||||
|
||||
private int code;
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package seng302.gameServer.messages;
|
||||
|
||||
public class RoomCodeRequest extends Message{
|
||||
private int size = 0;
|
||||
|
||||
@Override
|
||||
public int getSize() {
|
||||
return size;
|
||||
}
|
||||
|
||||
public RoomCodeRequest(String roomCode){
|
||||
size = roomCode.length() + 6;
|
||||
|
||||
setHeader(new Header(MessageType.ROOM_CODE_REQUEST, 0x01, (short)getSize()));
|
||||
allocateBuffer();
|
||||
writeHeaderToBuffer();
|
||||
|
||||
putInt(roomCode.length(), 6);
|
||||
putBytes(roomCode.getBytes());
|
||||
|
||||
writeCRC();
|
||||
rewind();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package seng302.gameServer.messages;
|
||||
|
||||
public class ServerRegistrationMessage extends Message {
|
||||
private int size;
|
||||
@Override
|
||||
public int getSize() {
|
||||
return size;
|
||||
}
|
||||
|
||||
public ServerRegistrationMessage(String serverName, String mapName, String address, int port, int players, int capacity, String roomCode){
|
||||
size = serverName.getBytes().length + mapName.length() + address.length() + roomCode.length() + 36;
|
||||
|
||||
setHeader(new Header(MessageType.REPO_REGISTRATION_REQUEST, 0x01, (short) getSize()));
|
||||
allocateBuffer();
|
||||
writeHeaderToBuffer();
|
||||
|
||||
int nameLength = serverName.length();
|
||||
int mapNameLength = mapName.length();
|
||||
int addressLength = address.length();
|
||||
int roomCodeLength = roomCode.length();
|
||||
|
||||
// Put fields here
|
||||
putInt(nameLength, 6);
|
||||
putInt(mapNameLength, 6);
|
||||
putInt(addressLength, 6);
|
||||
putInt(roomCodeLength, 6);
|
||||
|
||||
putInt(port, 4);
|
||||
putInt(players, 4);
|
||||
putInt(capacity, 4);
|
||||
|
||||
putBytes(serverName.getBytes());
|
||||
putBytes(mapName.getBytes());
|
||||
putBytes(address.getBytes());
|
||||
putBytes(roomCode.getBytes());
|
||||
|
||||
writeCRC();
|
||||
rewind();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user