[Fix] MAUI Profiler - dsrouter connection not getting established (ma…

…cOS) #103
JaneySprings · Jun 16, 2024 · dd4371a · dd4371a
1 parent 83dc2d6
commit dd4371a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/DotNet.Meteor.Debug/Agents/BaseLaunchAgent.cs b/src/DotNet.Meteor.Debug/Agents/BaseLaunchAgent.cs
@@ -36,10 +36,14 @@ public abstract class BaseLaunchAgent {
             logger.OnErrorDataReceived($"[HotReload]: {ex.Message}");
         }
     }
-    public virtual void Dispose() {
+    public virtual void Dispose() { 
         foreach (var disposable in Disposables) {
-            disposable.Invoke();
-            DebuggerLoggingService.CustomLogger.LogMessage($"Disposing {disposable.Method.Name}");
+            try {
+                disposable.Invoke();
+                DebuggerLoggingService.CustomLogger.LogMessage($"Disposing {disposable.Method.Name}");
+            } catch (Exception ex) {
+                DebuggerLoggingService.CustomLogger.LogMessage($"Error while disposing {disposable.Method.Name}: {ex.Message}");
+            }
         }
 
         Disposables.Clear();

diff --git a/src/DotNet.Meteor.Debug/Agents/TraceLaunchAgent.cs b/src/DotNet.Meteor.Debug/Agents/TraceLaunchAgent.cs
@@ -73,11 +73,6 @@ public class TraceLaunchAgent : BaseLaunchAgent {
         DeviceBridge.Shell(Configuration.Device.Serial, "setprop", "debug.mono.profile", $"127.0.0.1:{Configuration.ProfilerPort},suspend");
 
         var routerProcess = DSRouter.ServerToServer(Configuration.ProfilerPort + 1, logger);
-        System.Threading.Thread.Sleep(1000); // wait for router to start
-        var traceProcess = Trace.Collect(routerProcess.Id, nettracePath, logger);
-        System.Threading.Thread.Sleep(1000); // wait for trace to start
-
-        Disposables.Add(() => traceProcess.Terminate());
         Disposables.Add(() => routerProcess.Terminate());
         Disposables.Add(() => DeviceBridge.RemoveReverse(Configuration.Device.Serial));
 
@@ -86,6 +81,8 @@ public class TraceLaunchAgent : BaseLaunchAgent {
         DeviceBridge.Install(Configuration.Device.Serial, Configuration.OutputAssembly, logger);
         DeviceBridge.Launch(Configuration.Device.Serial, applicationId, logger);
 
+        var traceProcess = Trace.Collect(routerProcess.Id, nettracePath, logger);
+        Disposables.Insert(0, () => traceProcess.Terminate());
         Disposables.Add(() => DeviceBridge.Shell(Configuration.Device.Serial, "am", "force-stop", applicationId));
     }
     private void LaunchWindows(IProcessLogger logger, string diagnosticPort, string nettracePath) {