URl handler issue on Mac for all users nroduit#583

weasis-launcher/src/main/java/org/weasis/launcher/AppLauncher.java

@@ -18,6 +18,9 @@
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
 import ch.qos.logback.core.util.FileSize;
+import com.formdev.flatlaf.util.SystemInfo;
+import java.awt.Desktop;
+import java.awt.Desktop.Action;
 import java.io.File;
 import java.util.List;
 import java.util.Properties;
@@ -75,17 +78,74 @@ public class AppLauncher extends WeasisLauncher implements Singleton.SingletonAp
     logger.addAppender(rollingFileAppender);
   }
 
+  private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(AppLauncher.class);
+
   public AppLauncher(ConfigData configData) {
     super(configData);
   }
 
   public static void main(String[] argv) throws Exception {
     final Type launchType = Type.NATIVE;
-    System.setProperty("weasis.launch.type", launchType.name());
 
     ConfigData configData = new ConfigData(argv);
     if (!Singleton.invoke(configData)) {
       AppLauncher instance = new AppLauncher(configData);
+
+      // Init handler for open URI and open file events
+      Desktop app = Desktop.getDesktop();
+      if (app.isSupported(Action.APP_OPEN_URI)) {
+        long time = System.currentTimeMillis();
+        boolean noArgs = argv.length == 0;
+        app.setOpenURIHandler(
+            e -> {
+              String uri = e.getURI().toString();
+              LOGGER.info("Get URI event from OS. URI: {}", uri);
+              int index = Utils.getWeasisProtocolIndex(uri);
+              if (index < 0) {
+                uri = "dicom:get -r \"" + uri + "\""; // NON-NLS
+                instance.executeCommands(List.of(uri), null);
+              } else {
+                boolean sameInstance = System.currentTimeMillis() - time < 3000;
+                String[] args;
+                if (SystemInfo.isMacOS) {
+                  args = new String[] {"open", "-n", "-b", "org.weasis.launcher", "--args", uri};
+                } else if (SystemInfo.isWindows) {
+                  args = new String[] {"cmd", "/c", "start", uri};
+                } else {
+                  args = new String[] {"xdg-open", uri};
+                }
+                Thread launcherThread =
+                    Thread.ofVirtual()
+                        .start(
+                            () -> {
+                              try {
+                                ProcessBuilder pb = new ProcessBuilder(args);
+                                pb.start().waitFor(15, TimeUnit.SECONDS);
+                                if (sameInstance && noArgs) {
+                                  LOGGER.info(
+                                      "Configuration with URI is different, restart Weasis with new configuration");
+                                  instance.shutdownHook();
+                                }
+                              } catch (Exception ex) {
+                                LOGGER.error("Cannot start Weasis from URI", ex);
+                              }
+                            });
+                launcherThread.start();
+              }
+            });
+      }
+      if (app.isSupported(Desktop.Action.APP_OPEN_FILE)) {
+        app.setOpenFileHandler(
+            e -> {
+              List<String> files =
+                  e.getFiles().stream()
+                      .map(f -> "dicom:get -l \"" + f.getPath() + "\"") // NON-NLS
+                      .toList();
+              LOGGER.info("Get oOpen file event from OS. Files: {}", files);
+              instance.executeCommands(files, null);
+            });
+      }
+
       Singleton.start(instance, configData.getSourceID());
       instance.launch(launchType);
     }

weasis-launcher/src/main/java/org/weasis/launcher/Singleton.java

@@ -422,7 +422,7 @@ private void handleMagicWord(BufferedReader in, Socket s, InputStreamReader isr)
 
       if (siApp.canStartNewActivation(props)) {
         siApp.newActivation(args);
-        LOGGER.debug("Sending ACK");
+        LOGGER.debug("Sending ACK for loading args");
         sendResponse(s, isr, SI_ACK);
       } else {
         LOGGER.debug("Sending EXIT");

weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java

@@ -24,8 +24,6 @@
 
 import com.formdev.flatlaf.FlatSystemProperties;
 import com.formdev.flatlaf.util.SystemInfo;
-import java.awt.Desktop;
-import java.awt.Desktop.Action;
 import java.awt.EventQueue;
 import java.io.File;
 import java.io.FileDescriptor;
@@ -123,6 +121,7 @@ public static String valueOf(int state) {
   protected String look = null;
   protected RemotePrefService remotePrefs;
   protected String localPrefsDir;
+  protected volatile boolean closing = false;
 
   protected final Properties modulesi18n;
   protected final ConfigData configData;
@@ -179,6 +178,9 @@ public final void launch(Type type) throws Exception {
     try {
 
       String goshArgs = getGoshArgs(serverProp);
+      if (closing) {
+        return;
+      }
       // Now create an instance of the framework with our configuration properties.
       mFelix = new Felix(serverProp);
       // Initialize the framework, but don't start it yet.
@@ -195,7 +197,9 @@ public final void launch(Type type) throws Exception {
           new ServiceTracker(
               mFelix.getBundleContext(), "org.apache.felix.service.command.CommandProcessor", null);
       mTracker.open();
-
+      if (closing) {
+        return;
+      }
       // Start the framework.
       mFelix.start();
 
@@ -208,44 +212,16 @@ public final void launch(Type type) throws Exception {
         LOGGER.info(
             "Logs has been delegated to the OSGI service and can be read in {}", logActivation);
       }
-
-      // Init after default properties for UI
-      Desktop app = Desktop.getDesktop();
-      if (app.isSupported(Action.APP_OPEN_URI)) {
-        app.setOpenURIHandler(
-            e -> {
-              String uri = e.getURI().toString();
-              LOGGER.info("Get URI event from OS. URI: {}", uri);
-              int index = Utils.getWeasisProtocolIndex(uri);
-              if (index < 0) {
-                uri = "dicom:get -r \"" + uri + "\""; // NON-NLS
-                executeCommands(List.of(uri), null);
-              } else {
-                configData.extractArgFromUri(uri);
-                executeCommands(configData.getArguments(), null);
-              }
-            });
-      }
-      if (app.isSupported(Desktop.Action.APP_OPEN_FILE)) {
-
-        app.setOpenFileHandler(
-            e -> {
-              List<String> files =
-                  e.getFiles().stream()
-                      .map(f -> "dicom:get -l \"" + f.getPath() + "\"") // NON-NLS
-                      .toList();
-              LOGGER.info("Get oOpen file event from OS. Files: {}", files);
-              executeCommands(files, null);
-            });
-      }
-
       executeCommands(configData.getArguments(), goshArgs);
 
       checkBundleUI(serverProp);
       frameworkLoaded = true;
 
       showMessage(mainFrame, serverProp);
 
+      if (closing) {
+        return;
+      }
       // Wait for framework to stop to exit the VM.
       mFelix.waitForStop(0);
       System.exit(0);
@@ -1130,7 +1106,8 @@ public static Locale textToLocale(String value) {
     return Locale.getDefault();
   }
 
-  private void shutdownHook() {
+  protected void shutdownHook() {
+    closing = true;
     if (mFelix == null || (mFelix.getState() & 6) != 0) {
       return;
     }