Fix pagetimings not merging

browserup · Sep 22, 2023 · 7995130 · 7995130
1 parent aac3bad
commit 7995130
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/browserup-proxy.schema.json b/browserup-proxy.schema.json
@@ -25,7 +25,7 @@
       "url": "logo.png"
     },
     "title": "BrowserUp MitmProxy",
-    "version": "1.1.5"
+    "version": "1.22"
   },
   "paths": {
     "/har": {

diff --git a/mitmproxy/addons/browserup/browserup_addons_manager.py b/mitmproxy/addons/browserup/browserup_addons_manager.py
@@ -18,13 +18,15 @@
 
 # https://marshmallow.readthedocs.io/en/stable/quickstart.html
 
+VERSION = '1.22'
+
 
 class BrowserUpAddonsManagerAddOn:
     initialized = False
 
     def load(self, l):
         logging.info('Loading BrowserUpAddonsManagerAddOn')
-        logging.info('Version 1.22')
+        logging.info('Version {}'.format(VERSION))
 
         ctx.options.update(listen_port = 48080)
 
@@ -56,7 +58,7 @@ def is_script_loader_initialized(self):
     def basic_spec(self, app):
         return APISpec(
             title='BrowserUp MitmProxy',
-            version='1.1.5',
+            version=VERSION,
             servers = [{"url": "http://localhost:{port}/",
                         "description": "The development API server",
                         "variables": {"port": {"enum": ["48088"], "default": '48088'}}

diff --git a/mitmproxy/addons/browserup/har/har_builder.py b/mitmproxy/addons/browserup/har/har_builder.py
@@ -29,8 +29,8 @@ def log():
     @staticmethod
     def page_timings():
         return {
-            "onContentLoad": 0,
-            "onLoad": 0,
+            "onContentLoad": -1,
+            "onLoad": -1,
             "comment": ""
         }
 

diff --git a/mitmproxy/addons/browserup/har/har_manager.py b/mitmproxy/addons/browserup/har/har_manager.py
@@ -113,7 +113,9 @@ def add_error_to_har(self, error_dict):
 
     def add_page_timings_to_har(self, page_info):
         page = self.get_or_create_current_page()
-        page['pageTimings'] = page_info
+        timings = page['pageTimings']
+        timings.update(page_info)
+        page['pageTimings'] = timings
         logging.info(self.get_or_create_current_page())
 
     def add_page_data_to_har(self, page_data):