@ -1,25 +1,29 @@
import { HttpErrorReporterService } from '@abp/ng.core' ;
import { HttpErrorResponse } from '@angular/common/http' ;
import { inject , Injectable , Injector } from '@angular/core' ; import { inject , Injectable , Injector } from '@angular/core' ;
import { HttpErrorResponse } from '@angular/common/http' ;
import { Observable , of , throwError } from 'rxjs' ; import { Observable , of , throwError } from 'rxjs' ;
import { catchError , filter , switchMap } from 'rxjs/operators' ; import { catchError , filter , switchMap } from 'rxjs/operators' ;
import { HttpErrorReporterService } from '@abp/ng.core' ;
import { CustomHttpErrorHandlerService } from '../models/common' ; import { CustomHttpErrorHandlerService } from '../models/common' ;
import { Confirmation } from '../models/confirmation' ; import { Confirmation } from '../models/confirmation' ;
import { ConfirmationService } from '../services/confirmation.service' ;
import { CUSTOM_ERROR_HANDLERS , HTTP_ERROR_HANDLER } from '../tokens/http-error.token' ; import { CUSTOM_ERROR_HANDLERS , HTTP_ERROR_HANDLER } from '../tokens/http-error.token' ;
import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token' ;
import { DEFAULT_ERROR_LOCALIZATIONS , DEFAULT_ERROR_MESSAGES } from '../constants/default-errors' ; import { DEFAULT_ERROR_LOCALIZATIONS , DEFAULT_ERROR_MESSAGES } from '../constants/default-errors' ;
import { ConfirmationService } from '../services/confirmation.service' ;
import { RouterErrorHandlerService } from '../services/router-error-handler.service' ; import { RouterErrorHandlerService } from '../services/router-error-handler.service' ;
import { HTTP_ERROR_CONFIG } from '../tokens/http-error.token' ;
@Injectable ( { providedIn : 'root' } ) @Injectable ( { providedIn : 'root' } )
export class ErrorHandler { export class ErrorHandler {
private httpErrorReporter = inject ( HttpErrorReporterService ) ; protected readonly httpErrorReporter = inject ( HttpErrorReporterService ) ;
private confirmationService = inject ( ConfirmationService ) ; protected readonly confirmationService = inject ( ConfirmationService ) ;
private routerErrorHandlerService = inject ( RouterErrorHandlerService ) ; protected readonly routerErrorHandlerService = inject ( RouterErrorHandlerService ) ;
protected httpErrorConfig = inject ( HTTP_ERROR_CONFIG ) ; protected readonly httpErrorConfig = inject ( HTTP_ERROR_CONFIG ) ;
private customErrorHandlers = inject ( CUSTOM_ERROR_HANDLERS ) ; protected readonly customErrorHandlers = inject ( CUSTOM_ERROR_HANDLERS ) ;
private defaultHttpErrorHandler = ( _ , err : HttpErrorResponse ) = > throwError ( ( ) = > err ) ; protected readonly defaultHttpErrorHandler = ( _ , err : HttpErrorResponse ) = > throwError ( ( ) = > err ) ;
private httpErrorHandler = protected readonly httpErrorHandler =
inject ( HTTP_ERROR_HANDLER , { optional : true } ) || this . defaultHttpErrorHandler ; inject ( HTTP_ERROR_HANDLER , { optional : true } ) || this . defaultHttpErrorHandler ;
constructor ( protected injector : Injector ) { constructor ( protected injector : Injector ) {
@ -34,17 +38,14 @@ export class ErrorHandler {
protected listenToRestError() { protected listenToRestError() {
this . httpErrorReporter . reporter $ this . httpErrorReporter . reporter $
. pipe ( filter ( this . filterRestErrors ) , switchMap ( this . executeErrorHandler ) ) . pipe ( filter ( this . filterRestErrors ) , switchMap ( this . executeErrorHandler ) )
. subscribe ( err = > { . subscribe ( err = > this . handleError ( err ) ) ;
this . handleError ( err ) ;
} ) ;
} }
private executeErrorHandler = ( error : HttpErrorResponse ) = > { protected executeErrorHandler = ( error : HttpErrorResponse ) = > {
const errHandler = this . httpErrorHandler ( this . injector , error ) ; const errHandler = this . httpErrorHandler ( this . injector , error ) ;
const isObservable = errHandler instanceof Observable ; const isObservable = errHandler instanceof Observable ;
const response = isObservable ? errHandler : of ( null ) ;
return respons e . pipe ( return ( isObse rvabl e ? errHandler : of ( null ) ) . pipe (
catchError ( err = > { catchError ( err = > {
this . handleError ( err ) ; this . handleError ( err ) ;
return of ( null ) ; return of ( null ) ;
@ -59,16 +60,18 @@ export class ErrorHandler {
return ( b . priority || 0 ) - ( a . priority || 0 ) ; return ( b . priority || 0 ) - ( a . priority || 0 ) ;
} }
private handleError ( err : unknown ) { protected handleError ( err : unknown ) {
if ( this . customErrorHandlers && this . customErrorHandlers . length ) { if ( this . customErrorHandlers && this . customErrorHandlers . length ) {
const canHandleService = this . customErrorHandlers const canHandleService = this . customErrorHandlers
. sort ( this . sortHttpErrorHandlers ) . sort ( this . sortHttpErrorHandlers )
. find ( service = > service . canHandle ( err ) ) ; . find ( service = > service . canHandle ( err ) ) ;
if ( canHandleService ) { if ( canHandleService ) {
canHandleService . execute ( ) ; canHandleService . execute ( ) ;
return ; return ;
} }
} }
this . showError ( ) . subscribe ( ) ; this . showError ( ) . subscribe ( ) ;
} }
@ -90,10 +93,10 @@ export class ErrorHandler {
protected filterRestErrors = ( { status } : HttpErrorResponse ) : boolean = > { protected filterRestErrors = ( { status } : HttpErrorResponse ) : boolean = > {
if ( typeof status !== 'number' ) return false ; if ( typeof status !== 'number' ) return false ;
if ( ! this . httpErrorConfig . skipHandledErrorCodes ) { if ( ! this . httpErrorConfig || ! this . httpErrorConfig . skipHandledErrorCodes ) {
return true ; return true ;
} }
return this . httpErrorConfig . skipHandledErrorCodes . findIndex ( code = > code === status ) < 0 ; return this . httpErrorConfig . skipHandledErrorCodes ? . findIndex ( code = > code === status ) < 0 ;
} ; } ;
} }
maliming
3 years ago
GitHub