add tabId to content script logs

Author: Jyyjy

build/UserALEWebExtension/background.js

@@ -415,7 +415,7 @@ function createVersionParts(count) {
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -706,8 +706,8 @@ function selectorizePath(path) {
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 
@@ -1142,7 +1142,7 @@ function dispatchTabMessage(message) {
     });
   });
 }
-browser.runtime.onMessage.addListener(function (message) {
+browser.runtime.onMessage.addListener(function (message, sender, sendResponse) {
   switch (message.type) {
     case CONFIG_CHANGE:
       options(message.payload);
@@ -1151,7 +1151,11 @@ browser.runtime.onMessage.addListener(function (message) {
 
     // Handles logs rerouted from content and option scripts 
     case ADD_LOG:
-      log(message.payload);
+      var log$1 = message.payload;
+      if ("tab" in sender && "id" in sender.tab) {
+        log$1["tabId"] = sender.tab.id;
+      }
+      log(log$1);
       break;
     default:
       console.log('got unknown message type ', message);

build/UserALEWebExtension/content.js

@@ -405,7 +405,7 @@ function createVersionParts(count) {
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -720,8 +720,8 @@ function selectorizePath(path) {
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 
@@ -1100,7 +1100,6 @@ function options(newConfig) {
 // browser is defined in firefox, but chrome uses the 'chrome' global.
 var browser = browser || chrome;
 function rerouteLog(log) {
-  console.log(log);
   browser.runtime.sendMessage({
     type: ADD_LOG,
     payload: log

build/UserALEWebExtension/options.js

@@ -405,7 +405,7 @@ function createVersionParts(count) {
  * limitations under the License.
  */
 
-var browser$1 = detect();
+var browserInfo = detect();
 var logs$1;
 var config$1;
 
@@ -720,8 +720,8 @@ function selectorizePath(path) {
 }
 function detectBrowser() {
   return {
-    'browser': browser$1 ? browser$1.name : '',
-    'version': browser$1 ? browser$1.version : ''
+    'browser': browserInfo ? browserInfo.name : '',
+    'version': browserInfo ? browserInfo.version : ''
   };
 }
 
@@ -1100,7 +1100,6 @@ function options(newConfig) {
 // browser is defined in firefox, but chrome uses the 'chrome' global.
 var browser = browser || chrome;
 function rerouteLog(log) {
-  console.log(log);
   browser.runtime.sendMessage({
     type: ADD_LOG,
     payload: log

build/userale-2.4.0.js

@@ -418,7 +418,7 @@
    * limitations under the License.
    */
 
-  var browser = detect();
+  var browserInfo = detect();
   var logs$1;
   var config$1;
 
@@ -745,8 +745,8 @@
   }
   function detectBrowser() {
     return {
-      'browser': browser ? browser.name : '',
-      'version': browser ? browser.version : ''
+      'browser': browserInfo ? browserInfo.name : '',
+      'version': browserInfo ? browserInfo.version : ''
     };
   }
 

src/UserALEWebExtension/background.js

@@ -43,7 +43,7 @@ function dispatchTabMessage(message) {
   });
 }
 
-browser.runtime.onMessage.addListener(function (message) {
+browser.runtime.onMessage.addListener(function (message, sender, sendResponse) {
   switch (message.type) {
     case MessageTypes.CONFIG_CHANGE:
       userale.options(message.payload)
@@ -52,7 +52,11 @@ browser.runtime.onMessage.addListener(function (message) {
 
     // Handles logs rerouted from content and option scripts 
     case MessageTypes.ADD_LOG:
-      userale.log(message.payload);
+      let log = message.payload;
+      if("tab" in sender && "id" in sender.tab) {
+        log["tabId"] = sender.tab.id;
+      }
+      userale.log(log);
       break;
 
     default:
@@ -75,7 +79,6 @@ function packageDetailedTabLog(tab, data, type) {
 // Attach Handlers for tab events
 // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/tabs
 browser.tabs.onActivated.addListener((activeInfo) => {
-  browser.storage.local.set({ "tabId": activeInfo.tabId });
   packageTabLog(activeInfo.tabId, activeInfo, "tabs.onActivated");
 });