fix(info-collector): run TIS queries on main queue

Author: zonble

Packages/InfoCollector/Sources/InfoCollector/InfoCollector.swift

@@ -25,7 +25,6 @@ import Foundation
 
 @objc
 public class InfoCollector: NSObject {
-    @MainActor
     @available(iOS 13.0.0, macOS 10.15, *)
     public static func generate() async -> String {
         await withCheckedContinuation { (continuation: CheckedContinuation<String, Never>) in
@@ -35,7 +34,6 @@ public class InfoCollector: NSObject {
         }
     }
 
-    @MainActor
     public static func generate(callback: @escaping (String) -> Void) {
         let plugins: [InfoCollectorPlugin] = [
             MachineModelCollectorPlugin(),
@@ -44,7 +42,7 @@ public class InfoCollector: NSObject {
             KeyboardTypeCollectorPlugin(),
             ActiveInputSourceListCollectorPlugin(),
             DefaultWebBrowserCollectorPlugin(),
-            SafaruVersionCollectorPlugin(),
+            SafariVersionCollectorPlugin(),
             AppVersionCollectorPlugin(),
         ]
 

Packages/InfoCollector/Sources/InfoCollector/Plugins/ActiveInputSourceListCollectorPlugin.swift

@@ -37,35 +37,37 @@ struct ActiveInputSourceListCollectorPlugin: InfoCollectorPlugin {
             return nil
         }
 
-        // Use HIToolbox TIS APIs to get current and enabled input sources
-        // Build a query for enabled input sources
-        let keys: [CFString: Any] = [
-            kTISPropertyInputSourceIsEnabled: kCFBooleanTrue as CFBoolean,
-            kTISPropertyInputSourceIsSelectCapable: kCFBooleanTrue as CFBoolean,
-            kTISPropertyInputSourceCategory: kTISCategoryKeyboardInputSource as CFString,
-        ]
-        let dict = keys as CFDictionary
-        var lines: [String] = []
-        // Enabled input sources
-        if let list = TISCreateInputSourceList(dict, false)?.takeRetainedValue()
-            as? [TISInputSource]
-        {
-            lines.append("- Enabled Input Sources:")
-            for src in list {
-                let name = getStringValue(src, kTISPropertyLocalizedName) ?? "<unknown>"
-                let sid = getStringValue(src, kTISPropertyInputSourceID) ?? ""
-                let category =
+        DispatchQueue.main.async {
+            // Use HIToolbox TIS APIs to get current and enabled input sources
+            // Build a query for enabled input sources
+            let keys: [CFString: Any] = [
+                kTISPropertyInputSourceIsEnabled: kCFBooleanTrue as CFBoolean,
+                kTISPropertyInputSourceIsSelectCapable: kCFBooleanTrue as CFBoolean,
+                kTISPropertyInputSourceCategory: kTISCategoryKeyboardInputSource as CFString,
+            ]
+            let dict = keys as CFDictionary
+            var lines: [String] = []
+            // Enabled input sources
+            if let list = TISCreateInputSourceList(dict, false)?.takeRetainedValue()
+                as? [TISInputSource]
+            {
+                lines.append("- Enabled Input Sources:")
+                for src in list {
+                    let name = getStringValue(src, kTISPropertyLocalizedName) ?? "<unknown>"
+                    let sid = getStringValue(src, kTISPropertyInputSourceID) ?? ""
+                    let category =
                     getStringValue(
                         src,
                         kTISPropertyInputSourceCategory
                     ) ?? ""
-                lines.append("  - \(name) (\(sid)) [\(category)]")
+                    lines.append("  - \(name) (\(sid)) [\(category)]")
+                }
             }
-        }
 
-        if lines.isEmpty {
-            lines.append("No input sources found")
+            if lines.isEmpty {
+                lines.append("    No input sources found")
+            }
+            callback(.success(lines.joined(separator: "\n")))
         }
-        callback(.success(lines.joined(separator: "\n")))
     }
 }

…ugins/SafaruVersionCollectorPlugin.swift …ugins/SafariVersionCollectorPlugin.swiftPackages/InfoCollector/Sources/InfoCollector/Plugins/SafaruVersionCollectorPlugin.swift renamed to Packages/InfoCollector/Sources/InfoCollector/Plugins/SafariVersionCollectorPlugin.swift Packages/InfoCollector/Sources/InfoCollector/Plugins/SafaruVersionCollectorPlugin.swift renamed to Packages/InfoCollector/Sources/InfoCollector/Plugins/SafariVersionCollectorPlugin.swift

@@ -23,7 +23,7 @@
 
 import AppKit
 
-struct SafaruVersionCollectorPlugin: InfoCollectorPlugin {
+struct SafariVersionCollectorPlugin: InfoCollectorPlugin {
     var name: String { "Safari version collector" }
 
     func collect(callback: @escaping (Result<String, Error>) -> Void) {