@ubercode/dcmtk 0.11.1 → 0.12.1

package/dist/servers.cjs

@@ -2246,7 +2246,12 @@ var parser = new fastXmlParser.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 {
@@ -2855,6 +2860,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", []);
@@ -2892,6 +2900,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() {
@@ -2901,6 +2912,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;
   }
@@ -2911,6 +2925,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);
@@ -3082,7 +3125,16 @@ var DicomReceiver = class _DicomReceiver extends events.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
@@ -3090,6 +3142,15 @@ var DicomReceiver = class _DicomReceiver extends events.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).
    *
@@ -3419,28 +3480,33 @@ var DicomReceiver = class _DicomReceiver extends events.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) {
@@ -3448,10 +3514,12 @@ var DicomReceiver = class _DicomReceiver extends events.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();
   }
@@ -3483,6 +3551,20 @@ var DicomReceiver = class _DicomReceiver extends events.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) => {