wexample-wex-addon-dev-javascript 7.6.0__tar.gz → 7.7.0__tar.gz

{wexample_wex_addon_dev_javascript-7.6.0 → wexample_wex_addon_dev_javascript-7.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-javascript
-Version: 7.6.0
+Version: 7.7.0
 Summary: Python dev addon for wex
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 
 # wex_addon_dev_javascript
 
-Version: 7.6.0
+Version: 7.7.0
 
 Python dev addon for wex
 

{wexample_wex_addon_dev_javascript-7.6.0 → wexample_wex_addon_dev_javascript-7.7.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_javascript
 
-Version: 7.6.0
+Version: 7.7.0
 
 Python dev addon for wex
 

{wexample_wex_addon_dev_javascript-7.6.0 → wexample_wex_addon_dev_javascript-7.7.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-javascript"
-version = "7.6.0"
+version = "7.7.0"
 description = "Python dev addon for wex"
 authors = [
     { name = "weeger", email = "contact@wexample.com" },

{wexample_wex_addon_dev_javascript-7.6.0 → wexample_wex_addon_dev_javascript-7.7.0}/src/wexample_wex_addon_dev_javascript/workdir/javascript_package_workdir.py

@@ -160,10 +160,13 @@ class JavascriptPackageWorkdir(JavascriptWorkdir):
         per-version URLs.
         """
         import json
-        import time
         import urllib.error
         import urllib.request
 
+        from wexample_helpers.helpers.polling_callback_manager import (
+            PollingCallbackManager,
+        )
+
         package = self.get_project_name()
         version = self.get_setup_version()
 
@@ -173,15 +176,9 @@ class JavascriptPackageWorkdir(JavascriptWorkdir):
         token = self.get_runtime_config().search("npm.api_token").get_str_or_none()
 
         encoded = package.replace("/", "%2F")
-        base = (registry_base or "https://registry.npmjs.org").rstrip("/")
-        url = f"{base}/{encoded}"
-
-        max_attempts = 40
-        delay = 30.0
-
-        self.log(f"Waiting for {package}@{version} to appear on registry…")
+        url = f"{(registry_base or 'https://registry.npmjs.org').rstrip('/')}/{encoded}"
 
-        for attempt in range(1, max_attempts + 1):
+        def check_available() -> bool | None:
             try:
                 req = urllib.request.Request(url)
                 if token:
@@ -190,21 +187,33 @@ class JavascriptPackageWorkdir(JavascriptWorkdir):
                     if resp.status == 200:
                         data = json.loads(resp.read())
                         if version in data.get("versions", {}):
-                            self.success(f"{package}@{version} is available.")
-                            return
+                            return True
             except urllib.error.HTTPError as e:
                 if e.code != 404:
                     raise
             except Exception:
                 pass
+            return None
 
+        max_attempts = 40
+        delay_seconds = 30
+
+        self.log(f"Waiting for {package}@{version} to appear on registry…")
+
+        def on_retry(attempt, max_a, delay, _exc, _msg) -> None:
             self.log(
-                f"Not yet available (attempt {attempt}/{max_attempts}), "
-                f"retrying in {int(delay)}s…"
+                f"Not yet available (attempt {attempt}/{max_a}), retrying in {delay}s…"
             )
-            time.sleep(delay)
 
-        raise RuntimeError(
-            f"Timed out waiting for {package}@{version} on registry after "
-            f"{max_attempts * int(delay) // 60} minutes."
-        )
+        PollingCallbackManager(
+            callback=check_available,
+            max_attempts=max_attempts,
+            delay_seconds_callback=lambda _attempt: delay_seconds,
+            on_retry_callback=on_retry,
+            timeout_message=(
+                f"Timed out waiting for {package}@{version} on registry after "
+                f"{max_attempts * delay_seconds // 60} minutes."
+            ),
+        ).run()
+
+        self.success(f"{package}@{version} is available.")