Merge pull request #25 from vrc-plugin/manifest-v3

feat: migrate to Manifest v3

Author: bootjp

Diff for: package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "send_vrc",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "One click URL to VRChat",
   "main": "send.js",
   "scripts": {

Diff for: package.json

@@ -1,4 +1,9 @@
 (() => {
+  const CONTEXT_MENUS = {
+    SEND_THIS_PAGE: "send_this_page",
+    SEND_WITH_CLIPBOARD: "send_with_clipboard",
+  };
+
   const defaultMethod = "POST";
   const toVRC = (url: string, method: string = defaultMethod) => {
     fetch("http://localhost:11400/url", {
@@ -15,7 +20,12 @@
         }
 
         if (!res.ok && method === "PUT") {
-          window.alert("please start send_vrc_desktop.");
+          chrome.notifications.create({
+            type: "basic",
+            iconUrl: "./icon.png",
+            title: "send_vrc",
+            message: "please start send_vrc_desktop.",
+          });
         }
       })
       .catch((e) => {
@@ -25,26 +35,22 @@
           toVRC(url, "PUT");
         }
         if (method === "PUT") {
-          window.alert("please start send_vrc_desktop.");
+          chrome.notifications.create({
+            type: "basic",
+            iconUrl: "./icon.png",
+            title: "send_vrc",
+            message: "please start send_vrc_desktop.",
+          });
         }
       });
   };
-  const getClipboard = () => {
-    const pasteTarget = document.createElement("div");
-    pasteTarget.contentEditable = "true";
-    if (!document.activeElement) {
-      throw new Error("`document.activeElement` is null");
-    }
-    const activeElement =
-      document.activeElement.appendChild(pasteTarget).parentNode;
-    pasteTarget.focus();
-    document.execCommand("Paste");
-    const paste = pasteTarget.innerText;
-    if (!activeElement) {
-      throw new Error("`activeElement` is null");
-    }
-    activeElement.removeChild(pasteTarget);
-    return paste;
+
+  const getClipboard = async (tabId: number) => {
+    const result = await chrome.scripting.executeScript({
+      target: { tabId: tabId },
+      func: () => navigator.clipboard.readText(),
+    });
+    return result[0].result;
   };
 
   const canonicalizeUrl = (url: string) => {
@@ -66,28 +72,41 @@
   };
 
   chrome.contextMenus.create({
+    id: CONTEXT_MENUS.SEND_THIS_PAGE,
     title: "SendVRC this page",
     type: "normal",
     contexts: ["page"],
-    onclick: (info) => {
-      if (!info || !info["pageUrl"]) {
-        return;
-      }
-      const pageURL = info["pageUrl"];
-      toVRC(pageURL);
-    },
   });
 
   chrome.contextMenus.create({
+    id: CONTEXT_MENUS.SEND_WITH_CLIPBOARD,
     title: "SendVRC with clipboard",
     type: "normal",
-    contexts: ["browser_action"],
-    onclick: () => {
-      toVRC(getClipboard());
-    },
+    contexts: ["action"],
+  });
+
+  chrome.contextMenus.onClicked.addListener(async (info, tab) => {
+    switch (info.menuItemId) {
+      case CONTEXT_MENUS.SEND_THIS_PAGE: {
+        if (!info || !info["pageUrl"]) {
+          return;
+        }
+        const pageURL = info["pageUrl"];
+        toVRC(pageURL);
+        break;
+      }
+      case CONTEXT_MENUS.SEND_WITH_CLIPBOARD: {
+        if (!tab || tab.id === undefined) {
+          return;
+        }
+        const clipboardText = await getClipboard(tab.id);
+        toVRC(clipboardText);
+        break;
+      }
+    }
   });
 
-  chrome.browserAction.onClicked.addListener((e) => {
+  chrome.action.onClicked.addListener((e) => {
     if (!e || !e["url"]) {
       return;
     }

Diff for: send.ts

@@ -1,22 +1,24 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "SendVRC | VRChatにURLを送るやつ",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Sends the URL to VRChat. send_vrc_desktop is required for one-click operation.",
-  "browser_action": {
+  "action": {
     "default_icon": "icon.png",
     "default_title": "this page send to VRChat"
   },
   "icons": {
     "128": "icon.png"
   },
   "background": {
-    "scripts": ["send.js"]
+    "service_worker": "send.js"
   },
   "permissions": [
     "activeTab",
     "contextMenus",
     "clipboardRead",
-    "http://localhost:11400/*"
-  ]
+    "notifications",
+    "scripting"
+  ],
+  "host_permissions": ["http://localhost:11400/*"]
 }