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

osn_selenium/webdrivers/trio_threads/core/lifecycle.py

@@ -1,12 +1,14 @@
+from types import TracebackType
 from osn_selenium.models import WindowRect
+from osn_selenium.flags.models.base import BrowserFlags
 from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from typing import (
 	Any,
 	Dict,
 	Optional,
+	Type,
 	Union
 )
-from osn_selenium.flags.models.base import BrowserFlags
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 from osn_selenium.webdrivers.unified.core.lifecycle import (
 	UnifiedCoreLifecycleMixin
@@ -27,8 +29,47 @@ class CoreLifecycleMixin(UnifiedCoreLifecycleMixin, TrioThreadMixin, AbstractCor
 	underlying browser instance, ensuring clean session management.
 	"""
 	
-	async def close_webdriver(self) -> None:
-		await self.sync_to_trio(sync_function=self._close_webdriver_impl)()
+	async def start_webdriver(
+			self,
+			flags: Optional[BrowserFlags] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(flags=flags, window_rect=window_rect)
+	
+	async def __aenter__(
+			self,
+			flags: Optional[BrowserFlags] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.start_webdriver(flags=flags, window_rect=window_rect)
+	
+	async def stop_webdriver(self) -> None:
+		await self.sync_to_trio(sync_function=self._stop_webdriver_impl)()
+	
+	async def __aexit__(
+			self,
+			exc_type: Optional[Type[BaseException]],
+			exc_val: Optional[BaseException],
+			exc_tb: Optional[TracebackType],
+	) -> bool:
+		"""
+		Asynchronously exits the WebDriver context.
+
+		Args:
+			exc_type (Optional[Type[BaseException]]): The exception type, if any.
+			exc_val (Optional[BaseException]): The exception value, if any.
+			exc_tb (Optional[TracebackType]): The exception traceback, if any.
+
+		Returns:
+			bool: True if an exception was suppressed, False otherwise.
+		"""
+		
+		await self.stop_webdriver()
+		
+		if exc_type is not None and exc_val is not None and exc_tb is not None:
+			return True
+		
+		return False
 	
 	async def quit(self) -> None:
 		await self.sync_to_trio(sync_function=self._quit_impl)()
@@ -49,12 +90,5 @@ class CoreLifecycleMixin(UnifiedCoreLifecycleMixin, TrioThreadMixin, AbstractCor
 	async def start_session(self, capabilities: Dict[str, Any]) -> None:
 		await self.sync_to_trio(sync_function=self._start_session_impl)(capabilities=capabilities)
 	
-	async def start_webdriver(
-			self,
-			flags: Optional[BrowserFlags] = None,
-			window_rect: Optional[WindowRect] = None,
-	) -> None:
-		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(flags=flags, window_rect=window_rect)
-	
 	async def stop_client(self) -> None:
 		await self.sync_to_trio(sync_function=self._stop_client_impl)()

osn_selenium/webdrivers/trio_threads/core/script.py

@@ -1,4 +1,5 @@
 from typing import Any, List, Optional
+from selenium.webdriver.remote.script_key import ScriptKey
 from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.instances.trio_threads.script import Script
 from osn_selenium.instances.convert import (
@@ -42,7 +43,7 @@ class CoreScriptMixin(UnifiedCoreScriptMixin, TrioThreadMixin, AbstractCoreScrip
 	async def get_pinned_scripts(self) -> List[str]:
 		return await self.sync_to_trio(sync_function=self._get_pinned_scripts_impl)()
 	
-	async def pin_script(self, script: str, script_key: Optional[Any] = None) -> Any:
+	async def pin_script(self, script: str, script_key: Optional[Any] = None) -> ScriptKey:
 		return await self.sync_to_trio(sync_function=self._pin_script_impl)(script=script, script_key=script_key)
 	
 	async def script(self) -> Script:
@@ -55,5 +56,5 @@ class CoreScriptMixin(UnifiedCoreScriptMixin, TrioThreadMixin, AbstractCoreScrip
 				limiter=self._capacity_limiter,
 		)
 	
-	async def unpin(self, script_key: Any) -> None:
+	async def unpin(self, script_key: ScriptKey) -> None:
 		await self.sync_to_trio(sync_function=self._unpin_impl)(script_key=script_key)

osn_selenium/webdrivers/trio_threads/core/settings.py

@@ -1,7 +1,7 @@
 from typing import Optional
 from osn_selenium.models import WindowRect
-from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.flags.models.base import BrowserFlags
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.webdrivers.unified.core.settings import (
 	UnifiedCoreSettingsMixin
 )

osn_selenium/webdrivers/trio_threads/core/storage.py

@@ -1,10 +1,10 @@
-from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from typing import (
 	Any,
 	Dict,
 	List,
 	Optional
 )
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.instances.trio_threads.storage import Storage
 from osn_selenium.instances.convert import (
 	get_trio_thread_instance_wrapper

osn_selenium/webdrivers/trio_threads/core/timeouts.py

@@ -1,6 +1,6 @@
 from typing import Optional
-from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from selenium.webdriver.common.timeouts import Timeouts
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.webdrivers.unified.core.timeouts import (
 	UnifiedCoreTimeoutsMixin
 )

osn_selenium/webdrivers/trio_threads/core/window.py

@@ -1,10 +1,10 @@
-from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from typing import (
 	List,
 	Literal,
 	Optional,
 	Union
 )
+from osn_selenium.trio_threads_mixin import TrioThreadMixin
 from osn_selenium.models import (
 	Position,
 	Rectangle,
@@ -48,6 +48,9 @@ class CoreWindowMixin(UnifiedCoreWindowMixin, TrioThreadMixin, AbstractCoreWindo
 	async def fullscreen_window(self) -> None:
 		await self.sync_to_trio(sync_function=self._fullscreen_window_impl)()
 	
+	async def get_orientation(self) -> Literal["LANDSCAPE", "PORTRAIT"]:
+		return await self.sync_to_trio(sync_function=self._orientation_get_impl)()
+	
 	async def get_window_handle(self, window: Optional[Union[str, int]] = None) -> str:
 		return await self.sync_to_trio(sync_function=self._get_window_handle_impl)(window=window)
 	
@@ -69,9 +72,6 @@ class CoreWindowMixin(UnifiedCoreWindowMixin, TrioThreadMixin, AbstractCoreWindo
 	async def minimize_window(self) -> None:
 		await self.sync_to_trio(sync_function=self._minimize_window_impl)()
 	
-	async def orientation(self) -> Literal["LANDSCAPE", "PORTRAIT"]:
-		return await self.sync_to_trio(sync_function=self._orientation_get_impl)()
-	
 	async def set_orientation(self, value: Literal["LANDSCAPE", "PORTRAIT"]) -> None:
 		await self.sync_to_trio(sync_function=self._orientation_set_impl)(value=value)
 	

osn_selenium/webdrivers/trio_threads/edge/lifecycle.py

@@ -2,7 +2,7 @@ from typing import Optional
 from osn_selenium.models import WindowRect
 from osn_selenium._typehints import PATH_TYPEHINT
 from osn_selenium.flags.models.edge import EdgeFlags
-from osn_selenium.webdrivers.trio_threads.blink import BlinkLifecycleMixin
+from osn_selenium.webdrivers.trio_threads.blink.lifecycle import BlinkLifecycleMixin
 from osn_selenium.webdrivers.unified.edge.lifecycle import (
 	UnifiedEdgeLifecycleMixin
 )
@@ -26,7 +26,7 @@ class EdgeLifecycleMixin(
 	underlying browser instance, ensuring clean session management.
 	"""
 	
-	async def restart_webdriver(
+	async def start_webdriver(
 			self,
 			flags: Optional[EdgeFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -35,7 +35,7 @@ class EdgeLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
+		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,
@@ -44,7 +44,7 @@ class EdgeLifecycleMixin(
 				window_rect=window_rect,
 		)
 	
-	async def start_webdriver(
+	async def __aenter__(
 			self,
 			flags: Optional[EdgeFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -53,7 +53,25 @@ class EdgeLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
+		await self.start_webdriver(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)
+	
+	async def restart_webdriver(
+			self,
+			flags: Optional[EdgeFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,

osn_selenium/webdrivers/trio_threads/edge/settings.py

@@ -2,7 +2,7 @@ from typing import Optional
 from osn_selenium.models import WindowRect
 from osn_selenium._typehints import PATH_TYPEHINT
 from osn_selenium.flags.models.edge import EdgeFlags
-from osn_selenium.webdrivers.trio_threads.blink import BlinkSettingsMixin
+from osn_selenium.webdrivers.trio_threads.blink.settings import BlinkSettingsMixin
 from osn_selenium.webdrivers.unified.edge.settings import (
 	UnifiedEdgeSettingsMixin
 )

osn_selenium/webdrivers/trio_threads/yandex/lifecycle.py

@@ -2,7 +2,7 @@ from typing import Optional
 from osn_selenium.models import WindowRect
 from osn_selenium._typehints import PATH_TYPEHINT
 from osn_selenium.flags.models.yandex import YandexFlags
-from osn_selenium.webdrivers.trio_threads.chrome import ChromeLifecycleMixin
+from osn_selenium.webdrivers.trio_threads.chrome.lifecycle import ChromeLifecycleMixin
 from osn_selenium.webdrivers.unified.yandex.lifecycle import (
 	UnifiedYandexLifecycleMixin
 )
@@ -26,7 +26,7 @@ class YandexLifecycleMixin(
 	underlying browser instance, ensuring clean session management.
 	"""
 	
-	async def restart_webdriver(
+	async def start_webdriver(
 			self,
 			flags: Optional[YandexFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -35,7 +35,7 @@ class YandexLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
+		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,
@@ -44,7 +44,7 @@ class YandexLifecycleMixin(
 				window_rect=window_rect,
 		)
 	
-	async def start_webdriver(
+	async def __aenter__(
 			self,
 			flags: Optional[YandexFlags] = None,
 			browser_exe: Optional[PATH_TYPEHINT] = None,
@@ -53,7 +53,25 @@ class YandexLifecycleMixin(
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		await self.sync_to_trio(sync_function=self._start_webdriver_impl)(
+		await self.start_webdriver(
+				flags=flags,
+				browser_exe=browser_exe,
+				browser_name_in_system=browser_name_in_system,
+				use_browser_exe=use_browser_exe,
+				start_page_url=start_page_url,
+				window_rect=window_rect,
+		)
+	
+	async def restart_webdriver(
+			self,
+			flags: Optional[YandexFlags] = None,
+			browser_exe: Optional[PATH_TYPEHINT] = None,
+			browser_name_in_system: Optional[str] = None,
+			use_browser_exe: Optional[bool] = None,
+			start_page_url: Optional[str] = None,
+			window_rect: Optional[WindowRect] = None,
+	) -> None:
+		await self.sync_to_trio(sync_function=self._restart_webdriver_impl)(
 				flags=flags,
 				browser_exe=browser_exe,
 				browser_name_in_system=browser_name_in_system,

osn_selenium/webdrivers/trio_threads/yandex/settings.py

@@ -2,7 +2,7 @@ from typing import Optional
 from osn_selenium.models import WindowRect
 from osn_selenium._typehints import PATH_TYPEHINT
 from osn_selenium.flags.models.yandex import YandexFlags
-from osn_selenium.webdrivers.trio_threads.chrome import ChromeSettingsMixin
+from osn_selenium.webdrivers.trio_threads.chrome.settings import ChromeSettingsMixin
 from osn_selenium.webdrivers.unified.yandex.settings import (
 	UnifiedYandexSettingsMixin
 )

osn_selenium/webdrivers/unified/blink/base.py

@@ -1,6 +1,10 @@
 import pathlib
-from typing import Mapping, Optional, Type
 from osn_selenium.models import WindowRect
+from typing import (
+	Mapping,
+	Optional,
+	Type
+)
 from osn_selenium.flags.blink import BlinkFlagsManager
 from osn_selenium.flags.models.values import ArgumentValue
 from osn_selenium.browsers_handler import get_path_to_browser

osn_selenium/webdrivers/unified/blink/lifecycle.py

@@ -73,7 +73,7 @@ class UnifiedBlinkLifecycleMixin(UnifiedBlinkSettingsMixin, UnifiedCoreLifecycle
 			self._create_driver_impl()
 			self._is_active = True
 	
-	def _close_webdriver_impl(self) -> None:
+	def _stop_webdriver_impl(self) -> None:
 		if self._browser_exe_impl is not None:
 			debugging_port = self._debugging_port_impl
 			pids_with_ports = get_localhost_pids_with_ports()
@@ -83,8 +83,10 @@ class UnifiedBlinkLifecycleMixin(UnifiedBlinkSettingsMixin, UnifiedCoreLifecycle
 					kill_process_by_pid(pid=pid, force=True)
 		
 					is_active = self._check_browser_exe_active_impl()
+		
 					while is_active:
 						is_active = self._check_browser_exe_active_impl()
+		
 						if is_active:
 							time.sleep(0.05)
 		
@@ -103,7 +105,7 @@ class UnifiedBlinkLifecycleMixin(UnifiedBlinkSettingsMixin, UnifiedCoreLifecycle
 			start_page_url: Optional[str] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		self._close_webdriver_impl()
+		self._stop_webdriver_impl()
 		self._start_webdriver_impl(
 				flags=flags,
 				browser_exe=browser_exe,

osn_selenium/webdrivers/unified/chrome/base.py

@@ -1,5 +1,9 @@
-from typing import Mapping, Optional, Type
 from osn_selenium.models import WindowRect
+from typing import (
+	Mapping,
+	Optional,
+	Type
+)
 from osn_selenium.flags.chrome import ChromeFlagsManager
 from osn_selenium.flags.models.chrome import ChromeFlags
 from selenium.webdriver import (

osn_selenium/webdrivers/unified/core/auth.py

@@ -1,9 +1,11 @@
+from selenium.webdriver.remote.fedcm import FedCM
 from typing import (
 	Any,
 	List,
 	Optional,
 	Union
 )
+from selenium.webdriver.common.fedcm.dialog import Dialog
 from osn_selenium.webdrivers._decorators import requires_driver
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 from selenium.webdriver.common.virtual_authenticator import (
@@ -30,7 +32,7 @@ class UnifiedCoreAuthMixin(UnifiedCoreBaseMixin):
 			timeout: int = 5,
 			poll_frequency: float = 0.5,
 			ignored_exceptions: Any = None,
-	) -> Any:
+	) -> Dialog:
 		return self._driver_impl.fedcm_dialog(
 				timeout=timeout,
 				poll_frequency=poll_frequency,
@@ -38,7 +40,7 @@ class UnifiedCoreAuthMixin(UnifiedCoreBaseMixin):
 		)
 	
 	@requires_driver
-	def _fedcm_impl(self) -> Any:
+	def _fedcm_impl(self) -> FedCM:
 		return self._driver_impl.fedcm
 	
 	@requires_driver

osn_selenium/webdrivers/unified/core/base.py

@@ -1,17 +1,15 @@
-from osn_selenium._cdp_import import install_cdp_hook
 from osn_selenium.models import WindowRect
+from osn_selenium._cdp_import import install_cdp_hook
+from osn_selenium.flags.base import BrowserFlagsManager
+from osn_selenium.flags.models.base import BrowserFlags
+from selenium.webdriver.common.bidi.session import Session
 from typing import (
 	Any,
 	Dict,
-	Mapping, Optional,
+	Mapping,
+	Optional,
 	Type
 )
-from osn_selenium.flags.base import BrowserFlagsManager
-from osn_selenium.flags.models.base import BrowserFlags
-from selenium.webdriver.common.bidi.session import Session
-from osn_selenium._typehints import (
-	ARCHITECTURES_TYPEHINT, PATH_TYPEHINT
-)
 from selenium.webdriver.remote.errorhandler import ErrorHandler
 from osn_selenium.webdrivers._decorators import requires_driver
 from selenium.webdriver.remote.locator_converter import LocatorConverter
@@ -19,6 +17,10 @@ from selenium.webdriver.remote.remote_connection import RemoteConnection
 from osn_selenium.exceptions.webdriver import (
 	WebDriverNotStartedError
 )
+from osn_selenium._typehints import (
+	ARCHITECTURES_TYPEHINT,
+	PATH_TYPEHINT
+)
 from selenium.webdriver.remote.webdriver import (
 	WebDriver as legacyWebDriver
 )
@@ -53,9 +55,13 @@ class UnifiedCoreBaseMixin:
 		
 		if flags is not None:
 			self._webdriver_flags_manager.update_flags(flags)
-
+		
 		if not getattr(self, "cdp_hook_installed", False):
-			install_cdp_hook(cdp_paths=cdp_versioned_packages_paths, ignore_package_missing=ignore_cdp_version_package_missing)
+			install_cdp_hook(
+					cdp_paths=cdp_versioned_packages_paths,
+					ignore_package_missing=ignore_cdp_version_package_missing
+			)
+			
 			setattr(self, "cdp_hook_installed", True)
 	
 	@property

osn_selenium/webdrivers/unified/core/capture.py

@@ -1,5 +1,6 @@
-from typing import Any, Optional
+from typing import Optional
 from osn_selenium.webdrivers._decorators import requires_driver
+from selenium.webdriver.common.print_page_options import PrintOptions
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 
 
@@ -24,7 +25,7 @@ class UnifiedCoreCaptureMixin(UnifiedCoreBaseMixin):
 		return self._driver_impl.page_source
 	
 	@requires_driver
-	def _print_page_impl(self, print_options: Optional[Any] = None) -> str:
+	def _print_page_impl(self, print_options: Optional[PrintOptions] = None) -> str:
 		return self._driver_impl.print_page(print_options=print_options)
 	
 	@requires_driver

osn_selenium/webdrivers/unified/core/components.py

@@ -1,6 +1,11 @@
-from typing import Any
+from selenium.webdriver.remote.mobile import Mobile
+from selenium.webdriver.common.fedcm.dialog import Dialog
+from selenium.webdriver.common.bidi.browser import Browser
 from osn_selenium.webdrivers._decorators import requires_driver
+from selenium.webdriver.common.bidi.permissions import Permissions
+from selenium.webdriver.common.bidi.webextension import WebExtension
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
+from selenium.webdriver.common.bidi.browsing_context import BrowsingContext
 
 
 __all__ = ["UnifiedCoreComponentsMixin"]
@@ -8,25 +13,25 @@ __all__ = ["UnifiedCoreComponentsMixin"]
 
 class UnifiedCoreComponentsMixin(UnifiedCoreBaseMixin):
 	@requires_driver
-	def _browser_impl(self) -> Any:
+	def _browser_impl(self) -> Browser:
 		return self._driver_impl.browser
 	
 	@requires_driver
-	def _browsing_context_impl(self) -> Any:
+	def _browsing_context_impl(self) -> BrowsingContext:
 		return self._driver_impl.browsing_context
 	
 	@requires_driver
-	def _dialog_impl(self) -> Any:
+	def _dialog_impl(self) -> Dialog:
 		return self._driver_impl.dialog
 	
 	@requires_driver
-	def _mobile_impl(self) -> Any:
+	def _mobile_impl(self) -> Mobile:
 		return self._driver_impl.mobile
 	
 	@requires_driver
-	def _permissions_impl(self) -> Any:
+	def _permissions_impl(self) -> Permissions:
 		return self._driver_impl.permissions
 	
 	@requires_driver
-	def _webextension_impl(self) -> Any:
+	def _webextension_impl(self) -> WebExtension:
 		return self._driver_impl.webextension

osn_selenium/webdrivers/unified/core/devtools.py

@@ -1,4 +1,5 @@
 from contextlib import asynccontextmanager
+from selenium.webdriver.common.bidi.network import Network
 from typing import (
 	Any,
 	AsyncGenerator,
@@ -27,7 +28,7 @@ class UnifiedCoreDevToolsMixin(UnifiedCoreBaseMixin):
 		return self._driver_impl.execute_cdp_cmd(cmd=cmd, cmd_args=build_cdp_kwargs(**cmd_args))
 	
 	@requires_driver
-	def _network_impl(self) -> Any:
+	def _network_impl(self) -> Network:
 		return self._driver_impl.network
 	
 	@requires_driver

osn_selenium/webdrivers/unified/core/file.py

@@ -1,6 +1,7 @@
 from contextlib import contextmanager
 from typing import Any, Generator, List
 from osn_selenium.webdrivers._decorators import requires_driver
+from selenium.webdriver.remote.file_detector import FileDetector
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 
 
@@ -23,11 +24,11 @@ class UnifiedCoreFileMixin(UnifiedCoreBaseMixin):
 			yield file_detector
 	
 	@requires_driver
-	def _file_detector_get_impl(self) -> Any:
+	def _file_detector_get_impl(self) -> FileDetector:
 		return self._driver_impl.file_detector
 	
 	@requires_driver
-	def _file_detector_set_impl(self, value: Any) -> None:
+	def _file_detector_set_impl(self, value: FileDetector) -> None:
 		self._driver_impl.file_detector = value
 	
 	@requires_driver

osn_selenium/webdrivers/unified/core/lifecycle.py

@@ -1,11 +1,13 @@
+from types import TracebackType
 from osn_selenium.models import WindowRect
+from osn_selenium.flags.models.base import BrowserFlags
 from typing import (
 	Any,
 	Dict,
 	Optional,
+	Type,
 	Union
 )
-from osn_selenium.flags.models.base import BrowserFlags
 from osn_selenium.webdrivers._decorators import requires_driver
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 from osn_selenium.exceptions.logic import (
@@ -56,7 +58,7 @@ class UnifiedCoreLifecycleMixin(UnifiedCoreSettingsMixin, UnifiedCoreTimeoutsMix
 	def _quit_impl(self) -> None:
 		self._driver_impl.quit()
 	
-	def _close_webdriver_impl(self) -> None:
+	def _stop_webdriver_impl(self) -> None:
 		if self._driver_impl is not None:
 			self._quit_impl()
 		
@@ -68,7 +70,7 @@ class UnifiedCoreLifecycleMixin(UnifiedCoreSettingsMixin, UnifiedCoreTimeoutsMix
 			flags: Optional[BrowserFlags] = None,
 			window_rect: Optional[WindowRect] = None,
 	) -> None:
-		self._close_webdriver_impl()
+		self._stop_webdriver_impl()
 		self._start_webdriver_impl(flags=flags, window_rect=window_rect)
 	
 	@requires_driver

osn_selenium/webdrivers/unified/core/script.py

@@ -1,4 +1,6 @@
 from typing import Any, List, Optional
+from selenium.webdriver.common.bidi.script import Script
+from selenium.webdriver.remote.script_key import ScriptKey
 from osn_selenium.webdrivers._decorators import requires_driver
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 
@@ -20,13 +22,13 @@ class UnifiedCoreScriptMixin(UnifiedCoreBaseMixin):
 		return self._driver_impl.get_pinned_scripts()
 	
 	@requires_driver
-	def _pin_script_impl(self, script: str, script_key: Optional[Any] = None) -> Any:
+	def _pin_script_impl(self, script: str, script_key: Optional[Any] = None) -> ScriptKey:
 		return self._driver_impl.pin_script(script=script, script_key=script_key)
 	
 	@requires_driver
-	def _script_impl(self) -> Any:
+	def _script_impl(self) -> Script:
 		return self._driver_impl.script
 	
 	@requires_driver
-	def _unpin_impl(self, script_key: Any) -> None:
+	def _unpin_impl(self, script_key: ScriptKey) -> None:
 		self._driver_impl.unpin(script_key=script_key)

osn_selenium/webdrivers/unified/core/storage.py

@@ -4,6 +4,7 @@ from typing import (
 	List,
 	Optional
 )
+from selenium.webdriver.common.bidi.storage import Storage
 from osn_selenium.webdrivers._decorators import requires_driver
 from osn_selenium.webdrivers.unified.core.base import UnifiedCoreBaseMixin
 
@@ -33,5 +34,5 @@ class UnifiedCoreStorageMixin(UnifiedCoreBaseMixin):
 		return self._driver_impl.get_cookies()
 	
 	@requires_driver
-	def _storage_impl(self) -> Any:
+	def _storage_impl(self) -> Storage:
 		return self._driver_impl.storage