perf: 校验实时选择器

mojune8 · Jan 18, 2024 · b7a1b30 · b7a1b30
1 parent 25d3c64
commit b7a1b30
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/src/main/kotlin/li/songe/gkd/service/GkdAbService.kt b/app/src/main/kotlin/li/songe/gkd/service/GkdAbService.kt
@@ -503,12 +503,12 @@ class GkdAbService : CompositionAbService({
 
         fun execAction(gkdAction: GkdAction): ActionResult {
             val serviceVal = service ?: throw RpcError("无障碍没有运行")
-            val selector = try {
-                Selector.parse(gkdAction.selector)
-            } catch (e: Exception) {
-                throw RpcError("非法选择器")
+            val selector = Selector.parseOrNull(gkdAction.selector) ?: throw RpcError("非法选择器")
+            selector.propertyNames.forEach { n ->
+                if (!allowPropertyNames.contains(n)) {
+                    throw RpcError("未知属性名:$n")
+                }
             }
-
             val targetNode =
                 serviceVal.safeActiveWindow?.querySelector(selector, gkdAction.quickFind)
                     ?: throw RpcError("没有选择到节点")