Minecraft/asys
Archived
0
Fork 0
Code Activity

Merge branch 'dev-webconsole' into dev-zond

Browse Source 
# Conflicts:
#	bridge/build.gradle
#	bridge/src/main/java/asys/bridge/bukkit/BridgePlugin.java
#	bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java
This commit is contained in:
DmitriyMX
2017-06-14 21:34:15 +03:00
parent 3a3efc842a 2fca454179
commit 42000692fc
26 changed files with 478 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcserver-manager/build.gradle
View File

@@ -1,5 +1,5 @@
group = 'asys'
version = '0.8.13-SNAPSHOT'
version = '0.10.4-SNAPSHOT'
apply plugin: 'osgi'
@@ -8,6 +8,10 @@ configurations {
compile.extendsFrom include
}
compileJava {
dependsOn ':bridge-protocol:compileJava'
}
jar {
manifest {
name = 'ASys MC server manager'

9
mcserver-manager/src/main/java/asys/mcsmanager/Activator.java
View File

@@ -29,9 +29,7 @@ public class Activator implements BundleActivator, ServiceListener {
Config config = serviceConfigTracker.getService();
if (config == null) throw new RuntimeException("Service 'Config' is not avalable!");
Manager manager = new Manager();
module = new MCSM_WebModule(manager);
module = new MCSM_WebModule();
logger.debug("Get service: {}", Webinterface.class);
serviceTracker = new ServiceTracker<>(context, Webinterface.class, null);
@@ -44,13 +42,13 @@ public class Activator implements BundleActivator, ServiceListener {
String passcode = config.getString("asys.mcsmanager.passcode", "testpasscode");
logger.debug("Start server manager: {}:{}", host, port);
serverManager = new asys.mcsmanager.server.Server();
serverManager.start(host, port, passcode, manager);
serverManager.start(host, port, passcode);
host = config.getString("asys.mcsmanager.webconsole.host", "127.0.0.1");
port = config.getInt("asys.mcsmanager.webconsole.port", 8770);
logger.debug("Start webconsole server: {}:{}", host, port);
webconsoleServer = new asys.mcsmanager.websocket.Server();
webconsoleServer.start(host, port, manager);
webconsoleServer.start(host, port);
serviceConfigTracker.close();
}
@@ -82,7 +80,6 @@ public class Activator implements BundleActivator, ServiceListener {
logger.debug("service not found =(");
}
} catch (InterruptedException ignore) {
// ignore
}
}
}

84
mcserver-manager/src/main/java/asys/mcsmanager/Linker.java Normal file
View File

@@ -0,0 +1,84 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-05-01
*/
package asys.mcsmanager;
import asys.mcsmanager.packets.CS_ConsoleMessage;
import asys.mcsmanager.packets.SC_Command;
import asys.mcsmanager.packets.SC_ToggleSendMessages;
import io.netty.channel.Channel;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import java.util.*;
public class Linker {
private static Linker instance = new Linker();
private Map<String, ServerInfo> serverMap = new HashMap<>();
private Map<String, List<Channel>> webconsoleListeners = new HashMap<>();
public static Linker getInstance() {
return instance;
}
private Linker(){
}
public void addServer(String serverName, Channel channel) {
this.serverMap.put(serverName, new ServerInfo(serverName, channel));
}
public boolean existsServer(String serverName) {
return this.serverMap.containsKey(serverName);
}
public ServerInfo getServer(String serverName) {
return this.serverMap.get(serverName);
}
public Set<String> getServerList() {
return this.serverMap.keySet();
}
public void removeServer(String serverName) {
this.serverMap.remove(serverName);
if (this.webconsoleListeners.containsKey(serverName)) {
this.webconsoleListeners.get(serverName).forEach(Channel::close);
this.webconsoleListeners.remove(serverName);
}
}
public void addWebconsoleListener(String serverName, Channel channel) {
List<Channel> channels = this.webconsoleListeners.computeIfAbsent(serverName, v -> new ArrayList<>());
if (channels.size() == 0) {
this.serverMap.get(serverName).getChannel().writeAndFlush(new SC_ToggleSendMessages(true));
}
channels.add(channel);
}
public void removeWebconsoleListener(String serverName, Channel channel) {
List<Channel> channels = this.webconsoleListeners.get(serverName);
channels.remove(channel);
if (channels.size() == 0) {
this.serverMap.get(serverName).getChannel().writeAndFlush(new SC_ToggleSendMessages(false));
}
}
public void broadcastConsoleMessage(String serverName, CS_ConsoleMessage packet) {
if (this.webconsoleListeners.containsKey(serverName)) {
this.webconsoleListeners.get(serverName).forEach(channel -> {
channel.writeAndFlush(new TextWebSocketFrame(String.format(
"[L:%d] %s",
packet.getLevel(),
packet.getMessage()
)));
});
}
}
public void sendCommand(String serverName, String command) {
if (this.serverMap.containsKey(serverName)) {
this.serverMap.get(serverName).getChannel().writeAndFlush(new SC_Command(command));
}
}
}

9
mcserver-manager/src/main/java/asys/mcsmanager/MCSM_WebModule.java
View File

@@ -27,11 +27,6 @@ public class MCSM_WebModule extends WebModule {
private final String MODULE_URL = "/"+MODULE_NAME;
private final Pattern URL_PATTERN_JS = Pattern.compile(MODULE_URL+"/(\\w+)\\.js");
private final Pattern URL_PATTERN_CSS = Pattern.compile(MODULE_URL+"/(\\w+)\\.css");
private Manager manager;
MCSM_WebModule(Manager manager) {
this.manager = manager;
}
@Override
public String getName() {
@@ -89,7 +84,7 @@ public class MCSM_WebModule extends WebModule {
if (httpExchange.getRequestURI().getQuery() != null &&
!httpExchange.getRequestURI().getQuery().isEmpty()) {
Map<String, String> query = this.queryToMap(httpExchange.getRequestURI().getQuery());
ServerInfo serverInfo = manager.getInfo(query.get("clientid"));
ServerInfo serverInfo = Linker.getInstance().getServer(query.get("clientid"));
if (serverInfo == null) {
this.sendJson(httpExchange, "{}");
} else {
@@ -102,6 +97,6 @@ public class MCSM_WebModule extends WebModule {
}
private JsonElement serverList() {
return GSON.toJsonTree(manager.getServerList());
return GSON.toJsonTree(Linker.getInstance().getServerList());
}
}

96
mcserver-manager/src/main/java/asys/mcsmanager/Manager.java
View File

@@ -1,96 +0,0 @@
/*
* DmitriyMX <dimon550@gmail.com>
* 2017-05-01
*/
package asys.mcsmanager;
import asys.mcsmanager.packets.CS_ConsoleMessage;
import asys.mcsmanager.packets.CS_Ping;
import asys.mcsmanager.packets.SC_Command;
import io.netty.channel.Channel;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
public class Manager {
private Logger logger = LoggerFactory.getLogger(Manager.class);
private Map<String, ServerInfo> serversMap = new HashMap<>();
private Map<String, Channel> serverChannels = new HashMap<>();
private List<Channel> webconsoleListener = new ArrayList<>();
/**
* Добавляем в список ClientID
* @param clientId id сервера. Чувствителен к регистру
* @return <code>false</code>, если сервер с таким id уже имеется
*/
public boolean addClientId(String clientId, Channel channel) {
if (serversMap.containsKey(clientId)) {
return false;
}
logger.debug("addClientId: {}", clientId);
serversMap.put(clientId, new ServerInfo(clientId));
serverChannels.put(clientId, channel);
return true;
}
public void removeClientId(String clientId) {
if (clientId != null) {
serverChannels.remove(clientId);
}
}
public boolean sendCommand(String clientId, String command) {
/*
if (serverChannels.containsKey(clientId)) {
serverChannels.get(clientId).writeAndFlush(new SC_Command(command));
return true;
} else {
return false;
}
*/
//FIXME временный костыль
Channel channel = serverChannels.entrySet().iterator().next().getValue();
channel.writeAndFlush(new SC_Command(command));
return true;
}
/**
* Дополнить информация о сервере.
* Если сервер отсутствует в списке, информация будет потеряна.
* @param clientId id сервера. Чувствителен к регистру
* @param pingPacket
*/
public void putInfo(String clientId, CS_Ping pingPacket) {
if (!serversMap.containsKey(clientId)) return;
serversMap.get(clientId).putPing(pingPacket);
}
public Set<String> getServerList() {
return serversMap.keySet();
}
public ServerInfo getInfo(String clientId) {
return serversMap.get(clientId);
}
public void addWebConsoleListener(Channel channel) {
this.webconsoleListener.add(channel);
}
public void removeWebConsoleListener(Channel channel) {
this.webconsoleListener.remove(channel);
}
public void sendBroadcastToWebConsoleListeners(CS_ConsoleMessage message) {
for (Channel channel : this.webconsoleListener) {
channel.writeAndFlush(new TextWebSocketFrame(String.format(
"[L:%d] %s",
message.getLevel(),
message.getMessage()
)));
}
}
}

12
mcserver-manager/src/main/java/asys/mcsmanager/ServerInfo.java
View File

@@ -5,6 +5,7 @@
package asys.mcsmanager;
import asys.mcsmanager.packets.CS_Ping;
import io.netty.channel.Channel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,18 +15,23 @@ import java.util.LinkedList;
public class ServerInfo {
private final Logger logger = LoggerFactory.getLogger(ServerInfo.class);
private final String name;
private Channel channel;
private int lastOnline;
private Deque<CS_Ping> pingDeque;
private Deque<CS_Ping> pingDeque = new LinkedList<>();
public ServerInfo(String name) {
public ServerInfo(String name, Channel channel) {
this.name = name;
this.pingDeque = new LinkedList<>();
this.channel = channel;
}
public String getName() {
return name;
}
public Channel getChannel() {
return channel;
}
public int getLastOnline() {
return lastOnline;
}

5
mcserver-manager/src/main/java/asys/mcsmanager/server/Server.java
View File

@@ -4,7 +4,6 @@
*/
package asys.mcsmanager.server;
import asys.mcsmanager.Manager;
import asys.mcsmanager.packets.CS_Ping;
import asys.mcsmanager.packets.Packet;
import asys.mcsmanager.packets.codec.PacketDecoder;
@@ -25,11 +24,9 @@ public class Server {
);
private EventLoopGroup bossGroup, workerGroup;
static String passcode;
static Manager manager;
public void start(String host, int port, String passcode, Manager manager) {
public void start(String host, int port, String passcode) {
Server.passcode = passcode;
Server.manager = manager;
bossGroup = new NioEventLoopGroup(1);
workerGroup = new NioEventLoopGroup();

25
mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java
View File

@@ -4,6 +4,7 @@
*/
package asys.mcsmanager.server;
import asys.mcsmanager.Linker;
import asys.mcsmanager.packets.*;
import com.google.common.collect.BiMap;
import com.google.common.collect.ImmutableBiMap;
@@ -17,7 +18,6 @@ import java.util.Map;
import static asys.mcsmanager.packets.codec.Params.KNOWN_HANDLERS;
import static asys.mcsmanager.packets.codec.Params.KNOWN_PACKETS;
import static asys.mcsmanager.server.Server.manager;
class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacketHandler {
private static final BiMap<Integer, Class<? extends Packet>> handshakePackets = ImmutableBiMap.of(
@@ -26,10 +26,11 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke
);
private static Map<Class<? extends Packet>, IPacketHandler> handshakeHandlers;
private static final BiMap<Integer, Class<? extends Packet>> pingPackets = ImmutableBiMap.of(
private static final BiMap<Integer, Class<? extends Packet>> knownPackets = ImmutableBiMap.of(
3, CS_Ping.class,
4, CS_ConsoleMessage.class,
5, SC_Command.class
5, SC_Command.class,
6, SC_ToggleSendMessages.class
);
private static Map<Class<? extends Packet>, IPacketHandler> pingHandlers;
@@ -59,7 +60,7 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke
@Override
public void channelInactive(ChannelHandlerContext context) throws Exception {
manager.removeClientId(context.channel().attr(CLIENTID).get());
Linker.getInstance().removeServer(context.channel().attr(CLIENTID).get());
super.channelInactive(context);
}
@@ -70,7 +71,7 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke
} else if (packet.getClass() == CS_Ping.class) {
handleCSPing((CS_Ping) packet, context);
} else if (packet.getClass() == CS_ConsoleMessage.class) {
handleCSConsoleMessage((CS_ConsoleMessage) packet);
handleCSConsoleMessage(context.channel().attr(CLIENTID).get(), (CS_ConsoleMessage) packet);
}
}
@@ -79,32 +80,32 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke
try {
context.channel().writeAndFlush(HandshakeResult.INVALID_PASSCODE).sync().channel().close();
} catch (InterruptedException ignore) {
// ignore
}
return;
}
if (!manager.addClientId(packet.getClientId(), context.channel())) {
if (Linker.getInstance().existsServer(packet.getClientId())) {
try {
context.channel().writeAndFlush(HandshakeResult.CLIENTID_EXISTS).sync().channel().close();
} catch (InterruptedException ignore) {
// ignore
}
return;
} else {
Linker.getInstance().addServer(packet.getClientId(), context.channel());
}
context.channel().write(HandshakeResult.OK);
context.channel().attr(CLIENTID).set(packet.getClientId());
context.channel().attr(KNOWN_PACKETS).set(pingPackets);
context.channel().attr(KNOWN_PACKETS).set(knownPackets);
context.channel().attr(KNOWN_HANDLERS).set(pingHandlers);
context.channel().flush();
}
private void handleCSPing(CS_Ping packet, ChannelHandlerContext context) {
manager.putInfo(context.channel().attr(CLIENTID).get(), packet);
Linker.getInstance().getServer(context.channel().attr(CLIENTID).get()).putPing(packet);
}
private void handleCSConsoleMessage(CS_ConsoleMessage packet) {
manager.sendBroadcastToWebConsoleListeners(packet);
private void handleCSConsoleMessage(String serverName, CS_ConsoleMessage packet) {
Linker.getInstance().broadcastConsoleMessage(serverName, packet);
}
}

23
mcserver-manager/src/main/java/asys/mcsmanager/websocket/FrameHandler.java
View File

@@ -4,36 +4,35 @@
*/
package asys.mcsmanager.websocket;
import asys.mcsmanager.Linker;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import io.netty.handler.codec.http.websocketx.WebSocketFrame;
import io.netty.util.AttributeKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static asys.mcsmanager.websocket.Server.manager;
public class FrameHandler extends SimpleChannelInboundHandler<WebSocketFrame> {
private static final AttributeKey<String> WC_SERVERNAME = AttributeKey.valueOf("WC_SERVERNAME");
private final Logger logger = LoggerFactory.getLogger(FrameHandler.class);
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
manager.addWebConsoleListener(ctx.channel());
super.channelActive(ctx);
}
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception {
manager.removeWebConsoleListener(ctx.channel());
Linker.getInstance().removeWebconsoleListener(ctx.channel().attr(WC_SERVERNAME).get(), ctx.channel());
}
@Override
protected void channelRead0(ChannelHandlerContext ctx, WebSocketFrame frame) throws Exception {
if (frame instanceof TextWebSocketFrame) {
String requestText = ((TextWebSocketFrame)frame).text();
if (requestText.startsWith(":")) {
//FIXME убрать костыли
manager.sendCommand(null, requestText.substring(1));
if (requestText.startsWith("]")) {
String serverName = requestText.substring(1);
ctx.channel().attr(WC_SERVERNAME).set(serverName);
Linker.getInstance().addWebconsoleListener(serverName, ctx.channel());
} else if (requestText.startsWith(":")) {
String command = requestText.substring(1);
Linker.getInstance().sendCommand(ctx.channel().attr(WC_SERVERNAME).get(), command);
}
} else {
logger.warn("unsupport frame type: {}", frame.getClass().getName());

5
mcserver-manager/src/main/java/asys/mcsmanager/websocket/Server.java
View File

@@ -4,7 +4,6 @@
*/
package asys.mcsmanager.websocket;
import asys.mcsmanager.Manager;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.EventLoopGroup;
@@ -16,11 +15,9 @@ import io.netty.handler.codec.http.HttpServerCodec;
import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler;
public class Server {
static Manager manager;
private EventLoopGroup bossGroup, workerGroup;
public void start(String host, int port, Manager manager) {
Server.manager = manager;
public void start(String host, int port) {
bossGroup = new NioEventLoopGroup(1);
workerGroup = new NioEventLoopGroup();

57
mcserver-manager/src/main/resources/components.js
View File

@@ -76,26 +76,34 @@ var ScrollingContent = React.createClass({
ownHeight: 0,
scrollRatio: 0,
lastPageY: 0,
autoScroll: true,
updateScrollParams: function () {
this.totalHeight = this.refs.content.scrollHeight;
this.ownHeight = this.refs.content.clientHeight;
this.scrollRatio = this.ownHeight / this.totalHeight;
if (isNaN(this.scrollRatio)) this.scrollRatio = 0;
this.refs.scroll.style.height = this.scrollRatio * 100 + "%";
this.refs.scroll.style.top = (this.refs.content.scrollTop / this.totalHeight) * 100 + "%";
var h = this.scrollRatio * 100;
if (h < 100) {
if (this.autoScroll) {
this.refs.content.scrollTop = this.totalHeight;
}
this.refs.scroll.style.height = h + "%";
this.refs.scroll.style.top = (this.refs.content.scrollTop / this.totalHeight) * 100 + "%";
}
},
toggleSelect: function (value, event) { return value; },
handleScrollMouseDown: function (event) {
handleMouseDown: function (event) {
this.lastPageY = event.pageY;
document.body.classList.add('scroll-grabbed');
this.refs.scroll.classList.add('scroll-grabbed');
document.onselectstart = this.toggleSelect.bind(null, false);
document.addEventListener('mousemove', this.handleScrollMouseMove);
document.addEventListener('mouseup', this.handleScrollMouseUp);
document.addEventListener('mousemove', this.handleMouseMove);
document.addEventListener('mouseup', this.handleMouseUp);
},
handleScrollMouseMove: function (event) {
handleMouseMove: function (event) {
var delta = event.pageY - this.lastPageY;
this.lastPageY = event.pageY;
@@ -105,18 +113,25 @@ var ScrollingContent = React.createClass({
_this.refs.scroll.style.top = (_this.refs.content.scrollTop / _this.totalHeight) * 100 + "%";
});
},
handleScrollMouseUp: function (event) {
handleMouseUp: function (event) {
document.body.classList.remove('scroll-grabbed');
this.refs.scroll.classList.remove('scroll-grabbed');
document.onselectstart = this.toggleSelect.bind(null, true);
document.removeEventListener('mousemove', this.handleScrollMouseMove);
document.removeEventListener('mouseup', this.handleScrollMouseUp);
document.removeEventListener('mousemove', this.handleMouseMove);
document.removeEventListener('mouseup', this.handleMouseUp);
},
handleScroll: function (event) {
var zH = this.refs.gencon.offsetHeight;
var bottomPoint = ((this.refs.content.scrollTop / this.totalHeight) * zH) +
(this.scrollRatio * zH);
this.autoScroll = (bottomPoint === zH);
},
/*--------------------*/
render: function () {
return (
ce('div', {className: this.props.className},
ce('div', {className: this.props.className, ref: 'gencon'},
ce('div', {className: 'wrapper'},
ce('div', {className: 'content', ref: 'content'}, this.props.children)
),
@@ -126,7 +141,8 @@ var ScrollingContent = React.createClass({
},
componentDidMount: function () {
this.updateScrollParams();
this.refs.scroll.addEventListener('mousedown', this.handleScrollMouseDown);
this.refs.scroll.addEventListener('mousedown', this.handleMouseDown);
this.refs.content.addEventListener('scroll', this.handleScroll);
var _this = this;
this.refs.content.addEventListener('scroll', function(){
@@ -142,12 +158,15 @@ var ScrollingContent = React.createClass({
var WebConsole = React.createClass({
ws: null,
connect: function(){
connect: function(serverName){
if (this.ws !== null) return;
var _this = this;
this.ws = new WebSocket("ws://127.0.0.1:8770"); //FIXME указывать ip:port из настроек
this.ws.onopen = function(){ console.debug('WS: open...'); };
this.ws.onopen = function(){
console.debug('WS: open...');
_this.ws.send(']'+serverName);
};
this.ws.onclose = function(){ console.debug('WS: close...'); };
this.ws.onerror = function(e){ console.debug('WS: error'); console.error(e); };
this.ws.onmessage = function(event){
@@ -195,7 +214,7 @@ var WebConsole = React.createClass({
var ServerInfo = React.createClass({
tabStateWebConsole: function(state) {
if (state === 1) {
this.refs.webconsole.connect();
this.refs.webconsole.connect(this.state.title);
this.refs.webconsole.focusInput();
}
},
@@ -211,7 +230,7 @@ var ServerInfo = React.createClass({
return(
ce('div', null,
ce('h2', {style: {'margin-top': '0px'}}, this.state.title),
ce(Tabs, {tabs: ['Онлайн', 'Консоль'], stateCallback: this.tabStateWebConsole},
ce(Tabs, {tabs: ['Онлайн', 'Консоль'], stateCallback: this.tabStateWebConsole, ref: 'tabs'},
ce(NvLineChart, {datum: [{
key: 'Online players',
color: '#37d668',
@@ -223,6 +242,14 @@ var ServerInfo = React.createClass({
)
)
}
},
componentWillUpdate: function(nextProps, nextState) {
if (this.state.title === null) return;
if (this.state.title !== nextState.title) {
this.refs.webconsole.disconnect();
this.refs.webconsole.setState({lines: []});
this.refs.tabs.setState({activeTab: 0});
}
}
});

4
mcserver-manager/src/main/resources/module.js
View File

@@ -79,8 +79,8 @@ var ContentModule = React.createClass({
});
element = ce('div', {className: 'row'},
ce('div', {className: 'col-md-4'}, ce(ServerList, null, serverListItems)),
ce('div', {className: 'col-md-8'}, ce(ServerInfo, {ref: "serverInfo"}))
ce('div', {className: 'col-md-3'}, ce(ServerList, null, serverListItems)),
ce('div', {className: 'col-md-9'}, ce(ServerInfo, {ref: "serverInfo"}))
);
} else if (this.state.nvScriptReady < 0) {
element = ce('span', null, 'error');