fix current tab scripting with new API

achorein · Jun 6, 2024 · 0d49412 · 0d49412
1 parent 12de4ed
commit 0d49412
Show file tree

Hide file tree

Showing 8 changed files with 518 additions and 81 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wishspace-webextension-vue",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -25,16 +25,19 @@
     "vuex": "^3.6.2"
   },
   "devDependencies": {
+    "@babel/core": "^7.12.16",
+    "@babel/eslint-parser": "^7.12.16",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-service": "~5.0.8",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
     "node-sass": "^6.0.0",
     "sass-loader": "^10.0.0",
-    "vue-template-compiler": "^2.7.15",
-    "@babel/eslint-parser": "^7.12.16",
-    "@babel/core": "^7.12.16"
+    "vue-template-compiler": "^2.7.15"
+  },
+  "resolutions": {
+    "node-gyp": "^10"
   },
   "eslintConfig": {
     "root": true,

diff --git a/public/js/tab.js b/public/js/tab.js
@@ -1,29 +1,29 @@
-var image = document.querySelector('meta[property=\'og:image\']');
-var url = document.querySelector('meta[property=\'og:url\']');
-var title = document.querySelector('meta[property=\'og:title\']');
-var description = document.querySelector('meta[property=\'og:description\']');
+var image = document.querySelector("meta[property='og:image']");
+var url = document.querySelector("meta[property='og:url']");
+var title = document.querySelector("meta[property='og:title']");
+var description = document.querySelector("meta[property='og:description']");
 if (image) {
-    image = image.getAttribute('content');
+  image = image.getAttribute('content');
 } else {
-    // cas spécifique pour amazon
-    image = document.querySelector('img[data-old-hires]');
-    if (image) {
-        image = image.getAttribute('data-old-hires');
-    }
+  // cas spécifique pour amazon
+  image = document.querySelector('img[data-old-hires]');
+  if (image) {
+    image = image.getAttribute('data-old-hires');
+  }
 }
 if (url) {
-    url = url.getAttribute('content');
+  url = url.getAttribute('content');
 }
 if (title) {
-    title = title.getAttribute('content');
+  title = title.getAttribute('content');
 }
 if (description) {
-    description = description.getAttribute('content');
+  description = description.getAttribute('content');
 }
 
 ({
-    image: image || '',
-    url: url || '',
-    title: title || '',
-    description: description || ''
-});
+  image: image || '',
+  url: url || '',
+  title: title || '',
+  description: description || '',
+});
diff --git a/public/manifest.chrome.json b/public/manifest.chrome.json
@@ -3,7 +3,7 @@
   "name": "Oh My Wish Extension",
   "short_name": "Oh My Wish",
   "description": "Cette extension permet de rajouter facilement des souhaits sur le site de Oh My Wish",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "author": "Anselme Chorein",
   "homepage_url": "https://ohmywish.me",
   "options_page": "options.html",
@@ -23,6 +23,6 @@
     "default_popup": "popup.html",
     "default_title": "Ajouter un souhait à votre liste Oh My Wish"
   },
-  "permissions": ["activeTab", "storage"],
+  "permissions": ["activeTab", "storage", "scripting"],
   "host_permissions": ["https://api.ohmywish.me/*"]
 }
diff --git a/public/manifest.edge.json b/public/manifest.edge.json
@@ -3,7 +3,7 @@
   "name": "Oh My Wish Extension",
   "short_name": "Oh My Wish",
   "description": "Cette extension permet de rajouter facilement des souhaits sur le site de Oh My Wish",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "author": "Anselme Chorein",
   "homepage_url": "https://ohmywish.me",
   "options_page": "options.html",
@@ -23,6 +23,6 @@
     "default_popup": "popup.html",
     "default_title": "Ajouter un souhait à votre liste Oh My Wish"
   },
-  "permissions": ["activeTab", "storage"],
+  "permissions": ["activeTab", "storage", "scripting"],
   "host_permissions": ["https://api.ohmywish.me/*"]
 }
diff --git a/public/manifest.firefox.json b/public/manifest.firefox.json
@@ -4,7 +4,7 @@
   "name": "Oh My Wish Extension",
   "short_name": "Oh My Wish",
   "description": "Cette extension permet de rajouter facilement des souhaits sur le site de Oh My Wish",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "icons": {
     "16": "img/icon16.png",
     "48": "img/icon48.png",

diff --git a/src/App-Popup.vue b/src/App-Popup.vue
@@ -51,8 +51,7 @@ export default {
       // retrieved users lists and follows from API (mixins)
       this.getLists();
       // Get current tab URL (mixins)
-      this.getTabs(tabs => {
-        const tab = tabs[0];
+      this.getCurrentTab(tab => {
         // get data from persistent cache (mixins)
         this.storageGet(
           {
@@ -68,11 +67,11 @@ export default {
             this.wishModel.happiness = this.getDataFromCache('happiness', '', storage); // mixins
 
             // Parse DOM to get more informations (mixins)
-            this.executeScriptOnTab(results => {
-              if (!results) {
+            this.executeScriptOnTab(result => {
+              if (!result) {
+                console.log('Error while executing script on tab');
                 return; // error
               }
-              const result = results[0];
               const nom = this.getDataFromCache('nom', result.title, storage); // mixins
               if (nom.length > 0) {
                 this.wishModel.nom = nom;

diff --git a/src/mixins/ChromeUtils.js b/src/mixins/ChromeUtils.js
@@ -18,18 +18,26 @@ export const chromeUtils = {
         callback(params);
       }
     },
-    getTabs(callback) {
+    getCurrentTab(callback) {
       if (!devMode) {
-        chrome.tabs.query({ active: true, currentWindow: true }, callback);
+        chrome.tabs.query({ active: true, currentWindow: true }, ([tab]) => {
+          if (chrome.runtime.lastError) console.error(chrome.runtime.lastError);
+          // `tab` will either be a `tabs.Tab` instance or `undefined`.
+          callback(tab);
+        });
       } else {
         callback([{ url: 'http://localhost', title: 'Dev mode' }]);
       }
     },
     executeScriptOnTab(callback) {
       if (!devMode) {
-        chrome.tabs.executeScript({ file: '/js/tab.js' }, callback);
+        this.getCurrentTab(tab => {
+          chrome.scripting.executeScript({ target: { tabId: tab.id }, files: ['/js/tab.js'] }).then(injectionResults => {
+            callback(injectionResults[0].result);
+          });
+        });
       } else {
-        callback([{ url: 'http://localhost:8080', title: 'Dev mode', description: 'description', image: 'http://localhost:8080/img/brand.png' }]);
+        callback({ url: 'http://localhost:8080', title: 'Dev mode', description: 'description', image: 'http://localhost:8080/img/brand.png' });
       }
     },
   },