Manifest v3

manifest.dev.json

@@ -1,3 +1,5 @@
 {
-  "content_security_policy": "default-src 'self'; script-src 'self' 'unsafe-eval';"
-}
+  "content_security_policy": {
+    "extension_pages": "default-src 'self'; script-src 'self' 'unsafe-eval';"
+  }
+}

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "KeeWeb Connect",
   "version": "0.3.7",
-  "manifest_version": 2,
+  "manifest_version": 3,
   "description": "__MSG_description__",
   "icons": {
     "16": "icons/icon16.png",
@@ -20,15 +20,19 @@
     "contextMenus",
     "storage",
     "nativeMessaging",
-    "webNavigation",
+    "webNavigation"
+  ],
+  "host_permissions": [
     "<all_urls>"
   ],
-  "content_security_policy": "default-src 'self'",
+  "content_security_policy": {
+    "extension_pages": "default-src 'self'"
+  },
   "options_ui": {
     "page": "pages/options.html",
     "open_in_tab": true
   },
-  "browser_action": {
+  "action": {
     "default_title": "__MSG_cmdSubmitAuto__"
   },
   "default_locale": "en_US",
@@ -64,4 +68,4 @@
       "description": "__MSG_cmdInsertOther__"
     }
   }
-}
+}

package.json

@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/antelle/keeweb-connect#readme",
   "devDependencies": {
-    "@types/chrome": "^0.0.134",
+    "@types/chrome": "^0.0.268",
     "@types/copy-webpack-plugin": "^8.0.0",
     "@types/node": "^20.12.10",
     "@types/webpack": "^5.28.5",

src/background/commands.ts

@@ -53,7 +53,7 @@ async function runCommand(args: CommandArgs): Promise<void> {
 
     await backend.connect();
     if (backend.state !== BackendConnectionState.Connected) {
-        chrome.runtime.openOptionsPage();
+        void chrome.runtime.openOptionsPage();
         return;
     }
 
@@ -97,17 +97,23 @@ function isValidUrl(url: string): boolean {
 
 async function getActiveFrame(tab: chrome.tabs.Tab): Promise<number> {
     return new Promise((resolve) => {
-        chrome.tabs.executeScript(
-            tab.id || 0,
+        chrome.scripting.executeScript(
             {
-                frameId: 0,
-                code: "Array.from(document.querySelectorAll('iframe')).indexOf(document.activeElement)"
+                target: {
+                    frameIds: [0],
+                    tabId: tab.id || 0
+                },
+                func: () => {
+                    Array.from(document.querySelectorAll('iframe')).indexOf(
+                        document.activeElement as HTMLIFrameElement
+                    );
+                }
             },
-            (results: number[]) => {
+            (result: chrome.scripting.InjectionResult<void>[]) => {
                 if (chrome.runtime.lastError) {
                     return resolve(0);
                 }
-                resolve(results[0] + 1); // indexOf returns -1, then it's root document which is frameId:0
+                resolve(Number(result[0]) + 1); // indexOf returns -1, then it's root document which is frameId:0
             }
         );
     });
@@ -189,9 +195,8 @@ async function sendMessageToTab(
 
 function injectPageContentScript(tab: chrome.tabs.Tab): Promise<number> {
     return new Promise((resolve) => {
-        chrome.tabs.executeScript(
-            tab.id || 0,
-            { file: 'js/content-page.js', allFrames: true },
+        chrome.scripting.executeScript(
+            { files: ['js/content-page.js'], target: { allFrames: true, tabId: tab.id || 0 } },
             (results) => {
                 if (chrome.runtime.lastError) {
                     return resolve(0);

src/background/init.ts

@@ -10,8 +10,8 @@ chrome.runtime.onStartup.addListener(startAndReportError);
 chrome.runtime.onInstalled.addListener((e) => {
     startAndReportError()
         .then(() => {
-            if (e.reason === 'install') {
-                chrome.runtime.openOptionsPage();
+            if (e.reason === ('install' as chrome.runtime.OnInstalledReason)) {
+                void chrome.runtime.openOptionsPage();
             }
         })
         .catch(noop);

src/background/transport/transport-browser-tab.ts

@@ -106,14 +106,17 @@ class TransportBrowserTab extends TransportBase {
 
     private injectContentScript(): Promise<void> {
         return new Promise((resolve, reject) => {
-            chrome.tabs.executeScript(this._tab!.id!, { file: 'js/content-keeweb.js' }, () => {
-                if (chrome.runtime.lastError) {
-                    const msg = `Content script injection error: ${chrome.runtime.lastError.message}`;
-                    reject(new Error(msg));
-                } else {
-                    resolve();
+            chrome.scripting.executeScript(
+                { files: ['js/content-keeweb.js'], target: { tabId: this._tab!.id! } },
+                () => {
+                    if (chrome.runtime.lastError) {
+                        const msg = `Content script injection error: ${chrome.runtime.lastError.message}`;
+                        reject(new Error(msg));
+                    } else {
+                        resolve();
+                    }
                 }
-            });
+            );
         });
     }
 

src/background/ui.ts

@@ -9,7 +9,7 @@ export function createUIMenus(): void {
 
         const command = e.menuItemId as string;
         if (command === 'settings') {
-            chrome.runtime.openOptionsPage();
+            void chrome.runtime.openOptionsPage();
             return;
         }
 
@@ -96,7 +96,7 @@ export function createUIMenus(): void {
 }
 
 export function bindExtensionButtonClick(): void {
-    chrome.browserAction.onClicked.addListener(async (tab) => {
+    chrome.action.onClicked.addListener(async (tab) => {
         await runCommand({ command: 'submit-auto', tab });
     });
 }

src/options/components/shortcuts.tsx

@@ -6,7 +6,7 @@ import { canEditShortcuts, shortcutsCanBeEditedOnlyManually } from 'common/featu
 const Shortcuts: FunctionComponent = () => {
     const openShortcuts = (e: Event) => {
         e.preventDefault();
-        chrome.tabs.create({ url: 'chrome://extensions/shortcuts', active: true });
+        void chrome.tabs.create({ url: 'chrome://extensions/shortcuts', active: true });
     };
 
     return (