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

up

Browse source
This commit is contained in:
Lorenzo Iovino 2017-07-15 04:32:35 +02:00
parent 44a9e43cd4
commit 8eab4d97c1
23 changed files with 714 additions and 11795 deletions
Download patch file Download diff file Expand all files Collapse all files

1055
.idea/workspace.xml generated
View file

File diff suppressed because it is too large Load diff

4
Client/src/com/texttwist/client/controllers/MatchRequestController.java
View file

@ -1,6 +1,8 @@
package com.texttwist.client.controllers;
import com.texttwist.client.App;
import com.texttwist.client.tasks.JoinMatch;
import javax.swing.*;
/**
@ -14,6 +16,6 @@ public class MatchRequestController {
}
public void joinMatch(String matchName){
App.gameService.joinMatch(matchName);
new JoinMatch(matchName).execute();
}
}

5
Client/src/com/texttwist/client/controllers/MatchSetupController.java
View file

@ -1,5 +1,7 @@
package com.texttwist.client.controllers;
import com.texttwist.client.tasks.InvitePlayers;
import javax.swing.*;
import static com.texttwist.client.App.gameService;
@ -10,6 +12,7 @@ import static com.texttwist.client.App.gameService;
public class MatchSetupController {
public void play(DefaultListModel<String> userNames) {
gameService.beginMatch(userNames);
new InvitePlayers(userNames).execute();
}
}

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

@ -58,7 +58,7 @@ public class MatchSetupPage extends Page{
new Callable<Object>() {
@Override
public Void call() throws Exception {
//If notificationServer response ok, start beginMatch, else error
//If notificationServer response ok, start newMatch, else error
matchSetupController.play(searchUserBar.list);
return null;
}

58
Client/src/com/texttwist/client/services/GameService.java
View file

@ -5,6 +5,7 @@ import com.texttwist.client.pages.GamePage;
import com.texttwist.client.pages.MenuPage;
import com.texttwist.client.pages.Page;
import com.texttwist.client.tasks.InvitePlayers;
import com.texttwist.client.tasks.JoinMatch;
import com.texttwist.client.ui.TTDialog;
import javafx.util.Pair;
import models.Message;
@ -26,10 +27,10 @@ public class GameService {
public DefaultListModel<String> letters = new DefaultListModel<>();
public DefaultListModel<Pair<String,Integer>> globalRanks = new DefaultListModel<>();
public DefaultListModel<Pair<String,Integer>> ranks = new DefaultListModel<>();
private Boolean gameIsStarted = false;
public Boolean gameIsStarted = false;
public Boolean isWaiting = false;
private void addToPendingList(String username) throws IOException {
public void addToPendingList(String username) throws IOException {
pendingList.addElement(username);
}
@ -37,33 +38,6 @@ public class GameService {
App.openClientTCPSocket();
}
public void newMatch(String userName) {
//Add to pending invites list
try {
this.addToPendingList(userName);
} catch (IOException e) {
e.printStackTrace();
}
if(!App.gameService.gameIsStarted && !App.gameService.isWaiting) {
//Show invite popup
new TTDialog("success", "New invite from: " + userName + "!",
new Callable() {
@Override
public Object call() throws Exception {
App.gameService.joinMatch(userName);
return null;
}
},
new Callable() {
@Override
public Object call() throws Exception {
return new MenuPage(Page.window);
}
});
}
}
public DefaultListModel<String> getLetters(){
return App.gameService.letters;
}
@ -76,32 +50,6 @@ public class GameService {
this.letters = letters;
}
public void joinMatch(String matchName) {
//Clear pending invitation list and join selected match
if(!gameIsStarted) {
this.pendingList.clear();
try {
DefaultListModel<String> matchNames = new DefaultListModel<>();
matchNames.addElement(matchName);
Message message = new Message("JOIN_GAME", App.session.account.userName, App.session.token, matchNames);
byte[] byteMessage = message.toString().getBytes();
ByteBuffer buffer = ByteBuffer.wrap(byteMessage);
App.clientTCP.write(buffer);
new GamePage(Page.window);
} catch (IOException e) {
e.printStackTrace();
}
}
}
//Start game and wait for other players
public void beginMatch(DefaultListModel<String> userNames) {
new InvitePlayers(userNames).execute();
}
public void start(){
gameIsStarted = true;
}

3
Client/src/com/texttwist/client/services/NotificationClientService.java
View file

@ -1,6 +1,7 @@
package com.texttwist.client.services;
import com.texttwist.client.App;
import com.texttwist.client.tasks.BeginMatch;
import interfaces.INotificationClient;
import javax.swing.*;
import java.rmi.RemoteException;
@ -18,7 +19,7 @@ public class NotificationClientService implements INotificationClient {
if(App.session != null) {
if (users.contains(App.session.account.userName)) {
App.logger.write(userName + " send a invitation!");
App.gameService.newMatch(userName);
new BeginMatch(userName).execute();
} else {
App.logger.write("User " + userName + " is slogged");
}

52
Client/src/com/texttwist/client/tasks/BeginMatch.java Normal file
View file

@ -0,0 +1,52 @@
package com.texttwist.client.tasks;
import com.texttwist.client.App;
import com.texttwist.client.pages.MenuPage;
import com.texttwist.client.pages.Page;
import com.texttwist.client.ui.TTDialog;
import javax.swing.*;
import java.io.IOException;
import java.util.concurrent.Callable;
/**
* Author: Lorenzo Iovino on 15/07/2017.
* Description: Task: BeginMatch
*
*/
public class BeginMatch extends SwingWorker<Void,Void> {
private String userName;
public BeginMatch(String userName) {
this.userName = userName;
}
@Override
public Void doInBackground() {
//Add to pending invites list
try {
App.gameService.addToPendingList(userName);
} catch (IOException e) {
e.printStackTrace();
}
if(!App.gameService.gameIsStarted && !App.gameService.isWaiting) {
//Show invite popup
new TTDialog("success", "New invite from: " + userName + "!",
new Callable() {
@Override
public Object call() throws Exception {
new JoinMatch(userName).execute();
return null;
}
},
new Callable() {
@Override
public Object call() throws Exception {
return new MenuPage(Page.window);
}
});
}
return null;
}
}

47
Client/src/com/texttwist/client/tasks/JoinMatch.java Normal file
View file

@ -0,0 +1,47 @@
package com.texttwist.client.tasks;
import com.texttwist.client.App;
import com.texttwist.client.pages.GamePage;
import com.texttwist.client.pages.Page;
import models.Message;
import javax.swing.*;
import java.io.IOException;
import java.nio.ByteBuffer;
/**
* Author: Lorenzo Iovino on 25/06/2017.
* Description: Task: JoinMatch
*
*/
public class JoinMatch extends SwingWorker<Void,Void> {
private String matchName;
public JoinMatch(String matchName) {
this.matchName = matchName;
}
@Override
public Void doInBackground() {
//Clear pending invitation list and join selected match
if(!App.gameService.gameIsStarted) {
App.gameService.pendingList.clear();
try {
DefaultListModel<String> matchNames = new DefaultListModel<>();
matchNames.addElement(matchName);
Message message = new Message("JOIN_GAME", App.session.account.userName, App.session.token, matchNames);
byte[] byteMessage = message.toString().getBytes();
ByteBuffer buffer = ByteBuffer.wrap(byteMessage);
App.clientTCP.write(buffer);
new GamePage(Page.window);
} catch (IOException e) {
e.printStackTrace();
}
}
return null;
}
}

1
Client/src/com/texttwist/client/tasks/WaitForPlayers.java
View file

@ -79,6 +79,7 @@ public class WaitForPlayers extends SwingWorker<Void,Void> {
if(msg.data !=null ) {
DefaultListModel<String> data = msg.data;
App.openClientMulticastSocket(Integer.valueOf(data.remove(data.size()-2)));
App.gameService.setLetters(msg.data);
break;

2
Commons/src/interfaces/INotificationServer.java
View file

@ -1,5 +1,6 @@
package interfaces;
import javax.swing.*;
import java.rmi.Remote;
import java.rmi.RemoteException;
@ -10,4 +11,5 @@ import java.rmi.RemoteException;
public interface INotificationServer extends Remote {
void registerForCallback (INotificationClient ClientInterface) throws RemoteException;
void unregisterForCallback (INotificationClient ClientInterface) throws RemoteException;
void sendInvitations(String username, DefaultListModel<String> users) throws RemoteException;
}

15
Server/src/com/texttwist/server/services/AccountsService.java → Server/src/com/texttwist/server/managers/AccountsManager.java
View file

@ -1,5 +1,6 @@
package com.texttwist.server.services;
package com.texttwist.server.managers;
import com.texttwist.server.services.JedisService;
import models.User;
import java.io.Serializable;
import java.util.*;
@ -7,21 +8,21 @@ import java.util.*;
/**
* Author: Lorenzo Iovino on 18/06/2017.
* Description: AccountsService
* Description: AccountsManager
*/
public class AccountsService {
public class AccountsManager {
public List<User> users = Collections.synchronizedList(new ArrayList<User>());
private static class Holder {
static final AccountsService INSTANCE = new AccountsService();
static final AccountsManager INSTANCE = new AccountsManager();
}
public static AccountsService getInstance() {
return AccountsService.Holder.INSTANCE;
public static AccountsManager getInstance() {
return AccountsManager.Holder.INSTANCE;
}
private AccountsService(){
private AccountsManager(){
List<Serializable> l = JedisService.get("users");
for(int i=0; i<l.size(); i++) {
users.add((User) l.get(i));

11
Server/src/com/texttwist/server/services/SessionsService.java → Server/src/com/texttwist/server/managers/SessionsManager.java
View file

@ -1,26 +1,25 @@
package com.texttwist.server.services;
package com.texttwist.server.managers;
import models.Session;
import models.User;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
/**
* Author: Lorenzo Iovino on 17/06/2017.
* Description: SessionsService. It is a singleton that provides the model and methods for manage sessions
* Description: SessionsManager. It is a singleton that provides the model and methods for manage sessions
*/
public class SessionsService {
public class SessionsManager {
private List<Session> sessions = Collections.synchronizedList(new ArrayList<Session>());
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;
}

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

@ -1,7 +1,7 @@
package com.texttwist.server.models;
import com.texttwist.server.services.MessageService;
import com.texttwist.server.tasks.MatchTimeout;
import com.texttwist.server.tasks.TimeoutMatch;
import javafx.util.Pair;
import javax.swing.*;
@ -99,7 +99,7 @@ public class Match {
public void startGame(){
this.started = true;
matchTimeoutThread.submit(new MatchTimeout(this));
matchTimeoutThread.submit(new TimeoutMatch(this));
}
public void setScore(String player, Integer score){

6
Server/src/com/texttwist/server/proxies/MessageDispatcher.java
View file

@ -1,7 +1,7 @@
package com.texttwist.server.proxies;
import com.texttwist.server.Server;
import com.texttwist.server.services.SessionsService;
import com.texttwist.server.managers.SessionsManager;
import com.texttwist.server.models.Match;
import com.texttwist.server.tasks.*;
import models.Message;
@ -33,7 +33,7 @@ public class MessageDispatcher implements Callable<Boolean> {
public Boolean call() {
bufferMessage = ByteBuffer.allocate(1024);
byte[] byteMessage = null;
if(SessionsService.getInstance().isValidToken(request.token)){
if(SessionsManager.getInstance().isValidToken(request.token)){
switch(request.message){
case "START_GAME":
@ -68,7 +68,7 @@ public class MessageDispatcher implements Callable<Boolean> {
}
//Starts to wait until all player joins
Future<Boolean> joinTimeout = threadPool.submit(new JoinTimeout(match));
Future<Boolean> joinTimeout = threadPool.submit(new TimeoutJoin(match));
Boolean joinTimeoutRes = joinTimeout.get();
//If joinTimeoutRes==true timeout happen, need to notify to all waiting clients
if(joinTimeoutRes){

12
Server/src/com/texttwist/server/services/AuthService.java
View file

@ -1,6 +1,8 @@
package com.texttwist.server.services;
import com.texttwist.server.Server;
import com.texttwist.server.managers.AccountsManager;
import com.texttwist.server.managers.SessionsManager;
import constants.Config;
import interfaces.IAuth;
import interfaces.INotificationClient;
@ -29,7 +31,7 @@ public class AuthService extends UnicastRemoteObject implements IAuth {
public Response register(String userName, String password) throws RemoteException {
Server.logger.write("Invoked register with username=" + userName + " AND " + " password=" + password);
if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
if(AccountsService.getInstance().register(userName, password)){
if(AccountsManager.getInstance().register(userName, password)){
Server.logger.write("Registration successfull");
return new Response("Registration successfull", 200, null);
} else {
@ -44,11 +46,11 @@ public class AuthService extends UnicastRemoteObject implements IAuth {
public Response login(String userName, String password) throws RemoteException {
Server.logger.write("Invoked login with username=" + userName + " AND " + " password=" + password);
if ((userName != null && !userName.isEmpty()) && (password != null && !password.equals(""))) {
if(AccountsService.getInstance().exists(userName) && AccountsService.getInstance().checkPassword(userName, password)) {
if(AccountsManager.getInstance().exists(userName) && AccountsManager.getInstance().checkPassword(userName, password)) {
JsonObject data = new JsonObject();
String token = nextSessionId();
data.put("token", token);
SessionsService.getInstance().add(userName,token);
SessionsManager.getInstance().add(userName,token);
Server.logger.write("Login successfull");
return new Response("Login successfull", 200, data);
}
@ -63,14 +65,14 @@ public class AuthService extends UnicastRemoteObject implements IAuth {
notificationServer.unregisterForCallback(stub);
if ((userName != null && !userName.isEmpty()) && (token != null && !token.isEmpty())) {
boolean res = SessionsService.getInstance().remove(userName);
boolean res = SessionsManager.getInstance().remove(userName);
if(res) {
Server.logger.write("Logout successfull");
}
}
SessionsService.getInstance().remove(userName);
SessionsManager.getInstance().remove(userName);
Server.logger.write("Logout successfull (but something gone wrong)");
return new Response("Logout successfull (but something gone wrong)", 200, null);
}

3
Server/src/com/texttwist/server/services/ReceiveWordsService.java
View file

@ -1,6 +1,7 @@
package com.texttwist.server.services;
import com.texttwist.server.Server;
import com.texttwist.server.managers.SessionsManager;
import com.texttwist.server.models.Match;
import com.texttwist.server.tasks.ComputeScore;
import constants.Config;
@ -47,7 +48,7 @@ public class ReceiveWordsService implements Runnable {
String rcv = new String(packet.getData());
if (rcv.startsWith("MESSAGE")) {
msg = Message.toMessage(rcv);
if(SessionsService.getInstance().isValidToken(msg.token)) {
if(SessionsManager.getInstance().isValidToken(msg.token)) {
Match match = Match.findMatchByPlayerName(msg.sender);
threadPool.submit(new ComputeScore(msg.sender, msg.data, match));
}

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

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

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

@ -1,6 +1,6 @@
package com.texttwist.server.tasks;
import com.texttwist.server.services.AccountsService;
import com.texttwist.server.managers.AccountsManager;
import com.texttwist.server.services.JedisService;
import models.User;
@ -18,16 +18,16 @@ public class ComputeHighscores implements Callable<DefaultListModel<String>> {
public DefaultListModel<String> call() throws Exception {
DefaultListModel<String> l = new DefaultListModel<>();
AccountsService.getInstance().users.sort(new Comparator<User>() {
AccountsManager.getInstance().users.sort(new Comparator<User>() {
@Override
public int compare(User o1, User o2) {
return o2.score.compareTo(o1.score);
}
});
JedisService.removeAll("users");
for(int i = 0; i< AccountsService.getInstance().users.size(); i++){
l.addElement(AccountsService.getInstance().users.get(i).userName+":"+ AccountsService.getInstance().users.get(i).score);
JedisService.add("users", AccountsService.getInstance().users.get(i));
for(int i = 0; i< AccountsManager.getInstance().users.size(); i++){
l.addElement(AccountsManager.getInstance().users.get(i).userName+":"+ AccountsManager.getInstance().users.get(i).score);
JedisService.add("users", AccountsManager.getInstance().users.get(i));
}
return l;
}

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

@ -1,6 +1,6 @@
package com.texttwist.server.tasks;
import com.texttwist.server.services.AccountsService;
import com.texttwist.server.managers.AccountsManager;
import com.texttwist.server.models.Dictionary;
import com.texttwist.server.models.Match;
import models.User;
@ -35,7 +35,7 @@ public class ComputeScore implements Callable<Integer> {
}
match.setScore(sender, score);
User u = AccountsService.getInstance().findUser(sender);
User u = AccountsManager.getInstance().findUser(sender);
u.addScore(score);
if(match.allPlayersSendedHisScore()) {

4
Server/src/com/texttwist/server/tasks/JoinTimeout.java → Server/src/com/texttwist/server/tasks/TimeoutJoin.java
View file

@ -8,11 +8,11 @@ import java.util.concurrent.*;
* Author: Lorenzo Iovino on 23/06/2017.
* Description: Task: Join Timeout
*/
public class JoinTimeout implements Callable<Boolean> {
public class TimeoutJoin implements Callable<Boolean> {
public final Match match;
public JoinTimeout(Match match) {
public TimeoutJoin(Match match) {
this.match = match;
}

4
Server/src/com/texttwist/server/tasks/MatchTimeout.java → Server/src/com/texttwist/server/tasks/TimeoutMatch.java
View file

@ -8,10 +8,10 @@ import java.util.concurrent.Callable;
* Author: Lorenzo Iovino on 27/06/2017.
* Description: Task: Match Timeout
*/
public class MatchTimeout implements Callable<Boolean> {
public class TimeoutMatch implements Callable<Boolean> {
private Match match;
public MatchTimeout(Match match) {
public TimeoutMatch(Match match) {
this.match = match;
}

9134
client_1.log
View file

File diff suppressed because it is too large Load diff

2068
notificationServer.log
View file

File diff suppressed because it is too large Load diff