@file-viewer/renderer-dicom 3.0.0 → 3.0.1

package/README.en.md

@@ -14,7 +14,7 @@ const viewer = createViewer(container, {
 })
 ```
 
-The first scope accepts Implicit/Explicit VR Little Endian, JPEG Lossless Process 14 SV1, JPEG-LS Lossless, and JPEG 2000 Lossless Part 10 files covered by Chromium, Firefox, and WebKit regression (single-frame or multi-frame). It provides stack navigation, window width/center, zoom, pan, left/right 90° rotation, fit-to-view, and unified File Viewer view-state restoration. Other transfer syntaxes, PACS/DICOMweb, multi-file series assembly, annotations, MPR, segmentation, hanging protocols, and diagnostic use are outside this package.
+The first scope accepts Implicit/Explicit/Deflated Explicit VR Little Endian, JPEG Lossless Process 14 SV1, JPEG-LS Lossless, and JPEG 2000 Lossless Part 10 files covered by Chromium, Firefox, and WebKit regression (single-frame or multi-frame). It provides stack navigation, window width/center, zoom, pan, left/right 90° rotation, fit-to-view, and unified File Viewer view-state restoration. Other transfer syntaxes, PACS/DICOMweb, multi-file series assembly, annotations, MPR, segmentation, hanging protocols, and diagnostic use are outside this package.
 
 The package initializes codec workers only after a DICOM file is selected. Defaults are limited to a 64 MiB source, 256 frames, 16 million decoded samples per frame, and 48 million decoded samples in total; applications can configure lower limits. Destroying the viewer removes only that instance's file-manager entry, viewport, rendering engine, listeners, metadata, and image cache. Cornerstone owns the shared worker pool, so destroying a File Viewer instance never terminates a host-owned worker.
 

package/README.md

@@ -14,7 +14,7 @@ const viewer = createViewer(container, {
 })
 ```
 
-第一阶段接受经过 Chromium、Firefox、WebKit 真实浏览器回归的 Implicit/Explicit VR Little Endian、JPEG Lossless Process 14 SV1、JPEG-LS Lossless 和 JPEG 2000 Lossless Part 10 文件（单帧或多帧），支持帧切换、窗宽/窗位、缩放、平移、左右 90° 旋转、适合视图及 File Viewer 统一 view-state 恢复。其他传输语法、PACS/DICOMweb、多文件序列组装、标注、MPR、分割和 hanging protocol 不在本包范围内。
+第一阶段接受经过 Chromium、Firefox、WebKit 真实浏览器回归的 Implicit/Explicit/Deflated Explicit VR Little Endian、JPEG Lossless Process 14 SV1、JPEG-LS Lossless 和 JPEG 2000 Lossless Part 10 文件（单帧或多帧），支持帧切换、窗宽/窗位、缩放、平移、左右 90° 旋转、适合视图及 File Viewer 统一 view-state 恢复。其他传输语法、PACS/DICOMweb、多文件序列组装、标注、MPR、分割和 hanging protocol 不在本包范围内。
 
 只有选中 DICOM 文件后才初始化解码 worker。默认限制为源文件 64 MiB、256 帧、单帧 1600 万解码采样点、累计 4800 万解码采样点，均可通过 renderer options 向下调整。销毁预览时会移除本实例的 file-manager 条目、viewport、rendering engine、事件监听、metadata 与图像缓存；Cornerstone 的共享 worker 池由宿主管理，不会因销毁某个 File Viewer 实例而被终止。
 

package/THIRD_PARTY_LICENSES.json

@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "generatedFrom": {
     "packageName": "@file-viewer/renderer-dicom",
-    "packageVersion": "3.0.0",
+    "packageVersion": "3.0.1",
     "packageManager": "pnpm",
     "command": "pnpm --filter @file-viewer/renderer-dicom list --prod --depth Infinity --json"
   },
@@ -236,7 +236,7 @@
     },
     {
       "name": "@file-viewer/core",
-      "version": "3.0.0",
+      "version": "3.0.1",
       "license": "Apache-2.0",
       "direct": true,
       "optional": false,
@@ -248,7 +248,7 @@
     },
     {
       "name": "@file-viewer/renderer-dicom",
-      "version": "3.0.0",
+      "version": "3.0.1",
       "license": "Apache-2.0",
       "direct": false,
       "optional": false,
@@ -680,7 +680,7 @@
     },
     {
       "name": "dompurify",
-      "version": "3.4.13",
+      "version": "3.4.14",
       "license": "Apache-2.0",
       "declaredLicense": "(MPL-2.0 OR Apache-2.0)",
       "direct": false,
@@ -1104,7 +1104,7 @@
       "name": "pako",
       "version": "2.1.0",
       "license": "(MIT AND Zlib)",
-      "direct": false,
+      "direct": true,
       "optional": false,
       "firstParty": false,
       "author": "",

package/THIRD_PARTY_NOTICES.md

@@ -42,7 +42,7 @@ None of the Apache-2.0 dependencies in this closure publishes a top-level `NOTIC
 
 - `baseline-browser-mapping@2.11.19` — https://github.com/web-platform-dx/baseline-browser-mapping
 - `comlink@4.4.2` — https://github.com/GoogleChromeLabs/comlink
-- `dompurify@3.4.13` — https://github.com/cure53/DOMPurify
+- `dompurify@3.4.14` — https://github.com/cure53/DOMPurify
 
 ### BSD-3-Clause
 

package/dist/dicom.js

@@ -172,11 +172,16 @@ export default async function renderDicom(buffer, target, _type, context, option
     const documentRef = target.ownerDocument;
     const copy = resolveCopy(context);
     const root = createElement(documentRef, 'div', 'dicom-viewer');
+    const hasDicomWindow = inspected.windowWidth !== null && inspected.windowCenter !== null;
     Object.assign(root.dataset, {
         status: 'loading', renderer: 'dicom', rows: String(inspected.rows), columns: String(inspected.columns),
-        frameCount: String(inspected.frameCount), currentFrame: '1', windowWidth: String(inspected.windowWidth),
-        windowCenter: String(inspected.windowCenter), panX: '0', panY: '0', rotation: '0',
+        frameCount: String(inspected.frameCount), currentFrame: '1', windowSource: hasDicomWindow ? 'dicom' : 'auto',
+        panX: '0', panY: '0', rotation: '0',
     });
+    if (hasDicomWindow) {
+        root.dataset.windowWidth = String(inspected.windowWidth);
+        root.dataset.windowCenter = String(inspected.windowCenter);
+    }
     const toolbar = createElement(documentRef, 'div', 'dicom-toolbar');
     const navigation = createElement(documentRef, 'div', 'dicom-tool-group');
     const previousButton = createButton(documentRef, copy.previous, '‹');
@@ -199,7 +204,7 @@ export default async function renderDicom(buffer, target, _type, context, option
     widthInput.type = 'number';
     widthInput.min = '1';
     widthInput.step = '1';
-    widthInput.value = String(Math.round(inspected.windowWidth));
+    widthInput.value = inspected.windowWidth === null ? '' : String(Math.round(inspected.windowWidth));
     widthInput.setAttribute('aria-label', copy.windowWidth);
     widthLabel.append(widthInput);
     const centerLabel = createElement(documentRef, 'label', undefined, 'WC');
@@ -207,7 +212,7 @@ export default async function renderDicom(buffer, target, _type, context, option
     const centerInput = createElement(documentRef, 'input');
     centerInput.type = 'number';
     centerInput.step = '1';
-    centerInput.value = String(Math.round(inspected.windowCenter));
+    centerInput.value = inspected.windowCenter === null ? '' : String(Math.round(inspected.windowCenter));
     centerInput.setAttribute('aria-label', copy.windowCenter);
     centerLabel.append(centerInput);
     windowControls.append(widthLabel, centerLabel);
@@ -232,6 +237,7 @@ export default async function renderDicom(buffer, target, _type, context, option
     let frameQueue = Promise.resolve();
     let currentWindowWidth = inspected.windowWidth;
     let currentWindowCenter = inspected.windowCenter;
+    let currentWindowSource = hasDicomWindow ? 'dicom' : 'auto';
     let currentRotation = 0;
     let resizeObserver = null;
     let pointerId = null;
@@ -301,6 +307,36 @@ export default async function renderDicom(buffer, target, _type, context, option
         previousButton.disabled = currentFrame <= 0;
         nextButton.disabled = currentFrame >= inspected.frameCount - 1;
     };
+    const syncWindowUi = (width, center, source) => {
+        currentWindowWidth = width;
+        currentWindowCenter = center;
+        currentWindowSource = source;
+        widthInput.value = String(Math.round(width * 1000) / 1000);
+        centerInput.value = String(Math.round(center * 1000) / 1000);
+        root.dataset.windowWidth = String(width);
+        root.dataset.windowCenter = String(center);
+        root.dataset.windowSource = source;
+    };
+    const syncWindowFromViewport = () => {
+        var _a, _b;
+        if (!viewport)
+            return false;
+        let lower = finiteNumber((_a = viewport.getProperties().voiRange) === null || _a === void 0 ? void 0 : _a.lower, Number.NaN);
+        let upper = finiteNumber((_b = viewport.getProperties().voiRange) === null || _b === void 0 ? void 0 : _b.upper, Number.NaN);
+        if (!Number.isFinite(lower) || !Number.isFinite(upper) || upper <= lower) {
+            const image = viewport.getCornerstoneImage();
+            const slope = finiteNumber(image.slope, 1);
+            const intercept = finiteNumber(image.intercept, 0);
+            const first = finiteNumber(image.minPixelValue, Number.NaN) * slope + intercept;
+            const second = finiteNumber(image.maxPixelValue, Number.NaN) * slope + intercept;
+            lower = Math.min(first, second);
+            upper = Math.max(first, second);
+        }
+        if (!Number.isFinite(lower) || !Number.isFinite(upper) || upper <= lower)
+            return false;
+        syncWindowUi(upper - lower, (upper + lower) / 2, 'auto');
+        return true;
+    };
     const setFrame = (frame, source = 'user') => {
         const requested = clamp(Math.round(frame), 0, inspected.frameCount - 1);
         frameQueue = frameQueue.then(async () => {
@@ -310,6 +346,8 @@ export default async function renderDicom(buffer, target, _type, context, option
             if (destroyed)
                 return;
             currentFrame = requested;
+            if (currentWindowSource === 'auto')
+                syncWindowFromViewport();
             syncFrameUi();
             viewport.render();
             emitViewState('page-change', source);
@@ -319,14 +357,11 @@ export default async function renderDicom(buffer, target, _type, context, option
     const applyWindow = () => {
         if (!viewport)
             return;
-        const width = Math.max(1, finiteNumber(widthInput.value, currentWindowWidth));
-        const center = finiteNumber(centerInput.value, currentWindowCenter);
-        currentWindowWidth = width;
-        currentWindowCenter = center;
-        widthInput.value = String(Math.round(width * 1000) / 1000);
-        centerInput.value = String(Math.round(center * 1000) / 1000);
-        root.dataset.windowWidth = String(width);
-        root.dataset.windowCenter = String(center);
+        const width = Math.max(1, finiteNumber(widthInput.value, currentWindowWidth !== null && currentWindowWidth !== void 0 ? currentWindowWidth : Number.NaN));
+        const center = finiteNumber(centerInput.value, currentWindowCenter !== null && currentWindowCenter !== void 0 ? currentWindowCenter : Number.NaN);
+        if (!Number.isFinite(width) || !Number.isFinite(center))
+            return;
+        syncWindowUi(width, center, 'user');
         viewport.setProperties({ voiRange: { lower: center - width / 2, upper: center + width / 2 } });
         viewport.render();
         emitViewState('window-change', 'user');
@@ -357,7 +392,7 @@ export default async function renderDicom(buffer, target, _type, context, option
     try {
         ensureDicomRuntime(options === null || options === void 0 ? void 0 : options.maxWebWorkers);
         const fileName = ((_b = context === null || context === void 0 ? void 0 : context.filename) === null || _b === void 0 ? void 0 : _b.trim()) || 'preview.dcm';
-        baseImageId = wadouri.fileManager.add(new File([buffer], fileName, { type: 'application/dicom' }));
+        baseImageId = wadouri.fileManager.add(new File([inspected.loaderBuffer], fileName, { type: 'application/dicom' }));
         imageIds = makeImageIds(baseImageId, inspected.frameCount);
         root.dataset.dicomImageId = baseImageId;
         const renderingEngineId = `file-viewer-dicom-engine-${Date.now()}-${++renderingEngineSerial}`;
@@ -371,7 +406,15 @@ export default async function renderDicom(buffer, target, _type, context, option
         await viewport.setStack(imageIds, 0);
         if (destroyed || ((_c = context === null || context === void 0 ? void 0 : context.signal) === null || _c === void 0 ? void 0 : _c.aborted))
             throw ((_d = context === null || context === void 0 ? void 0 : context.signal) === null || _d === void 0 ? void 0 : _d.reason) || new DOMException('DICOM render aborted.', 'AbortError');
-        viewport.setProperties({ voiRange: { lower: currentWindowCenter - currentWindowWidth / 2, upper: currentWindowCenter + currentWindowWidth / 2 } });
+        if (hasDicomWindow) {
+            const width = inspected.windowWidth;
+            const center = inspected.windowCenter;
+            syncWindowUi(width, center, 'dicom');
+            viewport.setProperties({ voiRange: { lower: center - width / 2, upper: center + width / 2 } });
+        }
+        else if (!syncWindowFromViewport()) {
+            throw new Error('Unable to determine a visible DICOM window from the decoded pixels.');
+        }
         viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true });
         viewport.render();
         registerFileViewerZoomProvider(root, {

package/dist/index.js

@@ -9,7 +9,7 @@ export const dicomRendererDefinition = {
     packageName: '@file-viewer/renderer-dicom',
     presets: [],
     knownLimits: [
-        'This MVP is tested with Implicit/Explicit VR Little Endian, JPEG Lossless Process 14 SV1, JPEG-LS Lossless, and JPEG 2000 Lossless Part 10 files; other transfer syntaxes and DICOMweb are not included.',
+        'This MVP is tested with Implicit/Explicit/Deflated Explicit VR Little Endian, JPEG Lossless Process 14 SV1, JPEG-LS Lossless, and JPEG 2000 Lossless Part 10 files; other transfer syntaxes and DICOMweb are not included.',
         'The MVP renders one single-frame or multi-frame local file as a stack; series assembly, PACS/DICOMweb, MPR, and diagnostic use are not included.',
     ],
     capabilities: {

package/dist/inspect.d.ts

@@ -11,7 +11,9 @@ export interface InspectedDicomPart10 {
     rows: number;
     samplesPerPixel: number;
     transferSyntax: string;
-    windowCenter: number;
-    windowWidth: number;
+    windowCenter: number | null;
+    windowWidth: number | null;
+    /** @internal Part 10 bytes normalized for the image loader when required. */
+    loaderBuffer: ArrayBuffer;
 }
 export declare const inspectDicomPart10: (buffer: ArrayBuffer, limitsInput?: FileViewerDicomLimits) => InspectedDicomPart10;

package/dist/inspect.js

@@ -1,4 +1,5 @@
 import * as dicomParser from 'dicom-parser';
+import { Inflate } from 'pako';
 const MEBIBYTE = 1024 * 1024;
 export const DEFAULT_DICOM_LIMITS = Object.freeze({
     maxSourceBytes: 64 * MEBIBYTE,
@@ -10,6 +11,7 @@ export const DEFAULT_DICOM_LIMITS = Object.freeze({
 export const SUPPORTED_DICOM_TRANSFER_SYNTAXES = new Set([
     '1.2.840.10008.1.2',
     '1.2.840.10008.1.2.1',
+    '1.2.840.10008.1.2.1.99',
     '1.2.840.10008.1.2.4.70',
     '1.2.840.10008.1.2.4.80',
     '1.2.840.10008.1.2.4.90',
@@ -40,6 +42,75 @@ const hasPart10Signature = (buffer) => {
     const bytes = new Uint8Array(buffer, 128, 4);
     return bytes[0] === 0x44 && bytes[1] === 0x49 && bytes[2] === 0x43 && bytes[3] === 0x4d;
 };
+class DicomInflatedSizeError extends Error {
+}
+const inflateDeflatedDataSet = (byteArray, position, maxInflatedBytes) => {
+    const chunks = [];
+    let inflatedBytes = 0;
+    const inflater = new Inflate({ raw: true, chunkSize: 64 * 1024 });
+    inflater.onData = chunk => {
+        const bytes = chunk instanceof Uint8Array ? chunk : new Uint8Array(chunk);
+        inflatedBytes += bytes.byteLength;
+        if (position + inflatedBytes > maxInflatedBytes) {
+            throw new DicomInflatedSizeError(`DICOM inflated size exceeds the configured ${maxInflatedBytes}-byte limit.`);
+        }
+        chunks.push(bytes.slice());
+    };
+    inflater.push(byteArray.subarray(position), true);
+    if (inflater.err)
+        throw new Error(inflater.msg || 'Unable to inflate the DICOM data set.');
+    const fullByteArray = new Uint8Array(position + inflatedBytes);
+    fullByteArray.set(byteArray.subarray(0, position), 0);
+    let outputOffset = position;
+    for (const chunk of chunks) {
+        fullByteArray.set(chunk, outputOffset);
+        outputOffset += chunk.byteLength;
+    }
+    return fullByteArray;
+};
+const normalizeDeflatedTransferSyntax = (dataSet) => {
+    const transferSyntaxElement = dataSet.elements.x00020010;
+    const groupLengthElement = dataSet.elements.x00020000;
+    if (!transferSyntaxElement || !groupLengthElement) {
+        throw new Error('The DICOM file meta information is incomplete.');
+    }
+    const explicitLittleEndianUid = new TextEncoder().encode('1.2.840.10008.1.2.1\0');
+    const removedBytes = transferSyntaxElement.length - explicitLittleEndianUid.byteLength;
+    if (removedBytes < 0)
+        throw new Error('Unable to normalize the DICOM transfer syntax.');
+    const source = dataSet.byteArray;
+    const output = new Uint8Array(source.byteLength - removedBytes);
+    const valueOffset = transferSyntaxElement.dataOffset;
+    output.set(source.subarray(0, valueOffset), 0);
+    new DataView(output.buffer).setUint16(valueOffset - 2, explicitLittleEndianUid.byteLength, true);
+    output.set(explicitLittleEndianUid, valueOffset);
+    output.set(source.subarray(valueOffset + transferSyntaxElement.length), valueOffset + explicitLittleEndianUid.byteLength);
+    const groupLengthOffset = groupLengthElement.dataOffset;
+    const sourceView = new DataView(source.buffer, source.byteOffset, source.byteLength);
+    const outputView = new DataView(output.buffer);
+    outputView.setUint32(groupLengthOffset, sourceView.getUint32(groupLengthOffset, true) - removedBytes, true);
+    return { buffer: output.buffer, removedBytes };
+};
+const normalizeLoaderBuffer = (dataSet, transferSyntax, sourceBuffer) => {
+    const specificCharacterSet = String(dataSet.string('x00080005') || '').trim().toUpperCase();
+    const normalizesLegacyUtf8 = specificCharacterSet === 'ISO_IR 196';
+    const normalizesTransferSyntax = transferSyntax === '1.2.840.10008.1.2.1.99';
+    if (!normalizesLegacyUtf8 && !normalizesTransferSyntax)
+        return sourceBuffer;
+    const normalizedTransferSyntax = normalizesTransferSyntax
+        ? normalizeDeflatedTransferSyntax(dataSet)
+        : { buffer: sourceBuffer.slice(0), removedBytes: 0 };
+    if (!normalizesLegacyUtf8)
+        return normalizedTransferSyntax.buffer;
+    const characterSetElement = dataSet.elements.x00080005;
+    if (!characterSetElement)
+        return normalizedTransferSyntax.buffer;
+    const output = new Uint8Array(normalizedTransferSyntax.buffer);
+    const replacement = new Uint8Array(characterSetElement.length).fill(0x20);
+    replacement.set(new TextEncoder().encode('ISO_IR 192'));
+    output.set(replacement, characterSetElement.dataOffset - normalizedTransferSyntax.removedBytes);
+    return output.buffer;
+};
 export const inspectDicomPart10 = (buffer, limitsInput) => {
     const limits = resolveLimits(limitsInput);
     if (buffer.byteLength < 132 || buffer.byteLength > limits.maxSourceBytes) {
@@ -49,10 +120,19 @@ export const inspectDicomPart10 = (buffer, limitsInput) => {
         throw new Error('The selected file is not a DICOM Part 10 file (missing DICM signature).');
     }
     let dataSet;
+    const maxInflatedBytes = limits.maxSourceBytes + limits.maxTotalPixels * 4;
     try {
-        dataSet = dicomParser.parseDicom(new Uint8Array(buffer), { untilTag: 'x7fe00010' });
+        dataSet = dicomParser.parseDicom(new Uint8Array(buffer), {
+            untilTag: 'x7fe00010',
+            // dicom-parser's Node branch assumes Buffer.copy() for deflated data.
+            // A deterministic Uint8Array inflater keeps direct inspection identical
+            // in Node, browsers, Workers, and host bundlers that polyfill `process`.
+            inflater: (byteArray, position) => inflateDeflatedDataSet(byteArray, position, maxInflatedBytes),
+        });
     }
-    catch {
+    catch (error) {
+        if (error instanceof DicomInflatedSizeError)
+            throw error;
         throw new Error('Unable to parse the DICOM Part 10 header.');
     }
     const transferSyntax = String(dataSet.string('x00020010') || '').trim();
@@ -80,6 +160,9 @@ export const inspectDicomPart10 = (buffer, limitsInput) => {
     if (![1, 8, 16, 32].includes(bitsAllocated)) {
         throw new Error(`DICOM Bits Allocated value ${bitsAllocated} is not supported.`);
     }
+    const windowCenter = finiteNumber(dataSet.floatString('x00281050', 0), Number.NaN);
+    const windowWidth = finiteNumber(dataSet.floatString('x00281051', 0), Number.NaN);
+    const hasValidWindow = Number.isFinite(windowCenter) && Number.isFinite(windowWidth) && windowWidth > 0;
     return {
         bitsAllocated,
         columns,
@@ -89,7 +172,14 @@ export const inspectDicomPart10 = (buffer, limitsInput) => {
         rows,
         samplesPerPixel,
         transferSyntax,
-        windowCenter: finiteNumber(dataSet.floatString('x00281050', 0), (2 ** bitsAllocated) / 2),
-        windowWidth: Math.max(1, finiteNumber(dataSet.floatString('x00281051', 0), 2 ** bitsAllocated)),
+        // Window Center/Width are optional DICOM attributes. Keep their absence
+        // explicit so the renderer can use Cornerstone's pixel/rescale-aware VOI
+        // instead of inventing a raw unsigned range (which makes signed CT black).
+        windowCenter: hasValidWindow ? windowCenter : null,
+        windowWidth: hasValidWindow ? windowWidth : null,
+        // ISO_IR 196 was the original UTF-8 defined term from DICOM CP-107;
+        // normalize the loader-only copy to the current ISO_IR 192 spelling so
+        // dcmjs does not reject otherwise valid pixel data and UTF-8 metadata.
+        loaderBuffer: normalizeLoaderBuffer(dataSet, transferSyntax, buffer),
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-dicom",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": false,
   "type": "module",
   "sideEffects": false,
@@ -69,10 +69,12 @@
     "@cornerstonejs/core": "5.8.2",
     "@cornerstonejs/dicom-image-loader": "5.8.2",
     "@cornerstonejs/metadata": "5.8.2",
-    "@file-viewer/core": "3.0.0",
-    "dicom-parser": "1.8.21"
+    "@file-viewer/core": "3.0.1",
+    "dicom-parser": "1.8.21",
+    "pako": "2.1.0"
   },
   "devDependencies": {
+    "@types/pako": "^2.0.4",
     "typescript": "^6.0.3"
   },
   "license": "Apache-2.0",