fix(DicomWebDataSource): set correct cross-service URLs on DICOMweb clients

The dicomweb-client library sets qidoURL, wadoURL, and stowURL all to
the same base url when no prefixes are provided. This causes requests
to be routed to the wrong endpoint when qidoRoot and wadoRoot differ
(e.g. /qidors/ vs /wadors/).

After constructing the clients, assign the correct cross-service URLs
so each client can reach all three DICOMweb services. Also adds an
optional stowRoot config field for deployments with a separate STOW
endpoint.

Closes #5820

Signed-off-by: Agustin Bereciartua <bereciartua.agustin@gmail.com>

Author: galenzo17

extensions/default/src/DicomWebDataSource/index.test.ts

@@ -0,0 +1,112 @@
+/**
+ * Tests for the DICOMweb client URL construction fix.
+ *
+ * The dicomweb-client library sets qidoURL, wadoURL, stowURL all to the base
+ * `url` when no prefixes are provided. After construction, we must set the
+ * correct cross-service URLs on each client so that QIDO/WADO/STOW operations
+ * use the right endpoint.
+ *
+ * These tests validate the fix logic in isolation since the full
+ * createDicomWebApi function has deep transitive dependencies.
+ */
+
+class MockDICOMwebClient {
+  qidoURL: string;
+  wadoURL: string;
+  stowURL: string;
+
+  constructor(config: { url: string }) {
+    // Replicates dicomweb-client v0.10.4 behavior: all URLs default to base url
+    this.qidoURL = config.url;
+    this.wadoURL = config.url;
+    this.stowURL = config.url;
+  }
+}
+
+/**
+ * Applies the URL fix from index.ts lines ~211-219.
+ * Extracted here to test in isolation.
+ */
+function applyServiceUrls(
+  qidoClient: MockDICOMwebClient,
+  wadoClient: MockDICOMwebClient,
+  config: { qidoRoot: string; wadoRoot: string; stowRoot?: string }
+) {
+  const effectiveStowRoot = config.stowRoot || config.wadoRoot;
+
+  qidoClient.wadoURL = config.wadoRoot;
+  qidoClient.stowURL = effectiveStowRoot;
+
+  wadoClient.qidoURL = config.qidoRoot;
+  wadoClient.stowURL = effectiveStowRoot;
+}
+
+describe('DICOMweb client URL construction', () => {
+  it('should fix cross-service URLs when roots differ', () => {
+    const qidoClient = new MockDICOMwebClient({ url: 'https://server.com/qidors/org1' });
+    const wadoClient = new MockDICOMwebClient({ url: 'https://server.com/wadors/org1' });
+
+    // Before fix: each client has all URLs pointing to its own root
+    expect(qidoClient.wadoURL).toBe('https://server.com/qidors/org1');
+    expect(wadoClient.qidoURL).toBe('https://server.com/wadors/org1');
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/qidors/org1',
+      wadoRoot: 'https://server.com/wadors/org1',
+    });
+
+    // After fix: each client has correct cross-service URLs
+    expect(qidoClient.qidoURL).toBe('https://server.com/qidors/org1');
+    expect(qidoClient.wadoURL).toBe('https://server.com/wadors/org1');
+    expect(qidoClient.stowURL).toBe('https://server.com/wadors/org1');
+
+    expect(wadoClient.qidoURL).toBe('https://server.com/qidors/org1');
+    expect(wadoClient.wadoURL).toBe('https://server.com/wadors/org1');
+    expect(wadoClient.stowURL).toBe('https://server.com/wadors/org1');
+  });
+
+  it('should use explicit stowRoot when provided', () => {
+    const qidoClient = new MockDICOMwebClient({ url: 'https://server.com/qidors/org1' });
+    const wadoClient = new MockDICOMwebClient({ url: 'https://server.com/wadors/org1' });
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/qidors/org1',
+      wadoRoot: 'https://server.com/wadors/org1',
+      stowRoot: 'https://server.com/stowrs/org1',
+    });
+
+    expect(qidoClient.stowURL).toBe('https://server.com/stowrs/org1');
+    expect(wadoClient.stowURL).toBe('https://server.com/stowrs/org1');
+  });
+
+  it('should be a no-op when qidoRoot and wadoRoot are the same', () => {
+    const qidoClient = new MockDICOMwebClient({ url: 'https://server.com/dicomweb' });
+    const wadoClient = new MockDICOMwebClient({ url: 'https://server.com/dicomweb' });
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/dicomweb',
+      wadoRoot: 'https://server.com/dicomweb',
+    });
+
+    // All URLs should be the same (backward-compatible)
+    expect(qidoClient.qidoURL).toBe('https://server.com/dicomweb');
+    expect(qidoClient.wadoURL).toBe('https://server.com/dicomweb');
+    expect(qidoClient.stowURL).toBe('https://server.com/dicomweb');
+    expect(wadoClient.qidoURL).toBe('https://server.com/dicomweb');
+    expect(wadoClient.wadoURL).toBe('https://server.com/dicomweb');
+    expect(wadoClient.stowURL).toBe('https://server.com/dicomweb');
+  });
+
+  it('should default stowURL to wadoRoot when stowRoot is not provided', () => {
+    const qidoClient = new MockDICOMwebClient({ url: 'https://server.com/qidors' });
+    const wadoClient = new MockDICOMwebClient({ url: 'https://server.com/wadors' });
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/qidors',
+      wadoRoot: 'https://server.com/wadors',
+    });
+
+    expect(qidoClient.stowURL).toBe('https://server.com/wadors');
+    expect(wadoClient.stowURL).toBe('https://server.com/wadors');
+  });
+});

extensions/default/src/DicomWebDataSource/index.ts

@@ -35,6 +35,7 @@ export type DicomWebConfig = {
   /** Base URL to use for QIDO requests */
   qidoRoot?: string;
   wadoRoot?: string; // - Base URL to use for WADO requests
+  stowRoot?: string; // - Base URL to use for STOW requests (defaults to wadoRoot)
   wadoUri?: string; // - Base URL to use for WADO URI requests
   qidoSupportsIncludeField?: boolean; // - Whether QIDO supports the "Include" option to request additional fields in response
   imageRendering?: string; // - wadors | ? (unsure of where/how this is used)
@@ -207,6 +208,17 @@ function createDicomWebApi(dicomWebConfig: DicomWebConfig, servicesManager) {
       wadoDicomWebClient = dicomWebConfig.staticWado
         ? new StaticWadoClient(wadoConfig)
         : new api.DICOMwebClient(wadoConfig);
+
+      // Ensure each client has correct URLs for all DICOMweb services.
+      // Without this, each client uses its own base URL for ALL services,
+      // which breaks when QIDO/WADO/STOW have different endpoint paths.
+      const effectiveStowRoot = dicomWebConfig.stowRoot || dicomWebConfig.wadoRoot;
+
+      qidoDicomWebClient.wadoURL = dicomWebConfig.wadoRoot;
+      qidoDicomWebClient.stowURL = effectiveStowRoot;
+
+      wadoDicomWebClient.qidoURL = dicomWebConfig.qidoRoot;
+      wadoDicomWebClient.stowURL = effectiveStowRoot;
     },
     query: {
       studies: {