Preserve provider routing rules in Happ merge

Author: decoder-dev

CHANGELOG.md

@@ -17,6 +17,13 @@ All notable changes to **decoder sec.** are documented here.
 - In-app log console
 - Signed TestFlight builds
 
+## [0.1.0-beta.16] — 2026-08-12
+
+### Fixed
+- Дополнительный фикс Happ routing: catch-all правило больше не перекрывает правила провайдера
+- Существующие `routing.rules` из подписки сохраняются полностью; Happ-правила добавляются безопасно
+- Если в подписке уже есть свой catch-all (включая `balancerTag`), второй не добавляется
+
 ## [0.1.0-beta.15] — 2026-08-12
 
 ### Fixed

Shared/DeepLink/RoutingProfileStore.swift

@@ -221,11 +221,21 @@ enum HappRoutingApplier {
         ])
 
         // Merge with existing routing instead of replacing everything.
-        // Keep non-Happ rules so provider-specific routing logic survives.
+        // Important: keep provider rules untouched; append Happ catch-all only at the very end.
         var routing = (root["routing"] as? [String: Any]) ?? [:]
         let existingRules = (routing["rules"] as? [[String: Any]]) ?? []
-        let keptExisting = existingRules.filter { !looksLikeManagedHappRule($0, proxyTag: proxyTag, directTag: directTag, blockTag: blockTag) }
-        routing["rules"] = happRules + keptExisting
+
+        // Keep only specific Happ rules before provider rules.
+        // Global catch-all is appended last so it doesn't shadow provider logic.
+        let happSpecificRules = Array(happRules.dropLast())
+        let happCatchAll = happRules.last
+
+        var mergedRules = happSpecificRules + existingRules
+        if let catchAll = happCatchAll, !existingRules.contains(where: looksLikeCatchAllRule) {
+            mergedRules.append(catchAll)
+        }
+        routing["rules"] = mergedRules
+
         if let domainStrategy, !domainStrategy.isEmpty {
             routing["domainStrategy"] = domainStrategy
         } else if routing["domainStrategy"] == nil {
@@ -276,13 +286,21 @@ enum HappRoutingApplier {
         return nil
     }
 
-    private static func looksLikeManagedHappRule(_ rule: [String: Any], proxyTag: String, directTag: String, blockTag: String) -> Bool {
+    private static func looksLikeCatchAllRule(_ rule: [String: Any]) -> Bool {
         guard let type = rule["type"] as? String, type == "field" else { return false }
-        guard let outbound = rule["outboundTag"] as? String else { return false }
-        if outbound == proxyTag || outbound == directTag || outbound == blockTag {
-            return true
-        }
-        return false
+
+        // Typical Xray catch-all patterns used in subscription configs.
+        let hasDomain = (rule["domain"] as? [Any])?.isEmpty == false
+        let hasIP = (rule["ip"] as? [Any])?.isEmpty == false
+        let hasPort = rule["port"] != nil
+        let hasProtocol = rule["protocol"] != nil
+        let hasInboundTag = rule["inboundTag"] != nil
+        let hasProcess = rule["process"] != nil
+
+        // If rule has no specific selectors and forwards by outbound/balancer,
+        // it is effectively a catch-all.
+        let hasForward = rule["outboundTag"] != nil || rule["balancerTag"] != nil
+        return hasForward && !hasDomain && !hasIP && !hasPort && !hasProtocol && !hasInboundTag && !hasProcess
     }
 
     private static func stringArray(_ any: Any?) -> [String] {