@ubercode/dcmtk 0.6.2 → 0.6.4

package/dist/servers.cjs

@@ -2333,7 +2333,7 @@ async function dcm2json(inputPath, options) {
   }
   return tryDirectPath(inputPath, timeoutMs, signal, verbosity);
 }
-var TAG_OR_PATH_PATTERN = /^\([0-9A-Fa-f]{4},[0-9A-Fa-f]{4}\)(\[\d+\](\.\([0-9A-Fa-f]{4},[0-9A-Fa-f]{4}\)(\[\d+\])?)*)?$/;
+var TAG_OR_PATH_PATTERN = /^\([0-9A-Fa-f]{4},[0-9A-Fa-f]{4}\)(\[\d+\])?(\.\([0-9A-Fa-f]{4},[0-9A-Fa-f]{4}\)(\[\d+\])?)*$/;
 var TagModificationSchema = zod.z.object({
   tag: zod.z.string().regex(TAG_OR_PATH_PATTERN),
   value: zod.z.string()
@@ -3029,6 +3029,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
     worker.files = [];
     worker.fileSizes = [];
     worker.outputLines = [];
+    worker.pendingFiles = [];
     worker.startAt = Date.now();
     this.pipeConnection(worker, remoteSocket);
     void this.replenishPool();
@@ -3123,6 +3124,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       files: [],
       fileSizes: [],
       outputLines: [],
+      pendingFiles: [],
       startAt: void 0,
       remoteSocket: void 0,
       workerSocket: void 0
@@ -3197,7 +3199,9 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
   /** Wires FILE_RECEIVED from dcmrecv worker to handleFileReceived. */
   wireFileReceived(worker) {
     worker.dcmrecv.onFileReceived((data) => {
-      void this.handleFileReceived(worker, data);
+      const promise = this.handleFileReceived(worker, data);
+      worker.pendingFiles.push(promise);
+      void promise.finally(() => removePending(worker.pendingFiles, promise));
     });
   }
   /** Moves a received file, opens it as DicomInstance, and emits FILE_RECEIVED. */
@@ -3237,42 +3241,58 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
   /** Returns worker to idle pool on association complete, emits summary. */
   wireAssociationComplete(worker) {
     worker.dcmrecv.onAssociationComplete((data) => {
-      const assocId = worker.associationId ?? data.associationId;
-      const assocDir = worker.associationDir ?? "";
-      const files = [...worker.files];
-      const output = [...worker.outputLines];
-      const endAt = Date.now();
-      const startAt = worker.startAt ?? endAt;
-      const totalBytes = sumArray(worker.fileSizes);
-      const elapsedMs = endAt - startAt;
-      const bytesPerSecond = elapsedMs > 0 ? Math.round(totalBytes / elapsedMs * 1e3) : 0;
-      this.emit("ASSOCIATION_COMPLETE", {
-        associationId: assocId,
-        associationDir: assocDir,
-        callingAE: data.callingAE,
-        calledAE: data.calledAE,
-        source: data.source,
-        files,
-        durationMs: data.durationMs,
-        endReason: data.endReason,
-        totalBytes,
-        bytesPerSecond,
-        startAt,
-        endAt,
-        output
-      });
-      worker.state = "idle";
-      worker.associationId = void 0;
-      worker.associationDir = void 0;
-      worker.files = [];
-      worker.fileSizes = [];
-      worker.outputLines = [];
-      worker.startAt = void 0;
-      worker.remoteSocket = void 0;
-      worker.workerSocket = void 0;
-      void this.scaleDown();
+      void this.finalizeAssociation(worker, data);
+    });
+  }
+  /** Awaits pending file operations, emits ASSOCIATION_COMPLETE, resets worker state. */
+  async finalizeAssociation(worker, data) {
+    if (worker.pendingFiles.length > 0) {
+      await Promise.all(worker.pendingFiles);
+    }
+    this.emitAssociationComplete(worker, data);
+    this.resetWorker(worker);
+    void this.scaleDown();
+  }
+  /** Emits the ASSOCIATION_COMPLETE event with transfer stats. */
+  emitAssociationComplete(worker, data) {
+    const assocId = worker.associationId ?? data.associationId;
+    const assocDir = worker.associationDir ?? "";
+    const files = [...worker.files];
+    const output = [...worker.outputLines];
+    const endAt = Date.now();
+    const startAt = worker.startAt ?? endAt;
+    const totalBytes = sumArray(worker.fileSizes);
+    const elapsedMs = endAt - startAt;
+    const bytesPerSecond = elapsedMs > 0 ? Math.round(totalBytes / elapsedMs * 1e3) : 0;
+    this.emit("ASSOCIATION_COMPLETE", {
+      associationId: assocId,
+      associationDir: assocDir,
+      callingAE: data.callingAE,
+      calledAE: data.calledAE,
+      source: data.source,
+      files,
+      durationMs: data.durationMs,
+      endReason: data.endReason,
+      totalBytes,
+      bytesPerSecond,
+      startAt,
+      endAt,
+      output
     });
   }
+  /** Resets worker state to idle after an association completes. */
+  resetWorker(worker) {
+    worker.state = "idle";
+    worker.associationId = void 0;
+    worker.associationDir = void 0;
+    worker.files = [];
+    worker.fileSizes = [];
+    worker.outputLines = [];
+    worker.pendingFiles = [];
+    worker.startAt = void 0;
+    worker.remoteSocket = void 0;
+    worker.workerSocket = void 0;
+  }
   /** Bubbles ASSOCIATION_RECEIVED from dcmrecv worker. */
   wireAssociationReceived(worker) {
     worker.dcmrecv.onEvent("ASSOCIATION_RECEIVED", (data) => {
@@ -3377,6 +3397,10 @@ async function removeDirSafe(dirPath) {
   } catch {
   }
 }
+function removePending(arr, promise) {
+  const idx = arr.indexOf(promise);
+  if (idx !== -1) void arr.splice(idx, 1);
+}
 function delay(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);