osn-selenium 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

osn_selenium/dev_tools/target/lifecycle.py

@@ -1,7 +1,7 @@
 import trio
 from typing import List
+from osn_selenium._decorators import log_on_error
 from osn_selenium.dev_tools.target.detach import DetachMixin
-from osn_selenium.exceptions.devtools import CDPEndExceptions
 from osn_selenium.dev_tools.target.discovery import DiscoveryMixin
 from osn_selenium.dev_tools.target.events import EventHandlersMixin
 from osn_selenium.dev_tools.logger.target import build_target_logger
@@ -17,6 +17,10 @@ from osn_selenium.dev_tools._functions import (
 	execute_cdp_command,
 	wait_one
 )
+from osn_selenium.exceptions.devtools import (
+	CDPEndExceptions,
+	TrioEndExceptions
+)
 
 
 __all__ = ["LifecycleMixin"]
@@ -32,41 +36,96 @@ class LifecycleMixin(DiscoveryMixin, EventHandlersMixin, DetachMixin, Fingerprin
 		Closes all active resources, channels, and loggers associated with the target.
 		"""
 		
-		if self._new_target_receive_channel is not None:
-			await self._new_target_receive_channel[0].aclose()
-			await self._new_target_receive_channel[1].wait()
-			self._new_target_receive_channel = None
-		
-		if self._detached_receive_channel is not None:
-			await self._detached_receive_channel.aclose()
-			self._detached_receive_channel = None
-		
-		if self._logger_cdp_send_channel is not None:
-			await self._logger_cdp_send_channel.aclose()
-			self._logger_cdp_send_channel = None
-		
-		if self._logger_fingerprint_send_channel is not None:
-			await self._logger_fingerprint_send_channel.aclose()
-			self._logger_fingerprint_send_channel = None
-		
-		if self._logger is not None:
-			await self._logger.close()
-			self._logger = None
-		
-		for event_name, channel in self._events_receive_channels.items():
-			await channel[0].aclose()
-			await channel[1].wait()
-		
-		self._events_receive_channels = {}
-		
-		for scope_name, scope in self._cancel_scopes.items():
-			scope.cancel()
-		
-		self._cancel_scopes = {}
-		
-		if self.background_task_ended is not None:
-			await self.background_task_ended.wait()
-			self.background_task_ended = None
+		@log_on_error
+		async def _close_new_target_receive_channel() -> None:
+			if self._new_target_receive_channel is not None:
+				try:
+					await self._new_target_receive_channel[0].aclose()
+					await self._new_target_receive_channel[1].wait()
+				except TrioEndExceptions:
+					pass
+			
+				self._new_target_receive_channel = None
+		
+		@log_on_error
+		async def _close_logger_fingerprint_send_channel() -> None:
+			if self._logger_fingerprint_send_channel is not None:
+				try:
+					await self._logger_fingerprint_send_channel.aclose()
+				except TrioEndExceptions:
+					pass
+			
+				self._logger_fingerprint_send_channel = None
+		
+		@log_on_error
+		async def _close_logger_cdp_send_channel() -> None:
+			if self._logger_cdp_send_channel is not None:
+				try:
+					await self._logger_cdp_send_channel.aclose()
+				except TrioEndExceptions:
+					pass
+			
+				self._logger_cdp_send_channel = None
+		
+		@log_on_error
+		async def _close_logger() -> None:
+			if self._logger is not None:
+				try:
+					await self._logger.close()
+				except TrioEndExceptions:
+					pass
+			
+				self._logger = None
+		
+		@log_on_error
+		async def _close_events_receive_channels() -> None:
+			for event_name, channel in self._events_receive_channels.items():
+				try:
+					await channel[0].aclose()
+					await channel[1].wait()
+				except TrioEndExceptions:
+					pass
+			
+			self._events_receive_channels.clear()
+		
+		@log_on_error
+		async def _close_detached_receive_channel() -> None:
+			if self._detached_receive_channel is not None:
+				try:
+					await self._detached_receive_channel.aclose()
+				except TrioEndExceptions:
+					pass
+			
+				self._detached_receive_channel = None
+		
+		@log_on_error
+		def _close_cancel_scopes() -> None:
+			for scope_name, scope in self._cancel_scopes.items():
+				try:
+					scope.cancel()
+				except TrioEndExceptions:
+					pass
+			
+			self._cancel_scopes.clear()
+		
+		@log_on_error
+		async def _close_background_task() -> None:
+			if self.background_task_ended is not None:
+				try:
+					await self.background_task_ended.wait()
+				except TrioEndExceptions:
+					pass
+			
+				self.background_task_ended = None
+		
+		await _close_new_target_receive_channel()
+		await _close_detached_receive_channel()
+		await _close_logger_cdp_send_channel()
+		await _close_logger_fingerprint_send_channel()
+		await _close_logger()
+		await _close_events_receive_channels()
+		_close_cancel_scopes()
+		await _close_background_task()
 	
 	async def _setup_target(self):
 		"""
@@ -93,9 +152,9 @@ class LifecycleMixin(DiscoveryMixin, EventHandlersMixin, DetachMixin, Fingerprin
 			fingerprint_detecting_ready_event = trio.Event()
 			target_ready_events.append(fingerprint_detecting_ready_event)
 		
-			self._nursery_object.start_soon(self._run_new_targets_listener, new_targets_listener_ready_event)
-			self._nursery_object.start_soon(self._setup_fingerprint_injection, fingerprint_detecting_ready_event)
-			self._nursery_object.start_soon(self._run_detach_checking)
+			self._nursery.start_soon(self._run_new_targets_listener, new_targets_listener_ready_event)
+			self._nursery.start_soon(self._setup_fingerprint_injection, fingerprint_detecting_ready_event)
+			self._nursery.start_soon(self._run_detach_checking)
 		
 			if self._domains_settings:
 				for domain_name, domain_config in self._domains_settings.model_dump(exclude_none=True).items():
@@ -117,7 +176,7 @@ class LifecycleMixin(DiscoveryMixin, EventHandlersMixin, DetachMixin, Fingerprin
 		
 					domain_handlers_ready_event = trio.Event()
 					target_ready_events.append(domain_handlers_ready_event)
-					self._nursery_object.start_soon(
+					self._nursery.start_soon(
 							self._run_events_handlers,
 							domain_handlers_ready_event,
 							getattr(self._domains_settings, domain_name)
@@ -151,7 +210,7 @@ class LifecycleMixin(DiscoveryMixin, EventHandlersMixin, DetachMixin, Fingerprin
 		"""
 		
 		try:
-			self._logger_cdp_send_channel, self._logger_fingerprint_send_channel, self._logger = build_target_logger(self.target_data, self._nursery_object, self._logger_settings)
+			self._logger_cdp_send_channel, self._logger_fingerprint_send_channel, self._logger = build_target_logger(self.target_data, self._nursery, self._logger_settings)
 		
 			if self._cdp_target_type_log_accepted:
 				await self._logger.run()
@@ -167,8 +226,9 @@ class LifecycleMixin(DiscoveryMixin, EventHandlersMixin, DetachMixin, Fingerprin
 					await self._setup_target()
 		
 					if self._target_background_task is not None:
-						self._nursery_object.start_soon(background_task_decorator(self._target_background_task), self)
-		
+						self._nursery.start_soon(background_task_decorator(self._target_background_task), self)
+
+					self.started_event.set()
 					await wait_one(self.exit_event, self.about_to_stop_event)
 		except* (BrowserError, RuntimeError):
 			self.about_to_stop_event.set()

osn_selenium/dev_tools/target/logging.py

@@ -10,7 +10,7 @@ from typing import (
 	Optional,
 	TYPE_CHECKING
 )
-from osn_selenium.dev_tools._exception_helpers import (
+from osn_selenium._exception_helpers import (
 	extract_exception_trace,
 	log_exception
 )

osn_selenium/exceptions/__init__.py

@@ -1 +0,0 @@
-

osn_selenium/exceptions/base.py

@@ -1,5 +1,8 @@
-__all__ = ["OSNSeleniumError"]
+from osn_selenium._exception_helpers import (
+	extract_exception_trace
+)
 
+__all__ = ["ExceptionThrown", "OSNSeleniumError"]
 
 class OSNSeleniumError(Exception):
 	"""
@@ -7,3 +10,27 @@ class OSNSeleniumError(Exception):
 	"""
 	
 	pass
+
+
+class ExceptionThrown:
+	"""
+	A wrapper class to indicate that an exception was thrown during an operation.
+
+	This is used in `execute_cdp_command` when `error_mode` is "log" or "pass"
+	to return an object indicating an error occurred without re-raising it immediately.
+
+	Attributes:
+		exception (BaseException): The exception that was caught.
+		traceback (str): The formatted traceback string of the exception.
+	"""
+	
+	def __init__(self, exception: BaseException) -> None:
+		"""
+		Initializes the ExceptionThrown wrapper.
+
+		Args:
+			exception (BaseException): The exception to wrap.
+		"""
+		
+		self.exception = exception
+		self.traceback = extract_exception_trace(exception)

osn_selenium/exceptions/bidi_bridge.py

@@ -0,0 +1,59 @@
+from osn_selenium.exceptions.base import OSNSeleniumError
+
+__all__ = ["BiDiBridgeError", "BiDiBridgeStoppedError", "BiDiExecutionError", "CommandNotMappedToBiDiError"]
+
+class BiDiBridgeError(OSNSeleniumError):
+	"""
+	Base class for exceptions related to the BiDi Bridge.
+	"""
+	
+	pass
+
+
+class CommandNotMappedToBiDiError(BiDiBridgeError):
+	"""
+	Exception raised when a requested W3C command has no corresponding BiDi mapping.
+	"""
+	
+	def __init__(self, command: str) -> None:
+		"""
+		Initialize the exception.
+
+		Args:
+			command (str): The name of the unmapped command.
+		"""
+		
+		super().__init__(f"{command} is not mapped to BiDi.")
+
+
+class BiDiExecutionError(OSNSeleniumError):
+	"""
+	Exception raised when a BiDi command execution fails on the browser side.
+	"""
+	
+	def __init__(self, error: str, message: str) -> None:
+		"""
+		Initialize the exception with the error type and message.
+
+		Args:
+			error (str): The error category or code returned by the BiDi protocol.
+			message (str): The detailed error message provided by the browser.
+		"""
+		
+		super().__init__(f"BiDi: {error} - {message}")
+
+
+class BiDiBridgeStoppedError(BiDiBridgeError):
+	"""
+	Raised when the BiDi bridge has been stopped while tasks were still pending.
+	"""
+	
+	def __init__(self, reason: str) -> None:
+		"""
+		Initializes the error with the stop reason.
+
+		Args:
+			reason (str): The reason why the bridge stopped.
+		"""
+		
+		super().__init__(f"BiDi bridge was stopped. Reason: {reason}")

osn_selenium/exceptions/configuration.py

@@ -5,14 +5,7 @@ from osn_selenium._typehints import (
 	TYPES_FOR_FLATTENING_TYPEHINT
 )
 
-
-__all__ = [
-	"ConfigurationError",
-	"DuplicationError",
-	"NotExpectedTypeError",
-	"NotExpectedValueError"
-]
-
+__all__ = ["ConfigurationError", "DuplicationError", "NotExpectedTypeError", "NotExpectedValueError"]
 
 class ConfigurationError(OSNSeleniumError):
 	"""

osn_selenium/exceptions/dependencies.py

@@ -1,9 +1,9 @@
 from typing import Union
+from osn_selenium.exceptions.base import OSNSeleniumError
 from osn_selenium._cdp_import import (
 	check_cdp_version_exists_on_github
 )
 
-
 __all__ = ["CDPPackageError", "DependencyError"]
 
 _CDP_PACKAGE_EXISTS = """
@@ -19,7 +19,7 @@ If you need this specific version, you can generate it using the https://github.
 """.strip("\n")
 
 
-class DependencyError(Exception):
+class DependencyError(OSNSeleniumError):
 	"""
 	Base exception for dependency-related issues.
 	"""

osn_selenium/exceptions/devtools.py

@@ -1,48 +1,12 @@
 import trio
+import trio_websocket
 from osn_selenium.exceptions.base import OSNSeleniumError
-from osn_selenium.dev_tools._exception_helpers import (
-	extract_exception_trace
-)
 from selenium.webdriver.common.bidi.cdp import (
 	BrowserError,
 	CdpConnectionClosed
 )
 
-
-__all__ = [
-	"BidiConnectionNotEstablishedError",
-	"CDPCommandNotFoundError",
-	"CDPEndExceptions",
-	"CantEnterDevToolsContextError",
-	"DevToolsError",
-	"ExceptionThrown",
-	"TrioEndExceptions"
-]
-
-
-class ExceptionThrown:
-	"""
-	A wrapper class to indicate that an exception was thrown during an operation.
-
-	This is used in `execute_cdp_command` when `error_mode` is "log" or "pass"
-	to return an object indicating an error occurred without re-raising it immediately.
-
-	Attributes:
-		exception (BaseException): The exception that was caught.
-		traceback (str): The formatted traceback string of the exception.
-	"""
-	
-	def __init__(self, exception: BaseException) -> None:
-		"""
-		Initializes the ExceptionThrown wrapper.
-
-		Args:
-			exception (BaseException): The exception to wrap.
-		"""
-		
-		self.exception = exception
-		self.traceback = extract_exception_trace(exception)
-
+__all__ = ["BidiConnectionNotEstablishedError", "CDPCommandNotFoundError", "CDPEndExceptions", "CantEnterDevToolsContextError", "DevToolsError", "TrioEndExceptions", "WebSocketEndExceptions"]
 
 class DevToolsError(OSNSeleniumError):
 	"""
@@ -76,7 +40,7 @@ class CDPCommandNotFoundError(DevToolsError):
 	Error raised when a requested CDP command attribute is not found in the specified module.
 	"""
 	
-	def __init__(self, object_: str, module_: str):
+	def __init__(self, object_: str, module_: str) -> None:
 		"""
 		Initializes CDPCommandNotFoundError.
 
@@ -105,6 +69,12 @@ class BidiConnectionNotEstablishedError(DevToolsError):
 
 
 TrioEndExceptions = (trio.Cancelled, trio.EndOfChannel, trio.ClosedResourceError)
+WebSocketEndExceptions = (
+		trio.Cancelled,
+		trio.EndOfChannel,
+		trio.ClosedResourceError,
+		trio_websocket.ConnectionClosed
+)
 CDPEndExceptions = (
 		trio.Cancelled,
 		trio.EndOfChannel,

osn_selenium/exceptions/experimental.py

@@ -0,0 +1,26 @@
+from osn_selenium.exceptions.base import OSNSeleniumError
+
+__all__ = ["ExperimentalFeatureError", "NotImplementedExperimentalFeatureError"]
+
+class ExperimentalFeatureError(OSNSeleniumError):
+	"""
+	Base exception for experimental feature errors.
+	"""
+	
+	pass
+
+
+class NotImplementedExperimentalFeatureError(ExperimentalFeatureError):
+	"""
+	Raised when an experimental feature is not yet implemented.
+	"""
+	
+	def __init__(self, name: str):
+		"""
+		Initializes the error with the name of the missing feature.
+
+		Args:
+			name (str): The name of the feature.
+		"""
+		
+		super().__init__(f"{name} is not implemented in current version.")

osn_selenium/exceptions/flags.py

@@ -1,9 +1,7 @@
 from osn_selenium.exceptions.base import OSNSeleniumError
 
-
 __all__ = ["FlagError", "FlagNotDefinedError", "FlagTypeNotDefinedError"]
 
-
 class FlagError(OSNSeleniumError):
 	"""
 	Base class for errors related to management flags.

osn_selenium/exceptions/instance.py

@@ -10,15 +10,7 @@ from osn_selenium._typehints import (
 	TYPES_FOR_FLATTENING_TYPEHINT
 )
 
-
-__all__ = [
-	"CannotConvertTypeError",
-	"ElementInteractionError",
-	"ElementNotVisibleError",
-	"InstanceError",
-	"NotExpectedTypeError"
-]
-
+__all__ = ["CannotConvertTypeError", "ElementInteractionError", "ElementNotVisibleError", "InstanceError", "NotExpectedTypeError"]
 
 class InstanceError(OSNSeleniumError):
 	"""

osn_selenium/exceptions/javascript.py

@@ -1,10 +1,8 @@
 from typing import Iterable, Union
 from osn_selenium.exceptions.base import OSNSeleniumError
 
-
 __all__ = ["JavaScriptError", "JavaScriptResourceError"]
 
-
 class JavaScriptError(OSNSeleniumError):
 	"""
 	Base class for JavaScript-related errors.

osn_selenium/exceptions/logic.py

@@ -1,9 +1,7 @@
 from osn_selenium.exceptions.base import OSNSeleniumError
 
-
 __all__ = ["AbstractImplementationError", "LogicError"]
 
-
 class LogicError(OSNSeleniumError):
 	"""
 	Base class for internal logic and implementation errors.

osn_selenium/exceptions/path.py

@@ -2,15 +2,7 @@ from typing import Any
 from osn_selenium._typehints import PATH_TYPEHINT
 from osn_selenium.exceptions.base import OSNSeleniumError
 
-
-__all__ = [
-	"BrowserExecutableNotFoundError",
-	"ExecutableError",
-	"PathError",
-	"PathValidationError",
-	"WebDriverExecutableNotFoundError"
-]
-
+__all__ = ["BrowserExecutableNotFoundError", "ExecutableError", "PathError", "PathValidationError", "WebDriverExecutableNotFoundError"]
 
 class PathError(OSNSeleniumError):
 	"""

osn_selenium/exceptions/platform.py

@@ -1,9 +1,7 @@
 from osn_selenium.exceptions.base import OSNSeleniumError
 
-
 __all__ = ["PlatformError", "PlatformNotSupportedError"]
 
-
 class PlatformError(OSNSeleniumError):
 	"""
 	Base class for environment and platform-specific errors.

osn_selenium/exceptions/protocol.py

@@ -2,16 +2,13 @@ from osn_selenium.exceptions.base import OSNSeleniumError
 from typing import (
 	Any,
 	Iterable,
-	Protocol,
 	Type,
 	Union,
 	get_origin
 )
 
-
 __all__ = ["ProtocolComplianceError", "ProtocolError"]
 
-
 class ProtocolError(OSNSeleniumError):
 	"""
 	Base class for errors related to Protocol contract violations.

osn_selenium/exceptions/webdriver.py

@@ -1,12 +1,6 @@
 from osn_selenium.exceptions.base import OSNSeleniumError
 
-
-__all__ = [
-	"WebDriverAlreadyRunningError",
-	"WebDriverError",
-	"WebDriverNotStartedError"
-]
-
+__all__ = ["WebDriverAlreadyRunningError", "WebDriverError", "WebDriverNotStartedError"]
 
 class WebDriverError(OSNSeleniumError):
 	"""

osn_selenium/exceptions/window.py

@@ -1,13 +1,6 @@
 from osn_selenium.exceptions.base import OSNSeleniumError
 
-
-__all__ = [
-	"InvalidWindowHandleError",
-	"InvalidWindowIndexError",
-	"NoWindowHandlesFoundError",
-	"WindowManagementError"
-]
-
+__all__ = ["InvalidWindowHandleError", "InvalidWindowIndexError", "NoWindowHandlesFoundError", "WindowManagementError"]
 
 class WindowManagementError(OSNSeleniumError):
 	"""

osn_selenium/executors/sync/cdp.py

@@ -23,11 +23,6 @@ class CDPExecutor(AbstractCDPExecutor):
 
 	def __init__(self, execute_function: Callable[[str, Dict[str, Any]], Any]):
 		self._execute_function = execute_function
-		self._v140 = None
-		self._v141 = None
-		self._v142 = None
-		self._v143 = None
-		self._v144 = None
 
 	def get(self, version: int) -> Any:
 		"""

osn_selenium/executors/trio_bidi/cdp.py

@@ -0,0 +1,101 @@
+import importlib
+from typing import TYPE_CHECKING, Any, Dict, Callable, Union
+
+import trio
+
+from osn_selenium.abstract.executors.cdp import AbstractCDPExecutor
+from osn_selenium.exceptions.dependencies import CDPPackageError
+
+
+__all__ = ["CDPExecutor"]
+
+if TYPE_CHECKING:
+	from osn_selenium_cdp_v140.executors.trio_bidi import CDP140Executor
+	from osn_selenium_cdp_v141.executors.trio_bidi import CDP141Executor
+	from osn_selenium_cdp_v142.executors.trio_bidi import CDP142Executor
+	from osn_selenium_cdp_v143.executors.trio_bidi import CDP143Executor
+	from osn_selenium_cdp_v144.executors.trio_bidi import CDP144Executor
+
+
+class CDPExecutor(AbstractCDPExecutor):
+	"""
+	Global CDP executor router. 
+	Handles lazy loading and version-specific package validation.
+	"""
+
+	def __init__(self, execute_function: Callable[[str, Dict[str, Any]], Any], lock: trio.Lock, limiter: trio.CapacityLimiter, token: trio.lowlevel.TrioToken, buffer_size: Union[int, float]):
+		self._execute_function = execute_function
+		self._lock = lock
+		self._limiter = limiter
+		self._trio_token = token
+		self._bidi_buffer_size = buffer_size
+
+	def get(self, version: int) -> Any:
+		"""
+		Dynamically loads and returns the CDP executor for a specific version.
+
+		Args:
+			version (int): The CDP version number.
+
+		Returns:
+			Any: The version-specific executor instance.
+
+		Raises:
+			CDPPackageError: If the version-specific package is not installed.
+		"""
+	
+		try:
+			if getattr(self, f"_v{version}", None) is None:
+				module = importlib.import_module(f"osn_selenium_cdp_v{version}.executors.trio_bidi")
+				executor_type = getattr(module, f"CDP{version}Executor")
+
+				setattr(self, f"_v{version}", executor_type(execute_function=self._execute_function, lock=self._lock, limiter=self._limiter, token=self._trio_token, buffer_size=self._bidi_buffer_size))
+
+			return getattr(self, f"_v{version}", None)
+		except ImportError:
+			raise CDPPackageError(version=version)
+
+	@property
+	def v140(self) -> "CDP140Executor":
+		"""
+		Get or initialize the executor for CDP version 140.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=140)
+
+	@property
+	def v141(self) -> "CDP141Executor":
+		"""
+		Get or initialize the executor for CDP version 141.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=141)
+
+	@property
+	def v142(self) -> "CDP142Executor":
+		"""
+		Get or initialize the executor for CDP version 142.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=142)
+
+	@property
+	def v143(self) -> "CDP143Executor":
+		"""
+		Get or initialize the executor for CDP version 143.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=143)
+
+	@property
+	def v144(self) -> "CDP144Executor":
+		"""
+		Get or initialize the executor for CDP version 144.
+		Raises CDPPackageError if the version-specific package is not installed.
+		"""
+
+		return self.get(version=144)