cookiesync-cli 0.1.5__tar.gz → 0.2.0__tar.gz

{cookiesync_cli-0.1.5 → cookiesync_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cookiesync-cli
-Version: 0.1.5
+Version: 0.2.0
 Summary: Sync your browser cookies across machines.
 Keywords: 
 Author: Yasyf Mohamedali

{cookiesync_cli-0.1.5 → cookiesync_cli-0.2.0}/cookiesync/cli.py

@@ -235,7 +235,7 @@ async def run_auth(browser_name: str, profile: str, reason: str | None, ttl: str
 
 
 @main.command()
-@click.argument("url")
+@click.argument("urls", nargs=-1, required=True)
 @click.option(
     "--browser", "browser_name", default="chrome", show_default=True, help="The browser to read cookies from."
 )
@@ -248,13 +248,20 @@ async def run_auth(browser_name: str, profile: str, reason: str | None, ttl: str
     show_default=True,
     help="The output wire format.",
 )
-def cookies(url: str, browser_name: str, profile: str, fmt: str) -> None:
-    """Stream URL's cookies in the chosen format, decrypting with the daemon's cached key."""
-    anyio.run(run_cookies, url, browser_name, profile, fmt)
+def cookies(urls: tuple[str, ...], browser_name: str, profile: str, fmt: str) -> None:
+    """Stream the cookies for one or more URLS in the chosen format, merged into one document.
 
+    Pass several hosts (e.g. an app and the API host it calls) to get a single storageState
+    spanning them all — one cached-key decrypt, no extra Touch ID prompt.
+    """
+    anyio.run(run_cookies, urls, browser_name, profile, fmt)
 
-async def run_cookies(url: str, browser_name: str, profile: str, fmt: str) -> None:
-    result = await daemon_call("get_cookies", {"url": url, "browser": browser_name, "profile": profile})
+
+async def run_cookies(urls: tuple[str, ...], browser_name: str, profile: str, fmt: str) -> None:
+    # Dual-field wire: a new daemon prefers "urls" and merges every host; an older resident
+    # daemon still reads "url" and serves the first host, so the call degrades, never crashes.
+    params = {"url": urls[0], "urls": list(urls), "browser": browser_name, "profile": profile}
+    result = await daemon_call("get_cookies", params)
     state_obj = StorageState(tuple(cookie_from_wire(c) for c in result["cookies"]))
     for line in render(state_obj, OutputFormat(fmt)):
         click.echo(line)

{cookiesync_cli-0.1.5 → cookiesync_cli-0.2.0}/cookiesync/daemon/server.py

@@ -15,8 +15,9 @@ The method set splits in two:
 * **Local methods** are terminal and carry no origin — what the CLI on this box invokes:
   ``prime_auth`` obtains the Safe Storage key (locally behind Touch ID when a session is live,
   else by routing the user-presence gate to the active peer and then releasing this host's
-  *own* key non-interactively) and caches it; ``get_cookies`` renders a url's cookies from the
-  cached key, failing closed when cold; ``auth_status`` reports cache warmth; ``request_consent``
+  *own* key non-interactively) and caches it; ``get_cookies`` renders one or more urls' cookies,
+  merged into one set, from the cached key, failing closed when cold; ``auth_status`` reports cache
+  warmth; ``request_consent``
   shows the Touch-ID prompt for the named browser to the person at *this* machine and echoes the
   requester's nonce + endpoint to bind the approval — the key never crosses hosts.
 
@@ -35,7 +36,7 @@ from typing import TYPE_CHECKING
 import anyio
 
 from cookiesync import state as state_module
-from cookiesync.cookie import LocalBackend, extract
+from cookiesync.cookie import LocalBackend, extract, merge
 from cookiesync.cookie.browsers import REGISTRY, BrowserName
 from cookiesync.cookie.consent import ConsentError
 from cookiesync.cookie.crypto import DecryptError, decrypt_value
@@ -338,15 +339,23 @@ class Daemon:
             raise AuthRequired(
                 f"no cached key for {endpoint_id(state.self_target, browser, profile)}; run cookiesync auth"
             )
-        result = await extract(
-            params["url"],
-            browser=browser_for(browser),
-            key=AesKey(key),
-            backend=LocalBackend(self.consent),
-            profile=profile,
-            fallback=False,
-        )
-        return {"cookies": [cookie_to_wire(c) for c in result.cookies]}
+        # New CLIs send "urls" (one or more hosts); older ones send a single "url". Decrypt each
+        # host with the same cached key — no extra prompt — and union them by logical identity, so
+        # a domain cookie shared by overlapping hosts collapses to one row.
+        urls = params.get("urls") or [params["url"]]
+        backend = LocalBackend(self.consent)
+        states = [
+            await extract(
+                url,
+                browser=browser_for(browser),
+                key=AesKey(key),
+                backend=backend,
+                profile=profile,
+                fallback=False,
+            )
+            for url in urls
+        ]
+        return {"cookies": [cookie_to_wire(c) for c in merge(*(s.cookies for s in states))]}
 
     async def handle_auth_status(self, params: dict) -> dict:
         state = await self.load_state()

{cookiesync_cli-0.1.5 → cookiesync_cli-0.2.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "cookiesync-cli"
 # Inert sentinel: the real version is set from the release tag (uv version --frozen); never written back here.
-version = "0.1.5"
+version = "0.2.0"
 description = "Sync your browser cookies across machines."
 readme = "README.md"
 license = "PolyForm-Noncommercial-1.0.0"