Set up state to be cleaned up on demand

Author: Daniel Brain

src/conf/config.js

@@ -3,7 +3,7 @@ import { CONSTANTS } from './constants';
 
 export let CONFIG = {
 
-    ALLOW_POSTMESSAGE_POPUP: true,
+    ALLOW_POSTMESSAGE_POPUP: false,
 
     LOG_LEVEL: 'info',
 
@@ -23,4 +23,4 @@ export let CONFIG = {
 
 if (window.location.href.indexOf(CONSTANTS.FILE_PROTOCOL) === 0) {
     CONFIG.ALLOW_POSTMESSAGE_POPUP = true;
-}
+}

src/drivers/listeners.js

@@ -123,5 +123,5 @@ export function addRequestListener(name, win, domain, options, override) {
         }
     }
 
-    listeners.request.push({ name, win, domain, options });
-}
+    global.clean.push(global.listeners.request, { name, win, domain, options });
+}

src/drivers/receive/index.js

@@ -65,7 +65,7 @@ export function receiveMessage(event) {
     }
 
     if (global.receivedMessages.indexOf(message.id) === -1) {
-        global.receivedMessages.push(message.id);
+        global.clean.push(global.receivedMessages, message.id);
     } else {
         return;
     }
@@ -117,5 +117,9 @@ export function messageListener(event) {
 }
 
 export function listenForMessages() {
-    util.listen(window, 'message', messageListener);
+    let listener = util.listen(window, 'message', messageListener);
+
+    global.clean.register('listener', () => {
+        listener.cancel();
+    });
 }

src/global.js

@@ -1,4 +1,7 @@
 
 import { CONSTANTS } from './conf';
+import { cleanup } from './lib/cleanup';
 
-export let global = window[CONSTANTS.WINDOW_PROPS.POSTROBOT] = window[CONSTANTS.WINDOW_PROPS.POSTROBOT] || {};
+export let global = window[CONSTANTS.WINDOW_PROPS.POSTROBOT] = window[CONSTANTS.WINDOW_PROPS.POSTROBOT] || {};
+
+global.clean = global.clean || cleanup(global);

src/index.js

@@ -4,7 +4,7 @@ import { listenForMessages } from './drivers';
 import { global } from './global';
 import { openTunnelToOpener } from './bridge';
 
-function init() {
+export function init() {
 
     if (!global.initialized) {
         listenForMessages();
@@ -18,7 +18,14 @@ function init() {
 
 init();
 
+export function reset() {
+    return global.clean.all().then(() => {
+        global.initialized = false;
+        return init();
+    });
+}
+
 export * from './interface';
 export { Promise } from './lib';
 
-export default module.exports;
+export default module.exports;

src/interface/client.js

@@ -1,6 +1,7 @@
 
 import { CONFIG, CONSTANTS } from '../conf';
-import { listeners, sendMessage } from '../drivers';
+import { sendMessage } from '../drivers';
+import { global } from '../global';
 import { util, promise, getAncestor, isAncestor, onWindowReady, isWindowClosed } from '../lib';
 
 
@@ -41,7 +42,7 @@ export function request(options) {
         options.domain = options.domain || '*';
 
         let hash = `${options.name}_${util.uniqueID()}`;
-        listeners.response[hash] = options;
+        global.clean.setItem(global.listeners.response, hash, options);
 
         if (isWindowClosed(options.window)) {
             throw new Error('Target window is closed');

src/interface/index.js

@@ -9,9 +9,7 @@ import * as windowUtil from '../lib/windows';
 
 export let parent = getAncestor();
 
-export { resetListeners as reset } from '../drivers';
-
-export { openBridge, linkUrl, isBridge, needsBridge, needsBridgeForBrowser, needsBridgeForWin, needsBridgeForDomain, openTunnelToOpener } from '../bridge';
+export { openBridge, linkUrl, isBridge, needsBridge, needsBridgeForBrowser, needsBridgeForWin, needsBridgeForDomain, openTunnelToOpener, destroyBridges } from '../bridge';
 
 export { util } from '../lib/util';
 

src/lib/index.js

@@ -5,4 +5,5 @@ export * from './log';
 export * from './windows';
 export * from './methods';
 export * from './tick';
-export * from './ready';
+export * from './ready';
+export * from './cleanup';

src/lib/methods.js

@@ -49,11 +49,7 @@ export function serializeMethod(destination, domain, method, name) {
 
     let id = util.uniqueID();
 
-    global.methods[id] = {
-        destination,
-        domain,
-        method
-    };
+    global.clean.setItem(global.methods, id, { destination, domain, method });
 
     return {
         __type__: CONSTANTS.SERIALIZATION_TYPES.METHOD,
@@ -89,6 +85,8 @@ export function deserializeMethod(source, origin, obj) {
     }
 
     wrapper.__name__ = obj.__name__;
+    wrapper.source = source;
+    wrapper.origin = origin;
 
     return wrapper;
 }

src/lib/ready.js

@@ -19,7 +19,7 @@ export function initOnReady() {
             }
         }
 
-        global.readyPromises.push({
+        global.clean.push(global.readyPromises, {
             win: event.source,
             promise: new Promise().resolve(event)
         });
@@ -44,12 +44,9 @@ export function onWindowReady(win, timeout = 5000, name = 'Window') {
 
     let promise = new Promise();
 
-    global.readyPromises.push({
-        win,
-        promise
-    });
+    global.clean.push(global.readyPromises, { win, promise });
 
     setTimeout(() => promise.reject(new Error(`${name} did not load after ${timeout}ms`)), timeout);
 
     return promise;
-}
+}

src/lib/windows.js

@@ -27,10 +27,7 @@ export function isSameDomain(win) {
         match = false;
     }
 
-    global.domainMatches.push({
-        win,
-        match
-    });
+    global.clean.push(global.domainMatches, { win, match });
 
     if (!domainMatchTimeout) {
         domainMatchTimeout = setTimeout(() => {
@@ -581,4 +578,4 @@ export function jsonStringify() {
 
 export function jsonParse() {
     return JSON.parse.apply(this, arguments);
-}
+}

test/test.js

@@ -351,7 +351,7 @@ describe('[post-robot] error cases', function() {
             return postRobot.send(childFrame, 'foo', {}, { domain: 'http://www.zombo.com' }).then(function() {
                 throw new Error('Expected success handler to not be called');
             }, function(err) {
-                assert.ok(err);
+                assert.ok(err instanceof Error);
             });
         });
     });