fix: optimize iframe resolution logic by adjusting backend node ID checks and enhancing child frame handling

Author: thalissonvs

pydoll/elements/web_element.py

@@ -915,26 +915,29 @@ async def _resolve_oopif_by_parent(
             root_frame = (frame_tree or {}).get('frame', {})
             root_frame_id = root_frame.get('id', '')
 
-            is_matching_owner = False
-            if root_frame_id and backend_node_id is not None:
-                owner_backend_id = await self._owner_backend_for(
-                    self._connection_handler, None, root_frame_id
-                )
-                is_matching_owner = owner_backend_id == backend_node_id
-
-            if is_matching_owner or (backend_node_id is None and is_single_child and root_frame_id):
+            if is_single_child and root_frame_id and backend_node_id is None:
                 return (
                     browser_handler,
                     attached_session_id,
                     root_frame_id,
                     root_frame.get('url'),
                 )
 
+            if root_frame_id and backend_node_id is not None:
+                owner_backend_id = await self._owner_backend_for(
+                    self._connection_handler, None, root_frame_id
+                )
+                if owner_backend_id == backend_node_id:
+                    return (
+                        browser_handler,
+                        attached_session_id,
+                        root_frame_id,
+                        root_frame.get('url'),
+                    )
+
         for target_info in target_infos:
             if target_info.get('type') not in {'iframe', 'page'}:
                 continue
-            if backend_node_id is None:
-                continue
             attach_response = await browser_handler.execute_command(
                 TargetCommands.attach_to_target(
                     target_id=target_info.get('targetId', ''), flatten=True
@@ -947,7 +950,7 @@ async def _resolve_oopif_by_parent(
             root_frame = (frame_tree or {}).get('frame', {})
             root_frame_id = root_frame.get('id', '')
 
-            if root_frame_id:
+            if root_frame_id and backend_node_id is not None:
                 owner_backend_id = await self._owner_backend_for(
                     self._connection_handler, None, root_frame_id
                 )
@@ -959,14 +962,18 @@ async def _resolve_oopif_by_parent(
                         root_frame.get('url'),
                     )
 
+            child_frame_id = WebElement._find_child_by_parent(frame_tree, parent_frame_id)
+            if child_frame_id:
+                return browser_handler, attached_session_id, child_frame_id, None
+
         return None, None, None, None
 
     @staticmethod
     def _extract_frame_metadata(
         node_info: Node,
     ) -> tuple[Optional[str], Optional[str], Optional[str], Optional[int]]:
         """
-        Extract iframe-related metadata from a DOM.describeNode Node.
+        Extract iframe-related metadata from a DOM.describeNode Node.task
 
         Args:
             node_info (Node): DOM node information of the iframe element.
@@ -1050,7 +1057,7 @@ async def _resolve_oopif_if_needed(
             tuple[ConnectionHandler | None, str | None, str | None, str | None]:
                 (session_handler, session_id, frame_id, document_url).
         """
-        if not parent_frame_id:
+        if not parent_frame_id or (current_frame_id and backend_node_id is None):
             return None, None, current_frame_id, current_document_url
 
         (
@@ -1060,15 +1067,15 @@ async def _resolve_oopif_if_needed(
             resolved_url,
         ) = await self._resolve_oopif_by_parent(parent_frame_id, backend_node_id)
 
-        if session_handler and session_id:
+        if session_handler and session_id and resolved_url:
             return (
                 session_handler,
                 session_id,
                 resolved_frame_id or current_frame_id,
                 resolved_url or current_document_url,
             )
 
-        return None, None, current_frame_id, current_document_url
+        return None, None, current_frame_id or resolved_frame_id, current_document_url or resolved_url
 
     def _init_iframe_context(
         self,

tests/test_web_element.py

@@ -1904,8 +1904,10 @@ async def side_effect(command, timeout=60):
                 return {
                     'result': {
                         'node': {
+                            # Simula um iframe de mesma origem já com frameId
+                            # resolvido; não precisamos de backendNodeId aqui,
+                            # pois não queremos acionar a resolução OOPIF.
                             'frameId': 'parent-frame',
-                            'backendNodeId': 999,
                             'contentDocument': {
                                 'frameId': 'iframe-123',
                                 'documentURL': 'https://example.com/frame.html',
@@ -2435,9 +2437,14 @@ async def side_effect(command, timeout=60):
                             }
                         }
                     }
+                if method == 'DOM.getFrameOwner':
+                    # For direct-child success, owner _does_ match backend_node_id
+                    return {'result': {'backendNodeId': 999}}
                 raise AssertionError(f'Unexpected method {method}')
 
             browser_handler.execute_command.side_effect = side_effect
+            # Route DOM.getFrameOwner calls from _owner_backend_for to the same side_effect
+            iframe_element._connection_handler.execute_command.side_effect = side_effect
 
             handler, session_id, frame_id, url = await iframe_element._resolve_oopif_by_parent(
                 'parent-frame-123', 999
@@ -2687,9 +2694,9 @@ class TestResolveOOPIFIfNeeded:
 
     @pytest.mark.asyncio
     async def test_resolve_oopif_if_needed_already_has_frame_id(self, iframe_element):
-        """Test OOPIF resolution skipped when frame_id already exists."""
+        """Test OOPIF resolution skipped when frame_id already exists and no backend_node_id."""
         handler, session_id, frame_id, url = await iframe_element._resolve_oopif_if_needed(
-            'existing-frame-id', 'parent-frame', 999, 'https://example.com'
+            'existing-frame-id', 'parent-frame', None, 'https://example.com'
         )
 
         # Should return early without resolution