@fnndsc/salsa 3.15.0 → 3.16.0

package/dist/dicom/dictionary.d.ts

@@ -0,0 +1,42 @@
+/**
+ * @file The static knowledge a tag listing needs beyond the DICOM dictionary:
+ * which module a tag belongs to, which tags carry identifying information,
+ * and how a handful of coded values read in words.
+ *
+ * All three are surfaces' concerns as much as the kernel's, so they live
+ * once, here, and every surface renders from the same answer: grouping
+ * decides where a row sits, the PHI flag decides whether it is shown or
+ * redacted, decoding gives a human the meaning of `MR` or `HFS`. The kernel
+ * flags and decodes; it never strips.
+ *
+ * @module
+ */
+/** Where a tag sits in a grouped listing. */
+export type DicomTagGroup = 'meta' | 'patient' | 'study' | 'series' | 'image' | 'equipment' | 'private' | 'other';
+/** The groups in the order a listing shows them. */
+export declare const DICOM_TAG_GROUPS: readonly DicomTagGroup[];
+/**
+ * Places a tag in its listing group.
+ *
+ * @param groupNumber - The tag's group number (the `gggg` of `(gggg,eeee)`).
+ * @param name - The dictionary name, when the tag has one.
+ * @returns The listing group.
+ */
+export declare function tagGroup_of(groupNumber: number, name: string | undefined): DicomTagGroup;
+/**
+ * Tags that identify a person or an institution. Flagged on the model so a
+ * surface can redact; never stripped by the kernel.
+ */
+export declare const DICOM_PHI_TAGS: ReadonlySet<string>;
+/** Transfer syntaxes by UID. A renderer's decoder support is judged against these. */
+export declare const TRANSFER_SYNTAX_NAMES: Readonly<Record<string, string>>;
+/**
+ * Reads a coded value in words, for the short list of tags a reader meets
+ * first. SOP class UIDs are named by the caller through the dictionary.
+ *
+ * @param name - The tag's dictionary name.
+ * @param value - The tag's formatted value.
+ * @returns The decoded words, or undefined when the tag is not coded or the
+ *   code is unknown.
+ */
+export declare function tagValue_decode(name: string, value: string): string | undefined;

package/dist/dicom/dictionary.js

@@ -0,0 +1,221 @@
+"use strict";
+/**
+ * @file The static knowledge a tag listing needs beyond the DICOM dictionary:
+ * which module a tag belongs to, which tags carry identifying information,
+ * and how a handful of coded values read in words.
+ *
+ * All three are surfaces' concerns as much as the kernel's, so they live
+ * once, here, and every surface renders from the same answer: grouping
+ * decides where a row sits, the PHI flag decides whether it is shown or
+ * redacted, decoding gives a human the meaning of `MR` or `HFS`. The kernel
+ * flags and decodes; it never strips.
+ *
+ * @module
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TRANSFER_SYNTAX_NAMES = exports.DICOM_PHI_TAGS = exports.DICOM_TAG_GROUPS = void 0;
+exports.tagGroup_of = tagGroup_of;
+exports.tagValue_decode = tagValue_decode;
+/** The groups in the order a listing shows them. */
+exports.DICOM_TAG_GROUPS = [
+    'patient',
+    'study',
+    'series',
+    'image',
+    'equipment',
+    'meta',
+    'private',
+    'other',
+];
+/**
+ * Named tags whose module the group number alone gets wrong. Group 0008 mixes
+ * study, series and image identity; 0018 mixes acquisition and equipment;
+ * 0020 mixes study, series and image position.
+ */
+const GROUP_BY_NAME = {
+    // 0008: series identity and content
+    Modality: 'series',
+    SeriesDate: 'series',
+    SeriesTime: 'series',
+    SeriesDescription: 'series',
+    BodyPartExamined: 'series',
+    ProtocolName: 'series',
+    // 0008: image identity
+    SOPClassUID: 'image',
+    SOPInstanceUID: 'image',
+    ImageType: 'image',
+    ContentDate: 'image',
+    ContentTime: 'image',
+    AcquisitionDate: 'image',
+    AcquisitionTime: 'image',
+    AcquisitionNumber: 'image',
+    // 0008: equipment
+    Manufacturer: 'equipment',
+    ManufacturerModelName: 'equipment',
+    StationName: 'equipment',
+    InstitutionName: 'equipment',
+    InstitutionAddress: 'equipment',
+    InstitutionalDepartmentName: 'equipment',
+    // 0018: equipment
+    DeviceSerialNumber: 'equipment',
+    SoftwareVersions: 'equipment',
+    MagneticFieldStrength: 'equipment',
+    // 0020: study
+    StudyInstanceUID: 'study',
+    StudyID: 'study',
+    // 0020: series
+    SeriesInstanceUID: 'series',
+    SeriesNumber: 'series',
+    FrameOfReferenceUID: 'series',
+    PositionReferenceIndicator: 'series',
+    PatientPosition: 'series',
+    // 0020: image
+    InstanceNumber: 'image',
+    ImagePositionPatient: 'image',
+    ImageOrientationPatient: 'image',
+    SliceLocation: 'image',
+    ImageComments: 'image',
+    NumberOfFrames: 'image',
+};
+/** Module by tag group number, for tags the name table does not place. */
+const GROUP_BY_NUMBER = {
+    0x0002: 'meta',
+    0x0008: 'study',
+    0x0010: 'patient',
+    0x0018: 'series',
+    0x0020: 'image',
+    0x0028: 'image',
+    0x0032: 'study',
+    0x0038: 'patient',
+    0x0040: 'study',
+    0x0054: 'series',
+    0x0070: 'image',
+    0x0088: 'series',
+    0x3006: 'image',
+    0x7fe0: 'image',
+};
+/**
+ * Places a tag in its listing group.
+ *
+ * @param groupNumber - The tag's group number (the `gggg` of `(gggg,eeee)`).
+ * @param name - The dictionary name, when the tag has one.
+ * @returns The listing group.
+ */
+function tagGroup_of(groupNumber, name) {
+    if (groupNumber % 2 === 1)
+        return 'private';
+    if (name !== undefined && GROUP_BY_NAME[name] !== undefined)
+        return GROUP_BY_NAME[name];
+    return GROUP_BY_NUMBER[groupNumber] ?? 'other';
+}
+/**
+ * Tags that identify a person or an institution. Flagged on the model so a
+ * surface can redact; never stripped by the kernel.
+ */
+exports.DICOM_PHI_TAGS = new Set([
+    'PatientName',
+    'PatientID',
+    'PatientBirthDate',
+    'PatientBirthTime',
+    'PatientAddress',
+    'PatientTelephoneNumbers',
+    'OtherPatientIDs',
+    'OtherPatientNames',
+    'PatientMotherBirthName',
+    'InstitutionName',
+    'InstitutionAddress',
+    'ReferringPhysicianName',
+    'PerformingPhysicianName',
+    'OperatorsName',
+    'PhysiciansOfRecord',
+    'NameOfPhysiciansReadingStudy',
+    'AccessionNumber',
+]);
+/** Words for the coded values a reader meets first. */
+const MODALITY_NAMES = {
+    MR: 'Magnetic Resonance',
+    CT: 'Computed Tomography',
+    PT: 'Positron Emission Tomography',
+    NM: 'Nuclear Medicine',
+    US: 'Ultrasound',
+    CR: 'Computed Radiography',
+    DX: 'Digital Radiography',
+    MG: 'Mammography',
+    RF: 'Radio Fluoroscopy',
+    XA: 'X-Ray Angiography',
+    OT: 'Other',
+    SR: 'Structured Report',
+    SEG: 'Segmentation',
+    RTSTRUCT: 'RT Structure Set',
+    RTDOSE: 'RT Dose',
+    RTPLAN: 'RT Plan',
+    PR: 'Presentation State',
+    KO: 'Key Object Selection',
+    DOC: 'Document',
+};
+const PATIENT_SEX_NAMES = {
+    M: 'Male',
+    F: 'Female',
+    O: 'Other',
+};
+const PATIENT_POSITION_NAMES = {
+    HFS: 'Head First Supine',
+    HFP: 'Head First Prone',
+    HFDR: 'Head First Decubitus Right',
+    HFDL: 'Head First Decubitus Left',
+    FFS: 'Feet First Supine',
+    FFP: 'Feet First Prone',
+    FFDR: 'Feet First Decubitus Right',
+    FFDL: 'Feet First Decubitus Left',
+};
+const PHOTOMETRIC_NAMES = {
+    MONOCHROME1: 'Greyscale, minimum is white',
+    MONOCHROME2: 'Greyscale, minimum is black',
+    RGB: 'Colour, RGB',
+    'PALETTE COLOR': 'Colour, palette',
+    YBR_FULL: 'Colour, YBR full',
+    YBR_FULL_422: 'Colour, YBR 4:2:2',
+    YBR_RCT: 'Colour, YBR reversible',
+    YBR_ICT: 'Colour, YBR irreversible',
+};
+/** Transfer syntaxes by UID. A renderer's decoder support is judged against these. */
+exports.TRANSFER_SYNTAX_NAMES = {
+    '1.2.840.10008.1.2': 'Implicit VR Little Endian',
+    '1.2.840.10008.1.2.1': 'Explicit VR Little Endian',
+    '1.2.840.10008.1.2.1.99': 'Deflated Explicit VR Little Endian',
+    '1.2.840.10008.1.2.2': 'Explicit VR Big Endian',
+    '1.2.840.10008.1.2.4.50': 'JPEG Baseline (8-bit)',
+    '1.2.840.10008.1.2.4.51': 'JPEG Extended (12-bit)',
+    '1.2.840.10008.1.2.4.57': 'JPEG Lossless',
+    '1.2.840.10008.1.2.4.70': 'JPEG Lossless SV1',
+    '1.2.840.10008.1.2.4.80': 'JPEG-LS Lossless',
+    '1.2.840.10008.1.2.4.81': 'JPEG-LS Near-Lossless',
+    '1.2.840.10008.1.2.4.90': 'JPEG 2000 Lossless',
+    '1.2.840.10008.1.2.4.91': 'JPEG 2000',
+    '1.2.840.10008.1.2.4.201': 'High-Throughput JPEG 2000 Lossless',
+    '1.2.840.10008.1.2.4.202': 'High-Throughput JPEG 2000 Lossless RPCL',
+    '1.2.840.10008.1.2.4.203': 'High-Throughput JPEG 2000',
+    '1.2.840.10008.1.2.5': 'RLE Lossless',
+};
+/** Decoders by tag name; each answers with words or nothing. */
+const DECODERS = {
+    Modality: (value) => MODALITY_NAMES[value],
+    PatientSex: (value) => PATIENT_SEX_NAMES[value],
+    PatientPosition: (value) => PATIENT_POSITION_NAMES[value],
+    PhotometricInterpretation: (value) => PHOTOMETRIC_NAMES[value],
+    TransferSyntaxUID: (value) => exports.TRANSFER_SYNTAX_NAMES[value],
+};
+/**
+ * Reads a coded value in words, for the short list of tags a reader meets
+ * first. SOP class UIDs are named by the caller through the dictionary.
+ *
+ * @param name - The tag's dictionary name.
+ * @param value - The tag's formatted value.
+ * @returns The decoded words, or undefined when the tag is not coded or the
+ *   code is unknown.
+ */
+function tagValue_decode(name, value) {
+    const decoder = DECODERS[name];
+    return decoder === undefined ? undefined : decoder(value);
+}
+//# sourceMappingURL=dictionary.js.map

package/dist/dicom/dictionary.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dictionary.js","sourceRoot":"","sources":["../../src/dicom/dictionary.ts"],"names":[],"mappings":"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"}

package/dist/dicom/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @file DICOM in the kernel: tag reading and the series as a folder.
+ * @module
+ */
+export * from './dictionary.js';
+export * from './tags.js';
+export * from './series.js';

package/dist/dicom/index.js

@@ -0,0 +1,24 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * @file DICOM in the kernel: tag reading and the series as a folder.
+ * @module
+ */
+__exportStar(require("./dictionary.js"), exports);
+__exportStar(require("./tags.js"), exports);
+__exportStar(require("./series.js"), exports);
+//# sourceMappingURL=index.js.map

package/dist/dicom/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dicom/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;GAGG;AACH,kDAAgC;AAChC,4CAA0B;AAC1B,8CAA4B"}

package/dist/dicom/series.d.ts

@@ -0,0 +1,120 @@
+/**
+ * @file The series as the kernel knows it.
+ *
+ * A DICOM series in ChRIS is a folder of files. Files are the truth; a
+ * viewer hides them. This module answers "what is this folder as a series"
+ * without walking every file: the listing gives the count, the bytes and
+ * the order (oxidicom names each file by its InstanceNumber, so the name
+ * sorts the stack), and one header read gives identity, modality and
+ * geometry. A full positional sort is a volume renderer's business and is
+ * deferred to it.
+ *
+ * Headers read once are kept, keyed by path, so a tag listing that follows
+ * a scroll costs nothing on the second visit.
+ *
+ * @module
+ */
+import { type Result } from '@fnndsc/cumin';
+import type { VFSItem } from '../vfs/provider.js';
+import { type DicomTagSet } from './tags.js';
+/** How a folder is read; injected so the summary is testable without a daemon. */
+export interface DicomFolderIO {
+    list(path: string): Promise<Result<VFSItem[]>>;
+    readBinary(path: string): Promise<Result<Buffer>>;
+}
+/** The real folder reader: the VFS for listings, CFS for bytes. */
+export declare const dicomFolderIO_default: DicomFolderIO;
+/** How a folder's files are ordered into a stack. */
+export type DicomSeriesOrder = 'filename' | 'unknown';
+/** The voxel grid, from one header. */
+export interface DicomGeometry {
+    rows: number;
+    columns: number;
+    /** Row and column spacing in mm. */
+    pixelSpacing?: [number, number];
+    sliceThickness?: number;
+    spacingBetweenSlices?: number;
+}
+/** What one folder is as a series. */
+export interface DicomSeriesSummary {
+    path: string;
+    seriesInstanceUID?: string;
+    studyInstanceUID?: string;
+    modality: string;
+    seriesDescription: string;
+    seriesNumber?: number;
+    /** DICOM files in the folder. */
+    instances: number;
+    /** Frames in the header read; one for a classic single-frame file. */
+    frames: number;
+    order: DicomSeriesOrder;
+    geometry?: DicomGeometry;
+    transferSyntax?: {
+        uid: string;
+        name?: string;
+    };
+    /** Sum of the folder's DICOM file sizes. */
+    bytes: number;
+    /** The file whose header answered, first in stack order. */
+    header: string;
+    /** Files ordered for a stack, first to last. */
+    files: string[];
+    /** Annotation files found for the series' UID. */
+    annotations: string[];
+}
+/** Options for a series summary. */
+export interface DicomSeriesOptions {
+    /** Where annotation folders live; `<root>/<SeriesInstanceUID>` is listed when given. */
+    annotationRoot?: string;
+}
+/** A folder's DICOM files, ordered. */
+export interface DicomFolderListing {
+    files: Array<{
+        path: string;
+        size: number;
+    }>;
+    order: DicomSeriesOrder;
+}
+/**
+ * Reads one file's header through the cache.
+ *
+ * @param path - The file's VFS path.
+ * @param io - The folder reader.
+ * @returns The tag set, or an error when the file could not be read or parsed.
+ */
+export declare function dicomHeader_get(path: string, io?: DicomFolderIO): Promise<Result<DicomTagSet>>;
+/**
+ * Forgets every cached header.
+ */
+export declare function dicomHeaderCache_clear(): void;
+/**
+ * Lists a folder's DICOM files in stack order.
+ *
+ * Order is `filename` when every file starts with a number and a dash
+ * (oxidicom's `<InstanceNumber>-<SOPInstanceUID>.dcm`), sorted by that number;
+ * otherwise `unknown`, sorted by name.
+ *
+ * @param folder - The folder's VFS path.
+ * @param io - The folder reader.
+ * @returns The ordered files with sizes, or an error when the folder cannot be listed.
+ */
+export declare function dicomFolder_list(folder: string, io?: DicomFolderIO): Promise<Result<DicomFolderListing>>;
+/**
+ * Picks at most `cap` files spread evenly across the stack, always keeping
+ * the first and the last.
+ *
+ * @param files - The ordered files.
+ * @param cap - The most to keep.
+ * @returns The chosen files, in order.
+ */
+export declare function dicomFiles_sample<T>(files: T[], cap: number): T[];
+/**
+ * Summarizes a folder as a series from its listing and one header.
+ *
+ * @param folder - The folder's VFS path.
+ * @param options - Where to look for annotations.
+ * @param io - The folder reader.
+ * @returns The summary; an error when the folder cannot be listed, holds no
+ *   DICOM files, or its first file cannot be read.
+ */
+export declare function dicomSeries_summarize(folder: string, options?: DicomSeriesOptions, io?: DicomFolderIO): Promise<Result<DicomSeriesSummary>>;

package/dist/dicom/series.js

@@ -0,0 +1,209 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dicomFolderIO_default = void 0;
+exports.dicomHeader_get = dicomHeader_get;
+exports.dicomHeaderCache_clear = dicomHeaderCache_clear;
+exports.dicomFolder_list = dicomFolder_list;
+exports.dicomFiles_sample = dicomFiles_sample;
+exports.dicomSeries_summarize = dicomSeries_summarize;
+/**
+ * @file The series as the kernel knows it.
+ *
+ * A DICOM series in ChRIS is a folder of files. Files are the truth; a
+ * viewer hides them. This module answers "what is this folder as a series"
+ * without walking every file: the listing gives the count, the bytes and
+ * the order (oxidicom names each file by its InstanceNumber, so the name
+ * sorts the stack), and one header read gives identity, modality and
+ * geometry. A full positional sort is a volume renderer's business and is
+ * deferred to it.
+ *
+ * Headers read once are kept, keyed by path, so a tag listing that follows
+ * a scroll costs nothing on the second visit.
+ *
+ * @module
+ */
+const cumin_1 = require("@fnndsc/cumin");
+const dispatcher_js_1 = require("../vfs/dispatcher.js");
+const index_js_1 = require("../files/index.js");
+const dictionary_js_1 = require("./dictionary.js");
+const tags_js_1 = require("./tags.js");
+/** The real folder reader: the VFS for listings, CFS for bytes. */
+exports.dicomFolderIO_default = {
+    list: (path) => dispatcher_js_1.vfsDispatcher.list(path),
+    readBinary: (path) => (0, index_js_1.fileContent_getBinary)(path),
+};
+/** Headers kept by path. Bounded; the oldest entry leaves first. */
+const HEADER_CACHE_LIMIT = 4096;
+const headerCache = new Map();
+/**
+ * Reads one file's header through the cache.
+ *
+ * @param path - The file's VFS path.
+ * @param io - The folder reader.
+ * @returns The tag set, or an error when the file could not be read or parsed.
+ */
+async function dicomHeader_get(path, io = exports.dicomFolderIO_default) {
+    const cached = headerCache.get(path);
+    if (cached !== undefined)
+        return (0, cumin_1.Ok)(cached);
+    const bytes = await io.readBinary(path);
+    if (!bytes.ok)
+        return (0, cumin_1.Err)();
+    const parsed = (0, tags_js_1.dicomTags_read)(bytes.value);
+    if (!parsed.ok)
+        return (0, cumin_1.Err)();
+    if (headerCache.size >= HEADER_CACHE_LIMIT) {
+        const oldest = headerCache.keys().next().value;
+        if (oldest !== undefined)
+            headerCache.delete(oldest);
+    }
+    headerCache.set(path, parsed.value);
+    return parsed;
+}
+/**
+ * Forgets every cached header.
+ */
+function dicomHeaderCache_clear() {
+    headerCache.clear();
+}
+/**
+ * Lists a folder's DICOM files in stack order.
+ *
+ * Order is `filename` when every file starts with a number and a dash
+ * (oxidicom's `<InstanceNumber>-<SOPInstanceUID>.dcm`), sorted by that number;
+ * otherwise `unknown`, sorted by name.
+ *
+ * @param folder - The folder's VFS path.
+ * @param io - The folder reader.
+ * @returns The ordered files with sizes, or an error when the folder cannot be listed.
+ */
+async function dicomFolder_list(folder, io = exports.dicomFolderIO_default) {
+    const listing = await io.list(folder);
+    if (!listing.ok)
+        return (0, cumin_1.Err)();
+    const base = folder.endsWith('/') ? folder.slice(0, -1) : folder;
+    const entries = listing.value.filter((item) => item.type === 'file' && /\.dcm$/i.test(item.name));
+    const numbered = entries.length > 0 && entries.every((item) => /^\d+-/.test(item.name));
+    const sorted = [...entries].sort((a, b) => numbered ? parseInt(a.name, 10) - parseInt(b.name, 10) || a.name.localeCompare(b.name) : a.name.localeCompare(b.name));
+    return (0, cumin_1.Ok)({
+        files: sorted.map((item) => ({ path: `${base}/${item.name}`, size: item.size })),
+        order: numbered ? 'filename' : 'unknown',
+    });
+}
+/**
+ * Picks at most `cap` files spread evenly across the stack, always keeping
+ * the first and the last.
+ *
+ * @param files - The ordered files.
+ * @param cap - The most to keep.
+ * @returns The chosen files, in order.
+ */
+function dicomFiles_sample(files, cap) {
+    if (cap <= 0)
+        return [];
+    if (files.length <= cap)
+        return files;
+    if (cap === 1)
+        return [files[0]];
+    const chosen = [];
+    const step = (files.length - 1) / (cap - 1);
+    for (let i = 0; i < cap; i++)
+        chosen.push(files[Math.round(i * step)]);
+    return chosen;
+}
+/**
+ * Summarizes a folder as a series from its listing and one header.
+ *
+ * @param folder - The folder's VFS path.
+ * @param options - Where to look for annotations.
+ * @param io - The folder reader.
+ * @returns The summary; an error when the folder cannot be listed, holds no
+ *   DICOM files, or its first file cannot be read.
+ */
+async function dicomSeries_summarize(folder, options = {}, io = exports.dicomFolderIO_default) {
+    const listed = await dicomFolder_list(folder, io);
+    if (!listed.ok || listed.value.files.length === 0)
+        return (0, cumin_1.Err)();
+    const files = listed.value.files;
+    const header = await dicomHeader_get(files[0].path, io);
+    if (!header.ok)
+        return (0, cumin_1.Err)();
+    const tags = header.value.tags;
+    const seriesInstanceUID = tagText_of(tags, 'SeriesInstanceUID');
+    const summary = {
+        path: folder,
+        ...(seriesInstanceUID !== undefined ? { seriesInstanceUID } : {}),
+        ...(tagText_of(tags, 'StudyInstanceUID') !== undefined ? { studyInstanceUID: tagText_of(tags, 'StudyInstanceUID') } : {}),
+        modality: tagText_of(tags, 'Modality') ?? 'OT',
+        seriesDescription: tagText_of(tags, 'SeriesDescription') ?? '',
+        ...(tagNumber_of(tags, 'SeriesNumber') !== undefined ? { seriesNumber: tagNumber_of(tags, 'SeriesNumber') } : {}),
+        instances: files.length,
+        frames: tagNumber_of(tags, 'NumberOfFrames') ?? 1,
+        order: listed.value.order,
+        ...(geometry_of(tags) !== undefined ? { geometry: geometry_of(tags) } : {}),
+        ...(header.value.transferSyntaxUID !== undefined
+            ? {
+                transferSyntax: {
+                    uid: header.value.transferSyntaxUID,
+                    ...(dictionary_js_1.TRANSFER_SYNTAX_NAMES[header.value.transferSyntaxUID] !== undefined ? { name: dictionary_js_1.TRANSFER_SYNTAX_NAMES[header.value.transferSyntaxUID] } : {}),
+                },
+            }
+            : {}),
+        bytes: files.reduce((total, file) => total + file.size, 0),
+        header: files[0].path,
+        files: files.map((file) => file.path),
+        annotations: [],
+    };
+    if (options.annotationRoot !== undefined && seriesInstanceUID !== undefined) {
+        const root = options.annotationRoot.endsWith('/') ? options.annotationRoot.slice(0, -1) : options.annotationRoot;
+        const found = await io.list(`${root}/${seriesInstanceUID}`);
+        if (found.ok) {
+            summary.annotations = found.value
+                .filter((item) => item.type === 'file')
+                .map((item) => `${root}/${seriesInstanceUID}/${item.name}`)
+                .sort();
+        }
+    }
+    return (0, cumin_1.Ok)(summary);
+}
+/**
+ * A tag's text, or nothing when absent or empty.
+ */
+function tagText_of(tags, name) {
+    const tag = (0, tags_js_1.dicomTag_find)(tags, name);
+    return tag === undefined || tag.value === '' ? undefined : tag.value;
+}
+/**
+ * A tag's first value as a number, or nothing when absent or not numeric.
+ */
+function tagNumber_of(tags, name) {
+    const text = tagText_of(tags, name);
+    if (text === undefined)
+        return undefined;
+    const parsed = Number(text.split('\\')[0]);
+    return Number.isFinite(parsed) ? parsed : undefined;
+}
+/**
+ * The voxel grid from a header, when it has one.
+ */
+function geometry_of(tags) {
+    const rows = tagNumber_of(tags, 'Rows');
+    const columns = tagNumber_of(tags, 'Columns');
+    if (rows === undefined || columns === undefined)
+        return undefined;
+    const geometry = { rows, columns };
+    const spacing = tagText_of(tags, 'PixelSpacing');
+    if (spacing !== undefined) {
+        const parts = spacing.split('\\').map(Number);
+        if (parts.length === 2 && parts.every(Number.isFinite))
+            geometry.pixelSpacing = [parts[0], parts[1]];
+    }
+    const thickness = tagNumber_of(tags, 'SliceThickness');
+    if (thickness !== undefined)
+        geometry.sliceThickness = thickness;
+    const between = tagNumber_of(tags, 'SpacingBetweenSlices');
+    if (between !== undefined)
+        geometry.spacingBetweenSlices = between;
+    return geometry;
+}
+//# sourceMappingURL=series.js.map

package/dist/dicom/series.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"series.js","sourceRoot":"","sources":["../../src/dicom/series.ts"],"names":[],"mappings":"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"}

package/dist/dicom/tags.d.ts

@@ -0,0 +1,80 @@
+import { type Result } from '@fnndsc/cumin';
+import { type DicomTagGroup } from './dictionary.js';
+/** One element of a DICOM dataset, as every surface sees it. */
+export interface DicomTag {
+    /** `(gggg,eeee)`, upper-case hex. */
+    tag: string;
+    /** Dictionary name; `PrivateTag` or `Unknown` when the dictionary has none. */
+    name: string;
+    vr: string;
+    /** The value in text. Multi-valued elements join with `\`; bulk data reads `<N bytes>`. */
+    value: string;
+    group: DicomTagGroup;
+    /** True when the tag identifies a person or an institution. */
+    phi: boolean;
+    /** Words for a coded value, when the kernel knows them. */
+    decoded?: string;
+    /** Sequence items, each a dataset of its own. */
+    items?: DicomTag[][];
+}
+/** Everything read from one file. */
+export interface DicomTagSet {
+    tags: DicomTag[];
+    /** From the file meta group; absent for a bare dataset. */
+    transferSyntaxUID?: string;
+}
+/** A tag whose value changes across a folder. */
+export interface DicomVaryingTag {
+    tag: string;
+    name: string;
+    vr: string;
+    group: DicomTagGroup;
+    phi: boolean;
+    /** How many distinct values the folder holds. */
+    distinct: number;
+    /** The value in the first file, in folder order. */
+    first: string;
+    /** The value in the last file, in folder order. */
+    last: string;
+    /** Every file's value, in folder order. Files without the tag carry `null`. */
+    values: Array<{
+        path: string;
+        value: string | null;
+    }>;
+}
+/** What a folder of files shares and what changes across it. */
+export interface DicomTagsSummary {
+    constant: DicomTag[];
+    varying: DicomVaryingTag[];
+}
+/**
+ * Reads the elements of a DICOM file.
+ *
+ * @param bytes - The whole file, Part 10 header included.
+ * @returns The tag set, or an error when the bytes are not a DICOM file.
+ */
+export declare function dicomTags_read(bytes: Buffer): Result<DicomTagSet>;
+/**
+ * Finds one tag by name in a tag set's top level.
+ *
+ * @param tags - The tags to search.
+ * @param name - The dictionary name.
+ * @returns The tag, or undefined.
+ */
+export declare function dicomTag_find(tags: DicomTag[], name: string): DicomTag | undefined;
+/**
+ * Tells constant from varying across a folder's files, in folder order.
+ *
+ * A tag is constant when every file carries it with the same value
+ * (sequences compare by their items). Anything else, including a tag some
+ * files lack, is varying, with its first and last value and its distinct
+ * count. Files that failed to read are the caller's to report; they are not
+ * passed here.
+ *
+ * @param files - Each file's path and tag set, in folder order.
+ * @returns The summary.
+ */
+export declare function dicomTags_summarize(files: Array<{
+    path: string;
+    tags: DicomTagSet;
+}>): DicomTagsSummary;

package/dist/dicom/tags.js

@@ -0,0 +1,234 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dicomTags_read = dicomTags_read;
+exports.dicomTag_find = dicomTag_find;
+exports.dicomTags_summarize = dicomTags_summarize;
+/**
+ * @file DICOM tag reading: one parser for every surface.
+ *
+ * A DICOM file is a dictionary of elements. Reading one here gives every
+ * surface the same answer: the tag, its dictionary name and VR, its value in
+ * text, the module it belongs to, whether it identifies someone, and words
+ * for the coded values a reader meets first. Sequences keep their items.
+ * Across a folder, the same reader tells constant from varying: what the
+ * series shares against what changes slice by slice.
+ *
+ * Bulk values (pixel data and friends) are never rendered as bytes; the
+ * listing says how many bytes there were. Long text is carried whole on the
+ * model; a surface that bounds it says so.
+ *
+ * @module
+ */
+const dcmjs_1 = __importDefault(require("dcmjs"));
+const cumin_1 = require("@fnndsc/cumin");
+const dictionary_js_1 = require("./dictionary.js");
+/** VRs whose values are bulk bytes, never text. */
+const BULK_VRS = new Set(['OB', 'OW', 'OF', 'OD', 'OL', 'OV', 'UN']);
+/** Group numbers whose every element is a sequence item boundary or padding. */
+const STRUCTURAL_TAGS = new Set(['FFFEE000', 'FFFEE00D', 'FFFEE0DD']);
+/**
+ * Reads the elements of a DICOM file.
+ *
+ * @param bytes - The whole file, Part 10 header included.
+ * @returns The tag set, or an error when the bytes are not a DICOM file.
+ */
+function dicomTags_read(bytes) {
+    const buffer = new Uint8Array(bytes).slice().buffer;
+    try {
+        const message = dcmjs_1.default.data.DicomMessage.readFile(buffer, { ignoreErrors: true });
+        const meta = dict_flatten(message.meta);
+        const body = dict_flatten(message.dict);
+        const syntax = meta.find((tag) => tag.name === 'TransferSyntaxUID');
+        return (0, cumin_1.Ok)({
+            tags: [...meta, ...body],
+            ...(syntax !== undefined ? { transferSyntaxUID: syntax.value } : {}),
+        });
+    }
+    catch {
+        return (0, cumin_1.Err)();
+    }
+}
+/**
+ * Turns a raw dictionary into tags, in tag order, sequences nested.
+ *
+ * @param dict - A dcmjs dictionary keyed by `ggggeeee`.
+ * @returns The tags.
+ */
+function dict_flatten(dict) {
+    const keys = Object.keys(dict)
+        .filter((key) => /^[0-9A-Fa-f]{8}$/.test(key) && !STRUCTURAL_TAGS.has(key.toUpperCase()))
+        .sort();
+    return keys.map((key) => element_toTag(key, dict[key]));
+}
+/**
+ * Renders one element as a tag.
+ *
+ * @param key - The `ggggeeee` key.
+ * @param element - The raw element.
+ * @returns The tag.
+ */
+function element_toTag(key, element) {
+    const upper = key.toUpperCase();
+    const tag = `(${upper.slice(0, 4)},${upper.slice(4)})`;
+    const groupNumber = parseInt(upper.slice(0, 4), 16);
+    const entry = dcmjs_1.default.data.DicomMetaDictionary.dictionary[tag];
+    const isPrivate = groupNumber % 2 === 1;
+    const name = entry?.name ?? (isPrivate ? 'PrivateTag' : 'Unknown');
+    const vr = element.vr || entry?.vr || 'UN';
+    const values = element.Value ?? [];
+    const result = {
+        tag,
+        name,
+        vr,
+        value: '',
+        group: (0, dictionary_js_1.tagGroup_of)(groupNumber, entry?.name),
+        phi: dictionary_js_1.DICOM_PHI_TAGS.has(name),
+    };
+    if (vr === 'SQ') {
+        const items = values.map((item) => dict_flatten(item));
+        result.items = items;
+        result.value = `${items.length} item${items.length === 1 ? '' : 's'}`;
+        return result;
+    }
+    if (BULK_VRS.has(vr)) {
+        result.value = `<${bulk_bytes(values)} bytes>`;
+        return result;
+    }
+    result.value = values.map((value) => value_text(value, vr)).join('\\');
+    const decoded = decoded_of(name, result.value);
+    if (decoded !== undefined)
+        result.decoded = decoded;
+    return result;
+}
+/**
+ * Sums the bytes of a bulk value list.
+ *
+ * @param values - Buffers or typed arrays.
+ * @returns Total byte length.
+ */
+function bulk_bytes(values) {
+    let total = 0;
+    for (const value of values) {
+        if (value instanceof ArrayBuffer)
+            total += value.byteLength;
+        else if (ArrayBuffer.isView(value))
+            total += value.byteLength;
+    }
+    return total;
+}
+/**
+ * One value in text. Person names are alphabetic components; everything
+ * else is its string form.
+ *
+ * @param value - The raw value.
+ * @param vr - The element's VR.
+ * @returns The text.
+ */
+function value_text(value, vr) {
+    if (vr === 'PN' && value !== null && typeof value === 'object') {
+        const parts = value;
+        return String(parts.Alphabetic ?? parts.Ideographic ?? parts.Phonetic ?? '');
+    }
+    if (value === null || value === undefined)
+        return '';
+    return String(value);
+}
+/**
+ * Words for a coded value: the short dictionary list, plus SOP class UIDs
+ * named through dcmjs.
+ *
+ * @param name - The tag's name.
+ * @param value - The tag's text value.
+ * @returns Words, or nothing.
+ */
+function decoded_of(name, value) {
+    if (name === 'SOPClassUID' || name === 'MediaStorageSOPClassUID') {
+        return dcmjs_1.default.data.DicomMetaDictionary.sopClassNamesByUID[value];
+    }
+    return (0, dictionary_js_1.tagValue_decode)(name, value);
+}
+/**
+ * Finds one tag by name in a tag set's top level.
+ *
+ * @param tags - The tags to search.
+ * @param name - The dictionary name.
+ * @returns The tag, or undefined.
+ */
+function dicomTag_find(tags, name) {
+    return tags.find((tag) => tag.name === name);
+}
+/**
+ * Tells constant from varying across a folder's files, in folder order.
+ *
+ * A tag is constant when every file carries it with the same value
+ * (sequences compare by their items). Anything else, including a tag some
+ * files lack, is varying, with its first and last value and its distinct
+ * count. Files that failed to read are the caller's to report; they are not
+ * passed here.
+ *
+ * @param files - Each file's path and tag set, in folder order.
+ * @returns The summary.
+ */
+function dicomTags_summarize(files) {
+    const order = [];
+    const byTag = new Map();
+    for (const file of files) {
+        const seen = new Map();
+        for (const tag of file.tags.tags) {
+            if (!byTag.has(tag.tag)) {
+                byTag.set(tag.tag, new Map());
+                order.push(tag.tag);
+            }
+            seen.set(tag.tag, tag);
+        }
+        for (const [key, tag] of seen)
+            byTag.get(key).set(file.path, tag);
+    }
+    const constant = [];
+    const varying = [];
+    for (const key of order.sort()) {
+        const perFile = byTag.get(key);
+        const values = files.map((file) => {
+            const tag = perFile.get(file.path);
+            return { path: file.path, value: tag === undefined ? null : tag_comparable(tag) };
+        });
+        const distinctValues = new Set(values.map((entry) => entry.value));
+        const sample = perFile.values().next().value;
+        if (distinctValues.size === 1 && !distinctValues.has(null)) {
+            constant.push(sample);
+            continue;
+        }
+        const present = values.filter((entry) => entry.value !== null);
+        varying.push({
+            tag: sample.tag,
+            name: sample.name,
+            vr: sample.vr,
+            group: sample.group,
+            phi: sample.phi,
+            distinct: distinctValues.size - (distinctValues.has(null) ? 1 : 0),
+            first: present[0].value,
+            last: present[present.length - 1].value,
+            values: values.map((entry) => ({
+                path: entry.path,
+                value: entry.value === null ? null : perFile.get(entry.path).value,
+            })),
+        });
+    }
+    return { constant, varying };
+}
+/**
+ * The value a tag is compared by across files: its text, or for a sequence
+ * the text of its items.
+ *
+ * @param tag - The tag.
+ * @returns A comparable string.
+ */
+function tag_comparable(tag) {
+    if (tag.items === undefined)
+        return tag.value;
+    return JSON.stringify(tag.items.map((item) => item.map((inner) => `${inner.tag}=${tag_comparable(inner)}`)));
+}
+//# sourceMappingURL=tags.js.map

package/dist/dicom/tags.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tags.js","sourceRoot":"","sources":["../../src/dicom/tags.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export * from './context/index.js';
 export * from './store/index.js';
 export * from './pipelines/index.js';
 export * from './pacs/index.js';
+export * from './dicom/index.js';
 export * from './retrieve/watch.js';
 export * from './vfs/index.js';
 export * from './tags/index.js';

package/dist/index.js

@@ -27,6 +27,7 @@ __exportStar(require("./context/index.js"), exports);
 __exportStar(require("./store/index.js"), exports);
 __exportStar(require("./pipelines/index.js"), exports);
 __exportStar(require("./pacs/index.js"), exports);
+__exportStar(require("./dicom/index.js"), exports);
 __exportStar(require("./retrieve/watch.js"), exports);
 __exportStar(require("./vfs/index.js"), exports);
 __exportStar(require("./tags/index.js"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;AAEH,mDAAiC;AACjC,qDAAmC;AACnC,mDAAiC;AACjC,qDAAmC;AACnC,qDAAmC;AACnC,mDAAiC;AACjC,uDAAqC;AACrC,kDAAgC;AAChC,sDAAoC;AACpC,iDAA+B;AAC/B,kDAAgC;AAChC,oDAAkC;AAClC,yDAAuC;AACvC,6DAA2C;AAC3C,uDAAqC;AACrC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AACjC,mDAAygB;AAAhgB,4GAAA,iBAAiB,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,sHAAA,2BAA2B,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,gHAAA,qBAAqB,OAAA;AAAE,qHAAA,0BAA0B,OAAA;AAAE,sHAAA,2BAA2B,OAAA;AAAE,gHAAA,qBAAqB,OAAA;AAA8B,0GAAA,eAAe,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,yGAAA,cAAc,OAAA;AAAE,+GAAA,oBAAoB,OAAA;AAAE,0GAAA,eAAe,OAAA;AAAE,+GAAA,oBAAoB,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,+GAAA,oBAAoB,OAAA;AAAE,0GAAA,eAAe,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,iHAAA,sBAAsB,OAAA;AAEve,mDAAwE;AAA/D,+GAAA,eAAe,OAAA;AAAE,iHAAA,iBAAiB,OAAA;AAE3C,mDAAyE;AAAhE,gHAAA,gBAAgB,OAAA;AAAE,iHAAA,iBAAiB,OAAA;AAC5C,iDAAyD;AAAhD,mHAAA,oBAAoB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;AAEH,mDAAiC;AACjC,qDAAmC;AACnC,mDAAiC;AACjC,qDAAmC;AACnC,qDAAmC;AACnC,mDAAiC;AACjC,uDAAqC;AACrC,kDAAgC;AAChC,mDAAiC;AACjC,sDAAoC;AACpC,iDAA+B;AAC/B,kDAAgC;AAChC,oDAAkC;AAClC,yDAAuC;AACvC,6DAA2C;AAC3C,uDAAqC;AACrC,qDAAmC;AACnC,kDAAgC;AAChC,mDAAiC;AACjC,mDAAygB;AAAhgB,4GAAA,iBAAiB,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,sHAAA,2BAA2B,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,gHAAA,qBAAqB,OAAA;AAAE,qHAAA,0BAA0B,OAAA;AAAE,sHAAA,2BAA2B,OAAA;AAAE,gHAAA,qBAAqB,OAAA;AAA8B,0GAAA,eAAe,OAAA;AAAE,6GAAA,kBAAkB,OAAA;AAAE,yGAAA,cAAc,OAAA;AAAE,+GAAA,oBAAoB,OAAA;AAAE,0GAAA,eAAe,OAAA;AAAE,+GAAA,oBAAoB,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,+GAAA,oBAAoB,OAAA;AAAE,0GAAA,eAAe,OAAA;AAAE,8GAAA,mBAAmB,OAAA;AAAE,iHAAA,sBAAsB,OAAA;AAEve,mDAAwE;AAA/D,+GAAA,eAAe,OAAA;AAAE,iHAAA,iBAAiB,OAAA;AAE3C,mDAAyE;AAAhE,gHAAA,gBAAgB,OAAA;AAAE,iHAAA,iBAAiB,OAAA;AAC5C,iDAAyD;AAAhD,mHAAA,oBAAoB,OAAA"}

package/dist/retrieve/watch.d.ts

@@ -26,6 +26,9 @@ export type RetrieveProgressStatus = 'running' | 'done' | 'unconfirmed' | 'error
  * @property actualFiles - Most recent file count from LONK progress updates.
  * @property lastProgressFiles - `actualFiles` at the last progress tick (stall detection).
  * @property lastProgressTime - Timestamp of the last progress tick.
+ * @property firstFileTime - When this series' first file arrived; 0 while it
+ *   is still waiting its turn. The long stop counts from here, so a series
+ *   queued behind a dozen others is not charged for the wait.
  * @property startTime - Timestamp when the retrieve was fired.
  * @property lonkConfirmed - True only after an explicit LONK `done` or a storage confirmation.
  * @property cubePathDir - CUBE folder the series landed in (resolved post-pull).
@@ -42,6 +45,7 @@ export interface RetrieveTask {
     actualFiles: number;
     lastProgressFiles: number;
     lastProgressTime: number;
+    firstFileTime: number;
     startTime: number;
     lonkConfirmed: boolean;
     cubePathDir: string | null;

package/dist/retrieve/watch.js

@@ -62,6 +62,7 @@ function retrieveTask_make(info) {
         actualFiles: 0,
         lastProgressFiles: 0,
         lastProgressTime: Date.now(),
+        firstFileTime: 0,
         startTime: 0,
         lonkConfirmed: false,
         cubePathDir: null,
@@ -240,6 +241,11 @@ async function retrieve_fireAndWatch(tasks, pacsserver, client, events = {}, pha
     await new Promise((resolve) => {
         let resolved = false;
         let reconnectsLeft = WATCH_RECONNECT_ATTEMPTS;
+        // When this watch last saw life from the PACS, on ANY of its series.
+        // Quiet is a property of the watch, not of each series: a PACS busy
+        // sending the first series has not gone silent on the ten queued
+        // behind it, and they cannot report files they have not been sent yet.
+        let lastActivityAt = Date.now();
         const done = () => {
             if (resolved)
                 return;
@@ -290,6 +296,9 @@ async function retrieve_fireAndWatch(tasks, pacsserver, client, events = {}, pha
                     return;
                 }
                 ws = replacement;
+                // A reconnection is a new view, not new silence: charging the
+                // gap to the PACS would declare the study dead on reconnect.
+                lastActivityAt = Date.now();
                 socket_listen();
             })
                 .catch(() => socket_replace());
@@ -302,17 +311,27 @@ async function retrieve_fireAndWatch(tasks, pacsserver, client, events = {}, pha
                     continue;
                 }
                 allTerminal = false;
-                if (t.startTime > 0 && now - t.startTime > SERIES_TIMEOUT_MS) {
-                    t.status = 'timeout';
-                    emit(t, 'timeout');
-                    continue;
-                }
+                // A series that began and then stopped is stalled on its own
+                // evidence: it was being sent, and it no longer is.
                 if (t.actualFiles > 0 && now - t.lastProgressTime > STALL_TIMEOUT_MS) {
                     t.status = 'stalled';
                     emit(t, 'stalled');
                     continue;
                 }
-                if (t.startTime > 0 && t.actualFiles === 0 && now - t.startTime > NO_ACTIVITY_TIMEOUT_MS) {
+                // The long stop: a series that trickles and never ends. Counted
+                // from its first file, never from the fire, so waiting a turn in a
+                // large study costs a series nothing.
+                if (t.firstFileTime > 0 && now - t.firstFileTime > SERIES_TIMEOUT_MS) {
+                    t.status = 'timeout';
+                    emit(t, 'timeout');
+                    continue;
+                }
+                // Nothing has arrived for this series. That is evidence of a lost
+                // retrieve only when nothing has arrived for ANY of them. Charged
+                // per series from its own fire time, this declared every series
+                // after the first few dead fifteen seconds into any study large
+                // enough that the PACS served them in turn.
+                if (t.startTime > 0 && t.actualFiles === 0 && now - lastActivityAt > NO_ACTIVITY_TIMEOUT_MS) {
                     t.status = 'pulled';
                     t.lonkConfirmed = false;
                     emit(t, 'unconfirmed');
@@ -334,11 +353,14 @@ async function retrieve_fireAndWatch(tasks, pacsserver, client, events = {}, pha
                     const t = taskByUID.get(seriesUID);
                     if (!t)
                         return;
+                    lastActivityAt = Date.now();
                     if ('ndicom' in message && typeof message.ndicom === 'number') {
                         const n = message.ndicom;
                         t.actualFiles = n;
                         t.lastProgressFiles = n;
                         t.lastProgressTime = Date.now();
+                        if (t.firstFileTime === 0 && n > 0)
+                            t.firstFileTime = t.lastProgressTime;
                         if (t.status === 'pending')
                             t.status = 'pulling';
                         emit(t, 'running');
@@ -410,6 +432,7 @@ async function retrieve_confirmLoop(allTasks, retryMax, pacsserver, client, even
             t.actualFiles = 0;
             t.lastProgressFiles = 0;
             t.lastProgressTime = Date.now();
+            t.firstFileTime = 0;
             t.startTime = 0;
             t.lonkConfirmed = false;
             t.syntheticQueryId = null;

package/dist/retrieve/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/retrieve/watch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../src/retrieve/watch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fnndsc/salsa",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "description": "Shared Application Logic and Service Assets for ChRIS",
   "repository": {
     "type": "git",
@@ -56,11 +56,13 @@
   },
   "overrides": {
     "glob": "^10.0.0",
-    "inflight": "npm:@aashutoshrathi/word-wrap@^1.2.6"
+    "inflight": "npm:@aashutoshrathi/word-wrap@^1.2.6",
+    "adm-zip": "npm:empty-npm-package@1.0.0"
   },
   "dependencies": {
-    "@fnndsc/cumin": "^3.21.0",
+    "@fnndsc/cumin": "^3.21.1",
     "axios": "^1.6.8",
+    "dcmjs": "^0.52.0",
     "ws": "^8.21.0"
   }
 }