Move apiGetEnvironmentInfo implementation into Backend

ext/bg/js/api.js

@@ -89,34 +89,8 @@ function apiInjectStylesheet(css, sender) {
     return utilBackend()._onApiInjectStylesheet({css}, sender);
 }
 
-async function apiGetEnvironmentInfo() {
+function apiGetEnvironmentInfo() {
-    const browser = await _apiGetBrowser();
+    return utilBackend()._onApiGetEnvironmentInfo();
-    const platform = await new Promise((resolve) => chrome.runtime.getPlatformInfo(resolve));
-    return {
-        browser,
-        platform: {
-            os: platform.os
-        }
-    };
-}
-
-async function _apiGetBrowser() {
-    if (EXTENSION_IS_BROWSER_EDGE) {
-        return 'edge';
-    }
-    if (typeof browser !== 'undefined') {
-        try {
-            const info = await browser.runtime.getBrowserInfo();
-            if (info.name === 'Fennec') {
-                return 'firefox-mobile';
-            }
-        } catch (e) {
-            // NOP
-        }
-        return 'firefox';
-    } else {
-        return 'chrome';
-    }
 }
 
 async function apiClipboardGet() {

ext/bg/js/backend.js

@@ -464,8 +464,15 @@ class Backend {
         });
     }
 
-    _onApiGetEnvironmentInfo() {
+    async _onApiGetEnvironmentInfo() {
-        return apiGetEnvironmentInfo();
+        const browser = await Backend._getBrowser();
+        const platform = await new Promise((resolve) => chrome.runtime.getPlatformInfo(resolve));
+        return {
+            browser,
+            platform: {
+                os: platform.os
+            }
+        };
     }
 
     _onApiClipboardGet() {
@@ -638,6 +645,25 @@ class Backend {
             // Edge throws exception for no reason here.
         }
     }
+
+    static async _getBrowser() {
+        if (EXTENSION_IS_BROWSER_EDGE) {
+            return 'edge';
+        }
+        if (typeof browser !== 'undefined') {
+            try {
+                const info = await browser.runtime.getBrowserInfo();
+                if (info.name === 'Fennec') {
+                    return 'firefox-mobile';
+                }
+            } catch (e) {
+                // NOP
+            }
+            return 'firefox';
+        } else {
+            return 'chrome';
+        }
+    }
 }
 
 Backend._messageHandlers = new Map([