Console reading & Sending

Author: cyberpwnn

src/org/cyberpwn/react/AboutReact.java

@@ -10,7 +10,7 @@
 public class AboutReact
 {
 	private JFrame frame;
-	private String version = "2.3";
+	private String version = "2.4";
 
 	public AboutReact()
 	{

src/org/cyberpwn/react/network/NetworkedServer.java

@@ -153,8 +153,7 @@ public void run()
 				if(isOk())
 				{
 					sample = getData();
-					tab.push(sample);
-					
+					tab.push(sample, getConsole());
 				}
 			}
 		});

src/org/cyberpwn/react/network/Request.java

@@ -3,7 +3,6 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.net.Socket;
-
 import org.cyberpwn.react.util.GMap;
 import org.cyberpwn.react.util.JSONObject;
 
@@ -19,6 +18,7 @@ public Request(NetworkedServer ns, RequestCallback callback)
 		this.ns = ns;
 	}
 
+	@Override
 	public void run()
 	{
 		try
@@ -33,6 +33,7 @@ public void run()
 			String response = i.readUTF();
 			PacketResponse ps = new PacketResponse(new JSONObject(response));
 			GMap<String, Double> data = new GMap<String, Double>();
+			String console = "";
 
 			if(ps.getString("type").equals("OK"))
 			{
@@ -43,6 +44,13 @@ public void run()
 						continue;
 					}
 
+					if(j.equals("console-s"))
+					{
+						console = ps.getJSON().getString(j).replace("[0;36;1m", "").replace("[0;30;22m", "").replace("[0;34;22m", "").replace("[0;32;22m", "").replace("[0;36;22m", "").replace("[0;31;22m", "").replace("[0;35;22m", "").replace("[0;37;22m", "").replace("[0;34;1m", "").replace("[5m", "").replace("[21m", "").replace("[9m", "").replace("[4m", "").replace("[3m", "").replace("[0;33;22m", "").replace("[0;31;1m", "").replace("[0;35;1m", "").replace("[0;32;1m", "").replace("", "").replace("[0;33;1m", "").replace("[0;37;1m", "").replace("[0;30;1m", "").replace("", "").replace("", "").replace("", "").replace("[m", "");
+						
+						continue;
+					}
+					
 					try
 					{
 						data.put(j, ps.getJSON().getDouble(j));
@@ -54,10 +62,10 @@ public void run()
 					}
 				}
 
-				callback.run(data, true);
+				callback.run(data, console, true);
 			}
 
-			callback.run(data, false);
+			callback.run(data, console, false);
 		}
 
 		catch(Exception e)

src/org/cyberpwn/react/network/RequestCallback.java

@@ -6,11 +6,13 @@ public class RequestCallback implements Runnable
 {
 	private GMap<String, Double> data;
 	private boolean ok;
+	private String console;
 
-	public void run(GMap<String, Double> data, boolean ok)
+	public void run(GMap<String, Double> data, String console, boolean ok)
 	{
 		this.data = data;
 		this.ok = ok;
+		this.console = console;
 		run();
 	}
 
@@ -19,14 +21,19 @@ public void run()
 	{
 
 	}
-
+	
 	public GMap<String, Double> getData()
 	{
 		return data;
 	}
-
+	
 	public boolean isOk()
 	{
 		return ok;
 	}
+	
+	public String getConsole()
+	{
+		return console;
+	}
 }

src/org/cyberpwn/react/network/RequestCommand.java

@@ -0,0 +1,57 @@
+package org.cyberpwn.react.network;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.net.Socket;
+import org.cyberpwn.react.util.JSONObject;
+
+public class RequestCommand extends Thread
+{
+	private RequestCommandCallback callback;
+	private NetworkedServer ns;
+	private Socket s;
+	private String action;
+	
+	public RequestCommand(NetworkedServer ns, RequestCommandCallback callback, String action)
+	{
+		this.callback = callback;
+		this.ns = ns;
+		this.action = action;
+	}
+	
+	@Override
+	public void run()
+	{
+		try
+		{
+			System.out.println("Requesting Command: " + action);
+			s = new Socket(ns.getAddress(), ns.getPort());
+			s.setSoTimeout(500);
+			DataInputStream i = new DataInputStream(s.getInputStream());
+			DataOutputStream o = new DataOutputStream(s.getOutputStream());
+			PacketRequest pr = new PacketRequest(ns.getUsername(), ns.getPassword(), "COMMAND " + action);
+			System.out.println("OUT: " + pr.toString());
+			o.writeUTF(pr.toString());
+			o.flush();
+			String response = i.readUTF();
+			PacketResponse ps = new PacketResponse(new JSONObject(response));
+			System.out.println("IN: " + ps.toString());
+			Thread.sleep(50);
+			
+			if(ps.getString("type").equals("OK"))
+			{
+				callback.run(true);
+			}
+			
+			else
+			{
+				callback.run(false);
+			}
+		}
+		
+		catch(Exception e)
+		{
+			
+		}
+	}
+}

src/org/cyberpwn/react/network/RequestCommandCallback.java

@@ -0,0 +1,23 @@
+package org.cyberpwn.react.network;
+
+public class RequestCommandCallback implements Runnable
+{
+	private boolean ok;
+	
+	public void run(boolean ok)
+	{
+		this.ok = ok;
+		run();
+	}
+	
+	@Override
+	public void run()
+	{
+		
+	}
+	
+	public boolean isOk()
+	{
+		return ok;
+	}
+}

src/org/cyberpwn/react/ui/ServerTab.java

@@ -5,24 +5,32 @@
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import javax.swing.DefaultListModel;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
+import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
+import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
 import javax.swing.border.BevelBorder;
 import javax.swing.border.SoftBevelBorder;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import org.cyberpwn.react.ReactClient;
 import org.cyberpwn.react.network.NetworkedServer;
+import org.cyberpwn.react.network.RequestCommand;
+import org.cyberpwn.react.network.RequestCommandCallback;
 import org.cyberpwn.react.util.F;
 import org.cyberpwn.react.util.GList;
 import org.cyberpwn.react.util.GMap;
@@ -43,7 +51,10 @@ public class ServerTab implements ListSelectionListener, ActionListener
 	private JLabel label;
 	private JLabel label2;
 	private JLabel lblNewLabel;
+	private JCheckBox chckbxNewCheckBox;
 
+	private JScrollBar vertical;
+	private JTextArea textArea;
 	private JButton btnNewButton;
 	private JList<String> actionSet;
 	private DefaultListModel<String> actionList;
@@ -62,6 +73,7 @@ public class ServerTab implements ListSelectionListener, ActionListener
 
 	private Grapher MAH;
 	private GList<Double> DMAH;
+	private JTextField textField;
 
 	public ServerTab(JFrame frame, NetworkedServer server, JXTabbedPane tp)
 	{
@@ -275,22 +287,72 @@ public void mouseReleased(MouseEvent e)
 		panel_12.add(btnNewButton, "cell 1 2");
 
 		JPanel panel_3 = new JPanel();
-		tabbedPane_1.addTab("Problems", null, panel_3, null);
+		tabbedPane_1.addTab("Console", null, panel_3, null);
 		panel_3.setLayout(new MigLayout("", "[grow][grow]", "[grow][grow]"));
 
 		JPanel panel_18 = new JPanel();
 		panel_18.setBorder(new SoftBevelBorder(BevelBorder.RAISED, null, null, null, null));
 		panel_18.setBackground(Color.WHITE);
 		panel_3.add(panel_18, "cell 0 0 2 2,grow");
-		panel_18.setLayout(new MigLayout("", "[]", "[][]"));
-		
-		JLabel lblNoIssuesFound = new JLabel("No Issues Found (NOT YET IMPLEMENTED)");
-		lblNoIssuesFound.setFont(new Font("Segoe UI Light", Font.PLAIN, 35));
-		panel_18.add(lblNoIssuesFound, "cell 0 0");
+		panel_18.setLayout(new MigLayout("", "[grow]", "[grow][grow]"));
+		
+		textArea = new JTextArea();
+		textArea.setBackground(Color.DARK_GRAY);
+		textArea.setForeground(Color.WHITE);
+		textArea.setFont(new Font("Lucida Console", Font.PLAIN, 16));
+		textArea.setEditable(false);
+		
+		JScrollPane scrollConsole = new JScrollPane(textArea);
+		panel_18.add(scrollConsole, "cell 0 0,grow");
+		
+		textField = new JTextField();
+		textField.setFont(new Font("Segoe UI Light", Font.PLAIN, 14));
+		panel_18.add(textField, "flowx,cell 0 1,growx");
+		textField.setColumns(10);
+		textField.setDisabledTextColor(Color.RED);
+		textField.addKeyListener(new KeyListener()
+		{
+			@Override
+			public void keyTyped(KeyEvent e)
+			{
+				
+			}
+			
+			@Override
+			public void keyPressed(KeyEvent e)
+			{
+				
+			}
+			
+			@Override
+			public void keyReleased(KeyEvent e)
+			{
+				if(e.getKeyCode() == 10)
+				{
+					String command = textField.getText();
+					textField.setEnabled(false);
+					
+					new RequestCommand(ns, new RequestCommandCallback()
+					{
+						@Override
+						public void run()
+						{
+							textField.setEnabled(true);
+							textField.setText("");
+							textField.requestFocusInWindow();
+						}
+					}, command).start();
+				}
+			}
+		});
 
-		JLabel lblNewLabel_1 = new JLabel("Looks Like this server is doing fine for the moment!");
-		lblNewLabel_1.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
-		panel_18.add(lblNewLabel_1, "cell 0 1");
+		chckbxNewCheckBox = new JCheckBox("Follow Log");
+		chckbxNewCheckBox.setBackground(Color.WHITE);
+		chckbxNewCheckBox.setSelected(true);
+		chckbxNewCheckBox.setFont(new Font("Segoe UI Light", Font.PLAIN, 14));
+		panel_18.add(chckbxNewCheckBox, "cell 0 1");
+		vertical = scrollConsole.getVerticalScrollBar();
+		vertical.setValue(vertical.getMaximum());
 	}
 
 	public void pushStartedActions()
@@ -308,8 +370,18 @@ public void push(GList<String> actions)
 		}
 	}
 
-	public void push(GMap<String, Double> sample)
+	public void push(GMap<String, Double> sample, String console)
 	{
+		if(!textArea.getText().equals(console))
+		{
+			textArea.setText(console);
+			
+			if(chckbxNewCheckBox.isSelected())
+			{
+				textArea.setCaretPosition(textArea.getDocument().getLength());
+			}
+		}
+		
 		lblServerName.setText(ns.getName());
 		lblUsingSpigot.setText(ns.getVersion());
 		lblTps.setText(F.f(sample.get("tps"), 2) + " TPS (" + F.pc(sample.get("stability"), 0) + " Stable)");