feat: add verification logging for block/unblock and fix mDNSResponder exact-match pid lookup

Author: andrewyzhou

TomeHelper/HostsEditor.swift

@@ -14,7 +14,6 @@ class HostsEditor {
             var block = "\n\(blockMarkerStart)\n"
             for domain in unique {
                 block += "0.0.0.0 \(domain)\n"
-                // also block www. variant if not already present
                 if !domain.hasPrefix("www.") {
                     block += "0.0.0.0 www.\(domain)\n"
                 }
@@ -23,17 +22,68 @@ class HostsEditor {
             content += block
         }
 
-        try? content.write(toFile: hostsPath, atomically: true, encoding: .utf8)
+        do {
+            try content.write(toFile: hostsPath, atomically: true, encoding: .utf8)
+        } catch {
+            log("ERROR: failed to write /etc/hosts during block: \(error)")
+            return
+        }
+
         flushDNSCache()
+        verifyBlock(expectedDomains: domains)
     }
 
     func removeAllBlocks() {
         var content = (try? String(contentsOfFile: hostsPath, encoding: .utf8)) ?? ""
         content = removeBlockSection(from: content)
-        try? content.write(toFile: hostsPath, atomically: true, encoding: .utf8)
+
+        do {
+            try content.write(toFile: hostsPath, atomically: true, encoding: .utf8)
+        } catch {
+            log("ERROR: failed to write /etc/hosts during unblock: \(error)")
+            return
+        }
+
         flushDNSCache()
+        verifyUnblock()
+    }
+
+    // MARK: - Verification
+
+    private func verifyBlock(expectedDomains: [String]) {
+        guard let current = try? String(contentsOfFile: hostsPath, encoding: .utf8) else {
+            log("VERIFY ERROR: could not re-read /etc/hosts after block")
+            return
+        }
+        guard current.contains(blockMarkerStart), current.contains(blockMarkerEnd) else {
+            log("VERIFY ERROR: tome-block markers missing from /etc/hosts after block")
+            return
+        }
+        // spot-check first 3 domains
+        let sample = Array(expectedDomains.prefix(3))
+        for domain in sample {
+            if !current.contains("0.0.0.0 \(domain)") {
+                log("VERIFY ERROR: domain \(domain) not found in /etc/hosts after block")
+                return
+            }
+        }
+        log("VERIFY OK: \(expectedDomains.count) domain(s) confirmed in /etc/hosts")
     }
 
+    private func verifyUnblock() {
+        guard let current = try? String(contentsOfFile: hostsPath, encoding: .utf8) else {
+            log("VERIFY ERROR: could not re-read /etc/hosts after unblock")
+            return
+        }
+        if current.contains(blockMarkerStart) || current.contains(blockMarkerEnd) {
+            log("VERIFY ERROR: tome-block markers still present in /etc/hosts after unblock")
+            return
+        }
+        log("VERIFY OK: /etc/hosts clean after unblock")
+    }
+
+    // MARK: - Helpers
+
     private func removeBlockSection(from content: String) -> String {
         var result = ""
         var inBlock = false
@@ -50,7 +100,6 @@ class HostsEditor {
                 result += line + "\n"
             }
         }
-        // trim trailing newlines added by section removal, preserve one
         return result.trimmingCharacters(in: .newlines) + "\n"
     }
 
@@ -61,17 +110,21 @@ class HostsEditor {
         try? task.run()
         task.waitUntilExit()
 
+        guard let pid = mDNSResponderPID() else {
+            log("WARN: could not find mDNSResponder PID — DNS cache not flushed via HUP")
+            return
+        }
         let task2 = Process()
         task2.launchPath = "/bin/kill"
-        task2.arguments = ["-HUP", String(mDNSResponderPID() ?? 0)]
+        task2.arguments = ["-HUP", String(pid)]
         try? task2.run()
         task2.waitUntilExit()
     }
 
     private func mDNSResponderPID() -> Int32? {
         let task = Process()
         task.launchPath = "/bin/pgrep"
-        task.arguments = ["mDNSResponder"]
+        task.arguments = ["-x", "mDNSResponder"]  // -x: exact match, avoids multi-match
         let pipe = Pipe()
         task.standardOutput = pipe
         try? task.run()