Use XMLHttpRequest if supports CORS

Falx · Feb 20, 2018 · c7f70db · c7f70db
1 parent dbd549a
commit c7f70db
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/eventsource.js b/src/eventsource.js
@@ -410,6 +410,12 @@
     start(this, url, options);
   }
 
+  function getBestTransport() {
+    return XMLHttpRequest && "withCredentials" in XMLHttpRequest.prototype
+      ? XMLHttpRequest
+      : XDomainRequest;
+  }
+
   function start(es, url, options) {
     url = String(url);
     var withCredentials = options != undefined && Boolean(options.withCredentials);
@@ -421,7 +427,7 @@
     var retry = initialRetry;
     var wasActivity = false;
     var headers = options != undefined && options.headers != undefined ? JSON.parse(JSON.stringify(options.headers)) : undefined;
-    var CurrentTransport = options != undefined && options.Transport != undefined ? options.Transport : (XDomainRequest != undefined ? XDomainRequest : XMLHttpRequest);
+    var CurrentTransport = options != undefined && options.Transport != undefined ? options.Transport : getBestTransport();
     var transport = new XHRTransport(new CurrentTransport());
     var timeout = 0;
     var currentState = WAITING;

diff --git a/src/eventsource.min.js b/src/eventsource.min.js
diff --git a/tests/eventsource.js b/tests/eventsource.js
@@ -410,18 +410,24 @@
     start(this, url, options);
   }
 
+  function getBestTransport() {
+    return XMLHttpRequest && "withCredentials" in XMLHttpRequest.prototype
+      ? XMLHttpRequest
+      : XDomainRequest;
+  }
+
   function start(es, url, options) {
     url = String(url);
     var withCredentials = options != undefined && Boolean(options.withCredentials);
 
     var initialRetry = clampDuration(1000);
-    var heartbeatTimeout = clampDuration(45000);
+    var heartbeatTimeout = options != undefined && options.heartbeatTimeout != undefined ? parseDuration(options.heartbeatTimeout, 45000) : clampDuration(45000);
 
     var lastEventId = "";
     var retry = initialRetry;
     var wasActivity = false;
     var headers = options != undefined && options.headers != undefined ? JSON.parse(JSON.stringify(options.headers)) : undefined;
-    var CurrentTransport = options != undefined && options.Transport != undefined ? options.Transport : (XDomainRequest != undefined ? XDomainRequest : XMLHttpRequest);
+    var CurrentTransport = options != undefined && options.Transport != undefined ? options.Transport : getBestTransport();
     var transport = new XHRTransport(new CurrentTransport());
     var timeout = 0;
     var currentState = WAITING;