@ubercode/dcmtk 0.11.1 → 0.12.1

package/dist/servers.d.cts

@@ -1,4 +1,4 @@
-export { A as AssociationAcknowledgedData, a as AssociationCompleteData, b as AssociationContext, c as AssociationReceivedData, d as AssociationSummary, e as AssociationTracker, C as CStoreRequestData, f as CannotStartListenerData, g as ConfigErrorData, D as DCMPRSCP_FATAL_EVENTS, h as DCMPRSCP_PATTERNS, i as DCMPSRCV_FATAL_EVENTS, j as DCMPSRCV_PATTERNS, k as DCMQRSCP_FATAL_EVENTS, l as DCMQRSCP_PATTERNS, m as DCMRECV_FATAL_EVENTS, n as DCMRECV_PATTERNS, o as DatabaseReadyData, p as DcmQRSCP, q as DcmQRSCPEventMap, r as DcmQRSCPOptions, s as DcmprsCP, t as DcmprsCPEventMap, u as DcmprsCPOptions, v as DcmprscpEvent, w as DcmprscpEventValue, x as Dcmpsrcv, y as DcmpsrcvEvent, z as DcmpsrcvEventMap, B as DcmpsrcvEventValue, E as DcmpsrcvOptions, F as DcmqrscpEvent, G as DcmqrscpEventValue, H as Dcmrecv, I as DcmrecvEvent, J as DcmrecvEventMap, K as DcmrecvEventValue, L as DcmrecvOptions, M as DcmtkProcess, N as DcmtkProcessConfig, O as DcmtkProcessEventMap, P as DicomReceiver, Q as DicomReceiverEventMap, R as DicomReceiverOptions, S as EventPattern, T as FileDeletedData, U as FileReceivedData, V as FilenameMode, W as FilenameModeValue, X as LineParser, Y as LineParserEventMap, Z as MultiLineConfig, a2 as PoolStatus, a3 as PreferredTransferSyntax, a4 as PreferredTransferSyntaxValue, a5 as PrintAssociationAcknowledgedData, a6 as PrintAssociationReceivedData, a7 as PrintCannotStartListenerData, a8 as ProcessState, a9 as ProcessStateValue, aa as QRAssociationAcknowledgedData, ab as QRAssociationReceivedData, ac as QRCFindRequestData, ad as QRCGetRequestData, ae as QRCMoveRequestData, af as QRCStoreRequestData, ag as QRCannotStartListenerData, ah as QRListeningData, ai as ReceiverAssociationAcknowledgedData, aj as ReceiverAssociationData, ak as ReceiverAssociationReceivedData, al as ReceiverCStoreRequestData, am as ReceiverCannotStartListenerData, an as ReceiverConfigErrorData, ao as ReceiverDatabaseReadyData, ap as ReceiverEchoRequestData, aq as ReceiverErrorData, ar as ReceiverFileData, as as ReceiverFileReceivedData, at as ReceiverFileStoredData, au as ReceiverInstanceData, av as ReceiverListeningData, aw as RefusingAssociationData, ax as STORESCP_FATAL_EVENTS, ay as STORESCP_PATTERNS, az as StorageMode, aA as StorageModeValue, aB as StoreSCP, aC as StoreSCPEventMap, aD as StoreSCPOptions, aE as StoreSCPPreset, aF as StoreSCPPresetName, aG as StoredFileData, aH as StorescpEvent, aI as StorescpEventValue, aJ as StoringFileData, aK as SubdirectoryCreatedData, aL as SubdirectoryMode, aM as SubdirectoryModeValue, aN as TrackedFile, aO as WLMSCPFS_FATAL_EVENTS, aP as WLMSCPFS_PATTERNS, aQ as WlmAssociationAcknowledgedData, aR as WlmAssociationReceivedData, aS as WlmCFindRequestData, aT as WlmCannotStartListenerData, aU as WlmListeningData, aV as Wlmscpfs, aW as WlmscpfsEvent, aX as WlmscpfsEventMap, aY as WlmscpfsEventValue, aZ as WlmscpfsOptions } from './index-CVDMaxd8.cjs';
+export { A as AssociationAcknowledgedData, a as AssociationCompleteData, b as AssociationContext, c as AssociationReceivedData, d as AssociationSummary, e as AssociationTracker, C as CStoreRequestData, f as CannotStartListenerData, g as ConfigErrorData, D as DCMPRSCP_FATAL_EVENTS, h as DCMPRSCP_PATTERNS, i as DCMPSRCV_FATAL_EVENTS, j as DCMPSRCV_PATTERNS, k as DCMQRSCP_FATAL_EVENTS, l as DCMQRSCP_PATTERNS, m as DCMRECV_FATAL_EVENTS, n as DCMRECV_PATTERNS, o as DatabaseReadyData, p as DcmQRSCP, q as DcmQRSCPEventMap, r as DcmQRSCPOptions, s as DcmprsCP, t as DcmprsCPEventMap, u as DcmprsCPOptions, v as DcmprscpEvent, w as DcmprscpEventValue, x as Dcmpsrcv, y as DcmpsrcvEvent, z as DcmpsrcvEventMap, B as DcmpsrcvEventValue, E as DcmpsrcvOptions, F as DcmqrscpEvent, G as DcmqrscpEventValue, H as Dcmrecv, I as DcmrecvEvent, J as DcmrecvEventMap, K as DcmrecvEventValue, L as DcmrecvOptions, M as DcmtkProcess, N as DcmtkProcessConfig, O as DcmtkProcessEventMap, P as DicomReceiver, Q as DicomReceiverEventMap, R as DicomReceiverOptions, S as EventPattern, T as FileDeletedData, U as FileReceivedData, V as FilenameMode, W as FilenameModeValue, X as LineParser, Y as LineParserEventMap, Z as MultiLineConfig, a2 as PoolStatus, a3 as PreferredTransferSyntax, a4 as PreferredTransferSyntaxValue, a5 as PrintAssociationAcknowledgedData, a6 as PrintAssociationReceivedData, a7 as PrintCannotStartListenerData, a8 as ProcessState, a9 as ProcessStateValue, aa as QRAssociationAcknowledgedData, ab as QRAssociationReceivedData, ac as QRCFindRequestData, ad as QRCGetRequestData, ae as QRCMoveRequestData, af as QRCStoreRequestData, ag as QRCannotStartListenerData, ah as QRListeningData, ai as ReceiverAssociationAcknowledgedData, aj as ReceiverAssociationData, ak as ReceiverAssociationFinalizedData, al as ReceiverAssociationReceivedData, am as ReceiverCStoreRequestData, an as ReceiverCannotStartListenerData, ao as ReceiverConfigErrorData, ap as ReceiverDatabaseReadyData, aq as ReceiverEchoRequestData, ar as ReceiverErrorData, as as ReceiverFileData, at as ReceiverFileReceivedData, au as ReceiverFileStoredData, av as ReceiverInstanceData, aw as ReceiverInstanceErrorData, ax as ReceiverListeningData, ay as RefusingAssociationData, az as STORESCP_FATAL_EVENTS, aA as STORESCP_PATTERNS, aB as StorageMode, aC as StorageModeValue, aD as StoreSCP, aE as StoreSCPEventMap, aF as StoreSCPOptions, aG as StoreSCPPreset, aH as StoreSCPPresetName, aI as StoredFileData, aJ as StorescpEvent, aK as StorescpEventValue, aL as StoringFileData, aM as SubdirectoryCreatedData, aN as SubdirectoryMode, aO as SubdirectoryModeValue, aP as TrackedFile, aQ as WLMSCPFS_FATAL_EVENTS, aR as WLMSCPFS_PATTERNS, aS as WlmAssociationAcknowledgedData, aT as WlmAssociationReceivedData, aU as WlmCFindRequestData, aV as WlmCannotStartListenerData, aW as WlmListeningData, aX as Wlmscpfs, aY as WlmscpfsEvent, aZ as WlmscpfsEventMap, a_ as WlmscpfsEventValue, a$ as WlmscpfsOptions } from './index-DV8HaHEX.cjs';
 import './types-Cgumy1N4.cjs';
 import 'node:events';
 import 'node:net';

package/dist/servers.d.ts

@@ -1,4 +1,4 @@
-export { A as AssociationAcknowledgedData, a as AssociationCompleteData, b as AssociationContext, c as AssociationReceivedData, d as AssociationSummary, e as AssociationTracker, C as CStoreRequestData, f as CannotStartListenerData, g as ConfigErrorData, D as DCMPRSCP_FATAL_EVENTS, h as DCMPRSCP_PATTERNS, i as DCMPSRCV_FATAL_EVENTS, j as DCMPSRCV_PATTERNS, k as DCMQRSCP_FATAL_EVENTS, l as DCMQRSCP_PATTERNS, m as DCMRECV_FATAL_EVENTS, n as DCMRECV_PATTERNS, o as DatabaseReadyData, p as DcmQRSCP, q as DcmQRSCPEventMap, r as DcmQRSCPOptions, s as DcmprsCP, t as DcmprsCPEventMap, u as DcmprsCPOptions, v as DcmprscpEvent, w as DcmprscpEventValue, x as Dcmpsrcv, y as DcmpsrcvEvent, z as DcmpsrcvEventMap, B as DcmpsrcvEventValue, E as DcmpsrcvOptions, F as DcmqrscpEvent, G as DcmqrscpEventValue, H as Dcmrecv, I as DcmrecvEvent, J as DcmrecvEventMap, K as DcmrecvEventValue, L as DcmrecvOptions, M as DcmtkProcess, N as DcmtkProcessConfig, O as DcmtkProcessEventMap, P as DicomReceiver, Q as DicomReceiverEventMap, R as DicomReceiverOptions, S as EventPattern, T as FileDeletedData, U as FileReceivedData, V as FilenameMode, W as FilenameModeValue, X as LineParser, Y as LineParserEventMap, Z as MultiLineConfig, a2 as PoolStatus, a3 as PreferredTransferSyntax, a4 as PreferredTransferSyntaxValue, a5 as PrintAssociationAcknowledgedData, a6 as PrintAssociationReceivedData, a7 as PrintCannotStartListenerData, a8 as ProcessState, a9 as ProcessStateValue, aa as QRAssociationAcknowledgedData, ab as QRAssociationReceivedData, ac as QRCFindRequestData, ad as QRCGetRequestData, ae as QRCMoveRequestData, af as QRCStoreRequestData, ag as QRCannotStartListenerData, ah as QRListeningData, ai as ReceiverAssociationAcknowledgedData, aj as ReceiverAssociationData, ak as ReceiverAssociationReceivedData, al as ReceiverCStoreRequestData, am as ReceiverCannotStartListenerData, an as ReceiverConfigErrorData, ao as ReceiverDatabaseReadyData, ap as ReceiverEchoRequestData, aq as ReceiverErrorData, ar as ReceiverFileData, as as ReceiverFileReceivedData, at as ReceiverFileStoredData, au as ReceiverInstanceData, av as ReceiverListeningData, aw as RefusingAssociationData, ax as STORESCP_FATAL_EVENTS, ay as STORESCP_PATTERNS, az as StorageMode, aA as StorageModeValue, aB as StoreSCP, aC as StoreSCPEventMap, aD as StoreSCPOptions, aE as StoreSCPPreset, aF as StoreSCPPresetName, aG as StoredFileData, aH as StorescpEvent, aI as StorescpEventValue, aJ as StoringFileData, aK as SubdirectoryCreatedData, aL as SubdirectoryMode, aM as SubdirectoryModeValue, aN as TrackedFile, aO as WLMSCPFS_FATAL_EVENTS, aP as WLMSCPFS_PATTERNS, aQ as WlmAssociationAcknowledgedData, aR as WlmAssociationReceivedData, aS as WlmCFindRequestData, aT as WlmCannotStartListenerData, aU as WlmListeningData, aV as Wlmscpfs, aW as WlmscpfsEvent, aX as WlmscpfsEventMap, aY as WlmscpfsEventValue, aZ as WlmscpfsOptions } from './index--dDQfutR.js';
+export { A as AssociationAcknowledgedData, a as AssociationCompleteData, b as AssociationContext, c as AssociationReceivedData, d as AssociationSummary, e as AssociationTracker, C as CStoreRequestData, f as CannotStartListenerData, g as ConfigErrorData, D as DCMPRSCP_FATAL_EVENTS, h as DCMPRSCP_PATTERNS, i as DCMPSRCV_FATAL_EVENTS, j as DCMPSRCV_PATTERNS, k as DCMQRSCP_FATAL_EVENTS, l as DCMQRSCP_PATTERNS, m as DCMRECV_FATAL_EVENTS, n as DCMRECV_PATTERNS, o as DatabaseReadyData, p as DcmQRSCP, q as DcmQRSCPEventMap, r as DcmQRSCPOptions, s as DcmprsCP, t as DcmprsCPEventMap, u as DcmprsCPOptions, v as DcmprscpEvent, w as DcmprscpEventValue, x as Dcmpsrcv, y as DcmpsrcvEvent, z as DcmpsrcvEventMap, B as DcmpsrcvEventValue, E as DcmpsrcvOptions, F as DcmqrscpEvent, G as DcmqrscpEventValue, H as Dcmrecv, I as DcmrecvEvent, J as DcmrecvEventMap, K as DcmrecvEventValue, L as DcmrecvOptions, M as DcmtkProcess, N as DcmtkProcessConfig, O as DcmtkProcessEventMap, P as DicomReceiver, Q as DicomReceiverEventMap, R as DicomReceiverOptions, S as EventPattern, T as FileDeletedData, U as FileReceivedData, V as FilenameMode, W as FilenameModeValue, X as LineParser, Y as LineParserEventMap, Z as MultiLineConfig, a2 as PoolStatus, a3 as PreferredTransferSyntax, a4 as PreferredTransferSyntaxValue, a5 as PrintAssociationAcknowledgedData, a6 as PrintAssociationReceivedData, a7 as PrintCannotStartListenerData, a8 as ProcessState, a9 as ProcessStateValue, aa as QRAssociationAcknowledgedData, ab as QRAssociationReceivedData, ac as QRCFindRequestData, ad as QRCGetRequestData, ae as QRCMoveRequestData, af as QRCStoreRequestData, ag as QRCannotStartListenerData, ah as QRListeningData, ai as ReceiverAssociationAcknowledgedData, aj as ReceiverAssociationData, ak as ReceiverAssociationFinalizedData, al as ReceiverAssociationReceivedData, am as ReceiverCStoreRequestData, an as ReceiverCannotStartListenerData, ao as ReceiverConfigErrorData, ap as ReceiverDatabaseReadyData, aq as ReceiverEchoRequestData, ar as ReceiverErrorData, as as ReceiverFileData, at as ReceiverFileReceivedData, au as ReceiverFileStoredData, av as ReceiverInstanceData, aw as ReceiverInstanceErrorData, ax as ReceiverListeningData, ay as RefusingAssociationData, az as STORESCP_FATAL_EVENTS, aA as STORESCP_PATTERNS, aB as StorageMode, aC as StorageModeValue, aD as StoreSCP, aE as StoreSCPEventMap, aF as StoreSCPOptions, aG as StoreSCPPreset, aH as StoreSCPPresetName, aI as StoredFileData, aJ as StorescpEvent, aK as StorescpEventValue, aL as StoringFileData, aM as SubdirectoryCreatedData, aN as SubdirectoryMode, aO as SubdirectoryModeValue, aP as TrackedFile, aQ as WLMSCPFS_FATAL_EVENTS, aR as WLMSCPFS_PATTERNS, aS as WlmAssociationAcknowledgedData, aT as WlmAssociationReceivedData, aU as WlmCFindRequestData, aV as WlmCannotStartListenerData, aW as WlmListeningData, aX as Wlmscpfs, aY as WlmscpfsEvent, aZ as WlmscpfsEventMap, a_ as WlmscpfsEventValue, a$ as WlmscpfsOptions } from './index-B5FQoIqM.js';
 import './types-Cgumy1N4.js';
 import 'node:events';
 import 'node:net';

package/dist/servers.js

@@ -2221,7 +2221,12 @@ var parser = new XMLParser({
   ignoreAttributes: false,
   attributeNamePrefix: "@_",
   parseTagValue: false,
-  isArray: (name) => ARRAY_TAG_NAMES.has(name)
+  isArray: (name) => ARRAY_TAG_NAMES.has(name),
+  // DICOM XML does not use XML entities. Disable entity processing to avoid
+  // the default expansion limit (1000) which rejects files with >1000 tags.
+  // Without this, large studies fall through to dcm2json which hangs on
+  // compressed pixel data (DCMTK bug).
+  processEntities: false
 });
 function xmlToJson(xml) {
   try {
@@ -2830,6 +2835,9 @@ var Worker = class {
     __publicField(this, "_state", "idle");
     __publicField(this, "_context");
     __publicField(this, "_pending", /* @__PURE__ */ new Set());
+    __publicField(this, "_instancePending", /* @__PURE__ */ new Set());
+    __publicField(this, "_instancesReceived", 0);
+    __publicField(this, "_instanceErrors", 0);
     __publicField(this, "_files", []);
     __publicField(this, "_fileSizes", []);
     __publicField(this, "_outputLines", []);
@@ -2867,6 +2875,9 @@ var Worker = class {
     this._fileSizes.length = 0;
     this._outputLines.length = 0;
     this._pending.clear();
+    this._instancePending.clear();
+    this._instancesReceived = 0;
+    this._instanceErrors = 0;
   }
   /** Returns the worker to idle and clears all association state. */
   endAssociation() {
@@ -2876,6 +2887,9 @@ var Worker = class {
     this._fileSizes.length = 0;
     this._outputLines.length = 0;
     this._pending.clear();
+    this._instancePending.clear();
+    this._instancesReceived = 0;
+    this._instanceErrors = 0;
     this._remoteSocket = void 0;
     this._workerSocket = void 0;
   }
@@ -2886,6 +2900,35 @@ var Worker = class {
       this._pending.delete(promise);
     });
   }
+  /** Tracks an in-flight instance parsing promise; auto-removes on completion. */
+  trackInstance(promise) {
+    this._instancePending.add(promise);
+    void promise.finally(() => {
+      this._instancePending.delete(promise);
+    });
+  }
+  /** Records a successful instance parse. */
+  recordInstanceSuccess() {
+    this._instancesReceived++;
+  }
+  /** Records a failed instance parse. */
+  recordInstanceError() {
+    this._instanceErrors++;
+  }
+  /** Awaits all in-flight instance parsing promises. */
+  async drainInstancePending() {
+    if (this._instancePending.size > 0) {
+      await Promise.all(this._instancePending);
+    }
+  }
+  /** Number of successfully parsed instances in this association. */
+  get instancesReceived() {
+    return this._instancesReceived;
+  }
+  /** Number of failed instance parses in this association. */
+  get instanceErrors() {
+    return this._instanceErrors;
+  }
   /** Records a successfully received file path and its size. */
   recordFile(filePath, size) {
     this._files.push(filePath);
@@ -3057,7 +3100,16 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     return this.on("INSTANCE_RECEIVED", listener);
   }
   /**
-   * Registers a listener for completed associations.
+   * Registers a listener for DicomInstance.open failures.
+   *
+   * @param listener - Callback receiving instance error data
+   * @returns this for chaining
+   */
+  onInstanceError(listener) {
+    return this.on("INSTANCE_ERROR", listener);
+  }
+  /**
+   * Registers a listener for completed associations (file moves done).
    *
    * @param listener - Callback receiving association data
    * @returns this for chaining
@@ -3065,6 +3117,15 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
   onAssociationComplete(listener) {
     return this.on("ASSOCIATION_COMPLETE", listener);
   }
+  /**
+   * Registers a listener for fully finalized associations (all parsing done).
+   *
+   * @param listener - Callback receiving finalized data with instance counts
+   * @returns this for chaining
+   */
+  onAssociationFinalized(listener) {
+    return this.on("ASSOCIATION_FINALIZED", listener);
+  }
   /**
    * Registers a listener for new associations (bubbled from workers).
    *
@@ -3394,28 +3455,33 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
       calledAE: data.calledAE,
       source: data.source
     });
-    this.emitInstanceReceived(finalPath, fileSize, data, ctx);
-  }
-  /** Parses a DICOM file and emits INSTANCE_RECEIVED or error. */
-  emitInstanceReceived(filePath, fileSize, data, ctx) {
-    const errorCtx = {
-      filePath,
+    const instanceCtx = {
+      filePath: finalPath,
+      fileSize,
       associationId: ctx.associationId,
       associationDir: ctx.associationDir,
       callingAE: data.callingAE,
       calledAE: data.calledAE,
       source: data.source
     };
-    void DicomInstance.open(filePath).then((openResult) => {
+    worker.trackInstance(this.parseAndEmitInstance(worker, instanceCtx));
+  }
+  /** Parses a DICOM file and emits INSTANCE_RECEIVED or INSTANCE_ERROR. */
+  async parseAndEmitInstance(worker, ctx) {
+    try {
+      const openResult = await DicomInstance.open(ctx.filePath);
       if (!openResult.ok) {
-        this.emit("error", { error: openResult.error, ...errorCtx });
+        worker.recordInstanceError();
+        this.emit("INSTANCE_ERROR", { error: openResult.error, thrown: false, ...ctx });
         return;
       }
-      this.emit("INSTANCE_RECEIVED", { ...errorCtx, fileSize, instance: openResult.value });
-    }).catch((thrown) => {
+      worker.recordInstanceSuccess();
+      this.emit("INSTANCE_RECEIVED", { ...ctx, instance: openResult.value });
+    } catch (thrown) {
       const error = thrown instanceof Error ? thrown : new Error(String(thrown));
-      this.emit("error", { error, ...errorCtx });
-    });
+      worker.recordInstanceError();
+      this.emit("INSTANCE_ERROR", { error, thrown: true, ...ctx });
+    }
   }
   /** Returns worker to idle pool on association complete, emits summary. */
   wireAssociationComplete(worker) {
@@ -3423,10 +3489,12 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
       void this.finalizeAssociation(worker, data);
     });
   }
-  /** Awaits ALL pending file operations, emits ASSOCIATION_COMPLETE, resets worker state. */
+  /** Awaits file ops, emits ASSOCIATION_COMPLETE, awaits parsing, emits ASSOCIATION_FINALIZED. */
   async finalizeAssociation(worker, data) {
     await worker.drainPendingFiles();
     this.emitAssociationComplete(worker, data);
+    await worker.drainInstancePending();
+    this.emitAssociationFinalized(worker, data);
     worker.endAssociation();
     void this.scaleDown();
   }
@@ -3458,6 +3526,20 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
       output
     });
   }
+  /** Emits ASSOCIATION_FINALIZED after all instance parsing is done. */
+  emitAssociationFinalized(worker, data) {
+    const ctx = worker.context;
+    this.emit("ASSOCIATION_FINALIZED", {
+      associationId: ctx?.associationId ?? data.associationId,
+      associationDir: ctx?.associationDir ?? "",
+      callingAE: data.callingAE,
+      calledAE: data.calledAE,
+      source: data.source,
+      files: [...worker.files],
+      instancesReceived: worker.instancesReceived,
+      instanceErrors: worker.instanceErrors
+    });
+  }
   /** Bubbles ASSOCIATION_RECEIVED from dcmrecv worker. */
   wireAssociationReceived(worker) {
     worker.dcmrecv.onEvent("ASSOCIATION_RECEIVED", (data) => {