feat(core): scoped zone

Author: JiaLiPassion

lib/browser/browser.ts

@@ -12,7 +12,7 @@
 
 import {findEventTasks} from '../common/events';
 import {patchTimer} from '../common/timers';
-import {bindArguments, patchClass, patchMacroTask, patchMethod, patchOnProperties, patchPrototype, scheduleMacroTaskWithCurrentZone, ZONE_SYMBOL_ADD_EVENT_LISTENER, ZONE_SYMBOL_REMOVE_EVENT_LISTENER, zoneSymbol} from '../common/utils';
+import {attachOriginToPatched, bindArguments, patchClass, patchMacroTask, patchMethod, patchOnProperties, patchPrototype, scheduleMacroTaskWithCurrentZone, ZONE_SYMBOL_ADD_EVENT_LISTENER, ZONE_SYMBOL_REMOVE_EVENT_LISTENER, zoneSymbol} from '../common/utils';
 
 import {propertyPatch} from './define-property';
 import {eventTargetPatch, patchEvent} from './event-target';
@@ -23,6 +23,7 @@ Zone.__load_patch('util', (global: any, Zone: ZoneType, api: _ZonePrivate) => {
   api.patchOnProperties = patchOnProperties;
   api.patchMethod = patchMethod;
   api.bindArguments = bindArguments;
+  api.attachOriginToPatched = attachOriginToPatched;
 });
 
 Zone.__load_patch('timers', (global: any) => {

lib/browser/webapis-user-media.ts

@@ -15,6 +15,8 @@ Zone.__load_patch('getUserMedia', (global: any, Zone: any, api: _ZonePrivate) =>
   }
   let navigator = global['navigator'];
   if (navigator && navigator.getUserMedia) {
+    const native = navigator.getUserMedia;
     navigator.getUserMedia = wrapFunctionArgs(navigator.getUserMedia);
+    api.attachOriginToPatched(navigator, 'getUserMedia', native);
   }
 });

lib/browser/websocket.ts

@@ -55,6 +55,7 @@ export function apply(api: _ZonePrivate, _global: any) {
   };
 
   const globalWebSocket = _global['WebSocket'];
+  api.attachOriginToPatched(_global, 'WebSocket', WS);
   for (const prop in WS) {
     globalWebSocket[prop] = WS[prop];
   }

lib/common/promise.ts

@@ -445,6 +445,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
   }
 
   global['Promise'] = ZoneAwarePromise;
+  api.attachOriginToPatched(global, 'Promise', NativePromise);
 
   const symbolThenPatched = __symbol__('thenPatched');
 

lib/zone.ts

@@ -329,6 +329,7 @@ interface _ZonePrivate {
        patchFn: (delegate: Function, delegateName: string, name: string) =>
            (self: any, args: any[]) => any) => Function | null;
   bindArguments: (args: any[], source: string) => any[];
+  attachOriginToPatched: (patchedTarget: any, prop: string, original: any) => void;
 }
 
 /** @internal */
@@ -1403,6 +1404,7 @@ const Zone: ZoneType = (function(global: any) {
         nativeMicroTaskQueuePromise = NativePromise.resolve(0);
       }
     },
+    attachOriginToPatched: (patchedTarget: any, prop: string, original: any) => noop
   };
   let _currentZoneFrame: _ZoneFrame = {parent: null, zone: new Zone(null, null)};
   let _currentTask: Task|null = null;

test/browser/performance.spec.ts

@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+describe('Performance', () => {
+  function mark(name: string) {
+    performance && performance['mark'] && performance['mark'](name);
+  }
+  function performanceMeasure(name: string, label: string) {
+    performance && performance['measure'] && performance['measure'](name, label);
+  }
+  function getEntriesByName(name: string) {
+    return performance && performance['getEntriesByName'] &&
+        performance['getEntriesByName'](name).filter(m => m.entryType === 'measure');
+  }
+  describe('Lazy mode', () => {
+    const rootZone = Zone.root;
+    const noop = function() {};
+    const normal = function() {
+      for (let i = 0; i < 10000; i++) {
+        let j = i * i;
+      }
+    };
+    const times = 100000;
+    describe('root zone performance benchmark', () => {
+      it('noop function', () => {
+        const normal = 'rootZone normal noop';
+        mark(normal);
+        for (let i = 0; i < times; i++) {
+          rootZone.run(noop);
+        }
+        performanceMeasure(normal, normal);
+        const normalEntries = getEntriesByName(normal);
+        const normalDuration = normalEntries[0].duration;
+        const normalAverage = normalDuration / times;
+        console.log(`${normal} ${times} times cost: ${normalDuration}, ${normalAverage} average`);
+        const lazy = 'rootZone lazy noop';
+        mark(lazy);
+        (Zone as any)._mode = 'lazy';
+        for (let i = 0; i < 100000; i++) {
+          rootZone.run(noop);
+        }
+        performanceMeasure(lazy, lazy);
+        const lazyEntries = getEntriesByName(lazy);
+        const lazyDuration = lazyEntries[0].duration;
+        const lazyAverage = lazyDuration / times;
+        console.log(`${lazy} ${times} times cost: ${lazyDuration}, ${lazyAverage}`);
+        (Zone as any)._mode = 'normal';
+        const diff = lazyDuration - normalDuration;
+        const diffAverage = diff / times;
+        console.log(`diff running ${times} times is: ${diff}, average is ${diffAverage}`);
+      });
+    });
+  });
+});

test/browser_entry_point.ts

@@ -27,3 +27,4 @@ import './browser/Worker.spec';
 import './mocha-patch.spec';
 import './jasmine-patch.spec';
 import './extra/cordova.spec';
+import './browser/performance.spec';