@radicalimaging/static-wado-creator 1.5.0 → 1.6.11

package/lib/writer/HashDataWriter.js

@@ -1,27 +1,27 @@
-const hashFactory = require("node-object-hash");
-const { createHash } = require("crypto");
+const hashFactory = require('node-object-hash');
+const { createHash } = require('crypto');
 
-const path = require("path");
-const { Tags } = require("@radicalimaging/static-wado-util");
-const WriteStream = require("./WriteStream");
-const WriteMultipart = require("./WriteMultipart");
-const ExpandUriPath = require("./ExpandUriPath");
-const { MultipartHeader } = require("./MultipartHeader");
+const path = require('path');
+const { Tags } = require('@radicalimaging/static-wado-util');
+const WriteStream = require('./WriteStream');
+const WriteMultipart = require('./WriteMultipart');
+const ExpandUriPath = require('./ExpandUriPath');
+const { MultipartHeader } = require('./MultipartHeader');
 
 // Extensions for encapsulated content.  Do NOT add any executable content extensions here.
 const extensions = {
-  "application/pdf": ".pdf",
-  "text/json": ".json",
-  "application/xml+cda": ".cda.xml",
+  'application/pdf': '.pdf',
+  'text/json': '.json',
+  'application/xml+cda': '.cda.xml',
 };
 
 const baseHasher = hashFactory.hasher();
 
 const hasher = {
-  hash: (v) => {
+  hash: v => {
     const type = v.constructor?.name;
-    if (type === "Buffer") {
-      return createHash("sha256").update(v).digest("hex");
+    if (type === 'Buffer') {
+      return createHash('sha256').update(v).digest('hex');
     }
     return baseHasher.hash(v);
   },
@@ -29,7 +29,7 @@ const hasher = {
 
 /** Writes out JSON files to the given file name.  Automatically GZips them, and adds the extension */
 const HashDataWriter =
-  (options) =>
+  options =>
   async (id, key, data, additionalOptions = {}) => {
     const isRaw = ArrayBuffer.isView(data);
     const { mimeType } = additionalOptions;
@@ -43,7 +43,11 @@ const HashDataWriter =
       gzip,
     });
     if (isRaw) {
-      await WriteMultipart(writeStream, [new MultipartHeader("Content-Type", "application/octet-stream")], rawData);
+      await WriteMultipart(
+        writeStream,
+        [new MultipartHeader('Content-Type', 'application/octet-stream')],
+        rawData
+      );
     } else {
       await writeStream.write(rawData);
     }
@@ -57,7 +61,7 @@ const HashDataWriter =
 HashDataWriter.createHashPath = (data, options = {}) => {
   const { mimeType } = options;
   const isRaw = ArrayBuffer.isView(data);
-  const extension = isRaw ? (mimeType && extensions[mimeType]) || "" : ".json";
+  const extension = isRaw ? (mimeType && extensions[mimeType]) || '' : '.json';
   const hashValue = Tags.getValue(data, Tags.DeduppedHash) || hasher.hash(data);
 
   return {

package/lib/writer/ImageFrameWriter.js

@@ -1,10 +1,10 @@
-const uids = require("../model/uids");
-const WriteStream = require("./WriteStream");
-const WriteMultipart = require("./WriteMultipart");
-const ExpandUriPath = require("./ExpandUriPath");
-const { MultipartHeader, MultipartAttribute } = require("./MultipartHeader");
+const uids = require('../model/uids');
+const WriteStream = require('./WriteStream');
+const WriteMultipart = require('./WriteMultipart');
+const ExpandUriPath = require('./ExpandUriPath');
+const { MultipartHeader, MultipartAttribute } = require('./MultipartHeader');
 
-const ImageFrameWriter = (options) => {
+const ImageFrameWriter = options => {
   const { encapsulatedImage, singlePartImage } = options;
   return async (id, index, imageFrame) => {
     const { transferSyntaxUid } = id;
@@ -24,11 +24,20 @@ const ImageFrameWriter = (options) => {
       });
       await WriteMultipart(
         writeStream,
-        [new MultipartHeader("Content-Type", type.contentType, [new MultipartAttribute("transfer-syntax", transferSyntaxUid)])],
+        [
+          new MultipartHeader('Content-Type', type.contentType, [
+            new MultipartAttribute('transfer-syntax', transferSyntaxUid),
+          ]),
+        ],
         content
       );
       await writeStream.close();
-      console.verbose("Wrote encapsulated image frame", id.sopInstanceUid, index + 1, type.contentType);
+      console.verbose(
+        'Wrote encapsulated image frame',
+        id.sopInstanceUid,
+        index + 1,
+        type.contentType
+      );
     }
     if (extension && singlePartImage) {
       const writeStreamSingle = WriteStream(id.imageFrameRootPath, `${1 + index}${extension}`, {
@@ -37,10 +46,13 @@ const ImageFrameWriter = (options) => {
       });
       await writeStreamSingle.write(content);
       await writeStreamSingle.close();
-      console.verbose("Wrote single part image frame", id.sopInstanceUid, index + 1, extension);
+      console.verbose('Wrote single part image frame', id.sopInstanceUid, index + 1, extension);
     }
     const includeSeries = true;
-    return ExpandUriPath(id, `instances/${id.sopInstanceUid}/frames`, { includeSeries, ...options });
+    return ExpandUriPath(id, `instances/${id.sopInstanceUid}/frames`, {
+      includeSeries,
+      ...options,
+    });
   };
 };
 

package/lib/writer/MultipartHeader.js

@@ -1,4 +1,4 @@
-const MultipartAttribute = require("./MultipartAttribute");
+const MultipartAttribute = require('./MultipartAttribute');
 
 class MultipartHeader {
   constructor(headerName, headerValue, attributes = []) {

package/lib/writer/RawDicomWriter.js

@@ -1,13 +1,17 @@
-const { Tags } = require("@radicalimaging/static-wado-util");
-const WriteStream = require("./WriteStream");
-const WriteMultipart = require("./WriteMultipart");
-const { MultipartHeader } = require("./MultipartHeader");
+const { Tags } = require('@radicalimaging/static-wado-util');
+const WriteStream = require('./WriteStream');
+const WriteMultipart = require('./WriteMultipart');
+const { MultipartHeader } = require('./MultipartHeader');
 
-const modalitiesToRawWrite = ["SEG", "SR"];
+const modalitiesToRawWrite = ['SEG', 'SR'];
+const sopClassesToRawWrite = ['1.2.840.10008.5.1.4.1.1.30'];
 
-const defaultSelector = (instance) => {
+const defaultSelector = instance => {
   const modality = instance.metadata[Tags.Modality]?.Value?.[0];
-  return modalitiesToRawWrite.indexOf(modality) !== -1;
+  const sopClass = instance.metadata[Tags.SOPClassUID]?.Value?.[0];
+  return (
+    modalitiesToRawWrite.indexOf(modality) !== -1 || sopClassesToRawWrite.indexOf(sopClass) !== -1
+  );
 };
 
 /** Writes out raw DICOM files, encapsulated in multipart and gzipped - currently just DICOM SR and SEG */
@@ -21,14 +25,18 @@ const RawDicomWriter =
     if (!selector(instance)) {
       return undefined;
     }
-    const contentType = options.contentType || "application/dicom";
-    const writeStream = WriteStream(id.sopInstanceRootPath, "index.mht", {
+    const contentType = options.contentType || 'application/dicom';
+    const writeStream = WriteStream(id.sopInstanceRootPath, 'index.mht', {
       gzip: options.gzip,
       mkdir: true,
     });
     const { length } = content;
     const buffer = content.slice(0, length);
-    await WriteMultipart(writeStream, [new MultipartHeader("Content-Type", contentType, [])], buffer);
+    await WriteMultipart(
+      writeStream,
+      [new MultipartHeader('Content-Type', contentType, [])],
+      buffer
+    );
     await writeStream.close();
   };
 RawDicomWriter.defaultSelector = defaultSelector;

package/lib/writer/ThumbnailWriter.js

@@ -1,4 +1,4 @@
-const WriteStream = require("./WriteStream");
+const WriteStream = require('./WriteStream');
 
 const ThumbnailWriter = () => async (filePath, fileName, thumbBuffer) => {
   const writeStream = WriteStream(filePath, fileName, {
@@ -7,7 +7,7 @@ const ThumbnailWriter = () => async (filePath, fileName, thumbBuffer) => {
 
   await writeStream.write(thumbBuffer);
 
-  console.verbose("Wrote thumbnail frame", filePath, fileName);
+  console.verbose('Wrote thumbnail frame', filePath, fileName);
   return writeStream.close();
 };
 

package/lib/writer/VideoWriter.js

@@ -1,62 +1,51 @@
 /** Write raw video file */
-const { Tags } = require("@radicalimaging/static-wado-util");
-const WriteStream = require("./WriteStream");
+const { Tags } = require('@radicalimaging/static-wado-util');
+const WriteStream = require('./WriteStream');
 
-const MPEG2 = "mpg";
-const H264 = "mp4";
-const H265 = "h265";
+const MPEG2 = 'mpg';
+const H264 = 'mp4';
+const H265 = 'h265';
 
 const VIDEO_TYPES = {
-  "1.2.840.10008.1.2.4.100": MPEG2,
-  "1.2.840.10008.1.2.4.101": MPEG2,
-  "1.2.840.10008.1.2.4.102": H264,
-  "1.2.840.10008.1.2.4.103": H264,
-  "1.2.840.10008.1.2.4.104": H264,
-  "1.2.840.10008.1.2.4.105": H264,
-  "1.2.840.10008.1.2.4.106": H264,
-  "1.2.840.10008.1.2.4.107": H265,
-  "1.2.840.10008.1.2.4.108": H265,
+  '1.2.840.10008.1.2.4.100': MPEG2,
+  '1.2.840.10008.1.2.4.101': MPEG2,
+  '1.2.840.10008.1.2.4.102': H264,
+  '1.2.840.10008.1.2.4.103': H264,
+  '1.2.840.10008.1.2.4.104': H264,
+  '1.2.840.10008.1.2.4.105': H264,
+  '1.2.840.10008.1.2.4.106': H264,
+  '1.2.840.10008.1.2.4.107': H265,
+  '1.2.840.10008.1.2.4.108': H265,
   // TODO - add the new multi-segment MPEG2 and H264 variants
 };
 
-const isVideo = (value) =>
-  VIDEO_TYPES[
-    value && value.string ? value.string(Tags.RawTransferSyntaxUID) : value
-  ];
+const isVideo = value =>
+  VIDEO_TYPES[value && value.string ? value.string(Tags.RawTransferSyntaxUID) : value];
 
 const VideoWriter = () =>
   async function run(id, dataSet) {
     console.log(`Writing video  ${id.sopInstanceUid}`);
     const extension = VIDEO_TYPES[dataSet.string(Tags.RawTransferSyntaxUID)];
     const filename = `index.${extension}`;
-    const writeStream = WriteStream(
-      `${id.sopInstanceRootPath}/rendered`,
-      filename,
-      {
-        mkdir: true,
-      }
-    );
+    const writeStream = WriteStream(`${id.sopInstanceRootPath}/rendered`, filename, {
+      mkdir: true,
+    });
     let length = 0;
     const { fragments } = dataSet.elements.x7fe00010;
 
     if (!fragments) {
-      console.warn("No video data");
-      return "";
+      console.warn('No video data');
+      return '';
     }
     // The zero position fragment isn't available, even though present in the original data
     for (let i = 0; i < fragments.length; i++) {
       const fragment = fragments[i];
-      const blob = dataSet.byteArray.slice(
-        fragment.position,
-        fragment.position + fragment.length
-      );
+      const blob = dataSet.byteArray.slice(fragment.position, fragment.position + fragment.length);
       length += blob.length;
       await writeStream.write(blob);
     }
     await writeStream.close();
-    console.log(
-      `Done video ${id.sopInstanceRootPath}\\${filename} of length ${length}`
-    );
+    console.log(`Done video ${id.sopInstanceRootPath}\\${filename} of length ${length}`);
     return `series/${id.seriesInstanceUid}/instances/${id.sopInstanceUid}/rendered?length=${length}&offset=0&accept=video/mp4`;
   };
 

package/lib/writer/WriteMultipart.js

@@ -1,4 +1,4 @@
-const { v4: uuid } = require("uuid");
+const { v4: uuid } = require('uuid');
 
 const WriteMultipart = async (writeStream, headers, content) => {
   const boundaryId = uuid();
@@ -12,9 +12,9 @@ const WriteMultipart = async (writeStream, headers, content) => {
         await writeStream.write(`;${attribute.attributeName}=${attribute.attributeValue}`);
       }
     }
-    await writeStream.write("\r\n");
+    await writeStream.write('\r\n');
   }
-  await writeStream.write("\r\n");
+  await writeStream.write('\r\n');
   await writeStream.write(content);
   await writeStream.write(`\r\n--BOUNDARY_${boundaryId}--`);
 };

package/lib/writer/WriteStream.js

@@ -1,6 +1,6 @@
-const fs = require("fs");
-const zlib = require("zlib");
-const path = require("path");
+const fs = require('fs');
+const zlib = require('zlib');
+const path = require('path');
 
 let writeCount = 0;
 
@@ -10,24 +10,26 @@ let writeCount = 0;
  * requires syncing.
  */
 const WriteStream = (dir, nameSrc, options = {}) => {
-  const isGzip = nameSrc.indexOf(".gz") != -1 || options.gzip;
-  const name = (isGzip && nameSrc.indexOf(".gz") === -1 && `${nameSrc}.gz`) || nameSrc;
-  if (options.mkdir) fs.mkdirSync(dir, { recursive: true });
+  const isGzip = nameSrc.indexOf('.gz') != -1 || options.gzip;
+  const name = (isGzip && nameSrc.indexOf('.gz') === -1 && `${nameSrc}.gz`) || nameSrc;
+  if (options.mkdir && !fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
 
   const tempName = path.join(dir, `tempFile-${Math.round(Math.random() * 1000000000)}`);
   const finalName = path.join(dir, name);
   writeCount++;
   if (writeCount > 10) {
-    console.log("Write count", tempName, finalName, writeCount);
+    console.log('Write count', tempName, finalName, writeCount);
     if (writeCount > 100) {
-      console.error("Too many open writes", new Error());
+      console.error('Too many open writes', new Error());
       throw new Error(`Write count too high ${writeCount} destination ${finalName}`);
     }
   }
   const rawStream = fs.createWriteStream(tempName);
-  const closePromise = new Promise((resolve) => {
-    rawStream.on("close", () => {
-      resolve("closed");
+  const closePromise = new Promise(resolve => {
+    rawStream.on('close', () => {
+      resolve('closed');
     });
   });
 
@@ -35,7 +37,7 @@ const WriteStream = (dir, nameSrc, options = {}) => {
   if (isGzip) {
     writeStream = zlib.createGzip();
     writeStream.pipe(rawStream);
-    writeStream.on("close", () => {
+    writeStream.on('close', () => {
       rawStream.close();
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radicalimaging/static-wado-creator",
-  "version": "1.5.0",
+  "version": "1.6.11",
   "description": "Library to convert DICOMP10 to DICOMweb format. Original upstream: https://github.com/chafey/dicomp10-to-dicomweb-js",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,9 @@
     "DICOM",
     "DICOMweb"
   ],
-  "author": [
-    "Chris Hafey <chafey@gmail.com>",
-    "Bill Wallace <bill.wallace@radicalimaging.com>"
-  ],
+  "author": "Bill Wallace <bill.wallace@radicalimaging.com>",
   "contributors": [
+    "Chris Hafey <chafey@gmail.com>",
     "Rodolfo Costa <rodolfo.costa@radicalimaging.com>"
   ],
   "engines": {
@@ -24,48 +22,54 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/OHIF/static-wado",
+    "url": "https://github.com/radicalimaging/static-dicomweb",
     "directory": "packages/static-wado-creator"
   },
   "bugs": {
-    "url": "https://github.com/OHIF/static-wado/issues"
+    "url": "https://github.com/radicalimaging/static-dicomweb/issues"
   },
-  "homepage": "https://github.com/OHIF/static-wado#readme",
+  "homepage": "https://github.com/radicalimaging/static-dicomweb#readme",
   "license": "ISC",
   "main": "lib/index.js",
+  "module": "dist/index.js",
   "directories": {
     "lib": "lib",
+    "dist": "dist",
     "bin": "bin"
   },
   "files": [
     "bin",
+    "dist",
     "lib"
   ],
   "bin": {
-    "mkdicomweb": "bin/mkdicomweb.js"
+    "mkdicomweb": "bin/mkdicomweb.mjs"
   },
   "scripts": {
     "test": "jest --config ./jest.config.js",
-    "build": "echo \"No build yet\" && exit 0",
+    "build": "bun run build:esm",
+    "build:esm": "bun build lib/index.js --target node --outdir dist --",
+    "clean": "rimraf dist",
     "link:exec": "npm install -g && npm link",
     "lint": "npx eslint --color \"**/*.{js,mjs,cjs}\"",
+    "mkdicomweb": "bun bin/mkdicomwebDev.mjs --",
+    "pack:js": "npm pack --",
+    "publishJS": "yarn publish  --no-git-tag-version",
     "lint:fix": "npx eslint --fix --color \"**/*.{js,mjs,cjs}\""
   },
   "jest": {
     "verbose": true
   },
   "dependencies": {
-    "@cornerstonejs/dicom-codec": ">=1.0.5",
-    "@radicalimaging/static-cs-lite": "^1.5.0",
-    "@radicalimaging/static-wado-util": "^1.5.0",
-    "canvas": "^2.11.1",
+    "@radicalimaging/cs3d": ">=1.6.1",
+    "@radicalimaging/static-wado-util": ">=1.6.1",
+    "canvas": ">=3.1.0",
     "config-point": ">=0.5.1",
-    "dcmjs": "^0.29.5",
+    "dcmjs": "0.35.0",
     "dicom-parser": "^1.8.13",
-    "glob": "^7.2.0",
+    "glob": "^11.0.0",
     "node-object-hash": "^3.0.0",
-    "npmjs": "npm publish",
-    "uuid": "^8.3.2"
+    "uuid": "^11.0.2"
   },
   "devDependencies": {
     "must": "^0.13.4"

package/bin/mkdicomweb.js

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-
-const { mkdicomwebConfig } = require("../lib");
-const { configureProgram } = require("../lib/program");
-
-// Configure program commander
-configureProgram(mkdicomwebConfig).then(() => {
-  console.verbose("done");
-});