Bug fixes

Author: Mx-Iris

Core/Package.swift

@@ -73,11 +73,11 @@ let package = Package(
                 isRelative: true,
                 isEnabled: false,
             ),
-            .package(
-                path: "../../TestingLibraries/MachOSwiftSection",
-                isRelative: true,
-                isEnabled: true,
-            ),
+//            .package(
+//                path: "../../TestingLibraries/MachOSwiftSection",
+//                isRelative: true,
+//                isEnabled: true,
+//            ),
             remote: .package(
                 url: "https://github.com/MxIris-Reverse-Engineering/MachOSwiftSection",
 //                from: "0.6.0"

Core/Sources/RuntimeViewerCore/RuntimeEngine.swift

@@ -5,7 +5,7 @@ import ClassDumpRuntime
 import FoundationToolbox
 import RuntimeViewerCommunication
 
-public final actor RuntimeEngine {
+public actor RuntimeEngine {
     public static let shared = RuntimeEngine()
 
     private static let logger = Logger(label: "RuntimeEngine")
@@ -15,7 +15,7 @@ public final actor RuntimeEngine {
     @Published private var protocolList: [String] = []
 
     @Published private var protocolToImage: [String: String] = [:]
-    
+
     @Published private var imageToProtocols: [String: [String]] = [:]
 
     @Published public private(set) var imageList: [String] = []
@@ -24,6 +24,10 @@ public final actor RuntimeEngine {
 
     @Published public private(set) var imageToSwiftSections: [String: RuntimeSwiftSections] = [:]
 
+    private let reloadDataSubject = PassthroughSubject<Void, Never>()
+    
+    public var reloadDataPublisher: some Publisher<Void, Never> { reloadDataSubject.eraseToAnyPublisher() }
+    
     fileprivate enum CommandNames: String, CaseIterable {
         case classList
         case protocolList
@@ -43,6 +47,7 @@ public final actor RuntimeEngine {
         case observeRuntime
         case interfaceForRuntimeObjectInImageWithOptions
         case namesOfKindInImage
+        case reloadData
 
         var commandName: String { "com.JH.RuntimeViewerCore.RuntimeEngine.\(rawValue)" }
     }
@@ -137,13 +142,20 @@ public final actor RuntimeEngine {
             try await perform(self, response)
         }
     }
+    
+    private func setMessageHandlerBinding(forName name: CommandNames, perform: @escaping (isolated RuntimeEngine) async throws -> Void) {
+        connection?.setMessageHandler(name: name.commandName) { [weak self] in
+            guard let self else { return }
+            try await perform(self)
+        }
+    }
 
     public func reloadData() {
         Self.logger.debug("Start reload")
         classList = ObjCRuntime.classNames()
         protocolList = ObjCRuntime.protocolNames()
         imageList = DyldUtilities.imageNames()
-        imageNodes = [DyldUtilities.dyldSharedCacheImageRootNode, DyldUtilities.otherImageRootNode]
+//        imageNodes = [DyldUtilities.dyldSharedCacheImageRootNode, DyldUtilities.otherImageRootNode]
         Self.logger.debug("End reload")
         sendRemoteDataIfNeeded()
     }
@@ -157,25 +169,10 @@ public final actor RuntimeEngine {
         ) ?? ([:], [:])
         self.protocolToImage = protocolToImage
         self.imageToProtocols = imageToProtocols
-        Task.detached {
-            await self.setImageNodes([DyldUtilities.dyldSharedCacheImageRootNode, DyldUtilities.otherImageRootNode])
-        }
 
-//        Task.detached { [self] in
-//            await withTaskGroup { group in
-//                for imagePath in await imageList {
-//                    group.addTask {
-//                        do {
-//                            let section = try RuntimeSwiftSections(imagePath: imagePath)
-//                            await self.setSwiftSection(section, forImage: imagePath)
-//                        } catch {
-//                            print(imagePath)
-//                        }
-//                    }
-//                }
-//                await group.waitForAll()
-//            }
-//        }
+        await Task.detached {
+            await self.setImageNodes([DyldUtilities.dyldSharedCacheImageRootNode, DyldUtilities.otherImageRootNode])
+        }.value
 
         shouldReload
             .debounce(for: .milliseconds(15), scheduler: DispatchQueue.main)
@@ -325,7 +322,7 @@ public final actor RuntimeEngine {
             }
         }
     }
-    
+
     private func getOrCreateSwiftSections(for imagePath: String) async throws -> RuntimeSwiftSections {
         if let swiftSections = imageToSwiftSections[imagePath] {
             return swiftSections
@@ -367,8 +364,10 @@ extension RuntimeEngine {
             let section = try RuntimeSwiftSections(imagePath: path)
             await setSwiftSection(section, forImage: path)
             reloadData()
+            reloadDataSubject.send(())
         } remote: {
             try await $0.sendMessage(name: .loadImage, request: path)
+            reloadDataSubject.send(())
         }
     }
 

RuntimeViewerPackages/Sources/RuntimeViewerApplication/Sidebar/SidebarImageViewModel.swift

@@ -34,26 +34,6 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
 
         Task {
             do {
-                let loadState: RuntimeImageLoadState = try await runtimeEngine.isImageLoaded(path: imagePath) ? .loaded : .notLoaded
-                let objcClassNames = try await runtimeEngine.names(of: .objc(.class), in: imagePath)
-                let objcProtocolNames = try await runtimeEngine.names(of: .objc(.protocol), in: imagePath)
-                let swiftClassNames = try await runtimeEngine.names(of: .swift(.class), in: imagePath)
-                let swiftProtocolNames = try await runtimeEngine.names(of: .swift(.protocol), in: imagePath)
-                let swiftEnumNames = try await runtimeEngine.names(of: .swift(.enum), in: imagePath)
-                let swiftStructNames = try await runtimeEngine.names(of: .swift(.struct), in: imagePath)
-                await MainActor.run {
-                    let searchString = ""
-                    let searchScope: RuntimeTypeSearchScope = .all
-
-                    self.searchString = searchString
-                    self.searchScope = searchScope
-
-                    self.runtimeObjects = objcClassNames + objcProtocolNames + swiftEnumNames + swiftStructNames + swiftClassNames + swiftProtocolNames
-                    self.filteredRuntimeObjects = self.runtimeObjects.sorted()
-
-                    self.loadState = loadState
-                }
-
                 let debouncedSearch = $searchString
                     .debounce(.milliseconds(80), scheduler: MainScheduler.instance)
                     .asObservable()
@@ -69,6 +49,16 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
                     .bind(to: $filteredRuntimeObjects)
                     .disposed(by: rx.disposeBag)
 
+                await runtimeEngine.reloadDataPublisher
+                    .asObservable()
+                    .subscribeOnNext { [weak self] in
+                        guard let self else { return }
+                        Task {
+                            try await self.reloadData()
+                        }
+                    }
+                    .disposed(by: rx.disposeBag)
+
                 await runtimeEngine.$imageList
                     .asObservable()
                     .flatMap { [unowned self] imageList in
@@ -80,8 +70,10 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
                     .observeOnMainScheduler()
                     .bind(to: $loadState)
                     .disposed(by: rx.disposeBag)
+
+                try await reloadData()
             } catch {
-                loadState = .loadError(error)
+                self.loadState = .loadError(error)
                 print(error)
             }
         }
@@ -109,6 +101,34 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
         public let windowSubtitle: Signal<String>
     }
 
+    private func reloadData() async throws {
+        let loadState: RuntimeImageLoadState = try await runtimeEngine.isImageLoaded(path: imagePath) ? .loaded : .notLoaded
+        if case .notLoaded = loadState {
+            await MainActor.run {
+                self.loadState = loadState
+            }
+            return
+        }
+        let objcClassNames = try await runtimeEngine.names(of: .objc(.class), in: imagePath)
+        let objcProtocolNames = try await runtimeEngine.names(of: .objc(.protocol), in: imagePath)
+        let swiftClassNames = try await runtimeEngine.names(of: .swift(.class), in: imagePath)
+        let swiftProtocolNames = try await runtimeEngine.names(of: .swift(.protocol), in: imagePath)
+        let swiftEnumNames = try await runtimeEngine.names(of: .swift(.enum), in: imagePath)
+        let swiftStructNames = try await runtimeEngine.names(of: .swift(.struct), in: imagePath)
+        await MainActor.run {
+            let searchString = ""
+            let searchScope: RuntimeTypeSearchScope = .all
+
+            self.searchString = searchString
+            self.searchScope = searchScope
+
+            self.runtimeObjects = objcClassNames + objcProtocolNames + swiftEnumNames + swiftStructNames + swiftClassNames + swiftProtocolNames
+            self.filteredRuntimeObjects = self.runtimeObjects.sorted()
+
+            self.loadState = loadState
+        }
+    }
+
     @MainActor
     public func transform(_ input: Input) -> Output {
         input.searchString.emit(to: $searchString).disposed(by: rx.disposeBag)