update: only works when push icon

makinzm · Jan 3, 2025 · c9f07f0 · c9f07f0
1 parent 5cc3586
commit c9f07f0
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 19 deletions.
diff --git a/dist/background.js b/dist/background.js
diff --git a/dist/content_script.js b/dist/content_script.js
diff --git a/dist/extention.zip b/dist/extention.zip
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -5,13 +5,6 @@
   "description": "Improve your English vocabulary with ClipLex",
   "permissions": ["storage", "activeTab", "scripting"],
   "options_page": "options/options.html",
-  "content_scripts": [
-    {
-      "matches": ["<all_urls>"],
-      "js": ["content_script.js"],
-      "run_at": "document_idle"
-    }
-  ],
   "background": {
     "service_worker": "background.js"
   },

diff --git a/privacy_policy.md b/privacy_policy.md
@@ -34,6 +34,8 @@
    - **理由**: ClipLexのスクリプトをウェブページに挿入し、選択されたテキストを取得するために必要です。
 3. **`storage`**  
    - **理由**：選択したテキストやフィルタ設定をローカルに保存するために必要です。
+4. **ホスト権限（`<all_urls>`）**
+   - **理由**：activeTabで許可されたタブのすべてのコンテンツにスムーズにClipLexスクリプトを挿入するために必要です。
 
 これらの権限は、本拡張機能の動作に必要な最小限の範囲に限定されています。
 

diff --git a/src/background.ts b/src/background.ts
@@ -2,9 +2,22 @@ import { LocalDatabase } from "./database";
 
 chrome.action.onClicked.addListener((tab) => {
   if (tab.id && tab.url) {
-    chrome.scripting.executeScript({
-      target: { tabId: tab.id },
-      files: ["content_script.js"], // 動的に注入するスクリプト
+    chrome.tabs.sendMessage(tab.id, { type: "CHECK_SCRIPT" }, (response) => {
+      if (chrome.runtime.lastError || !response || !response.injected) {
+        // スクリプトが未注入の場合、注入する
+        chrome.scripting.executeScript({
+          target: { tabId: tab.id! },
+          files: ["content_script.js"],
+        })
+        .then(() => {
+          console.log("Content script injected successfully.");
+        })
+        .catch(err => {
+          console.error("Failed to inject content script:", err);
+        });
+      } else {
+        console.log("Content script already injected.");
+      }
     });
   }
 });

diff --git a/src/content_script.ts b/src/content_script.ts
@@ -1,5 +1,11 @@
 import { checkDomainFilterMode } from "./content_script_helper";
 
+chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
+  if (message.type === "CHECK_SCRIPT") {
+    sendResponse({ injected: true });
+  }
+});
+
 // 既存: background.ts と通信して save するための Promiseラッパー関数
 async function saveEntryToBackground(entry: WordEntry): Promise<void> {
   return new Promise<void>((resolve, reject) => {

diff --git a/src/manifest.json b/src/manifest.json
@@ -5,13 +5,6 @@
   "description": "Improve your English vocabulary with ClipLex",
   "permissions": ["storage", "activeTab", "scripting"],
   "options_page": "options/options.html",
-  "content_scripts": [
-    {
-      "matches": ["<all_urls>"],
-      "js": ["content_script.js"],
-      "run_at": "document_idle"
-    }
-  ],
   "background": {
     "service_worker": "background.js"
   },