Attach/detach console iframe on addon enabled/disabled

13 files changed, 108 insertions, 28 deletions

diff --git a/src/content/index.ts b/src/content/index.ts
index 5252338..20dbbcc 100644
--- a/src/content/index.ts
+++ b/src/content/index.ts
@@ -3,15 +3,10 @@ import "reflect-metadata";
 import Application from "./Application";
 import Bootstrap from "./Bootstrap";
 import consoleFrameStyle from "./site-style";
-import { ConsoleFramePresenterImpl } from "./presenters/ConsoleFramePresenter";
 import { container } from "tsyringe";
 import "./di";
 
 const initDom = () => {
-  if (window.self === window.top) {
-    new ConsoleFramePresenterImpl().initialize();
-  }
-
   try {
     const app = container.resolve(Application);
     app.run();
diff --git a/src/content/operators/impls/AddonOperatorFactoryChain.ts b/src/content/operators/impls/AddonOperatorFactoryChain.ts
index 54880c4..5e464e8 100644
--- a/src/content/operators/impls/AddonOperatorFactoryChain.ts
+++ b/src/content/operators/impls/AddonOperatorFactoryChain.ts
@@ -7,6 +7,7 @@ import Operator from "../Operator";
 import EnableAddonOperator from "./EnableAddonOperator";
 import DisableAddonOperator from "./DisableAddonOperator";
 import ToggleAddonOperator from "./ToggleAddonOperator";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
 
 @injectable()
 export default class AddonOperatorFactoryChain implements OperatorFactoryChain {
@@ -14,7 +15,9 @@ export default class AddonOperatorFactoryChain implements OperatorFactoryChain {
     @inject("AddonIndicatorClient")
     private readonly addonIndicatorClient: AddonIndicatorClient,
     @inject("AddonEnabledRepository")
-    private readonly addonEnabledRepository: AddonEnabledRepository
+    private readonly addonEnabledRepository: AddonEnabledRepository,
+    @inject("ConsoleFramePresenter")
+    private readonly consoleFramePresenter: ConsoleFramePresenter
   ) {}
 
   create(op: operations.Operation, _repeat: number): Operator | null {
@@ -22,17 +25,20 @@ export default class AddonOperatorFactoryChain implements OperatorFactoryChain {
       case operations.ADDON_ENABLE:
         return new EnableAddonOperator(
           this.addonIndicatorClient,
-          this.addonEnabledRepository
+          this.addonEnabledRepository,
+          this.consoleFramePresenter
         );
       case operations.ADDON_DISABLE:
         return new DisableAddonOperator(
           this.addonIndicatorClient,
-          this.addonEnabledRepository
+          this.addonEnabledRepository,
+          this.consoleFramePresenter
         );
       case operations.ADDON_TOGGLE_ENABLED:
         return new ToggleAddonOperator(
           this.addonIndicatorClient,
-          this.addonEnabledRepository
+          this.addonEnabledRepository,
+          this.consoleFramePresenter
         );
     }
     return null;
diff --git a/src/content/operators/impls/DisableAddonOperator.ts b/src/content/operators/impls/DisableAddonOperator.ts
index 28811fe..a92e04b 100644
--- a/src/content/operators/impls/DisableAddonOperator.ts
+++ b/src/content/operators/impls/DisableAddonOperator.ts
@@ -1,15 +1,18 @@
 import Operator from "../Operator";
 import AddonIndicatorClient from "../../client/AddonIndicatorClient";
 import AddonEnabledRepository from "../../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
 
 export default class DisableAddonOperator implements Operator {
   constructor(
     private readonly indicator: AddonIndicatorClient,
-    private readonly repository: AddonEnabledRepository
+    private readonly repository: AddonEnabledRepository,
+    private readonly consoleFramePresenter: ConsoleFramePresenter
   ) {}
 
   async run(): Promise<void> {
     this.repository.set(false);
+    this.consoleFramePresenter.detach();
     await this.indicator.setEnabled(false);
   }
 }
diff --git a/src/content/operators/impls/EnableAddonOperator.ts b/src/content/operators/impls/EnableAddonOperator.ts
index b5b1d79..fe2b771 100644
--- a/src/content/operators/impls/EnableAddonOperator.ts
+++ b/src/content/operators/impls/EnableAddonOperator.ts
@@ -1,15 +1,18 @@
 import Operator from "../Operator";
 import AddonIndicatorClient from "../../client/AddonIndicatorClient";
 import AddonEnabledRepository from "../../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
 
 export default class EnableAddonOperator implements Operator {
   constructor(
     private readonly indicator: AddonIndicatorClient,
-    private readonly repository: AddonEnabledRepository
+    private readonly repository: AddonEnabledRepository,
+    private readonly consoleFramePresenter: ConsoleFramePresenter
   ) {}
 
   async run(): Promise<void> {
     this.repository.set(true);
+    this.consoleFramePresenter.attach();
     await this.indicator.setEnabled(true);
   }
 }
diff --git a/src/content/operators/impls/ToggleAddonOperator.ts b/src/content/operators/impls/ToggleAddonOperator.ts
index 2a249d6..1019b8b 100644
--- a/src/content/operators/impls/ToggleAddonOperator.ts
+++ b/src/content/operators/impls/ToggleAddonOperator.ts
@@ -1,16 +1,23 @@
 import Operator from "../Operator";
 import AddonIndicatorClient from "../../client/AddonIndicatorClient";
 import AddonEnabledRepository from "../../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../../presenters/ConsoleFramePresenter";
 
 export default class ToggleAddonOperator implements Operator {
   constructor(
     private readonly indicator: AddonIndicatorClient,
-    private readonly repository: AddonEnabledRepository
+    private readonly repository: AddonEnabledRepository,
+    private readonly consoleFramePresenter: ConsoleFramePresenter
   ) {}
 
   async run(): Promise<void> {
-    const current = this.repository.get();
-    this.repository.set(!current);
-    await this.indicator.setEnabled(!current);
+    const enabled = !this.repository.get();
+    this.repository.set(enabled);
+    if (enabled) {
+      this.consoleFramePresenter.attach();
+    } else {
+      this.consoleFramePresenter.detach();
+    }
+    await this.indicator.setEnabled(enabled);
   }
 }
diff --git a/src/content/presenters/ConsoleFramePresenter.ts b/src/content/presenters/ConsoleFramePresenter.ts
index ccc196b..9c4b3f1 100644
--- a/src/content/presenters/ConsoleFramePresenter.ts
+++ b/src/content/presenters/ConsoleFramePresenter.ts
@@ -1,5 +1,7 @@
 export default interface ConsoleFramePresenter {
-  initialize(): void;
+  attach(): void;
+
+  detach(): void;
 
   blur(): void;
 
@@ -7,18 +9,33 @@ export default interface ConsoleFramePresenter {
 }
 
 export class ConsoleFramePresenterImpl implements ConsoleFramePresenter {
-  initialize(): void {
+  private static readonly IframeId = "vimvixen-console-frame" as const;
+
+  attach(): void {
+    const ele = document.getElementById("vimvixen-console-frame");
+    if (ele) {
+      return;
+    }
+
     const iframe = document.createElement("iframe");
     iframe.src = browser.runtime.getURL("build/console.html");
-    iframe.id = "vimvixen-console-frame";
+    iframe.id = ConsoleFramePresenterImpl.IframeId;
     iframe.className = "vimvixen-console-frame";
     document.body.append(iframe);
   }
 
+  detach(): void {
+    const ele = document.getElementById(ConsoleFramePresenterImpl.IframeId);
+    if (!ele) {
+      return;
+    }
+    ele.remove();
+  }
+
   blur(): void {
     const ele = document.getElementById("vimvixen-console-frame");
     if (!ele) {
-      throw new Error("console frame not created");
+      return;
     }
     ele.blur();
   }
diff --git a/src/content/usecases/AddonEnabledUseCase.ts b/src/content/usecases/AddonEnabledUseCase.ts
index f7e78c5..b45c47f 100644
--- a/src/content/usecases/AddonEnabledUseCase.ts
+++ b/src/content/usecases/AddonEnabledUseCase.ts
@@ -1,15 +1,17 @@
 import { injectable, inject } from "tsyringe";
 import AddonIndicatorClient from "../client/AddonIndicatorClient";
 import AddonEnabledRepository from "../repositories/AddonEnabledRepository";
+import ConsoleFramePresenter from "../presenters/ConsoleFramePresenter";
 
 @injectable()
 export default class AddonEnabledUseCase {
   constructor(
     @inject("AddonIndicatorClient")
-    private indicator: AddonIndicatorClient,
-
+    private readonly indicator: AddonIndicatorClient,
     @inject("AddonEnabledRepository")
-    private repository: AddonEnabledRepository
+    private readonly repository: AddonEnabledRepository,
+    @inject("ConsoleFramePresenter")
+    private readonly consoleFramePresenter: ConsoleFramePresenter
   ) {}
 
   async enable(): Promise<void> {
@@ -31,6 +33,12 @@ export default class AddonEnabledUseCase {
 
   private async setEnabled(on: boolean): Promise<void> {
     this.repository.set(on);
+
+    if (on) {
+      this.consoleFramePresenter.attach();
+    } else {
+      this.consoleFramePresenter.detach();
+    }
     await this.indicator.setEnabled(on);
   }
 }
diff --git a/test/content/operators/impls/AddonOperatorFactoryChain.test.ts b/test/content/operators/impls/AddonOperatorFactoryChain.test.ts
index c064bb9..dde5a35 100644
--- a/test/content/operators/impls/AddonOperatorFactoryChain.test.ts
+++ b/test/content/operators/impls/AddonOperatorFactoryChain.test.ts
@@ -6,13 +6,15 @@ import * as operations from "../../../../src/shared/operations";
 import { expect } from "chai";
 import MockAddonIndicatorClient from "../../mock/MockAddonIndicatorClient";
 import MockAddonEnabledRepository from "../../mock/MockAddonEnabledRepository";
+import MockConsoleFramePresenter from "./MockConsoleFramePresenter";
 
 describe("AddonOperatorFactoryChain", () => {
   describe("#create", () => {
     it("returns an operator", () => {
       const sut = new AddonOperatorFactoryChain(
         new MockAddonIndicatorClient(),
-        new MockAddonEnabledRepository()
+        new MockAddonEnabledRepository(),
+        new MockConsoleFramePresenter(false)
       );
       expect(sut.create({ type: operations.ADDON_ENABLE }, 0)).to.be.instanceOf(
         EnableAddonOperator
diff --git a/test/content/operators/impls/DisableAddonOperator.test.ts b/test/content/operators/impls/DisableAddonOperator.test.ts
index 358ae44..e05d1f1 100644
--- a/test/content/operators/impls/DisableAddonOperator.test.ts
+++ b/test/content/operators/impls/DisableAddonOperator.test.ts
@@ -2,18 +2,21 @@ import { expect } from "chai";
 import DisableAddonOperator from "../../../../src/content/operators/impls/DisableAddonOperator";
 import MockAddonIndicatorClient from "../../mock/MockAddonIndicatorClient";
 import MockAddonEnabledRepository from "../../mock/MockAddonEnabledRepository";
+import MockConsoleFramePresenter from "./MockConsoleFramePresenter";
 
 describe("DisableAddonOperator", () => {
   describe("#run", () => {
     it("disables addon", async () => {
       const client = new MockAddonIndicatorClient(true);
       const repository = new MockAddonEnabledRepository(true);
-      const sut = new DisableAddonOperator(client, repository);
+      const presenter = new MockConsoleFramePresenter(true);
+      const sut = new DisableAddonOperator(client, repository, presenter);
 
       await sut.run();
 
       expect(client.enabled).to.be.false;
       expect(repository.enabled).to.be.false;
+      expect(presenter.attached).to.be.false;
     });
   });
 });
diff --git a/test/content/operators/impls/EnableAddonOperator.test.ts b/test/content/operators/impls/EnableAddonOperator.test.ts
index a6ca31b..6025608 100644
--- a/test/content/operators/impls/EnableAddonOperator.test.ts
+++ b/test/content/operators/impls/EnableAddonOperator.test.ts
@@ -2,18 +2,21 @@ import { expect } from "chai";
 import EnableAddonOperator from "../../../../src/content/operators/impls/EnableAddonOperator";
 import MockAddonIndicatorClient from "../../mock/MockAddonIndicatorClient";
 import MockAddonEnabledRepository from "../../mock/MockAddonEnabledRepository";
+import MockConsoleFramePresenter from "./MockConsoleFramePresenter";
 
 describe("EnableAddonOperator", () => {
   describe("#run", () => {
     it("enabled addon", async () => {
       const client = new MockAddonIndicatorClient(false);
       const repository = new MockAddonEnabledRepository(false);
-      const sut = new EnableAddonOperator(client, repository);
+      const presenter = new MockConsoleFramePresenter(false);
+      const sut = new EnableAddonOperator(client, repository, presenter);
 
       await sut.run();
 
       expect(client.enabled).to.be.true;
       expect(repository.enabled).to.be.true;
+      expect(presenter.attached).to.be.true;
     });
   });
 });
diff --git a/test/content/operators/impls/MockConsoleFramePresenter.ts b/test/content/operators/impls/MockConsoleFramePresenter.ts
new file mode 100644
index 0000000..f8ac70b
--- /dev/null
+++ b/test/content/operators/impls/MockConsoleFramePresenter.ts
@@ -0,0 +1,22 @@
+import ConsoleFramePresenter from "../../../../src/content/presenters/ConsoleFramePresenter";
+
+export default class MockConsoleFramePresenter
+  implements ConsoleFramePresenter {
+  constructor(public attached: boolean) {}
+
+  attach(): void {
+    this.attached = true;
+  }
+
+  detach(): void {
+    this.attached = false;
+  }
+
+  blur(): void {
+    throw new Error("not implemented");
+  }
+
+  resize(_width: number, _height: number): void {
+    throw new Error("not implemented");
+  }
+}
diff --git a/test/content/operators/impls/ToggleAddonOperator.test.ts b/test/content/operators/impls/ToggleAddonOperator.test.ts
index 6026eb1..1f291b5 100644
--- a/test/content/operators/impls/ToggleAddonOperator.test.ts
+++ b/test/content/operators/impls/ToggleAddonOperator.test.ts
@@ -2,23 +2,27 @@ import { expect } from "chai";
 import ToggleAddonOperator from "../../../../src/content/operators/impls/ToggleAddonOperator";
 import MockAddonIndicatorClient from "../../mock/MockAddonIndicatorClient";
 import MockAddonEnabledRepository from "../../mock/MockAddonEnabledRepository";
+import MockConsoleFramePresenter from "./MockConsoleFramePresenter";
 
 describe("ToggleAddonOperator", () => {
   describe("#run", () => {
     it("toggles addon-enabled state", async () => {
       const client = new MockAddonIndicatorClient(true);
       const repository = new MockAddonEnabledRepository(true);
-      const sut = new ToggleAddonOperator(client, repository);
+      const presenter = new MockConsoleFramePresenter(true);
+      const sut = new ToggleAddonOperator(client, repository, presenter);
 
       await sut.run();
 
       expect(client.enabled).to.be.false;
       expect(repository.enabled).to.be.false;
+      expect(presenter.attached).to.be.false;
 
       await sut.run();
 
       expect(client.enabled).to.be.true;
       expect(repository.enabled).to.be.true;
+      expect(presenter.attached).to.be.true;
     });
   });
 });
diff --git a/test/content/usecases/AddonEnabledUseCase.test.ts b/test/content/usecases/AddonEnabledUseCase.test.ts
index 885da83..8a614c5 100644
--- a/test/content/usecases/AddonEnabledUseCase.test.ts
+++ b/test/content/usecases/AddonEnabledUseCase.test.ts
@@ -2,6 +2,7 @@ import AddonEnabledRepository from "../../../src/content/repositories/AddonEnabl
 import AddonEnabledUseCase from "../../../src/content/usecases/AddonEnabledUseCase";
 import AddonIndicatorClient from "../../../src/content/client/AddonIndicatorClient";
 import { expect } from "chai";
+import MockConsoleFramePresenter from "../operators/impls/MockConsoleFramePresenter";
 
 class MockAddonEnabledRepository implements AddonEnabledRepository {
   private enabled: boolean;
@@ -35,12 +36,14 @@ class MockAddonIndicatorClient implements AddonIndicatorClient {
 describe("AddonEnabledUseCase", () => {
   let repository: MockAddonEnabledRepository;
   let indicator: MockAddonIndicatorClient;
+  let presenter: MockConsoleFramePresenter;
   let sut: AddonEnabledUseCase;
 
   beforeEach(() => {
-    repository = new MockAddonEnabledRepository(true);
+    repository = new MockAddonEnabledRepository(false);
     indicator = new MockAddonIndicatorClient(false);
-    sut = new AddonEnabledUseCase(indicator, repository);
+    presenter = new MockConsoleFramePresenter(false);
+    sut = new AddonEnabledUseCase(indicator, repository, presenter);
   });
 
   describe("#enable", () => {
@@ -49,6 +52,7 @@ describe("AddonEnabledUseCase", () => {
 
       expect(repository.get()).to.be.true;
       expect(indicator.enabled).to.be.true;
+      expect(presenter.attached).to.be.true;
     });
   });
 
@@ -58,6 +62,7 @@ describe("AddonEnabledUseCase", () => {
 
       expect(repository.get()).to.be.false;
       expect(indicator.enabled).to.be.false;
+      expect(presenter.attached).to.be.false;
     });
   });
 
@@ -68,6 +73,7 @@ describe("AddonEnabledUseCase", () => {
 
       expect(repository.get()).to.be.false;
       expect(indicator.enabled).to.be.false;
+      expect(presenter.attached).to.be.false;
 
       repository.set(false);
 
@@ -75,6 +81,7 @@ describe("AddonEnabledUseCase", () => {
 
       expect(repository.get()).to.be.true;
       expect(indicator.enabled).to.be.true;
+      expect(presenter.attached).to.be.true;
     });
   });