Merge pull request #14 from teawon/fix/tab-read

탭 정보 불일치 문제 수정

Author: teawon

.changeset/ripe-states-like.md

@@ -0,0 +1,5 @@
+---
+"commitcrawler": patch
+---
+
+다중 탭 정보 읽기 데이터 불일치 문제 수정

src/commitInterceptor.ts

@@ -15,11 +15,18 @@ const commitInterceptorService = new CommitInterceptorService(
   debuggerService
 );
 
-// 디버거 설정 및 페이지 리로드
 chrome.runtime.onMessage.addListener(
-  (message: MessagePayload, sender, sendResponse) => {
+  (message: MessagePayload<{ targetTabId: number }>, sender, sendResponse) => {
     if (message.action === "START_INTERCEPTOR_COMMIT") {
-      commitInterceptorService.initializeCommitInterceptor(sendResponse);
+      const targetTabId = message.data?.targetTabId;
+      if (!targetTabId) {
+        sendResponse({ status: "error", message: "탭 ID가 없습니다." });
+        return true;
+      }
+      commitInterceptorService.initializeCommitInterceptor(
+        sendResponse,
+        targetTabId
+      );
       return true;
     }
   }

src/popup.ts

@@ -323,17 +323,21 @@ const showToast = (
 const handleStartInterceptorCommit = async (
   elements: StatusElements
 ): Promise<void> => {
-  const { button, status } = elements;
+  const { button } = elements;
   button.disabled = true;
 
   try {
     const [tab] = await chrome.tabs.query({
       active: true,
       currentWindow: true,
     });
+    if (!tab?.id) {
+      throw new Error("활성 탭을 찾을 수 없습니다.");
+    }
 
     const response = await MessageDispatcher.sendSuccess(
-      "START_INTERCEPTOR_COMMIT"
+      "START_INTERCEPTOR_COMMIT",
+      { targetTabId: tab.id }
     );
 
     if (response.status === "success") {

src/services/CommitInterceptorService.ts

@@ -12,40 +12,21 @@ export class CommitInterceptorService {
     return this.taskExecutionController.isTaskExecution;
   }
 
-  async initializeCommitInterceptor(sendResponse: (response: any) => void) {
+  async initializeCommitInterceptor(
+    sendResponse: (response: any) => void,
+    tabId: number
+  ) {
     try {
-      const tab = await this.getActiveTab();
-      await this.initializeDebugger(tab.id);
-      this.setupTimeoutHandler(tab.id);
-      await this.reloadTab(tab.id);
+      await this.initializeDebugger(tabId);
+      this.setupTimeoutHandler(tabId);
+      await this.reloadTab(tabId);
 
       sendResponse({ status: "success" });
     } catch (error) {
       this.handleError(error);
     }
   }
 
-  private async getActiveTab(): Promise<chrome.tabs.Tab> {
-    return new Promise((resolve, reject) => {
-      chrome.windows.getCurrent(async (window) => {
-        try {
-          const [tab] = await chrome.tabs.query({
-            active: true,
-            windowId: window.id,
-          });
-
-          if (!tab?.id) {
-            throw new Error("활성 탭을 찾을 수 없습니다.");
-          }
-
-          resolve(tab);
-        } catch (error) {
-          reject(error);
-        }
-      });
-    });
-  }
-
   private async initializeDebugger(tabId: number) {
     this.taskExecutionController.startTaskExecution();
     await this.debuggerService.attach(tabId);

src/services/MessageDispatcher.ts

@@ -13,10 +13,10 @@ interface MessageResponse {
   error?: string;
 }
 
-interface SuccessPayload {
+interface SuccessPayload<T = unknown> {
   type: "success";
   action: SuccessMessageType;
-  data?: unknown;
+  data?: T;
 }
 
 interface ErrorPayload {
@@ -25,13 +25,13 @@ interface ErrorPayload {
   error?: string;
 }
 
-export type MessagePayload = SuccessPayload | ErrorPayload;
+export type MessagePayload<T = unknown> = SuccessPayload<T> | ErrorPayload;
 
 /**
  * Chrome 확장 프로그램의 메시지 통신을 처리
  */
 export class MessageDispatcher {
-  static sendSuccess(action: SuccessMessageType, data?: unknown) {
+  static sendSuccess<T = unknown>(action: SuccessMessageType, data?: T) {
     return this.dispatch({
       type: "success",
       action,
@@ -47,7 +47,9 @@ export class MessageDispatcher {
     });
   }
 
-  private static dispatch(payload: MessagePayload) {
-    return chrome.runtime.sendMessage<MessagePayload, MessageResponse>(payload);
+  private static dispatch<T = unknown>(payload: MessagePayload<T>) {
+    return chrome.runtime.sendMessage<MessagePayload<T>, MessageResponse>(
+      payload
+    );
   }
 }