Extract hook and add config and documentation

This commit is contained in:
igoroctaviano committed 2021-05-13 09:06:11 -03:00
1 parent 35aaad175c
commit 2ea227ca06
13 files changed
+119 -64

No files matched your search

@@ -2,6 +2,7 @@ import { api } from 'dicomweb-client';
import DICOMWeb from '../../../DICOMWeb/';
import errorHandler from '../../../errorHandler';
import getXHRRetryRequestHook from '../../../utils/xhrRetryRequestHook';
/**
* Creates a QIDO date string for a date range query
@@ -118,6 +119,7 @@ export default function Studies(server, filter) {
url: server.qidoRoot,
headers: DICOMWeb.getAuthorizationHeader(server),
errorInterceptor: errorHandler.getHTTPErrorHandler(),
requestHooks: [getXHRRetryRequestHook()],
};
const dicomWeb = new api.DICOMwebClient(config);
@@ -1,6 +1,5 @@
import { api } from 'dicomweb-client';
import dcmjs from 'dcmjs';
import retry, { operation } from 'retry';
import DICOMWeb from '../../../DICOMWeb/';
import RetrieveMetadataLoader from './retrieveMetadataLoader';
import { sortStudySeries, sortingCriteria } from '../../sortStudy';
@@ -11,6 +10,7 @@ import {
} from './studyInstanceHelpers';
import errorHandler from '../../../errorHandler';
import { getXHRRetryRequestHook } from '../../../utils/xhrRetryRequestHook';
const { naturalizeDataset } = dcmjs.data.DicomMetaDictionary;
@@ -77,42 +77,7 @@ export default class RetrieveMetadataLoaderAsync extends RetrieveMetadataLoader
url: server.qidoRoot,
headers: DICOMWeb.getAuthorizationHeader(server),
errorInterceptor: errorHandler.getHTTPErrorHandler(),
requestHooks: [
(request, metadata) => {
function faultTolerantRequestSend(...args) {
const operation = retry.operation({
retries: 10,
});
/**
* retries: 5,
* factor: 3,
* minTimeout: 1 * 1000,
* maxTimeout: 60 * 1000,
* randomize: true
*/
operation.attempt(function(currentAttempt) {
const originalOnReadyStateChange = request.onreadystatechange;
request.onreadystatechange = function() {
originalOnReadyStateChange.call(request);
if (request.status === 429 || request.status >= 500) {
operation.retry(new Error('Attempt failed!'));
}
};
console.debug(`${metadata.url} (attempt: ${currentAttempt})`);
request.open(metadata.method, metadata.url, true);
originalRequestSend.call(request, ...args);
});
}
const originalRequestSend = request.send;
request.send = faultTolerantRequestSend;
return request;
},
],
requestHooks: [getXHRRetryRequestHook()],
});
this.client = client;
@@ -4,6 +4,7 @@ import { createStudyFromSOPInstanceList } from './studyInstanceHelpers';
import RetrieveMetadataLoader from './retrieveMetadataLoader';
import errorHandler from '../../../errorHandler';
import getXHRRetryRequestHook from '../../../utils/xhrRetryRequestHook';
/**
* Class for sync load of study metadata.
@@ -61,6 +62,7 @@ export default class RetrieveMetadataLoaderSync extends RetrieveMetadataLoader {
url: server.wadoRoot,
headers: DICOMWeb.getAuthorizationHeader(server),
errorInterceptor: errorHandler.getHTTPErrorHandler(),
requestHooks: [getXHRRetryRequestHook()],
});
this.client = client;