forked from External/mage
[app-wiring-refactor]: Remove static initialisation
- Remove all enum static managers - Introduce interfaces for the managers - Define new application wiring class (`ManagerFactory`) - Externalise the configuration
This commit is contained in:
Francesco Burato
parent
cf3dd2d94c
commit
d0c2135e17
48 changed files with 1385 additions and 911 deletions
|
|
@ -1,8 +1,9 @@
|
|||
|
||||
package mage.server;
|
||||
|
||||
import mage.MageException;
|
||||
import mage.players.net.UserData;
|
||||
import mage.server.managers.ISessionManager;
|
||||
import mage.server.managers.ManagerFactory;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.jboss.remoting.callback.InvokerCallbackHandler;
|
||||
|
||||
|
|
@ -13,21 +14,25 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||
/**
|
||||
* @author BetaSteward_at_googlemail.com
|
||||
*/
|
||||
public enum SessionManager {
|
||||
|
||||
instance;
|
||||
public class SessionManager implements ISessionManager {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(SessionManager.class);
|
||||
|
||||
private final ManagerFactory managerFactory;
|
||||
private final ConcurrentHashMap<String, Session> sessions = new ConcurrentHashMap<>();
|
||||
|
||||
public SessionManager(ManagerFactory managerFactory) {
|
||||
this.managerFactory = managerFactory;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<Session> getSession(@Nonnull String sessionId) {
|
||||
Session session = sessions.get(sessionId);
|
||||
if (session == null) {
|
||||
logger.trace("Session with sessionId " + sessionId + " is not found");
|
||||
return Optional.empty();
|
||||
}
|
||||
if (session.getUserId() != null && !UserManager.instance.getUser(session.getUserId()).isPresent()) {
|
||||
if (session.getUserId() != null && !managerFactory.userManager().getUser(session.getUserId()).isPresent()) {
|
||||
logger.error("User for session " + sessionId + " with userId " + session.getUserId() + " is missing. Session removed.");
|
||||
// can happen if user from same host signs in multiple time with multiple clients, after they disconnect with one client
|
||||
disconnect(sessionId, DisconnectReason.ConnectingOtherInstance, session); // direct disconnect
|
||||
|
|
@ -36,11 +41,13 @@ public enum SessionManager {
|
|||
return Optional.of(session);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createSession(String sessionId, InvokerCallbackHandler callbackHandler) {
|
||||
Session session = new Session(sessionId, callbackHandler);
|
||||
Session session = new Session(managerFactory, sessionId, callbackHandler);
|
||||
sessions.put(sessionId, session);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean registerUser(String sessionId, String userName, String password, String email) throws MageException {
|
||||
Session session = sessions.get(sessionId);
|
||||
if (session == null) {
|
||||
|
|
@ -59,6 +66,7 @@ public enum SessionManager {
|
|||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean connectUser(String sessionId, String userName, String password, String userIdStr) throws MageException {
|
||||
Session session = sessions.get(sessionId);
|
||||
if (session != null) {
|
||||
|
|
@ -78,6 +86,7 @@ public enum SessionManager {
|
|||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean connectAdmin(String sessionId) {
|
||||
Session session = sessions.get(sessionId);
|
||||
if (session != null) {
|
||||
|
|
@ -88,17 +97,20 @@ public enum SessionManager {
|
|||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setUserData(String userName, String sessionId, UserData userData, String clientVersion, String userIdStr) throws MageException {
|
||||
return getSession(sessionId)
|
||||
.map(session -> session.setUserData(userName,userData, clientVersion, userIdStr))
|
||||
.orElse(false);
|
||||
return getSession(sessionId)
|
||||
.map(session -> session.setUserData(userName, userData, clientVersion, userIdStr))
|
||||
.orElse(false);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(String sessionId, DisconnectReason reason) {
|
||||
disconnect(sessionId, reason, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void disconnect(String sessionId, DisconnectReason reason, Session directSession) {
|
||||
if (directSession == null) {
|
||||
// find real session to disconnects
|
||||
|
|
@ -115,13 +127,13 @@ public enum SessionManager {
|
|||
break;
|
||||
case ConnectingOtherInstance:
|
||||
case Disconnected: // regular session end or wrong client version
|
||||
UserManager.instance.disconnect(session.getUserId(), reason);
|
||||
managerFactory.userManager().disconnect(session.getUserId(), reason);
|
||||
break;
|
||||
case SessionExpired: // session ends after no reconnect happens in the defined time span
|
||||
break;
|
||||
case LostConnection: // user lost connection - session expires countdown starts
|
||||
session.userLostConnection();
|
||||
UserManager.instance.disconnect(session.getUserId(), reason);
|
||||
managerFactory.userManager().disconnect(session.getUserId(), reason);
|
||||
break;
|
||||
default:
|
||||
logger.trace("endSession: unexpected reason " + reason.toString() + " - sessionId: " + sessionId);
|
||||
|
|
@ -141,6 +153,7 @@ public enum SessionManager {
|
|||
* @param sessionId
|
||||
* @param userSessionId
|
||||
*/
|
||||
@Override
|
||||
public void disconnectUser(String sessionId, String userSessionId) {
|
||||
if (isAdmin(sessionId)) {
|
||||
getUserFromSession(sessionId).ifPresent(admin -> {
|
||||
|
|
@ -159,40 +172,46 @@ public enum SessionManager {
|
|||
|
||||
private Optional<User> getUserFromSession(String sessionId) {
|
||||
return getSession(sessionId)
|
||||
.flatMap(s -> UserManager.instance.getUser(s.getUserId()));
|
||||
.flatMap(s -> managerFactory.userManager().getUser(s.getUserId()));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void endUserSession(String sessionId, String userSessionId) {
|
||||
if (isAdmin(sessionId)) {
|
||||
disconnect(userSessionId, DisconnectReason.AdminDisconnect);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAdmin(String sessionId) {
|
||||
return getSession(sessionId).map(Session::isAdmin).orElse(false);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isValidSession(@Nonnull String sessionId) {
|
||||
return sessions.containsKey(sessionId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<User> getUser(@Nonnull String sessionId) {
|
||||
Session session = sessions.get(sessionId);
|
||||
if (session != null) {
|
||||
return UserManager.instance.getUser(sessions.get(sessionId).getUserId());
|
||||
return managerFactory.userManager().getUser(sessions.get(sessionId).getUserId());
|
||||
}
|
||||
logger.error(String.format("Session %s could not be found", sessionId));
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean extendUserSession(String sessionId, String pingInfo) {
|
||||
return getSession(sessionId)
|
||||
.map(session -> UserManager.instance.extendUserSession(session.getUserId(), pingInfo))
|
||||
.map(session -> managerFactory.userManager().extendUserSession(session.getUserId(), pingInfo))
|
||||
.orElse(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void sendErrorMessageToClient(String sessionId, String message) {
|
||||
Session session = sessions.get(sessionId);
|
||||
if (session == null) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue