Auto-delete logs finished + custom App-to-VPN messages

main/AppDelegate.swift

@@ -22,4 +22,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		sync.start()
 		return true
 	}
+	
+	func applicationDidBecomeActive(_ application: UIApplication) {
+		TheGreatDestroyer.deleteLogs(olderThan: PrefsShared.AutoDeleteLogsDays)
+	}
 }

main/DB/DBCommon.swift

@@ -39,9 +39,21 @@ extension SQLiteDatabase {
 	/// `INSERT INTO cache (dns, opt) VALUES (?, ?);`
 	func logWrite(_ domain: String, blocked: Bool = false) throws {
 		try self.run(sql: "INSERT INTO cache (dns, opt) VALUES (?, ?);",
-			bind: [BindText(domain), BindInt32(blocked ? 1 : 0)])
+					 bind: [BindText(domain), BindInt32(blocked ? 1 : 0)])
 		{ try ifStep($0, SQLITE_DONE) }
 	}
+	
+	/// `DELETE FROM cache WHERE ts < (now - ? days);`
+	/// - Parameter days: if `0` or negative, this function does nothing.
+	/// - Returns: `true` if at least one row was deleted.
+	@discardableResult func dnsLogsDeleteOlderThan(days: Int) throws -> Bool {
+		guard days > 0 else { return false }
+		return try self.run(sql: "DELETE FROM cache WHERE ts < strftime('%s', 'now', ?);",
+							bind: [BindText("-\(days) days")]) {
+			try ifStep($0, SQLITE_DONE)
+			return numberOfChanges > 0
+		}
+	}
 }
 
 

main/DB/TheGreatDestroyer.swift

@@ -15,7 +15,7 @@ struct TheGreatDestroyer {
 		}
 	}
 	
-	/// Fired when user taps on Settings -> Delete All Logs
+	/// Fired when user taps on Settings -> "Delete All Logs"
 	static func deleteAllLogs() {
 		sync.pause()
 		DispatchQueue.global().async {
@@ -26,4 +26,18 @@ struct TheGreatDestroyer {
 			} catch {}
 		}
 	}
+	
+	/// Fired when user changes Settings -> "Auto-delete logs" and every time the App enters foreground
+	static func deleteLogs(olderThan days: Int) {
+		guard days > 0 else { return }
+		sync.pause()
+		DispatchQueue.global().async {
+			defer { sync.continue() }
+			QLog.Info("Auto-delete logs")
+			guard let success = try? AppDB?.dnsLogsDeleteOlderThan(days: days), success else {
+				return // nothing changed
+			}
+			sync.needsReloadDB()
+		}
+	}
 }

main/GlassVPN.swift

@@ -43,6 +43,19 @@ final class GlassVPNManager {
 		}
 	}
 	
+	/// Notify VPN extension about changes
+	/// - Returns: `true` on success, `false` if VPN is off or message could not be converted to `.utf8`
+	@discardableResult func send(_ message: VPNAppMessage) -> Bool {
+		if let session = self.managerVPN?.connection as? NETunnelProviderSession,
+			session.status == .connected, let data = message.raw {
+			do {
+				try session.sendProviderMessage(data, responseHandler: nil)
+				return true
+			} catch {}
+		}
+		return false
+	}
+	
 	
 	// MARK: - Notify callback
 	
@@ -50,12 +63,8 @@ final class GlassVPNManager {
 		postRawVPNState((notification.object as? NETunnelProviderSession)?.status ?? .invalid)
 	}
 	
-	@objc private func didChangeDomainFilter() {
-		// Notify VPN extension about changes
-		if let session = self.managerVPN?.connection as? NETunnelProviderSession,
-			session.status == .connected {
-			try? session.sendProviderMessage("filter-update".data(using: .ascii)!, responseHandler: nil)
-		}
+	@objc private func didChangeDomainFilter(_ notification: Notification) {
+		send(.filterUpdate(domain: notification.object as? String))
 	}
 	
 	
@@ -109,3 +118,22 @@ final class GlassVPNManager {
 		NotifyVPNStateChanged.post()
 	}
 }
+
+
+//  ---------------------------------------------------------------
+// |
+// |    MARK: - VPN message
+// |
+//  ---------------------------------------------------------------
+
+struct VPNAppMessage {
+	let raw: Data?
+	init(_ string: String) { raw = string.data(using: .utf8) }
+	
+	static func filterUpdate(domain: String? = nil) -> Self {
+		.init("filter-update:\(domain ?? "")")
+	}
+	static func autoDelete(after interval: Int) -> Self {
+		.init("auto-delete:\(interval)")
+	}
+}

main/Settings/TVCSettings.swift

@@ -77,14 +77,19 @@ class TVCSettings: UITableViewController {
 			
 			let picker = DurationPickerAlert(
 				title: "Auto-delete logs",
-				detail: "Logs will be deleted on app launch or periodically as long as the VPN is running.",
+				detail: "Warning: Logs older than the selected interval are deleted immediately! " +
+						"Logs are also deleted on each app launch, and periodically in the background as long as the VPN is running.",
 				options: [(0...30).map{"\($0)"}, ["Days", "Weeks", "Months"]],
 				widths: [0.4, 0.6])
 			picker.pickerView.setSelection([min(30, one), two])
-			picker.present(in: self) {
-				PrefsShared.AutoDeleteLogsDays = $1[0] * multiplier[$1[1]]
-				cell.detailTextLabel?.text = autoDeleteString($1[0], unit: $1[1])
-				// TODO: notify VPN and local delete timer
+			picker.present(in: self) { _, idx in
+				cell.detailTextLabel?.text = autoDeleteString(idx[0], unit: idx[1])
+				let asDays = idx[0] * multiplier[idx[1]]
+				PrefsShared.AutoDeleteLogsDays = asDays
+				if !GlassVPN.send(.autoDelete(after: asDays)) {
+					// if VPN isn't active, fallback to immediate local delete
+					TheGreatDestroyer.deleteLogs(olderThan: asDays)
+				}
 			}
 		}
 	}