From 7952a34d64d43cbd56ec789909ee76a1063efc51 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 18 May 2022 16:09:09 +0530
Subject: [PATCH] Add logging

---
 src/platform/web/Platform.js    | 28 +++++++------
 src/platform/web/ThemeLoader.ts | 72 ++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 46 deletions(-)

diff --git a/src/platform/web/Platform.js b/src/platform/web/Platform.js
index 02990ea0..25439ad0 100644
--- a/src/platform/web/Platform.js
+++ b/src/platform/web/Platform.js
@@ -169,20 +169,22 @@ export class Platform {
     }
 
     async init() {
-        if (!this._config) {
-            if (!this._configURL) {
-                throw new Error("Neither config nor configURL was provided!");
+        await this.logger.run("Platform init", async () => {
+            if (!this._config) {
+                if (!this._configURL) {
+                    throw new Error("Neither config nor configURL was provided!");
+                }
+                const {body}= await this.request(this._configURL, {method: "GET", format: "json", cache: true}).response();
+                this._config = body;
             }
-            const {body}= await this.request(this._configURL, {method: "GET", format: "json", cache: true}).response();
-            this._config = body;
-        }
-        this.notificationService = new NotificationService(
-            this._serviceWorkerHandler,
-            this._config.push
-        );
-        const manifests = this.config["themeManifests"];
-        await this._themeLoader?.init(manifests);
-        this._themeLoader?.setTheme(await this._themeLoader.getActiveTheme());
+            this.notificationService = new NotificationService(
+                this._serviceWorkerHandler,
+                this._config.push
+            );
+            const manifests = this.config["themeManifests"];
+            await this._themeLoader?.init(manifests);
+            this._themeLoader?.setTheme(await this._themeLoader.getActiveTheme());
+        });
     }
 
     _createLogger(isDevelopment) {
diff --git a/src/platform/web/ThemeLoader.ts b/src/platform/web/ThemeLoader.ts
index 0234a04a..5d93ad68 100644
--- a/src/platform/web/ThemeLoader.ts
+++ b/src/platform/web/ThemeLoader.ts
@@ -27,30 +27,34 @@ export class ThemeLoader {
     }
 
     async init(manifestLocations: string[]): Promise<void> {
-        for (const manifestLocation of manifestLocations) {
-            const { body } = await this._platform
-                .request(manifestLocation, {
-                    method: "GET",
-                    format: "json",
-                    cache: true,
-                })
-                .response();
-            /*
-            After build has finished, the source section of each theme manifest
-            contains `built-assets` which is a mapping from the theme-name to the
-            location of the css file in build.
-            */
-            Object.assign(this._themeMapping, body["source"]["built-assets"]);
-        }
+        await this._platform.logger.run("ThemeLoader.init", async () => {
+            for (const manifestLocation of manifestLocations) {
+                const { body } = await this._platform
+                    .request(manifestLocation, {
+                        method: "GET",
+                        format: "json",
+                        cache: true,
+                    })
+                    .response();
+                /*
+                After build has finished, the source section of each theme manifest
+                contains `built-assets` which is a mapping from the theme-name to the
+                location of the css file in build.
+                */
+                Object.assign(this._themeMapping, body["source"]["built-assets"]);
+            }
+        });
     }
 
     setTheme(themeName: string) {
-        const themeLocation = this._themeMapping[themeName];
-        if (!themeLocation) {
-            throw new Error( `Cannot find theme location for theme "${themeName}"!`);
-        }
-        this._platform.replaceStylesheet(themeLocation);
-        this._platform.settingsStorage.setString("theme", themeName);
+        this._platform.logger.run("ThemeLoader.setTheme", () => {
+            const themeLocation = this._themeMapping[themeName];
+            if (!themeLocation) {
+                throw new Error( `Cannot find theme location for theme "${themeName}"!`);
+            }
+            this._platform.replaceStylesheet(themeLocation);
+            this._platform.settingsStorage.setString("theme", themeName);
+         });
     }
 
     get themes(): string[] {
@@ -58,17 +62,19 @@ export class ThemeLoader {
     }
 
     async getActiveTheme(): Promise<string|undefined> {
-        // check if theme is set via settings
-        let theme = await this._platform.settingsStorage.getString("theme");
-        if (theme) {
-            return theme;
-        }
-        // return default theme
-        if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
-            return this._platform.config["defaultTheme"].dark;
-        } else if (window.matchMedia("(prefers-color-scheme: light)").matches) {
-            return this._platform.config["defaultTheme"].light;
-        }
-        return undefined;
+        return await this._platform.logger.run("ThemeLoader.getActiveTheme", async () => {
+            // check if theme is set via settings
+            let theme = await this._platform.settingsStorage.getString("theme");
+            if (theme) {
+                return theme;
+            }
+            // return default theme
+            if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+                return this._platform.config["defaultTheme"].dark;
+            } else if (window.matchMedia("(prefers-color-scheme: light)").matches) {
+                return this._platform.config["defaultTheme"].light;
+            }
+            return undefined;
+         });
     }
 }