WIP! 2025-04-06T10:23:32Z wip

Author: nikitabobko

Sources/AppBundle/getNativeFocusedWindow.swift

@@ -11,7 +11,11 @@ private var focusedApp: (any AbstractApp)? {
             return appForTests
         } else {
             check(appForTests == nil)
-            return try await NSWorkspace.shared.frontmostApplication?.macApp
+            if let frontmostApplication = NSWorkspace.shared.frontmostApplication {
+                return try await MacApp.getOrRegister(frontmostApplication)
+            } else {
+                return nil
+            }
         }
     }
 }

Sources/AppBundle/layout/refresh.swift

@@ -174,7 +174,7 @@ private func normalizeContainers() {
 
 @MainActor
 private func detectNewAppsAndWindows() async throws {
-    for app in try await detectNewApps() { // todo parallelize
+    for app in try await detectNewAppsAndGcDead() { // todo parallelize
         for id in try await app.detectNewWindowsAndGetIds() {
             _ = try await MacWindow.getOrRegister(windowId: id, macApp: app as! MacApp)
         }

Sources/AppBundle/tree/MacApp.swift

@@ -8,8 +8,8 @@ final class MacApp: AbstractApp {
     /*conforms*/ let pid: Int32
     /*conforms*/ let bundleId: String?
     let nsApp: NSRunningApplication
-    private let axApp: ThreadGuardedValue<AXUIElement>
     let isZoom: Bool
+    private let axApp: ThreadGuardedValue<AXUIElement>
     private let appAxSubscriptions: ThreadGuardedValue<[AxSubscription]> // keep subscriptions in memory
     private let windows: ThreadGuardedValue<[UInt32: AxWindow]> = .init([:])
     private var thread: Thread?
@@ -34,7 +34,8 @@ final class MacApp: AbstractApp {
     }
 
     @MainActor
-    static func get(_ nsApp: NSRunningApplication) async throws -> MacApp? {
+    @discardableResult
+    static func getOrRegister(_ nsApp: NSRunningApplication) async throws -> MacApp? {
         // Don't perceive any of the lock screen windows as real windows
         // Otherwise, false positive ax notifications might trigger that lead to gcWindows
         if nsApp.bundleIdentifier == lockScreenAppBundleId {
@@ -295,9 +296,67 @@ final class MacApp: AbstractApp {
         thread = nil // Disallow all future job submissions
     }
 
-    private func getThreadOrCancel() throws -> Thread { // todo convert untyped throws to throws across the whole app
-        if let thread { return thread }
-        throw CancellationError()
+    @MainActor
+    private static func refreshAndGetAliveWindowIds(frontmostAppBundleId: String?) async throws -> [UInt32] {
+        try await withThrowingTaskGroup(of: Void.self) { group in
+            // Register new apps
+            for nsApp in NSWorkspace.shared.runningApplications where nsApp.activationPolicy == .regular {
+                let succ = group.addTaskUnlessCancelled { @Sendable @MainActor in
+                    _ = try await getOrRegister(nsApp)
+                }
+                if !succ { throw CancellationError() }
+            }
+            try await group.waitForAll()
+        }
+        return try await withThrowingTaskGroup(of: [UInt32].self, returning: [UInt32].self) { group in
+            var result: [UInt32] = []
+            // gc dead apps. refresh underlying windows
+            for (_, app) in MacApp.allAppsMap {
+                let succ = group.addTaskUnlessCancelled { @Sendable @MainActor in
+                    try await app.refreshAndGetAliveWindowIds(frontmostAppBundleId: frontmostAppBundleId)
+                }
+                if !succ { throw CancellationError() }
+            }
+            for try await child in group {
+                result.append(contentsOf: child)
+            }
+            return result
+        }
+    }
+
+    @MainActor
+    private func refreshAndGetAliveWindowIds(frontmostAppBundleId: String?) async throws -> [UInt32] {
+        if nsApp.isTerminated {
+            MacApp.allAppsMap.removeValue(forKey: pid)
+            thread?.runInLoopAsync { [windows, appAxSubscriptions, axApp] job in
+                axApp.destroy()
+                appAxSubscriptions.destroy()
+                windows.destroy()
+                CFRunLoopStop(CFRunLoopGetCurrent())
+            }
+            thread = nil // Disallow all future job submissions
+            return []
+        }
+        guard let thread else { return [] }
+        return try await thread.runInLoop { [nsApp, windows, axApp] (job) -> [UInt32] in
+            var result: [UInt32: AxWindow] = windows.threadGuarded
+            // Second line of defence against lock screen. See the first line of defence: closedWindowsCache
+            // Second and third lines of defence are technically needed only to avoid potential flickering
+            if frontmostAppBundleId != lockScreenAppBundleId {
+                result = try result.filter {
+                    try job.checkCancellation()
+                    return $0.value.ax.containingWindowId(signpostEvent: nsApp.idForDebug) != nil
+                }
+            }
+
+            for window in axApp.threadGuarded.get(Ax.windowsAttr, signpostEvent: nsApp.idForDebug) ?? [] {
+                try job.checkCancellation()
+                result.getOrRegisterAxWindow(window, nsApp)
+            }
+
+            windows.threadGuarded = result
+            return Array(result.keys)
+        }
     }
 
     @MainActor // todo swift is stupid
@@ -342,6 +401,7 @@ private class AxWindow {
 }
 
 extension [UInt32: AxWindow] {
+    @discardableResult
     fileprivate mutating func getOrRegisterAxWindow(_ axWindow: AXUIElement, _ nsApp: NSRunningApplication) -> AxWindow? {
         guard let id = axWindow.containingWindowId() else { return nil }
         if let existing = self[id] {
@@ -442,7 +502,4 @@ extension NSRunningApplication {
     var idForDebug: String {
         "PID: \(processIdentifier) ID: \(bundleIdentifier ?? executableURL?.description ?? "")"
     }
-
-    @MainActor
-    var macApp: MacApp? { get async throws { try await MacApp.get(self) } }
 }

Sources/AppBundle/tree/MacWindow.swift

@@ -104,7 +104,7 @@ final class MacWindow: Window {
                     break // Don't switch back on popup destruction
             }
         }
-        if unregisterAxWindow {
+        if unregisterAxWindow { // todo drop?
             macApp.unregisterWindow(windowId)
         }
     }

Sources/AppBundle/util/appBundleUtil.swift

@@ -60,17 +60,15 @@ extension String? {
 }
 
 @MainActor
-func detectNewApps() async throws -> [any AbstractApp] {
-    if isUnitTest {
-        return appForTests.asList()
-    }
-    var result = [any AbstractApp]()
-    for _app in NSWorkspace.shared.runningApplications where _app.activationPolicy == .regular {
-        if let app = try await _app.macApp {
-            result.append(app)
-        }
-    }
-    return result
+func detectNewAppsAndGcDead() async throws -> [any AbstractApp] {
+    dieT()
+    // var result: [any AbstractApp] = []
+    // for _app in NSWorkspace.shared.runningApplications where _app.activationPolicy == .regular {
+    //     if let app = try await _app.macApp {
+    //         result.append(app)
+    //     }
+    // }
+    // return result
 }
 
 @MainActor