Replaced the tar file request with cod request

Author: Adithyan-Dinesh-Trenser

packages/dicomImageLoader/package.json

@@ -67,6 +67,7 @@
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.5",
     "@cornerstonejs/core": "^1.41.0",
+    "cod-dicomweb-server": "^1.3.4",
     "dicom-parser": "^1.8.9",
     "jszip": "^3.10.1",
     "pako": "^2.0.4",

packages/dicomImageLoader/src/imageLoader/internal/codWebServer.ts

@@ -0,0 +1,11 @@
+import type { CodDicomWebServer } from 'cod-dicomweb-server';
+
+let codWebServer: CodDicomWebServer;
+
+export function setWadoRsWebServer(webServer: CodDicomWebServer) {
+  codWebServer = webServer;
+}
+
+export function getWadoRsWebServer(): CodDicomWebServer {
+  return codWebServer;
+}

packages/dicomImageLoader/src/imageLoader/internal/loadTarRequest.ts

@@ -0,0 +1,54 @@
+import { Enums, metaData } from '@cornerstonejs/core';
+import { FetchType } from 'cod-dicomweb-server';
+
+import { getWadoRsWebServer } from '../internal/codWebServer';
+import { getOptions } from '../internal/options';
+import type { CornerstoneWadoRsLoaderOptions } from '../wadors/loadImage';
+
+export default function codRequest(
+  url: string,
+  imageId: string,
+  defaultHeaders: Record<string, string> = {},
+  options: CornerstoneWadoRsLoaderOptions = {}
+): Promise<{
+  contentType: string;
+  pixelData: Uint8Array;
+  imageQualityStatus: Enums.ImageQualityStatus;
+  percentComplete: number;
+}> {
+  const instance = metaData.get('instance', imageId) || {};
+  const {
+    DeidStudyInstanceUID,
+    DeidSeriesInstanceUID,
+    DeidSopInstanceUID,
+    TransferSyntaxUID,
+  } = instance;
+
+  const deidReplacedUrl = url.replace(
+    /\/studies\/[^/]+\/series\/[^/]+\/instances\/[^/]+\/frames\//,
+    `/studies/${DeidStudyInstanceUID}/series/${DeidSeriesInstanceUID}/instances/${DeidSopInstanceUID}/frames/`
+  );
+
+  // @ts-ignore
+  const headers = getOptions()?.beforeSend() || {};
+  const webServer = getWadoRsWebServer();
+
+  return webServer
+    .fetchCod(
+      deidReplacedUrl,
+      { ...defaultHeaders, ...headers },
+      {
+        useSharedArrayBuffer: false,
+        fetchType: FetchType.API_OPTIMIZED,
+      }
+    )
+    .then((result) => ({
+      contentType: `transfer-syntax=${TransferSyntaxUID}`,
+      imageQualityStatus: Enums.ImageQualityStatus.FULL_RESOLUTION,
+      pixelData: new Uint8Array(result as ArrayBufferLike),
+      percentComplete: 100,
+    }))
+    .catch((error) => {
+      throw error;
+    });
+}

packages/dicomImageLoader/src/imageLoader/internal/tarRequest.ts

@@ -2,11 +2,11 @@ import { xhrRequest } from '../internal/index';
 // import rangeRequest from '../internal/rangeRequest';
 import streamRequest from '../internal/streamRequest';
 import rangeRequest from '../internal/rangeRequest';
-import tarRequest from '../internal/tarRequest';
 import extractMultipart from './extractMultipart';
 import { getImageQualityStatus } from './getImageQualityStatus';
 import { CornerstoneWadoRsLoaderOptions } from './loadImage';
 import { RangeRetrieveOptions } from 'core/dist/types/types';
+import codRequest from './codRequest';
 
 function getPixelData(
   uri: string,
@@ -38,6 +38,11 @@ function getPixelData(
     options.streamingData = { url };
   }
 
+  // Use the cod loader only when image scheme is cod:
+  if (imageId.startsWith('cod:')) {
+    return codRequest(url, imageId, headers);
+  }
+
   if ((retrieveOptions as RangeRetrieveOptions).rangeIndex !== undefined) {
     return rangeRequest(url, imageId, headers, options);
   }
@@ -47,12 +52,6 @@ function getPixelData(
     return streamRequest(url, imageId, headers, options);
   }
 
-  // Use the tar loader for dicomtar sceme
-  if (imageId.includes('dicomtar')) {
-    const url = imageId.split('dicomtar:')[1];
-    return tarRequest(url, imageId, headers);
-  }
-
   /**
    * Not progressively rendering, use regular xhr request.
    */

packages/dicomImageLoader/src/imageLoader/wadors/codRequest.ts

@@ -11,7 +11,6 @@ import getPixelData from './getPixelData';
 import metaDataManager from './metaDataManager';
 import loadImage from './loadImage';
 import register from './register';
-import tarFileManager from './tarFileManager';
 
 const metaData = {
   getNumberString,
@@ -28,5 +27,4 @@ export default {
   loadImage,
   metaDataManager,
   register,
-  tarFileManager,
 };

packages/dicomImageLoader/src/imageLoader/wadors/getPixelData.ts

@@ -198,7 +198,7 @@ function loadImage(
   const additionalDetails = options.additionalDetails || { imageId };
   const priority = options.priority === undefined ? 5 : options.priority;
   const addToBeginning = options.addToBeginning || false;
-  const uri = imageId.substring(7);
+  const uri = imageId.substring(imageId.indexOf(':') + 1);
 
   imageRetrievalPool.addRequest(
     sendXHR.bind(this, uri, imageId, mediaType),