Merge pull request #1213 from ueokande/cross-frame-search

Cross frame search

28 files changed, 487 insertions, 288 deletions

diff --git a/src/background/Application.ts b/src/background/Application.ts
index 69fe4a4..2006965 100644
--- a/src/background/Application.ts
+++ b/src/background/Application.ts
@@ -3,6 +3,7 @@ import ContentMessageListener from "./infrastructures/ContentMessageListener";
 import SettingController from "./controllers/SettingController";
 import VersionController from "./controllers/VersionController";
 import SettingRepository from "./repositories/SettingRepository";
+import FindRepositoryImpl from "./repositories/FindRepository";
 
 @injectable()
 export default class Application {
@@ -11,12 +12,19 @@ export default class Application {
     private settingController: SettingController,
     private versionController: VersionController,
     @inject("SyncSettingRepository")
-    private syncSettingRepository: SettingRepository
+    private syncSettingRepository: SettingRepository,
+    @inject("FindRepository")
+    private readonly findRepository: FindRepositoryImpl
   ) {}
 
   run() {
     this.settingController.reload();
 
+    browser.tabs.onUpdated.addListener((tabId: number, info) => {
+      if (info.status == "loading") {
+        this.findRepository.deleteLocalState(tabId);
+      }
+    });
     browser.runtime.onInstalled.addListener((details) => {
       if (details.reason !== "install" && details.reason !== "update") {
         return;
diff --git a/src/background/clients/FindClient.ts b/src/background/clients/FindClient.ts
new file mode 100644
index 0000000..b46b964
--- /dev/null
+++ b/src/background/clients/FindClient.ts
@@ -0,0 +1,45 @@
+import * as messages from "../../shared/messages";
+
+export default interface FindClient {
+  findNext(tabId: number, frameId: number, keyword: string): Promise<boolean>;
+
+  findPrev(tabId: number, frameId: number, keyword: string): Promise<boolean>;
+
+  clearSelection(tabId: number, frameId: number): Promise<void>;
+}
+
+export class FindClientImpl implements FindClient {
+  async findNext(
+    tabId: number,
+    frameId: number,
+    keyword: string
+  ): Promise<boolean> {
+    const found = (await browser.tabs.sendMessage(
+      tabId,
+      { type: messages.FIND_NEXT, keyword },
+      { frameId }
+    )) as boolean;
+    return found;
+  }
+
+  async findPrev(
+    tabId: number,
+    frameId: number,
+    keyword: string
+  ): Promise<boolean> {
+    const found = (await browser.tabs.sendMessage(
+      tabId,
+      { type: messages.FIND_PREV, keyword },
+      { frameId }
+    )) as boolean;
+    return found;
+  }
+
+  clearSelection(tabId: number, frameId: number): Promise<void> {
+    return browser.tabs.sendMessage(
+      tabId,
+      { type: messages.FIND_CLEAR_SELECTION },
+      { frameId }
+    );
+  }
+}
diff --git a/src/background/controllers/FindController.ts b/src/background/controllers/FindController.ts
index f3ea93f..0772866 100644
--- a/src/background/controllers/FindController.ts
+++ b/src/background/controllers/FindController.ts
@@ -1,15 +1,11 @@
 import { injectable } from "tsyringe";
-import FindUseCase from "../usecases/FindUseCase";
+import StartFindUseCase from "../usecases/StartFindUseCase";
 
 @injectable()
 export default class FindController {
-  constructor(private findUseCase: FindUseCase) {}
+  constructor(private startFindUseCase: StartFindUseCase) {}
 
-  getKeyword(): Promise<string> {
-    return this.findUseCase.getKeyword();
-  }
-
-  setKeyword(keyword: string): Promise<void> {
-    return this.findUseCase.setKeyword(keyword);
+  startFind(tabId: number, keyword?: string): Promise<void> {
+    return this.startFindUseCase.startFind(tabId, keyword);
   }
 }
diff --git a/src/background/di.ts b/src/background/di.ts
index a571c7d..e97c4a8 100644
--- a/src/background/di.ts
+++ b/src/background/di.ts
@@ -18,7 +18,10 @@ import { BrowserSettingRepositoryImpl } from "./repositories/BrowserSettingRepos
 import { RepeatRepositoryImpl } from "./repositories/RepeatRepository";
 import { ZoomPresenterImpl } from "./presenters/ZoomPresenter";
 import { WindowPresenterImpl } from "./presenters/WindowPresenter";
+import { FramePresenterImpl } from "./presenters/FramePresenter";
+import { FindClientImpl } from "./clients/FindClient";
 import { ConsoleFrameClientImpl } from "./clients/ConsoleFrameClient";
+import { FindRepositoryImpl } from "./repositories/FindRepository";
 
 container.register("LocalSettingRepository", {
   useClass: LocalSettingRepository,
@@ -40,6 +43,9 @@ container.register("TabRepository", { useClass: TabRepositoryImpl });
 container.register("ZoomPresenter", { useClass: ZoomPresenterImpl });
 container.register("TabPresenter", { useClass: TabPresenterImpl });
 container.register("WindowPresenter", { useClass: WindowPresenterImpl });
+container.register("FramePresenter", { useClass: FramePresenterImpl });
+container.register("FindRepository", { useClass: FindRepositoryImpl });
+container.register("FindClient", { useClass: FindClientImpl });
 container.register("NavigateClient", { useClass: NavigateClientImpl });
 container.register("ConsoleClient", { useClass: ConsoleClientImpl });
 container.register("ConsoleFrameClient", { useClass: ConsoleFrameClientImpl });
diff --git a/src/background/infrastructures/ContentMessageListener.ts b/src/background/infrastructures/ContentMessageListener.ts
index 6023047..ce7ff09 100644
--- a/src/background/infrastructures/ContentMessageListener.ts
+++ b/src/background/infrastructures/ContentMessageListener.ts
@@ -3,13 +3,13 @@ import * as messages from "../../shared/messages";
 import * as operations from "../../shared/operations";
 import CommandController from "../controllers/CommandController";
 import SettingController from "../controllers/SettingController";
-import FindController from "../controllers/FindController";
 import AddonEnabledController from "../controllers/AddonEnabledController";
 import LinkController from "../controllers/LinkController";
 import OperationController from "../controllers/OperationController";
 import MarkController from "../controllers/MarkController";
 import CompletionController from "../controllers/CompletionController";
 import ConsoleController from "../controllers/ConsoleController";
+import FindController from "../controllers/FindController";
 
 @injectable()
 export default class ContentMessageListener {
@@ -19,12 +19,12 @@ export default class ContentMessageListener {
     private readonly settingController: SettingController,
     private readonly commandController: CommandController,
     private readonly completionController: CompletionController,
-    private readonly findController: FindController,
     private readonly addonEnabledController: AddonEnabledController,
     private readonly linkController: LinkController,
     private readonly operationController: OperationController,
     private readonly markController: MarkController,
-    private readonly consoleController: ConsoleController
+    private readonly consoleController: ConsoleController,
+    private readonly findController: FindController
   ) {}
 
   run(): void {
@@ -36,6 +36,7 @@ export default class ContentMessageListener {
             return {};
           }
           return ret.catch((e) => {
+            console.error(e);
             if (!sender.tab || !sender.tab.id) {
               return;
             }
@@ -45,6 +46,7 @@ export default class ContentMessageListener {
             });
           });
         } catch (e) {
+          console.error(e);
           if (!sender.tab || !sender.tab.id) {
             return;
           }
@@ -80,6 +82,8 @@ export default class ContentMessageListener {
         return this.completionController.getProperties();
       case messages.CONSOLE_ENTER_COMMAND:
         return this.onConsoleEnterCommand(message.text);
+      case messages.CONSOLE_ENTER_FIND:
+        return this.findController.startFind(senderTab.id!, message.keyword);
       case messages.CONSOLE_RESIZE:
         return this.onConsoleResize(
           senderTab.id!,
@@ -88,10 +92,6 @@ export default class ContentMessageListener {
         );
       case messages.SETTINGS_QUERY:
         return this.onSettingsQuery();
-      case messages.FIND_GET_KEYWORD:
-        return this.onFindGetKeyword();
-      case messages.FIND_SET_KEYWORD:
-        return this.onFindSetKeyword(message.keyword);
       case messages.ADDON_ENABLED_RESPONSE:
         return this.onAddonEnabledResponse(message.enabled);
       case messages.OPEN_URL:
@@ -132,14 +132,6 @@ export default class ContentMessageListener {
     return (await this.settingController.getSetting()).toJSON();
   }
 
-  onFindGetKeyword(): Promise<string> {
-    return this.findController.getKeyword();
-  }
-
-  onFindSetKeyword(keyword: string): Promise<void> {
-    return this.findController.setKeyword(keyword);
-  }
-
   onAddonEnabledResponse(enabled: boolean): Promise<void> {
     return this.addonEnabledController.indicate(enabled);
   }
diff --git a/src/background/operators/impls/FindNextOperator.ts b/src/background/operators/impls/FindNextOperator.ts
new file mode 100644
index 0000000..241f71d
--- /dev/null
+++ b/src/background/operators/impls/FindNextOperator.ts
@@ -0,0 +1,94 @@
+import Operator from "../Operator";
+import TabPresenter from "../../presenters/TabPresenter";
+import FindRepository from "../../repositories/FindRepository";
+import FindClient from "../../clients/FindClient";
+import ConsoleClient from "../../infrastructures/ConsoleClient";
+import FramePresenter from "../../presenters/FramePresenter";
+
+export default class FindNextOperator implements Operator {
+  constructor(
+    private readonly tabPresenter: TabPresenter,
+    private readonly findRepository: FindRepository,
+    private readonly findClient: FindClient,
+    private readonly consoleClient: ConsoleClient,
+    private readonly framePresenter: FramePresenter
+  ) {}
+
+  async run(): Promise<void> {
+    const tab = await this.tabPresenter.getCurrent();
+    const tabId = tab?.id;
+    if (tabId == null) {
+      return;
+    }
+
+    const state = await this.findRepository.getLocalState(tabId);
+    if (state) {
+      // Start to find the keyword from the current frame which last found on,
+      // and concat it to end of frame ids to perform a wrap-search
+      //
+      //                ,- keyword should be in this frame
+      //                |
+      // [100, 101, 0, 100]
+      //   |
+      //   `- continue from frame id 100
+      //
+      const targetFrameIds = state.frameIds
+        .slice(state.framePos)
+        .concat(
+          state.frameIds.slice(0, state.framePos),
+          state.frameIds[state.framePos]
+        );
+
+      for (let i = 0; i < targetFrameIds.length; ++i) {
+        const found = await this.findClient.findNext(
+          tabId,
+          targetFrameIds[i],
+          state.keyword
+        );
+        if (found) {
+          this.findRepository.setLocalState(tabId, {
+            ...state,
+            framePos: (i + state.framePos) % state.frameIds.length, // save current frame position or first
+          });
+          return;
+        }
+        this.findClient.clearSelection(tabId, targetFrameIds[i]);
+      }
+
+      // The keyword is gone.
+      this.consoleClient.showError(
+        tabId,
+        "Pattern not found: " + state.keyword
+      );
+      return;
+    }
+
+    const keyword = await this.findRepository.getGlobalKeyword();
+    if (keyword) {
+      const frameIds = await this.framePresenter.getAllFrameIds(tabId);
+      for (const frameId of frameIds) {
+        await this.findClient.clearSelection(tabId, frameId);
+      }
+
+      for (let framePos = 0; framePos < frameIds.length; ++framePos) {
+        const found = await this.findClient.findNext(
+          tabId,
+          frameIds[framePos],
+          keyword
+        );
+        if (found) {
+          await this.findRepository.setLocalState(tabId, {
+            frameIds,
+            framePos,
+            keyword,
+          });
+          await this.consoleClient.showInfo(tabId, "Pattern found: " + keyword);
+          return;
+        }
+      }
+      this.consoleClient.showError(tabId, "Pattern not found: " + keyword);
+      return;
+    }
+    await this.consoleClient.showError(tabId, "No previous search keywords");
+  }
+}
diff --git a/src/background/operators/impls/FindOperatorFactoryChain.ts b/src/background/operators/impls/FindOperatorFactoryChain.ts
new file mode 100644
index 0000000..b71f032
--- /dev/null
+++ b/src/background/operators/impls/FindOperatorFactoryChain.ts
@@ -0,0 +1,49 @@
+import { inject, injectable } from "tsyringe";
+import Operator from "../Operator";
+import OperatorFactoryChain from "../OperatorFactoryChain";
+import TabPresenter from "../../presenters/TabPresenter";
+import * as operations from "../../../shared/operations";
+import FindNextOperator from "./FindNextOperator";
+import FindPrevOperator from "./FindPrevOperator";
+import FindRepository from "../../repositories/FindRepository";
+import FindClient from "../../clients/FindClient";
+import FramePresenter from "../../presenters/FramePresenter";
+import ConsoleClient from "../../infrastructures/ConsoleClient";
+
+@injectable()
+export default class FindOperatorFactoryChain implements OperatorFactoryChain {
+  constructor(
+    @inject("TabPresenter")
+    private readonly tabPresenter: TabPresenter,
+    @inject("FindRepository")
+    private readonly findRepository: FindRepository,
+    @inject("FindClient")
+    private readonly findClient: FindClient,
+    @inject("ConsoleClient")
+    private readonly consoleClient: ConsoleClient,
+    @inject("FramePresenter")
+    private readonly framePresenter: FramePresenter
+  ) {}
+
+  create(op: operations.Operation): Operator | null {
+    switch (op.type) {
+      case operations.FIND_NEXT:
+        return new FindNextOperator(
+          this.tabPresenter,
+          this.findRepository,
+          this.findClient,
+          this.consoleClient,
+          this.framePresenter
+        );
+      case operations.FIND_PREV:
+        return new FindPrevOperator(
+          this.tabPresenter,
+          this.findRepository,
+          this.findClient,
+          this.consoleClient,
+          this.framePresenter
+        );
+    }
+    return null;
+  }
+}
diff --git a/src/background/operators/impls/FindPrevOperator.ts b/src/background/operators/impls/FindPrevOperator.ts
new file mode 100644
index 0000000..822c386
--- /dev/null
+++ b/src/background/operators/impls/FindPrevOperator.ts
@@ -0,0 +1,94 @@
+import Operator from "../Operator";
+import TabPresenter from "../../presenters/TabPresenter";
+import FindRepository from "../../repositories/FindRepository";
+import FindClient from "../../clients/FindClient";
+import ConsoleClient from "../../infrastructures/ConsoleClient";
+import FramePresenter from "../../presenters/FramePresenter";
+
+export default class FindPrevOperator implements Operator {
+  constructor(
+    private readonly tabPresenter: TabPresenter,
+    private readonly findRepository: FindRepository,
+    private readonly findClient: FindClient,
+    private readonly consoleClient: ConsoleClient,
+    private readonly framePresenter: FramePresenter
+  ) {}
+
+  async run(): Promise<void> {
+    const tab = await this.tabPresenter.getCurrent();
+    const tabId = tab?.id;
+    if (tabId == null) {
+      return;
+    }
+
+    const state = await this.findRepository.getLocalState(tabId);
+    if (state) {
+      // Start to find the keyword from the current frame which last found on,
+      // and concat it to end of frame ids to perform a wrap-search
+      //
+      //                ,- keyword should be in this frame
+      //                |
+      // [100, 101, 0, 100]
+      //   |
+      //   `- continue from frame id 100
+      //
+      const targetFrameIds = state.frameIds
+        .slice(state.framePos)
+        .concat(
+          state.frameIds.slice(0, state.framePos),
+          state.frameIds[state.framePos]
+        );
+
+      for (let i = targetFrameIds.length - 1; i >= 0; --i) {
+        const found = await this.findClient.findPrev(
+          tabId,
+          targetFrameIds[i],
+          state.keyword
+        );
+        if (found) {
+          this.findRepository.setLocalState(tabId, {
+            ...state,
+            framePos: (i + state.framePos) % state.frameIds.length, // save current frame position or first
+          });
+          return;
+        }
+        this.findClient.clearSelection(tabId, targetFrameIds[i]);
+      }
+
+      // The keyword is gone.
+      this.consoleClient.showError(
+        tabId,
+        "Pattern not found: " + state.keyword
+      );
+      return;
+    }
+
+    const keyword = await this.findRepository.getGlobalKeyword();
+    if (keyword) {
+      const frameIds = await this.framePresenter.getAllFrameIds(tabId);
+      for (const frameId of frameIds) {
+        await this.findClient.clearSelection(tabId, frameId);
+      }
+
+      for (let framePos = frameIds.length - 1; framePos >= 0; --framePos) {
+        const found = await this.findClient.findPrev(
+          tabId,
+          frameIds[framePos],
+          keyword
+        );
+        if (found) {
+          await this.findRepository.setLocalState(tabId, {
+            frameIds,
+            framePos,
+            keyword,
+          });
+          await this.consoleClient.showInfo(tabId, "Pattern found: " + keyword);
+          return;
+        }
+      }
+      this.consoleClient.showError(tabId, "Pattern not found: " + keyword);
+      return;
+    }
+    await this.consoleClient.showError(tabId, "No previous search keywords");
+  }
+}
diff --git a/src/background/operators/impls/OperatorFactoryImpl.ts b/src/background/operators/impls/OperatorFactoryImpl.ts
index 34e7bb5..ce87491 100644
--- a/src/background/operators/impls/OperatorFactoryImpl.ts
+++ b/src/background/operators/impls/OperatorFactoryImpl.ts
@@ -8,6 +8,7 @@ import NavigateOperatorFactoryChain from "./NavigateOperatorFactoryChain";
 import RepeatOperatorFactoryChain from "./RepeatOperatorFactoryChain";
 import TabOperatorFactoryChain from "./TabOperatorFactoryChain";
 import ZoomOperatorFactoryChain from "./ZoomOperatorFactoryChain";
+import FindOperatorFactoryChain from "./FindOperatorFactoryChain";
 import * as operations from "../../../shared/operations";
 
 @injectable()
@@ -20,6 +21,7 @@ export class OperatorFactoryImpl implements OperatorFactory {
     navigateOperatorFactoryChain: NavigateOperatorFactoryChain,
     tabOperatorFactoryChain: TabOperatorFactoryChain,
     zoomOperatorFactoryChain: ZoomOperatorFactoryChain,
+    findOperatorFactoryChain: FindOperatorFactoryChain,
     @inject(delay(() => RepeatOperatorFactoryChain))
     repeatOperatorFactoryChain: RepeatOperatorFactoryChain
   ) {
@@ -30,6 +32,7 @@ export class OperatorFactoryImpl implements OperatorFactory {
       repeatOperatorFactoryChain,
       tabOperatorFactoryChain,
       zoomOperatorFactoryChain,
+      findOperatorFactoryChain,
     ];
   }
 
diff --git a/src/background/presenters/FramePresenter.ts b/src/background/presenters/FramePresenter.ts
new file mode 100644
index 0000000..c94f8dd
--- /dev/null
+++ b/src/background/presenters/FramePresenter.ts
@@ -0,0 +1,12 @@
+export default interface FramePresenter {
+  getAllFrameIds(tabId: number): Promise<Array<number>>;
+}
+
+export class FramePresenterImpl implements FramePresenter {
+  async getAllFrameIds(tabId: number): Promise<Array<number>> {
+    const frames = await browser.webNavigation.getAllFrames({ tabId: tabId });
+    return frames
+      .filter((f) => !f.url.startsWith("moz-extension://"))
+      .map((f) => f.frameId);
+  }
+}
diff --git a/src/background/repositories/FindRepository.ts b/src/background/repositories/FindRepository.ts
index 813e065..46ee390 100644
--- a/src/background/repositories/FindRepository.ts
+++ b/src/background/repositories/FindRepository.ts
@@ -1,22 +1,69 @@
 import { injectable } from "tsyringe";
 import MemoryStorage from "../infrastructures/MemoryStorage";
 
-const FIND_KEYWORD_KEY = "find-keyword";
+const FIND_GLOBAL_KEYWORD_KEY = "find-global-keyword";
+const FIND_LOCAL_KEYWORD_KEY = "find-local-keyword";
+
+export type FindState = {
+  keyword: string;
+  framePos: number;
+  frameIds: number[];
+};
+
+export default interface FindRepository {
+  getGlobalKeyword(): Promise<string | undefined>;
+
+  setGlobalKeyword(keyword: string): Promise<void>;
+
+  getLocalState(tabId: number): Promise<undefined | FindState>;
+
+  setLocalState(tabId: number, state: FindState): Promise<void>;
+
+  deleteLocalState(tabId: number): Promise<void>;
+}
 
 @injectable()
-export default class FindRepository {
+export class FindRepositoryImpl implements FindRepository {
   private cache: MemoryStorage;
 
   constructor() {
     this.cache = new MemoryStorage();
   }
 
-  getKeyword(): Promise<string> {
-    return Promise.resolve(this.cache.get(FIND_KEYWORD_KEY));
+  getGlobalKeyword(): Promise<string | undefined> {
+    return Promise.resolve(this.cache.get(FIND_GLOBAL_KEYWORD_KEY));
+  }
+
+  setGlobalKeyword(keyword: string): Promise<void> {
+    this.cache.set(FIND_GLOBAL_KEYWORD_KEY, keyword);
+    return Promise.resolve();
+  }
+
+  getLocalState(tabId: number): Promise<FindState | undefined> {
+    let states = this.cache.get(FIND_LOCAL_KEYWORD_KEY);
+    if (typeof states === "undefined") {
+      states = {};
+    }
+    return Promise.resolve(states[tabId]);
+  }
+
+  setLocalState(tabId: number, state: FindState): Promise<void> {
+    let states = this.cache.get(FIND_LOCAL_KEYWORD_KEY);
+    if (typeof states === "undefined") {
+      states = {};
+    }
+    states[tabId] = state;
+    this.cache.set(FIND_LOCAL_KEYWORD_KEY, states);
+    return Promise.resolve();
   }
 
-  setKeyword(keyword: string): Promise<void> {
-    this.cache.set(FIND_KEYWORD_KEY, keyword);
+  deleteLocalState(tabId: number): Promise<void> {
+    const states = this.cache.get(FIND_LOCAL_KEYWORD_KEY);
+    if (typeof states === "undefined") {
+      return Promise.resolve();
+    }
+    delete states[tabId];
+    this.cache.set(FIND_LOCAL_KEYWORD_KEY, states);
     return Promise.resolve();
   }
 }
diff --git a/src/background/usecases/FindUseCase.ts b/src/background/usecases/FindUseCase.ts
deleted file mode 100644
index cc111f2..0000000
--- a/src/background/usecases/FindUseCase.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { injectable } from "tsyringe";
-import FindRepository from "../repositories/FindRepository";
-
-@injectable()
-export default class FindUseCase {
-  constructor(private readonly findRepository: FindRepository) {}
-
-  getKeyword(): Promise<string> {
-    return this.findRepository.getKeyword();
-  }
-
-  setKeyword(keyword: string): Promise<void> {
-    return this.findRepository.setKeyword(keyword);
-  }
-}
diff --git a/src/background/usecases/StartFindUseCase.ts b/src/background/usecases/StartFindUseCase.ts
new file mode 100644
index 0000000..066d930
--- /dev/null
+++ b/src/background/usecases/StartFindUseCase.ts
@@ -0,0 +1,57 @@
+import { inject, injectable } from "tsyringe";
+import ConsoleClient from "../infrastructures/ConsoleClient";
+import FindRepositoryImpl from "../repositories/FindRepository";
+import FindClient from "../clients/FindClient";
+import FramePresenter from "../presenters/FramePresenter";
+
+@injectable()
+export default class StartFindUseCase {
+  constructor(
+    @inject("FindClient")
+    private readonly findClient: FindClient,
+    @inject("FindRepository")
+    private readonly findRepository: FindRepositoryImpl,
+    @inject("ConsoleClient")
+    private readonly consoleClient: ConsoleClient,
+    @inject("FramePresenter")
+    private readonly framePresenter: FramePresenter
+  ) {}
+
+  async startFind(tabId: number, keyword?: string): Promise<void> {
+    if (typeof keyword === "undefined") {
+      keyword = (await this.findRepository.getLocalState(tabId))?.keyword;
+    }
+    if (typeof keyword === "undefined") {
+      keyword = await this.findRepository.getGlobalKeyword();
+    }
+    if (typeof keyword === "undefined") {
+      await this.consoleClient.showError(tabId, "No previous search keywords");
+      return;
+    }
+
+    this.findRepository.setGlobalKeyword(keyword);
+
+    const frameIds = await this.framePresenter.getAllFrameIds(tabId);
+    for (const frameId of frameIds) {
+      await this.findClient.clearSelection(tabId, frameId);
+    }
+
+    for (let framePos = 0; framePos < frameIds.length; ++framePos) {
+      const found = await this.findClient.findNext(
+        tabId,
+        frameIds[framePos],
+        keyword
+      );
+      if (found) {
+        await this.findRepository.setLocalState(tabId, {
+          frameIds,
+          framePos,
+          keyword,
+        });
+        await this.consoleClient.showInfo(tabId, "Pattern found: " + keyword);
+        return;
+      }
+    }
+    this.consoleClient.showError(tabId, "Pattern not found: " + keyword);
+  }
+}
diff --git a/src/console/app/hooks.ts b/src/console/app/hooks.ts
index eefdea3..00ac05c 100644
--- a/src/console/app/hooks.ts
+++ b/src/console/app/hooks.ts
@@ -103,13 +103,10 @@ export const useExecCommand = () => {
 
 export const useExecFind = () => {
   const execFind = React.useCallback((text?: string) => {
-    window.top.postMessage(
-      JSON.stringify({
-        type: messages.CONSOLE_ENTER_FIND,
-        text,
-      }),
-      "*"
-    );
+    browser.runtime.sendMessage({
+      type: messages.CONSOLE_ENTER_FIND,
+      keyword: text,
+    });
   }, []);
   return execFind;
 };
diff --git a/src/content/Application.ts b/src/content/Application.ts
index b09edfa..a12c3c6 100644
--- a/src/content/Application.ts
+++ b/src/content/Application.ts
@@ -1,6 +1,5 @@
 import { injectable } from "tsyringe";
 import MessageListener from "./MessageListener";
-import FindController from "./controllers/FindController";
 import MarkController from "./controllers/MarkController";
 import FollowMasterController from "./controllers/FollowMasterController";
 import FollowSlaveController from "./controllers/FollowSlaveController";
@@ -14,6 +13,7 @@ import SettingController from "./controllers/SettingController";
 import ConsoleFrameController from "./controllers/ConsoleFrameController";
 import NavigateController from "./controllers/NavigateController";
 import * as messages from "../shared/messages";
+import FindController from "./controllers/FindController";
 
 type Message = messages.Message;
 
@@ -22,7 +22,6 @@ export default class Application {
   // eslint-disable-next-line max-params
   constructor(
     private messageListener: MessageListener,
-    private findController: FindController,
     private markController: MarkController,
     private followMasterController: FollowMasterController,
     private followSlaveController: FollowSlaveController,
@@ -33,7 +32,8 @@ export default class Application {
     private addonEnabledController: AddonEnabledController,
     private settingController: SettingController,
     private consoleFrameController: ConsoleFrameController,
-    private navigateController: NavigateController
+    private navigateController: NavigateController,
+    private findController: FindController
   ) {}
 
   init(): Promise<void> {
@@ -47,12 +47,6 @@ export default class Application {
   private routeMasterComponents() {
     this.messageListener.onWebMessage((msg: Message, sender: Window) => {
       switch (msg.type) {
-        case messages.CONSOLE_ENTER_FIND:
-          return this.findController.start(msg);
-        case messages.FIND_NEXT:
-          return this.findController.next(msg);
-        case messages.FIND_PREV:
-          return this.findController.prev(msg);
         case messages.CONSOLE_UNFOCUS:
           return this.consoleFrameController.unfocus(msg);
         case messages.FOLLOW_START:
@@ -64,16 +58,6 @@ export default class Application {
       }
       return undefined;
     });
-
-    this.messageListener.onBackgroundMessage((msg: Message) => {
-      switch (msg.type) {
-        case messages.ADDON_ENABLED_QUERY:
-          return this.addonEnabledController.getAddonEnabled(msg);
-        case messages.TAB_SCROLL_TO:
-          return this.markController.scrollTo(msg);
-      }
-      return undefined;
-    });
   }
 
   private routeCommonComponents(): Promise<void> {
@@ -109,6 +93,21 @@ export default class Application {
           return this.navigateController.openLinkPrev(msg);
         case messages.CONSOLE_RESIZE:
           return this.consoleFrameController.resize(msg);
+        case messages.FIND_NEXT:
+          return this.findController.findNext(msg.keyword);
+        case messages.FIND_PREV:
+          return this.findController.findPrev(msg.keyword);
+        case messages.FIND_CLEAR_SELECTION:
+          return this.findController.clearSelection();
+      }
+
+      if (window.self === window.top) {
+        switch (msg.type) {
+          case messages.ADDON_ENABLED_QUERY:
+            return this.addonEnabledController.getAddonEnabled(msg);
+          case messages.TAB_SCROLL_TO:
+            return this.markController.scrollTo(msg);
+        }
       }
     });
 
diff --git a/src/content/MessageListener.ts b/src/content/MessageListener.ts
index 3fe1dcd..31cc1ae 100644
--- a/src/content/MessageListener.ts
+++ b/src/content/MessageListener.ts
@@ -27,7 +27,12 @@ export default class MessageListener {
   ) {
     browser.runtime.onMessage.addListener(
       (msg: any, sender: WebExtMessageSender) => {
-        return listener(valueOf(msg), sender);
+        try {
+          return Promise.resolve(listener(valueOf(msg), sender));
+        } catch (e) {
+          console.warn(e);
+          return;
+        }
       }
     );
   }
diff --git a/src/content/client/FindClient.ts b/src/content/client/FindClient.ts
deleted file mode 100644
index 7da5069..0000000
--- a/src/content/client/FindClient.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import * as messages from "../../shared/messages";
-
-export default interface FindClient {
-  getGlobalLastKeyword(): Promise<string | null>;
-
-  setGlobalLastKeyword(keyword: string): Promise<void>;
-}
-
-export class FindClientImpl implements FindClient {
-  async getGlobalLastKeyword(): Promise<string | null> {
-    const keyword = await browser.runtime.sendMessage({
-      type: messages.FIND_GET_KEYWORD,
-    });
-    return keyword as string;
-  }
-
-  async setGlobalLastKeyword(keyword: string): Promise<void> {
-    await browser.runtime.sendMessage({
-      type: messages.FIND_SET_KEYWORD,
-      keyword: keyword,
-    });
-  }
-}
diff --git a/src/content/client/FindMasterClient.ts b/src/content/client/FindMasterClient.ts
deleted file mode 100644
index 9c3f812..0000000
--- a/src/content/client/FindMasterClient.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import * as messages from "../../shared/messages";
-
-export default interface FindMasterClient {
-  findNext(): void;
-
-  findPrev(): void;
-}
-
-export class FindMasterClientImpl implements FindMasterClient {
-  findNext(): void {
-    window.top.postMessage(
-      JSON.stringify({
-        type: messages.FIND_NEXT,
-      }),
-      "*"
-    );
-  }
-
-  findPrev(): void {
-    window.top.postMessage(
-      JSON.stringify({
-        type: messages.FIND_PREV,
-      }),
-      "*"
-    );
-  }
-}
diff --git a/src/content/controllers/FindController.ts b/src/content/controllers/FindController.ts
index 3087d5d..adcdb0d 100644
--- a/src/content/controllers/FindController.ts
+++ b/src/content/controllers/FindController.ts
@@ -1,20 +1,19 @@
 import { injectable } from "tsyringe";
-import * as messages from "../../shared/messages";
 import FindUseCase from "../usecases/FindUseCase";
 
 @injectable()
 export default class FindController {
   constructor(private findUseCase: FindUseCase) {}
 
-  async start(m: messages.ConsoleEnterFindMessage): Promise<void> {
-    await this.findUseCase.startFind(m.text);
+  findNext(keyword: string): boolean {
+    return this.findUseCase.findNext(keyword);
   }
 
-  async next(_: messages.FindNextMessage): Promise<void> {
-    await this.findUseCase.findNext();
+  findPrev(keyword: string): boolean {
+    return this.findUseCase.findPrev(keyword);
   }
 
-  async prev(_: messages.FindPrevMessage): Promise<void> {
-    await this.findUseCase.findPrev();
+  clearSelection() {
+    return this.findUseCase.clearSelection();
   }
 }
diff --git a/src/content/di.ts b/src/content/di.ts
index e74d7ac..4c85e76 100644
--- a/src/content/di.ts
+++ b/src/content/di.ts
@@ -6,10 +6,6 @@ import { AddressRepositoryImpl } from "./repositories/AddressRepository";
 import { ClipboardRepositoryImpl } from "./repositories/ClipboardRepository";
 import { ConsoleClientImpl } from "./client/ConsoleClient";
 import { ConsoleFramePresenterImpl } from "./presenters/ConsoleFramePresenter";
-import { FindClientImpl } from "./client/FindClient";
-import { FindMasterClientImpl } from "./client/FindMasterClient";
-import { FindPresenterImpl } from "./presenters/FindPresenter";
-import { FindRepositoryImpl } from "./repositories/FindRepository";
 import { FocusPresenterImpl } from "./presenters/FocusPresenter";
 import { FollowKeyRepositoryImpl } from "./repositories/FollowKeyRepository";
 import { FollowMasterClientImpl } from "./client/FollowMasterClient";
@@ -31,6 +27,7 @@ import { TabsClientImpl } from "./client/TabsClient";
 import { container } from "tsyringe";
 import OperatorFactoryImpl from "./operators/impls/OperatorFactoryImpl";
 import { URLRepositoryImpl } from "./operators/impls/URLRepository";
+import { FindPresenterImpl } from "./presenters/FindPresenter";
 
 container.register("FollowMasterClient", {
   useValue: new FollowMasterClientImpl(window.top),
@@ -49,10 +46,6 @@ container.register("ConsoleClient", { useClass: ConsoleClientImpl });
 container.register("ConsoleFramePresenter", {
   useClass: ConsoleFramePresenterImpl,
 });
-container.register("FindClient", { useClass: FindClientImpl });
-container.register("FindMasterClient", { useClass: FindMasterClientImpl });
-container.register("FindPresenter", { useClass: FindPresenterImpl });
-container.register("FindRepository", { useClass: FindRepositoryImpl });
 container.register("FocusPresenter", { useClass: FocusPresenterImpl });
 container.register("FollowKeyRepository", {
   useClass: FollowKeyRepositoryImpl,
@@ -79,6 +72,7 @@ container.register("NavigationPresenter", {
 });
 container.register("OperationClient", { useClass: OperationClientImpl });
 container.register("ScrollPresenter", { useClass: ScrollPresenterImpl });
+container.register("FindPresenter", { useClass: FindPresenterImpl });
 container.register("SettingClient", { useClass: SettingClientImpl });
 container.register("SettingRepository", { useClass: SettingRepositoryImpl });
 container.register("URLRepository", { useClass: URLRepositoryImpl });
diff --git a/src/content/operators/impls/FindNextOperator.ts b/src/content/operators/impls/FindNextOperator.ts
deleted file mode 100644
index c67f6d9..0000000
--- a/src/content/operators/impls/FindNextOperator.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import Operator from "../Operator";
-import FindMasterClient from "../../client/FindMasterClient";
-
-export default class FindNextOperator implements Operator {
-  constructor(
-    private readonly findMasterClient: FindMasterClient,
-    private readonly repeat: number
-  ) {}
-
-  async run(): Promise<void> {
-    for (let i = 0; i < this.repeat; ++i) {
-      this.findMasterClient.findNext();
-    }
-  }
-}
diff --git a/src/content/operators/impls/FindOperatorFactoryChain.ts b/src/content/operators/impls/FindOperatorFactoryChain.ts
deleted file mode 100644
index b3524c1..0000000
--- a/src/content/operators/impls/FindOperatorFactoryChain.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { inject, injectable } from "tsyringe";
-import Operator from "../Operator";
-import OperatorFactoryChain from "../OperatorFactoryChain";
-import FindNextOperator from "./FindNextOperator";
-import FindPrevOperator from "./FindPrevOperator";
-import FindMasterClient from "../../client/FindMasterClient";
-import * as operations from "../../../shared/operations";
-
-@injectable()
-export default class FindOperatorFactoryChain implements OperatorFactoryChain {
-  constructor(
-    @inject("FindMasterClient")
-    private readonly findMasterClient: FindMasterClient
-  ) {}
-
-  create(op: operations.Operation, repeat: number): Operator | null {
-    switch (op.type) {
-      case operations.FIND_NEXT:
-        return new FindNextOperator(this.findMasterClient, repeat);
-      case operations.FIND_PREV:
-        return new FindPrevOperator(this.findMasterClient, repeat);
-    }
-    return null;
-  }
-}
diff --git a/src/content/operators/impls/FindPrevOperator.ts b/src/content/operators/impls/FindPrevOperator.ts
deleted file mode 100644
index f73e605..0000000
--- a/src/content/operators/impls/FindPrevOperator.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import Operator from "../Operator";
-import FindMasterClient from "../../client/FindMasterClient";
-
-export default class FindPrevOperator implements Operator {
-  constructor(
-    private readonly findMasterClient: FindMasterClient,
-    private readonly repeat: number
-  ) {}
-
-  async run(): Promise<void> {
-    for (let i = 0; i < this.repeat; ++i) {
-      this.findMasterClient.findPrev();
-    }
-  }
-}
diff --git a/src/content/operators/impls/OperatorFactoryImpl.ts b/src/content/operators/impls/OperatorFactoryImpl.ts
index 22b35c8..bc9bbee 100644
--- a/src/content/operators/impls/OperatorFactoryImpl.ts
+++ b/src/content/operators/impls/OperatorFactoryImpl.ts
@@ -7,7 +7,6 @@ import { Operation } from "../../../shared/operations";
 import OperationClient from "../../client/OperationClient";
 import AddonOperatorFactoryChain from "./AddonOperatorFactoryChain";
 import ClipboardOperatorFactoryChain from "./ClipboardOperatorFactoryChain";
-import FindOperatorFactoryChain from "./FindOperatorFactoryChain";
 import FocusOperatorFactoryChain from "./FocusOperatorFactoryChain";
 import FollowOperatorFactoryChain from "./FollowOperatorFactoryChain";
 import MarkOperatorFactoryChain from "./MarkOperatorFactoryChain";
@@ -20,7 +19,6 @@ export default class OperatorFactoryImpl implements OperatorFactory {
   constructor(
     addonOperatorFactoryChain: AddonOperatorFactoryChain,
     clipboardOperatorFactoryChain: ClipboardOperatorFactoryChain,
-    findOperatorFactoryChain: FindOperatorFactoryChain,
     focusOperatorFactoryChain: FocusOperatorFactoryChain,
     followOperatorFactoryChain: FollowOperatorFactoryChain,
     markOperatorFactoryChain: MarkOperatorFactoryChain,
@@ -31,7 +29,6 @@ export default class OperatorFactoryImpl implements OperatorFactory {
     this.factoryChains = [
       addonOperatorFactoryChain,
       clipboardOperatorFactoryChain,
-      findOperatorFactoryChain,
       focusOperatorFactoryChain,
       followOperatorFactoryChain,
       markOperatorFactoryChain,
diff --git a/src/content/presenters/FindPresenter.ts b/src/content/presenters/FindPresenter.ts
index b25190c..569f161 100644
--- a/src/content/presenters/FindPresenter.ts
+++ b/src/content/presenters/FindPresenter.ts
@@ -7,16 +7,10 @@ export default interface FindPresenter {
 export class FindPresenterImpl implements FindPresenter {
   find(keyword: string, backwards: boolean): boolean {
     const caseSensitive = false;
-    const wrapScan = true;
+    const wrapScan = false;
 
     // NOTE: aWholeWord dows not implemented, and aSearchInFrames does not work
     // because of same origin policy
-    const found = window.find(keyword, caseSensitive, backwards, wrapScan);
-    if (found) {
-      return found;
-    }
-    this.clearSelection();
-
     return window.find(keyword, caseSensitive, backwards, wrapScan);
   }
 
diff --git a/src/content/repositories/FindRepository.ts b/src/content/repositories/FindRepository.ts
deleted file mode 100644
index aeb200f..0000000
--- a/src/content/repositories/FindRepository.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export default interface FindRepository {
-  getLastKeyword(): string | null;
-
-  setLastKeyword(keyword: string): void;
-}
-
-let current: string | null = null;
-
-export class FindRepositoryImpl implements FindRepository {
-  getLastKeyword(): string | null {
-    return current;
-  }
-
-  setLastKeyword(keyword: string): void {
-    current = keyword;
-  }
-}
diff --git a/src/content/usecases/FindUseCase.ts b/src/content/usecases/FindUseCase.ts
index bff0eee..9e77124 100644
--- a/src/content/usecases/FindUseCase.ts
+++ b/src/content/usecases/FindUseCase.ts
@@ -1,67 +1,22 @@
-import { injectable, inject } from "tsyringe";
+import { inject, injectable } from "tsyringe";
 import FindPresenter from "../presenters/FindPresenter";
-import FindRepository from "../repositories/FindRepository";
-import FindClient from "../client/FindClient";
-import ConsoleClient from "../client/ConsoleClient";
 
 @injectable()
 export default class FindUseCase {
   constructor(
-    @inject("FindPresenter") private presenter: FindPresenter,
-    @inject("FindRepository") private repository: FindRepository,
-    @inject("FindClient") private client: FindClient,
-    @inject("ConsoleClient") private consoleClient: ConsoleClient
+    @inject("FindPresenter")
+    private readonly findPresenter: FindPresenter
   ) {}
 
-  async startFind(keyword?: string): Promise<void> {
-    this.presenter.clearSelection();
-    if (keyword) {
-      this.saveKeyword(keyword);
-    } else {
-      const lastKeyword = await this.getKeyword();
-      if (!lastKeyword) {
-        return this.showNoLastKeywordError();
-      }
-      this.saveKeyword(lastKeyword);
-    }
-    return this.findNext();
+  findNext(keyword: string): boolean {
+    return this.findPresenter.find(keyword, false);
   }
 
-  findNext(): Promise<void> {
-    return this.findNextPrev(false);
+  findPrev(keyword: string): boolean {
+    return this.findPresenter.find(keyword, true);
   }
 
-  findPrev(): Promise<void> {
-    return this.findNextPrev(true);
-  }
-
-  private async findNextPrev(backwards: boolean): Promise<void> {
-    const keyword = await this.getKeyword();
-    if (!keyword) {
-      return this.showNoLastKeywordError();
-    }
-    const found = this.presenter.find(keyword, backwards);
-    if (found) {
-      this.consoleClient.info("Pattern found: " + keyword);
-    } else {
-      this.consoleClient.error("Pattern not found: " + keyword);
-    }
-  }
-
-  private async getKeyword(): Promise<string | null> {
-    let keyword = this.repository.getLastKeyword();
-    if (!keyword) {
-      keyword = await this.client.getGlobalLastKeyword();
-    }
-    return keyword;
-  }
-
-  private async saveKeyword(keyword: string): Promise<void> {
-    this.repository.setLastKeyword(keyword);
-    await this.client.setGlobalLastKeyword(keyword);
-  }
-
-  private async showNoLastKeywordError(): Promise<void> {
-    await this.consoleClient.error("No previous search keywords");
+  clearSelection() {
+    this.findPresenter.clearSelection();
   }
 }
diff --git a/src/shared/messages.ts b/src/shared/messages.ts
index 59329e7..8b9e598 100644
--- a/src/shared/messages.ts
+++ b/src/shared/messages.ts
@@ -37,8 +37,7 @@ export const TAB_SCROLL_TO = "tab.scroll.to";
 
 export const FIND_NEXT = "find.next";
 export const FIND_PREV = "find.prev";
-export const FIND_GET_KEYWORD = "find.get.keyword";
-export const FIND_SET_KEYWORD = "find.set.keyword";
+export const FIND_CLEAR_SELECTION = "find.clear.selection";
 
 export const ADDON_ENABLED_QUERY = "addon.enabled.query";
 export const ADDON_ENABLED_RESPONSE = "addon.enabled.response";
@@ -73,7 +72,7 @@ export interface ConsoleEnterCommandMessage {
 
 export interface ConsoleEnterFindMessage {
   type: typeof CONSOLE_ENTER_FIND;
-  text?: string;
+  keyword?: string;
 }
 
 export interface ConsoleShowCommandMessage {
@@ -229,20 +228,16 @@ export interface TabScrollToMessage {
 
 export interface FindNextMessage {
   type: typeof FIND_NEXT;
+  keyword: string;
 }
 
 export interface FindPrevMessage {
   type: typeof FIND_PREV;
+  keyword: string;
 }
 
-export interface FindGetKeywordMessage {
-  type: typeof FIND_GET_KEYWORD;
-}
-
-export interface FindSetKeywordMessage {
-  type: typeof FIND_SET_KEYWORD;
-  keyword: string;
-  found: boolean;
+export interface FindClearSelection {
+  type: typeof FIND_CLEAR_SELECTION;
 }
 
 export interface AddonEnabledQueryMessage {
@@ -324,8 +319,7 @@ export type Message =
   | TabScrollToMessage
   | FindNextMessage
   | FindPrevMessage
-  | FindGetKeywordMessage
-  | FindSetKeywordMessage
+  | FindClearSelection
   | AddonEnabledQueryMessage
   | AddonEnabledResponseMessage
   | AddonToggleEnabledMessage
@@ -362,8 +356,7 @@ export const valueOf = (o: any): Message => {
     case TAB_SCROLL_TO:
     case FIND_NEXT:
     case FIND_PREV:
-    case FIND_GET_KEYWORD:
-    case FIND_SET_KEYWORD:
+    case FIND_CLEAR_SELECTION:
     case ADDON_ENABLED_QUERY:
     case ADDON_ENABLED_RESPONSE:
     case ADDON_TOGGLE_ENABLED: