Allow starting and stopping connections to the assistant

src/main/java/mpo/dayon/assisted/gui/Assisted.java

@@ -6,12 +6,9 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.File;
 import java.io.IOException;
-import java.net.SocketException;
+import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
-import javax.net.ssl.*;
 import javax.swing.*;
 
 import mpo.dayon.assisted.capture.CaptureEngine;
@@ -24,6 +21,7 @@ import mpo.dayon.assisted.control.RobotNetworkControlMessageHandler;
 import mpo.dayon.assisted.mouse.MouseEngine;
 import mpo.dayon.assisted.network.NetworkAssistedEngine;
 import mpo.dayon.assisted.network.NetworkAssistedEngineConfiguration;
+import mpo.dayon.assisted.network.NetworkAssistedEngineListener;
 import mpo.dayon.common.babylon.Babylon;
 import mpo.dayon.common.error.FatalErrorHandler;
 import mpo.dayon.common.error.KeyboardErrorHandler;
@@ -32,7 +30,6 @@ import mpo.dayon.common.gui.common.DialogFactory;
 import mpo.dayon.common.log.Log;
 import mpo.dayon.common.network.NetworkEngine;
 import mpo.dayon.common.network.message.*;
-import mpo.dayon.common.security.CustomTrustManager;
 import mpo.dayon.common.utils.FileUtilities;
 import mpo.dayon.common.utils.SystemUtilities;
 
@@ -45,6 +42,10 @@ public class Assisted implements Subscriber, ClipboardOwner {
 
     private CompressorEngine compressorEngine;
 
+    private NetworkAssistedEngine networkEngine;
+
+    private boolean coldStart = true;
+
     public void configure() {
         final String lnf = SystemUtilities.getDefaultLookAndFeel();
         try {
@@ -54,76 +55,58 @@ public class Assisted implements Subscriber, ClipboardOwner {
         }
     }
 
-	public void start(String serverName, String portNumber) {
+    /**
-		frame = new AssistedFrame();
+     * Returns true if we have a valid configuration
-
+     */
-		FatalErrorHandler.attachFrame(frame);
+    public boolean start(String serverName, String portNumber) {
-		KeyboardErrorHandler.attachFrame(frame);
+        Log.info("Assisted start");
-
-		frame.setVisible(true);
-
-		// accept own cert, avoid PKIX path building exception
-		SSLContext sc = null;
-		try {
-			sc = SSLContext.getInstance("TLS");
-			sc.init(null, new TrustManager[] { new CustomTrustManager() }, null);
-		} catch (NoSuchAlgorithmException | KeyManagementException e) {
-			Log.error(e.getMessage());
-			System.exit(1);
-		}
-		HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
 
         // these should not block as they are called from the network incoming message thread (!)
         final NetworkCaptureConfigurationMessageHandler captureConfigurationHandler = this::onCaptureEngineConfigured;
         final NetworkCompressorConfigurationMessageHandler compressorConfigurationHandler = this::onCompressorEngineConfigured;
         final NetworkClipboardRequestMessageHandler clipboardRequestHandler = this::onClipboardRequested;
-		final NetworkControlMessageHandler controlHandler = new RobotNetworkControlMessageHandler();
 
+        final NetworkControlMessageHandler controlHandler = new RobotNetworkControlMessageHandler();
         controlHandler.subscribe(this);
 
-		final NetworkAssistedEngine networkEngine = new NetworkAssistedEngine(captureConfigurationHandler, compressorConfigurationHandler, controlHandler, clipboardRequestHandler, this);
+        networkEngine = new NetworkAssistedEngine(captureConfigurationHandler, compressorConfigurationHandler, controlHandler, clipboardRequestHandler, this);
+        networkEngine.addListener(new MyNetworkAssistedEngineListener());
 
-		boolean connected = false;
+        if (frame == null) {
-
+            frame = new AssistedFrame(new AssistedStartAction(this), new AssistedStopAction(this));
-		while (!connected) {
+            FatalErrorHandler.attachFrame(frame);
-			configureConnection(serverName, portNumber);
+            KeyboardErrorHandler.attachFrame(frame);
-			frame.onConnecting(configuration);
+            frame.setVisible(true);
-			networkEngine.configure(configuration);
-			try {
-				networkEngine.start();
-				connected = true;
-			} catch (SocketException e) {
-				frame.onRefused(configuration);
-				serverName = null;
-				portNumber = null;
-			} catch (NoSuchAlgorithmException | IOException | KeyManagementException e) {
-				FatalErrorHandler.bye(e.getMessage(), e);
         }
-		}
+        return configureConnection(serverName, portNumber);
-		networkEngine.sendHello();
-		frame.onConnected();
     }
 
-	private void configureConnection(String serverName, String portNumber) {
+    private boolean configureConnection(String serverName, String portNumber) {
         if (SystemUtilities.isValidIpAddressOrHostName(serverName) && SystemUtilities.isValidPortNumber(portNumber)) {
+            coldStart = false;
             configuration = new NetworkAssistedEngineConfiguration(serverName, Integer.parseInt(portNumber));
-		} else {
+            Log.info("Configuration from cli params" + configuration);
-			configuration = new NetworkAssistedEngineConfiguration();
+            networkEngine.configure(configuration);
+            networkEngine.connect();
+            return true;
+        }
 
         final String ip = SystemUtilities.getStringProperty(null, "dayon.assistant.ipAddress", null);
         final int port = SystemUtilities.getIntProperty(null, "dayon.assistant.portNumber", -1);
-
+        if (ip != null && port > -1) {
-			if ((ip == null || port == -1) && !requestConnectionSettings()) {
+            configuration = new NetworkAssistedEngineConfiguration(ip, port);
-				Log.info("Bye!");
+        } else {
-				System.exit(0);
+            configuration = new NetworkAssistedEngineConfiguration();
-			}
-		}
-		Log.info("Configuration " + configuration);
         }
 
-	@Override
+        // no network settings dialogue
-	public void lostOwnership(Clipboard clipboard, Transferable transferable) {
+        if (coldStart) {
-		Log.error("Lost clipboard ownership");
+            coldStart = false;
+            return true;
+        }
+
+        coldStart = false;
+        return requestConnectionSettings();
     }
 
     private boolean requestConnectionSettings() {
@@ -169,10 +152,47 @@ public class Assisted implements Subscriber, ClipboardOwner {
                 configuration = xconfiguration;
                 configuration.persist();
             }
+            Log.info("Configuration " + configuration);
+        } else {
+            // cancel
+            frame.onReady();
         }
         return ok;
     }
 
+    boolean start() {
+        // triggers network settings dialogue
+        return start(null, null);
+    }
+
+    void connect() {
+        frame.onConnecting(configuration.getServerName(), configuration.getServerPort());
+        networkEngine.configure(configuration);
+        networkEngine.connect();
+    }
+
+    void stop() {
+        Log.info("Assisted stop");
+        if (captureEngine != null) {
+            captureEngine.stop();
+            captureEngine = null;
+        }
+        if (compressorEngine != null) {
+            compressorEngine.stop();
+            compressorEngine = null;
+        }
+        if (networkEngine != null) {
+            networkEngine.cancel();
+            networkEngine = null;
+        }
+        frame.onDisconnecting();
+    }
+
+    @Override
+    public void lostOwnership(Clipboard clipboard, Transferable transferable) {
+        Log.error("Lost clipboard ownership");
+    }
+
     private MouseAdapter clearTextOnDoubleClick(JTextField textField) {
         return new MouseAdapter() {
             @Override
@@ -190,15 +210,12 @@ public class Assisted implements Subscriber, ClipboardOwner {
     private void onCaptureEngineConfigured(NetworkEngine engine, NetworkCaptureConfigurationMessage configuration) {
         final CaptureEngineConfiguration captureEngineConfiguration = configuration.getConfiguration();
 
-		Log.info("Capture configuration received " + captureEngineConfiguration);
-
         if (captureEngine != null) {
+            Log.info("Capture configuration received " + captureEngineConfiguration);
             captureEngine.reconfigure(captureEngineConfiguration);
             return;
         }
 
-		// First time we receive a configuration from the assistant (!)
-
         // Setup the mouse engine (no need before I guess)
         final MouseEngine mouseEngine = new MouseEngine();
         mouseEngine.addListener((NetworkAssistedEngine) engine);
@@ -206,11 +223,9 @@ public class Assisted implements Subscriber, ClipboardOwner {
 
         captureEngine = new CaptureEngine(new RobotCaptureFactory());
         captureEngine.configure(captureEngineConfiguration);
-
         if (compressorEngine != null) {
             captureEngine.addListener(compressorEngine);
         }
-
         captureEngine.start();
     }
 
@@ -220,9 +235,8 @@ public class Assisted implements Subscriber, ClipboardOwner {
     private void onCompressorEngineConfigured(NetworkEngine engine, NetworkCompressorConfigurationMessage configuration) {
         final CompressorEngineConfiguration compressorEngineConfiguration = configuration.getConfiguration();
 
-		Log.info("Compressor configuration received " + compressorEngineConfiguration);
-
         if (compressorEngine != null) {
+            Log.info("Compressor configuration received " + compressorEngineConfiguration);
             compressorEngine.reconfigure(compressorEngineConfiguration);
             return;
         }
@@ -231,7 +245,6 @@ public class Assisted implements Subscriber, ClipboardOwner {
         compressorEngine.configure(compressorEngineConfiguration);
         compressorEngine.addListener((NetworkAssistedEngine) engine);
         compressorEngine.start(1);
-
         if (captureEngine != null) {
             captureEngine.addListener(compressorEngine);
         }
@@ -273,4 +286,46 @@ public class Assisted implements Subscriber, ClipboardOwner {
         KeyboardErrorHandler.warn(String.valueOf(message));
     }
 
+    public void onReady() {
+        frame.onReady();
+    }
+
+    private class MyNetworkAssistedEngineListener implements NetworkAssistedEngineListener {
+
+        @Override
+        public void onConnecting(String serverName, int serverPort) {
+            frame.onConnecting(serverName, serverPort);
+        }
+
+        @Override
+        public void onHostNotFound(String serverName) {
+            frame.onHostNotFound(serverName);
+        }
+
+        @Override
+        public void onConnectionTimeout(String serverName, int serverPort) {
+            frame.onConnectionTimeout(serverName, serverPort);
+        }
+
+        @Override
+        public void onRefused(String serverName, int serverPort) {
+            frame.onRefused(serverName, serverPort);
+        }
+
+        @Override
+        public void onConnected(Socket connection) {
+            frame.onConnected();
+        }
+
+        @Override
+        public void onDisconnecting(Socket connection) {
+            frame.onDisconnecting();
+        }
+
+        @Override
+        public void onIOError(IOException error) {
+            stop();
+            frame.onDisconnecting();
+        }
+    }
 }

src/main/java/mpo/dayon/assisted/gui/AssistedFrame.java

@@ -1,8 +1,7 @@
 package mpo.dayon.assisted.gui;
 
-import javax.swing.Box;
+import javax.swing.*;
 
-import mpo.dayon.assisted.network.NetworkAssistedEngineConfiguration;
 import mpo.dayon.common.babylon.Babylon;
 import mpo.dayon.common.gui.common.BaseFrame;
 import mpo.dayon.common.gui.common.FrameType;
@@ -11,53 +10,79 @@ import mpo.dayon.common.gui.toolbar.ToolBar;
 import mpo.dayon.common.version.Version;
 
 class AssistedFrame extends BaseFrame {
+	private Action startAction;
+	private Action stopAction;
 
-	public AssistedFrame() {
+	public AssistedFrame(AssistedStartAction startAction, AssistedStopAction stopAction) {
 		super.setFrameType(FrameType.ASSISTED);
-
 		setTitle("Dayon! (" + Babylon.translate("assisted") + ") " + Version.get());
+		this.stopAction = stopAction;
+		this.startAction = startAction;
 
 		setupToolBar(createToolBar());
 		setupStatusBar(createStatusBar());
-
 		onReady();
 	}
 
 	private ToolBar createToolBar() {
 		final ToolBar toolbar = new ToolBar();
-
+		toolbar.addAction(startAction);
+		toolbar.addSeparator();
+		toolbar.addAction(stopAction);
+		toolbar.addSeparator();
 		toolbar.addAction(createShowInfoAction());
 		toolbar.addSeparator();
 		toolbar.addAction(createShowHelpAction());
 		toolbar.addGlue();
 		toolbar.addAction(createExitAction());
-
 		return toolbar;
 	}
 
 	private StatusBar createStatusBar() {
 		final StatusBar statusBar = new StatusBar();
-
 		statusBar.addSeparator();
 		statusBar.addRamInfo();
 		statusBar.add(Box.createHorizontalStrut(10));
-
 		return statusBar;
 	}
 
-	private void onReady() {
+	void onReady() {
+		startAction.setEnabled(true);
+		stopAction.setEnabled(false);
 		statusBar.setMessage(Babylon.translate("ready"));
 	}
 
-	void onConnecting(NetworkAssistedEngineConfiguration configuration) {
+	void onConnecting(String serverName, int serverPort) {
-		statusBar.setMessage(Babylon.translate("connecting", configuration.getServerName(), configuration.getServerPort()));
+		startAction.setEnabled(false);
+		stopAction.setEnabled(false);
+		statusBar.setMessage(Babylon.translate("connecting", serverName, serverPort));
 	}
 
 	void onConnected() {
+		startAction.setEnabled(false);
+		stopAction.setEnabled(true);
 		statusBar.setMessage(Babylon.translate("connected"));
 	}
 
-	void onRefused(NetworkAssistedEngineConfiguration configuration) {
+	void onHostNotFound(String serverName) {
-		statusBar.setMessage(Babylon.translate("refused",  configuration.getServerName(), configuration.getServerPort()));
+		startAction.setEnabled(true);
+		stopAction.setEnabled(false);
+		statusBar.setMessage(Babylon.translate("serverNotFound", serverName));
+	}
+
+	void onConnectionTimeout(String serverName, int serverPort) {
+		stopAction.setEnabled(false);
+		startAction.setEnabled(true);
+		statusBar.setMessage(Babylon.translate("connectionTimeout", serverName, serverPort));
+	}
+
+	void onRefused(String serverName, int serverPort) {
+		startAction.setEnabled(true);
+		stopAction.setEnabled(false);
+		statusBar.setMessage(Babylon.translate("refused",  serverName, serverPort));
+	}
+
+	void onDisconnecting() {
+		onReady();
 	}
 }