feat: make fetch() zone-aware without triggering extra requests or uncatchable errors. (#622)

MichaelBuerge · mhevery · commit 6731ad040cb8 · 2017-02-07T11:18:47.000-08:00
* Instrument with probePromise()

* De-instrument (probePromise).

* Introduce helper function to wraps any function returning a promise, ensuring a ZoneAwarePromise is returned. Use it on fetch().

* Minor readability improvement.

* No need to wrap result promise in ZoneAwarePromise after patching its constructor.

* Remove promise prober from karma build conf.

* Address linter issues.

* Use const.
diff --git a/lib/zone.ts b/lib/zone.ts
@@ -1325,38 +1325,46 @@ const Zone: ZoneType = (function(global: any) {
   ZoneAwarePromise['race'] = ZoneAwarePromise.race;
   ZoneAwarePromise['all'] = ZoneAwarePromise.all;
 
-  const NativePromise = global[__symbol__('Promise')] = global['Promise'];
+  const NativePromise = global[symbolPromise] = global['Promise'];
   global['Promise'] = ZoneAwarePromise;
-  function patchThen(NativePromise) {
-    const NativePromiseProtototype = NativePromise.prototype;
-    const NativePromiseThen = NativePromiseProtototype[__symbol__('then')] =
-        NativePromiseProtototype.then;
-    NativePromiseProtototype.then = function(onResolve, onReject) {
-      const nativePromise = this;
-      return new ZoneAwarePromise((resolve, reject) => {
-               NativePromiseThen.call(nativePromise, resolve, reject);
-             })
-          .then(onResolve, onReject);
+
+  const symbolThenPatched = __symbol__('thenPatched');
+
+  function patchThen(Ctor) {
+    const proto = Ctor.prototype;
+    const originalThen = proto.then;
+    // Keep a reference to the original method.
+    proto[symbolThen] = originalThen;
+
+    Ctor.prototype.then = function(onResolve, onReject) {
+      const wrapped = new ZoneAwarePromise((resolve, reject) => {
+        originalThen.call(this, resolve, reject);
+      });
+      return wrapped.then(onResolve, onReject);
     };
+    Ctor[symbolThenPatched] = true;
   }
 
-  if (NativePromise) {
-    patchThen(NativePromise);
-    if (typeof global['fetch'] !== 'undefined') {
-      let fetchPromise: Promise<any>;
-      try {
-        // In MS Edge this throws
-        fetchPromise = global['fetch']();
-      } catch (error) {
-        // In Chrome this throws instead.
-        fetchPromise = global['fetch']('about:blank');
+  function zoneify(fn) {
+    return function() {
+      let resultPromise = fn.apply(this, arguments);
+      if (resultPromise instanceof ZoneAwarePromise) {
+        return resultPromise;
       }
-      // ignore output to prevent error;
-      fetchPromise.then(() => null, () => null);
-      if (fetchPromise.constructor != NativePromise &&
-          fetchPromise.constructor != ZoneAwarePromise) {
-        patchThen(fetchPromise.constructor);
+      let Ctor = resultPromise.constructor;
+      if (!Ctor[symbolThenPatched]) {
+        patchThen(Ctor);
       }
+      return resultPromise;
+    };
+  }
+
+  if (NativePromise) {
+    patchThen(NativePromise);
+
+    let fetch = global['fetch'];
+    if (typeof fetch == 'function') {
+      global['fetch'] = zoneify(fetch);
     }
   }
 
