@ubercode/dcmtk 0.9.1 → 0.9.3

package/dist/servers.cjs

@@ -3227,18 +3227,44 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
   /** Wires FILE_RECEIVED from dcmrecv worker to handleFileReceived. */
   wireFileReceived(worker) {
     worker.dcmrecv.onFileReceived((data) => {
-      const promise = this.handleFileReceived(worker, data);
+      const assocId = worker.associationId;
+      const assocDir = worker.associationDir;
+      if (assocDir === void 0 || assocId === void 0) {
+        this.emit("error", {
+          error: new Error(`DicomReceiver: FILE_RECEIVED with no active association (worker state: ${worker.state})`),
+          filePath: data.filePath,
+          callingAE: data.callingAE,
+          calledAE: data.calledAE,
+          source: data.source
+        });
+        return;
+      }
+      const promise = this.handleFileReceived(worker, data, assocId, assocDir);
       worker.pendingFiles.push(promise);
       void promise.finally(() => removePending(worker.pendingFiles, promise));
     });
   }
   /** Moves a received file, opens it as DicomInstance, and emits FILE_RECEIVED. */
-  async handleFileReceived(worker, data) {
-    if (worker.associationDir === void 0 || worker.associationId === void 0) return;
+  async handleFileReceived(worker, data, assocId, assocDir) {
+    try {
+      await this.moveAndEmitFile(worker, data, assocId, assocDir);
+    } catch (thrown) {
+      const error = thrown instanceof Error ? thrown : new Error(String(thrown));
+      this.emit("error", {
+        error,
+        filePath: data.filePath,
+        associationId: assocId,
+        associationDir: assocDir,
+        callingAE: data.callingAE,
+        calledAE: data.calledAE,
+        source: data.source
+      });
+    }
+  }
+  /** Inner handler: move file, parse DICOM, emit FILE_RECEIVED or error. */
+  async moveAndEmitFile(worker, data, assocId, assocDir) {
     const srcPath = data.filePath;
-    const destPath = path__namespace.join(worker.associationDir, path__namespace.basename(srcPath));
-    const assocId = worker.associationId;
-    const assocDir = worker.associationDir;
+    const destPath = path__namespace.join(assocDir, path__namespace.basename(srcPath));
     const moveResult = await moveFile(srcPath, destPath);
     const finalPath = moveResult.ok ? destPath : srcPath;
     const fileSize = await statFileSafe(finalPath);
@@ -3274,9 +3300,9 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       void this.finalizeAssociation(worker, data);
     });
   }
-  /** Awaits pending file operations, emits ASSOCIATION_COMPLETE, resets worker state. */
+  /** Awaits ALL pending file operations, emits ASSOCIATION_COMPLETE, resets worker state. */
   async finalizeAssociation(worker, data) {
-    if (worker.pendingFiles.length > 0) {
+    while (worker.pendingFiles.length > 0) {
       await Promise.all(worker.pendingFiles);
     }
     this.emitAssociationComplete(worker, data);