@ubercode/dcmtk 0.10.0 → 0.11.0

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 ReceiverListeningData, at as RefusingAssociationData, au as STORESCP_FATAL_EVENTS, av as STORESCP_PATTERNS, aw as StorageMode, ax as StorageModeValue, ay as StoreSCP, az as StoreSCPEventMap, aA as StoreSCPOptions, aB as StoreSCPPreset, aC as StoreSCPPresetName, aD as StoredFileData, aE as StorescpEvent, aF as StorescpEventValue, aG as StoringFileData, aH as SubdirectoryCreatedData, aI as SubdirectoryMode, aJ as SubdirectoryModeValue, aK as TrackedFile, aL as WLMSCPFS_FATAL_EVENTS, aM as WLMSCPFS_PATTERNS, aN as WlmAssociationAcknowledgedData, aO as WlmAssociationReceivedData, aP as WlmCFindRequestData, aQ as WlmCannotStartListenerData, aR as WlmListeningData, aS as Wlmscpfs, aT as WlmscpfsEvent, aU as WlmscpfsEventMap, aV as WlmscpfsEventValue, aW as WlmscpfsOptions } from './index-CEqwLKgE.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 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';
 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 ReceiverListeningData, at as RefusingAssociationData, au as STORESCP_FATAL_EVENTS, av as STORESCP_PATTERNS, aw as StorageMode, ax as StorageModeValue, ay as StoreSCP, az as StoreSCPEventMap, aA as StoreSCPOptions, aB as StoreSCPPreset, aC as StoreSCPPresetName, aD as StoredFileData, aE as StorescpEvent, aF as StorescpEventValue, aG as StoringFileData, aH as SubdirectoryCreatedData, aI as SubdirectoryMode, aJ as SubdirectoryModeValue, aK as TrackedFile, aL as WLMSCPFS_FATAL_EVENTS, aM as WLMSCPFS_PATTERNS, aN as WlmAssociationAcknowledgedData, aO as WlmAssociationReceivedData, aP as WlmCFindRequestData, aQ as WlmCannotStartListenerData, aR as WlmListeningData, aS as Wlmscpfs, aT as WlmscpfsEvent, aU as WlmscpfsEventMap, aV as WlmscpfsEventValue, aW as WlmscpfsOptions } from './index-Hp4Ri9y5.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 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';
 import './types-Cgumy1N4.js';
 import 'node:events';
 import 'node:net';

package/dist/servers.js

@@ -2007,13 +2007,14 @@ async function execCommand(binary, args, options) {
       windowsHide: true,
       signal: options?.signal
     });
-    wireSpawnListeners(child, timeoutMs, resolve);
+    wireSpawnListeners(binary, child, timeoutMs, resolve);
   });
 }
-function wireSpawnListeners(child, timeoutMs, resolve) {
+function wireSpawnListeners(binary, child, timeoutMs, resolve) {
   let stdout = "";
   let stderr6 = "";
   let settled = false;
+  const name = binary.split("/").pop() ?? binary;
   const settle = (result) => {
     if (settled) return;
     settled = true;
@@ -2022,25 +2023,25 @@ function wireSpawnListeners(child, timeoutMs, resolve) {
   };
   const timer = setTimeout(() => {
     if (child.pid !== void 0 && child.pid !== null) killTree(child.pid);
-    settle(err(new Error(`Process timed out after ${timeoutMs}ms`)));
+    settle(err(new Error(`${name} timed out after ${timeoutMs}ms (pid: ${String(child.pid ?? "unknown")})`)));
   }, timeoutMs);
   child.stdout?.on("data", (chunk) => {
     stdout += String(chunk);
     if (stdout.length + stderr6.length > MAX_OUTPUT_BYTES) {
       if (child.pid !== void 0 && child.pid !== null) killTree(child.pid);
-      settle(err(new Error(`Process output exceeded ${MAX_OUTPUT_BYTES} bytes`)));
+      settle(err(new Error(`${name} output exceeded ${MAX_OUTPUT_BYTES} bytes`)));
     }
   });
   child.stderr?.on("data", (chunk) => {
     stderr6 += String(chunk);
     if (stdout.length + stderr6.length > MAX_OUTPUT_BYTES) {
       if (child.pid !== void 0 && child.pid !== null) killTree(child.pid);
-      settle(err(new Error(`Process output exceeded ${MAX_OUTPUT_BYTES} bytes`)));
+      settle(err(new Error(`${name} output exceeded ${MAX_OUTPUT_BYTES} bytes`)));
     }
   });
   child.on("error", (error) => {
     if (child.pid !== void 0 && child.pid !== null) killTree(child.pid);
-    settle(err(new Error(`Process error: ${error.message}`)));
+    settle(err(new Error(`${name} error: ${error.message}`)));
   });
   child.on("close", (code) => {
     settle(ok({ stdout, stderr: stderr6, exitCode: code ?? 1 }));
@@ -2055,7 +2056,7 @@ async function spawnCommand(binary, args, options) {
       windowsHide: true,
       signal: options?.signal
     });
-    wireSpawnListeners(child, timeoutMs, resolve);
+    wireSpawnListeners(binary, child, timeoutMs, resolve);
   });
 }
 var PN_REPS = ["Alphabetic", "Ideographic", "Phonetic"];
@@ -3029,14 +3030,32 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     return this.on(event, listener);
   }
   /**
-   * Registers a listener for received files.
+   * Registers a listener for files received by dcmrecv (before move/parse).
    *
-   * @param listener - Callback receiving file data
+   * @param listener - Callback receiving raw file data
    * @returns this for chaining
    */
   onFileReceived(listener) {
     return this.on("FILE_RECEIVED", listener);
   }
+  /**
+   * Registers a listener for files stored in the association directory.
+   *
+   * @param listener - Callback receiving stored file data with size
+   * @returns this for chaining
+   */
+  onFileStored(listener) {
+    return this.on("FILE_STORED", listener);
+  }
+  /**
+   * Registers a listener for parsed DicomInstance availability.
+   *
+   * @param listener - Callback receiving instance data
+   * @returns this for chaining
+   */
+  onInstanceReceived(listener) {
+    return this.on("INSTANCE_RECEIVED", listener);
+  }
   /**
    * Registers a listener for completed associations.
    *
@@ -3330,11 +3349,18 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
         });
         return;
       }
+      this.emit("FILE_RECEIVED", {
+        filePath: data.filePath,
+        associationId: ctx.associationId,
+        callingAE: data.callingAE,
+        calledAE: data.calledAE,
+        source: data.source
+      });
       const promise = this.handleFileReceived(worker, data, ctx);
       worker.trackFile(promise);
     });
   }
-  /** Moves a received file, opens it as DicomInstance, and emits FILE_RECEIVED. */
+  /** Moves file to association dir, emits FILE_STORED, then parses instance. */
   async handleFileReceived(worker, data, ctx) {
     try {
       await this.moveAndEmitFile(worker, data, ctx);
@@ -3351,7 +3377,7 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
       });
     }
   }
-  /** Inner handler: move file, parse DICOM, emit FILE_RECEIVED or error. */
+  /** Inner handler: move file, emit FILE_STORED, parse DICOM, emit INSTANCE_RECEIVED. */
   async moveAndEmitFile(worker, data, ctx) {
     const srcPath = data.filePath;
     const destPath = path.join(ctx.associationDir, path.basename(srcPath));
@@ -3359,28 +3385,42 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     const finalPath = moveResult.ok ? destPath : srcPath;
     const fileSize = await statFileSafe(finalPath);
     worker.recordFile(finalPath, fileSize);
-    const openResult = await DicomInstance.open(finalPath);
-    if (!openResult.ok) {
-      this.emit("error", {
-        error: openResult.error,
-        filePath: finalPath,
-        associationId: ctx.associationId,
-        associationDir: ctx.associationDir,
-        callingAE: data.callingAE,
-        calledAE: data.calledAE,
-        source: data.source
-      });
-      return;
-    }
-    this.emit("FILE_RECEIVED", {
+    this.emit("FILE_STORED", {
       filePath: finalPath,
       fileSize,
       associationId: ctx.associationId,
       associationDir: ctx.associationDir,
       callingAE: data.callingAE,
       calledAE: data.calledAE,
-      source: data.source,
-      instance: openResult.value
+      source: data.source
+    });
+    this.emitInstanceReceived(finalPath, fileSize, data, ctx);
+  }
+  /** Parses a DICOM file and emits INSTANCE_RECEIVED or error. */
+  emitInstanceReceived(filePath, fileSize, data, ctx) {
+    void DicomInstance.open(filePath).then((openResult) => {
+      if (!openResult.ok) {
+        this.emit("error", {
+          error: openResult.error,
+          filePath,
+          associationId: ctx.associationId,
+          associationDir: ctx.associationDir,
+          callingAE: data.callingAE,
+          calledAE: data.calledAE,
+          source: data.source
+        });
+        return;
+      }
+      this.emit("INSTANCE_RECEIVED", {
+        filePath,
+        fileSize,
+        associationId: ctx.associationId,
+        associationDir: ctx.associationDir,
+        callingAE: data.callingAE,
+        calledAE: data.calledAE,
+        source: data.source,
+        instance: openResult.value
+      });
     });
   }
   /** Returns worker to idle pool on association complete, emits summary. */