RED-3800: allow to skip path from server error interceptor

This commit is contained in:
Dan Percic 2022-06-02 15:37:09 +03:00
parent 4aad2e33ad
commit a814fc8aa7
3 changed files with 18 additions and 6 deletions

View File

@ -1,5 +1,5 @@
export * from './error.service'; export * from './error.service';
export * from './max-retries.token'; export * from './tokens';
export * from './server-error-interceptor'; export * from './server-error-interceptor';
export * from './full-page-error/full-page-error.component'; export * from './full-page-error/full-page-error.component';
export * from './connection-status/connection-status.component'; export * from './connection-status/connection-status.component';

View File

@ -2,7 +2,7 @@ import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest
import { Inject, Injectable, Optional } from '@angular/core'; import { Inject, Injectable, Optional } from '@angular/core';
import { MonoTypeOperatorFunction, Observable, retry, throwError, timer } from 'rxjs'; import { MonoTypeOperatorFunction, Observable, retry, throwError, timer } from 'rxjs';
import { catchError, tap } from 'rxjs/operators'; import { catchError, tap } from 'rxjs/operators';
import { MAX_RETRIES_ON_SERVER_ERROR } from './max-retries.token'; import { MAX_RETRIES_ON_SERVER_ERROR, SERVER_ERROR_SKIP_PATHS } from './tokens';
import { ErrorService } from './error.service'; import { ErrorService } from './error.service';
import { KeycloakService } from 'keycloak-angular'; import { KeycloakService } from 'keycloak-angular';
@ -14,12 +14,22 @@ function updateSeconds(seconds: number) {
} }
} }
function backoffOnServerError(maxRetries = 3): MonoTypeOperatorFunction<HttpEvent<unknown>> { function isNotServerError(error: HttpErrorResponse) {
return error.status < HttpStatusCode.InternalServerError && error.status !== 0;
}
function isPathSkipped(path: string, skippedPaths: string[]) {
const sanitized = path.replace('https://', '').replace('http://', '');
const pathWithoutHost = sanitized.split(/\/(.*)/s)[1];
return skippedPaths.some(skippedPath => pathWithoutHost === skippedPath);
}
function backoffOnServerError(maxRetries = 3, skippedPaths: string[] = []): MonoTypeOperatorFunction<HttpEvent<unknown>> {
let seconds = 0; let seconds = 0;
function delay(error: HttpErrorResponse) { function delay(error: HttpErrorResponse) {
seconds = updateSeconds(seconds); seconds = updateSeconds(seconds);
if (error.status < HttpStatusCode.InternalServerError && error.status !== 0) { if (isNotServerError(error) || (error.url && isPathSkipped(error.url, skippedPaths))) {
return throwError(() => error); return throwError(() => error);
} }
@ -39,6 +49,7 @@ export class ServerErrorInterceptor implements HttpInterceptor {
private readonly _errorService: ErrorService, private readonly _errorService: ErrorService,
private readonly _keycloakService: KeycloakService, private readonly _keycloakService: KeycloakService,
@Optional() @Inject(MAX_RETRIES_ON_SERVER_ERROR) private readonly _maxRetries: number, @Optional() @Inject(MAX_RETRIES_ON_SERVER_ERROR) private readonly _maxRetries: number,
@Optional() @Inject(SERVER_ERROR_SKIP_PATHS) private readonly _skippedPaths: string[],
) {} ) {}
intercept(req: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> { intercept(req: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
@ -50,14 +61,14 @@ export class ServerErrorInterceptor implements HttpInterceptor {
} }
// server error // server error
if (error.status >= HttpStatusCode.InternalServerError) { if (error.status >= HttpStatusCode.InternalServerError && error.url && !isPathSkipped(error.url, this._skippedPaths)) {
this._errorService.set(error); this._errorService.set(error);
this._urlsWithError.add(req.url); this._urlsWithError.add(req.url);
} }
return throwError(() => error); return throwError(() => error);
}), }),
backoffOnServerError(this._maxRetries || 3), backoffOnServerError(this._maxRetries, this._skippedPaths),
tap(() => { tap(() => {
if (this._urlsWithError.has(req.url)) { if (this._urlsWithError.has(req.url)) {
this._errorService.setOnline(); this._errorService.setOnline();

View File

@ -1,3 +1,4 @@
import { InjectionToken } from '@angular/core'; import { InjectionToken } from '@angular/core';
export const MAX_RETRIES_ON_SERVER_ERROR = new InjectionToken<number>('Number of retries before giving up'); export const MAX_RETRIES_ON_SERVER_ERROR = new InjectionToken<number>('Number of retries before giving up');
export const SERVER_ERROR_SKIP_PATHS = new InjectionToken<string[]>('A list of paths to skip when handling server errors');