Refactored IPC, fixes #663

main/commons/src/main/java/org/cryptomator/common/Environment.java

@@ -28,7 +28,7 @@ public class Environment {
 	public Environment() {
 		LOG.debug("cryptomator.settingsPath: {}", System.getProperty("cryptomator.settingsPath"));
 		LOG.debug("cryptomator.ipcPortPath: {}", System.getProperty("cryptomator.ipcPortPath"));
-		LOG.debug("cryptomator.keychainPath: {}", System.getProperty("cryptomator.ipcPortPath"));
+		LOG.debug("cryptomator.keychainPath: {}", System.getProperty("cryptomator.keychainPath"));
 	}
 
 	public Stream<Path> getSettingsPath() {

main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java

@@ -13,21 +13,34 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
 
 public class Cryptomator {
 
 	private static final Logger LOG = LoggerFactory.getLogger(Cryptomator.class);
-	private static final CryptomatorComponent CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.create();
-	private static final Path DEFAULT_IPC_PATH = Paths.get(".ipcPort.tmp");
+	private static final CryptomatorComponent CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.create(); // DaggerCryptomatorComponent gets generated by Dagger. Run Maven and include target/generated-sources/annotations in your IDE.
 
-	// We need a separate FX Application class.
-	// If org.cryptomator.launcher.Cryptomator simply extended Application, the module system magically kicks in and throws exceptions
+	public static void main(String[] args) {
+		LOG.info("Starting Cryptomator {} on {} {} ({})", CRYPTOMATOR_COMPONENT.applicationVersion().orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+
+		try (IpcFactory.IpcEndpoint endpoint = CRYPTOMATOR_COMPONENT.ipcFactory().create()) {
+			endpoint.getRemote().handleLaunchArgs(args); // if we are the server, getRemote() returns self.
+			if (endpoint.isConnectedToRemote()) {
+				LOG.info("Found running application instance. Shutting down.");
+			} else {
+				CleanShutdownPerformer.registerShutdownHook();
+				Application.launch(MainApp.class, args);
+			}
+		} catch (IOException e) {
+			LOG.error("Failed to initiate inter-process communication.", e);
+			System.exit(2);
+		} catch (Throwable e) {
+			LOG.error("Error during startup", e);
+			System.exit(1);
+		}
+		System.exit(0); // end remaining non-daemon threads.
+	}
+
+	// We need a separate FX Application class, until we can use the module system. See https://stackoverflow.com/q/54756176/4014509
 	public static class MainApp extends Application {
 
 		private Stage primaryStage;
@@ -60,45 +73,4 @@ public void stop() {
 
 	}
 
-	public static void main(String[] args) {
-		LOG.info("Starting Cryptomator {} on {} {} ({})", CRYPTOMATOR_COMPONENT.applicationVersion().orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
-
-		FileOpenRequestHandler fileOpenRequestHandler = CRYPTOMATOR_COMPONENT.fileOpenRequestHanlder();
-		Path ipcPortPath = CRYPTOMATOR_COMPONENT.environment().getIpcPortPath().findFirst().orElse(DEFAULT_IPC_PATH);
-		try (InterProcessCommunicator communicator = InterProcessCommunicator.start(ipcPortPath, new IpcProtocolImpl(fileOpenRequestHandler))) {
-			if (communicator.isServer()) {
-				fileOpenRequestHandler.handleLaunchArgs(args);
-				CleanShutdownPerformer.registerShutdownHook();
-				Application.launch(MainApp.class, args);
-			} else {
-				communicator.handleLaunchArgs(args);
-				LOG.info("Found running application instance. Shutting down.");
-			}
-			System.exit(0); // end remaining non-daemon threads.
-		} catch (IOException e) {
-			LOG.error("Failed to initiate inter-process communication.", e);
-			System.exit(2);
-		} catch (Throwable e) {
-			LOG.error("Error during startup", e);
-			System.exit(1);
-		}
-	}
-
-	private static class IpcProtocolImpl implements InterProcessCommunicationProtocol {
-
-		private final FileOpenRequestHandler fileOpenRequestHandler;
-
-		// TODO: inject?
-		public IpcProtocolImpl(FileOpenRequestHandler fileOpenRequestHandler) {
-			this.fileOpenRequestHandler = fileOpenRequestHandler;
-		}
-
-		@Override
-		public void handleLaunchArgs(String[] args) {
-			LOG.info("Received launch args: {}", Arrays.stream(args).reduce((a, b) -> a + ", " + b).orElse(""));
-			fileOpenRequestHandler.handleLaunchArgs(args);
-		}
-
-	}
-
 }

main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java

@@ -6,17 +6,13 @@
 
 import javax.inject.Named;
 import javax.inject.Singleton;
-import java.nio.file.Path;
 import java.util.Optional;
-import java.util.concurrent.BlockingQueue;
 
 @Singleton
 @Component(modules = {CryptomatorModule.class, CommonsModule.class})
 public interface CryptomatorComponent {
 
-	Environment environment();
-
-	FileOpenRequestHandler fileOpenRequestHanlder();
+	IpcFactory ipcFactory();
 
 	@Named("applicationVersion")
 	Optional<String> applicationVersion();