@radicalimaging/static-wado-creator 0.6.4 → 0.6.5

package/lib/DeleteStudy.js

@@ -8,7 +8,7 @@ module.exports = (options) =>
     const studyData = await this.scanStudy("studies", studyInstanceUid);
     studyData.delete();
     const allStudies = await JSONReader(options.directoryName, "studies/index.json.gz", []);
-    const studiesWithoutDeleted = allStudies.filter((study) => studyInstanceUid != Tags.getValue(study,Tags.StudyInstanceUID));
+    const studiesWithoutDeleted = allStudies.filter((study) => studyInstanceUid != Tags.getValue(study, Tags.StudyInstanceUID));
     await JSONWriter(options.directoryName, "studies", studiesWithoutDeleted);
     delete this.studyData;
   };

package/lib/StaticWado.js

@@ -4,7 +4,8 @@ const dicomParser = require("dicom-parser");
 const fs = require("fs");
 const path = require("path");
 const { dirScanner } = require("@radicalimaging/static-wado-util");
-const asyncIterableToBuffer = require("./operation/adapter/asyncIterableToBuffer");
+const { JSONReader } = require("@radicalimaging/static-wado-util");
+const asyncIterableToBuffer = require("@radicalimaging/static-wado-util/lib/asyncIterableToBuffer");
 const getDataSet = require("./operation/getDataSet");
 const InstanceDeduplicate = require("./operation/InstanceDeduplicate");
 const DeduplicateWriter = require("./writer/DeduplicateWriter");
@@ -19,6 +20,7 @@ const ThumbnailWriter = require("./writer/ThumbnailWriter");
 const ThumbnailService = require("./operation/ThumbnailService");
 const DeleteStudy = require("./DeleteStudy");
 const RejectInstance = require("./RejectInstance");
+const JSONWriter = require("./writer/JSONWriter");
 
 function setStudyData(studyData) {
   this.studyData = studyData;
@@ -202,5 +204,24 @@ class StaticWado {
     await this.callback.completeStudy();
     Stats.OverallStats.summarize("Completed Study Processing");
   }
+
+  async reindex() {
+    const { directoryName } = this.options;
+    const studiesDir = `${directoryName}/studies/`;
+
+    console.log("Re-indexing", studiesDir);
+    const dirs = await fs.promises.readdir(studiesDir);
+    const studies = [];
+    for (const dir of dirs) {
+      const study = await JSONReader(`${studiesDir}/${dir}`, "index.json.gz", null);
+      if (study === null) {
+        console.log("No study found in", dir);
+        continue;
+      }
+      console.log("Adding study", dir);
+      studies.push(...study);
+    }
+    return JSONWriter(directoryName, "studies", studies);
+  }
 }
 module.exports = StaticWado;

package/lib/dictionary/Tags.js

@@ -1,41 +1,42 @@
-const dataDictionary = require("./dataDictionary");
 const dcmjs = require("dcmjs");
+const dataDictionary = require("./dataDictionary");
 
-const { naturalizeDataset, denaturalizeDataset} = dcmjs.data.DicomMetaDictionary
+const { naturalizeDataset, denaturalizeDataset } = dcmjs.data.DicomMetaDictionary;
 
 /** Find the actual tag for a private value */
 const findPrivate = (item, tagObject, create) => {
-    if( typeof tagObject === "string" ) return tagObject;
-    if( typeof tagObject === "number" ) return `00000000${tagObject.toString(16)}`.slice(-8);
-    const {creator,tag} = tagObject;
-    if( !creator ) return tag;
-    const start = tag.substring(0,4);
-    const end = tag.substring(6,8);
-    // Should technically go all the way up, but for now only test 0x30 items
-    let assignPosition;
-    for(let offset = 0x10; offset < 0x40; offset++) {
-      const testTag = `${start}00${offset.toString(16)}`
-      const testCreator = item[testTag];
-      if( testCreator===undefined && assignPosition===undefined ) assignPosition = offset;
-      if( testCreator && testCreator.Value && testCreator.Value[0]===creator ) {
-        return `${start}${offset.toString(16)}${end}`
-      }
-    }
-    if( create ) {
-      if( !assignPosition ) throw new Error(`Couldn't find any assign positions for ${creator} ${tag} in ${item}`);
-      const creatorTag = `${start}00${assignPosition.toString(16)}`
-      item[creatorTag] = { Value: [creator], vr: 'CS' };
-      return `${start}${assignPosition.toString(16)}${end}`
+  if (typeof tagObject === "string") return tagObject;
+  if (typeof tagObject === "number") return `00000000${tagObject.toString(16)}`.slice(-8);
+  const { creator, tag } = tagObject;
+  if (!creator) return tag;
+  const start = tag.substring(0, 4);
+  const end = tag.substring(6, 8);
+  // Should technically go all the way up, but for now only test 0x30 items
+  let assignPosition;
+  for (let offset = 0x10; offset < 0x40; offset++) {
+    const testTag = `${start}00${offset.toString(16)}`;
+    const testCreator = item[testTag];
+    if (testCreator === undefined && assignPosition === undefined) assignPosition = offset;
+    if (testCreator && testCreator.Value && testCreator.Value[0] === creator) {
+      return `${start}${offset.toString(16)}${end}`;
     }
-  };
+  }
+  if (create) {
+    if (!assignPosition) throw new Error(`Couldn't find any assign positions for ${creator} ${tag} in ${item}`);
+    const creatorTag = `${start}00${assignPosition.toString(16)}`;
+    item[creatorTag] = { Value: [creator], vr: "CS" };
+    return `${start}${assignPosition.toString(16)}${end}`;
+  }
+};
 
 const DeduppedCreator = "dedupped";
-  
+
 const Tags = {
   // Raw tags have the x before them, not parsed yet
   RawMinTag: "x00000000",
   RawFirstBodyTag: "x00080000",
   RawTransferSyntaxUID: "x00020010",
+  RawSopInstanceUID: "x00080018",
 
   // This one isn't defined in the dataDictionary
   AvailableTransferSyntaxUID: "00083002",
@@ -43,60 +44,67 @@ const Tags = {
   DeduppedCreator,
 
   // The references to extract data included in this object, 1..n values
-  DeduppedRef: { creator: DeduppedCreator, tag: "00091010"},
+  DeduppedRef: { creator: DeduppedCreator, tag: "00091010" },
 
   // The hash value of THIS object
-  DeduppedHash: {creator: DeduppedCreator, tag: "00091011"},
+  DeduppedHash: { creator: DeduppedCreator, tag: "00091011" },
 
   // Type of hash instance
-  DeduppedType: {creator: DeduppedCreator, tag: "00091012"},
+  DeduppedType: { creator: DeduppedCreator, tag: "00091012" },
   InstanceType: "instance",
   InfoType: "info",
 
-  naturalizeDataset, denaturalizeDataset,
-  
+  naturalizeDataset,
+  denaturalizeDataset,
+
   setValue: (item, tag, value) => {
-    const actualTag = findPrivate(item,tag,true);
+    const actualTag = findPrivate(item, tag, true);
     item[actualTag] = { Value: Array.isArray(value) ? value : [value] };
     return actualTag;
   },
 
   setList: (item, tag, value) => {
-    const actualTag = findPrivate(item,tag,true);
-    item[actualTag] =  {Value: Array.isArray(value) ? value : [value]};
+    const actualTag = findPrivate(item, tag, true);
+    item[actualTag] = { Value: Array.isArray(value) ? value : [value] };
     return actualTag;
   },
 
   pushList: (item, tag, value) => {
-    const actualTag = findPrivate(item,tag,true);
-    if( !item[actualTag] ) item[actualTag] = { Value: [] };
+    const actualTag = findPrivate(item, tag, true);
+    if (!item[actualTag]) item[actualTag] = { Value: [] };
     item[actualTag].Value.push(value);
     return actualTag;
   },
 
   getValue: (item, tag) => {
-    const actualTag = findPrivate(item,tag);
-    if( !actualTag ) return undefined;
+    const actualTag = findPrivate(item, tag);
+    if (!actualTag) return undefined;
     const value = item[actualTag];
-    if( value===undefined ) return undefined;
-    if( Array.isArray(value) ) return value.length==1 ? value[0] : (value.length===0 ? "" : value);
-    if( value.Value ) return value.Value.length==1 ? value.Value[0] : (value.Value.length===0 ? "" : value.Value);
+    if (value === undefined) return undefined;
+    if (Array.isArray(value)) {
+      if (value.length == 1) return value[0];
+      return value.length === 0 ? "" : value;
+    }
+    if (value.Value) {
+      if (value.Value.length == 1) return value.Value[0];
+      return value.Value.length === 0 ? "" : value.Value;
+    }
     return value;
   },
 
   getList: (item, tag) => {
-    const actualTag = findPrivate(item,tag);
-    if( !actualTag ) return undefined;
+    const actualTag = findPrivate(item, tag);
+    if (!actualTag) return undefined;
     const value = item[actualTag];
-    if( value===undefined ) return undefined;
-    if( Array.isArray(value) ) return value;
-    if( value.Value ) return value.Value;
+    if (value === undefined) return undefined;
+    if (Array.isArray(value)) return value;
+    if (value.Value) return value.Value;
     return [value];
   },
 
-  removeValue: (item,tag) => {
-    const actualTag = findPrivate(item,tag);
-    if( actualTag ) delete item[actualTag];
+  removeValue: (item, tag) => {
+    const actualTag = findPrivate(item, tag);
+    if (actualTag) delete item[actualTag];
     // TODO, remove creator tag if not used any longer
   },
 

package/lib/indexMain.js

@@ -0,0 +1,10 @@
+const StaticWado = require("./StaticWado");
+const adaptProgramOpts = require("./util/adaptProgramOpts");
+
+module.exports = function createMain(options) {
+  const finalOptions = adaptProgramOpts(options, {
+    ...this,
+  });
+  const importer = new StaticWado(finalOptions);
+  return importer.reindex();
+};

package/lib/mkdicomwebConfig.js

@@ -4,6 +4,7 @@ const createMain = require("./createMain");
 const deleteMain = require("./deleteMain");
 const rejectMain = require("./rejectMain");
 const instanceMain = require("./instanceMain");
+const indexMain = require("./indexMain");
 const groupMain = require("./groupMain");
 const metadataMain = require("./metadataMain");
 const compressionOptionParser = require("./util/compressionOptionParser");
@@ -114,6 +115,11 @@ const { mkdicomwebConfig } = ConfigPoint.register({
           "deduplicated files each time a study instance UID is found, and only updates those studies\n" +
           "having at least one ",
       },
+      {
+        command: "index",
+        main: indexMain,
+        helpDescription: "Recreate the index for the DICOMweb data.",
+      },
       {
         command: "instance",
         arguments: ["input"],

package/lib/model/TagLists.js

@@ -9,9 +9,9 @@ const { PatientID, PatientName, IssuerOfPatientID } = Tags;
 const { StudyDescription, AccessionNumber, StudyInstanceUID, StudyDate, StudyTime } = Tags;
 const { SeriesDescription, SeriesNumber, SeriesInstanceUID, SeriesDate, SeriesTime } = Tags;
 
-const { DeduppedHash, DeduppedRef, DeduppedType, } = Tags;
+const { DeduppedHash, DeduppedRef, DeduppedType } = Tags;
 
-const { pushList, getList, setValue, getValue } = Tags;
+const { pushList, setValue, getValue } = Tags;
 
 const PatientQuery = [
   PatientID,
@@ -106,14 +106,14 @@ const ImageExtract = [
 ];
 
 const addHash = (data, type) => {
-  const existing = getValue(data,DeduppedHash);
+  const existing = getValue(data, DeduppedHash);
   if (existing) {
     return existing;
   }
 
   const hashValue = hasher.hash(data);
-  setValue(data, DeduppedHash, hashValue );
-  setValue(data, DeduppedType, type );
+  setValue(data, DeduppedHash, hashValue);
+  setValue(data, DeduppedType, type);
   return hashValue;
 };
 
@@ -141,7 +141,7 @@ const TagSets = {
     });
     const hashValue = addHash(ret, type);
     if (hashRef) {
-      pushList(data,DeduppedRef,hashValue);
+      pushList(data, DeduppedRef, hashValue);
     }
     return ret;
   },

package/lib/operation/InstanceDeduplicate.js

@@ -3,7 +3,7 @@ const JSONWriter = require("../writer/JSONWriter");
 const TagLists = require("../model/TagLists");
 const Tags = require("../dictionary/Tags");
 
-const {getValue, setValue} = Tags;
+const { getValue, setValue } = Tags;
 
 const extractors = {
   patient: TagLists.PatientQuery,
@@ -21,26 +21,26 @@ const extractors = {
 async function deduplicateSingleInstance(id, imageFrame) {
   if (!imageFrame) return {};
   const studyData = await this.completeStudy.getCurrentStudyData(this, id);
-  const seriesUID = getValue(imageFrame,Tags.SeriesInstanceUID);
-  const sopUID = getValue(imageFrame,Tags.SOPInstanceUID);
+  const seriesUID = getValue(imageFrame, Tags.SeriesInstanceUID);
+  const sopUID = getValue(imageFrame, Tags.SOPInstanceUID);
   if (!sopUID) {
     console.warn("No sop instance UID in", imageFrame);
     return {};
   }
   if (studyData.sopExists(sopUID)) {
-    if( this.verbose ) console.log('SOP Instance UID', sopUID, 'already exists, skipping');
+    if (this.verbose) console.log("SOP Instance UID", sopUID, "already exists, skipping");
     // TODO - allow replace as an option
     // Null value means skip writing this instance
     return null;
   }
 
-  if( this.verbose ) console.log('SOP Instance UID', sopUID, 'being added');
+  if (this.verbose) console.log("SOP Instance UID", sopUID, "being added");
   const deduplicated = { ...imageFrame };
 
   if (!this.extractors) this.extractors = extractors;
   for (const key of Object.keys(this.extractors)) {
     const extracted = TagLists.extract(deduplicated, key, this.extractors[key], TagLists.RemoveExtract);
-    const hashKey = getValue(extracted,Tags.DeduppedHash);
+    const hashKey = getValue(extracted, Tags.DeduppedHash);
     await studyData.addExtracted(this, hashKey, extracted);
   }
 

package/lib/operation/StudyData.js

@@ -6,11 +6,10 @@ const Tags = require("../dictionary/Tags");
 const TagLists = require("../model/TagLists");
 const JSONWriter = require("../writer/JSONWriter");
 
-const {getValue, setValue, getList, setList} = Tags;
+const { getValue, setValue, getList, setList } = Tags;
 const hasher = hashFactory();
 
-const getSeriesInstanceUid = (seriesInstance) =>
-  getValue(seriesInstance,Tags.SeriesInstanceUID);
+const getSeriesInstanceUid = (seriesInstance) => getValue(seriesInstance, Tags.SeriesInstanceUID);
 
 /**
  * StudyData contains information about the grouped study data.  It is used to create
@@ -88,10 +87,10 @@ class StudyData {
         return true;
       }
       const info = deduplicatedTopFile[0];
-      if (!info || getValue(info,Tags.DeduppedHash) || getValue(info,Tags.DeduppedType) != "info") {
+      if (!info || getValue(info, Tags.DeduppedHash) || getValue(info, Tags.DeduppedType) != "info") {
         return true;
       }
-      const hashValue = getValue(info,Tags.DeduppedHash);
+      const hashValue = getValue(info, Tags.DeduppedHash);
       return this.existingFiles[0].indexOf(hashValue) == -1;
     } catch (e) {
       console.log("Assume study metadata is dirty", e);
@@ -105,12 +104,12 @@ class StudyData {
     this.newInstancesAdded += 1;
     for (let i = 0; i < this.deduplicated.length; i++) {
       const recombined = await this.recombine(i);
-      const reSeriesUid = getValue(recombined,Tags.SeriesInstanceUID);
+      const reSeriesUid = getValue(recombined, Tags.SeriesInstanceUID);
       if (reSeriesUid !== seriesInstanceUid) continue;
-      const reSop = getValue(recombined,Tags.SOPInstanceUID);
+      const reSop = getValue(recombined, Tags.SOPInstanceUID);
       if (!reSop) continue;
       if (reSop !== sopInstanceUid) continue;
-      setValue(this.deduplicated[i], Tags.DeduppedType,"deleted");
+      setValue(this.deduplicated[i], Tags.DeduppedType, "deleted");
     }
   }
 
@@ -150,7 +149,7 @@ class StudyData {
     if (index < 0 || index >= this.deduplicated.length) {
       throw new Error(`Can't read index ${index}, out of bounds [0..${this.deduplicated.length})`);
     }
-    const refs = getList(deduplicated,Tags.DeduppedRef);
+    const refs = getList(deduplicated, Tags.DeduppedRef);
     if (!refs) {
       console.log("No refs for", deduplicated);
       return deduplicated;
@@ -165,7 +164,7 @@ class StudyData {
 
   async addExtracted(callback, hashKey, item) {
     if (this.extractData[hashKey]) {
-      if( this.verbose ) console.log("Already have extracted", hashKey, getValue(item,Tags.DeduppedType));
+      if (this.verbose) console.log("Already have extracted", hashKey, getValue(item, Tags.DeduppedType));
       return;
     }
     await callback.bulkdata(this, hashKey, item);
@@ -192,7 +191,7 @@ class StudyData {
       // console.log('Not adding', hashValue, 'because the hash exists');
       return false;
     }
-    const sopValue = getValue(data,Tags.SOPInstanceUID);
+    const sopValue = getValue(data, Tags.SOPInstanceUID);
     const sopIndex = this.sopInstances[sopValue];
     if (!sopValue) {
       console.warn("No sop value in", filename, "reading", data);
@@ -275,14 +274,14 @@ class StudyData {
         if (type == Tags.InstanceType) {
           this.internalAddDeduplicated(item, name);
         } else if (type == "info") {
-          const refs = getList(item,Tags.DeduppedRef);
+          const refs = getList(item, Tags.DeduppedRef);
           if (refs) {
             refs.forEach((hashValue) => {
               this.readHashes[hashValue] = `${hashValue}.gz`;
             });
           }
         } else {
-          const hashValue = getValue(item,Tags.DeduppedHash);
+          const hashValue = getValue(item, Tags.DeduppedHash);
           if (hashValue) {
             this.extractData[hashValue] = item;
           }
@@ -299,7 +298,7 @@ class StudyData {
 
     for (let i = 0; i < this.numberOfInstances; i++) {
       const seriesInstance = await this.recombine(i);
-      const type = getValue(seriesInstance,Tags.DeduppedType);
+      const type = getValue(seriesInstance, Tags.DeduppedType);
       if (type == "deleted") {
         console.log("Skipping", type);
         continue;
@@ -337,7 +336,7 @@ class StudyData {
       numberOfInstances += instances.length;
       numberOfSeries += 1;
       seriesList.push(seriesQuery);
-      const modality = getValue(seriesQuery,Tags.Modality);
+      const modality = getValue(seriesQuery, Tags.Modality);
       if (modalitiesInStudy.indexOf(modality) == -1) modalitiesInStudy.push(modality);
       await JSONWriter(seriesPath, "metadata", instances, {
         gzip: true,
@@ -379,8 +378,8 @@ class StudyData {
   createInfo() {
     const data = {};
     const hashValue = hasher.hash(this.deduplicated);
-    setValue(data,Tags.DeduppedHash,hashValue);
-    setValue(data,Tags.DeduppedType,"info");
+    setValue(data, Tags.DeduppedHash, hashValue);
+    setValue(data, Tags.DeduppedType, "info");
     return data;
   }
 
@@ -393,7 +392,7 @@ class StudyData {
   /** Writes the deduplicated group */
   async writeDeduplicatedGroup() {
     const data = this.createInfo();
-    const hashValue = getValue(data,Tags.DeduppedHash);
+    const hashValue = getValue(data, Tags.DeduppedHash);
     console.log(
       "Writing deduplicated hash data set data with",
       Object.values(this.extractData).length,
@@ -401,8 +400,11 @@ class StudyData {
       this.deduplicated.length,
       "instance items"
     );
-    setList(data,Tags.DeduppedRef,
-      Object.keys(this.readHashes).filter(() => this.deduplicatedHashes[hashValue] == undefined));
+    setList(
+      data,
+      Tags.DeduppedRef,
+      Object.keys(this.readHashes).filter(() => this.deduplicatedHashes[hashValue] == undefined)
+    );
     const deduplicatedList = [data, ...Object.values(this.extractData), ...this.deduplicated];
     // const naturalList = deduplicatedList.map(Tags.naturalizeDataset);
     // // console.log("naturalList=", JSON.stringify(naturalList,null,2));

package/lib/operation/adapter/transcodeImage.js

@@ -15,7 +15,7 @@ const transcodeOp = {
 const transcodeDestinationMap = {
   lei: {
     transferSyntaxUid: "1.2.840.10008.1.2.1",
-    transcodeOp: transcodeOp.none
+    transcodeOp: transcodeOp.none,
   },
   jls: {
     transferSyntaxUid: "1.2.840.10008.1.2.4.80",
@@ -71,9 +71,9 @@ const transcodeSourceMap = {
 };
 
 /**
- * Get an existing destination transcoder from destination map. 
+ * Get an existing destination transcoder from destination map.
  *
- * @param {*} id Destination type to compress to 
+ * @param {*} id Destination type to compress to
  * @returns A partial transcoder definition. Otherwise it returns undefined.
  */
 function getDestinationTranscoder(id) {
@@ -99,7 +99,7 @@ function getTranscoder(transferSyntaxUid, { contentType, verbose }) {
   if (!sourceTranscoder || !destinationTranscoder) {
     return undefined;
   }
-  
+
   return {
     transferSyntaxUid: destinationTranscoder.transferSyntaxUid,
     transcodeOp: sourceTranscoder.transcodeOp | destinationTranscoder.transcodeOp, // eslint-disable-line no-bitwise
@@ -107,7 +107,6 @@ function getTranscoder(transferSyntaxUid, { contentType, verbose }) {
   };
 }
 
-
 /**
  * Tell whether given id contain transferSyntaxUid which can be transcoded or not.
  * @param {*} id object containing transferSyntaxUid
@@ -289,7 +288,7 @@ function transcodeMetadata(metadata, id, options) {
   const result = { ...metadata };
 
   if (result[Tags.AvailableTransferSyntaxUID]) {
-    Tags.setValue(result,Tags.AvailableTransferSyntaxUID, transcodedId.transferSyntaxUid);
+    Tags.setValue(result, Tags.AvailableTransferSyntaxUID, transcodedId.transferSyntaxUid);
   }
 
   return result;

package/lib/util/compressionOptionParser.js

@@ -1,13 +1,13 @@
 const { program } = require("@radicalimaging/static-wado-util");
 const { getDestinationTranscoder } = require("../operation/adapter/transcodeImage");
 
-module.exports = function compressionOptionParser(value) { 
+module.exports = function compressionOptionParser(value) {
   const destination = getDestinationTranscoder(value);
   if (destination) {
     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}`);
-  } 
+  }
   return destination.transferSyntaxUid;
-}
+};

package/lib/writer/CompleteStudyWriter.js

@@ -47,12 +47,12 @@ const CompleteStudyWriter = (options) => {
     const studyQuery = await studyData.writeMetadata();
 
     const allStudies = await JSONReader(options.directoryName, "studies/index.json.gz", []);
-    const studyUID = Tags.getValue(studyQuery,Tags.StudyInstanceUID);
+    const studyUID = Tags.getValue(studyQuery, Tags.StudyInstanceUID);
     if (!studyUID) {
       console.error("studyQuery=", studyQuery);
       throw new Error("Study query has null studyUID");
     }
-    const studyIndex = allStudies.findIndex((item) => Tags.getValue(item,Tags.StudyInstanceUID) == studyUID);
+    const studyIndex = allStudies.findIndex((item) => Tags.getValue(item, Tags.StudyInstanceUID) == studyUID);
     if (studyIndex == -1) {
       allStudies.push(studyQuery);
     } else {

package/lib/writer/HashDataWriter.js

@@ -47,7 +47,7 @@ HashDataWriter.createHashPath = (data, options = {}) => {
   const { mimeType } = options;
   const isRaw = ArrayBuffer.isView(data);
   const extension = isRaw ? (mimeType && extensions[mimeType]) || "" : ".json";
-  const hashValue = Tags.getValue(data,Tags.DeduppedHash) || hasher.hash(data);
+  const hashValue = Tags.getValue(data, Tags.DeduppedHash) || hasher.hash(data);
 
   return {
     // Use string concat as this value is used for the BulkDataURI which needs forward slashes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radicalimaging/static-wado-creator",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "Library to convert DICOMP10 to DICOMweb format. Original upstream: https://github.com/chafey/dicomp10-to-dicomweb-js",
   "publishConfig": {
     "access": "public"
@@ -53,8 +53,8 @@
     "build": "echo \"No build yet\" && exit 0",
     "link:exec": "npm link",
     "lint": "npx eslint --color \"*(bin|lib)/**/*.{js,mjs}\"",
-      "lint:fix": "npx eslint --fix --color \"*(bin|lib)/**/*.{js,mjs}\""
-    },
+    "lint:fix": "npx eslint --fix --color \"*(bin|lib)/**/*.{js,mjs}\""
+  },
   "jest": {
     "verbose": true
   },
@@ -63,11 +63,12 @@
     "@radicalimaging/static-cs-lite": "^0.0.2",
     "@radicalimaging/static-wado-util": "^0.6.2",
     "canvas": "^2.9.1",
-    "config-point": "^0.5.0",
+    "config-point": "0.5.1",
+    "dcmjs": "^0.27.0",
     "dicom-parser": "^1.8.13",
     "glob": "^7.2.0",
-    "uuid": "^8.3.2",
-    "node-object-hash": "^2.3.10"
+    "node-object-hash": "^2.3.10",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "must": "^0.13.4"

package/lib/operation/adapter/asyncIterableToBuffer.js

@@ -1,112 +0,0 @@
-const { Stats } = require("@radicalimaging/static-wado-util");
-/* eslint "no-param-reassign": "off" */
-
-const handler = {
-  get(obj, key) {
-    const ikey = parseInt(key);
-    if (ikey == key) return obj.index_get(ikey);
-    const handlerFunc = handler[key];
-    if (handlerFunc && key != "get") return handlerFunc(obj, key);
-    if (!obj._keys[key]) {
-      console.log("New call to", key);
-      obj._keys[key] = true;
-    }
-    return obj[key];
-  },
-
-  length: (obj) => obj.combinedLength,
-};
-
-const StreamingFunctions = {
-  addChunks(chunks) {
-    if (!this.chunks) this.chunks = [];
-    chunks.forEach((chunk) => this.chunks.push(chunk));
-    this.combinedLength = 0;
-    let i = 0;
-    this.chunks.forEach((chunk) => {
-      chunk.start = this.combinedLength;
-      chunk.i = i;
-      i += 1;
-      this.combinedLength += chunk.length;
-    });
-    this.lastChunk = this.chunks[0];
-  },
-
-  index_get(ikey) {
-    const found = this.findChunk(ikey);
-    if (!found) throw Error(`index ${ikey} not found between 0..${this.combinedLength}`);
-    return found[ikey - found.start];
-  },
-
-  findChunk(ikey) {
-    let i = (this.lastChunk.start <= ikey && this.lastChunk.i) || 0;
-    while (i < this.chunks.length) {
-      const chunk = this.chunks[i];
-      if (ikey >= chunk.start && ikey < chunk.start + chunk.length) {
-        this.lastChunk = chunk;
-        return chunk;
-      }
-      i += 1;
-    }
-    return undefined;
-  },
-
-  slice(start, end) {
-    const buflen = end - start;
-    const ret = Buffer.alloc(buflen);
-    let i = 0;
-    while (i < buflen) {
-      const chunk = this.findChunk(start + i);
-      const chunkI = start + i - chunk.start;
-      const useLen = Math.min(buflen, chunk.length - chunkI);
-      chunk.copy(ret, i, chunkI, chunkI + useLen);
-      i += useLen;
-    }
-    return ret;
-  },
-
-  hexSlice(start, end) {
-    return this.slice(start, end).hexSlice();
-  },
-
-  /** The internal node copy function is a native that directly accesses internal class details, so over-ride it.
-   * TODO: Make this efficient by using the internal copy function when available rather than copy one at a time.
-   */
-  copy(target, targetStart = 0, srcStart = 0, srcEnd = 0) {
-    const { length } = target;
-    const srcLength = (srcEnd === undefined && Math.min(this.length, srcEnd)) || this.length;
-    const copied = 0;
-    while (targetStart < length && srcStart < srcLength) {
-      target[targetStart] = this[srcStart];
-      targetStart += 1;
-      srcStart += 1;
-    }
-    return copied;
-  },
-
-  _keys: { then: true, lastChunk: true, chunks: true },
-};
-
-Object.keys(StreamingFunctions).forEach((key) => {
-  StreamingFunctions._keys[key] = true;
-});
-
-const StreamingBuffer = (chunks) => {
-  const buf = Buffer.from("NotUsed");
-  Object.assign(buf, StreamingFunctions);
-  buf.addChunks(chunks);
-  return new Proxy(buf, handler);
-};
-
-const asyncIteratorToBuffer = async (readable) => {
-  if (ArrayBuffer.isView(readable)) return readable;
-  const chunks = [];
-  for await (const chunk of readable) {
-    chunks.push(chunk);
-    Stats.BufferStats.add("Read Async", `Read async buffer ${chunks.length}`, 1024);
-  }
-  Stats.BufferStats.reset();
-  return StreamingBuffer(chunks);
-};
-
-module.exports = asyncIteratorToBuffer;