fix(webextension): add boot event

textlint · Aug 2, 2020 · 34babc9 · 34babc9
1 parent a86ebd2
commit 34babc9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/webextension/app/scripts/background.ts b/packages/webextension/app/scripts/background.ts
@@ -78,7 +78,7 @@ browser.runtime.onConnect.addListener(async (port) => {
         const blob = new Blob([script.code], { type: "application/javascript" });
         return createTextlintWorker(URL.createObjectURL(blob));
     });
-    console.log("[Background] workers", workers);
+    console.log("[Background] workers started", workers);
     // Support multiple workers
     const ext = ".md";
     const lintEngine: LintEngineAPI = {
@@ -128,6 +128,7 @@ browser.runtime.onConnect.addListener(async (port) => {
         });
     });
     console.log("[Background] content port", port);
-    await Promise.all(workers.map((worker) => worker.ready()));
     Comlink.expose(backgroundExposedObject, createBackgroundEndpoint(port));
+    await Promise.all(workers.map((worker) => worker.ready()));
+    port.postMessage("textlint-editor-boot");
 });
diff --git a/packages/webextension/app/scripts/contentScript.ts b/packages/webextension/app/scripts/contentScript.ts
@@ -6,7 +6,8 @@ import { createEndpoint } from "comlink-extension";
 import * as Comlink from "comlink";
 import type { backgroundExposedObject } from "./background";
 
-const port = Comlink.wrap<backgroundExposedObject>(createEndpoint(browser.runtime.connect()));
+const rawPort = browser.runtime.connect();
+const port = Comlink.wrap<backgroundExposedObject>(createEndpoint(rawPort));
 const targetElement = document.querySelectorAll("textarea");
 
 async function contentScriptMain() {
@@ -26,7 +27,11 @@ async function contentScriptMain() {
     });
 }
 
-console.log("[ContentScript]", "main");
-contentScriptMain().catch((error) => {
-    console.error("[texlint editor ContentScriptError]", error);
+console.log("[ContentScript]", "main loaded");
+rawPort.onMessage.addListener((event) => {
+    if (event === "textlint-editor-boot") {
+        contentScriptMain().catch((error) => {
+            console.error("[texlint editor ContentScriptError]", error);
+        });
+    }
 });