LT-67; OHIF-78: Merging server configuration and CINE dialog changes from downstream (Ascend)

Packages/worklist/server/services/dimse/instances.js

@@ -1,68 +1,66 @@
-/**
- * Parses data returned from a study search and transforms it into
- * an array of series that are present in the study
- *
- * @param resultData
- * @returns {Array} Series List
- */
-function resultDataToStudyMetadata(resultData) {
-    var seriesMap = {};
-    var seriesList = [];
-
-    resultData.forEach(function(instanceRaw) {
-        var instance = instanceRaw.toObject();
-        // Use seriesMap to cache series data
-        // If the series instance UID has already been used to
-        // process series data, continue using that series
-        var seriesInstanceUid = instance[0x0020000E];
-        var series = seriesMap[seriesInstanceUid];
-
-        // If no series data exists in the seriesMap cache variable,
-        // process any available series data
-        if (!series) {
-            series = {
-                seriesInstanceUid: seriesInstanceUid,
-                seriesNumber: instance[0x00200011],
-                instances: []
-            };
-
-            // Save this data in the seriesMap cache variable
-            seriesMap[seriesInstanceUid] = series;
-            seriesList.push(series);
-        }
-
-        // TODO: [custom-servers] Check which peer it should point to
-        var server = Meteor.settings.servers.dimse[0].peers[0];
-        var host = Meteor.settings.servers.dimse.host,
-            port = Meteor.settings.servers.dimse.port;
-
-        var serverRoot = host + ':' + port;
-
-        var sopInstanceUid = instance[0x00080018];
-        var uri = serverRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1';
-
-        // Add this instance to the current series
-        series.instances.push({
-            sopClassUid: instance[0x00080016],
-            sopInstanceUid: sopInstanceUid,
-            uri: uri,
-            instanceNumber: instance[0x00200013]
-        });
-    });
-    return seriesList;
-}
-
-/**
- * Retrieve a set of instances using a DIMSE call
- * @param studyInstanceUid
- * @returns {{wadoUriRoot: String, studyInstanceUid: String, seriesList: Array}}
- */
-Services.DIMSE.Instances = function(studyInstanceUid) {
-    //var url = buildUrl(server, studyInstanceUid);
-    var result = DIMSE.retrieveInstances(studyInstanceUid);
-
-    return {
-        studyInstanceUid: studyInstanceUid,
-        seriesList: resultDataToStudyMetadata(result)
-    };
-};
+/**
+ * Parses data returned from a study search and transforms it into
+ * an array of series that are present in the study
+ *
+ * @param resultData
+ * @returns {Array} Series List
+ */
+function resultDataToStudyMetadata(resultData) {
+    var seriesMap = {};
+    var seriesList = [];
+
+    resultData.forEach(function(instanceRaw) {
+        var instance = instanceRaw.toObject();
+        // Use seriesMap to cache series data
+        // If the series instance UID has already been used to
+        // process series data, continue using that series
+        var seriesInstanceUid = instance[0x0020000E];
+        var series = seriesMap[seriesInstanceUid];
+
+        // If no series data exists in the seriesMap cache variable,
+        // process any available series data
+        if (!series) {
+            series = {
+                seriesInstanceUid: seriesInstanceUid,
+                seriesNumber: instance[0x00200011],
+                instances: []
+            };
+
+            // Save this data in the seriesMap cache variable
+            seriesMap[seriesInstanceUid] = series;
+            seriesList.push(series);
+        }
+
+        // TODO: Check which peer it should point to
+        var server = getCurrentServer().peers[0];
+
+        var serverRoot = server.host + ':' + server.port;
+
+        var sopInstanceUid = instance[0x00080018];
+        var uri = serverRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1';
+
+        // Add this instance to the current series
+        series.instances.push({
+            sopClassUid: instance[0x00080016],
+            sopInstanceUid: sopInstanceUid,
+            uri: uri,
+            instanceNumber: instance[0x00200013]
+        });
+    });
+    return seriesList;
+}
+
+/**
+ * Retrieve a set of instances using a DIMSE call
+ * @param studyInstanceUid
+ * @returns {{wadoUriRoot: String, studyInstanceUid: String, seriesList: Array}}
+ */
+Services.DIMSE.Instances = function(studyInstanceUid) {
+    //var url = buildUrl(server, studyInstanceUid);
+    var result = DIMSE.retrieveInstances(studyInstanceUid);
+
+    return {
+        studyInstanceUid: studyInstanceUid,
+        seriesList: resultDataToStudyMetadata(result)
+    };
+};

Packages/worklist/server/services/dimse/retrieveMetadata.js

@@ -110,8 +110,8 @@ function resultDataToStudyMetadata(studyInstanceUid, resultData) {
         };
 
         // Retrieve the actual data over WADO-URI
-        var server = Meteor.settings.servers.dicomWeb[0];
-        instanceSummary.wadouri = WADOProxy.convertURL(server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + "&contentType=application%2Fdicom", server.requestOptions);
+        var server = getCurrentServer();
+        instanceSummary.wadouri = WADOProxy.convertURL(server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + '&contentType=application%2Fdicom', server.requestOptions);
 
         series.instances.push(instanceSummary);
     });
@@ -127,8 +127,8 @@ function resultDataToStudyMetadata(studyInstanceUid, resultData) {
  * @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
  */
 Services.DIMSE.RetrieveMetadata = function(studyInstanceUid) {
-    // TODO: Find active server
-    const activeServer = Meteor.settings.servers.dimse[0].peers[0];
+    // TODO: Check which peer it should point to
+    const activeServer = getCurrentServer().peers[0];
     const supportsInstanceRetrievalByStudyUid = activeServer.supportsInstanceRetrievalByStudyUid;
     let results;
 

Packages/worklist/server/services/dimse/setup.js

@@ -0,0 +1,38 @@
+import { Meteor } from 'meteor/meteor';
+
+const setupDIMSE = () => {
+    // Terminate existing DIMSE servers and sockets and clean up the connection object
+    DIMSE.connection.reset();
+
+    // Get the new server configuration
+    const server = getCurrentServer();
+
+    // Stop here if the new server is not of DIMSE type
+    if (server.type !== 'dimse') {
+        return;
+    }
+
+    // Check if peers were defined in the server configuration and throw an error if not
+    const peers = server.peers;
+    if (!peers || !peers.length) {
+        console.error('dimse-config: ' + 'No DIMSE Peers provided.');
+        throw new Meteor.Error('dimse-config', 'No DIMSE Peers provided.');
+    }
+
+    // Add all the DIMSE peers, establishing the connections
+    console.log('Adding DIMSE peers');
+    try {
+        peers.forEach(peer => DIMSE.connection.addPeer(peer));
+    } catch(error) {
+        console.error('dimse-addPeers: ' + error);
+        throw new Meteor.Error('dimse-addPeers', error);
+    }
+};
+
+// Setup the DIMSE connections on startup or when the current server is changed
+Meteor.startup(() => {
+    CurrentServer.find().observe({
+        added: setupDIMSE,
+        changed: setupDIMSE
+    });
+});