fix(bluebird): fix#1112, bluebird chained callback should return a Bluebird Promise (#1114)

Author: JiaLiPassion

file-size-limit.json

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

lib/common/promise.ts

@@ -476,11 +476,6 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 
 if(NativePromise){
 patchThen(NativePromise);
-
-/*let fetch = global['fetch'];
- if (typeof fetch == 'function') {
- global['fetch'] = zoneify(fetch);
- }*/
 }
 
 // This is not part of public API, but it is useful for tests, so we expose it.

lib/extra/bluebird.ts

@@ -25,8 +25,14 @@ Zone.__load_patch('bluebird', (global: any, Zone: ZoneType, api: _ZonePrivate) =
 args[i]=function(){
 constargSelf: any=this;
 constargArgs: any=arguments;
-zone.scheduleMicroTask('Promise.then',()=>{
-returnfunc.apply(argSelf,argArgs);
+returnnewBluebird((res: any,rej: any)=>{
+zone.scheduleMicroTask('Promise.then',()=>{
+try{
+res(func.apply(argSelf,argArgs));
+}catch(error){
+rej(error);
+}
+});
 });
 };
 }
@@ -35,6 +41,16 @@ Zone.__load_patch('bluebird', (global: any, Zone: ZoneType, api: _ZonePrivate) =
 });
 });
 
+Bluebird.onPossiblyUnhandledRejection(function(e: any,promise: any){
+try{
+Zone.current.runGuarded(()=>{
+throwe;
+});
+}catch(err){
+api.onUnhandledError(err);
+}
+});
+
 // override global promise
 global[api.symbol('ZoneAwarePromise')]=Bluebird;
 };

test/extra/bluebird.spec.ts

@@ -9,6 +9,10 @@
 // this spec will not be integrated with Travis CI, because I don't
 // want to add bluebird into devDependencies, you can run this spec
 // on your local environment
+process.on('unhandledRejection',(reason,p)=>{
+console.log('Unhandled Rejection at:',p,'reason:',reason);
+// application specific logging, throwing an error, or other logic here
+});
 
 describe('bluebird promise',()=>{
 letBluebirdPromise: any;
@@ -636,4 +640,156 @@ describe('bluebird promise', () => {
 });
 });
 });
+
+it('should be able to chain promise',(done: DoneFn)=>{
+Zone.current.fork({name: 'zone_A'}).run(()=>{
+newBluebirdPromise((resolve: any,reject: any)=>{
+expect(Zone.current.name).toEqual('zone_A');
+resolve(1);
+})
+.then((r: any)=>{
+expect(r).toBe(1);
+expect(Zone.current.name).toEqual('zone_A');
+returnPromise.resolve(2);
+})
+.then((r: any)=>{
+expect(r).toBe(2);
+expect(Zone.current.name).toEqual('zone_A');
+});
+});
+Zone.current.fork({name: 'zone_B'}).run(()=>{
+newBluebirdPromise((resolve: any,reject: any)=>{
+expect(Zone.current.name).toEqual('zone_B');
+reject(1);
+})
+.then(
+()=>{
+fail('should not be here.');
+},
+(r: any)=>{
+expect(r).toBe(1);
+expect(Zone.current.name).toEqual('zone_B');
+returnPromise.resolve(2);
+})
+.then((r: any)=>{
+expect(r).toBe(2);
+expect(Zone.current.name).toEqual('zone_B');
+done();
+});
+});
+});
+
+it('should catch rejected chained bluebird promise',(done: DoneFn)=>{
+constlogs: string[]=[];
+constzone=Zone.current.fork({
+name: 'testErrorHandling',
+onHandleError: function(){
+// should not get here
+logs.push('onHandleError');
+returntrue;
+}
+});
+
+zone.runGuarded(()=>{
+returnBluebirdPromise.resolve()
+.then(()=>{
+thrownewError('test error');
+})
+.catch(()=>{
+expect(logs).toEqual([]);
+done();
+});
+});
+});
+
+it('should catch rejected chained global promise',(done: DoneFn)=>{
+constlogs: string[]=[];
+constzone=Zone.current.fork({
+name: 'testErrorHandling',
+onHandleError: function(){
+// should not get here
+logs.push('onHandleError');
+returntrue;
+}
+});
+
+zone.runGuarded(()=>{
+returnPromise.resolve()
+.then(()=>{
+thrownewError('test error');
+})
+.catch(()=>{
+expect(logs).toEqual([]);
+done();
+});
+});
+});
+
+it('should catch rejected bluebird promise',(done: DoneFn)=>{
+constlogs: string[]=[];
+constzone=Zone.current.fork({
+name: 'testErrorHandling',
+onHandleError: function(){
+// should not get here
+logs.push('onHandleError');
+returntrue;
+}
+});
+
+zone.runGuarded(()=>{
+returnBluebirdPromise.reject().catch(()=>{
+expect(logs).toEqual([]);
+done();
+});
+});
+});
+
+it('should catch rejected global promise',(done: DoneFn)=>{
+constlogs: string[]=[];
+constzone=Zone.current.fork({
+name: 'testErrorHandling',
+onHandleError: function(){
+// should not get here
+logs.push('onHandleError');
+returntrue;
+}
+});
+
+zone.runGuarded(()=>{
+returnPromise.reject(newError('reject')).catch(()=>{
+expect(logs).toEqual([]);
+done();
+});
+});
+});
+
+it('should trigger onHandleError when unhandledRejection',(done: DoneFn)=>{
+constzone=Zone.current.fork({
+name: 'testErrorHandling',
+onHandleError: function(){
+setTimeout(done,100);
+returntrue;
+}
+});
+
+zone.runGuarded(()=>{
+returnPromise.reject(newError('reject'));
+});
+});
+
+it('should trigger onHandleError when unhandledRejection in chained Promise',(done: DoneFn)=>{
+constzone=Zone.current.fork({
+name: 'testErrorHandling',
+onHandleError: function(){
+setTimeout(done,100);
+returntrue;
+}
+});
+
+zone.runGuarded(()=>{
+returnPromise.resolve().then(()=>{
+thrownewError('test');
+});
+});
+});
 });