clan-app: Add logging middleware

pkgs/clan-app/clan_app/deps/webview/_webview_ffi.py

@@ -109,9 +109,7 @@ class _WebviewLibrary:
         self.webview_return = self.lib.webview_return
         self.webview_return.argtypes = [c_void_p, c_char_p, c_int, c_char_p]
 
-        self.binding_callback_t = CFUNCTYPE(
-            None, c_char_p, c_char_p, c_void_p
-        )
+        self.binding_callback_t = CFUNCTYPE(None, c_char_p, c_char_p, c_void_p)
 
         self.CFUNCTYPE = CFUNCTYPE
 

pkgs/clan-app/clan_app/deps/webview/webview.py

@@ -66,13 +66,14 @@ class Webview:
     ) -> None:
         op_key = op_key_bytes.decode()
         args = json.loads(request_data.decode())
-        log.debug(f"Calling {method_name}({args[0]})")
-        metadata: dict[str, Any] = {}
+        log.debug(f"Calling {method_name}({args})")
+        header: dict[str, Any]
 
         try:
             # Initialize dataclasses from the payload
             reconciled_arguments = {}
-            if len(args) > 0:
+            if len(args) > 1:
+                header = args[1]
                 for k, v in args[0].items():
                     # Some functions expect to be called with dataclass instances
                     # But the js api returns dictionaries.
@@ -83,6 +84,8 @@ class Webview:
                     # TODO: rename from_dict into something like construct_checked_value
                     # from_dict really takes Anything and returns an instance of the type/class
                     reconciled_arguments[k] = from_dict(arg_class, v)
+            elif len(args) == 1:
+                header = args[0]
 
             reconciled_arguments["op_key"] = op_key
         except Exception as e:
@@ -109,12 +112,12 @@ class Webview:
             ctx.should_cancel = lambda: stop_event.is_set()
             # If the API call has set log_group in metadata,
             # create the log file under that group.
-            log_group = metadata.get("logging", {}).get("group", None)
+            log_group = header.get("logging", {}).get("group", None)
             if log_group is not None:
                 log.warning(
                     f"Using log group {log_group} for {method_name} with op_key {op_key}"
                 )
-                breakpoint()
+
             log_file = log_manager.create_log_file(
                 wrap_method, op_key=op_key, group=log_group
             ).get_file_path()
@@ -136,10 +139,11 @@ class Webview:
                 try:
                     # Original logic: call the wrapped API method.
                     result = wrap_method(**reconciled_arguments)
+                    wrapped_result = {"body": dataclass_to_dict(result), "header": {}}
 
                     # Serialize the result to JSON.
                     serialized = json.dumps(
-                        dataclass_to_dict(result), indent=4, ensure_ascii=False
+                        dataclass_to_dict(wrapped_result), indent=4, ensure_ascii=False
                     )
 
                     # This log message will now also be written to log_f
@@ -206,7 +210,6 @@ class Webview:
         _webview_lib.webview_set_title(self._handle, _encode_c_string(value))
         self._title = value
 
-
     def destroy(self) -> None:
         for name in list(self._callbacks.keys()):
             self.unbind(name)