Add surrogate-based replacement placeholders for Rumble and Google reCAPTCHA widgets

src/data/socialwidgets.json

@@ -146,7 +146,9 @@
     "Google reCAPTCHA": {
         "domains": [
             "google.com",
-            "www.google.com"
+            "www.google.com",
+            "recaptcha.net",
+            "www.recaptcha.net"
         ],
         "buttonSelectors": [
             "div.g-recaptcha",
@@ -156,13 +158,17 @@
         "scriptSelectors": [
             "script[src^='//google.com/recaptcha/api.js']",
             "script[src^='https://google.com/recaptcha/api.js']",
-            "script[src^='https://www.google.com/recaptcha/api.js']"
+            "script[src^='https://www.google.com/recaptcha/api.js']",
+            "script[src^='//recaptcha.net/recaptcha/api.js']",
+            "script[src^='https://recaptcha.net/recaptcha/api.js']",
+            "script[src^='https://www.recaptcha.net/recaptcha/api.js']"
         ],
-        "fallbackScriptUrl": "//google.com/recaptcha/api.js",
         "replacementButton": {
             "unblockDomains": [
                 "google.com",
-                "www.google.com"
+                "www.google.com",
+                "recaptcha.net",
+                "www.recaptcha.net"
             ],
             "type": 4
         }
@@ -203,6 +209,18 @@
             "type": 0
         }
     },
+    "Rumble Video Player": {
+        "domain": "rumble.com",
+        "buttonSelectors": [
+            "iframe[src^='https://rumble.com/embed/']"
+        ],
+        "replacementButton": {
+            "unblockDomains": [
+                "rumble.com"
+            ],
+            "type": 3
+        }
+    },
     "SoundCloud": {
         "domain": "w.soundcloud.com",
         "buttonSelectors": [

src/data/surrogates.js

@@ -18,6 +18,8 @@
 require.scopes.surrogatedb = (function () {
 
 const MATCH_SUFFIX = 'suffix',
+  MATCH_PREFIX = 'prefix',
+  MATCH_PREFIX_WITH_PARAMS = 'prefix_params',
   MATCH_ANY = 'any';
 
 /**
@@ -86,6 +88,38 @@ const hostnames = {
       '/apstag.js',
     ]
   },
+  'rumble.com': {
+    match: MATCH_PREFIX,
+    tokens: [
+      '/embedJS/',
+    ],
+    widgetName: "Rumble Video Player"
+  },
+  'www.google.com': {
+    match: MATCH_PREFIX_WITH_PARAMS,
+    params: {
+      onload: true,
+      //render: "explicit",
+      render: true,
+    },
+    tokens: [
+      '/recaptcha/api.js',
+      '/recaptcha/enterprise.js',
+    ],
+    widgetName: "Google reCAPTCHA"
+  },
+  'www.recaptcha.net': {
+    match: MATCH_PREFIX_WITH_PARAMS,
+    params: {
+      onload: true,
+      render: true,
+    },
+    tokens: [
+      '/recaptcha/api.js',
+      '/recaptcha/enterprise.js',
+    ],
+    widgetName: "Google reCAPTCHA"
+  },
 };
 
 /**
@@ -121,6 +155,11 @@ const surrogates = {
 
   '/apstag.js': 'amazon_apstag.js',
 
+  '/embedJS/': 'rumble_embedjs.js',
+
+  '/recaptcha/api.js': 'grecaptcha.js',
+  '/recaptcha/enterprise.js': 'grecaptcha_enterprise.js',
+
   'noopjs': 'noop.js'
 };
 
@@ -132,6 +171,8 @@ Object.keys(surrogates).forEach(key => {
 
 const exports = {
   MATCH_ANY,
+  MATCH_PREFIX,
+  MATCH_PREFIX_WITH_PARAMS,
   MATCH_SUFFIX,
   hostnames,
   surrogates,

src/data/web_accessible_resources/grecaptcha.js

@@ -0,0 +1,31 @@
+(function () {
+
+    let script_src = document.currentScript.src;
+
+    window.grecaptcha = {
+        render: function (container) {
+            if (Object.prototype.toString.call(container) != "[object String]") {
+                if (!container.id) {
+                    container.id = "grecaptcha-" + Math.random().toString().replace(".", "");
+                }
+                container = container.id;
+            }
+            document.dispatchEvent(new CustomEvent("pbSurrogateMessage", {
+                detail: {
+                    type: "widgetFromSurrogate",
+                    name: "Google reCAPTCHA",
+                    widgetData: {
+                        domId: container,
+                        scriptUrl: script_src
+                    }
+                }
+            }));
+        }
+    };
+
+    let onload = (new URL(script_src)).searchParams.get('onload');
+    if (onload && onload in window) {
+        window[onload]();
+    }
+
+}());

src/data/web_accessible_resources/grecaptcha_enterprise.js

@@ -0,0 +1,37 @@
+(function () {
+
+    let script_src = document.currentScript.src;
+
+    window.grecaptcha = {};
+
+    window.grecaptcha.enterprise = {
+        ready: function (cb) {
+            cb();
+        },
+        render: function (container) {
+            if (Object.prototype.toString.call(container) != "[object String]") {
+                if (!container.id) {
+                    container.id = "grecaptcha-" + Math.random().toString().replace(".", "");
+                }
+                container = container.id;
+            }
+            document.dispatchEvent(new CustomEvent("pbSurrogateMessage", {
+                detail: {
+                    type: "widgetFromSurrogate",
+                    name: "Google reCAPTCHA",
+                    widgetData: {
+                        domId: container,
+                        scriptUrl: script_src
+                    }
+                }
+            }));
+        },
+        execute: function () {}
+    };
+
+    let onload = (new URL(script_src)).searchParams.get('onload');
+    if (onload && onload in window) {
+        window[onload]();
+    }
+
+}());

src/data/web_accessible_resources/rumble_embedjs.js

@@ -0,0 +1,38 @@
+(function () {
+    if ("Rumble" in window && "_" in window.Rumble) {
+        for (let args of window.Rumble._) {
+            args = [].slice.apply(args);
+
+            let cmd = args[0],
+                conf = args[1],
+                script_src = document.currentScript.src,
+                idx = script_src.indexOf("/embedJS/"),
+                pub_code;
+
+            if (idx != -1) {
+                script_src = script_src.slice(idx + "/embedJS/".length);
+                idx = script_src.indexOf("/");
+                if (idx != -1) {
+                    script_src = script_src.slice(0, idx);
+                    idx = script_src.indexOf(".");
+                    if (idx != -1) {
+                        pub_code = script_src.slice(0, idx);
+                    }
+                }
+            }
+
+            if (pub_code && cmd == "play" && "div" in conf && "video" in conf) {
+                document.dispatchEvent(new CustomEvent("pbSurrogateMessage", {
+                    detail: {
+                        type: "widgetFromSurrogate",
+                        name: "Rumble Video Player",
+                        widgetData: {
+                            pubCode: pub_code,
+                            args
+                        }
+                    }
+                }));
+            }
+        }
+    }
+}());

src/js/background.js

@@ -233,6 +233,8 @@ Badger.prototype = {
             <frame_id>: {
               url: {String}
               host: {String}
+              widgetReplacementReady: {Boolean}
+              widgetQueue: {Array} widget objects
               warAccessTokens: {
                 <extension_resource_URL>: {String} access token
                 ...