@ubercode/dcmtk 0.9.4 → 0.10.1

package/dist/index.js

@@ -6,12 +6,12 @@ import { spawn, execSync } from 'child_process';
 import kill from 'tree-kill';
 import { EventEmitter } from 'events';
 import { stderr, tryCatch } from 'stderr-lib';
-import * as fs from 'fs/promises';
-import { mkdir, stat, rm, copyFile, unlink, mkdtemp, readdir } from 'fs/promises';
+import { mkdir, stat, rm, copyFile, unlink, rename, mkdtemp, readdir } from 'fs/promises';
 import * as os from 'os';
 import { tmpdir } from 'os';
 import { XMLParser } from 'fast-xml-parser';
 import * as net from 'net';
+import { setTimeout as setTimeout$1 } from 'timers/promises';
 import { randomUUID } from 'crypto';
 
 var __defProp = Object.defineProperty;
@@ -293,13 +293,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 stderr8 = "";
   let settled = false;
+  const name = binary.split("/").pop() ?? binary;
   const settle = (result) => {
     if (settled) return;
     settled = true;
@@ -308,25 +309,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 + stderr8.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) => {
     stderr8 += String(chunk);
     if (stdout.length + stderr8.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: stderr8, exitCode: code ?? 1 }));
@@ -341,7 +342,7 @@ async function spawnCommand(binary, args, options) {
       windowsHide: true,
       signal: options?.signal
     });
-    wireSpawnListeners(child, timeoutMs, resolve);
+    wireSpawnListeners(binary, child, timeoutMs, resolve);
   });
 }
 var ProcessState = {
@@ -36247,6 +36248,184 @@ var Wlmscpfs = class _Wlmscpfs extends DcmtkProcess {
     signal.addEventListener("abort", this.abortHandler, { once: true });
   }
 };
+var MIN_CONCURRENCY = 1;
+var MAX_CONCURRENCY = 64;
+var DEFAULT_CONCURRENCY = 4;
+function clampConcurrency(value) {
+  if (value === void 0) return DEFAULT_CONCURRENCY;
+  return Math.max(MIN_CONCURRENCY, Math.min(MAX_CONCURRENCY, Math.floor(value)));
+}
+function createBatchState(total) {
+  const results = [];
+  for (let i = 0; i < total; i += 1) {
+    results.push(void 0);
+  }
+  return { results, succeeded: 0, failed: 0, completed: 0 };
+}
+async function processItem(item, index, operation, state) {
+  let result;
+  try {
+    result = await operation(item);
+  } catch (thrown) {
+    result = err(stderr(thrown));
+  }
+  state.results[index] = result;
+  state.completed += 1;
+  if (result.ok) {
+    state.succeeded += 1;
+  } else {
+    state.failed += 1;
+  }
+}
+async function batch(items, operation, options) {
+  const concurrency = clampConcurrency(options?.concurrency);
+  const signal = options?.signal;
+  const onProgress = options?.onProgress;
+  const total = items.length;
+  if (total === 0) {
+    return { results: [], succeeded: 0, failed: 0 };
+  }
+  const state = createBatchState(total);
+  const inFlight = /* @__PURE__ */ new Set();
+  let nextIndex = 0;
+  while (nextIndex < total) {
+    if (signal?.aborted) break;
+    const itemIndex = nextIndex;
+    nextIndex += 1;
+    const promise = processItem(items[itemIndex], itemIndex, operation, state).then(() => {
+      if (onProgress) {
+        const result = state.results[itemIndex];
+        onProgress(state.completed, total, result);
+      }
+    });
+    inFlight.add(promise);
+    promise.then(
+      () => inFlight.delete(promise),
+      () => inFlight.delete(promise)
+    );
+    if (inFlight.size >= concurrency) {
+      await Promise.race(inFlight);
+    }
+  }
+  if (inFlight.size > 0) {
+    await Promise.all(inFlight);
+  }
+  return { results: state.results, succeeded: state.succeeded, failed: state.failed };
+}
+
+// src/utils/retry.ts
+var DEFAULT_MAX_ATTEMPTS = 3;
+var DEFAULT_INITIAL_DELAY_MS = 1e3;
+var DEFAULT_MAX_DELAY_MS = 3e4;
+var DEFAULT_BACKOFF_MULTIPLIER = 2;
+var JITTER_FRACTION = 0.1;
+var DEFAULT_CONFIG = {
+  maxAttempts: DEFAULT_MAX_ATTEMPTS,
+  initialDelayMs: DEFAULT_INITIAL_DELAY_MS,
+  maxDelayMs: DEFAULT_MAX_DELAY_MS,
+  backoffMultiplier: DEFAULT_BACKOFF_MULTIPLIER,
+  shouldRetry: void 0,
+  signal: void 0,
+  onRetry: void 0
+};
+function resolveConfig(opts) {
+  if (!opts) return DEFAULT_CONFIG;
+  return {
+    ...DEFAULT_CONFIG,
+    ...Object.fromEntries(Object.entries(opts).filter(([, v]) => v !== void 0)),
+    maxAttempts: Math.max(1, Math.floor(opts.maxAttempts ?? DEFAULT_MAX_ATTEMPTS)),
+    initialDelayMs: Math.max(0, opts.initialDelayMs ?? DEFAULT_INITIAL_DELAY_MS),
+    maxDelayMs: Math.max(0, opts.maxDelayMs ?? DEFAULT_MAX_DELAY_MS),
+    backoffMultiplier: Math.max(1, opts.backoffMultiplier ?? DEFAULT_BACKOFF_MULTIPLIER)
+  };
+}
+function computeDelay(attempt, config) {
+  const baseDelay = Math.min(config.initialDelayMs * Math.pow(config.backoffMultiplier, attempt), config.maxDelayMs);
+  const jitter = baseDelay * JITTER_FRACTION * (2 * Math.random() - 1);
+  return Math.max(0, Math.round(baseDelay + jitter));
+}
+async function waitWithAbort(delayMs, signal) {
+  if (signal?.aborted) {
+    return false;
+  }
+  return new Promise((resolve) => {
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve(true);
+    }, delayMs);
+    const onAbort = () => {
+      clearTimeout(timer);
+      cleanup();
+      resolve(false);
+    };
+    const cleanup = () => {
+      signal?.removeEventListener("abort", onAbort);
+    };
+    if (signal) {
+      signal.addEventListener("abort", onAbort, { once: true });
+    }
+  });
+}
+function shouldBreakAfterFailure(attempt, lastError, config) {
+  if (attempt === config.maxAttempts - 1) return true;
+  if (config.shouldRetry && !config.shouldRetry(lastError, attempt + 1)) return true;
+  if (config.signal?.aborted) return true;
+  return false;
+}
+async function retry(operation, options) {
+  const config = resolveConfig(options);
+  let lastResult = err(new Error("No attempts executed"));
+  for (let attempt = 0; attempt < config.maxAttempts; attempt += 1) {
+    lastResult = await operation();
+    if (lastResult.ok) return lastResult;
+    if (shouldBreakAfterFailure(attempt, lastResult.error, config)) break;
+    const delayMs = computeDelay(attempt, config);
+    if (config.onRetry) config.onRetry(lastResult.error, attempt + 1, delayMs);
+    const waitCompleted = await waitWithAbort(delayMs, config.signal);
+    if (!waitCompleted) break;
+  }
+  return lastResult;
+}
+async function ensureDirectory(dirPath) {
+  try {
+    await mkdir(dirPath, { recursive: true });
+    return ok(void 0);
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return err(new Error(`Failed to create directory ${dirPath}: ${msg}`));
+  }
+}
+async function moveFile(src, dest) {
+  try {
+    await rename(src, dest);
+    return ok(void 0);
+  } catch {
+    try {
+      await copyFile(src, dest);
+      await unlink(src);
+      return ok(void 0);
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      return err(new Error(`Failed to move file ${src} \u2192 ${dest}: ${msg}`));
+    }
+  }
+}
+async function statFileSafe(filePath) {
+  try {
+    const s = await stat(filePath);
+    return s.size;
+  } catch {
+    return 0;
+  }
+}
+async function removeDirSafe(dirPath) {
+  try {
+    await rm(dirPath, { recursive: true, force: true });
+  } catch {
+  }
+}
+
+// src/servers/DicomReceiver.ts
 var DEFAULT_MIN_POOL_SIZE = 2;
 var DEFAULT_MAX_POOL_SIZE = 10;
 var DEFAULT_CONNECTION_TIMEOUT_MS = 1e4;
@@ -36272,6 +36451,102 @@ var DicomReceiverOptionsSchema = z.object({
 }).strict().refine((data) => (data.minPoolSize ?? DEFAULT_MIN_POOL_SIZE) <= (data.maxPoolSize ?? DEFAULT_MAX_POOL_SIZE), {
   message: "minPoolSize must be <= maxPoolSize"
 });
+var Worker = class {
+  constructor(dcmrecv, port, tempDir) {
+    __publicField(this, "dcmrecv");
+    __publicField(this, "port");
+    __publicField(this, "tempDir");
+    __publicField(this, "_state", "idle");
+    __publicField(this, "_context");
+    __publicField(this, "_pending", /* @__PURE__ */ new Set());
+    __publicField(this, "_files", []);
+    __publicField(this, "_fileSizes", []);
+    __publicField(this, "_outputLines", []);
+    __publicField(this, "_remoteSocket");
+    __publicField(this, "_workerSocket");
+    this.dcmrecv = dcmrecv;
+    this.port = port;
+    this.tempDir = tempDir;
+  }
+  /** Current worker state. */
+  get state() {
+    return this._state;
+  }
+  /** Active association context, or undefined when idle. */
+  get context() {
+    return this._context;
+  }
+  /** Files moved to the association directory during the current association. */
+  get files() {
+    return this._files;
+  }
+  /** Byte sizes parallel to files[], for transfer stats. */
+  get fileSizes() {
+    return this._fileSizes;
+  }
+  /** Captured output lines during the current association. */
+  get outputLines() {
+    return this._outputLines;
+  }
+  /** Marks the worker busy with a new association context. */
+  beginAssociation(ctx) {
+    this._state = "busy";
+    this._context = ctx;
+    this._files.length = 0;
+    this._fileSizes.length = 0;
+    this._outputLines.length = 0;
+    this._pending.clear();
+  }
+  /** Returns the worker to idle and clears all association state. */
+  endAssociation() {
+    this._state = "idle";
+    this._context = void 0;
+    this._files.length = 0;
+    this._fileSizes.length = 0;
+    this._outputLines.length = 0;
+    this._pending.clear();
+    this._remoteSocket = void 0;
+    this._workerSocket = void 0;
+  }
+  /** Tracks an in-flight file handling promise; auto-removes on completion. */
+  trackFile(promise) {
+    this._pending.add(promise);
+    void promise.finally(() => {
+      this._pending.delete(promise);
+    });
+  }
+  /** Records a successfully received file path and its size. */
+  recordFile(filePath, size) {
+    this._files.push(filePath);
+    this._fileSizes.push(size);
+  }
+  /** Awaits all in-flight file handling promises. */
+  async drainPendingFiles() {
+    if (this._pending.size > 0) {
+      await Promise.all(this._pending);
+    }
+  }
+  /** Appends a line to the output buffer, respecting the cap. */
+  captureOutput(text) {
+    if (this._outputLines.length < MAX_OUTPUT_LINES_PER_ASSOCIATION) {
+      this._outputLines.push(text);
+    }
+  }
+  /** Stores the remote and worker sockets for later cleanup. */
+  setSockets(remote, worker) {
+    this._remoteSocket = remote;
+    this._workerSocket = worker;
+  }
+  /** Destroys both sockets if they exist and are not already destroyed. */
+  destroySockets() {
+    if (this._remoteSocket !== void 0 && !this._remoteSocket.destroyed) {
+      this._remoteSocket.destroy();
+    }
+    if (this._workerSocket !== void 0 && !this._workerSocket.destroyed) {
+      this._workerSocket.destroy();
+    }
+  }
+};
 function allocatePort() {
   return new Promise((resolve) => {
     const server = net.createServer();
@@ -36289,6 +36564,13 @@ function allocatePort() {
     });
   });
 }
+function sumArray(arr) {
+  let total = 0;
+  for (let i = 0; i < arr.length; i++) {
+    total += arr[i] ?? 0;
+  }
+  return total;
+}
 var DicomReceiver = class _DicomReceiver extends EventEmitter {
   constructor(options) {
     super();
@@ -36303,8 +36585,6 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     __publicField(this, "stopping", false);
     __publicField(this, "abortHandler");
     this.setMaxListeners(20);
-    this.on("error", () => {
-    });
     this.options = options;
     this.minPoolSize = options.minPoolSize ?? DEFAULT_MIN_POOL_SIZE;
     this.maxPoolSize = options.maxPoolSize ?? DEFAULT_MAX_POOL_SIZE;
@@ -36512,14 +36792,12 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
       this.emit("error", { error: mkdirResult.error });
       return;
     }
-    worker.state = "busy";
-    worker.associationId = associationId;
-    worker.associationDir = associationDir;
-    worker.files = [];
-    worker.fileSizes = [];
-    worker.outputLines = [];
-    worker.pendingFiles = [];
-    worker.startAt = Date.now();
+    const ctx = {
+      associationId,
+      associationDir,
+      startAt: Date.now()
+    };
+    worker.beginAssociation(ctx);
     this.pipeConnection(worker, remoteSocket);
     void this.replenishPool();
   }
@@ -36529,7 +36807,7 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     if (idle !== void 0) return idle;
     const maxRetries = Math.min(Math.ceil(this.connectionTimeoutMs / CONNECTION_RETRY_INTERVAL_MS), MAX_CONNECTION_RETRIES);
     for (let i = 0; i < maxRetries; i++) {
-      await delay(CONNECTION_RETRY_INTERVAL_MS);
+      await setTimeout$1(CONNECTION_RETRY_INTERVAL_MS);
       const found = this.getIdleWorker();
       if (found !== void 0) return found;
       if (this.stopping) return void 0;
@@ -36546,8 +36824,7 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
   /** Pipes remote socket bidirectionally to the worker's port. */
   pipeConnection(worker, remoteSocket) {
     const workerSocket = net.createConnection({ port: worker.port, host: "127.0.0.1" });
-    worker.remoteSocket = remoteSocket;
-    worker.workerSocket = workerSocket;
+    worker.setSockets(remoteSocket, workerSocket);
     const cleanup = () => {
       remoteSocket.unpipe(workerSocket);
       workerSocket.unpipe(remoteSocket);
@@ -36606,21 +36883,7 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     const createResult = this.createDcmrecv(port, tempDir);
     if (!createResult.ok) return createResult;
     const dcmrecv = createResult.value;
-    const worker = {
-      dcmrecv,
-      port,
-      tempDir,
-      state: "idle",
-      associationId: void 0,
-      associationDir: void 0,
-      files: [],
-      fileSizes: [],
-      outputLines: [],
-      pendingFiles: [],
-      startAt: void 0,
-      remoteSocket: void 0,
-      workerSocket: void 0
-    };
+    const worker = new Worker(dcmrecv, port, tempDir);
     this.wireWorkerEvents(worker);
     const startResult = await dcmrecv.start();
     if (!startResult.ok) {
@@ -36629,14 +36892,9 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     this.workers.set(port, worker);
     return ok(worker);
   }
-  /** Stops a single worker: stop process, clean temp dir, remove from pool. */
+  /** Stops a single worker: destroy sockets, stop process, clean temp dir, remove from pool. */
   async stopWorker(worker) {
-    if (worker.remoteSocket !== void 0 && !worker.remoteSocket.destroyed) {
-      worker.remoteSocket.destroy();
-    }
-    if (worker.workerSocket !== void 0 && !worker.workerSocket.destroyed) {
-      worker.workerSocket.destroy();
-    }
+    worker.destroySockets();
     await worker.dcmrecv.stop();
     worker.dcmrecv[Symbol.dispose]();
     await removeDirSafe(worker.tempDir);
@@ -36688,12 +36946,11 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     this.wireRefusingAssociation(worker);
     this.wireOutputCapture(worker);
   }
-  /** Wires FILE_RECEIVED from dcmrecv worker — files are processed serially per worker. */
+  /** Wires FILE_RECEIVED from dcmrecv worker — captures context synchronously. */
   wireFileReceived(worker) {
     worker.dcmrecv.onFileReceived((data) => {
-      const assocId = worker.associationId;
-      const assocDir = worker.associationDir;
-      if (assocDir === void 0 || assocId === void 0) {
+      const ctx = worker.context;
+      if (ctx === void 0) {
         this.emit("error", {
           error: new Error(`DicomReceiver: FILE_RECEIVED with no active association (worker state: ${worker.state})`),
           filePath: data.filePath,
@@ -36703,21 +36960,21 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
         });
         return;
       }
-      const promise = this.handleFileReceived(worker, data, assocId, assocDir);
-      worker.pendingFiles.push(promise);
+      const promise = this.handleFileReceived(worker, data, ctx);
+      worker.trackFile(promise);
     });
   }
   /** Moves a received file, opens it as DicomInstance, and emits FILE_RECEIVED. */
-  async handleFileReceived(worker, data, assocId, assocDir) {
+  async handleFileReceived(worker, data, ctx) {
     try {
-      await this.moveAndEmitFile(worker, data, assocId, assocDir);
+      await this.moveAndEmitFile(worker, data, ctx);
     } catch (thrown) {
       const error = thrown instanceof Error ? thrown : new Error(String(thrown));
       this.emit("error", {
         error,
         filePath: data.filePath,
-        associationId: assocId,
-        associationDir: assocDir,
+        associationId: ctx.associationId,
+        associationDir: ctx.associationDir,
         callingAE: data.callingAE,
         calledAE: data.calledAE,
         source: data.source
@@ -36725,21 +36982,20 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     }
   }
   /** Inner handler: move file, parse DICOM, emit FILE_RECEIVED or error. */
-  async moveAndEmitFile(worker, data, assocId, assocDir) {
+  async moveAndEmitFile(worker, data, ctx) {
     const srcPath = data.filePath;
-    const destPath = path.join(assocDir, path.basename(srcPath));
+    const destPath = path.join(ctx.associationDir, path.basename(srcPath));
     const moveResult = await moveFile(srcPath, destPath);
     const finalPath = moveResult.ok ? destPath : srcPath;
     const fileSize = await statFileSafe(finalPath);
-    worker.files.push(finalPath);
-    worker.fileSizes.push(fileSize);
+    worker.recordFile(finalPath, fileSize);
     const openResult = await DicomInstance.open(finalPath);
     if (!openResult.ok) {
       this.emit("error", {
         error: openResult.error,
         filePath: finalPath,
-        associationId: assocId,
-        associationDir: assocDir,
+        associationId: ctx.associationId,
+        associationDir: ctx.associationDir,
         callingAE: data.callingAE,
         calledAE: data.calledAE,
         source: data.source
@@ -36749,8 +37005,8 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     this.emit("FILE_RECEIVED", {
       filePath: finalPath,
       fileSize,
-      associationId: assocId,
-      associationDir: assocDir,
+      associationId: ctx.associationId,
+      associationDir: ctx.associationDir,
       callingAE: data.callingAE,
       calledAE: data.calledAE,
       source: data.source,
@@ -36765,21 +37021,20 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
   }
   /** Awaits ALL pending file operations, emits ASSOCIATION_COMPLETE, resets worker state. */
   async finalizeAssociation(worker, data) {
-    if (worker.pendingFiles.length > 0) {
-      await Promise.all(worker.pendingFiles);
-    }
+    await worker.drainPendingFiles();
     this.emitAssociationComplete(worker, data);
-    this.resetWorker(worker);
+    worker.endAssociation();
     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 ctx = worker.context;
+    const assocId = ctx?.associationId ?? data.associationId;
+    const assocDir = ctx?.associationDir ?? "";
+    const startAt = ctx?.startAt ?? Date.now();
     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;
@@ -36799,24 +37054,11 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
       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) => {
       this.emit("ASSOCIATION_RECEIVED", {
-        associationId: worker.associationId ?? "",
+        associationId: worker.context?.associationId ?? "",
         callingAE: data.callingAE,
         calledAE: data.calledAE,
         source: data.source
@@ -36827,7 +37069,7 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
   wireCStoreRequest(worker) {
     worker.dcmrecv.onEvent("C_STORE_REQUEST", (data) => {
       this.emit("C_STORE_REQUEST", {
-        associationId: worker.associationId ?? "",
+        associationId: worker.context?.associationId ?? "",
         raw: data.raw
       });
     });
@@ -36836,7 +37078,7 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
   wireEchoRequest(worker) {
     worker.dcmrecv.onEvent("ECHO_REQUEST", () => {
       this.emit("ECHO_REQUEST", {
-        associationId: worker.associationId ?? ""
+        associationId: worker.context?.associationId ?? ""
       });
     });
   }
@@ -36851,8 +37093,8 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
   /** Captures worker output lines during busy associations. */
   wireOutputCapture(worker) {
     worker.dcmrecv.on("line", ({ text }) => {
-      if (worker.state === "busy" && worker.outputLines.length < MAX_OUTPUT_LINES_PER_ASSOCIATION) {
-        worker.outputLines.push(text);
+      if (worker.state === "busy") {
+        worker.captureOutput(text);
       }
     });
   }
@@ -36871,56 +37113,6 @@ var DicomReceiver = class _DicomReceiver extends EventEmitter {
     signal.addEventListener("abort", this.abortHandler, { once: true });
   }
 };
-async function ensureDirectory(dirPath) {
-  try {
-    await fs.mkdir(dirPath, { recursive: true });
-    return ok(void 0);
-  } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
-    return err(new Error(`Failed to create directory ${dirPath}: ${msg}`));
-  }
-}
-async function moveFile(src, dest) {
-  try {
-    await fs.rename(src, dest);
-    return ok(void 0);
-  } catch {
-    try {
-      await fs.copyFile(src, dest);
-      await fs.unlink(src);
-      return ok(void 0);
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      return err(new Error(`Failed to move file ${src} \u2192 ${dest}: ${msg}`));
-    }
-  }
-}
-async function statFileSafe(filePath) {
-  try {
-    const stat4 = await fs.stat(filePath);
-    return stat4.size;
-  } catch {
-    return 0;
-  }
-}
-function sumArray(arr) {
-  let total = 0;
-  for (let i = 0; i < arr.length; i++) {
-    total += arr[i] ?? 0;
-  }
-  return total;
-}
-async function removeDirSafe(dirPath) {
-  try {
-    await fs.rm(dirPath, { recursive: true, force: true });
-  } catch {
-  }
-}
-function delay(ms) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-}
 
 // src/senders/types.ts
 var SenderMode = {
@@ -37343,7 +37535,7 @@ function createStorescuExecutor(options) {
     return ok({ stdout: result.value.stdout, stderr: result.value.stderr });
   };
 }
-function resolveConfig(options) {
+function resolveConfig2(options) {
   const mode = options.mode ?? "multiple";
   const rawMax = options.maxAssociations ?? DEFAULT_MAX_ASSOCIATIONS;
   return {
@@ -37390,7 +37582,7 @@ var DicomSender = class _DicomSender extends EventEmitter {
     if (!validation.success) {
       return err(createValidationError("DicomSender", validation.error));
     }
-    const cfg = resolveConfig(options);
+    const cfg = resolveConfig2(options);
     const senderRef = { current: void 0 };
     const engine = new SenderEngine({
       ...cfg,
@@ -37592,7 +37784,7 @@ function createDcmsendExecutor(options) {
     return ok({ stdout: result.value.stdout, stderr: result.value.stderr });
   };
 }
-function resolveConfig2(options) {
+function resolveConfig3(options) {
   const mode = options.mode ?? "multiple";
   const rawMax = options.maxAssociations ?? DEFAULT_MAX_ASSOCIATIONS2;
   return {
@@ -37639,7 +37831,7 @@ var DicomSend = class _DicomSend extends EventEmitter {
     if (!validation.success) {
       return err(createValidationError("DicomSend", validation.error));
     }
-    const cfg = resolveConfig2(options);
+    const cfg = resolveConfig3(options);
     const senderRef = { current: void 0 };
     const engine = new SenderEngine({
       ...cfg,
@@ -38240,70 +38432,6 @@ var PacsClient = class _PacsClient {
     return ok({ success: true, outputDirectory: options.outputDirectory });
   }
 };
-var MIN_CONCURRENCY = 1;
-var MAX_CONCURRENCY = 64;
-var DEFAULT_CONCURRENCY = 4;
-function clampConcurrency(value) {
-  if (value === void 0) return DEFAULT_CONCURRENCY;
-  return Math.max(MIN_CONCURRENCY, Math.min(MAX_CONCURRENCY, Math.floor(value)));
-}
-function createBatchState(total) {
-  const results = [];
-  for (let i = 0; i < total; i += 1) {
-    results.push(void 0);
-  }
-  return { results, succeeded: 0, failed: 0, completed: 0 };
-}
-async function processItem(item, index, operation, state) {
-  let result;
-  try {
-    result = await operation(item);
-  } catch (thrown) {
-    result = err(stderr(thrown));
-  }
-  state.results[index] = result;
-  state.completed += 1;
-  if (result.ok) {
-    state.succeeded += 1;
-  } else {
-    state.failed += 1;
-  }
-}
-async function batch(items, operation, options) {
-  const concurrency = clampConcurrency(options?.concurrency);
-  const signal = options?.signal;
-  const onProgress = options?.onProgress;
-  const total = items.length;
-  if (total === 0) {
-    return { results: [], succeeded: 0, failed: 0 };
-  }
-  const state = createBatchState(total);
-  const inFlight = /* @__PURE__ */ new Set();
-  let nextIndex = 0;
-  while (nextIndex < total) {
-    if (signal?.aborted) break;
-    const itemIndex = nextIndex;
-    nextIndex += 1;
-    const promise = processItem(items[itemIndex], itemIndex, operation, state).then(() => {
-      if (onProgress) {
-        const result = state.results[itemIndex];
-        onProgress(state.completed, total, result);
-      }
-    });
-    inFlight.add(promise);
-    promise.then(
-      () => inFlight.delete(promise),
-      () => inFlight.delete(promise)
-    );
-    if (inFlight.size >= concurrency) {
-      await Promise.race(inFlight);
-    }
-  }
-  if (inFlight.size > 0) {
-    await Promise.all(inFlight);
-  }
-  return { results: state.results, succeeded: state.succeeded, failed: state.failed };
-}
 
 // src/testing/types.ts
 var HammerPhase = {
@@ -38640,80 +38768,6 @@ var DicomHammer = class _DicomHammer extends EventEmitter {
   }
 };
 
-// src/utils/retry.ts
-var DEFAULT_MAX_ATTEMPTS = 3;
-var DEFAULT_INITIAL_DELAY_MS = 1e3;
-var DEFAULT_MAX_DELAY_MS = 3e4;
-var DEFAULT_BACKOFF_MULTIPLIER = 2;
-var JITTER_FRACTION = 0.1;
-var DEFAULT_CONFIG = {
-  maxAttempts: DEFAULT_MAX_ATTEMPTS,
-  initialDelayMs: DEFAULT_INITIAL_DELAY_MS,
-  maxDelayMs: DEFAULT_MAX_DELAY_MS,
-  backoffMultiplier: DEFAULT_BACKOFF_MULTIPLIER,
-  shouldRetry: void 0,
-  signal: void 0,
-  onRetry: void 0
-};
-function resolveConfig3(opts) {
-  if (!opts) return DEFAULT_CONFIG;
-  return {
-    ...DEFAULT_CONFIG,
-    ...Object.fromEntries(Object.entries(opts).filter(([, v]) => v !== void 0)),
-    maxAttempts: Math.max(1, Math.floor(opts.maxAttempts ?? DEFAULT_MAX_ATTEMPTS)),
-    initialDelayMs: Math.max(0, opts.initialDelayMs ?? DEFAULT_INITIAL_DELAY_MS),
-    maxDelayMs: Math.max(0, opts.maxDelayMs ?? DEFAULT_MAX_DELAY_MS),
-    backoffMultiplier: Math.max(1, opts.backoffMultiplier ?? DEFAULT_BACKOFF_MULTIPLIER)
-  };
-}
-function computeDelay(attempt, config) {
-  const baseDelay = Math.min(config.initialDelayMs * Math.pow(config.backoffMultiplier, attempt), config.maxDelayMs);
-  const jitter = baseDelay * JITTER_FRACTION * (2 * Math.random() - 1);
-  return Math.max(0, Math.round(baseDelay + jitter));
-}
-async function waitWithAbort(delayMs, signal) {
-  if (signal?.aborted) {
-    return false;
-  }
-  return new Promise((resolve) => {
-    const timer = setTimeout(() => {
-      cleanup();
-      resolve(true);
-    }, delayMs);
-    const onAbort = () => {
-      clearTimeout(timer);
-      cleanup();
-      resolve(false);
-    };
-    const cleanup = () => {
-      signal?.removeEventListener("abort", onAbort);
-    };
-    if (signal) {
-      signal.addEventListener("abort", onAbort, { once: true });
-    }
-  });
-}
-function shouldBreakAfterFailure(attempt, lastError, config) {
-  if (attempt === config.maxAttempts - 1) return true;
-  if (config.shouldRetry && !config.shouldRetry(lastError, attempt + 1)) return true;
-  if (config.signal?.aborted) return true;
-  return false;
-}
-async function retry(operation, options) {
-  const config = resolveConfig3(options);
-  let lastResult = err(new Error("No attempts executed"));
-  for (let attempt = 0; attempt < config.maxAttempts; attempt += 1) {
-    lastResult = await operation();
-    if (lastResult.ok) return lastResult;
-    if (shouldBreakAfterFailure(attempt, lastResult.error, config)) break;
-    const delayMs = computeDelay(attempt, config);
-    if (config.onRetry) config.onRetry(lastResult.error, attempt + 1, delayMs);
-    const waitCompleted = await waitWithAbort(delayMs, config.signal);
-    if (!waitCompleted) break;
-  }
-  return lastResult;
-}
-
 export { AETitleSchema, AssociationTracker, ChangeSet, ColorConversion, DCMPRSCP_FATAL_EVENTS, DCMPRSCP_PATTERNS, DCMPSRCV_FATAL_EVENTS, DCMPSRCV_PATTERNS, DCMQRSCP_FATAL_EVENTS, DCMQRSCP_PATTERNS, DCMRECV_FATAL_EVENTS, DCMRECV_PATTERNS, DEFAULT_BLOCK_TIMEOUT_MS, DEFAULT_DICOM_PORT, DEFAULT_DRAIN_TIMEOUT_MS, DEFAULT_PARSE_CONCURRENCY, DEFAULT_START_TIMEOUT_MS, DEFAULT_TIMEOUT_MS, Dcm2pnmOutputFormat, Dcm2xmlCharset, DcmQRSCP, DcmdumpFormat, Dcmj2pnmOutputFormat, DcmprsCP, DcmprscpEvent, Dcmpsrcv, DcmpsrcvEvent, DcmqrscpEvent, Dcmrecv, DcmrecvEvent, DcmtkProcess, DicomDataset, DicomHammer, DicomInstance, DicomReceiver, DicomSend, DicomSender, DicomTagPathSchema, DicomTagSchema, FilenameMode, GetQueryModel, HammerPhase, Img2dcmInputFormat, JplsColorConversion, LineParser, LutType, MAX_BLOCK_LINES, MAX_CHANGESET_OPERATIONS, MAX_EVENT_PATTERNS, MAX_TRAVERSAL_DEPTH, MoveQueryModel, PDU_SIZE, PacsClient, PortSchema, PreferredTransferSyntax, ProcessState, ProposedTransferSyntax, QueryLevel, QueryModel, REQUIRED_BINARIES, RetrieveMode, SOP_CLASSES, STORESCP_FATAL_EVENTS, STORESCP_PATTERNS, SenderHealth, SenderMode, StorageMode, StoreSCP, StoreSCPPreset, StorescpEvent, SubdirectoryMode, TransferSyntax, UIDSchema, UNIX_SEARCH_PATHS, VR, VR_CATEGORY, VR_CATEGORY_NAME, VR_META, WINDOWS_SEARCH_PATHS, WLMSCPFS_FATAL_EVENTS, WLMSCPFS_PATTERNS, Wlmscpfs, WlmscpfsEvent, assertUnreachable, batch, cda2dcm, clearDcmtkPathCache, createAETitle, createDicomFilePath, createDicomTag, createDicomTagPath, createPort, createSOPClassUID, createTransferSyntaxUID, dcm2cda, dcm2json, dcm2pdf, dcm2pnm, dcm2xml, dcmcjpeg, dcmcjpls, dcmconv, dcmcrle, dcmdecap, dcmdjpeg, dcmdjpls, dcmdrle, dcmdspfn, dcmdump, dcmencap, dcmftest, dcmgpdir, dcmj2pnm, dcmmkcrv, dcmmkdir, dcmmklut, dcmodify, dcmp2pgm, dcmprscu, dcmpschk, dcmpsmk, dcmpsprt, dcmqridx, dcmquant, dcmscale, dcmsend, dcod2lum, dconvlum, drtdump, dsr2xml, dsrdump, dump2dcm, echoscu, err, execCommand, findDcmtkPath, findscu, getVRCategory, getscu, img2dcm, isBinaryVR, isNumericVR, isStringVR, json2dcm, lookupTag, lookupTagByKeyword, lookupTagByName, mapResult, movescu, ok, parseAETitle, parseDicomTag, parseDicomTagPath, parsePort, parseSOPClassUID, parseTransferSyntaxUID, pdf2dcm, retry, segmentsToModifyPath, segmentsToString, sopClassNameFromUID, spawnCommand, stl2dcm, storescu, tag, tagPathToSegments, termscu, walkTags, xml2dcm, xml2dsr, xmlToJson };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map