MV3 click to load support (#189)

* mv3 messaging support

* MV3 enable social tracker

* revert package-lock.json

* build

* handle config response on init

* cleanup debug

* builds

* fix mozilla sendMessage proxy

* builds

Co-authored-by: ladamski@duckduckgo.com <ladamski@duckduckgo.com>

Author: ladamski

Sources/ContentScopeScripts/dist/contentScope.js

@@ -3188,7 +3188,7 @@
                   if (this.replaceSettings.type === 'loginButton') {
                       isLogin = true;
                   }
-                  enableSocialTracker(this.entity, isLogin);
+                  enableSocialTracker({ entity: this.entity, action: 'block-ctl-fb', isLogin });
                   const parent = replacementElement.parentNode;
 
                   // If we allow everything when this element is clicked,
@@ -3506,16 +3506,12 @@
   /*********************************************************
    *  Messaging to surrogates & extension
    *********************************************************/
-  function enableSocialTracker (entity, isLogin) {
-      const message = {
-          entity,
-          isLogin
-      };
+  function enableSocialTracker (message) {
       sendMessage('enableSocialTracker', message);
   }
 
   function runLogin (entity) {
-      enableSocialTracker(entity, true);
+      enableSocialTracker(entity);
       window.dispatchEvent(
           createCustomEvent('ddg-ctp-run-login', {
               detail: {
@@ -4236,12 +4232,13 @@
   }
 
   function update$1 (args) {
-      if (!(args && args.type)) { return }
+      const detail = args && args.detail;
+      if (!(detail && detail.func)) { return }
 
-      const fn = updateHandlers[args.type];
+      const fn = updateHandlers[detail.func];
       if (typeof fn !== 'function') { return }
 
-      fn(args.response);
+      fn(detail.response);
   }
 
   var clickToPlay = /*#__PURE__*/Object.freeze({

build/android/contentScope.js

@@ -113,8 +113,8 @@ function init () {
     window.addEventListener('sendMessage', (m) => {
         const messageType = m.detail.messageType
         chrome.runtime.sendMessage(m && m.detail, response => {
-            const msg = { type: messageType, response }
-            const stringifiedArgs = JSON.stringify(msg)
+            const msg = { func: messageType, response }
+            const stringifiedArgs = JSON.stringify({ detail: msg })
             const callRandomUpdateFunction = `
                 window.${reusableMethodName}('${reusableSecret}', ${stringifiedArgs});
             `

build/chrome-mv3/inject.js

@@ -41,8 +41,8 @@ function init () {
     window.addEventListener('sendMessage', (m) => {
         const messageType = m.detail.messageType
         chrome.runtime.sendMessage(m && m.detail, response => {
-            const msg = { type: messageType, response }
-            contentScopeFeatures.update(msg)
+            const msg = { func: messageType, response }
+            contentScopeFeatures.update({ detail: msg })
         })
     })
 }

build/chrome/inject.js

@@ -1243,7 +1243,7 @@ class DuckWidget {
                 if (this.replaceSettings.type === 'loginButton') {
                     isLogin = true
                 }
-                enableSocialTracker(this.entity, isLogin)
+                enableSocialTracker({ entity: this.entity, action: 'block-ctl-fb', isLogin })
                 const parent = replacementElement.parentNode
 
                 // If we allow everything when this element is clicked,
@@ -1561,11 +1561,7 @@ async function replaceClickToLoadElements (config, targetElement) {
 /*********************************************************
  *  Messaging to surrogates & extension
  *********************************************************/
-function enableSocialTracker (entity, isLogin) {
-    const message = {
-        entity,
-        isLogin
-    }
+function enableSocialTracker (message) {
     sendMessage('enableSocialTracker', message)
 }
 
@@ -2291,10 +2287,11 @@ export function init (args) {
 }
 
 export function update (args) {
-    if (!(args && args.type)) { return }
+    const detail = args && args.detail
+    if (!(detail && detail.func)) { return }
 
-    const fn = updateHandlers[args.type]
+    const fn = updateHandlers[detail.func]
     if (typeof fn !== 'function') { return }
 
-    fn(args.response)
+    fn(detail.response)
 }