JSON server configuration launch

extensions/cornerstone/src/index.js

@@ -30,8 +30,13 @@ export default {
    * @param {object} [configuration={}]
    * @param {object|array} [configuration.csToolsConfig] - Passed directly to `initCornerstoneTools`
    */
-  preRegistration({ servicesManager, commandsManager, configuration = {} }) {
-    init({ servicesManager, commandsManager, configuration });
+  preRegistration({
+    servicesManager,
+    commandsManager,
+    appConfig,
+    configuration = {},
+  }) {
+    init({ servicesManager, commandsManager, appConfig, configuration });
   },
   getViewportModule({ servicesManager, commandsManager }) {
     const ExtendedOHIFCornerstoneViewport = props => {

extensions/cornerstone/src/init.js

@@ -62,6 +62,7 @@ const _createInternalToolsConfig = UIDialogService => {
 export default function init({
   servicesManager,
   commandsManager,
+  appConfig,
   configuration,
 }) {
   const {
@@ -276,7 +277,8 @@ export default function init({
 
   cs.metaData.addProvider(metadataProvider.get.bind(metadataProvider), 9999);
 
-  initWADOImageLoader(UserAuthenticationService);
+  const { imageLoaderAcceptHeader } = appConfig;
+  initWADOImageLoader(UserAuthenticationService, imageLoaderAcceptHeader);
 
   // ~~
   const defaultCsToolsConfig = csToolsConfig || {

extensions/cornerstone/src/initWADOImageLoader.js

@@ -24,7 +24,10 @@ function initWebWorkers() {
   }
 }
 
-export default function initWADOImageLoader(UserAuthenticationService) {
+export default function initWADOImageLoader(
+  UserAuthenticationService,
+  imageLoaderAcceptHeader = 'multipart/related; type=application/octet-stream'
+) {
   cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
   cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
 
@@ -38,8 +41,8 @@ export default function initWADOImageLoader(UserAuthenticationService) {
       // For now we use image/jls and image/x-jls because some servers still use the old type
       // http://dicom.nema.org/medical/dicom/current/output/html/part18.html
       const xhrRequestHeaders = {
-        // To prevent Preflight requests:
-        accept: 'multipart/related; type=application/octet-stream',
+        // Preflight requests disabled by default:
+        accept: imageLoaderAcceptHeader,
         //
         //accept: 'multipart/related; type="image/x-jls"',
         // 'multipart/related; type="image/x-jls", multipart/related; type="image/jls"; transfer-syntax="1.2.840.10008.1.2.4.80", multipart/related; type="image/x-jls", multipart/related; type="application/octet-stream"; transfer-syntax=*',

extensions/default/src/DicomWebProxyDataSource/index.js

@@ -0,0 +1,74 @@
+import { IWebApiDataSource } from '@ohif/core';
+import { createDicomWebApi } from '../DicomWebDataSource/index';
+
+function createDicomWebProxyApi(
+  dicomWebProxyConfig,
+  UserAuthenticationService
+) {
+  const { name } = dicomWebProxyConfig;
+  let dicomWebDelegate = undefined;
+
+  const implementation = {
+    initialize: async ({ params, query, url }) => {
+      let studyInstanceUIDs = [];
+
+      if (!url) url = query.get('url');
+
+      if (!url) {
+        console.error(`No url for '${name}'`);
+      } else {
+        const response = await fetch(url);
+        let data = await response.json();
+
+        // there seem to be a couple of variations of the case for this parameter
+        const queryStudyInstanceUIDs =
+          query.get('studyInstanceUIDs') || query.get('studyInstanceUids');
+        if (!queryStudyInstanceUIDs) {
+          console.error(`No studyInstanceUids in request for '${name}'`);
+        }
+        if (data.servers && queryStudyInstanceUIDs) {
+          dicomWebDelegate = createDicomWebApi(
+            data.servers.dicomWeb[0],
+            UserAuthenticationService
+          );
+          studyInstanceUIDs = queryStudyInstanceUIDs.split(';');
+        }
+      }
+      return studyInstanceUIDs;
+    },
+    query: {
+      studies: {
+        search: params => dicomWebDelegate.query.studies.search(params),
+      },
+      series: {
+        search: (...args) => dicomWebDelegate.query.series.search(...args),
+      },
+      instances: {
+        search: (studyInstanceUid, queryParameters) =>
+          dicomWebDelegate.query.instances.search(
+            studyInstanceUid,
+            queryParameters
+          ),
+      },
+    },
+    retrieve: {
+      directURL: (...args) => dicomWebDelegate.retrieve.directURL(...args),
+      series: {
+        metadata: (...args) =>
+          dicomWebDelegate.retrieve.series.metadata(...args),
+      },
+    },
+    store: {
+      dicom: (...args) => dicomWebDelegate.store(...args),
+    },
+    deleteStudyMetadataPromise: (...args) =>
+      dicomWebDelegate.deleteStudyMetadataPromise(...args),
+    getImageIdsForDisplaySet: (...args) =>
+      dicomWebDelegate.getImageIdsForDisplaySet(...args),
+    getImageIdsForInstance: (...args) =>
+      dicomWebDelegate.getImageIdsForInstance(...args),
+  };
+  return IWebApiDataSource.create(implementation);
+}
+
+export { createDicomWebProxyApi };

extensions/default/src/getDataSourcesModule.js

@@ -5,6 +5,7 @@
 import { createDicomWebApi } from './DicomWebDataSource/index.js';
 import { createDicomJSONApi } from './DicomJSONDataSource/index.js';
 import { createDicomLocalApi } from './DicomLocalDataSource/index.js';
+import { createDicomWebProxyApi } from './DicomWebProxyDataSource/index.js';
 
 /**
  *
@@ -16,6 +17,11 @@ function getDataSourcesModule() {
       type: 'webApi',
       createDataSource: createDicomWebApi,
     },
+    {
+      name: 'dicomwebproxy',
+      type: 'webApi',
+      createDataSource: createDicomWebProxyApi,
+    },
     {
       name: 'dicomjson',
       type: 'jsonApi',

platform/viewer/public/config/default.js

@@ -5,6 +5,8 @@ window.config = {
   modes: [],
   showStudyList: true,
   // filterQueryParam: false,
+  // enable imageLoaderAcceptHeader configuration to force a reconfiguration of WADOImageLoader to support preflight request
+  // imageLoaderAcceptHeader: 'multipart/related; type="application/octet-stream"',
   dataSources: [
     {
       friendlyName: 'dcmjs DICOMWeb Server',
@@ -24,6 +26,14 @@ window.config = {
         supportsWildcard: true,
       },
     },
+    {
+      friendlyName: 'dicomweb delegating proxy',
+      namespace: '@ohif/extension-default.dataSourcesModule.dicomwebproxy',
+      sourceName: 'dicomwebproxy',
+      configuration: {
+        name: 'dicomwebproxy',
+      },
+    },
     {
       friendlyName: 'dicom json',
       namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',