Finalize

Author: cyberpwnn

src/org/cyberpwn/react/ReactClient.java

@@ -25,6 +25,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.cyberpwn.react.network.Network;
+import org.cyberpwn.react.network.NetworkScheduler;
 import org.cyberpwn.react.network.NetworkedServer;
 import org.cyberpwn.react.ui.AbstractTabRenderer;
 import org.cyberpwn.react.ui.JXTabbedPane;
@@ -34,7 +35,7 @@
 public class ReactClient
 {
 	private final Network network;
-	
+	private NetworkScheduler ns;
 	private JFrame frmReactClient;
 	private static ReactClient instance;
 	public JXTabbedPane tabbedPane;
@@ -66,6 +67,8 @@ public ReactClient()
 
 		this.network = new Network();
 		initialize();
+		ns = new NetworkScheduler(network.getServers(), 500);
+		ns.start();
 	}
 
 	private void initialize()
@@ -190,6 +193,7 @@ public void showTutorial()
 
 	public static void restart()
 	{
+		instance.ns.interrupt();
 		Dimension d = instance.frmReactClient.getSize();
 		Point p = instance.frmReactClient.getLocationOnScreen();
 		instance.frmReactClient.setVisible(false);
@@ -207,6 +211,7 @@ public void addTab(String name)
 
 	public void exit()
 	{
+		ns.interrupt();
 		System.exit(0);
 	}
 

src/org/cyberpwn/react/ServerTab.java

@@ -18,17 +18,34 @@
 import javax.swing.border.SoftBevelBorder;
 
 import org.cyberpwn.react.network.NetworkedServer;
+import org.cyberpwn.react.ui.Grapher;
 import org.cyberpwn.react.ui.JXTabbedPane;
+import org.cyberpwn.react.util.F;
+import org.cyberpwn.react.util.GList;
+import org.cyberpwn.react.util.GMap;
 
 import net.miginfocom.swing.MigLayout;
 
 public class ServerTab
 {
 	private NetworkedServer ns;
 
+	private JLabel lblTps;
+	private JLabel lblMbUsed;
+	private JLabel lblGcminute;
+	private JLabel lblMahs;
+	private JLabel lblUsingSpigot;
+	private JLabel lblOnline;
+	private JLabel lblmsPing;
+	
+	private JPanel TPS;
+	private Grapher GTPS;
+	private GList<Double> DTPS;
+	
 	public ServerTab(JFrame frame, NetworkedServer server, JXTabbedPane tabbedPane)
 	{
 		this.ns = server;
+		this.DTPS = new GList<Double>().qadd(20.0);
 
 		JPanel panel = new JPanel();
 		tabbedPane.addTab(ns.getName(), new ImageIcon(ReactClient.class.getResource("/org/cyberpwn/react/ui/server-mini.png")), panel, null);
@@ -52,21 +69,17 @@ public ServerTab(JFrame frame, NetworkedServer server, JXTabbedPane tabbedPane)
 		lblServerName.setFont(new Font("Segoe UI Light", Font.PLAIN, 35));
 		panel_5.add(lblServerName, "cell 0 0");
 
-		JLabel lblUsingSpigot = new JLabel("Using Spigot 1.8.8");
+		lblUsingSpigot = new JLabel("Using Spigot 1.8.8");
 		lblUsingSpigot.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
 		panel_5.add(lblUsingSpigot, "cell 0 1");
 
-		JLabel lblOnline = new JLabel("146 Players Online");
+		lblOnline = new JLabel("146 Players Online");
 		lblOnline.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
 		panel_5.add(lblOnline, "cell 0 2");
 
-		JLabel lblHours = new JLabel("7 Hours Uptime");
-		lblHours.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
-		panel_5.add(lblHours, "cell 0 3");
-		
-		JLabel lblmsPing = new JLabel("43 Plugins");
+		lblmsPing = new JLabel("43 Plugins");
 		lblmsPing.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
-		panel_5.add(lblmsPing, "cell 0 4");
+		panel_5.add(lblmsPing, "cell 0 3");
 
 		JPanel panel_8 = new JPanel();
 		panel_8.setBorder(new SoftBevelBorder(BevelBorder.RAISED, null, null, null, null));
@@ -120,14 +133,16 @@ public void mouseReleased(MouseEvent e)
 		lblCpuLoad.setFont(new Font("Segoe UI Light", Font.PLAIN, 35));
 		panel_7.add(lblCpuLoad, "flowx,cell 0 0");
 
-		JLabel lblTps = new JLabel("20 TPS (99% Stable)");
+		lblTps = new JLabel("20 TPS (99% Stable)");
 		lblTps.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
 		panel_7.add(lblTps, "cell 1 0");
 
-		JPanel panel_10 = new JPanel();
-		panel_10.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null, null, null, null));
-		panel_10.setBackground(Color.DARK_GRAY);
-		panel_7.add(panel_10, "cell 0 1 2 2,grow");
+		TPS = new JPanel();
+		TPS.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null, null, null, null));
+		TPS.setBackground(Color.DARK_GRAY);
+		panel_7.add(TPS, "cell 0 1 2 2,grow");
+		GTPS = new Grapher(TPS.getWidth(), TPS.getHeight(), 20, Color.CYAN, new GList<Double>().qadd(1.0));
+		TPS.add(GTPS);
 
 		JPanel panel_13 = new JPanel();
 		tabbedPane_2.addTab("Memory", null, panel_13, null);
@@ -143,7 +158,7 @@ public void mouseReleased(MouseEvent e)
 		lblMemory.setFont(new Font("Segoe UI Light", Font.PLAIN, 35));
 		panel_14.add(lblMemory, "cell 0 0");
 
-		JLabel lblMbUsed = new JLabel("683 MB Used");
+		lblMbUsed = new JLabel("683 MB Used");
 		lblMbUsed.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
 		panel_14.add(lblMbUsed, "cell 1 0");
 
@@ -162,7 +177,7 @@ public void mouseReleased(MouseEvent e)
 		lblGarbage.setFont(new Font("Segoe UI Light", Font.PLAIN, 35));
 		panel_16.add(lblGarbage, "cell 0 0");
 
-		JLabel lblGcminute = new JLabel("9 GC/Minute");
+		lblGcminute = new JLabel("9 GC/Minute");
 		lblGcminute.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
 		panel_16.add(lblGcminute, "cell 1 0");
 
@@ -181,7 +196,7 @@ public void mouseReleased(MouseEvent e)
 		lblState.setFont(new Font("Segoe UI Light", Font.PLAIN, 35));
 		panel_15.add(lblState, "cell 0 0");
 
-		JLabel lblMahs = new JLabel("264 MAH/s");
+		lblMahs = new JLabel("264 MAH/s");
 		lblMahs.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
 		panel_15.add(lblMahs, "cell 1 0");
 
@@ -210,7 +225,7 @@ public void mouseReleased(MouseEvent e)
 		list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		panel_12.add(list, "cell 0 1 2 1,grow");
 
-		JLabel lblNewLabel = new JLabel("Executing \"Purge Chunks\" (33%)");
+		JLabel lblNewLabel = new JLabel("Not Yet Implemented");
 		lblNewLabel.setFont(new Font("Segoe UI Light", Font.PLAIN, 18));
 		panel_12.add(lblNewLabel, "cell 0 2");
 
@@ -228,13 +243,51 @@ public void mouseReleased(MouseEvent e)
 		panel_3.add(panel_18, "cell 0 0 2 2,grow");
 		panel_18.setLayout(new MigLayout("", "[]", "[][]"));
 
-		JLabel lblNoIssuesFound = new JLabel("No Issues Found");
+		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");
 
 		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");
+	}
+
+	public void push(GMap<String, Double> sample)
+	{
+		lblUsingSpigot.setText("Using " + ns.getVersionBukkit());
+		lblTps.setText(F.f(sample.get("tps"), 2) + " TPS (" + F.pc(sample.get("stability"), 0) + " Stable)");
+		lblGcminute.setText(F.f(sample.get("spms")) + " GC/Minute");
+		lblMahs.setText(F.f(sample.get("mah/s")) + " MAH/s");
+		lblMbUsed.setText(F.mem(sample.get("mem").longValue()) + " Used");
+		lblOnline.setText(F.f(sample.get("plr")) + " Players Online");
+		lblmsPing.setText(F.f(sample.get("plg")) + " Loaded Plugins");
+		
+		DTPS.add(sample.get("tps"));
 
+		if(DTPS.size() > 64)
+		{
+			DTPS.remove(0);
+		}
+		
+		GTPS.setWidth(TPS.getWidth());
+		GTPS.setHeight(TPS.getHeight());
+		GTPS.setData(DTPS);
+		GTPS.repaint();
+		TPS.repaint();
 	}
+	
+	/*
+			>> liq/s : 0.0
+			>> tnt/s : 0.0
+			>> drops : 31.0
+			>> hist : 1.0
+			>> chk/s : 10.6
+			>> rct : 501220.2773345846
+			>> red/s : 0.0
+			>> chunks : 0.0
+			>> mb/p : 29.857142857142858
+			>> ents : 190.0
+			>> cgen/s : 2.0
+			>> chunkmem : 0.0
+	 */
 }

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

@@ -0,0 +1,36 @@
+package org.cyberpwn.react.network;
+
+import org.cyberpwn.react.util.GList;
+
+public class NetworkScheduler extends Thread
+{
+	private GList<NetworkedServer> ns;
+	private long ms;
+	
+	public NetworkScheduler(GList<NetworkedServer> ns, long ms)
+	{
+		this.ns = ns;
+		this.ms = ms;
+	}
+	
+	public void run()
+	{
+		while(!interrupted())
+		{
+			for(NetworkedServer i : ns)
+			{
+				i.requestSample();
+			}
+			
+			try
+			{
+				Thread.sleep(ms);
+			} 
+			
+			catch(InterruptedException e)
+			{
+				break;
+			}
+		}
+	}
+}

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

@@ -14,6 +14,9 @@ public class NetworkedServer
 	private Integer port;
 	private GMap<String, Double> sample;
 	private ServerTab tab;
+	private Request rx;
+	private String version;
+	private String versionBukkit;
 
 	public NetworkedServer(String name, String username, String password, String address, Integer port)
 	{
@@ -24,6 +27,9 @@ public NetworkedServer(String name, String username, String password, String add
 		this.tab = null;
 		this.port = port;
 		this.sample = new GMap<String, Double>();
+		this.rx = null;
+		this.version = null;
+		this.versionBukkit = null;
 	}
 
 	public NetworkedServer(JSONObject js)
@@ -52,16 +58,39 @@ public void toJson(JSONArray parent)
 
 	public void requestSample()
 	{
-		new Request(this, new RequestCallback()
+		if(version == null || versionBukkit == null)
+		{
+			new RequestBasic(this, new RequestCallbackBasic()
+			{
+				public void run()
+				{
+					if(isOk())
+					{
+						version = getData().get("version");
+						versionBukkit = getData().get("version-bukkit");
+					}
+				}
+			}).start();
+		}
+		
+		if(rx != null && rx.isAlive())
+		{
+			return;
+		}
+		
+		rx = new Request(this, new RequestCallback()
 		{
 			public void run()
 			{
 				if(isOk())
 				{
 					sample = getData();
+					tab.push(sample);
 				}
 			}
 		});
+		
+		rx.start();
 	}
 
 	public String getName()
@@ -123,14 +152,29 @@ public void setSample(GMap<String, Double> sample)
 	{
 		this.sample = sample;
 	}
-
+	
 	public ServerTab getTab()
 	{
 		return tab;
 	}
-
+	
 	public void setTab(ServerTab tab)
 	{
 		this.tab = tab;
 	}
+
+	public Request getRx()
+	{
+		return rx;
+	}
+
+	public String getVersion()
+	{
+		return version;
+	}
+
+	public String getVersionBukkit()
+	{
+		return versionBukkit;
+	}
 }

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

@@ -2,5 +2,5 @@
 
 public enum PacketRequestType
 {
-	GET_ACTIONS, GET_SAMPLES;
+	GET_ACTIONS, GET_SAMPLES, GET_BASIC;
 }

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

@@ -4,6 +4,7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
 import org.cyberpwn.react.util.GMap;
@@ -26,11 +27,14 @@ public void run()
 		try
 		{
 			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(), PacketRequestType.GET_SAMPLES.toString());
 			o.writeUTF(pr.toString());
-			PacketResponse ps = new PacketResponse(new JSONObject(i.readUTF()));
+			o.flush();
+			String response = i.readUTF();
+			PacketResponse ps = new PacketResponse(new JSONObject(response));
 			GMap<String, Double> data = new GMap<String, Double>();
 
 			if(ps.getString("type").equals("OK"))
@@ -49,7 +53,7 @@ public void run()
 
 					catch(Exception e)
 					{
-						
+						e.printStackTrace();
 					}
 				}
 
@@ -62,7 +66,12 @@ public void run()
 		catch(UnknownHostException e)
 		{
 			e.printStackTrace();
-		} 
+		}
+		
+		catch(SocketTimeoutException e)
+		{
+			e.printStackTrace();
+		}
 
 		catch(IOException e)
 		{