vergnet/clavardator
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: vergnet:e8807f28d39d7c9fd7894d49c165003f90a9816c
Branches Tags
vergnet:master
vergnet:subprojects
..
compare: vergnet:93cf550a9b4777c9fc1fb4777f8f983b455a7b32
Branches Tags
vergnet:master
vergnet:subprojects

No commits in common. "e8807f28d39d7c9fd7894d49c165003f90a9816c" and "93cf550a9b4777c9fc1fb4777f8f983b455a7b32" have entirely different histories.
e8807f28d3 ... 93cf550a9b

104 changed files with 864 additions and 1665 deletions
Show stats Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,6 +1,6 @@
.gradle
**/build/
!client/src/**/build/
!src/**/build/
# Ignore sqlite db files
/*.db
@ -17,4 +17,3 @@ gradle-app.setting
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties
/out/
/clavardator_stored_files/

2
.idea/compiler.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
<bytecodeTargetLevel target="14" />
</component>
</project>

24
.idea/dataSources.xml
View file

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="clavardator_test" uuid="ef1353b8-2399-4195-b9fc-3ae9b9c61351">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/clavardator_test.db</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
</data-source>
<data-source source="LOCAL" name="clavardator" uuid="9e12684a-a723-44a7-82c6-f07ab8912b44">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/clavardator.db</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir>
<libraries>
<library>
<url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.31.1/sqlite-jdbc-3.31.1.jar</url>
</library>
</libraries>
</data-source>
</component>
</project>

3
.idea/gradle.xml
View file

@ -9,9 +9,6 @@
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/client" />
<option value="$PROJECT_DIR$/lib" />
<option value="$PROJECT_DIR$/server" />
</set>
</option>
</GradleProjectSettings>

29
.idea/modules/clavardator.main.iml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/../../build/classes/java/main" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../client/src/main">
<sourceFolder url="file://$MODULE_DIR$/../../client/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../client/src/main/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: com.jfoenix:jfoenix:9.0.10" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-fxml:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-controls:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-controls:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-graphics:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-graphics:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-base:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-base:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:20.1.0" level="project" />
<orderEntry type="library" name="Gradle: org.xerial:sqlite-jdbc:3.32.3" level="project" />
<orderEntry type="library" name="Gradle: org.kordamp.ikonli:ikonli-javafx:12.0.0" level="project" />
<orderEntry type="library" name="Gradle: org.kordamp.ikonli:ikonli-fontawesome5-pack:12.0.0" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
<orderEntry type="library" name="Gradle: org.kordamp.ikonli:ikonli-core:12.0.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.openjfx:javafx-graphics:mac:11.0.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.openjfx:javafx-graphics:win:11.0.2" level="project" />
</component>
</module>

36
.idea/modules/clavardator.test.iml
View file

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.system.module.type="sourceSet" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager">
<output-test url="file://$MODULE_DIR$/../../build/classes/java/test" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../client/src/test">
<sourceFolder url="file://$MODULE_DIR$/../../client/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../client/src/test/resources" type="java-test-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="clavardator.main" />
<orderEntry type="library" name="Gradle: com.jfoenix:jfoenix:9.0.10" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-fxml:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-controls:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-controls:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-graphics:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-graphics:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-base:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.openjfx:javafx-base:linux:11.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.jetbrains:annotations:20.1.0" level="project" />
<orderEntry type="library" name="Gradle: org.xerial:sqlite-jdbc:3.32.3" level="project" />
<orderEntry type="library" name="Gradle: org.kordamp.ikonli:ikonli-javafx:12.0.0" level="project" />
<orderEntry type="library" name="Gradle: org.kordamp.ikonli:ikonli-fontawesome5-pack:12.0.0" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
<orderEntry type="library" name="Gradle: org.junit.jupiter:junit-jupiter-api:5.7.0" level="project" />
<orderEntry type="library" name="Gradle: org.kordamp.ikonli:ikonli-core:12.0.0" level="project" />
<orderEntry type="library" name="Gradle: org.junit.platform:junit-platform-commons:1.7.0" level="project" />
<orderEntry type="library" name="Gradle: org.apiguardian:apiguardian-api:1.1.0" level="project" />
<orderEntry type="library" name="Gradle: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.openjfx:javafx-graphics:mac:11.0.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.openjfx:javafx-graphics:win:11.0.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.jupiter:junit-jupiter-engine:5.7.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Gradle: org.junit.platform:junit-platform-engine:1.7.0" level="project" />
</component>
</module>

2
.idea/sqldialects.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$/client/src/main/java/fr/insa/clavardator/client/db/DatabaseController.java" dialect="GenericSQL" />
<file url="file://$PROJECT_DIR$/src/main/java/fr/insa/clavardator/db/DatabaseController.java" dialect="GenericSQL" />
<file url="PROJECT" dialect="SQLite" />
</component>
</project>

12
README.md
View file

@ -2,8 +2,6 @@
This project contains the source for the 4IR Java project.
Full report available [here](report/report.pdf).
## Group
* SIMARD Yohan
@ -33,10 +31,10 @@ Follow [this link](https://gluonhq.com/products/scene-builder/) to download and
Run this command
```shell script
./gradlew runShadow
./gradlew run
```
Or in Intellij, open the gradle window and click on `clavardator -> Tasks -> application -> runShadow`.
Or in Intellij, open the gradle window and click on `clavardator -> Tasks -> application -> run`.
#### Generate cross-platform jar
@ -46,13 +44,11 @@ Run this command
./gradlew build
```
This will generate a jar file under `client/build/libs/client-{VERSION}-all.jar`.
This will generate a jar file under `build/libs`.
You can then copy this file and place it on any Linux/Windows/Mac environment with at least Java 11 installed.
#### Running a JAR file
You can run a jar file with this command:
You can then run this jar file with this command:
```shell script
java -jar <JAR-NAME>.jar

14
client/build.gradle → build.gradle
View file

@ -4,7 +4,7 @@ plugins {
id 'com.github.johnrengelman.shadow' version '6.1.0'
}
group 'fr.insa.clavardator.client'
group 'fr.insa.clavardator'
version '0.0.1'
repositories {
@ -17,7 +17,6 @@ javafx {
}
dependencies {
implementation project(':lib')
implementation 'org.jetbrains:annotations:20.1.0'
runtimeOnly "org.openjfx:javafx-graphics:$javafx.version:win"
runtimeOnly "org.openjfx:javafx-graphics:$javafx.version:linux"
@ -36,7 +35,16 @@ test {
useJUnitPlatform()
}
mainClassName = 'fr.insa.clavardator.client.Launcher'
mainClassName = 'fr.insa.clavardator.Launcher'
jar {
manifest {
attributes 'Main-Class': 'fr.insa.clavardator.Launcher'
}
from {
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
}
}
shadowJar {
mergeServiceFiles()

6
client/src/main/java/fr/insa/clavardator/client/server/ServerType.java
View file

@ -1,6 +0,0 @@
package fr.insa.clavardator.client.server;
public enum ServerType {
INSA,
TEST,
}

55
client/src/main/java/fr/insa/clavardator/client/server/presence/Presence.java
View file

@ -1,55 +0,0 @@
package fr.insa.clavardator.client.server.presence;
import fr.insa.clavardator.client.server.proxy.Proxy;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.ParametrizedCallback;
import fr.insa.clavardator.lib.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
/**
* Interface exposing public methods necessary for any presence server.
*
* @implNote Implement this interface when creating your own presence server class,
* then update the {@link PresenceFactory factory}
* to add your new implementation.
*/
public interface Presence {
/**
* Subscribes to this presence server notifications and publish current status.
* A list of Ids representing the current active users is returned.
*
* @param callback Called when subscription completes
*/
void subscribe(UserInformation userInformation, ParametrizedCallback<ArrayList<UserInformation>> callback, @Nullable ErrorCallback errorCallback);
/**
* Stops subscription to the presence server by closing TCP connections.
* This will stop notifications.
*
* @implNote Call this before exiting the app.
* If not, the presence server will wait for a tcp timeout before marking this user as disconnected.
*/
void unsubscribe(SimpleCallback callback, @Nullable ErrorCallback errorCallback);
/**
* Notifies the presence server of any changes to the current user
*
* @param newInformation The new information to send
* @param callback Called when notify completes
*/
void notify(UserInformation newInformation, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback);
/**
* Gets the proxy.
* This can be used to initialize a
* {@link fr.insa.clavardator.client.users.PeerUser Peeruser}
* and send messages like on a local network.
*
* @return The proxy
*/
Proxy getProxy();
}

86
client/src/main/java/fr/insa/clavardator/client/server/proxy/InsaProxy.java
View file

@ -1,86 +0,0 @@
package fr.insa.clavardator.client.server.proxy;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.lib.message.SenderInfo;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.lib.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
public class InsaProxy implements Proxy {
private final String path;
private final int proxyPort;
TcpConnection proxyConnection;
Map<String, TcpConnection.MessageReceivedCallback> callbackMap = new HashMap<>();
private boolean receiving = false;
public InsaProxy(String path, int proxyPort) {
this.path = path;
this.proxyPort = proxyPort;
}
public void connect(SimpleCallback callback, ErrorCallback errorCallback) {
try {
proxyConnection = new TcpConnection(InetAddress.getByName(path), proxyPort,
(newConnection) -> newConnection.send(new UserInformation(CurrentUser.getInstance()), () -> {
if (callback != null) {
callback.call();
}
}, errorCallback),
errorCallback);
} catch (UnknownHostException e) {
Log.e(getClass().getSimpleName(), "Could not connect to the proxy", e);
}
}
public void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
proxyConnection.send(message, callback, errorCallback);
}
public void receive(String userId, TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
Log.v(getClass().getSimpleName(), "Registering a new receive request from " + userId);
callbackMap.put(userId, callback);
if (!receiving) {
proxyConnection.receive(this::onMessageReceived, errorCallback);
receiving = true;
}
}
private void onMessageReceived(Object msg) throws IOException {
if (msg instanceof SenderInfo) {
TcpConnection.MessageReceivedCallback callback = callbackMap.get(((SenderInfo) msg).getSenderId());
if (callback != null) {
callback.onMessageReceived(msg);
} else {
Log.w(getClass().getSimpleName(),
"Nobody is waiting for messages from " + ((SenderInfo) msg).getSenderId());
}
} else {
Log.e(getClass().getSimpleName(),
"Proxy sent a message that does not contain sender information: " +
msg.getClass().getSimpleName());
}
}
public boolean isConnected() {
return proxyConnection != null &&
proxyConnection.isOpen();
}
public void close() {
proxyConnection.close();
}
public void disconnectUser(String id) {
callbackMap.remove(id);
}
}

22
client/src/main/java/fr/insa/clavardator/client/server/proxy/Proxy.java
View file

@ -1,22 +0,0 @@
package fr.insa.clavardator.client.server.proxy;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.io.Serializable;
public interface Proxy {
void connect(SimpleCallback callback, ErrorCallback errorCallback);
void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback);
void receive(String userId, TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback);
boolean isConnected();
void close();
void disconnectUser(String id);
}

7
client/src/main/java/fr/insa/clavardator/client/ui/UserSelectedEvent.java
View file

@ -1,7 +0,0 @@
package fr.insa.clavardator.client.ui;
import fr.insa.clavardator.client.users.PeerUser;
public interface UserSelectedEvent {
void onSelected(PeerUser user);
}

35
client/src/main/java/fr/insa/clavardator/client/users/DirectPeerConnection.java
View file

@ -1,35 +0,0 @@
package fr.insa.clavardator.client.users;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.io.Serializable;
public class DirectPeerConnection extends PeerConnection {
private final TcpConnection connection;
public DirectPeerConnection(TcpConnection connection) {
this.connection = connection;
}
@Override
protected void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
connection.send(message, callback, errorCallback);
}
@Override
protected void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
connection.receive(callback, errorCallback);
}
@Override
public void disconnect() {
if (connection != null && connection.isOpen()) {
connection.close();
}
}
}

28
client/src/main/java/fr/insa/clavardator/client/users/PeerConnection.java
View file

@ -1,28 +0,0 @@
package fr.insa.clavardator.client.users;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.io.Serializable;
public abstract class PeerConnection {
protected abstract void send(Serializable message, @Nullable SimpleCallback calback, @Nullable ErrorCallback errorCallback);
/**
* Subscribe to this user messages.
* If receiving new user info, update this user.
* If receiving text message, store it in the history.
*
* @param errorCallback Callback on error
*/
protected abstract void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback);
/**
* Close the connection and set state to disconnected
*/
public abstract void disconnect();
}

218
client/src/main/java/fr/insa/clavardator/client/users/PeerUser.java
View file

@ -1,218 +0,0 @@
package fr.insa.clavardator.client.users;
import fr.insa.clavardator.client.chat.ChatHistory;
import fr.insa.clavardator.client.db.DatabaseController;
import fr.insa.clavardator.client.server.proxy.Proxy;
import fr.insa.clavardator.lib.errors.UsernameTakenException;
import fr.insa.clavardator.lib.message.FileMessage;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.users.User;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.users.UserState;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.util.Date;
public class PeerUser extends User implements Comparable<PeerUser> {
private final transient ChatHistory history;
private UserState state = UserState.DISCONNECTED;
private PeerConnection connection;
public PeerUser(String id, String username) {
super(id, username);
history = new ChatHistory(this);
}
public PeerUser() {
super();
history = new ChatHistory(this);
}
private void init(String id, String username, ErrorCallback errorCallback) {
setId(id);
setUsername(username);
setState(UserState.CONNECTED);
connection.receive(msg -> onMessageReceived(msg, errorCallback), e -> {
disconnect();
if (!(e instanceof EOFException)) {
Log.e(this.getClass().getSimpleName(), "Error receiving message from " + getId(), e);
errorCallback.onError(e);
}
});
}
public void init(TcpConnection tcpConnection, String id, String username, ErrorCallback errorCallback) {
connection = new DirectPeerConnection(tcpConnection);
init(id, username, errorCallback);
}
public void init(Proxy proxy, String id, String username, ErrorCallback errorCallback) {
connection = new ProxyPeerConnection(proxy, getId());
init(id, username, errorCallback);
}
/**
* Sends a basic text message to this user
*
* @param msg The text message to send
* @param errorCallback Callback on error
*/
public void sendTextMessage(String msg, @Nullable ErrorCallback errorCallback) {
if (connection != null) {
Log.v(this.getClass().getSimpleName(),
"Sending message to " + getUsername() + " / " + getId() + ": " + msg);
final Message message = new Message(CurrentUser.getInstance(), this, new Date(), msg);
connection.send(message, () -> addMessageToHistory(message, errorCallback), errorCallback);
} else {
Log.e(this.getClass().getSimpleName(), "Could not send message: connection is not initialized");
}
}
/**
* Sends a message containing a file to this user
*
* @param msg The text message to send
* @param errorCallback Callback on error
*/
public void sendFileMessage(String msg, File file, @Nullable ErrorCallback errorCallback) {
if (connection != null) {
Log.v(this.getClass().getSimpleName(),
"Sending file message to " + this.getUsername() + " / " + this.getId() + ": " + msg);
try {
final FileMessage message = new FileMessage(CurrentUser.getInstance(), this, new Date(), msg, file.getPath());
message.storeFile();
connection.send(message, () -> addMessageToHistory(message, errorCallback), errorCallback);
} catch (IOException e) {
Log.e(this.getClass().getSimpleName(), "Could not send message: error while opening file", e);
if (errorCallback != null) {
errorCallback.onError(e);
}
}
} else {
Log.e(this.getClass().getSimpleName(), "Could not send message: connection is not initialized");
}
}
/**
* Sends current user information to this user
*
* @param errorCallback Callback on error
*/
public void sendCurrentUser(@Nullable ErrorCallback errorCallback) {
if (connection != null) {
final String username = CurrentUser.getInstance().getUsername();
Log.v(this.getClass().getSimpleName(),
"Sending current user information to " + this.getUsername() + " / " + this.getId() + ": " + username);
connection.send(new UserInformation(CurrentUser.getInstance()), null, errorCallback);
} else {
Log.e(this.getClass().getSimpleName(), "Could not send new username: connection is not initialized");
}
}
protected void sendUsernameTaken() {
if (connection != null) {
Log.v(this.getClass().getSimpleName(), "Received username request using current username");
UsernameTakenException exception = new UsernameTakenException("Username taken",
CurrentUser.getInstance().getId(), getId());
connection.send(exception, null, null);
} else {
Log.e(this.getClass().getSimpleName(), "Could not send UsernameTaken: connection is not initialized");
}
}
protected void addMessageToHistory(Message message, @Nullable ErrorCallback errorCallback) {
history.addMessage(message, errorCallback);
}
protected void onMessageReceived(Object msg, ErrorCallback errorCallback) throws IOException {
Log.v(this.getClass().getSimpleName(), "Received message from " + getId());
if (msg instanceof UserInformation) {
assert ((UserInformation) msg).id.equals(getId());
final String receivedUsername = ((UserInformation) msg).getUsername();
Log.v(this.getClass().getSimpleName(), "Message username: " + receivedUsername);
if (CurrentUser.getInstance().getUsername().equals(receivedUsername)) {
sendUsernameTaken();
} else {
setUsername(receivedUsername);
}
} else if (msg instanceof Message) {
assert !((Message) msg).getRecipient().id.equals(getId());
Log.v(this.getClass().getSimpleName(), "Message text: " + ((Message) msg).getText());
if (msg instanceof FileMessage) {
((FileMessage) msg).storeFile();
}
history.addMessage((Message) msg, errorCallback);
} else if (msg instanceof UsernameTakenException) {
CurrentUser.getInstance().setState(CurrentUser.State.INVALID);
errorCallback.onError(new Exception("Received username already taken message"));
}
}
public void disconnect() {
if (connection != null) {
Log.v(this.getClass().getSimpleName(), "Disconnecting from user: " + getId());
connection.disconnect();
connection = null;
}
setState(UserState.DISCONNECTED);
}
/**
* Gets the value of history
*
* @return the value of history
*/
public ChatHistory getHistory() {
return history;
}
/**
* Sets this user state
*
* @param state The new state
*/
protected void setState(UserState state) {
getPcs().firePropertyChange("state", this.state, state);
this.state = state;
}
@Override
protected void setUsername(String newUsername) {
super.setUsername(newUsername);
final DatabaseController db = new DatabaseController();
db.updateUsername(new UserInformation(this),
null,
e -> Log.e(getClass().getSimpleName(), "Unable to update the username", e));
}
/**
* Check if this user is active.
*
* @return True id active, false otherwise
*/
public boolean isActive() {
return state == UserState.CONNECTED;
}
@Override
public int compareTo(@NotNull PeerUser peerUser) {
if (peerUser.isActive() && !this.isActive()) {
return 1;
} else if (!peerUser.isActive() && this.isActive()) {
return -1;
}
return getUsername().compareTo(peerUser.getUsername());
}
}

35
client/src/main/java/fr/insa/clavardator/client/users/ProxyPeerConnection.java
View file

@ -1,35 +0,0 @@
package fr.insa.clavardator.client.users;
import fr.insa.clavardator.client.server.proxy.Proxy;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.io.Serializable;
public class ProxyPeerConnection extends PeerConnection {
private final Proxy proxy;
private final String userId;
public ProxyPeerConnection(Proxy proxy, String userId) {
this.proxy = proxy;
this.userId = userId;
}
@Override
protected void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
proxy.send(message, callback, errorCallback);
}
@Override
protected void receive(TcpConnection.MessageReceivedCallback callback, ErrorCallback errorCallback) {
proxy.receive(userId, callback, errorCallback);
}
@Override
public void disconnect() {
proxy.disconnectUser(userId);
}
}

29
client/src/main/resources/fr/insa/clavardator/client/ui/chat/messageListItem.fxml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.JFXButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.VBox?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<VBox xmlns:fx="http://javafx.com/fxml/1"
xmlns="http://javafx.com/javafx/11.0.1"
fx:controller="fr.insa.clavardator.client.ui.chat.MessageListItemController"
stylesheets="@../styles.css"
styleClass="inner"
fx:id="container"
spacing="10">
<padding>
<Insets left="50" right="50" top="10" bottom="10"/>
</padding>
<JFXButton fx:id="button"
mnemonicParsing="false"
text="Message"
textAlignment="CENTER">
<graphic>
<FontIcon iconLiteral="fas-paperclip" iconSize="24" fx:id="attachmentIcon"/>
</graphic>
</JFXButton>
<Label fx:id="timestamp"
text="Timestamp"
styleClass="timestamp"/>
</VBox>

10
client/src/main/resources/fr/insa/clavardator/client/ui/users/userActiveIndicator.fxml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.shape.Circle?>
<HBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.users.UserActiveIndicatorController"
stylesheets="@../styles.css" alignment="CENTER">
<Circle fx:id="circle" radius="5.0" styleClass="active-user-dot"/>
</HBox>

0
report/conception/changeUsername.png → conception/changeUsername.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

0
report/conception/class diagram.png → conception/class diagram.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 142 KiB

After

Width:  |  Height:  |  Size: 142 KiB

0
report/conception/modelisation_projet.xmi → conception/modelisation_projet.xmi
View file

0
report/conception/sendMessage.png → conception/sendMessage.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

0
report/conception/use case.png → conception/use case.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
report/conception/viewActiveUsers.png → conception/viewActiveUsers.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

0
report/conception/viewMessageHistory.png → conception/viewMessageHistory.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

8
client/config.json → config.json
View file

@ -1,15 +1,11 @@
{
"serveur": {
"actif": 0,
"uri": "localhost",
"actif": 1,
"uri": "test",
"type": "INSA",
"ports": {
"presence": 35650,
"proxy": 35750
}
},
"local": {
"actif": 1,
"port": 31590
}
}

14
lib/build.gradle
View file

@ -1,14 +0,0 @@
plugins {
id 'java'
}
group 'fr.insa.clavardator.lib'
version '0.0.1'
repositories {
mavenCentral()
}
dependencies {
implementation 'org.jetbrains:annotations:20.1.0'
}

27
lib/src/main/java/fr/insa/clavardator/lib/errors/UsernameTakenException.java
View file

@ -1,27 +0,0 @@
package fr.insa.clavardator.lib.errors;
import fr.insa.clavardator.lib.message.RecipientInfo;
import fr.insa.clavardator.lib.message.SenderInfo;
import java.io.Serializable;
public class UsernameTakenException extends Exception implements Serializable, RecipientInfo, SenderInfo {
public final String recipient;
public final String sender;
public UsernameTakenException(String message, String sender, String recipient) {
super(message);
this.sender = sender;
this.recipient = recipient;
}
@Override
public String getRecipientId() {
return recipient;
}
@Override
public String getSenderId() {
return sender;
}
}

5
lib/src/main/java/fr/insa/clavardator/lib/message/RecipientInfo.java
View file

@ -1,5 +0,0 @@
package fr.insa.clavardator.lib.message;
public interface RecipientInfo {
String getRecipientId();
}

5
lib/src/main/java/fr/insa/clavardator/lib/message/SenderInfo.java
View file

@ -1,5 +0,0 @@
package fr.insa.clavardator.lib.message;
public interface SenderInfo {
String getSenderId();
}

56
lib/src/main/java/fr/insa/clavardator/lib/users/UserInformation.java
View file

@ -1,56 +0,0 @@
package fr.insa.clavardator.lib.users;
import fr.insa.clavardator.lib.message.SenderInfo;
import java.io.Serializable;
/**
* Class used to serialize useful user information
*/
public class UserInformation implements Serializable, SenderInfo {
public final String id;
private final String username;
private final UserState state;
public UserInformation(String id, String username) {
this.id = id;
this.username = username;
this.state = UserState.CONNECTED;
}
public UserInformation(String id, String username, UserState state) {
this.id = id;
this.username = username;
this.state = state;
}
public UserInformation(User user) {
this.id = user.getId();
this.username = user.getUsername();
this.state = UserState.CONNECTED;
}
public UserInformation(User user, UserState state) {
this.id = user.getId();
this.username = user.getUsername();
this.state = state;
}
public String getUsername() {
return username;
}
public UserState getState() {
return state;
}
@Override
public String toString() {
return "UserInfo " + id + '(' + username + ')';
}
@Override
public String getSenderId() {
return id;
}
}

6
lib/src/main/java/fr/insa/clavardator/lib/users/UserState.java
View file

@ -1,6 +0,0 @@
package fr.insa.clavardator.lib.users;
public enum UserState {
CONNECTED,
DISCONNECTED,
}

BIN
report/report.pdf
View file

Binary file not shown.

26
server/build.gradle
View file

@ -1,26 +0,0 @@
plugins {
id 'application'
id 'com.github.johnrengelman.shadow' version '6.1.0'
}
group 'fr.insa.clavardator.server'
version '0.0.1'
repositories {
mavenCentral()
}
dependencies {
implementation project(':lib')
implementation 'org.jetbrains:annotations:20.1.0'
}
mainClassName = 'fr.insa.clavardator.server.Main'
shadowJar {
mergeServiceFiles()
}
run {
standardInput = System.in
}

93
server/src/main/java/fr/insa/clavardator/server/Main.java
View file

@ -1,93 +0,0 @@
package fr.insa.clavardator.server;
import fr.insa.clavardator.lib.util.Log;
import java.util.List;
import java.util.Scanner;
public class Main {
private static final int PROXY_PORT = 35750;
private static final int PRESENCE_PORT = 35650;
private static final List<String> HELP_ARGS = List.of("-h", "--help");
private static final List<String> VERSION_ARGS = List.of("-v", "--version");
private static final List<String> PROXY_ARGS = List.of("-x", "--proxy");
private static final List<String> PRESENCE_ARGS = List.of("-p", "--presence");
private static int proxyPort = PROXY_PORT;
private static int presencePort = PRESENCE_PORT;
private static void printHelp() {
System.out.println("\nClavardator INSA presence server v1.0.0\n");
System.out.println("usage: <command> [options]\n");
System.out.println("Options:");
System.out.println(" -h, --help Display help message.");
System.out.println(" -v, --version Display version information.");
System.out.println(" -X <port>, --proxy <port> Set the proxy port.");
System.out.println(" -p <port>, --presence <port> Set the presence server port.");
}
private static void printVersion() {
System.out.println("\nClavardator INSA presence server v1.0.0\n");
}
private static int getPort(String value, int defaultValue) {
int port;
try {
port = Integer.parseInt(value.trim());
if (port <= 1024 || port >= 64000) {
System.out.println("Port should be between 1024 and 64000. Falling back to default.");
port = defaultValue;
}
} catch (NumberFormatException e) {
System.out.println("Could not read port " + value + ". Falling back to default.");
port = defaultValue;
}
return port;
}
private static void readArgs(String[] args) {
if (args.length > 0) {
if (HELP_ARGS.contains(args[0])) {
printHelp();
System.exit(0);
}
if (VERSION_ARGS.contains(args[0])) {
printVersion();
System.exit(0);
}
for (int i = 0; i < args.length - 1; i++) {
if (PROXY_ARGS.contains(args[i])) {
proxyPort = getPort(args[i + 1], PROXY_PORT);
}
if (PRESENCE_ARGS.contains(args[i])) {
presencePort = getPort(args[i + 1], PRESENCE_PORT);
}
}
if (presencePort == proxyPort) {
System.out.println("Proxy and presence ports must be different");
System.exit(1);
}
}
}
public static void main(String[] args) {
readArgs(args);
System.out.println("\nType q then press enter to exit\n");
Log.v(Main.class.getSimpleName(), "Starting proxy on port " + proxyPort);
Proxy proxy = new Proxy(proxyPort);
Log.v(Main.class.getSimpleName(), "Starting presence server on port " + presencePort);
Presence presence = new Presence(presencePort);
String line;
Scanner scanner = new Scanner(System.in);
do {
line = scanner.nextLine();
} while (!line.equals("q"));
proxy.stop();
presence.stop();
}
}

110
server/src/main/java/fr/insa/clavardator/server/Presence.java
View file

@ -1,110 +0,0 @@
package fr.insa.clavardator.server;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.network.TcpListener;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.users.UserState;
import fr.insa.clavardator.lib.util.Log;
import java.io.EOFException;
import java.io.Serializable;
import java.net.Socket;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
public class Presence {
private final Map<String, TcpConnection> subscribers = new HashMap<>();
private final ArrayList<UserInformation> connectedUsers = new ArrayList<>();
private final TcpListener presenceListener;
public Presence(int port) {
presenceListener = new TcpListener();
presenceListener.acceptConnection(
port,
this::subscribe,
e -> Log.e(getClass().getSimpleName(), "Error while registering a user", e));
}
public void publish(UserInformation info) {
ArrayList<UserInformation> msg = new ArrayList<>(1);
msg.add(info);
for (Map.Entry<String, TcpConnection> entry : subscribers.entrySet()) {
// Do not send update to self
if (!entry.getKey().equals(info.id)) {
entry.getValue().send(msg, null,
e -> Log.e(getClass().getSimpleName(), "Error while publishing user information", e));
}
}
}
private void updateUser(UserInformation userInformation) {
connectedUsers.removeIf(ui -> userInformation.id.equals(ui.id));
connectedUsers.add(userInformation);
}
private void adduser(UserInformation userInformation, TcpConnection userConnection) {
subscribers.put(userInformation.id, userConnection);
connectedUsers.add(userInformation);
}
public void subscribe(Socket socket) {
TcpConnection userConnection = new TcpConnection(socket);
// Receive user information
userConnection.receiveOne(o -> {
if (o instanceof UserInformation) {
UserInformation userInformation = ((UserInformation) o);
Log.v(getClass().getSimpleName(), "Registering user " + userInformation.id +
" (" + userInformation.getUsername() + ")");
// publish new user info to all subscribers
publish(userInformation);
// Send the list of connected users to the new subscriber. We're cloning it because we're modifying it
// just after this call, while the sender thread might not have send it yet
userConnection.send((Serializable) connectedUsers.clone(), null,
e -> Log.e(getClass().getSimpleName(), "Error while receiving user information", e));
adduser(userInformation, userConnection);
userConnection.receive(msg -> {
if (msg instanceof UserInformation) {
UserInformation newUserInformation = ((UserInformation) msg);
Log.v(getClass().getSimpleName(), "Receiving user status update " + newUserInformation.id +
" (" + newUserInformation.getUsername() + ")");
updateUser(newUserInformation);
publish(newUserInformation);
}
},
e -> {
if (e instanceof EOFException) {
unsubscribe(userInformation);
}
});
} else {
Log.e(getClass().getSimpleName(), "Received unexpected message type: " + o.getClass().getSimpleName());
}
}, e -> {
if (!(e instanceof EOFException)) {
Log.e(getClass().getSimpleName(), "Error while receiving user information", e);
}
});
}
public void unsubscribe(UserInformation userInformation) {
Log.v(getClass().getSimpleName(), "Unsubscribing user " + userInformation.id + "(" + userInformation.getUsername() + ")");
subscribers.get(userInformation.id).close();
subscribers.remove(userInformation.id);
publish(new UserInformation(userInformation.id, userInformation.getUsername(), UserState.DISCONNECTED));
connectedUsers.removeIf(ui -> userInformation.id.equals(ui.id));
}
public void stop() {
presenceListener.stopAccepting();
for (TcpConnection connection : subscribers.values()) {
connection.close();
}
}
}

78
server/src/main/java/fr/insa/clavardator/server/Proxy.java
View file

@ -1,78 +0,0 @@
package fr.insa.clavardator.server;
import fr.insa.clavardator.lib.message.RecipientInfo;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.network.TcpListener;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.Log;
import java.io.EOFException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
public class Proxy {
private final HashMap<String, TcpConnection> users = new HashMap<>();
private final TcpListener proxyListener;
public Proxy(int port) {
proxyListener = new TcpListener();
proxyListener.acceptConnection(
port,
clientSocket -> {
Log.v(getClass().getSimpleName(), "Accepting a new user");
TcpConnection connection = new TcpConnection(clientSocket);
connection.receive(msg -> {
if (msg instanceof UserInformation) {
// Send UserInformation to all other connected users
Log.v(getClass().getSimpleName(), "Received UserInformation: " + msg);
users.put(((UserInformation) msg).id, connection);
for (String userId : users.keySet()) {
UserInformation userInfo = ((UserInformation) msg);
if (!userId.equals(userInfo.id)) {
transmitMessage((Serializable) msg, userId);
}
}
} else if (msg instanceof RecipientInfo) {
// Send other messages only to the recipient
transmitMessage((Serializable) msg, ((RecipientInfo) msg).getRecipientId());
} else {
Log.e(getClass().getSimpleName(), "Unexpected message received: " + msg.toString());
}
}, e -> {
if (!(e instanceof EOFException)) {
Log.e(getClass().getSimpleName(), "Error while receiving message to transmit", e);
}
for (Map.Entry<String, TcpConnection> user : users.entrySet()) {
if (user.getValue().equals(connection)) {
Log.v(getClass().getSimpleName(), "Disconnecting user " + user.getKey());
users.remove(user.getKey());
break;
}
}
});
},
e -> Log.e(getClass().getSimpleName(), "Error while accepting a user", e));
}
void transmitMessage(Serializable msg, String recipientId) {
TcpConnection user = users.get(recipientId);
if (user == null) {
Log.e(getClass().getSimpleName(), "Cannot find the recipient in the connected users");
} else {
Log.v(getClass().getSimpleName(), "Transmitting message: " + msg);
user.send(msg, null, e -> Log.e(getClass().getSimpleName(), "Error while sending message", e));
}
}
public void stop() {
proxyListener.stopAccepting();
for (TcpConnection connection : users.values()) {
connection.close();
}
}
}

4
settings.gradle
View file

@ -1,4 +1,2 @@
rootProject.name = 'clavardator'
include 'client'
include 'lib'
include 'server'

2
client/src/main/java/fr/insa/clavardator/client/Launcher.java → src/main/java/fr/insa/clavardator/Launcher.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.client;
package fr.insa.clavardator;
public class Launcher {
public static void main(String[] args) {

7
client/src/main/java/fr/insa/clavardator/client/MainApp.java → src/main/java/fr/insa/clavardator/MainApp.java
View file

@ -1,7 +1,8 @@
package fr.insa.clavardator.client;
package fr.insa.clavardator;
import fr.insa.clavardator.client.ui.MainController;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.ui.MainController;
import fr.insa.clavardator.users.UserList;
import fr.insa.clavardator.util.Log;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;

15
client/src/main/java/fr/insa/clavardator/client/chat/ChatHistory.java → src/main/java/fr/insa/clavardator/chat/ChatHistory.java
View file

@ -1,12 +1,11 @@
package fr.insa.clavardator.client.chat;
package fr.insa.clavardator.chat;
import fr.insa.clavardator.client.db.DatabaseController;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.db.DatabaseController;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.PeerUser;
import fr.insa.clavardator.users.UserInformation;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import javafx.application.Platform;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;

35
lib/src/main/java/fr/insa/clavardator/lib/message/FileMessage.java → src/main/java/fr/insa/clavardator/chat/FileMessage.java
View file

@ -1,7 +1,7 @@
package fr.insa.clavardator.lib.message;
package fr.insa.clavardator.chat;
import fr.insa.clavardator.lib.users.User;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.users.User;
import fr.insa.clavardator.users.UserInformation;
import java.io.File;
import java.io.FileInputStream;
@ -14,8 +14,8 @@ public class FileMessage extends Message {
public static final String STORED_FILES_FOLDER = "clavardator_stored_files";
private final String fileName;
byte[] rawFile = null;
private String path;
byte[] rawFile = null;
/**
* Constructs a FileMessage
@ -32,13 +32,13 @@ public class FileMessage extends Message {
File file = new File(filePath);
if (!file.exists())
throw new IOException("The file " + file.getAbsolutePath() + " does not exist");
throw new IOException("The file " + filePath + " does not exist");
if (!file.canRead())
throw new IOException("The file " + file.getAbsolutePath() + " is not readable");
throw new IOException("The file " + filePath + " is not readable");
if (!file.isFile())
throw new IOException("The path " + file.getAbsolutePath() + " does not lead to a file");
throw new IOException("The path " + filePath + " does not lead to a file");
if (file.length() > MAX_FILE_SIZE)
throw new IOException("The file " + file.getAbsolutePath() + " is too large");
throw new IOException("The file " + filePath + " is too large");
fileName = file.getName();
path = filePath;
@ -63,20 +63,12 @@ public class FileMessage extends Message {
* @return the path to the file
*/
public String storeFile() throws IOException {
path = STORED_FILES_FOLDER + File.separatorChar + fileName;
// Create clavardator directory
// Create directory
File dir = new File(STORED_FILES_FOLDER);
dir.mkdirs();
// Copy the source file to rawFile
if (rawFile == null) {
FileInputStream istream = new FileInputStream(path);
rawFile = istream.readAllBytes();
istream.close();
}
path = STORED_FILES_FOLDER + File.separatorChar + fileName;
// Create new file
int extensionBeginning = fileName.lastIndexOf('.');
String name = fileName;
@ -92,7 +84,12 @@ public class FileMessage extends Message {
file = new File(path);
}
// Write the file in clavardator dir
// write to the file
if (rawFile == null) {
FileInputStream stream = new FileInputStream(fileName);
rawFile = stream.readAllBytes();
}
FileOutputStream ostream = new FileOutputStream(file);
ostream.write(rawFile);
ostream.close();

4
lib/src/main/java/fr/insa/clavardator/lib/message/ImageMessage.java → src/main/java/fr/insa/clavardator/chat/ImageMessage.java
View file

@ -1,6 +1,6 @@
package fr.insa.clavardator.lib.message;
package fr.insa.clavardator.chat;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.users.UserInformation;
import java.io.IOException;
import java.util.Date;

29
lib/src/main/java/fr/insa/clavardator/lib/message/Message.java → src/main/java/fr/insa/clavardator/chat/Message.java
View file

@ -1,12 +1,13 @@
package fr.insa.clavardator.lib.message;
package fr.insa.clavardator.chat;
import fr.insa.clavardator.lib.users.User;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.User;
import fr.insa.clavardator.users.UserInformation;
import java.io.Serializable;
import java.util.Date;
public class Message implements Serializable, SenderInfo, RecipientInfo {
public class Message implements Serializable {
private final String text;
private final Date date;
private final UserInformation sender;
@ -17,7 +18,7 @@ public class Message implements Serializable, SenderInfo, RecipientInfo {
}
public Message(User sender, User recipient, Date date) {
this(sender, recipient, date, "");
this(sender, recipient, date,"");
}
public Message(UserInformation sender, UserInformation recipient, Date date, String text) {
@ -46,6 +47,14 @@ public class Message implements Serializable, SenderInfo, RecipientInfo {
return recipient;
}
public UserInformation getCorrespondent() {
if (CurrentUser.getInstance().getId() != null && CurrentUser.getInstance().getId().equals(sender.id)) {
return recipient;
} else {
return sender;
}
}
public Date getDate() {
return date;
}
@ -59,14 +68,4 @@ public class Message implements Serializable, SenderInfo, RecipientInfo {
", recipient=" + recipient +
'}';
}
@Override
public String getSenderId() {
return sender.id;
}
@Override
public String getRecipientId() {
return recipient.id;
}
}

111
client/src/main/java/fr/insa/clavardator/client/config/Config.java → src/main/java/fr/insa/clavardator/config/Config.java
View file

@ -1,20 +1,17 @@
package fr.insa.clavardator.client.config;
package fr.insa.clavardator.config;
import fr.insa.clavardator.client.server.ServerType;
import fr.insa.clavardator.server.PresenceType;
import org.json.JSONException;
import org.json.JSONObject;
@SuppressWarnings("FieldCanBeLocal")
public class Config {
private final String SERVER_KEY = "serveur";
private final String LOCAL_KEY = "local";
private ServerConfig serverConfig;
private LocalConfig localConfig;
private final String SERVER_KEY = "serveur";
public Config() {
serverConfig = new ServerConfig();
localConfig = new LocalConfig();
}
public Config(JSONObject obj) {
@ -22,35 +19,29 @@ public class Config {
if (obj.has(SERVER_KEY)) {
this.serverConfig = new ServerConfig(obj.getJSONObject(SERVER_KEY));
}
if (obj.has(LOCAL_KEY)) {
this.localConfig = new LocalConfig(obj.getJSONObject(LOCAL_KEY));
}
}
public ServerConfig getServerConfig() {
return serverConfig;
}
public LocalConfig getLocalConfig() {
return localConfig;
}
@SuppressWarnings("FieldCanBeLocal")
public static class ServerConfig {
public static final int DEFAULT_PRESENCE_PORT = 35650;
public static final int DEFAULT_PROXY_PORT = 35750;
private JSONObject obj;
private boolean enabled;
private String uri;
private PresenceType type;
private int presencePort;
private int proxyPort;
private final String ENABLED_KEY = "actif";
private final String URI_KEY = "uri";
private final String TYPE_KEY = "type";
private final String PORTS_KEY = "ports";
private final String PORT_PRESENCE_KEY = "presence";
private final String PORT_PROXY_KEY = "proxy";
private JSONObject obj;
private boolean enabled;
private String uri;
private ServerType type;
private int presencePort;
private int proxyPort;
/**
* Basic constructor setting the default server configuration
@ -58,7 +49,7 @@ public class Config {
public ServerConfig() {
enabled = false;
uri = "";
type = ServerType.INSA;
type = PresenceType.INSA;
}
/**
@ -111,9 +102,9 @@ public class Config {
*/
private void readServerType() {
try {
type = obj.getEnum(ServerType.class, TYPE_KEY);
type = obj.getEnum(PresenceType.class, TYPE_KEY);
} catch (JSONException e) {
type = ServerType.INSA;
type = PresenceType.INSA;
}
}
@ -123,8 +114,8 @@ public class Config {
presencePort = portsObj.getInt(PORT_PRESENCE_KEY);
proxyPort = portsObj.getInt(PORT_PROXY_KEY);
} catch (JSONException e) {
presencePort = DEFAULT_PRESENCE_PORT;
proxyPort = DEFAULT_PROXY_PORT;
presencePort = 30000; // TODO set default ports
proxyPort = 300001;
}
}
@ -142,7 +133,7 @@ public class Config {
return uri;
}
public ServerType getType() {
public PresenceType getType() {
return type;
}
@ -154,70 +145,4 @@ public class Config {
return proxyPort;
}
}
@SuppressWarnings("FieldCanBeLocal")
public static class LocalConfig {
public static final int DEFAULT_TCP_PORT = 31598;
private final String ENABLED_KEY = "actif";
private final String PORT_KEY = "port";
private JSONObject obj;
private boolean enabled;
private int port;
/**
* Basic constructor setting the default local configuration
*/
public LocalConfig() {
enabled = true;
port = DEFAULT_TCP_PORT;
}
/**
* Tries to read the given JSON object to extract custom user configuration
*
* @param obj THe JSON object to read config from
*/
public LocalConfig(JSONObject obj) {
this();
this.obj = obj;
readEnabled();
if (enabled) {
readServerPort();
}
}
/**
* Reads if local mode is enabled.
* Uses true by default.
*/
private void readEnabled() {
try {
enabled = obj.getInt(ENABLED_KEY) == 1;
} catch (JSONException e) {
enabled = true;
}
}
private void readServerPort() {
try {
port = obj.getInt(PORT_KEY);
} catch (JSONException e) {
port = DEFAULT_TCP_PORT;
}
}
/**
* Checks if the local mode is enabled.
* If this returns false, all other data returned by this object can be ignored.
*
* @return True if enabled, false otherwise.
*/
public boolean isEnabled() {
return enabled;
}
public int getPort() {
return port;
}
}
}

4
client/src/main/java/fr/insa/clavardator/client/config/ConfigLoader.java → src/main/java/fr/insa/clavardator/config/ConfigLoader.java
View file

@ -1,6 +1,6 @@
package fr.insa.clavardator.client.config;
package fr.insa.clavardator.config;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.util.Log;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;

27
client/src/main/java/fr/insa/clavardator/client/db/DatabaseController.java → src/main/java/fr/insa/clavardator/db/DatabaseController.java
View file

@ -1,12 +1,11 @@
package fr.insa.clavardator.client.db;
package fr.insa.clavardator.db;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.lib.message.FileMessage;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.lib.users.User;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.chat.FileMessage;
import fr.insa.clavardator.chat.Message;
import fr.insa.clavardator.users.User;
import fr.insa.clavardator.users.UserInformation;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import org.intellij.lang.annotations.Language;
import org.jetbrains.annotations.Nullable;
@ -275,6 +274,8 @@ public class DatabaseController {
chatHistory.add(new FileMessage(sender, recipient, date, text, filePath));
} catch (IOException e) {
Log.e(getClass().getSimpleName(), "Error while opening the file", e);
errorCallback.onError(e);
return;
}
}
}
@ -313,17 +314,11 @@ public class DatabaseController {
public void addMessage(Message message, @Nullable DatabaseController.UpdateCallback callback, ErrorCallback errorCallback) {
// Insert the correspondent if not already in the database
Log.v(getClass().getSimpleName(), "Inserting correspondent into db... ");
UserInformation correspondent;
if (CurrentUser.getInstance().getId() != null && CurrentUser.getInstance().getId().equals(message.getSender().id)) {
correspondent = message.getRecipient();
} else {
correspondent = message.getSender();
}
addUser(correspondent, () -> {
addUser(message.getCorrespondent(), () -> {
// Handle messages containing a file
String filePath = null;
if (message instanceof FileMessage) {
filePath = ((FileMessage) message).getPath();
filePath = "'" + ((FileMessage) message).getPath() + "'";
}
@Language("SQL") String sql = "INSERT INTO message " +
"(timestamp, sender, recipient, text, file_path) VALUES (?, ?, ?, ?, ?)";

9
src/main/java/fr/insa/clavardator/errors/UsernameTakenException.java Normal file
View file

@ -0,0 +1,9 @@
package fr.insa.clavardator.errors;
import java.io.Serializable;
public class UsernameTakenException extends Exception implements Serializable {
public UsernameTakenException(String message) {
super(message);
}
}

60
client/src/main/java/fr/insa/clavardator/client/network/NetDiscoverer.java → src/main/java/fr/insa/clavardator/network/NetDiscoverer.java
View file

@ -1,16 +1,13 @@
package fr.insa.clavardator.client.network;
package fr.insa.clavardator.network;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import org.jetbrains.annotations.Nullable;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.SocketException;
import java.net.*;
import static fr.insa.clavardator.client.network.NetUtil.isLocalAddress;
import static fr.insa.clavardator.network.NetUtil.isLocalAddress;
public class NetDiscoverer {
private static final short DISCOVERY_PORT = 31593;
@ -89,14 +86,6 @@ public class NetDiscoverer {
}
private interface BroadcastReceivedCallback {
void onBroadcastReceived(InetAddress ipAddr, String data);
}
public interface ResponseReceivedCallback {
void onResponseReceived(InetAddress ipAddr, String data);
}
private static class BroadcastSender extends Thread {
private final String broadcastMessage;
private final ErrorCallback errorCallback;
@ -115,22 +104,16 @@ public class NetDiscoverer {
@Override
public void run() {
byte[] buf = broadcastMessage.getBytes();
DatagramSocket broadcastSocket = null;
try {
for (InetAddress broadcastAddr : NetUtil.listAllBroadcastAddresses()) {
broadcastSocket = new DatagramSocket();
DatagramSocket broadcastSocket = new DatagramSocket();
broadcastSocket.setBroadcast(true);
broadcastSocket.send(new DatagramPacket(buf, buf.length, broadcastAddr, DISCOVERY_PORT));
Log.v(this.getClass().getSimpleName(), "Broadcast sent on address " + broadcastAddr.toString());
broadcastSocket.close();
}
} catch (IOException e) {
Log.e(this.getClass().getSimpleName(), "Error sending broadcast", e);
errorCallback.onError(e);
} finally {
if (broadcastSocket != null) {
broadcastSocket.close();
}
}
}
}
@ -155,11 +138,15 @@ public class NetDiscoverer {
@Override
public void run() {
try {
socket = new DatagramSocket(DISCOVERY_PORT);
byte[] buffer = new byte[BROADCAST_BUFFER_SIZE];
while (!shouldStop) {
socket = new DatagramSocket(null);
socket.setOption(StandardSocketOptions.SO_REUSEPORT, true);
socket.setOption(StandardSocketOptions.SO_REUSEADDR, true);
socket.bind(new InetSocketAddress((InetAddress) null, DISCOVERY_PORT));
byte[] buffer = new byte[BROADCAST_BUFFER_SIZE];
DatagramPacket receivedPacket = new DatagramPacket(buffer, BROADCAST_BUFFER_SIZE);
socket.receive(receivedPacket);
Log.v(this.getClass().getSimpleName(), "Broadcast received from ip " + receivedPacket.getAddress().toString());
callback.onBroadcastReceived(receivedPacket.getAddress(), new String(receivedPacket.getData()));
@ -169,9 +156,6 @@ public class NetDiscoverer {
Log.e(this.getClass().getSimpleName(), "Error receiving broadcast message", e);
errorCallback.onError(e);
}
} finally {
if (socket != null)
socket.close();
}
}
@ -202,7 +186,8 @@ public class NetDiscoverer {
@Override
public void run() {
byte[] buf = message.getBytes();
try (DatagramSocket responseSocket = new DatagramSocket()) {
try {
DatagramSocket responseSocket = new DatagramSocket();
responseSocket.send(new DatagramPacket(buf, buf.length, address, RESPONSE_PORT));
Log.v(this.getClass().getSimpleName(), "Broadcast response sent to ip " + address.toString());
} catch (IOException e) {
@ -232,8 +217,12 @@ public class NetDiscoverer {
@Override
public void run() {
try {
socket = new DatagramSocket(RESPONSE_PORT);
while (!shouldStop) {
socket = new DatagramSocket(null);
socket.setOption(StandardSocketOptions.SO_REUSEPORT, true);
socket.setOption(StandardSocketOptions.SO_REUSEADDR, true);
socket.bind(new InetSocketAddress((InetAddress) null, RESPONSE_PORT));
byte[] buffer = new byte[RESPONSE_BUFFER_SIZE];
DatagramPacket receivedPacket = new DatagramPacket(buffer, RESPONSE_BUFFER_SIZE);
socket.receive(receivedPacket);
@ -254,4 +243,13 @@ public class NetDiscoverer {
}
}
private interface BroadcastReceivedCallback {
void onBroadcastReceived(InetAddress ipAddr, String data);
}
public interface ResponseReceivedCallback {
void onResponseReceived(InetAddress ipAddr, String data);
}
}

4
client/src/main/java/fr/insa/clavardator/client/network/NetUtil.java → src/main/java/fr/insa/clavardator/network/NetUtil.java
View file

@ -1,6 +1,6 @@
package fr.insa.clavardator.client.network;
package fr.insa.clavardator.network;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.util.Log;
import java.net.InetAddress;
import java.net.InterfaceAddress;

20
client/src/main/java/fr/insa/clavardator/client/network/PeerHandshake.java → src/main/java/fr/insa/clavardator/network/PeerHandshake.java
View file

@ -1,11 +1,10 @@
package fr.insa.clavardator.client.network;
package fr.insa.clavardator.network;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.lib.errors.UsernameTakenException;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.errors.UsernameTakenException;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.UserInformation;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import java.net.InetAddress;
import java.net.Socket;
@ -15,13 +14,12 @@ public class PeerHandshake {
private TcpConnection connection;
private UserInformation userInformation;
public void createConnection(InetAddress ipAddr, int port, UserConnectedCallback callback, ErrorCallback errorCallback) {
public void createConnection(InetAddress ipAddr, UserConnectedCallback callback, ErrorCallback errorCallback) {
closeConnection();
Log.v(this.getClass().getSimpleName(), "Creating new TCP connection ");
connection = new TcpConnection(
ipAddr,
port,
(thisConnection) -> init(thisConnection,
false,
callback,
@ -72,9 +70,7 @@ public class PeerHandshake {
private void sendUsernameTaken(TcpConnection thisConnection) {
Log.v(this.getClass().getSimpleName(), "Received username request using current username");
UsernameTakenException exception = new UsernameTakenException("Username taken",
CurrentUser.getInstance().getId(), userInformation.id);
thisConnection.send(exception, this::closeConnection, null);
thisConnection.send(new UsernameTakenException("Username taken"), this::closeConnection, null);
}

78
lib/src/main/java/fr/insa/clavardator/lib/network/TcpConnection.java → src/main/java/fr/insa/clavardator/network/TcpConnection.java
View file

@ -1,7 +1,6 @@
package fr.insa.clavardator.lib.network;
package fr.insa.clavardator.network;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.SimpleCallback;
import fr.insa.clavardator.util.ErrorCallback;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -13,13 +12,24 @@ import java.net.InetAddress;
import java.net.Socket;
public class TcpConnection {
public static final int TCP_PORT = 31598;
private final int port;
private final Object outputStreamGuard = new Object();
private Socket socket;
private ObjectOutputStream outputStream;
private ObjectInputStream inputStream;
private boolean shouldStop = false;
private final int port;
/**
* Creates a new connection, and connects to the peer
*
* @param ipAddr The IP address of the peer
* @param callback The function to call when connected
* @param errorCallback The function to call on error
*/
public TcpConnection(InetAddress ipAddr, SocketConnectedCallback callback, ErrorCallback errorCallback) {
this(ipAddr, TCP_PORT, callback, errorCallback);
}
/**
* Creates a new connection, and connects to the peer
@ -51,7 +61,7 @@ public class TcpConnection {
* @param callback The function to call on success
* @param errorCallback The function to call on error
*/
public void send(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
public void send(Serializable message, @Nullable MessageSentCallback callback, @Nullable ErrorCallback errorCallback) {
Sender sender = new Sender(message, callback, errorCallback);
sender.start();
}
@ -83,35 +93,22 @@ public class TcpConnection {
*/
public void close() {
shouldStop = true;
try {
if (outputStream != null)
outputStream.close();
if (inputStream != null)
inputStream.close();
if (socket != null)
if (socket != null) {
try {
socket.close();
} catch (IOException ignored) {
} catch (IOException ignored) {
}
}
}
/**
* Checks if the current connection is open
*
* @return True if the socket is still open
* @return True if the socket is still open
*/
public boolean isOpen() {
return socket != null && socket.isConnected() && !socket.isClosed();
}
public interface SocketConnectedCallback {
void onSocketConnected(TcpConnection connection);
}
public interface MessageReceivedCallback {
void onMessageReceived(Object msg) throws IOException;
}
private class Connector extends Thread {
private final InetAddress ipAddr;
private final SocketConnectedCallback callback;
@ -138,35 +135,34 @@ public class TcpConnection {
}
}
private class Sender extends Thread {
private final Serializable message;
private final SimpleCallback callback;
private final MessageSentCallback callback;
private final ErrorCallback errorCallback;
/**
* Constructs a thread that sends a message using the socket of the outer class
*
* @param message The message to send
* @param message The message to send
* @param callback The function to call on success
* @param errorCallback The function to call on error
*/
public Sender(Serializable message, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
public Sender(Serializable message, @Nullable MessageSentCallback callback, @Nullable ErrorCallback errorCallback) {
this.message = message;
this.callback = callback;
this.errorCallback = errorCallback;
}
@Override
public void run() {
synchronized public void run() {
try {
synchronized (outputStreamGuard) {
if (outputStream == null) {
outputStream = new ObjectOutputStream(socket.getOutputStream());
}
outputStream.writeObject(message);
if (outputStream == null) {
outputStream = new ObjectOutputStream(socket.getOutputStream());
}
outputStream.writeObject(message);
if (callback != null)
callback.call();
callback.onMessageSent();
} catch (IOException e) {
if (errorCallback != null && !shouldStop)
errorCallback.onError(e);
@ -206,4 +202,18 @@ public class TcpConnection {
}
}
}
public interface SocketConnectedCallback {
void onSocketConnected(TcpConnection connection);
}
public interface MessageReceivedCallback {
void onMessageReceived(Object msg) throws IOException;
}
public interface MessageSentCallback {
void onMessageSent();
}
}

35
lib/src/main/java/fr/insa/clavardator/lib/network/TcpListener.java → src/main/java/fr/insa/clavardator/network/TcpListener.java
View file

@ -1,22 +1,30 @@
package fr.insa.clavardator.lib.network;
package fr.insa.clavardator.network;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.util.ErrorCallback;
import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
import static fr.insa.clavardator.network.TcpConnection.TCP_PORT;
public class TcpListener {
Acceptor acceptor = null;
public TcpListener() {
}
public void acceptConnection(int port, NewConnectionCallback callback, ErrorCallback errorCallback) {
/**
* Start accepting incoming connections
*
* @param callback The function to call when a user connects
* @param errorCallback The function to call on error
*/
public void acceptConnection(NewConnectionCallback callback, ErrorCallback errorCallback) {
if (acceptor != null) {
acceptor.stopAccepting();
}
acceptor = new Acceptor(port, callback, errorCallback);
acceptor = new Acceptor(callback, errorCallback);
acceptor.start();
}
@ -30,19 +38,13 @@ public class TcpListener {
}
public interface NewConnectionCallback {
void onNewConnection(Socket clientSocket);
}
private static class Acceptor extends Thread {
private boolean shouldStop = false;
private final NewConnectionCallback callback;
private final ErrorCallback errorCallback;
private final int port;
private boolean shouldStop = false;
private ServerSocket server;
public Acceptor(int port, NewConnectionCallback callback, ErrorCallback errorCallback) {
this.port = port;
public Acceptor(NewConnectionCallback callback, ErrorCallback errorCallback) {
this.callback = callback;
this.errorCallback = errorCallback;
}
@ -50,7 +52,7 @@ public class TcpListener {
@Override
public void run() {
try {
server = new ServerSocket(port);
server = new ServerSocket(TCP_PORT);
while (!shouldStop) {
Socket clientSocket = server.accept();
callback.onNewConnection(clientSocket);
@ -59,15 +61,20 @@ public class TcpListener {
if (!shouldStop)
errorCallback.onError(e);
}
}
public void stopAccepting() {
shouldStop = true;
// TODO: call interrupt() with ChannelServerSocket instead of closing the socket?
try {
server.close();
} catch (IOException ignored) {
}
}
}
public interface NewConnectionCallback {
void onNewConnection(Socket clientSocket);
}
}

95
client/src/main/java/fr/insa/clavardator/client/server/presence/InsaPresence.java → src/main/java/fr/insa/clavardator/server/InsaPresence.java
View file

@ -1,14 +1,12 @@
package fr.insa.clavardator.client.server.presence;
package fr.insa.clavardator.server;
import fr.insa.clavardator.client.server.proxy.InsaProxy;
import fr.insa.clavardator.client.server.proxy.Proxy;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.lib.network.TcpConnection;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.lib.util.ParametrizedCallback;
import fr.insa.clavardator.lib.util.SimpleCallback;
import fr.insa.clavardator.network.TcpConnection;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.UserInformation;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import fr.insa.clavardator.util.ParametrizedCallback;
import fr.insa.clavardator.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.net.InetAddress;
@ -28,28 +26,31 @@ import java.util.Arrays;
* such as subscribe, unsubscribe, publish, and receive notifications.
* <br/>
* On the proxy port, the client will be able to send regular
* {@link Message messages} like on the local network.
* {@link fr.insa.clavardator.chat.Message messages} like on the local network.
* The proxy will forward the message to the appropriate recipient using the provided id.
*/
public class InsaPresence implements Presence {
private final String path;
private final int presencePort;
private final Proxy proxy;
private final int proxyPort;
private TcpConnection presenceConnection;
private TcpConnection proxyConnection;
public InsaPresence(String path, int presencePort, int proxyPort) {
this.path = path;
this.presencePort = presencePort;
this.proxy = new InsaProxy(path, proxyPort);
this.proxyPort = proxyPort;
}
@Override
public void subscribe(UserInformation userInformation, ParametrizedCallback<ArrayList<UserInformation>> callback, ErrorCallback errorCallback) {
public void subscribe(ParametrizedCallback<ArrayList<UserInformation>> callback, ErrorCallback errorCallback) {
if (!isConnected()) {
connectToPresence(
() -> proxy.connect(() -> {
notify(userInformation, null, errorCallback);
() -> connectToProxy(() -> {
sendSubscribeMessage(errorCallback);
receiveSubscribeNotifications(callback, errorCallback);
}, errorCallback),
errorCallback);
@ -58,6 +59,15 @@ public class InsaPresence implements Presence {
}
}
/**
* Send current user information to tell the server who is subscribing
*
* @param errorCallback Called on connection error
*/
private void sendSubscribeMessage(ErrorCallback errorCallback) {
presenceConnection.send(new UserInformation(CurrentUser.getInstance()), null, errorCallback);
}
/**
* Waits for presence server response to the subscribe request
*
@ -72,19 +82,14 @@ public class InsaPresence implements Presence {
final ArrayList<?> list = (ArrayList<?>) msg;
for (Object obj : list) {
if (obj instanceof UserInformation) {
userList.add((UserInformation) obj);
userList.add((UserInformation)obj);
}
}
Log.v(getClass().getSimpleName(), "Receive subscribe response: " + msg);
Log.v(getClass().getSimpleName(), "Converted list: " + Arrays.toString(userList.toArray()));
if (callback != null) {
callback.call(userList);
}
} else {
Log.e(getClass().getSimpleName(), "Unexpected object received: " + msg.getClass().getSimpleName());
if (errorCallback != null) {
errorCallback.onError(new RuntimeException("Unexpected object received"));
}
}
Log.v(getClass().getSimpleName(), "Receive subscribe response: " + msg);
Log.v(getClass().getSimpleName(), "Converted list: " + Arrays.toString(userList.toArray()));
if (callback != null) {
callback.call(userList);
}
}, errorCallback);
}
@ -98,11 +103,6 @@ public class InsaPresence implements Presence {
}
}
@Override
public void notify(UserInformation newInformation, @Nullable SimpleCallback callback, @Nullable ErrorCallback errorCallback) {
presenceConnection.send(newInformation, callback, errorCallback);
}
/**
* Connects to the presence server by TCP
*
@ -124,6 +124,27 @@ public class InsaPresence implements Presence {
}
}
/**
* Connects to the presence proxy by TCP
*
* @param callback Called when connection is successful
* @param errorCallback Called on connection error
*/
private void connectToProxy(SimpleCallback callback, ErrorCallback errorCallback) {
try {
proxyConnection = new TcpConnection(InetAddress.getByName(path),
proxyPort,
(newConnection) -> {
if (callback != null) {
callback.call();
}
},
errorCallback);
} catch (UnknownHostException e) {
Log.e(getClass().getSimpleName(), "Could not connect to presence proxy", e);
}
}
/**
* Closes the given connection
*/
@ -141,7 +162,8 @@ public class InsaPresence implements Presence {
private boolean isConnected() {
return presenceConnection != null &&
presenceConnection.isOpen() &&
proxy.isConnected();
proxyConnection != null &&
proxyConnection.isOpen();
}
/**
@ -150,12 +172,13 @@ public class InsaPresence implements Presence {
private void disconnect() {
Log.v(this.getClass().getSimpleName(), "Disconnecting presence server");
closeConnection(presenceConnection);
closeConnection(proxyConnection);
presenceConnection = null;
proxy.close();
proxyConnection = null;
}
@Override
public Proxy getProxy() {
return proxy;
public TcpConnection getProxyConnection() {
return proxyConnection;
}
}

47
src/main/java/fr/insa/clavardator/server/Presence.java Normal file
View file

@ -0,0 +1,47 @@
package fr.insa.clavardator.server;
import fr.insa.clavardator.network.TcpConnection;
import fr.insa.clavardator.users.UserInformation;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.ParametrizedCallback;
import fr.insa.clavardator.util.SimpleCallback;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
/**
* Interface exposing public methods necessary for any presence server.
*
* @implNote Implement this interface when creating your own presence server class,
* then update the {@link fr.insa.clavardator.server.PresenceFactory factory}
* to add your new implementation.
*/
public interface Presence {
/**
* Subscribes to this presence server notifications.
* A list of Ids representing the current active users is returned.
*
* @param callback Called when subscription completes
*/
void subscribe(ParametrizedCallback<ArrayList<UserInformation>> callback, @Nullable ErrorCallback errorCallback);
/**
* Stops subscription to the presence server by closing TCP connections.
* This will stop notifications.
*
* @implNote Call this before exiting the app.
* If not, the presence server will wait for a tcp timeout before marking this user as disconnected.
*/
void unsubscribe(SimpleCallback callback, @Nullable ErrorCallback errorCallback);
/**
* Gets a connection to the proxy.
* This can be used to initialize a
* {@link fr.insa.clavardator.users.PeerUser Peeruser}
* and send messages like on a local network.
*
* @return The server address
*/
TcpConnection getProxyConnection();
}

6
client/src/main/java/fr/insa/clavardator/client/server/presence/PresenceFactory.java → src/main/java/fr/insa/clavardator/server/PresenceFactory.java
View file

@ -1,12 +1,10 @@
package fr.insa.clavardator.client.server.presence;
import fr.insa.clavardator.client.server.ServerType;
package fr.insa.clavardator.server;
/**
* Static factory class used to create concrete presence server implementations.
*/
public class PresenceFactory {
public static Presence create(ServerType type, String uri, int serverPort, int proxyPort) throws UnknownPresenceException {
public static Presence create(PresenceType type, String uri, int serverPort, int proxyPort) throws UnknownPresenceException {
switch (type) {
case INSA:
return new InsaPresence(uri, serverPort, proxyPort);

6
src/main/java/fr/insa/clavardator/server/PresenceType.java Normal file
View file

@ -0,0 +1,6 @@
package fr.insa.clavardator.server;
public enum PresenceType {
INSA,
TEST,
}

2
client/src/main/java/fr/insa/clavardator/client/server/presence/UnknownPresenceException.java → src/main/java/fr/insa/clavardator/server/UnknownPresenceException.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.client.server.presence;
package fr.insa.clavardator.server;
public class UnknownPresenceException extends Exception {
public UnknownPresenceException() {

4
client/src/main/java/fr/insa/clavardator/client/ui/ButtonPressEvent.java → src/main/java/fr/insa/clavardator/ui/ButtonPressEvent.java
View file

@ -1,8 +1,8 @@
package fr.insa.clavardator.client.ui;
package fr.insa.clavardator.ui;
/**
* Interface used to create callbacks for button press events
*/
public interface ButtonPressEvent {
void onPress();
public void onPress();
}

2
client/src/main/java/fr/insa/clavardator/client/ui/ErrorScreenController.java → src/main/java/fr/insa/clavardator/ui/ErrorScreenController.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.client.ui;
package fr.insa.clavardator.ui;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;

5
client/src/main/java/fr/insa/clavardator/client/ui/LoadingScreenController.java → src/main/java/fr/insa/clavardator/ui/LoadingScreenController.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.client.ui;
package fr.insa.clavardator.ui;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
@ -35,7 +35,6 @@ public class LoadingScreenController implements Initializable {
/**
* Instantly shows the loading screen
*
* @param label The text to display bellow the loading indicator
*/
public void show(String label) {
@ -52,7 +51,6 @@ public class LoadingScreenController implements Initializable {
/**
* Sets the text to display bellow the loading indicator
*
* @param label The text to use
*/
public void setLabel(@Nullable String label) {
@ -64,7 +62,6 @@ public class LoadingScreenController implements Initializable {
/**
* Gets the main container styles to apply custom styling
*
* @return The style list
*/
public ObservableList<String> getRootStyle() {

126
client/src/main/java/fr/insa/clavardator/client/ui/MainController.java → src/main/java/fr/insa/clavardator/ui/MainController.java
View file

@ -1,22 +1,21 @@
package fr.insa.clavardator.client.ui;
package fr.insa.clavardator.ui;
import com.jfoenix.controls.JFXSnackbar;
import fr.insa.clavardator.client.config.Config;
import fr.insa.clavardator.client.config.ConfigLoader;
import fr.insa.clavardator.client.db.DatabaseController;
import fr.insa.clavardator.client.server.ServerType;
import fr.insa.clavardator.client.server.presence.Presence;
import fr.insa.clavardator.client.server.presence.PresenceFactory;
import fr.insa.clavardator.client.server.presence.UnknownPresenceException;
import fr.insa.clavardator.client.ui.chat.ChatController;
import fr.insa.clavardator.client.ui.dialogs.AboutDialogController;
import fr.insa.clavardator.client.ui.dialogs.EditUsernameDialogController;
import fr.insa.clavardator.client.ui.dialogs.SnackbarController;
import fr.insa.clavardator.client.ui.users.UserListController;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.client.users.UserList;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.config.Config;
import fr.insa.clavardator.config.ConfigLoader;
import fr.insa.clavardator.db.DatabaseController;
import fr.insa.clavardator.server.Presence;
import fr.insa.clavardator.server.PresenceFactory;
import fr.insa.clavardator.server.PresenceType;
import fr.insa.clavardator.server.UnknownPresenceException;
import fr.insa.clavardator.ui.chat.ChatController;
import fr.insa.clavardator.ui.dialogs.AboutDialogController;
import fr.insa.clavardator.ui.dialogs.EditUsernameDialogController;
import fr.insa.clavardator.ui.dialogs.SnackbarController;
import fr.insa.clavardator.ui.users.UserListController;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.UserList;
import fr.insa.clavardator.util.Log;
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
@ -32,7 +31,6 @@ import java.util.TimerTask;
public class MainController implements Initializable {
private final CurrentUser currentUser;
private final int DEFAULT_PORT = 31598;
@FXML
private StackPane root;
@FXML
@ -51,42 +49,23 @@ public class MainController implements Initializable {
private LoadingScreenController loadingController;
@FXML
private ErrorScreenController errorController;
private JFXSnackbar snackbar;
private UserList userList;
private Presence presenceServer;
private boolean online;
private int port = DEFAULT_PORT;
private boolean localEnabled = true;
public MainController() {
online = false;
currentUser = CurrentUser.getInstance();
currentUser.addObserver(propertyChangeEvent -> {
final String propertyName = propertyChangeEvent.getPropertyName();
if (propertyName.equals("state")) {
if (propertyChangeEvent.getPropertyName().equals("state")) {
final CurrentUser.State newState = (CurrentUser.State) propertyChangeEvent.getNewValue();
onCurrentUserStateChange(newState);
} else if (propertyName.equals("username")) {
final String newUsername = (String) propertyChangeEvent.getNewValue();
onCurrentUserNameChange(newUsername);
}
});
}
private void onCurrentUserNameChange(String newUsername) {
if (online) {
if (userList != null) {
userList.propagateUsernameChange();
}
if (presenceServer != null) {
presenceServer.notify(
new UserInformation(CurrentUser.getInstance().getId(), newUsername),
null,
null);
}
}
}
/**
* If the current user becomes valid, start the chat.
* If it is invalid or not set, show the login screen.
@ -170,13 +149,11 @@ public class MainController implements Initializable {
* If any error happens, disconnect the user from chat and ask for reconnection.
*/
private void discoverActiveUsers() {
if (userList != null && online && localEnabled) {
userList.discoverActiveUsers(
port,
(e) -> {
Log.e(this.getClass().getSimpleName(), "Error discovering users", e);
CurrentUser.getInstance().setState(CurrentUser.State.INVALID);
});
if (userList != null && online) {
userList.discoverActiveUsers((e) -> {
Log.e(this.getClass().getSimpleName(), "Error discovering users", e);
CurrentUser.getInstance().setState(CurrentUser.State.INVALID);
});
}
}
@ -185,14 +162,12 @@ public class MainController implements Initializable {
* If any error happens, disconnect the user from chat and ask for reconnection.
*/
private void startListening() {
if (userList != null && online && localEnabled) {
if (userList != null) {
userList.startDiscoveryListening();
userList.startUserListening(
port,
(e) -> {
Log.e(this.getClass().getSimpleName(), "Error listening to users", e);
CurrentUser.getInstance().setState(CurrentUser.State.INVALID);
});
userList.startUserListening((e) -> {
Log.e(this.getClass().getSimpleName(), "Error listening to users", e);
CurrentUser.getInstance().setState(CurrentUser.State.INVALID);
});
}
}
@ -274,37 +249,25 @@ public class MainController implements Initializable {
*/
private void initBackend() {
ConfigLoader.load(
(Config config) -> {
initLocalNetwork(config.getLocalConfig());
new DatabaseController().initTables(
() -> userList.retrievedPreviousUsers(
() -> currentUser.init(
() -> initPresenceServer(config.getServerConfig()),
this::onInitError),
this::onInitError
), this::onInitError);
});
}
private void initLocalNetwork(Config.LocalConfig localConfig) {
port = localConfig.getPort();
localEnabled = localConfig.isEnabled();
if (localEnabled) {
Log.v(getClass().getSimpleName(), "Local network support enabled on port: " + port);
} else {
Log.v(getClass().getSimpleName(), "Local network support disabled");
}
(Config config) -> new DatabaseController().initTables(
() -> userList.retrievedPreviousUsers(
() -> currentUser.init(
() -> initPresenceServer(config),
this::onInitError),
this::onInitError
), this::onInitError));
}
/**
* Initializes the presence server based on user config
*
* @param serverConfig The server config
* @param config The user config
*/
private void initPresenceServer(Config.ServerConfig serverConfig) {
public void initPresenceServer(Config config) {
final Config.ServerConfig serverConfig = config.getServerConfig();
if (serverConfig.isEnabled()) {
try {
final ServerType type = serverConfig.getType();
final PresenceType type = serverConfig.getType();
final String uri = serverConfig.getUri();
final int presencePort = serverConfig.getPresencePort();
final int proxyPort = serverConfig.getProxyPort();
@ -323,14 +286,13 @@ public class MainController implements Initializable {
private void subscribeToPresenceServer() {
if (presenceServer != null && online) {
presenceServer.subscribe(
new UserInformation(CurrentUser.getInstance()),
param -> userList.onReceivePresenceNotification(
param,
presenceServer.getProxy()),
param,
presenceServer.getProxyConnection()),
(e) -> Log.v(
getClass().getSimpleName(),
"Error subscribing to presence server",
e));
getClass().getSimpleName(),
"Error subscribing to presence server",
e));
}
}

2
client/src/main/java/fr/insa/clavardator/client/ui/NoSelectionModel.java → src/main/java/fr/insa/clavardator/ui/NoSelectionModel.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.client.ui;
package fr.insa.clavardator.ui;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;

8
client/src/main/java/fr/insa/clavardator/client/ui/ToolbarController.java → src/main/java/fr/insa/clavardator/ui/ToolbarController.java
View file

@ -1,12 +1,14 @@
package fr.insa.clavardator.client.ui;
package fr.insa.clavardator.ui;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.users.CurrentUser;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import java.beans.PropertyChangeEvent;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
/**
@ -23,7 +25,6 @@ public class ToolbarController implements Initializable {
public void setEditListener(ButtonPressEvent listener) {
editListeners = listener;
}
public void setAboutListener(ButtonPressEvent listener) {
aboutListeners = listener;
}
@ -33,7 +34,6 @@ public class ToolbarController implements Initializable {
editListeners.onPress();
}
}
public void onAboutPress() {
if (aboutListeners != null) {
aboutListeners.onPress();

7
src/main/java/fr/insa/clavardator/ui/UserSelectedEvent.java Normal file
View file

@ -0,0 +1,7 @@
package fr.insa.clavardator.ui;
import fr.insa.clavardator.users.PeerUser;
public interface UserSelectedEvent {
void onSelected(PeerUser user);
}

27
client/src/main/java/fr/insa/clavardator/client/ui/chat/ChatController.java → src/main/java/fr/insa/clavardator/ui/chat/ChatController.java
View file

@ -1,12 +1,12 @@
package fr.insa.clavardator.client.ui.chat;
package fr.insa.clavardator.ui.chat;
import fr.insa.clavardator.client.chat.ChatHistory;
import fr.insa.clavardator.client.ui.LoadingScreenController;
import fr.insa.clavardator.client.ui.NoSelectionModel;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.chat.ChatHistory;
import fr.insa.clavardator.chat.Message;
import fr.insa.clavardator.ui.LoadingScreenController;
import fr.insa.clavardator.ui.NoSelectionModel;
import fr.insa.clavardator.users.PeerUser;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import javafx.application.Platform;
import javafx.collections.ListChangeListener;
import javafx.fxml.FXML;
@ -36,19 +36,18 @@ public class ChatController implements Initializable {
private VBox emptyContainer;
private PeerUser remoteUser;
// public void setAttachmentListener(ButtonPressEvent listener) {
// public void setAttachmentListener(ButtonPressEvent listener) {
// chatFooterController.setAttachmentListener(listener);
// }
public void setSendErrorListener(ErrorCallback listener) {
chatFooterController.setSendErrorListener(listener);
}
public void setSendErrorListener(ErrorCallback listener) {
chatFooterController.setSendErrorListener(listener);
}
/**
* Check the user that finished loading is the right one then set the chat state to done
*
* @param user The user that finished loading
*/
private void onHistoryLoaded(PeerUser user) {
private void onHistoryLoaded (PeerUser user) {
if (user.equals(remoteUser)) {
setState(State.DONE);
scrollToEnd();

20
client/src/main/java/fr/insa/clavardator/client/ui/chat/ChatFooterController.java → src/main/java/fr/insa/clavardator/ui/chat/ChatFooterController.java
View file

@ -1,11 +1,10 @@
package fr.insa.clavardator.client.ui.chat;
package fr.insa.clavardator.ui.chat;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.lib.users.UserState;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.users.PeerUser;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import javafx.application.Platform;
import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
@ -24,8 +23,6 @@ import java.util.ResourceBundle;
* Controller for the chat input field and associated buttons
*/
public class ChatFooterController implements Initializable {
FileChooser fileChooser = new FileChooser();
File attachedFile;
@FXML
private HBox container;
@FXML
@ -34,10 +31,15 @@ public class ChatFooterController implements Initializable {
private JFXButton sendButton;
@FXML
private JFXButton attachButton;
private ErrorCallback sendErrorListeners;
private PeerUser remoteUser;
private HashMap<PeerUser, String> savedText;
FileChooser fileChooser = new FileChooser();
File attachedFile;
public void setSendErrorListener(ErrorCallback listener) {
sendErrorListeners = listener;
}
@ -155,8 +157,8 @@ public class ChatFooterController implements Initializable {
private void onUserStateChange(PropertyChangeEvent propertyChangeEvent) {
final String propName = propertyChangeEvent.getPropertyName();
if (propName.equals("state")) {
final UserState newState = (UserState) propertyChangeEvent.getNewValue();
Platform.runLater(() -> setEnabled(newState == UserState.CONNECTED));
final PeerUser.State newState = (PeerUser.State) propertyChangeEvent.getNewValue();
Platform.runLater(() -> setEnabled(newState == PeerUser.State.CONNECTED));
}
}

10
client/src/main/java/fr/insa/clavardator/client/ui/chat/ChatHeaderController.java → src/main/java/fr/insa/clavardator/ui/chat/ChatHeaderController.java
View file

@ -1,7 +1,7 @@
package fr.insa.clavardator.client.ui.chat;
package fr.insa.clavardator.ui.chat;
import fr.insa.clavardator.client.ui.users.UserActiveIndicatorController;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.ui.users.UserActiveIndicatorController;
import fr.insa.clavardator.users.PeerUser;
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
@ -9,6 +9,7 @@ import javafx.scene.control.Label;
import java.beans.PropertyChangeEvent;
import java.net.URL;
import java.util.ArrayList;
import java.util.ResourceBundle;
/**
@ -52,6 +53,5 @@ public class ChatHeaderController implements Initializable {
}
@Override
public void initialize(URL location, ResourceBundle resources) {
}
public void initialize(URL location, ResourceBundle resources) {}
}

5
client/src/main/java/fr/insa/clavardator/client/ui/chat/MessageListItemCell.java → src/main/java/fr/insa/clavardator/ui/chat/MessageListItemCell.java
View file

@ -1,6 +1,7 @@
package fr.insa.clavardator.client.ui.chat;
package fr.insa.clavardator.ui.chat;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.chat.Message;
import javafx.application.Platform;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
import javafx.scene.control.ListCell;

12
client/src/main/java/fr/insa/clavardator/client/ui/chat/MessageListItemController.java → src/main/java/fr/insa/clavardator/ui/chat/MessageListItemController.java
View file

@ -1,9 +1,9 @@
package fr.insa.clavardator.client.ui.chat;
package fr.insa.clavardator.ui.chat;
import com.jfoenix.controls.JFXButton;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.lib.message.FileMessage;
import fr.insa.clavardator.lib.message.Message;
import fr.insa.clavardator.chat.FileMessage;
import fr.insa.clavardator.chat.Message;
import fr.insa.clavardator.users.CurrentUser;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.geometry.Pos;
@ -30,7 +30,6 @@ public class MessageListItemController implements Initializable {
private Label timestamp;
@FXML
private FontIcon attachmentIcon;
/**
* Sets the message to display
*
@ -109,6 +108,5 @@ public class MessageListItemController implements Initializable {
}
@Override
public void initialize(URL url, ResourceBundle rb) {
}
public void initialize(URL url, ResourceBundle rb) {}
}

2
client/src/main/java/fr/insa/clavardator/client/ui/dialogs/AboutDialogController.java → src/main/java/fr/insa/clavardator/ui/dialogs/AboutDialogController.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.client.ui.dialogs;
package fr.insa.clavardator.ui.dialogs;
import com.jfoenix.controls.JFXDialog;
import javafx.fxml.FXML;

19
client/src/main/java/fr/insa/clavardator/client/ui/dialogs/EditUsernameDialogController.java → src/main/java/fr/insa/clavardator/ui/dialogs/EditUsernameDialogController.java
View file

@ -1,12 +1,12 @@
package fr.insa.clavardator.client.ui.dialogs;
package fr.insa.clavardator.ui.dialogs;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXDialog;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.validation.base.ValidatorBase;
import fr.insa.clavardator.client.ui.ButtonPressEvent;
import fr.insa.clavardator.client.users.CurrentUser;
import fr.insa.clavardator.client.users.UserList;
import fr.insa.clavardator.ui.ButtonPressEvent;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.UserList;
import javafx.beans.property.ReadOnlyBooleanWrapper;
import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
@ -67,7 +67,6 @@ public class EditUsernameDialogController implements Initializable {
public void setOnSuccessListener(ButtonPressEvent listener) {
this.successListener = listener;
}
public void setOnCancelListener(ButtonPressEvent listener) {
this.cancelListener = listener;
}
@ -75,11 +74,12 @@ public class EditUsernameDialogController implements Initializable {
/**
* Plays the dialog show animation
*
* @param root The dialog's root component
* @param mode The dialog display mode
* @implNote WARNING: Do not try to open the dialog instantly after closing it.
* Due to JFoenix animations, the dialog will not reopen.
* If you must, wait at least 500ms before reopening.
*
* @param root The dialog's root component
* @param mode The dialog display mode
*/
public void show(StackPane root, Mode mode) {
setLocked(false);
@ -179,6 +179,9 @@ public class EditUsernameDialogController implements Initializable {
if (successListener != null) {
successListener.onPress();
}
if (userList != null) {
userList.propagateUsernameChange();
}
}
/**
@ -200,7 +203,7 @@ public class EditUsernameDialogController implements Initializable {
textField.setOnKeyPressed(event -> {
if (event.getCode() == KeyCode.ENTER) {
event.consume();
if (!textField.getText().isEmpty()) {
if(!textField.getText().isEmpty()){
onConfirm();
}
}

3
client/src/main/java/fr/insa/clavardator/client/ui/dialogs/SnackbarController.java → src/main/java/fr/insa/clavardator/ui/dialogs/SnackbarController.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.client.ui.dialogs;
package fr.insa.clavardator.ui.dialogs;
import com.jfoenix.effects.JFXDepthManager;
import javafx.collections.ObservableList;
@ -9,6 +9,7 @@ import javafx.scene.layout.HBox;
import org.kordamp.ikonli.javafx.FontIcon;
import java.net.URL;
import java.util.Arrays;
import java.util.ResourceBundle;
/**

12
client/src/main/java/fr/insa/clavardator/client/ui/users/UserActiveIndicatorController.java → src/main/java/fr/insa/clavardator/ui/users/UserActiveIndicatorController.java
View file

@ -1,7 +1,6 @@
package fr.insa.clavardator.client.ui.users;
package fr.insa.clavardator.ui.users;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.lib.users.UserState;
import fr.insa.clavardator.users.PeerUser;
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
@ -42,8 +41,8 @@ public class UserActiveIndicatorController implements Initializable {
*/
private void onStateChange(PropertyChangeEvent propertyChangeEvent) {
if (propertyChangeEvent.getPropertyName().equals("state")) {
final UserState newState = (UserState) propertyChangeEvent.getNewValue();
Platform.runLater(() -> updateState(newState == UserState.CONNECTED));
final PeerUser.State newState = (PeerUser.State) propertyChangeEvent.getNewValue();
Platform.runLater(() -> updateState(newState == PeerUser.State.CONNECTED));
}
}
@ -72,7 +71,6 @@ public class UserActiveIndicatorController implements Initializable {
}
@Override
public void initialize(URL location, ResourceBundle resources) {
}
public void initialize(URL location, ResourceBundle resources) {}
}

19
client/src/main/java/fr/insa/clavardator/client/ui/users/UserListController.java → src/main/java/fr/insa/clavardator/ui/users/UserListController.java
View file

@ -1,11 +1,11 @@
package fr.insa.clavardator.client.ui.users;
package fr.insa.clavardator.ui.users;
import com.jfoenix.controls.JFXButton;
import fr.insa.clavardator.client.ui.ButtonPressEvent;
import fr.insa.clavardator.client.ui.UserSelectedEvent;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.client.users.UserList;
import fr.insa.clavardator.lib.users.User;
import fr.insa.clavardator.ui.ButtonPressEvent;
import fr.insa.clavardator.ui.UserSelectedEvent;
import fr.insa.clavardator.users.PeerUser;
import fr.insa.clavardator.users.User;
import fr.insa.clavardator.users.UserList;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.ListView;
@ -22,17 +22,14 @@ public class UserListController implements Initializable {
private ButtonPressEvent refreshUserListener;
private UserSelectedEvent userSelectedListener;
public UserListController() {
}
public UserListController() {}
public void setRefreshUserListener(ButtonPressEvent listener) {
refreshUserListener = listener;
}
public void setUserSelectedListener(UserSelectedEvent listener) {
userSelectedListener = listener;
}
public void onRefreshUserListPress() {
if (refreshUserListener != null) {
refreshUserListener.onPress();
@ -41,7 +38,6 @@ public class UserListController implements Initializable {
/**
* Enables or disables the refresh button
*
* @param enabled True to enable, false otherwise
*/
public void setRefreshButtonEnabled(boolean enabled) {
@ -67,7 +63,6 @@ public class UserListController implements Initializable {
/**
* Sets the user list to subscribe to
*
* @param userList The user list to use
*/
public void setUserList(UserList userList) {

6
client/src/main/java/fr/insa/clavardator/client/ui/users/UserListItemCell.java → src/main/java/fr/insa/clavardator/ui/users/UserListItemCell.java
View file

@ -1,7 +1,7 @@
package fr.insa.clavardator.client.ui.users;
package fr.insa.clavardator.ui.users;
import fr.insa.clavardator.client.ui.UserSelectedEvent;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.ui.UserSelectedEvent;
import fr.insa.clavardator.users.PeerUser;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
import javafx.scene.control.ListCell;

14
client/src/main/java/fr/insa/clavardator/client/ui/users/UserListItemController.java → src/main/java/fr/insa/clavardator/ui/users/UserListItemController.java
View file

@ -1,9 +1,8 @@
package fr.insa.clavardator.client.ui.users;
package fr.insa.clavardator.ui.users;
import com.jfoenix.controls.JFXButton;
import fr.insa.clavardator.client.ui.ButtonPressEvent;
import fr.insa.clavardator.client.users.PeerUser;
import fr.insa.clavardator.lib.users.UserState;
import fr.insa.clavardator.ui.ButtonPressEvent;
import fr.insa.clavardator.users.PeerUser;
import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
@ -57,8 +56,8 @@ public class UserListItemController implements Initializable {
final String newUsername = (String) propertyChangeEvent.getNewValue();
Platform.runLater(() -> button.setText(newUsername));
} else if (propName.equals("state") && !selected) {
final UserState newState = (UserState) propertyChangeEvent.getNewValue();
Platform.runLater(() -> resetBackground(newState == UserState.CONNECTED));
final PeerUser.State newState = (PeerUser.State) propertyChangeEvent.getNewValue();
Platform.runLater(() -> resetBackground(newState == PeerUser.State.CONNECTED));
}
}
@ -111,6 +110,5 @@ public class UserListItemController implements Initializable {
}
@Override
public void initialize(URL location, ResourceBundle resources) {
}
public void initialize(URL location, ResourceBundle resources) {}
}

20
client/src/main/java/fr/insa/clavardator/client/users/CurrentUser.java → src/main/java/fr/insa/clavardator/users/CurrentUser.java
View file

@ -1,10 +1,8 @@
package fr.insa.clavardator.client.users;
package fr.insa.clavardator.users;
import fr.insa.clavardator.client.db.DatabaseController;
import fr.insa.clavardator.lib.users.User;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.db.DatabaseController;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import java.util.UUID;
@ -35,8 +33,8 @@ public class CurrentUser extends User {
final DatabaseController db = new DatabaseController();
db.getCurrentUser((user) -> {
if (user == null) {
setId(generateUniqueId());
Log.v(getClass().getSimpleName(), "No previous user found, generating id: " + getId());
id = generateUniqueId();
Log.v(getClass().getSimpleName(), "No previous user found, generating id: " + id);
db.addCurrentUser(
new UserInformation(this),
() -> {
@ -45,9 +43,9 @@ public class CurrentUser extends User {
},
errorCallback);
} else {
setId(user.id);
id = user.id;
if (user.getUsername() != null) {
Log.v(getClass().getSimpleName(), "Last user found : " + getId() + " / " + getUsername());
Log.v(getClass().getSimpleName(), "Last user found : " + id + " / " + getUsername());
setUsername(user.getUsername());
} else {
Log.v(getClass().getSimpleName(), "No username found, asking user");
@ -77,7 +75,7 @@ public class CurrentUser extends User {
public void setState(State state) {
Log.v(this.getClass().getSimpleName(),
"State changed from " + this.state.toString() + " to " + state.toString());
instance.getPcs().firePropertyChange("state", this.state, state);
instance.pcs.firePropertyChange("state", this.state, state);
this.state = state;
}

234
src/main/java/fr/insa/clavardator/users/PeerUser.java Normal file
View file

@ -0,0 +1,234 @@
package fr.insa.clavardator.users;
import fr.insa.clavardator.chat.ChatHistory;
import fr.insa.clavardator.chat.FileMessage;
import fr.insa.clavardator.chat.Message;
import fr.insa.clavardator.db.DatabaseController;
import fr.insa.clavardator.errors.UsernameTakenException;
import fr.insa.clavardator.network.TcpConnection;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.EOFException;
import java.io.File;
import java.io.IOException;
import java.util.Date;
public class PeerUser extends User implements Comparable<PeerUser> {
protected transient ChatHistory history;
private State state = State.DISCONNECTED;
private transient TcpConnection connection;
public PeerUser(String id, String username) {
super(id, username);
history = new ChatHistory(this);
}
public PeerUser(String id) {
super(id);
history = new ChatHistory(this);
}
public PeerUser() {
super();
history = new ChatHistory(this);
}
/**
* Sends a basic text message to this user
*
* @param msg The text message to send
* @param errorCallback Callback on error
*/
public void sendTextMessage(String msg, @Nullable ErrorCallback errorCallback) {
if (connection != null) {
Log.v(this.getClass().getSimpleName(),
"Sending message to " + this.getUsername() + " / " + this.getId() + ": " + msg);
final Message message = new Message(CurrentUser.getInstance(), this, new Date(), msg);
connection.send(message, () -> history.addMessage(message, errorCallback), errorCallback);
} else {
Log.e(this.getClass().getSimpleName(), "Could not send message: connection is not initialized");
}
}
/**
* Sends a message containing a file to this user
*
* @param msg The text message to send
* @param errorCallback Callback on error
*/
public void sendFileMessage(String msg, File file, @Nullable ErrorCallback errorCallback) {
if (connection != null) {
Log.v(this.getClass().getSimpleName(),
"Sending file message to " + this.getUsername() + " / " + this.getId() + ": " + msg);
try {
final FileMessage message = new FileMessage(CurrentUser.getInstance(), this, new Date(), msg, file.getPath());
message.storeFile();
connection.send(message, () -> history.addMessage(message, errorCallback), errorCallback);
} catch (IOException e) {
Log.e(this.getClass().getSimpleName(), "Could not send message: error while opening file", e);
if (errorCallback != null) {
errorCallback.onError(e);
}
}
} else {
Log.e(this.getClass().getSimpleName(), "Could not send message: connection is not initialized");
}
}
/**
* Sends current user information to this user
*
* @param errorCallback Callback on error
*/
public void sendCurrentUser(@Nullable ErrorCallback errorCallback) {
if (connection != null) {
final String username = CurrentUser.getInstance().getUsername();
Log.v(this.getClass().getSimpleName(),
"Sending current user information to " + this.getUsername() + " / " + this.getId() + ": " + username);
connection.send(
new UserInformation(CurrentUser.getInstance()),
null,
errorCallback);
} else {
Log.e(this.getClass().getSimpleName(), "Could not send new username: connection is not initialized");
}
}
private void sendUsernameTaken(TcpConnection thisConnection) {
Log.v(this.getClass().getSimpleName(), "Received username request using current username");
thisConnection.send(new UsernameTakenException("Username taken"), this::disconnect, null);
}
public void init(TcpConnection connection, String id, String username, ErrorCallback errorCallback) {
this.connection = connection;
this.id = id;
setUsername(username);
setState(State.CONNECTED);
subscribeToMessages((e) -> {
disconnect();
errorCallback.onError(e);
});
}
/**
* Subscribe to this user messages.
* If receiving new user info, update this user.
* If receiving text message, store it in the history.
*
* @param errorCallback Callback on error
*/
private void subscribeToMessages(ErrorCallback errorCallback) {
connection.receive(
msg -> {
Log.v(this.getClass().getSimpleName(), "Received message from " + id);
if (msg instanceof UserInformation) {
assert ((UserInformation) msg).id.equals(getId());
final String receivedUsername = ((UserInformation) msg).getUsername();
Log.v(this.getClass().getSimpleName(), "Message username: " + receivedUsername);
if (CurrentUser.getInstance().getUsername().equals(receivedUsername)) {
sendUsernameTaken(connection);
} else {
setUsername(receivedUsername);
}
} else if (msg instanceof Message) {
assert !((Message) msg).getRecipient().id.equals(id);
Log.v(this.getClass().getSimpleName(), "Message text: " + ((Message) msg).getText());
if (msg instanceof FileMessage) {
((FileMessage) msg).storeFile();
}
history.addMessage((Message) msg, errorCallback);
} else if (msg instanceof UsernameTakenException) {
disconnect();
errorCallback.onError(new Exception("Received username already taken message"));
}
},
e -> {
if (e instanceof EOFException) {
disconnect();
} else {
Log.e(this.getClass().getSimpleName(), "Error receiving message from " + id, e);
errorCallback.onError(e);
}
});
}
/**
* Close the connection and set state to disconnected
*/
public void disconnect() {
Log.v(this.getClass().getSimpleName(), "Disconnecting from user: " + id);
closeConnection();
setState(State.DISCONNECTED);
}
@Override
protected void setUsername(String newUsername) {
super.setUsername(newUsername);
final DatabaseController db = new DatabaseController();
db.updateUsername(new UserInformation(this),
null,
e -> Log.e(getClass().getSimpleName(), "Unable to update the username", e));
}
/**
* Close the connection to this user
*/
private void closeConnection() {
if (connection != null && connection.isOpen()) {
connection.close();
connection = null;
}
}
/**
* Gets the value of history
*
* @return the value of history
*/
public ChatHistory getHistory() {
return history;
}
/**
* Sets this user state
*
* @param state The new state
*/
protected void setState(State state) {
pcs.firePropertyChange("state", this.state, state);
this.state = state;
}
/**
* Check if this user is active.
*
* @return True id active, false otherwise
*/
public boolean isActive() {
return state == State.CONNECTED;
}
@Override
public int compareTo(@NotNull PeerUser peerUser) {
if (peerUser.isActive() && !this.isActive()) {
return 1;
} else if (!peerUser.isActive() && this.isActive()) {
return -1;
}
return getUsername().compareTo(peerUser.getUsername());
}
/**
* The user connection state
*/
public enum State {
CONNECTED,
DISCONNECTED,
}
}

29
lib/src/main/java/fr/insa/clavardator/lib/users/User.java → src/main/java/fr/insa/clavardator/users/User.java
View file

@ -1,14 +1,24 @@
package fr.insa.clavardator.lib.users;
package fr.insa.clavardator.users;
import fr.insa.clavardator.db.DatabaseController;
import fr.insa.clavardator.util.Log;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.Serializable;
public class User implements Serializable {
// Make this class observable
private final transient PropertyChangeSupport pcs = new PropertyChangeSupport(this);
private String username;
private String id;
protected String id;
// Make this class observable
protected final transient PropertyChangeSupport pcs = new PropertyChangeSupport(this);
public void addObserver(PropertyChangeListener listener) {
pcs.addPropertyChangeListener(listener);
}
public void removeObserver(PropertyChangeListener listener) {
pcs.removePropertyChangeListener(listener);
}
public User() {
}
@ -22,17 +32,6 @@ public class User implements Serializable {
this.username = username;
}
public void addObserver(PropertyChangeListener listener) {
pcs.addPropertyChangeListener(listener);
}
public void removeObserver(PropertyChangeListener listener) {
pcs.removePropertyChangeListener(listener);
}
public PropertyChangeSupport getPcs() {
return pcs;
}
public String getId() {
return id;

29
src/main/java/fr/insa/clavardator/users/UserInformation.java Normal file
View file

@ -0,0 +1,29 @@
package fr.insa.clavardator.users;
import java.io.Serializable;
/**
* Class used to serialize useful user information
*/
public class UserInformation implements Serializable {
public final String id;
private final String username;
public UserInformation(String id, String username) {
this.id = id;
this.username = username;
}
public UserInformation(User user) {
this.id = user.getId();
this.username = user.getUsername();
}
public String getUsername() {
return username;
}
@Override
public String toString() {
return "UserInfo " + id + '(' + username + ')';
}
}

74
client/src/main/java/fr/insa/clavardator/client/users/UserList.java → src/main/java/fr/insa/clavardator/users/UserList.java
View file

@ -1,15 +1,12 @@
package fr.insa.clavardator.client.users;
package fr.insa.clavardator.users;
import fr.insa.clavardator.client.db.DatabaseController;
import fr.insa.clavardator.client.network.NetDiscoverer;
import fr.insa.clavardator.client.network.PeerHandshake;
import fr.insa.clavardator.client.server.proxy.Proxy;
import fr.insa.clavardator.lib.network.TcpListener;
import fr.insa.clavardator.lib.users.User;
import fr.insa.clavardator.lib.users.UserInformation;
import fr.insa.clavardator.lib.users.UserState;
import fr.insa.clavardator.lib.util.ErrorCallback;
import fr.insa.clavardator.lib.util.Log;
import fr.insa.clavardator.db.DatabaseController;
import fr.insa.clavardator.network.NetDiscoverer;
import fr.insa.clavardator.network.PeerHandshake;
import fr.insa.clavardator.network.TcpConnection;
import fr.insa.clavardator.network.TcpListener;
import fr.insa.clavardator.util.ErrorCallback;
import fr.insa.clavardator.util.Log;
import javafx.application.Platform;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
@ -38,53 +35,32 @@ public class UserList {
*
* @param errorCallback The function to call on error
*/
public void discoverActiveUsers(int port, ErrorCallback errorCallback) {
public void discoverActiveUsers(ErrorCallback errorCallback) {
netDiscoverer.discoverActiveUsers("CLAVARDATOR_BROADCAST", (ipAddr, data) -> {
Log.v(this.getClass().getSimpleName(), "Discovered new user: " + data);
new PeerHandshake().createConnection(
ipAddr,
port,
this::onUserConnectionSuccess,
errorCallback);
}, errorCallback);
}
public void onReceivePresenceNotification(ArrayList<UserInformation> newPresenceUsers, Proxy proxy) {
public void onReceivePresenceNotification(ArrayList<UserInformation> newPresenceUsers, TcpConnection proxyConnection) {
newPresenceUsers.forEach((userInfo -> {
final PeerUser savedUser = userHashmap.get(userInfo.id);
if (savedUser != null) {
if (savedUser.isActive()) {
if (userInfo.getState() == UserState.DISCONNECTED) {
Log.v(getClass().getSimpleName(), "Received disconnected user from presence server was already known and connected, disconnecting...");
savedUser.disconnect();
} else {
Log.v(getClass().getSimpleName(), "Received user from presence server was already known and connected, updating info...");
savedUser.setState(userInfo.getState());
savedUser.setUsername(userInfo.getUsername());
}
Log.v(getClass().getSimpleName(), "Received user from presence server already known and connected");
} else {
if (userInfo.getState() == UserState.CONNECTED) {
Log.v(getClass().getSimpleName(), "Received user from presence server was already known but not connected, connecting...");
savedUser.init(proxy, userInfo.id, userInfo.getUsername(),
e -> Log.e(getClass().getSimpleName(), "Error with user " + userInfo.getUsername(), e));
} else {
Log.v(getClass().getSimpleName(), "Received disconnected user from presence server was already known and disconnected.");
}
Log.v(getClass().getSimpleName(), "Received user from presence server already known and connected");
savedUser.init(proxyConnection, userInfo.id, userInfo.getUsername(), null);
}
} else {
if (userInfo.getState() == UserState.CONNECTED) {
Log.v(getClass().getSimpleName(), "Received new connected user from presence server");
final PeerUser user = new PeerUser();
user.init(proxy, userInfo.id, userInfo.getUsername(),
e -> Log.e(getClass().getSimpleName(), "Error with user " + userInfo.getUsername(), e));
userHashmap.put(user.getId(), user);
Platform.runLater(() -> userObservableList.add(user));
} else {
Log.v(getClass().getSimpleName(), "Received new disconnected user from presence server");
final PeerUser user = new PeerUser(userInfo.id, userInfo.getUsername());
userHashmap.put(user.getId(), user);
Platform.runLater(() -> userObservableList.add(user));
}
Log.v(getClass().getSimpleName(), "Received new user from presence server");
final PeerUser user = new PeerUser();
user.init(proxyConnection, userInfo.id, userInfo.getUsername(), null);
userHashmap.put(user.id, user);
Platform.runLater(() -> userObservableList.add(user));
}
}));
}
@ -102,7 +78,7 @@ public class UserList {
public void retrievedPreviousUsers(UserListLoadedCallback onFinish, ErrorCallback errorCallback) {
db.getAllUsers(users -> {
users.forEach(user -> createNewInactiveUser(user.getId(), user.getUsername()));
users.forEach(user -> createNewInactiveUser(user.id, user.getUsername()));
onFinish.onLoaded();
}, errorCallback);
}
@ -112,9 +88,8 @@ public class UserList {
*
* @param errorCallback Callback on error
*/
public void startUserListening(int port, ErrorCallback errorCallback) {
public void startUserListening(ErrorCallback errorCallback) {
tcpListener.acceptConnection(
port,
(clientSocket) -> {
Log.v(this.getClass().getSimpleName(),
"new connection from user at address: " + clientSocket.getInetAddress().toString());
@ -131,14 +106,11 @@ public class UserList {
final UserInformation userInfo = handshake.getUserInformation();
final PeerUser savedUser = userHashmap.get(userInfo.id);
if (savedUser != null) {
savedUser.init(handshake.getConnection(), userInfo.id, userInfo.getUsername(),
e -> Log.e(getClass().getSimpleName(), "Error with user " + userInfo.getUsername(), e));
savedUser.init(handshake.getConnection(), userInfo.id, userInfo.getUsername(), null);
} else {
final PeerUser user = new PeerUser();
user.init(handshake.getConnection(), userInfo.id, userInfo.getUsername(),
e -> Log.e(getClass().getSimpleName(), "Error with user " + userInfo.getUsername(), e));
userHashmap.put(user.getId(), user);
user.init(handshake.getConnection(), userInfo.id, userInfo.getUsername(), null);
userHashmap.put(user.id, user);
Platform.runLater(() -> userObservableList.add(user));
}
}

2
lib/src/main/java/fr/insa/clavardator/lib/util/ErrorCallback.java → src/main/java/fr/insa/clavardator/util/ErrorCallback.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.lib.util;
package fr.insa.clavardator.util;
public interface ErrorCallback {
void onError(Exception e);

16
lib/src/main/java/fr/insa/clavardator/lib/util/Log.java → src/main/java/fr/insa/clavardator/util/Log.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.lib.util;
package fr.insa.clavardator.util;
import org.jetbrains.annotations.Nullable;
@ -16,13 +16,13 @@ public class Log {
public static int verboseLevel = 4;
private static void print(String prefix, String message, String mode, int requiredLevel, @Nullable Exception e) {
if (verboseLevel >= requiredLevel) {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
System.out.println(sdf.format(date) + " | " + mode + " | " + prefix + ": " + message);
if (e != null)
e.printStackTrace();
}
if (verboseLevel >= requiredLevel) {
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss.SSS");
System.out.println(sdf.format(date) + " | " + mode + " | " + prefix + ": " + message);
if (e != null)
e.printStackTrace();
}
}
public static void v(String prefix, String message) {

2
lib/src/main/java/fr/insa/clavardator/lib/util/ParametrizedCallback.java → src/main/java/fr/insa/clavardator/util/ParametrizedCallback.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.lib.util;
package fr.insa.clavardator.util;
public interface ParametrizedCallback<T> {
void call(T param);

2
lib/src/main/java/fr/insa/clavardator/lib/util/SimpleCallback.java → src/main/java/fr/insa/clavardator/util/SimpleCallback.java
View file

@ -1,4 +1,4 @@
package fr.insa.clavardator.lib.util;
package fr.insa.clavardator.util;
public interface SimpleCallback {
void call();

11
client/src/main/resources/fr/insa/clavardator/client/ui/chat/chat.fxml → src/main/resources/fr/insa/clavardator/ui/chat/chat.fxml
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--suppress JavaFxUnresolvedFxIdReference -->
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.*?>
<AnchorPane xmlns:fx="http://javafx.com/fxml/1"
xmlns="http://javafx.com/javafx/11.0.1" fx:controller="fr.insa.clavardator.client.ui.chat.ChatController"
<!--suppress JavaFxUnresolvedFxIdReference -->
<?import javafx.scene.control.Label?>
<?import com.jfoenix.controls.JFXSpinner?>
<?import javafx.geometry.Insets?>
<AnchorPane xmlns="http://javafx.com/javafx/11.0.1"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.insa.clavardator.ui.chat.ChatController"
stylesheets="@../styles.css" styleClass="container">
<StackPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">

6
client/src/main/resources/fr/insa/clavardator/client/ui/chat/chatFooter.fxml → src/main/resources/fr/insa/clavardator/ui/chat/chatFooter.fxml
View file

@ -5,9 +5,9 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.layout.HBox?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<HBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.chat.ChatFooterController"
<HBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="fr.insa.clavardator.ui.chat.ChatFooterController"
stylesheets="@../styles.css" styleClass="container" alignment="CENTER" spacing="10.0" fx:id="container">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>

2
client/src/main/resources/fr/insa/clavardator/client/ui/chat/chatHeader.fxml → src/main/resources/fr/insa/clavardator/ui/chat/chatHeader.fxml
View file

@ -6,7 +6,7 @@
<?import javafx.scene.layout.VBox?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.chat.ChatHeaderController"
fx:controller="fr.insa.clavardator.ui.chat.ChatHeaderController"
stylesheets="@../styles.css" styleClass="container">
<HBox alignment="CENTER_LEFT" spacing="5" prefHeight="64">
<padding>

29
src/main/resources/fr/insa/clavardator/ui/chat/messageListItem.fxml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.JFXButton?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<VBox xmlns="http://javafx.com/javafx/11.0.1"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="fr.insa.clavardator.ui.chat.MessageListItemController"
stylesheets="@../styles.css"
styleClass="inner"
fx:id="container"
spacing="10">
<padding>
<Insets left="50" right="50" top="10" bottom="10"/>
</padding>
<JFXButton fx:id="button"
mnemonicParsing="false"
text="Message"
textAlignment="CENTER">
<graphic>
<FontIcon iconLiteral="fas-paperclip" iconSize="24" fx:id="attachmentIcon"/>
</graphic>
</JFXButton>
<Label fx:id="timestamp"
text="Timestamp"
styleClass="timestamp"/>
</VBox>

5
client/src/main/resources/fr/insa/clavardator/client/ui/dialogs/aboutDialog.fxml → src/main/resources/fr/insa/clavardator/ui/dialogs/aboutDialog.fxml
View file

@ -2,13 +2,14 @@
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXDialog?>
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<JFXDialog xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.dialogs.AboutDialogController"
fx:controller="fr.insa.clavardator.ui.dialogs.AboutDialogController"
stylesheets="@../styles.css" fx:id="dialog">
<AnchorPane
prefWidth="600"
@ -21,7 +22,7 @@
<padding>
<Insets bottom="10"/>
</padding>
<Label styleClass="dialog-title">À Propos</Label>
<Label styleClass="dialog-title" >À Propos</Label>
<VBox VBox.vgrow="ALWAYS" alignment="CENTER" spacing="30">
<Label VBox.vgrow="ALWAYS">Application réalisée par Yohan SIMARD et Arnaud VERGNET</Label>
<Label VBox.vgrow="ALWAYS">INSA Toulouse 2020-2021</Label>

2
client/src/main/resources/fr/insa/clavardator/client/ui/dialogs/editUsernameDialog.fxml → src/main/resources/fr/insa/clavardator/ui/dialogs/editUsernameDialog.fxml
View file

@ -9,7 +9,7 @@
<?import org.kordamp.ikonli.javafx.FontIcon?>
<JFXDialog xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.dialogs.EditUsernameDialogController"
fx:controller="fr.insa.clavardator.ui.dialogs.EditUsernameDialogController"
stylesheets="@../styles.css" fx:id="dialog">
<AnchorPane
prefWidth="600"

7
client/src/main/resources/fr/insa/clavardator/client/ui/dialogs/snackbar.fxml → src/main/resources/fr/insa/clavardator/ui/dialogs/snackbar.fxml
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<?import javafx.geometry.Insets?>
<AnchorPane xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.dialogs.SnackbarController"
fx:controller="fr.insa.clavardator.ui.dialogs.SnackbarController"
stylesheets="@../styles.css">
<HBox fx:id="container" alignment="CENTER_LEFT" prefHeight="50.0" prefWidth="400" AnchorPane.rightAnchor="0"
AnchorPane.leftAnchor="0" AnchorPane.topAnchor="0" AnchorPane.bottomAnchor="100"

12
client/src/main/resources/fr/insa/clavardator/client/ui/errorScreen.fxml → src/main/resources/fr/insa/clavardator/ui/errorScreen.fxml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.JFXButton?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.VBox?>
<?import com.jfoenix.controls.JFXButton?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.ErrorScreenController"
fx:controller="fr.insa.clavardator.ui.ErrorScreenController"
stylesheets="@styles.css"
styleClass="container"
alignment="CENTER"
@ -14,9 +14,9 @@
fx:id="container">
<Label>Une erreur est survenue et Clavardator ne peut pas démarrer</Label>
<JFXButton styleClass="background-danger" onAction="#onPress">
<graphic>
<FontIcon iconLiteral="fas-times"/>
</graphic>
Quitter
<graphic>
<FontIcon iconLiteral="fas-times"/>
</graphic>
Quitter
</JFXButton>
</VBox>

2
client/src/main/resources/fr/insa/clavardator/client/ui/loadingScreen.fxml → src/main/resources/fr/insa/clavardator/ui/loadingScreen.fxml
View file

@ -6,7 +6,7 @@
<?import javafx.scene.layout.VBox?>
<StackPane xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.LoadingScreenController"
fx:controller="fr.insa.clavardator.ui.LoadingScreenController"
stylesheets="@styles.css"
styleClass="container"
fx:id="container">

3
client/src/main/resources/fr/insa/clavardator/client/ui/scene.fxml → src/main/resources/fr/insa/clavardator/ui/scene.fxml
View file

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--suppress JavaFxUnresolvedFxIdReference -->
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?>
<StackPane xmlns:fx="http://javafx.com/fxml/1"
xmlns="http://javafx.com/javafx/11.0.1"
fx:controller="fr.insa.clavardator.client.ui.MainController"
fx:controller="fr.insa.clavardator.ui.MainController"
stylesheets="@styles.css"
styleClass="container"
fx:id="root">

2
client/src/main/resources/fr/insa/clavardator/client/ui/styles.css → src/main/resources/fr/insa/clavardator/ui/styles.css
View file

@ -1,3 +1,4 @@
/********************************************************
THEME
*********************************************************/
@ -16,6 +17,7 @@
}
/********************************************************
STYLE
*********************************************************/

12
client/src/main/resources/fr/insa/clavardator/client/ui/toolbar.fxml → src/main/resources/fr/insa/clavardator/ui/toolbar.fxml
View file

@ -3,14 +3,12 @@
<?import com.jfoenix.controls.JFXButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.layout.*?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<VBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.client.ui.ToolbarController"
stylesheets="@styles.css" styleClass="container">
<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="fr.insa.clavardator.ui.ToolbarController"
stylesheets="@styles.css" styleClass="container">
<HBox alignment="CENTER_LEFT" prefHeight="64.0" spacing="10">
<padding>
<Insets left="20" right="20"/>

Some files were not shown because too many files have changed in this diff Show more