fix: Tests had a couple of issues runnning

Author: wayfarer3130

dcm4chee-docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
   ldap:
     image: dcm4che/slapd-dcm4chee:2.4.44-13.3

src/api.js

@@ -223,7 +223,7 @@ class DICOMwebClient {
       let requestInstance = request.instance ? request.instance : new XMLHttpRequest();
 
       requestInstance.open(method, url, true);
-      if ('responseType' in request) {
+      if (request.responseType) {
         requestInstance.responseType = request.responseType;
       }
 
@@ -297,10 +297,8 @@ class DICOMwebClient {
       };
 
       // Event triggered while download progresses
-      if ('progressCallback' in request) {
-        if (typeof request.progressCallback === 'function') {
-          requestInstance.onprogress = request.progressCallback;
-        }
+      if (typeof request.progressCallback === 'function') {
+        requestInstance.onprogress = request.progressCallback;
       }
 
       if (requestHooks && areValidRequestHooks(requestHooks)) {
@@ -313,13 +311,11 @@ class DICOMwebClient {
       }
 
       // Add withCredentials to request if needed
-      if ('withCredentials' in request) {
-        if (request.withCredentials) {
-          requestInstance.withCredentials = true;
-        }
+      if (request.withCredentials) {
+        requestInstance.withCredentials = true;
       }
 
-      if ('data' in request) {
+      if (request.data) {
         requestInstance.send(request.data);
       } else {
         requestInstance.send();
@@ -596,6 +592,7 @@ class DICOMwebClient {
         'image/gif',
         'image/png',
         'image/jp2',
+        'image/*',
       ];
     } else {
       supportedMediaTypes = {
@@ -610,6 +607,7 @@ class DICOMwebClient {
         '1.2.840.10008.1.2.4.91': ['image/jp2'],
         '1.2.840.10008.1.2.4.92': ['image/jpx'],
         '1.2.840.10008.1.2.4.93': ['image/jpx'],
+        '*': ['image/*'],
       };
 
       if (byteRange) {
@@ -963,7 +961,7 @@ class DICOMwebClient {
     });
 
     if( !fieldValueParts.length ) {
-      throw new Error(`No acceptable media types found among ${JSON.stringify(mediaTypes)}`);
+      throw new Error(`No acceptable media types found among ${JSON.stringify(mediaTypes)} testing against ${JSON.stringify(acceptableMediaTypes)}`);
     }
 
     return fieldValueParts.join(', ');
@@ -1229,7 +1227,7 @@ class DICOMwebClient {
     debugLog(`retrieve metadata of instance ${options.sopInstanceUID}`);
     const url = `${this.wadoURL}/studies/${options.studyInstanceUID}/series/${options.seriesInstanceUID}/instances/${options.sopInstanceUID}/metadata`;
 
-    const request = getRequestOptions(options.request)
+    const request = getRequestOptions(options.request);
     return this._httpGetApplicationJson(url, {}, request);
   }
 
@@ -1278,6 +1276,7 @@ class DICOMwebClient {
     const { mediaTypes } = options;
 
     const request = getRequestOptions(options.request)
+    request.responseType = 'arraybuffer';
 
     if (!mediaTypes) {
       return this._httpGetMultipartApplicationOctetStream(
@@ -1319,7 +1318,6 @@ class DICOMwebClient {
           supportedMediaTypes,
         ),
       };
-      request.responseType = 'arraybuffer';
       return this._httpGet(url, headers, request);
     }
 

src/message.js

@@ -209,7 +209,7 @@ function addHeaders(destination, headerString) {
     }
     if (name === 'content-type') {
       const endSimpleType = value.indexOf(';');
-      contentType ||= value.substring(
+      contentType = value.substring(
         0,
         endSimpleType === -1 ? value.length : endSimpleType,
       );

test/test.js

@@ -24,6 +24,7 @@ let dwc = new DICOMwebClient.api.DICOMwebClient({
   url: 'http://localhost:8008/dcm4chee-arc/aets/DCM4CHEE/rs',
   retrieveRendered: false,
 });
+
 describe('dicomweb.api.DICOMwebClient', function() {
   //
   // Note: you can add the following for debugging tests locally
@@ -124,10 +125,17 @@ describe('dicomweb.api.DICOMwebClient', function() {
       sopInstanceUID:
         '1.3.6.1.4.1.14519.5.2.1.2744.7002.325971588264730726076978589153',
       frameNumbers: '1',
+      // The next line should work, but the server side is broken
+      // mediaTypes: [ {mediaType: 'image/*' }],
     };
 
-    const frames = dwc.retrieveInstance(options);
-  });
+    const frames = await dwc.retrieveInstanceFrames(options);
+    expect(frames instanceof Array).toBe(true);
+    expect(frames.length).toBe(1);
+    expect(frames[0].contentType).toBe("application/octet-stream");
+    // The next line is the correct value for servers supporting image/*
+    //expect(frames[0].transferSyntaxUID).toBe('1.2.3');
+  }, 15000);
 
   it('should retrieve a single instance', async function() {
     // from sample.dcm
@@ -173,10 +181,9 @@ describe('dicomweb.api.DICOMwebClient', function() {
     const options = {
       studyInstanceUID: '999.999.3859744',
       seriesInstanceUID: '999.999.94827453',
-      sopInstanceUID: '999.999.133.1996.1.1800.1.6.25',
     };
 
-    const metadata = await dwc.retrieveInstanceMetadata(options);
+    const metadata = await dwc.retrieveSeriesMetadata(options);
 
     // TODO: Check why metadata is an array of objects, not just an object
     const bulkDataOptions = {

test_ci.sh

@@ -1,5 +1,5 @@
 # Clear any previous data from the last test run
-rm -rf /tmp/dcm4chee-arc/db
+rm -rf ./tmp/dcm4chee-arc/db
 
 # now start dcm4chee archive and wait for it to startup
 echo 'Starting dcm4chee Docker container'