@radicalimaging/static-wado-creator 1.5.0 → 1.6.11

package/lib/operation/adapter/decodeImage.js

@@ -1,8 +1,11 @@
-const dicomCodec = require("@cornerstonejs/dicom-codec");
-const getImageInfo = require("./getImageInfo");
+const dicomCodec = require('@cornerstonejs/dicom-codec');
+const getImageInfo = require('./getImageInfo');
 
-async function decodeImage(imageFrame, dataset, transferSyntaxUid) {
-  const imageInfo = getImageInfo(dataset);
+function decodeImage(imageFrame, dataset, instance, transferSyntaxUid) {
+  const imageInfo = getImageInfo(dataset, instance);
+  if (imageFrame && !imageFrame.length) {
+    imageFrame = new Uint8Array(imageFrame);
+  }
   return dicomCodec.decode(imageFrame, imageInfo, transferSyntaxUid);
 }
 

package/lib/operation/adapter/getImageInfo.js

@@ -1,12 +1,29 @@
+const { Tags } = require('@radicalimaging/static-wado-util');
 /**
  * Minimum image info data to be used on transcode process by dicom-codec api.
  */
-function getImageInfo(dataSet) {
-  const rows = dataSet.uint16("x00280010");
-  const columns = dataSet.uint16("x00280011");
-  const bitsAllocated = dataSet.uint16("x00280100");
-  const samplesPerPixel = dataSet.uint16("x00280002");
-  const pixelRepresentation = dataSet.uint16("x00280103") || 0; // not yet being used.
+function getImageInfo(dataSet, instance) {
+  if (instance) {
+    const rows = Tags.getValue(instance, Tags.Rows);
+    const columns = Tags.getValue(instance, Tags.Columns);
+    const bitsAllocated = Tags.getValue(instance, Tags.BitsAllocated);
+    const samplesPerPixel = Tags.getValue(instance, Tags.SamplesPerPixel);
+    const pixelRepresentation = Tags.getValue(instance, Tags.PixelRepresentation) || 0; // not yet being used.
+
+    return {
+      bitsAllocated,
+      samplesPerPixel,
+      rows, // Number with the image rows/height
+      columns, // Number with the image columns/width,
+      signed: pixelRepresentation === 1,
+      pixelRepresentation,
+    };
+  }
+  const rows = dataSet.uint16('x00280010');
+  const columns = dataSet.uint16('x00280011');
+  const bitsAllocated = dataSet.uint16('x00280100');
+  const samplesPerPixel = dataSet.uint16('x00280002');
+  const pixelRepresentation = dataSet.uint16('x00280103') || 0; // not yet being used.
 
   return {
     bitsAllocated,

package/lib/operation/adapter/transcodeImage.js

@@ -1,8 +1,8 @@
-const dicomCodec = require("@cornerstonejs/dicom-codec");
-const { Tags, replicate } = require("@radicalimaging/static-wado-util");
-const getImageInfo = require("./getImageInfo");
+const dicomCodec = require('@cornerstonejs/dicom-codec');
+const { Tags, replicate } = require('@radicalimaging/static-wado-util');
+const getImageInfo = require('./getImageInfo');
 
-dicomCodec.setConfig("verbose: false");
+dicomCodec.setConfig('verbose: false');
 
 const transcodeOp = {
   none: 0,
@@ -11,88 +11,117 @@ const transcodeOp = {
   transcode: 3, // decode and then encode
 };
 
+const jpegBeforeEncode = (options, encoder) => {
+  const quality = options.quality ?? 99;
+  // First value is to encode as reversible lossless colour
+  return encoder => {
+    console.log('Calling setQuality', quality, !!encoder.setQuality);
+    encoder.setQuality(quality);
+  };
+};
+
+const jlsBeforeEncode = options => {
+  const delta = (options.delta ?? lossy) ? 3 : 0;
+  return encoder => encoder.setNearLossless(delta);
+};
+
+const htj2kBeforeEncode = options => {
+  const { lossy } = options;
+  const quality = lossy === true ? 0.002 : -1;
+  return encoder => encoder.setQuality(!lossy, quality);
+};
+
 /**
  * Static mapping for transcoding decoder destination names/uids - currently only lei, jls and jls-lossy appear to work.
  */
 const transcodeDestinationMap = {
   lei: {
-    transferSyntaxUid: "1.2.840.10008.1.2.1",
+    transferSyntaxUid: '1.2.840.10008.1.2.1',
     transcodeOp: transcodeOp.none,
   },
   jls: {
-    transferSyntaxUid: "1.2.840.10008.1.2.4.80",
+    transferSyntaxUid: '1.2.840.10008.1.2.4.80',
     transcodeOp: transcodeOp.encode,
+    beforeEncode: jlsBeforeEncode.bind(null, { lossy: false }),
   },
-  "jls-lossy": {
-    transferSyntaxUid: "1.2.840.10008.1.2.4.81",
+  'jls-lossy': {
+    transferSyntaxUid: '1.2.840.10008.1.2.4.81',
     transcodeOp: transcodeOp.encode,
+    beforeEncode: jlsBeforeEncode.bind(null, { lossy: true, delta: 3 }),
   },
   jp2: {
-    transferSyntaxUid: "1.2.840.10008.1.2.4.90",
+    transferSyntaxUid: '1.2.840.10008.1.2.4.90',
     transcodeOp: transcodeOp.encode,
   },
-  "jp2-lossy": {
-    transferSyntaxUid: "1.2.840.10008.1.2.4.91",
+  'jp2-lossy': {
+    transferSyntaxUid: '1.2.840.10008.1.2.4.91',
     transcodeOp: transcodeOp.encode,
   },
   jhc: {
-    transferSyntaxUid: "1.2.840.10008.1.2.4.202",
+    transferSyntaxUid: '1.2.840.10008.1.2.4.201',
+    transcodeOp: transcodeOp.encode,
+    beforeEncode: htj2kBeforeEncode({}),
+  },
+  'jhc-lossy': {
+    transferSyntaxUid: '1.2.840.10008.1.2.4.202',
     transcodeOp: transcodeOp.encode,
+    beforeEncode: htj2kBeforeEncode({ lossy: true }),
   },
   jpeg: {
-    transferSyntaxUid: "1.2.840.10008.1.2.4.50",
+    transferSyntaxUid: '1.2.840.10008.1.2.4.50',
     transcodeOp: transcodeOp.encode,
+    // beforeEncode: jpegBeforeEncode({}),
   },
 };
 
 const transcodeSourceMap = {
-  "1.2.840.10008.1.2": {
+  '1.2.840.10008.1.2': {
     transcodeOp: transcodeOp.decode,
-    alias: "uncompressed",
+    alias: 'uncompressed',
   },
-  "1.2.840.10008.1.2.1": {
+  '1.2.840.10008.1.2.1': {
     transcodeOp: transcodeOp.none,
-    alias: "uncompressed",
+    alias: 'uncompressed',
   },
-  "1.2.840.10008.1.2.2": {
+  '1.2.840.10008.1.2.2': {
     transcodeOp: transcodeOp.decode,
-    alias: "uncompressed",
+    alias: 'uncompressed',
   },
-  "1.2.840.10008.1.2.4.50": {
+  '1.2.840.10008.1.2.4.50': {
     transcodeOp: transcodeOp.decode,
-    alias: "jpeg",
+    alias: 'jpeg',
   },
-  "1.2.840.10008.1.2.4.57": {
+  '1.2.840.10008.1.2.4.57': {
     transcodeOp: transcodeOp.decode,
-    alias: "jls",
+    alias: 'jls',
   },
-  "1.2.840.10008.1.2.4.70": {
+  '1.2.840.10008.1.2.4.70': {
     transcodeOp: transcodeOp.decode,
-    alias: "jpll",
+    alias: 'jpll',
   },
-  "1.2.840.10008.1.2.4.80": {
+  '1.2.840.10008.1.2.4.80': {
     transcodeOp: transcodeOp.decode,
-    alias: "jls",
+    alias: 'jls',
   },
-  "1.2.840.10008.1.2.4.90": {
+  '1.2.840.10008.1.2.4.90': {
     transcodeOp: transcodeOp.decode,
-    alias: "jp2",
+    alias: 'jp2',
   },
-  "1.2.840.10008.1.2.4.91": {
+  '1.2.840.10008.1.2.4.91': {
     transcodeOp: transcodeOp.decode,
-    alias: "jp2",
+    alias: 'jp2',
   },
-  "3.2.840.10008.1.2.4.96": {
+  '3.2.840.10008.1.2.4.96': {
     transcodeOp: transcodeOp.decode,
-    alias: "jhc",
+    alias: 'jhc',
   },
-  "1.2.840.10008.1.2.4.202": {
+  '1.2.840.10008.1.2.4.202': {
     transcodeOp: transcodeOp.decode,
-    alias: "jhc",
+    alias: 'jhc',
   },
-  "1.2.840.10008.1.2.5": {
+  '1.2.840.10008.1.2.5': {
     transcodeOp: transcodeOp.decode,
-    alias: "rle",
+    alias: 'rle',
   },
 };
 
@@ -103,11 +132,10 @@ const transcodeSourceMap = {
  * @returns A partial transcoder definition. Otherwise it returns undefined.
  */
 function getDestinationTranscoder(id) {
-  const destinationTranscoderEntry = Object.entries(transcodeDestinationMap).find(([key, value]) => key === id || value.transferSyntaxUid === id);
-  if (destinationTranscoderEntry) {
-    return destinationTranscoderEntry[1];
-  }
-  return undefined;
+  const destinationTranscoderEntry =
+    transcodeDestinationMap[id] ||
+    Object.values(transcodeDestinationMap).find(value => value.transferSyntaxUid === id);
+  return destinationTranscoderEntry;
 }
 
 /**
@@ -116,7 +144,11 @@ function getDestinationTranscoder(id) {
  * @param {*} transferSyntaxUid
  * @returns
  */
-function getTranscoder(transferSyntaxUid, { contentType: greyContentType, colorContentType }, samplesPerPixel) {
+function getTranscoder(
+  transferSyntaxUid,
+  { contentType: greyContentType, colorContentType },
+  samplesPerPixel
+) {
   const contentType = samplesPerPixel === 3 ? colorContentType : greyContentType;
   const sourceTranscoder = transcodeSourceMap[transferSyntaxUid];
   const destinationTranscoder = getDestinationTranscoder(contentType);
@@ -126,8 +158,9 @@ function getTranscoder(transferSyntaxUid, { contentType: greyContentType, colorC
 
   return {
     transferSyntaxUid: destinationTranscoder.transferSyntaxUid,
-    transcodeOp: sourceTranscoder.transcodeOp | destinationTranscoder.transcodeOp, // eslint-disable-line no-bitwise
+    transcodeOp: sourceTranscoder.transcodeOp | destinationTranscoder.transcodeOp,
     alias: sourceTranscoder.alias,
+    beforeEncode: destinationTranscoder.beforeEncode,
   };
 }
 
@@ -140,7 +173,7 @@ function shouldTranscodeImageFrame(id, options, samplesPerPixel) {
   const { recompress: recompressGrey, recompressColor } = options;
   const recompress = samplesPerPixel === 3 ? recompressColor : recompressGrey;
   if (!recompress) {
-    console.verbose("Not transcoding because recompress not set");
+    console.verbose('Not transcoding because recompress not set');
     return false;
   }
 
@@ -148,12 +181,21 @@ function shouldTranscodeImageFrame(id, options, samplesPerPixel) {
   const transcoder = getTranscoder(transferSyntaxUid, options, samplesPerPixel);
   const validTranscoder = transcoder && transcoder.transferSyntaxUid;
   if (!validTranscoder) {
-    console.verbose("Not transcoding because no decoder found for", transferSyntaxUid, samplesPerPixel);
+    console.verbose(
+      'Not transcoding because no decoder found for',
+      transferSyntaxUid,
+      samplesPerPixel
+    );
     return false;
   }
-  const validRecompress = recompress.includes("true") || recompress.includes(transcoder.alias);
+  const validRecompress = recompress.includes('true') || recompress.includes(transcoder.alias);
   if (!validRecompress) {
-    console.verbose("Not transcoding because recompress", recompress, "does not include", transcoder.alias);
+    console.verbose(
+      'Not transcoding because recompress',
+      recompress,
+      'does not include',
+      transcoder.alias
+    );
     return false;
   }
 
@@ -175,8 +217,12 @@ function shouldThumbUseTranscoded(id, options) {
   function isValidTranscoder() {
     const { transferSyntaxUid } = id;
     // Ignore the samples per pixel for thumbnails
-    const transcoder = getTranscoder(transferSyntaxUid, options, "thumbnail");
-    const result = transcoder && transcoder.transferSyntaxUid && options.recompress.includes(transcoder.alias) && options.recompressThumb.includes(transcoder.alias);
+    const transcoder = getTranscoder(transferSyntaxUid, options, 'thumbnail');
+    const result =
+      transcoder &&
+      transcoder.transferSyntaxUid &&
+      options.recompress.includes(transcoder.alias) &&
+      options.recompressThumb.includes(transcoder.alias);
 
     return result;
   }
@@ -184,21 +230,12 @@ function shouldThumbUseTranscoded(id, options) {
   return isValidTranscoder();
 }
 
-function transcodeLog(options, msg, error = "") {
+function transcodeLog(options, msg, error = '') {
   if (options.verbose) {
     console.log(`\x1b[34m${msg}\x1b[0m`, error);
   }
 }
 
-const beforeEncode = (options, encoder) => {
-  const lossy = !!options.lossy;
-  const quality = lossy ? 0.002 : -1;
-  const delta = lossy ? 3 : 0;
-  // First value is to encode as reversible lossless colour
-  encoder.setQuality?.(!lossy, quality);
-  encoder.setNearLossless?.(delta);
-};
-
 function scale(imageFrame, imageInfo) {
   const { rows, columns, bitsPerPixel, pixelRepresentation, samplesPerPixel } = imageInfo;
   let ArrayConstructor = Float32Array;
@@ -243,12 +280,13 @@ function scale(imageFrame, imageInfo) {
 async function generateLossyImage(id, decoded, options) {
   if (!options.alternate) return;
   if (!decoded?.imageFrame) return;
+  console.verbose('Writing alternate thumbnail');
 
   try {
     let { imageFrame, imageInfo } = decoded;
     const lossyId = {
       ...id,
-      imageFrameRootPath: id.imageFrameRootPath.replace("frames", options.alternateName),
+      imageFrameRootPath: id.imageFrameRootPath.replace('frames', options.alternateName),
       transferSyntaxUid: transcodeDestinationMap.jhc.transferSyntaxUid,
     };
 
@@ -263,31 +301,40 @@ async function generateLossyImage(id, decoded, options) {
       imageInfo = scaled.imageInfo;
     }
 
-    if (options.alternate === "jls") {
-      lossyId.transferSyntaxUid = transcodeDestinationMap["jls-lossy"].transferSyntaxUid;
-    } else if (options.alternate === "jlsLossless") {
+    if (options.alternate === 'jls') {
+      lossyId.transferSyntaxUid = transcodeDestinationMap['jls-lossy'].transferSyntaxUid;
+    } else if (options.alternate === 'jlsLossless') {
       lossyId.transferSyntaxUid = transcodeDestinationMap.jls.transferSyntaxUid;
       lossy = false;
-    } else if (options.alternate === "jhcLossless") {
+    } else if (options.alternate === 'jhcLossless') {
       lossy = false;
     }
 
     const encodeOptions = {
-      beforeEncode: beforeEncode.bind(null, {
-        lossy,
-      }),
+      beforeEncode: transcodeDestinationMap[options.alternate]?.beforeEncode,
     };
-    const lossyEncoding = await dicomCodec.encode(imageFrame, imageInfo, lossyId.transferSyntaxUid, encodeOptions);
-    console.log("Encoded alternate", lossyId.transferSyntaxUid, "of size", lossyEncoding.imageFrame.length);
-    // eslint-disable-next-line consistent-return
+
+    const lossyEncoding = await dicomCodec.encode(
+      imageFrame,
+      imageInfo,
+      lossyId.transferSyntaxUid,
+      encodeOptions
+    );
+    console.verbose(
+      'Encoded alternate',
+      lossyId.transferSyntaxUid,
+      'of size',
+      lossyEncoding.imageFrame.length
+    );
+
     return { id: lossyId, imageFrame: lossyEncoding.imageFrame };
   } catch (e) {
-    console.warn("Unable to create alternate:", e);
+    console.warn('Unable to create alternate:', e);
   }
 }
 
 function isPalette(dataSet) {
-  return dataSet.string(Tags.RawPhotometricInterpretation) === "PALETTE COLOR";
+  return dataSet.string(Tags.RawPhotometricInterpretation) === 'PALETTE COLOR';
 }
 
 /**
@@ -305,8 +352,12 @@ async function transcodeImageFrame(id, targetIdSrc, imageFrame, dataSet, options
   let result = {};
 
   const samplesPerPixel = dataSet.uint16(Tags.RawSamplesPerPixel);
-  const planarConfiguration = dataSet.uint16("x00280006");
-  if (!shouldTranscodeImageFrame(id, options, samplesPerPixel) || planarConfiguration === 1 || isPalette(dataSet)) {
+  const planarConfiguration = dataSet.uint16('x00280006');
+  if (
+    !shouldTranscodeImageFrame(id, options, samplesPerPixel) ||
+    planarConfiguration === 1 ||
+    isPalette(dataSet)
+  ) {
     console.verbose("Shouldn't transcode");
     return {
       id,
@@ -319,7 +370,7 @@ async function transcodeImageFrame(id, targetIdSrc, imageFrame, dataSet, options
 
   // Don't transcode if not required
   if (targetId.transferSyntaxUid !== transcoder.transferSyntaxUid && !options.forceTranscode) {
-    console.verbose("Image is already in", targetId.transferSyntaxUid, "not transcoding");
+    console.verbose('Image is already in', targetId.transferSyntaxUid, 'not transcoding');
     return {
       id,
       imageFrame,
@@ -327,33 +378,49 @@ async function transcodeImageFrame(id, targetIdSrc, imageFrame, dataSet, options
     };
   }
 
-  console.verbose("Transcoding to", transcoder.transferSyntaxUid);
+  console.verbose('Transcoding to', transcoder.transferSyntaxUid);
 
   const imageInfo = getImageInfo(dataSet);
   let done = false;
-  let processResultMsg = "";
+  let processResultMsg = '';
   const encodeOptions = {
-    beforeEncode: beforeEncode.bind(null, {
-      lossy: options.lossy,
-    }),
+    beforeEncode: transcoder.beforeEncode,
   };
   let decoded;
 
   try {
     switch (transcoder.transcodeOp) {
       case transcodeOp.transcode:
-        transcodeLog(options, `Full transcoding image from \x1b[43m${id.transferSyntaxUid}\x1b[0m to \x1b[43m${targetId.transferSyntaxUid}\x1b[0m`);
+        transcodeLog(
+          options,
+          `Full transcoding image from \x1b[43m${id.transferSyntaxUid}\x1b[0m to \x1b[43m${targetId.transferSyntaxUid}\x1b[0m`
+        );
 
         decoded = await dicomCodec.decode(imageFrame, imageInfo, id.transferSyntaxUid);
-        result = await dicomCodec.encode(decoded.imageFrame, decoded.imageInfo, targetId.transferSyntaxUid, encodeOptions);
-
-        console.log("transcoded image to", targetId.transferSyntaxUid, "of size", result.imageFrame.length);
+        result = await dicomCodec.encode(
+          decoded.imageFrame,
+          decoded.imageInfo,
+          targetId.transferSyntaxUid,
+          encodeOptions
+        );
+
+        console.verbose(
+          'transcoded image to',
+          targetId.transferSyntaxUid,
+          'of size',
+          result.imageFrame.length
+        );
         processResultMsg = `Transcoding finished`;
         break;
       case transcodeOp.encode:
         transcodeLog(options, `Encoding image to \x1b[43m${targetId.transferSyntaxUid}\x1b[0m`);
 
-        result = await dicomCodec.encode(imageFrame, imageInfo, targetId.transferSyntaxUid, encodeOptions);
+        result = await dicomCodec.encode(
+          imageFrame,
+          imageInfo,
+          targetId.transferSyntaxUid,
+          encodeOptions
+        );
 
         processResultMsg = `Encoding finished`;
         break;
@@ -364,12 +431,12 @@ async function transcodeImageFrame(id, targetIdSrc, imageFrame, dataSet, options
         processResultMsg = `Decoding finished`;
         break;
       default:
-        processResultMsg = "";
+        processResultMsg = '';
     }
 
     done = !!result.imageFrame;
   } catch (e) {
-    transcodeLog(options, "Failed to transcode image", e);
+    transcodeLog(options, 'Failed to transcode image', e);
   }
 
   // recover transfer syntax
@@ -379,7 +446,7 @@ async function transcodeImageFrame(id, targetIdSrc, imageFrame, dataSet, options
 
   // log final message only if resultMsg is present
   if (processResultMsg) {
-    processResultMsg += done ? " successfully" : " unsuccessfully";
+    processResultMsg += done ? ' successfully' : ' unsuccessfully';
     transcodeLog(options, processResultMsg);
   }
 
@@ -437,7 +504,7 @@ function transcodeMetadata(metadata, id, options) {
 
   if (result[Tags.AvailableTransferSyntaxUID]) {
     Tags.setValue(result, Tags.AvailableTransferSyntaxUID, transcodedId.transferSyntaxUid);
-    console.verbose("Apply available tsuid", transcodeId.transferSyntaxUid);
+    console.verbose('Apply available tsuid', transcodeId.transferSyntaxUid);
   }
 
   return result;

package/lib/operation/extractImageFrames.js

@@ -1,17 +1,18 @@
-const { Stats } = require("@radicalimaging/static-wado-util");
+const { Stats } = require('@radicalimaging/static-wado-util');
 
-const getNumberOfFrames = require("./getNumberOfFrames");
-const getUncompressedImageFrame = require("./getUncompressedImageFrame");
-const getEncapsulatedImageFrame = require("./getEncapsulatedImageFrame");
-const { isVideo } = require("../writer/VideoWriter");
+const getNumberOfFrames = require('./getNumberOfFrames');
+const getUncompressedImageFrame = require('./getUncompressedImageFrame');
+const getEncapsulatedImageFrame = require('./getEncapsulatedImageFrame');
+const { isVideo } = require('../writer/VideoWriter');
 
-const areFramesAreFragmented = (attr, numberOfFrames) => attr.encapsulatedPixelData && numberOfFrames != attr.fragments.length;
+const areFramesAreFragmented = (attr, numberOfFrames) =>
+  attr.encapsulatedPixelData && numberOfFrames != attr.fragments.length;
 
-const getFrameSize = (dataSet) => {
-  const rows = dataSet.uint16("x00280010");
-  const columns = dataSet.uint16("x00280011");
-  const samplesPerPixel = dataSet.uint16("x00280002");
-  const bitsAllocated = dataSet.uint16("x00280100");
+const getFrameSize = dataSet => {
+  const rows = dataSet.uint16('x00280010');
+  const columns = dataSet.uint16('x00280011');
+  const samplesPerPixel = dataSet.uint16('x00280002');
+  const bitsAllocated = dataSet.uint16('x00280100');
   return (rows * columns * samplesPerPixel * bitsAllocated) / 8;
 };
 
@@ -30,11 +31,21 @@ const extractImageFrames = async (dataSet, attr, vr, callback) => {
 
   for (let frameIndex = 0; frameIndex < numberOfFrames; frameIndex++) {
     if (attr.encapsulatedPixelData) {
-      const compressedFrame = getEncapsulatedImageFrame(dataSet, attr, frameIndex, framesAreFragmented);
+      const compressedFrame = getEncapsulatedImageFrame(
+        dataSet,
+        attr,
+        frameIndex,
+        framesAreFragmented
+      );
       BulkDataURI = await callback.imageFrame(compressedFrame, { dataSet });
-      Stats.OverallStats.add("Image Write", `Write image frame ${frameIndex + 1}`, 5000);
+      Stats.OverallStats.add('Image Write', `Write image frame ${frameIndex + 1}`, 5000);
     } else {
-      const uncompressedFrame = getUncompressedImageFrame(dataSet, attr, frameIndex, uncompressedFrameSize);
+      const uncompressedFrame = getUncompressedImageFrame(
+        dataSet,
+        attr,
+        frameIndex,
+        uncompressedFrameSize
+      );
       BulkDataURI = await callback.imageFrame(uncompressedFrame, { dataSet });
     }
   }

package/lib/operation/getDataSet.js

@@ -1,6 +1,6 @@
-const { Tags } = require("@radicalimaging/static-wado-util");
-const getVR = require("./getVR");
-const getValue = require("./getValue");
+const { Tags } = require('@radicalimaging/static-wado-util');
+const getVR = require('./getVR');
+const getValue = require('./getValue');
 
 /**
  * Get dataset.
@@ -28,7 +28,7 @@ async function getDataSet(dataSet, callback, optionsOrig, parentAttr = undefined
       options = { ...options, SpecificCharacterSet };
     }
     const attr = dataSet.elements[tag];
-    /* eslint-disable-next-line no-use-before-define */
+
     await attributeToJS(metadata, tag, dataSet, attr, callback, options, parentAttr);
   }
   if (metadata[Tags.TransferSyntaxUID]) {

package/lib/operation/getEncapsulatedImageFrame.js

@@ -1,4 +1,4 @@
-const dicomParser = require("dicom-parser");
+const dicomParser = require('dicom-parser');
 
 /**
  * Function to deal with extracting an image frame from an encapsulated data set.
@@ -12,12 +12,24 @@ const getEncapsulatedImageFrame = (dataSet, attr, frameIndex, framesAreFragmente
 
   // Empty basic offset table
   if (framesAreFragmented) {
-    const basicOffsetTable = dicomParser.createJPEGBasicOffsetTable(dataSet, dataSet.elements.x7fe00010);
+    const basicOffsetTable = dicomParser.createJPEGBasicOffsetTable(
+      dataSet,
+      dataSet.elements.x7fe00010
+    );
 
-    return dicomParser.readEncapsulatedImageFrame(dataSet, dataSet.elements.x7fe00010, frameIndex, basicOffsetTable);
+    return dicomParser.readEncapsulatedImageFrame(
+      dataSet,
+      dataSet.elements.x7fe00010,
+      frameIndex,
+      basicOffsetTable
+    );
   }
 
-  return dicomParser.readEncapsulatedPixelDataFromFragments(dataSet, dataSet.elements.x7fe00010, frameIndex);
+  return dicomParser.readEncapsulatedPixelDataFromFragments(
+    dataSet,
+    dataSet.elements.x7fe00010,
+    frameIndex
+  );
 };
 
 module.exports = getEncapsulatedImageFrame;

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/getVR.js

@@ -1,16 +1,24 @@
-const { dataDictionary } = require("@radicalimaging/static-wado-util");
+const { dataDictionary } = require('@radicalimaging/static-wado-util');
 
-const getVR = (attr) => {
+const nullVrTags = new Set();
+nullVrTags.add('FFFEE00D');
+
+const getVR = attr => {
   if (attr.vr) {
     return attr.vr;
   }
   // lookup the vr using the data dictionary
   const tag = attr.tag.substring(1).toUpperCase();
   const dataDictAttr = dataDictionary[tag];
-  if (dataDictAttr) {
+  if (dataDictAttr?.vr) {
     return dataDictAttr.vr;
   }
-  return undefined;
+  if (nullVrTags.has(tag)) {
+    return null;
+  }
+
+  console.log('Unknown VR', tag, attr, dataDictAttr);
+  return 'UN';
 };
 
 module.exports = getVR;