fix: Use correct external URL for rendered responses with relative URI (#4236)

extensions/default/src/DicomWebDataSource/utils/fixBulkDataURI.ts

@@ -20,16 +20,23 @@ function fixBulkDataURI(value, instance, dicomWebConfig) {
   // in case of the relative path, make it absolute. The current DICOM standard says
   // the bulkdataURI is relative to the series. However, there are situations where
   // it can be relative to the study too
-  if (!value.BulkDataURI.startsWith('http') && !value.BulkDataURI.startsWith('/')) {
-    if (dicomWebConfig.bulkDataURI?.relativeResolution === 'studies') {
-      value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${instance.StudyInstanceUID}/${value.BulkDataURI}`;
+  const { BulkDataURI } = value;
+  if (!BulkDataURI.startsWith('http') && !value.BulkDataURI.startsWith('/')) {
+    const { StudyInstanceUID, SeriesInstanceUID } = instance;
+    const isInstanceStart = BulkDataURI.startsWith('instances/') || BulkDataURI.startsWith('../');
+    if (
+      BulkDataURI.startsWith('series/') ||
+      BulkDataURI.startsWith('bulkdata/') ||
+      (dicomWebConfig.bulkDataURI?.relativeResolution === 'studies' && isInstanceStart)
+    ) {
+      value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${StudyInstanceUID}/${BulkDataURI}`;
     } else if (
+      isInstanceStart ||
       dicomWebConfig.bulkDataURI?.relativeResolution === 'series' ||
       !dicomWebConfig.bulkDataURI?.relativeResolution
     ) {
-      value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${instance.StudyInstanceUID}/series/${instance.SeriesInstanceUID}/${value.BulkDataURI}`;
+      value.BulkDataURI = `${dicomWebConfig.wadoRoot}/studies/${StudyInstanceUID}/series/${SeriesInstanceUID}/${BulkDataURI}`;
     }
-
     return;
   }
 
@@ -39,11 +46,11 @@ function fixBulkDataURI(value, instance, dicomWebConfig) {
   // uri (e.g., bulkData: /bulk/1e, wado root: http://myserver.com/dicomweb, output: http://myserver.com/bulk/1e)
   // and in case of relative wado root, we need to prepend the bulkdata uri to the wado root (e.g,. bulkData: /bulk/1e
   // wado root: /dicomweb, output: /bulk/1e)
-  if (value.BulkDataURI[0] === '/') {
+  if (BulkDataURI[0] === '/') {
     if (dicomWebConfig.wadoRoot.startsWith('http')) {
       // Absolute wado root
       const url = new URL(dicomWebConfig.wadoRoot);
-      value.BulkDataURI = `${url.origin}${value.BulkDataURI}`;
+      value.BulkDataURI = `${url.origin}${BulkDataURI}`;
     } else {
       // Relative wado root, we don't need to do anything, bulkdata uri is already correct
     }