Red-YT-Cipher-Solver 0.2.0__tar.gz → 0.3.0__tar.gz

{red_yt_cipher_solver-0.2.0 → red_yt_cipher_solver-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Red-YT-Cipher-Solver
-Version: 0.2.0
+Version: 0.3.0
 Summary: A thin wrapper over yt-dlp/ejs for deciphering YT signatures. Comes with Deno out of the box.
 Author: Jakub Kuczys, Cog Creators
 Author-email: Jakub Kuczys <me@jacken.men>
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Requires-Dist: aiohttp>=3.9.5,<4
 Requires-Dist: deno>=2.7.1,<3
-Requires-Dist: typing-extensions~=4.15.0
+Requires-Dist: typing-extensions>=4.13.2,<5
 Requires-Dist: yarl~=1.15.2
 Requires-Dist: yt-dlp-ejs~=0.5.0
 Requires-Python: >=3.10
@@ -24,6 +24,9 @@ Description-Content-Type: text/markdown
 
 # Red-YT-Cipher-Solver
 
+[![Red-YT-Cipher-Solver on PyPI](https://img.shields.io/pypi/v/Red-YT-Cipher-Solver)](https://pypi.org/project/Red-YT-Cipher-Solver)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
 A thin wrapper over [yt-dlp/ejs](https://github.com/yt-dlp/ejs) for deciphering YT signatures.
 Aside from yt-dlp/ejs, this uses the [official Deno PyPI package](https://github.com/denoland/deno_pypi),
 meaning no additional setup is required beyond installing the package and then using it either as a library

{red_yt_cipher_solver-0.2.0 → red_yt_cipher_solver-0.3.0}/README.md

@@ -1,5 +1,8 @@
 # Red-YT-Cipher-Solver
 
+[![Red-YT-Cipher-Solver on PyPI](https://img.shields.io/pypi/v/Red-YT-Cipher-Solver)](https://pypi.org/project/Red-YT-Cipher-Solver)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
 A thin wrapper over [yt-dlp/ejs](https://github.com/yt-dlp/ejs) for deciphering YT signatures.
 Aside from yt-dlp/ejs, this uses the [official Deno PyPI package](https://github.com/denoland/deno_pypi),
 meaning no additional setup is required beyond installing the package and then using it either as a library

{red_yt_cipher_solver-0.2.0 → red_yt_cipher_solver-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Red-YT-Cipher-Solver"
-version = "0.2.0"
+version = "0.3.0"
 description = "A thin wrapper over yt-dlp/ejs for deciphering YT signatures. Comes with Deno out of the box."
 readme = "README.md"
 authors = [
@@ -13,7 +13,7 @@ requires-python = ">=3.10"
 dependencies = [
     "aiohttp>=3.9.5,<4",
     "deno>=2.7.1,<3",
-    "typing-extensions~=4.15.0",
+    "typing-extensions>=4.13.2,<5",
     "yarl~=1.15.2",
     "yt-dlp-ejs~=0.5.0",
 ]

{red_yt_cipher_solver-0.2.0 → red_yt_cipher_solver-0.3.0}/src/red_yt_cipher_solver/server_process.py

@@ -68,6 +68,7 @@ class SolverServerProcess:
         self.start_timeout = start_timeout
         self._client_timeout = client_timeout
         self._proc: asyncio.subprocess.Process | None = None
+        self._startup_finished = asyncio.Event()
         self._stopped = asyncio.Event()
         self._running = False
         self._restarting = False
@@ -100,6 +101,33 @@ class SolverServerProcess:
         await self.stop()
         await self._session.close()
 
+    async def wait_for_startup(self) -> bool:
+        """
+        Wait for the startup to finish (successfully or not).
+
+        Returns
+        -------
+        bool
+            ``True`` if the startup was successful, ``False`` otherwise.
+        """
+        await self._startup_finished.wait()
+        return not self._stopped.is_set()
+
+    async def wait_until_stopped(self) -> None:
+        """Wait until the server stops."""
+        await self._stopped.wait()
+
+    async def check_restart_failure(self) -> None:
+        """
+        Check whether a scheduled restart failed.
+
+        This function will raise the exception from scheduled restart
+        or return immediately, if the scheduled restart was successful
+        or when there was no restart.
+        """
+        if self._restart_task is not None:
+            await self._restart_task
+
     def is_running(self) -> bool:
         """Whether the server is currently running."""
         return self._running
@@ -156,6 +184,8 @@ class SolverServerProcess:
         while wait:
             wait = (time.perf_counter() - process_start) < start_timeout
             if self._proc.returncode is not None:
+                await self.stop(timeout=1.0)
+                self._startup_finished.set()
                 raise ProcessStartError("The process failed to start.")
 
             request_start = time.perf_counter()
@@ -174,12 +204,14 @@ class SolverServerProcess:
             await asyncio.sleep(1.0 - request_duration)
         else:
             await self.stop(timeout=1.0)
+            self._startup_finished.set()
             raise TimeoutError("The server did not start in time.")
 
         self._running = True
         self._health_checker = asyncio.create_task(self._health_check_loop())
         self._proc_watcher = asyncio.create_task(self._watch_process(self._proc))
         log.info("A solver server process has been started successfully.")
+        self._startup_finished.set()
 
     async def stop(self, *, timeout: float = 5.0) -> None:
         """
@@ -309,6 +341,5 @@ class SolverServerProcess:
         """
         async with self:
             await self.start()
-            await self._stopped.wait()
-            if self._restart_task is not None:
-                await self._restart_task
+            await self.wait_until_stopped()
+            await self.check_restart_failure()