添加正则校验 修改Rule名称回调时机

Author: codersdg

NIO1901/Modules/RuleList/Controller/RuleOverViewController.swift

@@ -257,6 +257,7 @@ class RuleItemView: UIView {
             contentField?.tag = 0
             contentField?.delegate = self
             contentView.addSubview(contentField!)
+            contentField?.addTarget(self, action: #selector(textFieldDidChange(_:)), for: UIControl.Event.editingChanged)
             break
         case .Switch:
             let labelFrame = CGRect(x: LRSpacing, y: 0, width: SCREENWIDTH - LRSpacing * 2 - 50, height: contentHeight)
@@ -297,10 +298,13 @@ class RuleItemView: UIView {
     @objc func contentViewDidClick(){
         contentDidClickHandle?()
     }
+    
+    @objc func textFieldDidChange(_ textField: UITextField) {
+        textValueChangeHandle?(textField.text ?? "")
+        
+    }
 }
 
 extension RuleItemView: UITextFieldDelegate {
-    func textFieldDidEndEditing(_ textField: UITextField) {
-        textValueChangeHandle?(textField.text ?? "")
-    }
+ 
 }

TunnelServices/Rule/Rule.swift

@@ -450,6 +450,10 @@ public class Rule: ASModel {
             case .DOMAINSUFFIX:
                 if host.lowercased().hasSuffix(item.value.lowercased()) { return true }
             case .URLREGEX:
+                guard (try? NSRegularExpression(pattern: item.value, options: .caseInsensitive)) != nil else {
+                    print("Invalid Regex")
+                    return false
+                }
                 let pred = NSPredicate(format: "SELF MATCHES %@", item.value)
                 if pred.evaluate(with: host) || pred.evaluate(with: fullUri) || pred.evaluate(with: fullUri.urlEncoded()) {
                     return true
@@ -497,6 +501,10 @@ public class Rule: ASModel {
 //                    print("命中DOMAINSUFFIX(\(item.value)):\n*************************\n\(host)\n\(target)\n\(uri)\n*************************")
                     return true }
             case .URLREGEX:
+                guard (try? NSRegularExpression(pattern: item.value, options: .caseInsensitive)) != nil else {
+                    print("Invalid Regex")
+                    return false
+                }
                 let pred = NSPredicate(format: "SELF MATCHES %@", item.value)
                 if pred.evaluate(with: host) || pred.evaluate(with: fullUri) || pred.evaluate(with: fullUri.urlEncoded()) {
 //                    print("命中URLREGEX(\(item.value)):\n*************************\n\(host)\n\(target)\n\(uri)\n*************************")