Improve logging and other small tweaks to watcher mode

Author: kthchew

ExtendFS Extension (ext4)/Ext4Volume.swift

@@ -413,7 +413,7 @@ final class Ext4Volume: FSVolume, FSVolume.Operations, FSVolume.PathConfOperatio
             config.activates = false
             config.addsToRecentItems = false
             config.hides = true
-            try? await NSWorkspace.shared.open([URL(string: "extendfs-internal-diskwatch:/dev/\(resource.bsdName)")!], withApplicationAt: appURL, configuration: config)
+            let _ = try? await NSWorkspace.shared.open([URL(string: "extendfs-internal-diskwatch:/dev/\(resource.bsdName)")!], withApplicationAt: appURL, configuration: config)
         }
 
         return await cache.root

ExtendFS.xcodeproj/project.pbxproj

@@ -314,7 +314,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = YN43D87323;
@@ -382,7 +382,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 11;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = YN43D87323;

ExtendFS/DiskWatcher.swift

@@ -4,6 +4,9 @@
 import Foundation
 import AppKit
 import DiskArbitration
+import os.log
+
+fileprivate let logger = Logger(subsystem: "com.kpchew.ExtendFS", category: "WatcherModeDelegate")
 
 /// An object that watches a disk and keeps the process alive until it is unmounted.
 ///
@@ -21,6 +24,7 @@ class DiskWatcher {
         self.session = session
 
         guard let disk = DADiskCreateFromBSDName(kCFAllocatorDefault, session, blockDevice) else {
+            logger.log("Couldn't create disk from BSD name \(blockDevice)")
             return nil
         }
         let cfDesc = DADiskCopyDescription(disk) as! [String: Any]
@@ -32,6 +36,7 @@ class DiskWatcher {
         ]
 
         DARegisterDiskUnmountApprovalCallback(session, filter as CFDictionary, { (recvDisk, context) in
+            logger.log("Disk is trying to unmount, exiting")
             Task { @MainActor in
                 exit(0)
             }
@@ -58,6 +63,7 @@ class DiskWatcher {
 
         if let description = DADiskCopyDescription(disk) as? [CFString: Any], let bsd = description[kDADiskDescriptionMediaBSDNameKey] as? String {
             // mark as unmounted so it can be tried to be mounted again later
+            logger.log("Creating marker for unmounted disk")
             let empty = Data()
             try? empty.write(to: URL.temporaryDirectory.appending(component: "unmounted-\(bsd)"))
         }

ExtendFS/ExtendFSApp.swift

@@ -23,8 +23,7 @@ struct ExtendFSApp: App {
 
     init() {
         // handle unmounted disks that were previously unmounted during a quit event, probably indicating an App Store update relaunch
-        
-        if let contents = try? FileManager.default.contentsOfDirectory(at: URL.temporaryDirectory, includingPropertiesForKeys: nil) {
+        if let contents = try? FileManager.default.contentsOfDirectory(at: URL.temporaryDirectory, includingPropertiesForKeys: [.creationDateKey]) {
             let bsdList = contents
                 .filter({ $0.lastPathComponent.starts(with: "unmounted-") })
             guard bsdList.count > 0 else {
@@ -46,6 +45,11 @@ struct ExtendFSApp: App {
                     logger.error("Couldn't create disk from BSD name \(bsd, privacy: .public)")
                 }
 
+                if let creationDate = try? name.resourceValues(forKeys: [.creationDateKey]).creationDate, abs(creationDate.timeIntervalSinceNow) > 60 * 10 {
+                    logger.log("Disk was marked as unmounted more than 10 minutes ago, which is strange. Will open GUI as a fallback")
+                    couldCleanAllItems = false
+                }
+                
                 do {
                     try FileManager.default.removeItem(at: name)
                 } catch {
@@ -66,6 +70,8 @@ struct ExtendFSApp: App {
                 .onOpenURL { url in
                     guard !delegate.wasStartedForGUI, url.scheme == "extendfs-internal-diskwatch" else { return }
 
+                    logger.log("Got request to monitor disk \(url.lastPathComponent, privacy: .public)")
+                    
                     dismissWindow(id: "main")
                     let devNode = url.path(percentEncoded: false)
                     NSApp.hide(nil)
@@ -87,9 +93,17 @@ struct ExtendFSApp: App {
                     }
                     do {
                         try Task.checkCancellation()
+                        logger.log("Normal app launch")
                         delegate.wasStartedForGUI = true
                         NSApp.setActivationPolicy(.regular)
                         NSApp.activate()
+                        if !NSApp.isActive {
+                            // weird workaround since LSUIElement is set to avoid dock flickering, but that causes the window to not be activated by default
+                            // either this will activate the GUI, or a background process which is setup to then activate the GUI
+                            let appURL = Bundle.main.bundleURL
+                            let config = NSWorkspace.OpenConfiguration()
+                            NSWorkspace.shared.openApplication(at: appURL, configuration: config)
+                        }
                     } catch {}
                 }
         }

ExtendFS/WatcherModeDelegate.swift

@@ -4,6 +4,9 @@
 import AppKit
 import DiskArbitration
 import Foundation
+import os.log
+
+fileprivate let logger = Logger(subsystem: "com.kpchew.ExtendFS", category: "WatcherModeDelegate")
 
 /// A delegate that creates a pseudo-headless mode for the app to run in when it is in disk monitoring mode.
 ///
@@ -16,7 +19,7 @@ class WatcherModeDelegate: NSObject, NSApplicationDelegate {
     var diskWatcher: DiskWatcher?
 
     func getGUIApp() -> NSRunningApplication? {
-        let runningApps = NSRunningApplication.runningApplications(withBundleIdentifier: "com.kpchew.ExtendFS")
+        let runningApps = NSRunningApplication.runningApplications(withBundleIdentifier: Bundle.main.bundleIdentifier!)
         for app in runningApps {
             if app.activationPolicy != .prohibited {
                 return app
@@ -31,24 +34,32 @@ class WatcherModeDelegate: NSObject, NSApplicationDelegate {
 
         if hasFirstActivated {
             // user opened app manually but background listener was activated, open a new GUI app
+            logger.log("Received activation request in background mode")
             NSApp.deactivate()
             NSApp.hide(nil)
             NSApplication.shared.setActivationPolicy(.prohibited)
             if let app = getGUIApp() {
+                logger.log("GUI app found, activating it")
                 app.activate()
             } else {
+                logger.log("No GUI app found, launching one")
                 let appURL = Bundle.main.bundleURL
                 let config = NSWorkspace.OpenConfiguration()
                 config.createsNewApplicationInstance = true
                 config.activates = true
-                NSWorkspace.shared.openApplication(at: appURL, configuration: config)
+                Task {
+                    let app = try? await NSWorkspace.shared.openApplication(at: appURL, configuration: config)
+                    app?.activate()
+                }
+                
             }
         }
     }
 
     func applicationWillTerminate(_ notification: Notification) {
         guard !wasStartedForGUI else { return }
         // something told the app to quit, try to cleanly unmount because this is probably an update
+        logger.log("Received request to terminate, trying to unmounting disk")
         diskWatcher?.unmount()
     }