Improve mock domain logic

Author: Daniel Brain

src/drivers/receive/index.js

@@ -1,6 +1,6 @@
 
 import { CONFIG, CONSTANTS, POST_MESSAGE_NAMES_LIST } from '../../conf';
-import { getWindowById, registerWindow, deserializeMethods, log, getOpener, getWindowId, isWindowClosed, isSameDomain } from '../../lib';
+import { getWindowById, registerWindow, deserializeMethods, log, getOpener, getWindowId, isWindowClosed, isSameDomain, util } from '../../lib';
 import { emulateIERestrictions, registerBridge } from '../../compat';
 
 import { sendMessage } from '../send';
@@ -83,12 +83,20 @@ export function receiveMessage(event) {
 
     let { source, origin, data } = event;
 
+    if (isSameDomain(source, false)) {
+        origin = util.getDomain(source);
+    }
+
     let message = parseMessage(data);
 
     if (!message) {
         return;
     }
 
+    if (message.sourceDomain.indexOf('mock://') === 0) {
+        origin = message.sourceDomain;
+    }
+
     if (receivedMessages.indexOf(message.id) === -1) {
         receivedMessages.push(message.id);
     } else {

src/lib/util.js

@@ -247,9 +247,15 @@ export let util = {
         return safeInterval;
     },
 
-    getDomain(win) {
+    getDomain(win, allowMockDomain = true) {
+
         win = win || window;
-        return win.mockDomain || `${win.location.protocol}//${win.location.host}`;
+
+        if (win.mockDomain && allowMockDomain && win.mockDomain.indexOf('mock://') === 0) {
+            return win.mockDomain;
+        }
+
+        return `${win.location.protocol}//${win.location.host}`;
     },
 
     getDomainFromUrl(url) {

src/lib/windows.js

@@ -17,40 +17,33 @@ function safeGet(obj, prop) {
 let domainMatches = [];
 let domainMatchTimeout;
 
-export function isSameDomain(win) {
+export function isSameDomain(win, allowMockDomain = true) {
 
     for (let match of domainMatches) {
         if (match.win === win) {
-
-            if (!match.match) {
-                return false;
-            }
-
-            match.match = false;
-
-            try {
-                match.match = util.getDomain(window) === util.getDomain(win);
-            } catch (err) {
-                return;
-            }
-
-            return match.match;
+            return allowMockDomain ? match.match : match.actualMatch;
         }
     }
 
     let match = false;
+    let actualMatch = false;
 
     try {
         if (util.getDomain(window) === util.getDomain(win)) {
             match = true;
         }
+
+        if (util.getDomain(window, false) === util.getDomain(win, false)) {
+            actualMatch = true;
+        }
     } catch (err) {
         // pass
     }
 
     domainMatches.push({
         win,
-        match
+        match,
+        actualMatch
     });
 
     if (!domainMatchTimeout) {
@@ -60,7 +53,7 @@ export function isSameDomain(win) {
         }, 1);
     }
 
-    return match;
+    return allowMockDomain ? match : actualMatch;
 }
 
 export function isWindowClosed(win) {

test/bridge.htm

@@ -1,6 +1,6 @@
 <script>
 	window.__coverage__ = window.parent.__coverage__;
-	window.mockDomain = 'http://test-post-robot-child.com';
+	window.mockDomain = 'mock://test-post-robot-child.com';
 </script>
 
 <script src="/base/test/child.js"></script>

test/child.htm

@@ -6,5 +6,5 @@
 <script src="/base/test/child.js"></script>
 
 <script>
-    postRobot.openBridge('/base/test/bridge.htm', 'http://test-post-robot.com');
+    postRobot.openBridge('/base/test/bridge.htm', 'mock://test-post-robot.com');
 </script>

test/common.js

@@ -3,22 +3,4 @@ window.console.karma = function() {
     var karma = window.karma || (window.top && window.top.karma) || (window.opener && window.opener.karma);
     karma.log('debug', arguments);
     console.log.apply(console, arguments);
-};
-
-let addEventListener = window.addEventListener;
-
-window.addEventListener = function(name, method) {
-    return addEventListener.call(window, name, function(event) {
-        let { origin, source, data } = event;
-
-        try {
-            if (source.mockDomain) {
-                origin = source.mockDomain;
-            }
-        } catch (err) {
-            // pass
-        }
-
-        return method({ origin, source, data });
-    });
-}
+};

test/test.js

@@ -5,7 +5,7 @@ import postRobot from 'src/index';
 import { onWindowReady, promise } from 'src/lib';
 
 postRobot.CONFIG.LOG_TO_PAGE = true;
-window.mockDomain = 'http://test-post-robot.com';
+window.mockDomain = 'mock://test-post-robot.com';
 
 function createIframe(name, callback) {
     var frame = document.createElement('iframe');
@@ -28,7 +28,7 @@ let bridge;
 let childWindow, childFrame, otherChildFrame;
 
 before(function() {
-    return postRobot.openBridge('/base/test/bridge.htm', 'http://test-post-robot-child.com').then(frame => {
+    return postRobot.openBridge('/base/test/bridge.htm', 'mock://test-post-robot-child.com').then(frame => {
         bridge = frame;
     }).then(function() {
 
@@ -335,18 +335,6 @@ describe('[post-robot] error cases', function() {
         });
     });
 
-    it.skip('should error out trying to set up a second bridge', function() {
-
-        try {
-            postRobot.openBridge('/base/test/child.htm');
-        } catch (err) {
-            assert.ok(err);
-            return;
-        }
-
-        throw new Error('Expected opening second bridge to throw an error');
-    });
-
     it('should fail to send a message when the expected domain does not match', function() {
 
         postRobot.on('foobu', { domain: 'http://www.zombo.com' }, function() {