Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 42 additions & 16 deletions packages/devextreme-angular/src/http/ajax.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import {
HttpClient, HttpEventType, HttpParams, HttpEvent, HttpErrorResponse, HttpResponse,
} from '@angular/common/http';
import { throwError, Subject } from 'rxjs';
import { takeUntil, timeoutWith } from 'rxjs/operators';
import { Deferred, DeferredObj } from 'devextreme/core/utils/deferred';
import { isDefined } from 'devextreme/core/utils/type';
import { getWindow } from 'devextreme/core/utils/window';
Expand Down Expand Up @@ -33,6 +31,10 @@ interface XHRSurrogate {
statusText?: string;
}

interface SubscriptionLike {
unsubscribe: () => void;
}

const PARSER_ERROR = 'parsererror';
const SUCCESS = 'success';
const ERROR = 'error';
Expand Down Expand Up @@ -206,7 +208,9 @@ function getUploadCallbacks(options: Options, deferred: DeferredResult, xhrSurro
}

export const sendRequestFactory = (httpClient: HttpClient) => (options: Options) => {
const abort$ = new Subject<void>();
let subscription: SubscriptionLike | null = null;
let timeoutId: ReturnType<typeof setTimeout> | null = null;

const deferred: DeferredResult = Deferred();
const result = deferred.promise() as Result;
const isGet = isGetMethod(options);
Expand All @@ -216,13 +220,23 @@ export const sendRequestFactory = (httpClient: HttpClient) => (options: Options)
options.crossDomain = isCrossDomain(options.url);
options.cache = isCacheNeed(options);

const clearTimeoutIfSet = () => {
if (timeoutId !== null) {
clearTimeout(timeoutId);
timeoutId = null;
}
};

const headers = getRequestHeaders(options);
const xhrSurrogate: XHRSurrogate = {
type: 'XMLHttpRequestSurrogate',
aborted: false,
abort() {
this.aborted = true;
abort$.next();
clearTimeoutIfSet();
subscription?.unsubscribe();
subscription = null;
rejectIfAborted(deferred, this, () => options.upload?.onabort?.(this));
},
};

Expand Down Expand Up @@ -276,18 +290,30 @@ export const sendRequestFactory = (httpClient: HttpClient) => (options: Options)
},
);

const subscriptionCallbacks = upload
? getUploadCallbacks
: getRequestCallbacks;

request.pipe.apply(request, [
takeUntil(abort$) as any,
...options.timeout
? [timeoutWith(options.timeout, throwError({ statusText: TIMEOUT, status: 0, ok: false })) as any]
: [],
]).subscribe(
subscriptionCallbacks(options, deferred, xhrSurrogate),
);
if (options.timeout) {
timeoutId = setTimeout(() => {
timeoutId = null;
deferred.reject({ statusText: TIMEOUT, status: 0, ok: false });
subscription?.unsubscribe();
subscription = null;
}, options.timeout);
}

const callbacks = upload
? getUploadCallbacks(options, deferred, xhrSurrogate)
: getRequestCallbacks(options, deferred, xhrSurrogate);

subscription = request.subscribe({
next(value) {
clearTimeoutIfSet();
callbacks.next(value);
},
error(err) {
clearTimeoutIfSet();
callbacks.error(err);
},
complete: callbacks.complete,
});

return result;
};
Loading