Increase ack timeout for windows known to have post-robot

Author: Daniel Brain

src/conf/config.js

@@ -11,8 +11,9 @@ export let CONFIG : Object = {
     BRIDGE_TIMEOUT:       5000,
     CHILD_WINDOW_TIMEOUT: 5000,
 
-    ACK_TIMEOUT: (window.navigator.userAgent.match(/MSIE/i) !== -1 && !__TEST__) ? 2000 : 1000,
-    RES_TIMEOUT: __TEST__ ? 2000 : -1,
+    ACK_TIMEOUT:       2000,
+    ACK_TIMEOUT_KNOWN: 10000,
+    RES_TIMEOUT:       __TEST__ ? 2000 : -1,
 
     ALLOWED_POST_MESSAGE_METHODS: {
         [ CONSTANTS.SEND_STRATEGIES.POST_MESSAGE ]: true,

src/drivers/receive/index.js

@@ -4,7 +4,7 @@ import { isWindowClosed, type CrossDomainWindowType } from 'cross-domain-utils/s
 import { addEventListener, noop } from 'belter/src';
 
 import { CONSTANTS, POST_MESSAGE_NAMES_LIST } from '../../conf';
-import { deserializeMethods } from '../../lib';
+import { deserializeMethods, markWindowKnown } from '../../lib';
 import { global } from '../../global';
 
 import { RECEIVE_MESSAGE_TYPES } from './types';
@@ -75,6 +75,8 @@ export function receiveMessage(event : MessageEvent) {
         return;
     }
 
+    markWindowKnown(source);
+
     if (!message.sourceDomain || typeof message.sourceDomain !== 'string') {
         throw new Error(`Expected message to have sourceDomain`);
     }

src/interface.js

@@ -6,6 +6,7 @@ import { global } from './global';
 import { on, send } from './public';
 
 export * from './public';
+export { markWindowKnown } from './lib';
 export { cleanUpWindow } from './clean';
 export { ZalgoPromise as Promise } from 'zalgo-promise/src';
 export let bridge = __POST_ROBOT__.__IE_POPUP_SUPPORT__ ? require('./bridge/interface') : null;

src/lib/ready.js

@@ -10,6 +10,7 @@ import { global } from '../global';
 
 
 global.readyPromises = global.readyPromises || new WeakMap();
+global.knownWindows = global.knownWindows || new WeakMap();
 
 export function onHello(handler : ({ source? : CrossDomainWindowType, origin? : string }) => void) {
     global.on(CONSTANTS.POST_MESSAGE_NAMES.HELLO, { domain: CONSTANTS.WILDCARD }, ({ source, origin }) => {
@@ -24,6 +25,14 @@ export function sayHello(win : CrossDomainWindowType) : ZalgoPromise<{ origin :
         });
 }
 
+export function markWindowKnown(win : CrossDomainWindowType) {
+    global.knownWindows.set(win, true);
+}
+
+export function isWindowKnown(win : CrossDomainWindowType) : boolean {
+    return global.knownWindows.get(win);
+}
+
 export function initOnReady() {
 
     onHello(({ source, origin }) => {

src/public/client.js

@@ -8,7 +8,7 @@ import { uniqueID, isRegex } from 'belter/src';
 
 import { CONFIG, CONSTANTS } from '../conf';
 import { sendMessage, addResponseListener, deleteResponseListener, markResponseListenerErrored, type ResponseListenerType } from '../drivers';
-import { onChildWindowReady, sayHello } from '../lib';
+import { onChildWindowReady, sayHello, isWindowKnown } from '../lib';
 import { global } from '../global';
 
 global.requestPromises = global.requestPromises || new WeakMap();
@@ -168,8 +168,11 @@ export function request(options : RequestOptionsType) : ZalgoPromise<ResponseMes
                     return resolve();
                 }
 
-                let ackTimeout = CONFIG.ACK_TIMEOUT;
-                let resTimeout = options.timeout || CONFIG.RES_TIMEOUT;
+                let totalAckTimeout = isWindowKnown(win) ? CONFIG.ACK_TIMEOUT_KNOWN : CONFIG.ACK_TIMEOUT;
+                let totalResTimeout = options.timeout || CONFIG.RES_TIMEOUT;
+
+                let ackTimeout = totalAckTimeout;
+                let resTimeout = totalResTimeout;
 
                 let cycleTime = 100;
 
@@ -204,10 +207,10 @@ export function request(options : RequestOptionsType) : ZalgoPromise<ResponseMes
                         cycleTime = Math.min(resTimeout, 2000);
 
                     } else if (ackTimeout === 0) {
-                        return reject(new Error(`No ack for postMessage ${ name } in ${ getDomain() } in ${ CONFIG.ACK_TIMEOUT }ms`));
+                        return reject(new Error(`No ack for postMessage ${ name } in ${ getDomain() } in ${ totalAckTimeout }ms`));
 
                     } else if (resTimeout === 0) {
-                        return reject(new Error(`No response for postMessage ${ name } in ${ getDomain() } in ${ options.timeout || CONFIG.RES_TIMEOUT }ms`));
+                        return reject(new Error(`No response for postMessage ${ name } in ${ getDomain() } in ${ totalResTimeout }ms`));
                     }
 
                     setTimeout(cycle, cycleTime);