loke/texttwist
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ok

Browse source
This commit is contained in:
Lorenzo Iovino 2017-07-13 14:40:10 +02:00
parent 4760152e90
commit 04f900c389
22 changed files with 1278 additions and 1456 deletions
Download patch file Download diff file Expand all files Collapse all files

1182
.idea/workspace.xml generated
View file

File diff suppressed because it is too large Load diff

2
Client/src/com/texttwist/client/pages/GamePage.java
View file

@ -141,7 +141,7 @@ public class GamePage extends Page {
return null; return null;
} }
}), }),
Config.timeoutGame Config.gameTimeout
); );
} }
} }

9
Commons/src/constants/Config.java
View file

@ -18,9 +18,14 @@ public class Config {
public static String ScoreMulticastServerURI = "226.226.226.226"; public static String ScoreMulticastServerURI = "226.226.226.226";
public static Integer NotificationServerPort = 20000; public static Integer NotificationServerPort = 20000;
public static Integer NotificationServerStubPort = 5000; public static Integer NotificationServerStubPort = 30000;
public static String NotificationServerName ="notification"; public static String NotificationServerName ="notification";
public static int timeoutGame = 120;
public static String RedisServerURI = "localhost";
public static int gameTimeout = 10; //2 minuti in sec
public static int joinMatchTimeout = 5000; //7 minuti in millisec
public static int sendWordsTimeout = 3000; //5 minuti in millisec
public static String getAuthServerURI(){ public static String getAuthServerURI(){
return "rmi://".concat(AuthServerURI).concat(":").concat(AuthServerPort.toString()); return "rmi://".concat(AuthServerURI).concat(":").concat(AuthServerPort.toString());

10
Server/src/com/texttwist/server/Main.java
View file

@ -1,13 +1,13 @@
package com.texttwist.server; package com.texttwist.server;
import utilities.Logger;
import java.io.File;
import java.io.IOException; import java.io.IOException;
/**
* Author: Lorenzo Iovino on 14/06/2017.
* Description: Main
*/
public class Main { public class Main {
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
Server ttServer = new Server(); new Server();
} }
} }

81
Server/src/com/texttwist/server/Server.java
View file

@ -1,65 +1,78 @@
package com.texttwist.server; package com.texttwist.server;
import com.texttwist.server.components.Auth; import com.texttwist.server.services.AuthService;
import com.texttwist.server.components.GameServer; import com.texttwist.server.services.MessageService;
import com.texttwist.server.components.NotificationServer; import com.texttwist.server.services.NotificationService;
import constants.Config; import constants.Config;
import interfaces.INotificationServer; import interfaces.INotificationServer;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig; import redis.clients.jedis.JedisPoolConfig;
import utilities.Logger; import utilities.Logger;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.rmi.AlreadyBoundException; import java.rmi.AlreadyBoundException;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry; import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry; import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject; import java.rmi.server.UnicastRemoteObject;
/** /**
* Created by loke on 15/06/2017. * Author: Lorenzo Iovino on 15/06/2017.
* Description: Server. Initialize all services.
*/ */
public class Server { public class Server {
public static NotificationServer notificationServer; public static NotificationService notificationServer;
public static JedisPool jedisPool; public static JedisPool jedisPool;
public static Logger logger; public static Logger logger;
public static AuthService auth;
public Server() throws IOException { public Server() throws IOException {
logger = new Logger(new File("./notificationServer.log"), "Server", true); logger = new Logger(new File("./notificationServer.log"), "Server", true);
Server.logger.write("Server starting ..."); Server.logger.write("Services starting ...");
startAuthService();
//Start services startJedisService();
startMessageService();
startNotificationService();
Server.logger.write("Services started correctly ...");
}
private void startAuthService(){
//Starting AuthService service based on RMI
try { try {
//Definitions of registry for auth auth = new AuthService(Config.AuthServerPort);
Auth auth = new Auth(Config.AuthServerPort);
Registry authRegistry = LocateRegistry.createRegistry(auth.serverPort); Registry authRegistry = LocateRegistry.createRegistry(auth.serverPort);
authRegistry.bind("auth", auth); authRegistry.bind("auth", auth);
} catch (RemoteException e) {
//Connecting to Redis server on localhost Server.logger.write("SERVER: RMI authentication service error (Remote exception)");
jedisPool = new JedisPool(new JedisPoolConfig(), "localhost");
GameServer gameServer = new GameServer(Config.GameServerPort);
new Thread(gameServer).start();
try {
/*registrazione presso il registry */
notificationServer = new NotificationServer();
INotificationServer stub = (INotificationServer) UnicastRemoteObject.exportObject(notificationServer, Config.NotificationServerPort);
LocateRegistry.createRegistry(Config.NotificationServerStubPort);
Registry notificationRegistry = LocateRegistry.getRegistry(Config.NotificationServerStubPort);
notificationRegistry.bind(Config.NotificationServerName, stub);
} catch (Exception e) {
System.out.println("Eccezione" + e);
}
Server.logger.write("Server started");
} catch (AlreadyBoundException e) { } catch (AlreadyBoundException e) {
e.printStackTrace(); Server.logger.write("SERVER: RMI authentication service can't use this port because is busy ");
} }
} }
private void startJedisService(){
//Starting Jedis pool for Redis connection
jedisPool = new JedisPool(new JedisPoolConfig(), Config.RedisServerURI);
}
} private void startMessageService(){
//Starting the Message service based on TCP
new Thread(new MessageService(Config.GameServerPort)).start();
}
private void startNotificationService(){
//Starting Notification service based on RMI
try {
notificationServer = new NotificationService();
INotificationServer stub = (INotificationServer) UnicastRemoteObject.exportObject(notificationServer, Config.NotificationServerPort);
LocateRegistry.createRegistry(Config.NotificationServerStubPort);
Registry notificationRegistry = LocateRegistry.getRegistry(Config.NotificationServerStubPort);
notificationRegistry.bind(Config.NotificationServerName, stub);
} catch (RemoteException e) {
Server.logger.write("SERVER: RMI notification service error (Remote exception)");
} catch (AlreadyBoundException e) {
Server.logger.write("SERVER: RMI notification service can't use this port because is busy ");
}
}
}

7
Server/src/com/texttwist/server/models/Match.java
View file

@ -1,6 +1,6 @@
package com.texttwist.server.models; package com.texttwist.server.models;
import com.texttwist.server.components.GameServer; import com.texttwist.server.services.MessageService;
import com.texttwist.server.tasks.MatchTimeout; import com.texttwist.server.tasks.MatchTimeout;
import constants.Config; import constants.Config;
import javafx.util.Pair; import javafx.util.Pair;
@ -11,12 +11,11 @@ import java.io.IOException;
import java.net.*; import java.net.*;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.util.*; import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import static com.texttwist.server.components.GameServer.activeMatches; import static com.texttwist.server.services.MessageService.activeMatches;
/** /**
* Created by loke on 23/06/2017. * Created by loke on 23/06/2017.
@ -155,7 +154,7 @@ public class Match {
private int generateMulticastId(){ private int generateMulticastId(){
return GameServer.multicastID++; return MessageService.multicastID++;
} }
public void setLetters(DefaultListModel<String> letters){ public void setLetters(DefaultListModel<String> letters){
this.letters = letters; this.letters = letters;

434
Server/src/com/texttwist/server/components/ThreadProxy.java → Server/src/com/texttwist/server/models/servers/ThreadProxy.java
View file

@ -1,221 +1,213 @@
package com.texttwist.server.components; package com.texttwist.server.models.servers;
import com.sun.org.apache.xpath.internal.operations.Bool; import com.texttwist.server.models.Match;
import com.texttwist.client.App; import com.texttwist.server.services.SessionsService;
import com.texttwist.server.models.Match; import com.texttwist.server.tasks.*;
import com.texttwist.server.tasks.*; import models.Message;
import constants.Config;
import javafx.util.Pair; import javax.swing.*;
import models.Message; import java.io.IOException;
import java.nio.ByteBuffer;
import javax.swing.*; import java.nio.channels.SocketChannel;
import java.io.IOException; import java.util.concurrent.*;
import java.net.DatagramPacket;
import java.net.DatagramSocket; import static com.texttwist.server.services.MessageService.activeMatches;
import java.net.InetAddress;
import java.net.MulticastSocket; /**
import java.nio.ByteBuffer; * Created by loke on 18/06/2017.
import java.nio.channels.DatagramChannel; */
import java.nio.channels.SocketChannel; public class ThreadProxy implements Callable<Boolean> {
import java.util.concurrent.*; protected final ExecutorService threadPool = Executors.newCachedThreadPool();
private final Message request;
import static com.texttwist.server.components.GameServer.activeMatches; private final SocketChannel socketChannel;
private ByteBuffer bufferMessage;
/** boolean matchNotAvailable =false;
* Created by loke on 18/06/2017.
*/
public class ThreadProxy implements Callable<Boolean> { public ThreadProxy(Message request, SocketChannel socketChannel, ByteBuffer bufferMessage) {
protected final ExecutorService threadPool = Executors.newCachedThreadPool(); this.request = request;
private final Message request; this.socketChannel = socketChannel;
private final SocketChannel socketChannel; this.bufferMessage = bufferMessage;
private ByteBuffer bufferMessage;
boolean matchNotAvailable =false; }
@Override
ThreadProxy(Message request, SocketChannel socketChannel, ByteBuffer bufferMessage) { public Boolean call() {
this.request = request; bufferMessage = ByteBuffer.allocate(1024);
this.socketChannel = socketChannel; byte[] byteMessage = null;
this.bufferMessage = bufferMessage; if(SessionsService.getInstance().isValidToken(request.token)){
switch(request.message){
} case "START_GAME":
Future<Boolean> onlineUsers = threadPool.submit(new CheckOnlineUsers(request.data));
@Override try {
public Boolean call() { Boolean usersOnline = onlineUsers.get();
bufferMessage = ByteBuffer.allocate(1024); if(usersOnline){
byte[] byteMessage = null; Future<Boolean> sendInvitations = threadPool.submit(new SendInvitations(request.sender, request.data));
if(SessionsManager.getInstance().isValidToken(request.token)){ try {
switch(request.message){ Boolean invitationSended = sendInvitations.get();
case "START_GAME": if (invitationSended) {
Future<Boolean> onlineUsers = threadPool.submit(new CheckOnlineUsers(request.data));
try { //Crea nuova partita e attendi i giocatori
Boolean usersOnline = onlineUsers.get(); request.data.addElement(request.sender);
if(usersOnline){ final Match match = new Match(request.sender, request.data);
Future<Boolean> sendInvitations = threadPool.submit(new SendInvitations(request.sender, request.data)); match.printAll();
try {
Boolean invitationSended = sendInvitations.get(); activeMatches.add(match);
if (invitationSended) {
DefaultListModel<String> matchName = new DefaultListModel<>();
//Crea nuova partita e attendi i giocatori matchName.addElement(request.sender);
request.data.addElement(request.sender);
final Match match = new Match(request.sender, request.data); Future<Boolean> joinMatch = threadPool.submit(new JoinMatch(request.sender, matchName, socketChannel));
match.printAll(); Boolean joinMatchRes = joinMatch.get();
activeMatches.add(match); if(!joinMatchRes){
bufferMessage = ByteBuffer.allocate(1024);
DefaultListModel<String> matchName = new DefaultListModel<>();
matchName.addElement(request.sender); //NON FARE NULLA, ASPETTA GLI ALTRI
Message message = new Message("INVITES_ALL_SENDED", "", "", new DefaultListModel<>());
Future<Boolean> joinMatch = threadPool.submit(new JoinMatch(request.sender, matchName, socketChannel)); byteMessage = message.toString().getBytes();
Boolean joinMatchRes = joinMatch.get(); bufferMessage = ByteBuffer.wrap(byteMessage);
socketChannel.write(bufferMessage);
if(!joinMatchRes){ }
bufferMessage = ByteBuffer.allocate(1024);
Future<Boolean> joinTimeout = threadPool.submit(new JoinTimeout(match));
//NON FARE NULLA, ASPETTA GLI ALTRI joinTimeout.get();
Message message = new Message("INVITES_ALL_SENDED", "", "", new DefaultListModel<>()); if(match.joinTimeout){
byteMessage = message.toString().getBytes(); Future<Boolean> sendMessageJoinTimeout = threadPool.submit(
bufferMessage = ByteBuffer.wrap(byteMessage); new SendMessageToAllPlayers(match, new Message("JOIN_TIMEOUT", "", "", new DefaultListModel<>()), socketChannel));
socketChannel.write(bufferMessage); Boolean sendMessageJoinTimeoutRes = sendMessageJoinTimeout.get();
} if(!sendMessageJoinTimeoutRes){
activeMatches.remove(Match.findMatchIndex(activeMatches, match.matchCreator));
Future<Boolean> joinTimeout = threadPool.submit(new JoinTimeout(match)); return sendMessageJoinTimeoutRes;
joinTimeout.get(); }
if(match.joinTimeout){ } else {
Future<Boolean> sendMessageJoinTimeout = threadPool.submit( System.out.println("TIMEOUT FINITO SENZA EFFETTI");
new SendMessageToAllPlayers(match, new Message("JOIN_TIMEOUT", "", "", new DefaultListModel<>()), socketChannel)); return true;
Boolean sendMessageJoinTimeoutRes = sendMessageJoinTimeout.get(); }
if(!sendMessageJoinTimeoutRes){
activeMatches.remove(Match.findMatchIndex(activeMatches, match.matchCreator)); } else {
return sendMessageJoinTimeoutRes; return false;
} }
} else { } catch (InterruptedException e) {
System.out.println("TIMEOUT FINITO SENZA EFFETTI"); e.printStackTrace();
return true; } catch (ExecutionException e) {
} e.printStackTrace();
}
} else { } else {
return false;
} Message message = new Message("USER_NOT_ONLINE", "", "", new DefaultListModel<>());
} catch (InterruptedException e) { byteMessage = new String(message.toString()).getBytes();
e.printStackTrace(); bufferMessage.clear();
} catch (ExecutionException e) { bufferMessage = ByteBuffer.wrap(byteMessage);
e.printStackTrace(); this.socketChannel.write(bufferMessage);
} return false;
} else { }
} catch (InterruptedException e) {
Message message = new Message("USER_NOT_ONLINE", "", "", new DefaultListModel<>()); e.printStackTrace();
byteMessage = new String(message.toString()).getBytes(); } catch (ExecutionException e) {
bufferMessage.clear(); e.printStackTrace();
bufferMessage = ByteBuffer.wrap(byteMessage); } catch (IOException e) {
this.socketChannel.write(bufferMessage); e.printStackTrace();
return false; }
}
} catch (InterruptedException e) { case "FETCH_HIGHSCORES":
e.printStackTrace(); Future<DefaultListModel<String>> computeHighscores = threadPool.submit(new ComputeHighscores());
} catch (ExecutionException e) { try {
e.printStackTrace(); DefaultListModel<String> computeHighscoresRes = computeHighscores.get();
} catch (IOException e) { bufferMessage.clear();
e.printStackTrace(); bufferMessage = ByteBuffer.allocate(1024);
}
Message message = new Message("HIGHSCORES", "", "", computeHighscoresRes);
case "FETCH_HIGHSCORES": byteMessage = message.toString().getBytes();
Future<DefaultListModel<String>> computeHighscores = threadPool.submit(new ComputeHighscores());
try { bufferMessage = ByteBuffer.wrap(byteMessage);
DefaultListModel<String> computeHighscoresRes = computeHighscores.get(); try {
bufferMessage.clear(); String s = new String(bufferMessage.array(), bufferMessage.position(), bufferMessage.remaining());
bufferMessage = ByteBuffer.allocate(1024); System.out.println("INVIO HIGHSCORES "+ s);
socketChannel.write(bufferMessage);
Message message = new Message("HIGHSCORES", "", "", computeHighscoresRes); } catch (IOException e) {
byteMessage = message.toString().getBytes(); e.printStackTrace();
}
bufferMessage = ByteBuffer.wrap(byteMessage); return false;
try { } catch (InterruptedException e) {
String s = new String(bufferMessage.array(), bufferMessage.position(), bufferMessage.remaining()); e.printStackTrace();
System.out.println("INVIO HIGHSCORES "+ s); } catch (ExecutionException e) {
socketChannel.write(bufferMessage); e.printStackTrace();
} catch (IOException e) { }
e.printStackTrace();
} case "JOIN_GAME":
return false; Future<Boolean> joinMatch = threadPool.submit(new JoinMatch(request.sender, request.data, socketChannel));
} catch (InterruptedException e) { try {
e.printStackTrace(); Match match = Match.findMatch(activeMatches, request.data.get(0));;
} catch (ExecutionException e) { Boolean joinMatchRes = joinMatch.get();
e.printStackTrace(); if(joinMatchRes){
}
if(!match.joinTimeout) {
case "JOIN_GAME": Future<DefaultListModel<String>> generateLetters = threadPool.submit(new GenerateLetters());
Future<Boolean> joinMatch = threadPool.submit(new JoinMatch(request.sender, request.data, socketChannel)); match.setLetters(generateLetters.get());
try { match.letters.addElement(String.valueOf(match.multicastId));
Match match = Match.findMatch(activeMatches, request.data.get(0));;
Boolean joinMatchRes = joinMatch.get(); for (int i = 0; i < match.playersSocket.size(); i++) {
if(joinMatchRes){ SocketChannel socketClient = match.playersSocket.get(i).getValue();
if (socketClient != null) {
if(!match.joinTimeout) { bufferMessage.clear();
Future<DefaultListModel<String>> generateLetters = threadPool.submit(new GenerateLetters()); bufferMessage = ByteBuffer.allocate(1024);
match.setLetters(generateLetters.get());
match.letters.addElement(String.valueOf(match.multicastId)); Message message = new Message("GAME_STARTED", "", "", match.letters);
match.startGame();
for (int i = 0; i < match.playersSocket.size(); i++) {
SocketChannel socketClient = match.playersSocket.get(i).getValue(); System.out.println("TIMEOUT CANCELLEd");
if (socketClient != null) { byteMessage = message.toString().getBytes();
bufferMessage.clear();
bufferMessage = ByteBuffer.allocate(1024); bufferMessage = ByteBuffer.wrap(byteMessage);
try {
Message message = new Message("GAME_STARTED", "", "", match.letters); String s = new String(bufferMessage.array(), bufferMessage.position(), bufferMessage.remaining());
match.startGame(); System.out.println("INVIO GAME_STARTED "+ s);
socketClient.write(bufferMessage);
System.out.println("TIMEOUT CANCELLEd"); } catch (IOException e) {
byteMessage = message.toString().getBytes(); e.printStackTrace();
}
bufferMessage = ByteBuffer.wrap(byteMessage); }
try {
String s = new String(bufferMessage.array(), bufferMessage.position(), bufferMessage.remaining()); }
System.out.println("INVIO GAME_STARTED "+ s); if (matchNotAvailable) {
socketClient.write(bufferMessage); return false;
} catch (IOException e) { }
e.printStackTrace(); }
} } else {
} if(match == null){
bufferMessage = ByteBuffer.allocate(1024);
} if (socketChannel != null) {
if (matchNotAvailable) { bufferMessage = ByteBuffer.allocate(1024);
return false;
} Message msg = new Message("MATCH_NOT_AVAILABLE", "", null, new DefaultListModel<>());
} bufferMessage.clear();
} else { byteMessage = msg.toString().getBytes();
if(match == null){ bufferMessage = ByteBuffer.wrap(byteMessage);
bufferMessage = ByteBuffer.allocate(1024); socketChannel.write(bufferMessage);
if (socketChannel != null) { matchNotAvailable = true;
bufferMessage = ByteBuffer.allocate(1024); }
Message msg = new Message("MATCH_NOT_AVAILABLE", "", null, new DefaultListModel<>()); }
bufferMessage.clear(); }
byteMessage = msg.toString().getBytes(); } catch (InterruptedException e) {
bufferMessage = ByteBuffer.wrap(byteMessage); e.printStackTrace();
socketChannel.write(bufferMessage); } catch (ExecutionException e) {
matchNotAvailable = true; e.printStackTrace();
} } catch (IOException e) {
e.printStackTrace();
} }
}
} catch (InterruptedException e) { default:
e.printStackTrace();
} catch (ExecutionException e) { break;
e.printStackTrace(); }
} catch (IOException e) {
e.printStackTrace(); } else {
} threadPool.submit(new TokenInvalid(request.sender, socketChannel, bufferMessage));
return false;
default: }
break; return false;
} }
}
} else {
threadPool.submit(new TokenInvalid(request.sender, socketChannel, bufferMessage));
return false;
}
return false;
}
}

158
Server/src/com/texttwist/server/components/AccountsManager.java → Server/src/com/texttwist/server/services/AccountsService.java
View file

@ -1,79 +1,79 @@
package com.texttwist.server.components; package com.texttwist.server.services;
import models.User; import models.User;
import java.io.Serializable; import java.io.Serializable;
import java.util.*; import java.util.*;
/** /**
* Created by loke on 18/06/2017. * Created by loke on 18/06/2017.
*/ */
public class AccountsManager { public class AccountsService {
public List<User> users = Collections.synchronizedList(new ArrayList<User>()); public List<User> users = Collections.synchronizedList(new ArrayList<User>());
private static class Holder { private static class Holder {
static final AccountsManager INSTANCE = new AccountsManager(); static final AccountsService INSTANCE = new AccountsService();
} }
public static AccountsManager getInstance() { public static AccountsService getInstance() {
return AccountsManager.Holder.INSTANCE; return AccountsService.Holder.INSTANCE;
} }
private AccountsManager(){ private AccountsService(){
List<Serializable> l = JedisService.get("users"); List<Serializable> l = JedisService.get("users");
for(int i=0; i<l.size(); i++) { for(int i=0; i<l.size(); i++) {
users.add((User) l.get(i)); users.add((User) l.get(i));
} }
} }
public boolean register(String userName, String password) { public boolean register(String userName, String password) {
if(!exists(userName)){ if(!exists(userName)){
User newUser = new User(userName, password,0); User newUser = new User(userName, password,0);
Boolean res = users.add(newUser); Boolean res = users.add(newUser);
JedisService.add("users", newUser); JedisService.add("users", newUser);
return res; return res;
} else { } else {
return false; return false;
} }
} }
public boolean exists(String userName) { public boolean exists(String userName) {
Iterator<User> i = users.iterator(); Iterator<User> i = users.iterator();
while (i.hasNext()) { while (i.hasNext()) {
if (i.next().userName.equals(userName)) { if (i.next().userName.equals(userName)) {
return true; return true;
} }
} }
return false; return false;
} }
public boolean checkPassword(String userName, String password) { public boolean checkPassword(String userName, String password) {
Iterator<User> i = users.iterator(); Iterator<User> i = users.iterator();
while (i.hasNext()) { while (i.hasNext()) {
User account = i.next(); User account = i.next();
if (account.userName.equals(userName) && account.password.equals(password)) { if (account.userName.equals(userName) && account.password.equals(password)) {
return true; return true;
} }
} }
return false; return false;
} }
public User findUser(String userName){ public User findUser(String userName){
Iterator<User> i = users.iterator(); Iterator<User> i = users.iterator();
while (i.hasNext()) { while (i.hasNext()) {
User u = i.next(); User u = i.next();
if (u.userName.equals(userName)) { if (u.userName.equals(userName)) {
return u; return u;
} }
} }
return null; return null;
} }
public int size(){ public int size(){
return users.size(); return users.size();
} }
} }

166
Server/src/com/texttwist/server/components/Auth.java → Server/src/com/texttwist/server/services/AuthService.java
View file

@ -1,83 +1,83 @@
package com.texttwist.server.components; package com.texttwist.server.services;
import com.texttwist.server.Server; import com.texttwist.server.Server;
import interfaces.IAuth; import interfaces.IAuth;
import interfaces.INotificationClient; import interfaces.INotificationClient;
import models.Response; import models.Response;
import org.json.simple.JsonObject; import org.json.simple.JsonObject;
import java.math.BigInteger; import java.math.BigInteger;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject; import java.rmi.server.UnicastRemoteObject;
import java.security.SecureRandom; import java.security.SecureRandom;
import static com.texttwist.server.Server.notificationServer; import static com.texttwist.server.Server.notificationServer;
/** /**
* Created by loke on 15/06/2017. * Created by loke on 15/06/2017.
*/ */
public class Auth extends UnicastRemoteObject implements IAuth { public class AuthService extends UnicastRemoteObject implements IAuth {
private SecureRandom random = new SecureRandom(); private SecureRandom random = new SecureRandom();
public int serverPort = 9999; public int serverPort = 9999;
public Auth(int serverPort) throws RemoteException{ public AuthService(int serverPort) throws RemoteException{
this.serverPort=serverPort; this.serverPort=serverPort;
Server.logger.write("Auth Service running at "+serverPort+" port..."); Server.logger.write("AuthService Service running at "+serverPort+" port...");
} }
@Override @Override
public Response register(String userName, String password) throws RemoteException { public Response register(String userName, String password) throws RemoteException {
Server.logger.write("Invoked register with username=" + userName + " AND " + " password=" + password); Server.logger.write("Invoked register with username=" + userName + " AND " + " password=" + password);
if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) { if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
if(AccountsManager.getInstance().register(userName, password)){ if(AccountsService.getInstance().register(userName, password)){
Server.logger.write("Registration successfull"); Server.logger.write("Registration successfull");
return new Response("Registration successfull", 200, null); return new Response("Registration successfull", 200, null);
} else { } else {
Server.logger.write("Registration unsuccessfull"); Server.logger.write("Registration unsuccessfull");
return new Response("<html><center>Registration unsuccessfull: <br/> Username exist!</center></html>", 400, null); return new Response("<html><center>Registration unsuccessfull: <br/> Username exist!</center></html>", 400, null);
} }
} }
return new Response("<html><center>Registration unsuccessfull! <br/> All fields are mandatories</center></html>", 400, null); return new Response("<html><center>Registration unsuccessfull! <br/> All fields are mandatories</center></html>", 400, null);
} }
@Override @Override
public Response login(String userName, String password) throws RemoteException { public Response login(String userName, String password) throws RemoteException {
Server.logger.write("Invoked login with username=" + userName + " AND " + " password=" + password); Server.logger.write("Invoked login with username=" + userName + " AND " + " password=" + password);
if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) { if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
if(AccountsManager.getInstance().exists(userName) && AccountsManager.getInstance().checkPassword(userName, password)) { if(AccountsService.getInstance().exists(userName) && AccountsService.getInstance().checkPassword(userName, password)) {
JsonObject data = new JsonObject(); JsonObject data = new JsonObject();
String token = nextSessionId(); String token = nextSessionId();
data.put("token", token); data.put("token", token);
SessionsManager.getInstance().add(userName,token); SessionsService.getInstance().add(userName,token);
Server.logger.write("Login successfull"); Server.logger.write("Login successfull");
return new Response("Login successfull", 200, data); return new Response("Login successfull", 200, data);
} }
} }
Server.logger.write("Login unsuccessfull"); Server.logger.write("Login unsuccessfull");
return new Response("Login unsuccessfull", 400, null); return new Response("Login unsuccessfull", 400, null);
} }
@Override @Override
public Response logout(String userName, String token, INotificationClient stub) throws RemoteException { public Response logout(String userName, String token, INotificationClient stub) throws RemoteException {
Server.logger.write("Invoked logout with username=" + userName + " AND " + " token=" + token); Server.logger.write("Invoked logout with username=" + userName + " AND " + " token=" + token);
notificationServer.unregisterForCallback(stub); notificationServer.unregisterForCallback(stub);
if ((userName != null && !userName.isEmpty()) && (token != null && !token.isEmpty())) { if ((userName != null && !userName.isEmpty()) && (token != null && !token.isEmpty())) {
boolean res = SessionsManager.getInstance().remove(userName); boolean res = SessionsService.getInstance().remove(userName);
if(res) { if(res) {
Server.logger.write("Logout successfull"); Server.logger.write("Logout successfull");
} }
} }
SessionsManager.getInstance().remove(userName); SessionsService.getInstance().remove(userName);
Server.logger.write("Logout successfull (but something gone wrong)"); Server.logger.write("Logout successfull (but something gone wrong)");
return new Response("Logout successfull (but something gone wrong)", 200, null); return new Response("Logout successfull (but something gone wrong)", 200, null);
} }
public String nextSessionId() { public String nextSessionId() {
return new BigInteger(130, random).toString(32); return new BigInteger(130, random).toString(32);
} }
} }

3
Server/src/com/texttwist/server/components/JedisService.java → Server/src/com/texttwist/server/services/JedisService.java
View file

@ -1,10 +1,9 @@
package com.texttwist.server.components; package com.texttwist.server.services;
import models.User; import models.User;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
import java.io.*; import java.io.*;
import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Base64; import java.util.Base64;
import java.util.List; import java.util.List;

272
Server/src/com/texttwist/server/components/GameServer.java → Server/src/com/texttwist/server/services/MessageService.java
View file

@ -1,138 +1,136 @@
package com.texttwist.server.components; package com.texttwist.server.services;
import com.texttwist.client.App; import com.texttwist.server.Server;
import com.texttwist.server.Server; import com.texttwist.server.models.Dictionary;
import com.texttwist.server.models.Dictionary; import com.texttwist.server.models.Match;
import com.texttwist.server.models.Match; import com.texttwist.server.models.servers.ThreadProxy;
import com.texttwist.server.tasks.ReceiveWords; import com.texttwist.server.tasks.ReceiveWords;
import constants.Config; import constants.Config;
import models.Message; import models.Message;
import utilities.Logger;
import java.net.*;
import java.net.*; import java.io.IOException;
import java.io.IOException; import java.nio.ByteBuffer;
import java.nio.ByteBuffer; import java.nio.channels.*;
import java.nio.channels.*; import java.util.ArrayList;
import java.util.ArrayList; import java.util.Collections;
import java.util.Collections; import java.util.Iterator;
import java.util.Iterator; import java.util.List;
import java.util.List; import java.util.concurrent.ExecutorService;
import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors;
import java.util.concurrent.Executors;
import static java.nio.channels.SelectionKey.OP_ACCEPT;
import static java.nio.channels.SelectionKey.OP_ACCEPT; import static java.nio.channels.SelectionKey.OP_READ;
import static java.nio.channels.SelectionKey.OP_READ;
public class MessageService implements Runnable{
public class GameServer implements Runnable{
private int serverPort;
private int serverPort; private ThreadProxy proxy;
private ThreadProxy proxy; private ReceiveWords wordsReceiver;
private ReceiveWords wordsReceiver;
private DatagramChannel datagramChannel;
private DatagramChannel datagramChannel; private Selector selector = null;
private Selector selector = null; private ExecutorService threadPool = Executors.newCachedThreadPool();
private ExecutorService threadPool = Executors.newCachedThreadPool(); private String dictionaryPath = "./Server/resources/dictionary";
private String dictionaryPath = "./Server/resources/dictionary"; public static Dictionary dict;
public static Dictionary dict; SocketChannel client;
SocketChannel client; ByteBuffer bufferWords = ByteBuffer.allocate(1024);
ByteBuffer bufferWords = ByteBuffer.allocate(1024); ByteBuffer bufferMessages = ByteBuffer.allocate(1024);
ByteBuffer bufferMessages = ByteBuffer.allocate(1024);
public static List<Match> activeMatches = Collections.synchronizedList(new ArrayList<>());
public static Integer multicastID = 30000;
public static List<Match> activeMatches = Collections.synchronizedList(new ArrayList<>());
public static Integer multicastID = 4000; public MessageService(int port){
this.serverPort = port;
public GameServer(int port){ }
this.serverPort = port;
} public void run(){
public void run(){ dict = new Dictionary(dictionaryPath);
try {
dict = new Dictionary(dictionaryPath); selector = Selector.open();
try {
selector = Selector.open(); ServerSocketChannel serverSocketChannel = ServerSocketChannel.open();
serverSocketChannel.configureBlocking(false);
ServerSocketChannel serverSocketChannel = ServerSocketChannel.open(); serverSocketChannel.socket().bind(new InetSocketAddress(serverPort));
serverSocketChannel.configureBlocking(false); serverSocketChannel.register(selector, OP_ACCEPT);
serverSocketChannel.socket().bind(new InetSocketAddress(serverPort)); InetSocketAddress address = new InetSocketAddress(Config.WordsReceiverServerURI,Config.WordsReceiverServerPort);
serverSocketChannel.register(selector, OP_ACCEPT); datagramChannel = DatagramChannel.open();
InetSocketAddress address = new InetSocketAddress(Config.WordsReceiverServerURI,Config.WordsReceiverServerPort); datagramChannel.configureBlocking(true);
datagramChannel = DatagramChannel.open(); datagramChannel.connect(address);
datagramChannel.configureBlocking(true); Server.logger.write("MessageService Service is running at "+this.serverPort+" port...");
datagramChannel.connect(address);
Server.logger.write("GameService Service is running at "+this.serverPort+" port..."); wordsReceiver = new ReceiveWords(datagramChannel, bufferWords, bufferMessages, client);
threadPool.submit(wordsReceiver);
wordsReceiver = new ReceiveWords(datagramChannel, bufferWords, bufferMessages, client);
threadPool.submit(wordsReceiver); } catch (IOException e) {
e.printStackTrace();
} catch (IOException e) { }
e.printStackTrace();
} while (true) {
System.out.println("WAITING FOR MSG");
while (true) { try {
System.out.println("WAITING FOR MSG"); selector.select();
try { } catch (IOException e) {
selector.select(); e.printStackTrace();
} catch (IOException e) { }
e.printStackTrace();
} Iterator<SelectionKey> iter = selector.selectedKeys().iterator();
while (iter.hasNext()) {
Iterator<SelectionKey> iter = selector.selectedKeys().iterator(); bufferMessages = ByteBuffer.allocate(1024);
while (iter.hasNext()) { bufferMessages.clear();
bufferMessages = ByteBuffer.allocate(1024); client = null;
bufferMessages.clear(); SelectionKey key = iter.next();
client = null; iter.remove();
SelectionKey key = iter.next();
iter.remove(); try {
switch (key.readyOps()) {
try { case OP_ACCEPT:
switch (key.readyOps()) { client = ((ServerSocketChannel) key.channel()).accept();
case OP_ACCEPT: client.configureBlocking(false);
client = ((ServerSocketChannel) key.channel()).accept(); client.register(selector, OP_READ);
client.configureBlocking(false); break;
client.register(selector, OP_READ);
break; case OP_READ:
client = (SocketChannel) key.channel();
case OP_READ: if (client.read(bufferMessages) != -1) {
client = (SocketChannel) key.channel(); bufferMessages.flip();
if (client.read(bufferMessages) != -1) { String line = new String(bufferMessages.array(), bufferMessages.position(), bufferMessages.remaining());
bufferMessages.flip(); System.out.println(line);
String line = new String(bufferMessages.array(), bufferMessages.position(), bufferMessages.remaining()); if (line.startsWith("MESSAGE")) {
System.out.println(line); SessionsService.getInstance().printAll();
if (line.startsWith("MESSAGE")) { Message msg = Message.toMessage(line);
SessionsManager.getInstance().printAll(); proxy = new ThreadProxy(msg, client, bufferMessages);
Message msg = Message.toMessage(line); threadPool.submit(proxy);
proxy = new ThreadProxy(msg, client, bufferMessages); }
threadPool.submit(proxy);
} if (line.startsWith("CLOSE")) {
client.close();
if (line.startsWith("CLOSE")) { } else if (line.startsWith("QUIT")) {
client.close(); for (SelectionKey k : selector.keys()) {
} else if (line.startsWith("QUIT")) { k.cancel();
for (SelectionKey k : selector.keys()) { k.channel().close();
k.cancel(); }
k.channel().close(); selector.close();
} return;
selector.close(); }
return; } else {
} key.cancel();
} else { }
key.cancel(); break;
}
break; default:
break;
default: }
break; } catch (IOException e) {
} try {
} catch (IOException e) { client.close();
try { } catch (IOException e1) {
client.close(); e1.printStackTrace();
} catch (IOException e1) { }
e1.printStackTrace(); }
} }
} }
} }
}
}
} }

124
Server/src/com/texttwist/server/components/NotificationServer.java → Server/src/com/texttwist/server/services/NotificationService.java
View file

@ -1,62 +1,62 @@
package com.texttwist.server.components; package com.texttwist.server.services;
import interfaces.INotificationClient; import interfaces.INotificationClient;
import interfaces.INotificationServer; import interfaces.INotificationServer;
import javax.swing.*; import javax.swing.*;
import java.rmi.RemoteException; import java.rmi.RemoteException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
/** /**
* Created by loke on 19/06/2017. * Created by loke on 19/06/2017.
*/ */
public class NotificationServer implements INotificationServer { public class NotificationService implements INotificationServer {
private List<INotificationClient> clients; private List<INotificationClient> clients;
public NotificationServer() throws RemoteException { public NotificationService() throws RemoteException {
super(); super();
clients = new ArrayList<>(); clients = new ArrayList<>();
} }
public synchronized void registerForCallback(INotificationClient clientInterface) throws RemoteException { public synchronized void registerForCallback(INotificationClient clientInterface) throws RemoteException {
if(!clients.contains(clientInterface)){ if(!clients.contains(clientInterface)){
clients.add(clientInterface); clients.add(clientInterface);
System.out.println(clientInterface); System.out.println(clientInterface);
System.out.println("New client registered"); System.out.println("New client registered");
} }
} }
public synchronized void unregisterForCallback(INotificationClient client) throws RemoteException { public synchronized void unregisterForCallback(INotificationClient client) throws RemoteException {
if (clients.remove(client)) { if (clients.remove(client)) {
System.out.println("Client unregistered"); System.out.println("Client unregistered");
} else { } else {
System.out.println("Unable to unregister client"); System.out.println("Unable to unregister client");
} }
} }
public synchronized void sendInvitations(String username, DefaultListModel<String> users){ public synchronized void sendInvitations(String username, DefaultListModel<String> users){
Iterator i = clients.iterator(); Iterator i = clients.iterator();
INotificationClient client = null; INotificationClient client = null;
System.out.println("Starting callbacks"); System.out.println("Starting callbacks");
while (i.hasNext()) { while (i.hasNext()) {
client = (INotificationClient) i.next(); client = (INotificationClient) i.next();
try { try {
System.out.println("SENDING INVITE TO "+users); System.out.println("SENDING INVITE TO "+users);
client.sendInvite(username, users); client.sendInvite(username, users);
} catch (RemoteException e) { } catch (RemoteException e) {
System.out.println("Sembra down"); System.out.println("Sembra down");
try { try {
unregisterForCallback(client); unregisterForCallback(client);
} catch (RemoteException e1) { } catch (RemoteException e1) {
e1.printStackTrace(); e1.printStackTrace();
} }
} }
} }
} }
} }

175
Server/src/com/texttwist/server/components/SessionsManager.java → Server/src/com/texttwist/server/services/SessionsService.java
View file

@ -1,88 +1,87 @@
package com.texttwist.server.components; package com.texttwist.server.services;
import interfaces.INotificationClient; import models.Session;
import models.Session; import models.User;
import models.User;
import java.util.ArrayList;
import java.util.ArrayList; import java.util.Collections;
import java.util.Collections; import java.util.Iterator;
import java.util.Iterator; import java.util.List;
import java.util.List;
/**
/** * Created by loke on 17/06/2017.
* Created by loke on 17/06/2017. */
*/ public class SessionsService {
public class SessionsManager {
private List<Session> sessions = Collections.synchronizedList(new ArrayList<Session>());
private List<Session> sessions = Collections.synchronizedList(new ArrayList<Session>()); private static class Holder {
private static class Holder { static final SessionsService INSTANCE = new SessionsService();
static final SessionsManager INSTANCE = new SessionsManager(); }
}
public static SessionsService getInstance() {
public static SessionsManager getInstance() { return Holder.INSTANCE;
return Holder.INSTANCE; }
}
private SessionsService(){}
private SessionsManager(){}
public boolean add(String userName, String token) {
public boolean add(String userName, String token) { remove(userName);
remove(userName); return sessions.add(new Session(new User(userName,"",0), token));
return sessions.add(new Session(new User(userName,"",0), token)); }
}
public void printAll(){
public void printAll(){ Iterator<Session> i = sessions.iterator();
Iterator<Session> i = sessions.iterator(); while (i.hasNext()) {
while (i.hasNext()) { Session elem = i.next();
Session elem = i.next(); System.out.println(elem.account.userName + " | " + elem.token);
System.out.println(elem.account.userName + " | " + elem.token); }
}
}
}
public boolean remove(String userName){
public boolean remove(String userName){ if(exists(userName)) {
if(exists(userName)) { Session s = getSession(userName);
Session s = getSession(userName); if(s != null) {
if(s != null) { sessions.remove(s);
sessions.remove(s); return true;
return true; }
} }
} return false;
return false; }
}
public Session getSession(String userName) {
public Session getSession(String userName) { Iterator<Session> i = sessions.iterator();
Iterator<Session> i = sessions.iterator(); while (i.hasNext()) {
while (i.hasNext()) { Session elem = i.next();
Session elem = i.next(); if (elem.account.userName.equals(userName)) {
if (elem.account.userName.equals(userName)) { return elem;
return elem; }
} }
} return null;
return null;
}
}
public boolean exists(String userName) {
public boolean exists(String userName) { Iterator<Session> i = sessions.iterator();
Iterator<Session> i = sessions.iterator(); while (i.hasNext()) {
while (i.hasNext()) { Session elem = i.next();
Session elem = i.next(); if (elem.account.userName.equals(userName)) {
if (elem.account.userName.equals(userName)) { return true;
return true; }
} }
} return false;
return false;
}
}
public boolean isValidToken(String token) {
public boolean isValidToken(String token) { Iterator<Session> i = sessions.iterator();
Iterator<Session> i = sessions.iterator(); while (i.hasNext()) {
while (i.hasNext()) { if (i.next().token.equals(token)) {
if (i.next().token.equals(token)) { return true;
return true; }
} }
} return false;
return false;
}
}
}
}

4
Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java
View file

@ -1,6 +1,6 @@
package com.texttwist.server.tasks; package com.texttwist.server.tasks;
import com.texttwist.server.components.SessionsManager; import com.texttwist.server.services.SessionsService;
import javax.swing.*; import javax.swing.*;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
@ -18,7 +18,7 @@ public class CheckOnlineUsers implements Callable<Boolean> {
@Override @Override
public Boolean call() throws Exception { public Boolean call() throws Exception {
for(int i = 0; i < users.size(); i++){ for(int i = 0; i < users.size(); i++){
if(!(SessionsManager.getInstance().exists(users.get(i)))){ if(!(SessionsService.getInstance().exists(users.get(i)))){
return false; return false;
} }
} }

14
Server/src/com/texttwist/server/tasks/ComputeHighscores.java
View file

@ -1,13 +1,11 @@
package com.texttwist.server.tasks; package com.texttwist.server.tasks;
import com.texttwist.server.components.AccountsManager; import com.texttwist.server.services.AccountsService;
import com.texttwist.server.components.JedisService; import com.texttwist.server.services.JedisService;
import models.User; import models.User;
import javax.swing.*; import javax.swing.*;
import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
/** /**
@ -21,16 +19,16 @@ public class ComputeHighscores implements Callable<DefaultListModel<String>> {
public DefaultListModel<String> call() throws Exception { public DefaultListModel<String> call() throws Exception {
DefaultListModel<String> l = new DefaultListModel<>(); DefaultListModel<String> l = new DefaultListModel<>();
AccountsManager.getInstance().users.sort(new Comparator<User>() { AccountsService.getInstance().users.sort(new Comparator<User>() {
@Override @Override
public int compare(User o1, User o2) { public int compare(User o1, User o2) {
return o2.score.compareTo(o1.score); return o2.score.compareTo(o1.score);
} }
}); });
JedisService.removeAll("users"); JedisService.removeAll("users");
for(int i =0; i< AccountsManager.getInstance().users.size(); i++){ for(int i = 0; i< AccountsService.getInstance().users.size(); i++){
l.addElement(AccountsManager.getInstance().users.get(i).userName+":"+AccountsManager.getInstance().users.get(i).score); l.addElement(AccountsService.getInstance().users.get(i).userName+":"+ AccountsService.getInstance().users.get(i).score);
JedisService.add("users",AccountsManager.getInstance().users.get(i)); JedisService.add("users", AccountsService.getInstance().users.get(i));
} }
return l; return l;
} }

16
Server/src/com/texttwist/server/tasks/ComputeScore.java
View file

@ -1,24 +1,12 @@
package com.texttwist.server.tasks; package com.texttwist.server.tasks;
import com.texttwist.client.App; import com.texttwist.server.services.AccountsService;
import com.texttwist.server.components.AccountsManager;
import com.texttwist.server.components.JedisService;
import com.texttwist.server.models.Dictionary; import com.texttwist.server.models.Dictionary;
import com.texttwist.server.models.Match; import com.texttwist.server.models.Match;
import constants.Config;
import models.Message;
import models.User; import models.User;
import redis.clients.jedis.Jedis;
import javax.swing.*; import javax.swing.*;
import java.io.Serializable;
import java.net.DatagramPacket;
import java.net.InetAddress;
import java.net.MulticastSocket;
import java.util.List;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import static com.texttwist.server.components.GameServer.activeMatches;
/** /**
* Created by loke on 27/06/2017. * Created by loke on 27/06/2017.
*/ */
@ -52,7 +40,7 @@ public class ComputeScore implements Callable<Integer> {
match.setScore(sender, score); match.setScore(sender, score);
System.out.println(score); System.out.println(score);
User u = AccountsManager.getInstance().findUser(sender); User u = AccountsService.getInstance().findUser(sender);
u.addScore(score); u.addScore(score);
if(match.allPlayersSendedHisScore()) { if(match.allPlayersSendedHisScore()) {

8
Server/src/com/texttwist/server/tasks/GenerateLetters.java
View file

@ -1,12 +1,8 @@
package com.texttwist.server.tasks; package com.texttwist.server.tasks;
import com.texttwist.server.components.GameServer; import com.texttwist.server.services.MessageService;
import javax.swing.*; import javax.swing.*;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.charset.Charset;
import java.nio.file.*;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
/** /**
@ -23,7 +19,7 @@ public class GenerateLetters implements Callable<DefaultListModel<String>> {
public DefaultListModel<String> call() throws Exception { public DefaultListModel<String> call() throws Exception {
DefaultListModel<String> l = new DefaultListModel<String>(); DefaultListModel<String> l = new DefaultListModel<String>();
String word = GameServer.dict.getRandomWord(6, 7); String word = MessageService.dict.getRandomWord(6, 7);
for (int i = 0;i < word.length(); i++){ for (int i = 0;i < word.length(); i++){
l.addElement(String.valueOf(word.charAt(i))); l.addElement(String.valueOf(word.charAt(i)));
} }

2
Server/src/com/texttwist/server/tasks/JoinMatch.java
View file

@ -5,7 +5,7 @@ import javafx.util.Pair;
import javax.swing.*; import javax.swing.*;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import static com.texttwist.server.components.GameServer.activeMatches; import static com.texttwist.server.services.MessageService.activeMatches;
/** /**
* Created by loke on 23/06/2017. * Created by loke on 23/06/2017.

8
Server/src/com/texttwist/server/tasks/MatchTimeout.java
View file

@ -1,17 +1,9 @@
package com.texttwist.server.tasks; package com.texttwist.server.tasks;
import com.sun.org.apache.xpath.internal.operations.Bool;
import com.texttwist.server.models.Match; import com.texttwist.server.models.Match;
import constants.Config;
import models.Message;
import java.net.DatagramPacket;
import java.net.InetAddress;
import java.net.MulticastSocket;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import static com.texttwist.server.components.GameServer.activeMatches;
/** /**
* Created by loke on 27/06/2017. * Created by loke on 27/06/2017.
*/ */

4
Server/src/com/texttwist/server/tasks/ReceiveWords.java
View file

@ -1,6 +1,6 @@
package com.texttwist.server.tasks; package com.texttwist.server.tasks;
import com.texttwist.server.components.SessionsManager; import com.texttwist.server.services.SessionsService;
import com.texttwist.server.models.Match; import com.texttwist.server.models.Match;
import constants.Config; import constants.Config;
import models.Message; import models.Message;
@ -53,7 +53,7 @@ public class ReceiveWords implements Callable<Boolean>{
System.out.println(rcv); System.out.println(rcv);
if (rcv.startsWith("MESSAGE")) { if (rcv.startsWith("MESSAGE")) {
msg = Message.toMessage(rcv); msg = Message.toMessage(rcv);
if(SessionsManager.getInstance().isValidToken(msg.token)) { if(SessionsService.getInstance().isValidToken(msg.token)) {
System.out.println(msg.sender); System.out.println(msg.sender);
Match match = Match.findMatchByPlayer(msg.sender); Match match = Match.findMatchByPlayer(msg.sender);
threadPool.submit(new ComputeScore(msg.sender, msg.data, match)); threadPool.submit(new ComputeScore(msg.sender, msg.data, match));

7
Server/src/com/texttwist/server/tasks/SendInvitations.java
View file

@ -1,15 +1,8 @@
package com.texttwist.server.tasks; package com.texttwist.server.tasks;
import com.texttwist.server.Server; import com.texttwist.server.Server;
import com.texttwist.server.components.NotificationServer;
import com.texttwist.server.components.SessionsManager;
import constants.Config;
import interfaces.INotificationServer;
import javax.swing.*; import javax.swing.*;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
/** /**

48
notificationServer.log
View file

@ -1296,3 +1296,51 @@ LOGGER (Server): Thu Jul 13 03:30:57 CEST 2017 - Invoked login with username=asd
LOGGER (Server): Thu Jul 13 03:30:57 CEST 2017 - Login successfull LOGGER (Server): Thu Jul 13 03:30:57 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 03:31:02 CEST 2017 - Invoked login with username=a AND password=a LOGGER (Server): Thu Jul 13 03:31:02 CEST 2017 - Invoked login with username=a AND password=a
LOGGER (Server): Thu Jul 13 03:31:02 CEST 2017 - Login successfull LOGGER (Server): Thu Jul 13 03:31:02 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:22:29 CEST 2017 - Server starting ...
LOGGER (Server): Thu Jul 13 14:22:30 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Thu Jul 13 14:22:30 CEST 2017 - GameService Service is running at 10000 port...
LOGGER (Server): Thu Jul 13 14:22:30 CEST 2017 - Server started
LOGGER (Server): Thu Jul 13 14:22:35 CEST 2017 - Invoked login with username=a AND password=a
LOGGER (Server): Thu Jul 13 14:22:35 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:22:39 CEST 2017 - Invoked login with username=b AND password=b
LOGGER (Server): Thu Jul 13 14:22:39 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:22:46 CEST 2017 - Invoked login with username=dd AND password=dd
LOGGER (Server): Thu Jul 13 14:22:46 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:22:50 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Thu Jul 13 14:22:50 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:23:30 CEST 2017 - Server starting ...
LOGGER (Server): Thu Jul 13 14:23:31 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Thu Jul 13 14:23:31 CEST 2017 - GameService Service is running at 10000 port...
LOGGER (Server): Thu Jul 13 14:23:31 CEST 2017 - Server started
LOGGER (Server): Thu Jul 13 14:23:40 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Thu Jul 13 14:23:40 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:23:43 CEST 2017 - Invoked login with username=a AND password=a
LOGGER (Server): Thu Jul 13 14:23:43 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:23:49 CEST 2017 - Invoked login with username=b AND password=b
LOGGER (Server): Thu Jul 13 14:23:49 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:23:55 CEST 2017 - Invoked login with username=dd AND password=dd
LOGGER (Server): Thu Jul 13 14:23:55 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:28:32 CEST 2017 - Server starting ...
LOGGER (Server): Thu Jul 13 14:28:33 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Thu Jul 13 14:28:33 CEST 2017 - GameService Service is running at 10000 port...
LOGGER (Server): Thu Jul 13 14:28:33 CEST 2017 - Server started
LOGGER (Server): Thu Jul 13 14:28:43 CEST 2017 - Invoked login with username=a AND password=a
LOGGER (Server): Thu Jul 13 14:28:43 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:28:46 CEST 2017 - Invoked login with username=b AND password=b
LOGGER (Server): Thu Jul 13 14:28:46 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:28:49 CEST 2017 - Invoked login with username=dd AND password=dd
LOGGER (Server): Thu Jul 13 14:28:49 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:28:54 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Thu Jul 13 14:28:54 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:37:57 CEST 2017 - Services starting ...
LOGGER (Server): Thu Jul 13 14:37:57 CEST 2017 - AuthService Service running at 9999 port...
LOGGER (Server): Thu Jul 13 14:37:57 CEST 2017 - Services started correctly ...
LOGGER (Server): Thu Jul 13 14:37:57 CEST 2017 - MessageService Service is running at 10000 port...
LOGGER (Server): Thu Jul 13 14:38:06 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Thu Jul 13 14:38:06 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:38:09 CEST 2017 - Invoked login with username=a AND password=a
LOGGER (Server): Thu Jul 13 14:38:09 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:38:13 CEST 2017 - Invoked login with username=b AND password=b
LOGGER (Server): Thu Jul 13 14:38:13 CEST 2017 - Login successfull
LOGGER (Server): Thu Jul 13 14:38:17 CEST 2017 - Invoked login with username=dd AND password=dd
LOGGER (Server): Thu Jul 13 14:38:17 CEST 2017 - Login successfull