@radicalimaging/static-wado-creator 1.6.10 → 1.6.11

package/lib/operation/getEncapsulatedImageFrame.js

@@ -1,46 +1,34 @@
-const dicomParser = require("dicom-parser");
+const dicomParser = require('dicom-parser');
 
 /**
  * Function to deal with extracting an image frame from an encapsulated data set.
  */
 
-const getEncapsulatedImageFrame = (
-  dataSet,
-  attr,
-  frameIndex,
-  framesAreFragmented,
-) => {
-  if (
-    dataSet.elements.x7fe00010 &&
-    dataSet.elements.x7fe00010.basicOffsetTable.length
-  ) {
+const getEncapsulatedImageFrame = (dataSet, attr, frameIndex, framesAreFragmented) => {
+  if (dataSet.elements.x7fe00010 && dataSet.elements.x7fe00010.basicOffsetTable.length) {
     // Basic Offset Table is not empty
-    return dicomParser.readEncapsulatedImageFrame(
-      dataSet,
-      dataSet.elements.x7fe00010,
-      frameIndex,
-    );
+    return dicomParser.readEncapsulatedImageFrame(dataSet, dataSet.elements.x7fe00010, frameIndex);
   }
 
   // Empty basic offset table
   if (framesAreFragmented) {
     const basicOffsetTable = dicomParser.createJPEGBasicOffsetTable(
       dataSet,
-      dataSet.elements.x7fe00010,
+      dataSet.elements.x7fe00010
     );
 
     return dicomParser.readEncapsulatedImageFrame(
       dataSet,
       dataSet.elements.x7fe00010,
       frameIndex,
-      basicOffsetTable,
+      basicOffsetTable
     );
   }
 
   return dicomParser.readEncapsulatedPixelDataFromFragments(
     dataSet,
     dataSet.elements.x7fe00010,
-    frameIndex,
+    frameIndex
   );
 };
 

package/lib/operation/getNumberOfFrames.js

@@ -1,6 +1,6 @@
-const getNumberOfFrames = (dataSet) => {
+const getNumberOfFrames = dataSet => {
   if (dataSet.elements.x00280008) {
-    const numberOfFramesString = dataSet.string("x00280008");
+    const numberOfFramesString = dataSet.string('x00280008');
     if (numberOfFramesString.length === 0) {
       return 1;
     }

package/lib/operation/getUncompressedImageFrame.js

@@ -1,14 +1,6 @@
-function getUncompressedImageFrame(
-  dataSet,
-  attr,
-  frame,
-  uncompressedFrameSize,
-) {
+function getUncompressedImageFrame(dataSet, attr, frame, uncompressedFrameSize) {
   const start = attr.dataOffset + frame * uncompressedFrameSize;
-  const binaryValue = dataSet.byteArray.slice(
-    start,
-    start + uncompressedFrameSize,
-  );
+  const binaryValue = dataSet.byteArray.slice(start, start + uncompressedFrameSize);
   return binaryValue;
 }
 

package/lib/operation/getVR.js

@@ -1,9 +1,9 @@
-const { dataDictionary } = require("@radicalimaging/static-wado-util");
+const { dataDictionary } = require('@radicalimaging/static-wado-util');
 
 const nullVrTags = new Set();
-nullVrTags.add("FFFEE00D");
+nullVrTags.add('FFFEE00D');
 
-const getVR = (attr) => {
+const getVR = attr => {
   if (attr.vr) {
     return attr.vr;
   }
@@ -17,8 +17,8 @@ const getVR = (attr) => {
     return null;
   }
 
-  console.log("Unknown VR", tag, attr, dataDictAttr);
-  return "UN";
+  console.log('Unknown VR', tag, attr, dataDictAttr);
+  return 'UN';
 };
 
 module.exports = getVR;

package/lib/operation/getValue.js

@@ -1,7 +1,7 @@
-const extractImageFrames = require("./extractImageFrames");
+const extractImageFrames = require('./extractImageFrames');
 
 function decodeUtf8(s, options) {
-  if (options?.SpecificCharacterSet === "ISO_IR 192") {
+  if (options?.SpecificCharacterSet === 'ISO_IR 192') {
     return decodeURIComponent(escape(s));
   }
   return s;
@@ -22,19 +22,14 @@ const getStrings = (dataSet, attr, options) => {
 
 const getValuePatientName = (dataSet, attr) => {
   const strings = getStrings(dataSet, attr);
-  return (
-    (strings && strings.map((item) => ({ Alphabetic: item }))) || undefined
-  );
+  return (strings && strings.map(item => ({ Alphabetic: item }))) || undefined;
 };
 
 /** Gets either InlineBinary or BulkDataURI, if already defined */
 const getValueInlineBinary = (dataSet, attr) => {
   if (attr.BulkDataURI) return { BulkDataURI: attr.BulkDataURI };
-  const binaryValue = dataSet.byteArray.slice(
-    attr.dataOffset,
-    attr.dataOffset + attr.length,
-  );
-  return { InlineBinary: binaryValue.toString("base64") };
+  const binaryValue = dataSet.byteArray.slice(attr.dataOffset, attr.dataOffset + attr.length);
+  return { InlineBinary: binaryValue.toString('base64') };
 };
 
 const getValueInlineSignedShort = (dataSet, attr) => {
@@ -79,10 +74,10 @@ const getValueInlineFloat = (dataSet, attr) => {
 };
 
 const getValueInlineIntString = (dataSet, attr) =>
-  getStrings(dataSet, attr).map((val) => parseInt(val));
+  getStrings(dataSet, attr).map(val => parseInt(val));
 
 const getValueInlineFloatString = (dataSet, attr) =>
-  getStrings(dataSet, attr).map((val) => parseFloat(val));
+  getStrings(dataSet, attr).map(val => parseFloat(val));
 
 const getValueInlineFloatDouble = (dataSet, attr) => {
   if (attr.length > 8) {
@@ -105,63 +100,63 @@ const getValueInline = (dataSet, attr, vr, options) => {
   }
 
   switch (vr) {
-    case "AE":
-    case "AS":
+    case 'AE':
+    case 'AS':
       return getValueInlineString(dataSet, attr, options);
-    case "AT":
+    case 'AT':
       return getValueInlineAttributeTag(dataSet, attr);
-    case "DS":
+    case 'DS':
       return getValueInlineFloatString(dataSet, attr);
-    case "CS":
-    case "DA":
-    case "DT":
+    case 'CS':
+    case 'DA':
+    case 'DT':
       return getValueInlineString(dataSet, attr, options);
-    case "FL":
+    case 'FL':
       return getValueInlineFloat(dataSet, attr);
-    case "FD":
+    case 'FD':
       return getValueInlineFloatDouble(dataSet, attr);
-    case "IS":
+    case 'IS':
       return getValueInlineIntString(dataSet, attr);
-    case "LO":
-    case "LT":
+    case 'LO':
+    case 'LT':
       return getValueInlineString(dataSet, attr, options);
-    case "OB":
-    case "OF":
-    case "OW":
+    case 'OB':
+    case 'OF':
+    case 'OW':
       return getValueInlineBinary(dataSet, attr);
-    case "PN":
+    case 'PN':
       return getValuePatientName(dataSet, attr);
-    case "SH":
+    case 'SH':
       return getValueInlineString(dataSet, attr, options);
-    case "SL":
+    case 'SL':
       return getValueInlineSignedLong(dataSet, attr);
-    case "SS":
+    case 'SS':
       return getValueInlineSignedShort(dataSet, attr);
-    case "ST":
-    case "TM":
-    case "UI":
+    case 'ST':
+    case 'TM':
+    case 'UI':
       return getValueInlineString(dataSet, attr, options);
-    case "UL":
+    case 'UL':
       return getValueInlineUnsignedLong(dataSet, attr);
-    case "UN":
+    case 'UN':
       return getValueInlineBinary(dataSet, attr);
-    case "US":
+    case 'US':
       return getValueInlineUnsignedShort(dataSet, attr);
-    case "UT":
+    case 'UT':
       return getValueInlineString(dataSet, attr, options);
     default:
       return getValueInlineBinary(dataSet, attr);
   }
 };
 
-const isPrivate = (attr) => {
+const isPrivate = attr => {
   const { tag } = attr;
   const ch = tag.substr(4, 1);
   const chHex = parseInt(ch, 16);
   return chHex % 2 == 1;
 };
 
-const RawEncapsulatedDocument = "x00420011";
+const RawEncapsulatedDocument = 'x00420011';
 
 const isValueInline = (attr, options) => {
   if (isPrivate(attr)) {
@@ -187,30 +182,15 @@ const isValueInline = (attr, options) => {
  * @param {*} parentAttr attr's parent. If not present means attr is at root level.
  * @returns
  */
-const getValue = async (
-  dataSet,
-  attr,
-  vr,
-  getDataSet,
-  callback,
-  options,
-  parentAttr,
-) => {
+const getValue = async (dataSet, attr, vr, getDataSet, callback, options, parentAttr) => {
   // It will only process pixelData tag if on metadata root. Otherwise it will be skiped.
-  if (attr.tag === "x7fe00010" && !parentAttr) {
-    const BulkDataURI = await extractImageFrames(
-      dataSet,
-      attr,
-      vr,
-      callback,
-      options,
-    );
+  if (attr.tag === 'x7fe00010' && !parentAttr) {
+    const BulkDataURI = await extractImageFrames(dataSet, attr, vr, callback, options);
     return { BulkDataURI };
   }
-  if (attr.tag === "xfffee00d") return undefined;
+  if (attr.tag === 'xfffee00d') return undefined;
   // Group length
-  if (attr.tag.length == 9 && attr.tag.substring(5, 9) === "0000")
-    return undefined;
+  if (attr.tag.length == 9 && attr.tag.substring(5, 9) === '0000') return undefined;
   if (attr.items) {
     // sequences
     const result = [];
@@ -227,11 +207,8 @@ const getValue = async (
   if (isValueInline(attr, options)) {
     return getValueInline(dataSet, attr, vr, options);
   }
-  const binaryValue = dataSet.byteArray.slice(
-    attr.dataOffset,
-    attr.dataOffset + attr.length,
-  );
-  const mimeType = attr.tag == "x00420011" && dataSet.string("x00420012");
+  const binaryValue = dataSet.byteArray.slice(attr.dataOffset, attr.dataOffset + attr.length);
+  const mimeType = attr.tag == 'x00420011' && dataSet.string('x00420012');
 
   const BulkDataURI = await callback.bulkdata(binaryValue, { mimeType });
   return { BulkDataURI, vr };

package/lib/operation/validateMetadata.js

@@ -1,13 +1,13 @@
-const { Tags } = require("@radicalimaging/static-wado-util");
+const { Tags } = require('@radicalimaging/static-wado-util');
 
 function validateMetadata(options) {
-  const serviceUrl = "";
+  const serviceUrl = '';
   const { verify, multipart: stowResponse } = options;
 
   return function (id, result) {
     const getValue = Tags.getValue.bind(null, result.metadata);
     if (verify) {
-      console.verbose("Validating metadata", id);
+      console.verbose('Validating metadata', id);
       if (id.studyInstanceUid.length > 64) {
         throw new Error(`StudyInstanceUID too long: ${id.studyInstanceUid}`);
       }
@@ -32,7 +32,7 @@ function validateMetadata(options) {
           },
         ],
       };
-      this.success("instanceStored", successMessage, filename);
+      this.success('instanceStored', successMessage, filename);
     }
   };
 }

package/lib/program/index.js

@@ -1,4 +1,4 @@
-const staticWadoUtil = require("@radicalimaging/static-wado-util");
+const staticWadoUtil = require('@radicalimaging/static-wado-util');
 
 /**
  * Configure static-wado-creator commander program.
@@ -7,10 +7,7 @@ const staticWadoUtil = require("@radicalimaging/static-wado-util");
  * @returns Program object
  */
 async function configureProgram(defaults) {
-  const configurationFile = await staticWadoUtil.loadConfiguration(
-    defaults,
-    process.argv,
-  );
+  const configurationFile = await staticWadoUtil.loadConfiguration(defaults, process.argv);
   return staticWadoUtil.configureCommands(defaults);
 }
 

package/lib/rejectMain.js

@@ -1,5 +1,5 @@
-const StaticWado = require("./StaticWado");
-const adaptProgramOpts = require("./util/adaptProgramOpts");
+const StaticWado = require('./StaticWado');
+const adaptProgramOpts = require('./util/adaptProgramOpts');
 
 module.exports = function rejectMain(args, options) {
   const finalOptions = adaptProgramOpts(options, {

package/lib/serverMain.js

@@ -1,27 +1,21 @@
-const readline = require("node:readline");
-const {
-  argv,
-  argv0,
-  exit,
-  stdin: input,
-  stdout: output,
-} = require("node:process");
+const readline = require('node:readline');
+const { argv, argv0, exit, stdin: input, stdout: output } = require('node:process');
 
-const StaticWado = require("./StaticWado");
-const adaptProgramOpts = require("./util/adaptProgramOpts");
+const StaticWado = require('./StaticWado');
+const adaptProgramOpts = require('./util/adaptProgramOpts');
 
 module.exports = async function createMain(options, program) {
   const rl = readline.createInterface({ input, output });
   for await (const line of rl) {
     if (!line) continue;
-    if (line.startsWith("exit")) {
+    if (line.startsWith('exit')) {
       exit(0);
     }
-    argv.splice(2, argv.length - 2, ...line.split(" "));
-    console.verbose("exec mkdicomweb", JSON.stringify(argv));
+    argv.splice(2, argv.length - 2, ...line.split(' '));
+    console.verbose('exec mkdicomweb', JSON.stringify(argv));
 
     // Configure program commander
     await StaticWado.configureProgram(StaticWado.mkdicomwebConfig);
-    output.write("mkdicomweb server -->\n");
+    output.write('mkdicomweb server -->\n');
   }
 };

package/lib/util/IdCreator.js

@@ -1,7 +1,5 @@
-const path = require("path");
-const {
-  getStudyUIDPathAndSubPath,
-} = require("@radicalimaging/static-wado-util");
+const path = require('path');
+const { getStudyUIDPathAndSubPath } = require('@radicalimaging/static-wado-util');
 
 function IdCreator({
   directoryName,
@@ -12,7 +10,7 @@ function IdCreator({
   return (uids, filename) => {
     const { studyInstanceUid, seriesInstanceUid, sopInstanceUid } = uids;
 
-    const { path: hashPath = "", subpath: hashSubpath = "" } = hashStudyUidPath
+    const { path: hashPath = '', subpath: hashSubpath = '' } = hashStudyUidPath
       ? getStudyUIDPathAndSubPath(studyInstanceUid)
       : {};
 
@@ -20,20 +18,13 @@ function IdCreator({
       ? path.join(hashPath, hashSubpath, studyInstanceUid)
       : studyInstanceUid;
 
-    const studyPath = path.join(directoryName, "studies", studySubDir);
-    const seriesRootPath = path.join(studyPath, "series", seriesInstanceUid);
-    const sopInstanceRootPath = path.join(
-      seriesRootPath,
-      "instances",
-      sopInstanceUid,
-    );
-    const imageFrameRootPath = path.join(sopInstanceRootPath, "frames");
+    const studyPath = path.join(directoryName, 'studies', studySubDir);
+    const seriesRootPath = path.join(studyPath, 'series', seriesInstanceUid);
+    const sopInstanceRootPath = path.join(seriesRootPath, 'instances', sopInstanceUid);
+    const imageFrameRootPath = path.join(sopInstanceRootPath, 'frames');
 
     const deduplicatedPath = path.join(deduplicatedRoot, studySubDir);
-    const deduplicatedInstancesPath = path.join(
-      deduplicatedInstancesRoot,
-      studySubDir,
-    );
+    const deduplicatedInstancesPath = path.join(deduplicatedInstancesRoot, studySubDir);
 
     return {
       ...uids,

package/lib/util/adaptProgramOpts.js

@@ -1,5 +1,5 @@
 const assignDefined = (dest, src) => {
-  Object.keys(src).forEach((key) => {
+  Object.keys(src).forEach(key => {
     const val = src[key];
     if (val !== undefined) {
       dest[key] = val;
@@ -34,6 +34,6 @@ module.exports = function adaptProgramOpts(programOpts, defaults) {
       encapsulatedImage: encapsulatedImage ?? singlePartImage !== true,
       singlePartImage: singlePartImage ?? encapsulatedImage === false,
       delete: deleteInstances,
-    },
+    }
   );
 };

package/lib/util/compressionOptionParser.js

@@ -1,22 +1,13 @@
-const { program } = require("@radicalimaging/static-wado-util");
-const {
-  getDestinationTranscoder,
-} = require("../operation/adapter/transcodeImage");
+const { program } = require('@radicalimaging/static-wado-util');
+const { getDestinationTranscoder } = require('../operation/adapter/transcodeImage');
 
 module.exports = function compressionOptionParser(value) {
   const destination = getDestinationTranscoder(value);
   if (destination) {
-    console.log(
-      "Found destination transferSyntax ",
-      destination.transferSyntaxUid,
-      "for ",
-      value,
-    );
+    console.log('Found destination transferSyntax ', destination.transferSyntaxUid, 'for ', value);
   } else {
-    console.log("No transcoder destination for ", value);
-    throw new program.InvalidArgumentError(
-      `No transcoder destination for ${value}`,
-    );
+    console.log('No transcoder destination for ', value);
+    throw new program.InvalidArgumentError(`No transcoder destination for ${value}`);
   }
   return destination.transferSyntaxUid;
 };

package/lib/util/resultsReport.ts

@@ -1,88 +1,87 @@
-import fs from "fs";
+import fs from 'fs';
 
 const results = [];
 let sopResponse = null;
 
 function ensureSOPResponse(data) {
-    if( !data.ReferencedSOPSequence && !data.FailedSOPSequence ) {
-        return;
-    }
-    if( !sopResponse ) {
-        sopResponse = {
-            ...data,
-            FailedSOPSequence: undefined,
-            ReferencedSOPSequence: undefined,
-        }
-        results.push(sopResponse);
-    }
-    if( data.ReferencedSOPSequence ) {
-        sopResponse.ReferencedSOPSequence ||= [];
-        sopResponse.ReferencedSOPSequence.push(...data.ReferencedSOPSequence);
-    }
-    if( data.FailedSOPSequence ) {
-        sopResponse.FailedSOPSequence ||= [];
-        sopResponse.FailedSOPSequence.push(...data.FailedSOPSequence);
-    }
-
+  if (!data.ReferencedSOPSequence && !data.FailedSOPSequence) {
+    return;
+  }
+  if (!sopResponse) {
+    sopResponse = {
+      ...data,
+      FailedSOPSequence: undefined,
+      ReferencedSOPSequence: undefined,
+    };
+    results.push(sopResponse);
+  }
+  if (data.ReferencedSOPSequence) {
+    sopResponse.ReferencedSOPSequence ||= [];
+    sopResponse.ReferencedSOPSequence.push(...data.ReferencedSOPSequence);
+  }
+  if (data.FailedSOPSequence) {
+    sopResponse.FailedSOPSequence ||= [];
+    sopResponse.FailedSOPSequence.push(...data.FailedSOPSequence);
+  }
 }
 export function Success(options) {
-    const { deleteInput = false } = options;
+  const { deleteInput = false } = options;
 
-    return (_action, data, file) => {
-      if( data.ReferencedSOPSequence ) {
-        ensureSOPResponse(data);
-      } else {
-        results.push(data);
-      }
-      if (file && deleteInput) {
-        console.noQuiet("Deleting", file);
-        fs.unlinkSync(file);
-    } else if( file ) {
-        console.verbose("Not deleting", file);
-      }
-    };
+  return (_action, data, file) => {
+    if (data.ReferencedSOPSequence) {
+      ensureSOPResponse(data);
+    } else {
+      results.push(data);
+    }
+    if (file && deleteInput) {
+      console.noQuiet('Deleting', file);
+      fs.unlinkSync(file);
+    } else if (file) {
+      console.verbose('Not deleting', file);
+    }
+  };
 }
 
 export function Failure(options) {
-    const { deleteFailed } = options;
+  const { deleteFailed } = options;
 
-    return (_action, data, file) => {
-        if (data.FailedSOPSequence) {
-          ensureSOPResponse(data);
-        } else {
-            results.push(data);
-        }
-        if( file && deleteFailed ) {
-            console.noQuiet("Deleting failure", file);
-            fs.unlinkSync(file);
-        } else if( file ) {
-            console.verbose("Not deleting failure file", file);
-        }
-    };
+  return (_action, data, file) => {
+    if (data.FailedSOPSequence) {
+      ensureSOPResponse(data);
+    } else {
+      results.push(data);
+    }
+    if (file && deleteFailed) {
+      console.noQuiet('Deleting failure', file);
+      fs.unlinkSync(file);
+    } else if (file) {
+      console.verbose('Not deleting failure file', file);
+    }
+  };
 }
 
 export function clearResults() {
-    results.splice(0,results.length);
-    sopResponse = null;
+  results.splice(0, results.length);
+  sopResponse = null;
 }
 
 export function WriteResults(options) {
-    const { multipart } = options;
+  const { multipart } = options;
 
-    return function () {
-      if (multipart) {
-        const str =
-          results.length === 1
-            ? JSON.stringify(results[0])
-            : `[\n${results.map((r) => JSON.stringify(r, null, 2)).join(",\n")}\n]`;
-        console.log(
-          "\r\n--boundary-response\r\n" +
-            "content-type: application/json\r\n\r\n" +
-            str +
-            "\r\n--boundary-response--\r\n"
-        );
-      }
+  return function () {
+    if (multipart) {
+      const str =
+        results.length === 1
+          ? JSON.stringify(results[0])
+          : `[\n${results.map(r => JSON.stringify(r, null, 2)).join(',\n')}\n]`;
+      console.log(
+        '\r\n--boundary-response\r\n' +
+          'content-type: application/json\r\n\r\n' +
+          str +
+          '\r\n--boundary-response--\r\n'
+      );
+    }
 
-      clearResults();
-    };
-}
+    clearResults();
+  };
+}