Use -1 universally for disabled timeout

Author: Daniel Brain

src/conf/config.js

@@ -14,7 +14,7 @@ export let CONFIG : Object = {
     CHILD_WINDOW_TIMEOUT: 5000,
 
     ACK_TIMEOUT: (window.navigator.userAgent.match(/MSIE/i) !== -1 && !__TEST__) ? 2000 : 1000,
-    RES_TIMEOUT: __TEST__ ? 2000 : Infinity,
+    RES_TIMEOUT: __TEST__ ? 2000 : -1,
 
     LOG_TO_PAGE: false,
 

src/lib/ready.js

@@ -19,7 +19,7 @@ export function onHello(handler : ({ source? : CrossDomainWindowType, origin? :
 }
 
 export function sayHello(win : CrossDomainWindowType) : ZalgoPromise<{ origin : string }> {
-    return global.send(win, CONSTANTS.POST_MESSAGE_NAMES.HELLO, {}, { domain: CONSTANTS.WILDCARD, timeout: Infinity })
+    return global.send(win, CONSTANTS.POST_MESSAGE_NAMES.HELLO, {}, { domain: CONSTANTS.WILDCARD, timeout: -1 })
         .then(({ origin }) => {
             return { origin };
         });

src/lib/serialize.js

@@ -159,7 +159,7 @@ export function deserializeMethod(source : CrossDomainWindowType, origin : strin
             name: obj.__name__,
             args
 
-        }, { domain: origin, timeout: Infinity }).then(({ data }) => {
+        }, { domain: origin, timeout: -1 }).then(({ data }) => {
 
             log.debug('Got foreign method result', obj.__name__, data.result);
             return data.result;

src/public/client.js

@@ -186,23 +186,25 @@ export function request(options : RequestOptionsType) : ZalgoPromise<ResponseMes
                         return reject(new Error(`Window closed for ${ name } before response`));
                     }
 
-                    ackTimeout -= cycleTime;
-                    resTimeout -= cycleTime;
+                    ackTimeout = Math.max(ackTimeout - cycleTime, 0);
+                    if (resTimeout !== -1) {
+                        resTimeout = Math.max(resTimeout - cycleTime, 0);
+                    }
 
                     let hasAck = responseListener.ack;
 
                     if (hasAck) {
 
-                        if (resTimeout === Infinity) {
+                        if (resTimeout === -1) {
                             return;
                         }
 
                         cycleTime = Math.min(resTimeout, 2000);
 
-                    } else if (ackTimeout <= 0) {
+                    } else if (ackTimeout === 0) {
                         return reject(new Error(`No ack for postMessage ${ name } in ${ getDomain() } in ${ CONFIG.ACK_TIMEOUT }ms`));
 
-                    } else if (resTimeout <= 0) {
+                    } else if (resTimeout === 0) {
                         return reject(new Error(`No response for postMessage ${ name } in ${ getDomain() } in ${ options.timeout || CONFIG.RES_TIMEOUT }ms`));
                     }