CR Updates

Author: igoroctaviano

src/api.js

@@ -30,7 +30,7 @@ const MEDIATYPES = {
  * A callback with the request instance and metadata information
  * of the currently request being executed that should necessarily
  * return the given request optionally modified.
- * @typedef {function} RequestInterceptor
+ * @typedef {function} RequestHook
  * @param {XMLHttpRequest} request - The original XMLHttpRequest instance.
  * @param {object} metadata - The metadata used by the request.
  */
@@ -46,7 +46,7 @@ class DICOMwebClient {
    * @param {String} options.username - Username
    * @param {String} options.password - Password
    * @param {Object} options.headers - HTTP headers
-   * @param {Array.<RequestInterceptor>} options.requestInterceptors - Request interceptors.
+   * @param {Array.<RequestHook>} options.requestHooks - Request hooks.
    */
   constructor(options) {
     this.baseURL = options.url;
@@ -85,8 +85,8 @@ class DICOMwebClient {
       this.stowURL = this.baseURL;
     }
 
-    if ("requestInterceptors" in options) {
-      this.requestInterceptors = options.requestInterceptors;
+    if ("requestHooks" in options) {
+      this.requestHooks = options.requestHooks;
     }
 
     // Headers to pass to requests.
@@ -114,13 +114,13 @@ class DICOMwebClient {
    * @param {String} method
    * @param {Object} headers
    * @param {Object} options
-   * @param {Array.<RequestInterceptor>} options.requestInterceptors - Request interceptors.
+   * @param {Array.<RequestHook>} options.requestHooks - Request hooks.
    * @return {*}
    * @private
    */
   _httpRequest(url, method, headers, options = {}) {
 
-    const { errorInterceptor, requestInterceptors } = this;
+    const { errorInterceptor, requestHooks } = this;
 
     return new Promise((resolve, reject) => {
       let request = new XMLHttpRequest();
@@ -186,11 +186,10 @@ class DICOMwebClient {
         }
       }
 
-      if (requestInterceptors) { 
-        console.debug('yes')
+      if (requestHooks) { 
         const metadata = { method, url };
-        const pipeRequestInterceptors = functions => (args) => functions.reduce((args, fn) => fn(args, metadata), args);
-        const pipedRequest = pipeRequestInterceptors(requestInterceptors);
+        const pipeRequstHooks = functions => (args) => functions.reduce((args, fn) => fn(args, metadata), args);
+        const pipedRequest = pipeRequstHooks(requestHooks);
         request = pipedRequest(request);
       }
 

test/test.js

@@ -147,20 +147,20 @@ describe('dicomweb.api.DICOMwebClient', function() {
     expect(bulkData[0] instanceof ArrayBuffer).toBe(true);
   }, 15000);
 
-  describe('Request interceptors', function() {
-    let requestInterceptor1Spy, requestInterceptor2Spy;
+  describe('Request hooks', function() {
+    let requestHook1Spy, requestHook2Spy;
 
     beforeAll(function() {
-      requestInterceptor1Spy = createSpy('requestInterceptor1Spy').and.callFake((request, metadata) => request);
-      requestInterceptor2Spy = createSpy('requestInterceptor2Spy').and.callFake((request, metadata) => request);
+      requestHook1Spy = createSpy('requestHook1Spy').and.callFake((request, metadata) => request);
+      requestHook2Spy = createSpy('requestHook2Spy').and.callFake((request, metadata) => request);
     });
 
-    it('request interceptors should be called', async function() {
+    it('request hooks should be called', async function() {
       const url = 'http://localhost:8008/dcm4chee-arc/aets/DCM4CHEE/rs';
       const metadataUrl = 'http://localhost:8008/dcm4chee-arc/aets/DCM4CHEE/rs/studies/999.999.3859744/series/999.999.94827453/instances/999.999.133.1996.1.1800.1.6.25/metadata';
       const dwc = new DICOMwebClient.api.DICOMwebClient({ 
         url, 
-        requestInterceptors: [requestInterceptor1Spy, requestInterceptor2Spy] 
+        requestHooks: [requestHook1Spy, requestHook2Spy] 
       });
       const metadata = { url: metadataUrl, method: 'get' };
       const request = new XMLHttpRequest();
@@ -170,8 +170,8 @@ describe('dicomweb.api.DICOMwebClient', function() {
         seriesInstanceUID: '999.999.94827453',
         sopInstanceUID: '999.999.133.1996.1.1800.1.6.25',
       });
-      expect(requestInterceptor1Spy).toHaveBeenCalledWith(request, metadata);
-      expect(requestInterceptor2Spy).toHaveBeenCalledWith(request, metadata);
+      expect(requestHook1Spy).toHaveBeenCalledWith(request, metadata);
+      expect(requestHook2Spy).toHaveBeenCalledWith(request, metadata);
     });
   });
 });