driverclient 0.2.17__tar.gz → 0.2.18__tar.gz

{driverclient-0.2.17 → driverclient-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: driverclient
-Version: 0.2.17
+Version: 0.2.18
 Summary: Driver Server client with an embeddable connector for config injection at runtime.
 Project-URL: Homepage, https://example.com/driverclient
 Author-email: Raja Sanaullah <sanaullah@99technologies.com>

{driverclient-0.2.17 → driverclient-0.2.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "driverclient"
-version = "0.2.17"
+version = "0.2.18"
 description = "Driver Server client with an embeddable connector for config injection at runtime."
 readme = "README.md"
 requires-python = ">=3.10"

{driverclient-0.2.17 → driverclient-0.2.18}/src/driverclient/__init__.py

@@ -25,7 +25,7 @@ from driverclient.main import run as _run
 
 __all__ = ["DriverClient", "ClientEvent"]
 
-__version__ = "0.2.17"
+__version__ = "0.2.18"
 
 
 class DriverClient:

{driverclient-0.2.17 → driverclient-0.2.18}/src/driverclient/config.json

@@ -19,8 +19,9 @@
     "usb":    [".inf", ".sys", ".cat", ".dll"]
   },
 
-  "wu_wait_minutes": 10,
+  "wu_wait_minutes": 30,
   "wu_poll_interval_seconds": 30,
+  "wu_quiescent_polls": 2,
   "wu_ignore_classes": ["hidclass", "bluetooth", "printer"],
 
   "automate_wu_fallback": true,

{driverclient-0.2.17 → driverclient-0.2.18}/src/driverclient/ops/capture.py

@@ -714,6 +714,63 @@ def _trigger_wu() -> "_WuTrigger | None":
     return None
 
 
+def _emit_wu_log_line(line: str) -> None:
+    """Turn one raw status line from the WU PowerShell into a friendly GUI event
+    so the operator sees WU's real phase (searching / downloading / installing)
+    live, instead of only a generic 'still working' tick."""
+    up = line.upper()
+    if up.startswith("SERVICE MICROSOFT_UPDATE"):
+        events.ok("windows_update",
+                  "[wu-update] Using the Microsoft Update service (drivers + Microsoft products)")
+    elif up.startswith("SERVICE WINDOWS_UPDATE_FALLBACK"):
+        detail = line.split(None, 2)[2] if len(line.split(None, 2)) > 2 else ""
+        events.warn("windows_update",
+                    f"[wu-update] Microsoft Update unavailable — falling back to default "
+                    f"Windows Update service  {detail}".rstrip())
+    elif up == "SEARCHING":
+        events.progress("windows_update",
+                        "[wu-update] Searching Windows Update for applicable updates… "
+                        "(the first scan can take several minutes)")
+    elif up == "NO_UPDATES":
+        events.progress("windows_update", "[wu-update] Search complete — no applicable updates found")
+    elif up.startswith("DOWNLOADING"):
+        n = line.split()[-1] if line.split() else "?"
+        events.progress("windows_update", f"[wu-update] Downloading {n} update(s)…")
+    elif up == "NONE_DOWNLOADED":
+        events.warn("windows_update", "[wu-update] Nothing downloaded")
+    elif up.startswith("INSTALLING"):
+        n = line.split()[-1] if line.split() else "?"
+        events.progress("windows_update", f"[wu-update] Installing {n} update(s)…")
+    elif up.startswith("INSTALLED"):
+        events.ok("windows_update", f"[wu-update] {line}")
+    elif up.startswith("WU_ERROR"):
+        detail = line[len("WU_ERROR"):].strip()
+        events.warn("windows_update", f"[wu-update] Windows Update error: {detail}", error=detail)
+    else:
+        events.progress("windows_update", f"[wu-update] {line}")
+
+
+def _drain_wu_log(trigger: "_WuTrigger | None", pos: int) -> int:
+    """Emit any new lines the WU PowerShell wrote to its log since offset `pos`,
+    return the new offset. Best-effort — a read failure just leaves `pos`
+    unchanged and never raises into the poll loop. Only the COM path writes a
+    log (trigger.log_path); the usoclient/wuauclt fallbacks have none."""
+    if trigger is None or not trigger.log_path:
+        return pos
+    try:
+        with open(trigger.log_path, "r", encoding="utf-8", errors="replace") as fh:
+            fh.seek(pos)
+            chunk   = fh.read()
+            new_pos = fh.tell()
+    except Exception:
+        return pos
+    for line in chunk.splitlines():
+        line = line.strip()
+        if line:
+            _emit_wu_log_line(line)
+    return new_pos
+
+
 def _poll_and_submit_incremental(wu_start: datetime, cfg: dict,
                                  trigger: "_WuTrigger | None") -> CaptureResult:
     """
@@ -739,12 +796,14 @@ def _poll_and_submit_incremental(wu_start: datetime, cfg: dict,
     seen: set[str] = set()
     total          = CaptureResult()
     empty_polls    = 0
+    log_pos        = 0
 
     events.progress("windows_update",
                     f"[wu-update] Waiting on Windows Update — polling every {poll_secs}s, "
                     f"stops early once WU goes idle (hard cap {wait_min} min)")
 
     while datetime.now(timezone.utc) < deadline:
+        log_pos   = _drain_wu_log(trigger, log_pos)   # surface WU's live phase
         all_new   = _enumerate_packages_since(wu_start, cfg)
         new_batch = [
             p for p in all_new
@@ -789,6 +848,7 @@ def _poll_and_submit_incremental(wu_start: datetime, cfg: dict,
         events.warn("windows_update",
                     f"[wu-update] Reached {wait_min} min hard cap — stopping WU wait")
 
+    _drain_wu_log(trigger, log_pos)   # flush any final lines before cleanup
     if trigger is not None:
         trigger.terminate()
     return total