fix: process full server response

landscape/client/broker/transport.py

@@ -33,7 +33,7 @@ def exchange(
         self,
         payload: dict,
         computer_id: Optional[str] = None,
-        exchange_token: Optional[str] = None,
+        exchange_token: Optional[bytes] = None,
         message_api: bytes = SERVER_API,
     ) -> Union[dict, None]:
         """Exchange message data with the server.
@@ -59,7 +59,16 @@ def exchange(
         except Exception:
             return None
 
-        return asdict(response)
+        # Return `ServerResponse` as a dictionary
+        #  converting the field names back to kebab case
+        #  which (imo) is better than mixing snake_case & kebab-case
+        #  in landscape.client.broker.exchange.MessageExchange.
+        return asdict(
+            response,
+            dict_factory=lambda data: {
+                k.replace("_", "-"): v for k, v in data
+            },
+        )
 
 
 class FakeTransport:

landscape/client/exchange.py

@@ -23,8 +23,12 @@
 class ServerResponse:
     """The HTTP response from the server after a message exchange."""
 
-    server_uuid: str
+    client_accepted_types_hash: Optional[bytes]
     messages: List[Dict[str, Any]]
+    next_exchange_token: Optional[bytes]
+    next_expected_sequence: Optional[int]
+    server_api: str
+    server_uuid: bytes
 
 
 def exchange_messages(
@@ -33,7 +37,7 @@ def exchange_messages(
     *,
     cainfo: Optional[str] = None,
     computer_id: Optional[str] = None,
-    exchange_token: Optional[str] = None,
+    exchange_token: Optional[bytes] = None,
     server_api: str = SERVER_API.decode(),
 ) -> ServerResponse:
     """Sends `payload` via HTTP(S) to `server_url`, parsing and returning the
@@ -61,7 +65,7 @@ def exchange_messages(
         headers["X-Computer-ID"] = computer_id
 
     if exchange_token:
-        headers["X-Exchange-Token"] = exchange_token
+        headers["X-Exchange-Token"] = exchange_token.decode()
 
     curl = pycurl.Curl()
 
@@ -91,4 +95,11 @@ def exchange_messages(
 
     logging.debug(f"Received payload:\n{pformat(response)}")
 
-    return ServerResponse(response["server-uuid"], response["messages"])
+    return ServerResponse(
+        response.get("client-accepted-types-hash"),
+        response["messages"],
+        response.get("next-exchange-token"),
+        response.get("next-expected-sequence"),
+        response["server-api"],
+        response["server-uuid"],
+    )

landscape/lib/fetch.py

@@ -1,6 +1,7 @@
 import io
 import os
 import sys
+import logging
 from argparse import ArgumentParser
 
 from twisted.internet.defer import DeferredList