fix(xhr): fix#1072, should set scheduled flag to target (#1074)

Author: JiaLiPassion

file-size-limit.json

@@ -3,7 +3,7 @@
  {
 "path": "dist/zone.min.js",
 "checkTarget": true,
-"limit": 41500
+"limit": 41600
  }
  ]
 }

lib/browser/browser.ts

@@ -96,6 +96,7 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 constXHR_LISTENER=zoneSymbol('xhrListener');
 constXHR_SCHEDULED=zoneSymbol('xhrScheduled');
 constXHR_URL=zoneSymbol('xhrURL');
+constXHR_ERROR_BEFORE_SCHEDULED=zoneSymbol('xhrErrorBeforeScheduled');
 
 interfaceXHROptionsextendsTaskData{
 target: any;
@@ -126,9 +127,10 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 constSCHEDULED='scheduled';
 
 functionscheduleTask(task: Task){
-(XMLHttpRequestasany)[XHR_SCHEDULED]=false;
 constdata=<XHROptions>task.data;
 consttarget=data.target;
+target[XHR_SCHEDULED]=false;
+target[XHR_ERROR_BEFORE_SCHEDULED]=false;
 // remove existing event listener
 constlistener=target[XHR_LISTENER];
 if(!oriAddListener){
@@ -143,7 +145,7 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 if(target.readyState===target.DONE){
 // sometimes on some browsers XMLHttpRequest will fire onreadystatechange with
 // readyState=4 multiple times, so we need to check task state here
-if(!data.aborted&&(XMLHttpRequestasany)[XHR_SCHEDULED]&&task.state===SCHEDULED){
+if(!data.aborted&&target[XHR_SCHEDULED]&&task.state===SCHEDULED){
 // check whether the xhr has registered onload listener
 // if that is the case, the task should invoke after all
 // onload listeners finish.
@@ -167,6 +169,9 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 }else{
 task.invoke();
 }
+}elseif(!data.aborted&&target[XHR_SCHEDULED]===false){
+// error occurs when xhr.send()
+target[XHR_ERROR_BEFORE_SCHEDULED]=true;
 }
 }
 };
@@ -177,7 +182,7 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 target[XHR_TASK]=task;
 }
 sendNative!.apply(target,data.args);
-(XMLHttpRequestasany)[XHR_SCHEDULED]=true;
+target[XHR_SCHEDULED]=true;
 returntask;
 }
 
@@ -215,8 +220,15 @@ Zone.__load_patch('XHR', (global: any, Zone: ZoneType) => {
 }else{
 constoptions: XHROptions=
 {target: self,url: self[XHR_URL],isPeriodic: false,args: args,aborted: false};
-returnscheduleMacroTaskWithCurrentZone(
+consttask=scheduleMacroTaskWithCurrentZone(
 XMLHTTPREQUEST_SOURCE,placeholderCallback,options,scheduleTask,clearTask);
+if(self&&self[XHR_ERROR_BEFORE_SCHEDULED]===true&&!options.aborted&&
+task.state===SCHEDULED){
+// xhr request throw error when send
+// we should invoke task instead of leaving a scheduled
+// pending macroTask
+task.invoke();
+}
 }
 });
 

test/browser/XMLHttpRequest.spec.ts

@@ -266,6 +266,79 @@ describe('XMLHttpRequest', function() {
 });
 });
 
+it('should trigger readystatechange if xhr request trigger cors error',(done)=>{
+constreq=newXMLHttpRequest();
+leterr: any=null;
+try{
+req.open('get','file:///test',true);
+}catch(err){
+// in IE, open will throw Access is denied error
+done();
+return;
+}
+req.addEventListener('readystatechange',function(ev){
+if(req.readyState===4){
+constxhrScheduled=(reqasany)['__zone_symbol__xhrScheduled'];
+consttask=(reqasany)['__zone_symbol__xhrTask'];
+if(xhrScheduled===false){
+expect(task.state).toEqual('scheduling');
+setTimeout(()=>{
+if(err){
+expect(task.state).toEqual('unknown');
+}else{
+expect(task.state).toEqual('notScheduled');
+}
+done();
+});
+}else{
+expect(task.state).toEqual('scheduled');
+done();
+}
+}
+});
+try{
+req.send();
+}catch(error){
+err=error;
+}
+});
+
+it('should invoke task if xhr request trigger cors error',(done)=>{
+constlogs: string[]=[];
+constzone=Zone.current.fork({
+name: 'xhr',
+onHasTask: (delegate: ZoneDelegate,curr: Zone,target: Zone,hasTask: HasTaskState)=>{
+logs.push(JSON.stringify(hasTask));
+}
+});
+constreq=newXMLHttpRequest();
+try{
+req.open('get','file:///test',true);
+}catch(err){
+// in IE, open will throw Access is denied error
+done();
+return;
+}
+zone.run(()=>{
+letisError=false;
+lettimerId=null;
+try{
+timerId=(windowasany)['__zone_symbol__setTimeout'](()=>{
+expect(logs).toEqual([
+`{"microTask":false,"macroTask":true,"eventTask":false,"change":"macroTask"}`,
+`{"microTask":false,"macroTask":false,"eventTask":false,"change":"macroTask"}`
+]);
+done();
+},500);
+req.send();
+}catch(error){
+isError=true;
+(windowasany)['__zone_symbol__clearTimeout'](timerId);
+done();
+}
+});
+});
+
 it('should not throw error when get XMLHttpRequest.prototype.onreadystatechange the first time',
 function(){
 constfunc=function(){