@ubercode/dcmtk 0.10.0 → 0.11.0

package/dist/servers.cjs

@@ -2032,13 +2032,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;
@@ -2047,25 +2048,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 }));
@@ -2080,7 +2081,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"];
@@ -3054,14 +3055,32 @@ var DicomReceiver = class _DicomReceiver extends events.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.
    *
@@ -3355,11 +3374,18 @@ var DicomReceiver = class _DicomReceiver extends events.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);
@@ -3376,7 +3402,7 @@ var DicomReceiver = class _DicomReceiver extends events.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__namespace.join(ctx.associationDir, path__namespace.basename(srcPath));
@@ -3384,28 +3410,42 @@ var DicomReceiver = class _DicomReceiver extends events.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. */