@ubercode/dcmtk 0.13.2 → 0.14.0

package/dist/servers.cjs

@@ -2396,15 +2396,17 @@ async function dcm2json(inputPath, options) {
   }
   const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const signal = options?.signal;
+  const startTime = Date.now();
+  const remaining = () => Math.max(1e3, timeoutMs - (Date.now() - startTime));
   const verbosity = options?.verbosity;
   if (options?.directOnly === true) {
-    return tryDirectPath(inputPath, timeoutMs, signal, verbosity);
+    return tryDirectPath(inputPath, remaining(), signal, verbosity);
   }
-  const xmlResult = await tryXmlPath(inputPath, timeoutMs, signal, buildXmlOpts(options));
+  const xmlResult = await tryXmlPath(inputPath, remaining(), signal, buildXmlOpts(options));
   if (xmlResult.ok) {
     return xmlResult;
   }
-  return tryDirectPath(inputPath, timeoutMs, signal, verbosity);
+  return tryDirectPath(inputPath, remaining(), 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 TagModificationSchema = zod.z.object({
@@ -2888,7 +2890,7 @@ var Worker = class {
     this.port = port;
     this.tempDir = tempDir;
   }
-  /** Current worker state. */
+  /** Current worker state: idle (ready), busy (handling association), finalizing (draining). */
   get state() {
     return this._state;
   }
@@ -2920,6 +2922,10 @@ var Worker = class {
     this._instancesReceived = 0;
     this._instanceErrors = 0;
   }
+  /** Marks the worker as finalizing — still has valid context but cannot accept new connections. */
+  markFinalizing() {
+    this._state = "finalizing";
+  }
   /**
    * Returns the worker to idle. Context is intentionally preserved so that
    * late FILE_RECEIVED events (arriving in a subsequent pipe chunk after
@@ -3102,6 +3108,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       this.options.signal.removeEventListener("abort", this.abortHandler);
     }
     await this.closeTcpProxy();
+    await this.drainAllWorkers();
     const stopPromises = [];
     for (const worker of this.workers.values()) {
       stopPromises.push(this.stopWorker(worker));
@@ -3270,6 +3277,18 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       this.tcpServer.close(() => resolve());
     });
   }
+  /** Drains in-flight file and instance work on all non-idle workers, with a 5s safety timeout. */
+  async drainAllWorkers() {
+    const drainPromises = [];
+    for (const worker of this.workers.values()) {
+      if (worker.state !== "idle") {
+        drainPromises.push(worker.drainPendingFiles());
+        drainPromises.push(worker.drainInstancePending());
+      }
+    }
+    if (drainPromises.length === 0) return;
+    await Promise.race([Promise.all(drainPromises), promises.setTimeout(5e3)]);
+  }
   // -----------------------------------------------------------------------
   // Connection routing
   // -----------------------------------------------------------------------
@@ -3298,7 +3317,9 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
     };
     worker.beginAssociation(ctx);
     this.pipeConnection(worker, remoteSocket);
-    void this.replenishPool();
+    void this.replenishPool().catch((e) => {
+      this.emit("error", { error: e instanceof Error ? e : new Error(String(e)) });
+    });
   }
   /** Finds an idle worker, retrying up to connectionTimeoutMs. */
   async findIdleWorker() {
@@ -3537,6 +3558,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
   /** Returns worker to idle pool on association complete, emits summary. */
   wireAssociationComplete(worker) {
     worker.dcmrecv.onAssociationComplete((data) => {
+      worker.markFinalizing();
       setImmediate(() => {
         void this.finalizeAssociation(worker, data);
       });