@ubercode/dcmtk 0.14.0 → 0.15.1

package/dist/index.cjs

@@ -713,6 +713,51 @@ var LineParser = class extends events.EventEmitter {
   }
 };
 
+// src/tools/_toolError.ts
+var MAX_ARGS_LENGTH = 200;
+var MAX_STDERR_LENGTH = 500;
+function truncate(value, maxLength) {
+  if (value.length <= maxLength) {
+    return value;
+  }
+  return `${value.substring(0, maxLength)}...`;
+}
+var ToolExecutionError = class extends Error {
+  constructor(message, details) {
+    super(message);
+    __publicField(this, "stdout");
+    __publicField(this, "stderr");
+    __publicField(this, "exitCode");
+    this.name = "ToolExecutionError";
+    this.stdout = details.stdout;
+    this.stderr = details.stderr;
+    this.exitCode = details.exitCode;
+  }
+};
+function createToolError(toolName, args, exitCode, stderr8, stdout = "") {
+  const argsStr = truncate(args.join(" "), MAX_ARGS_LENGTH);
+  const stderrStr = truncate(stderr8.trim(), MAX_STDERR_LENGTH);
+  const parts = [`${toolName} failed (exit code ${String(exitCode)})`];
+  if (argsStr.length > 0) {
+    parts.push(`args: ${argsStr}`);
+  }
+  if (stderrStr.length > 0) {
+    parts.push(`stderr: ${stderrStr}`);
+  }
+  return new ToolExecutionError(parts.join(" | "), { stdout, stderr: stderr8, exitCode });
+}
+function createValidationError(toolName, zodError) {
+  const parts = [];
+  for (let i = 0; i < zodError.issues.length; i++) {
+    const issue = zodError.issues[i];
+    if (issue === void 0) continue;
+    const path2 = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
+    parts.push(`${path2}: ${issue.message}`);
+  }
+  const detail = parts.length > 0 ? parts.join("; ") : "unknown validation error";
+  return new Error(`${toolName}: invalid options \u2014 ${detail}`);
+}
+
 // src/dicom/vr.ts
 var VR = {
   /** Application Entity — 16 bytes max, leading/trailing spaces significant */
@@ -31136,39 +31181,6 @@ function resolveBinary(toolName) {
   return ok(path.join(pathResult.value, binaryName2));
 }
 
-// src/tools/_toolError.ts
-var MAX_ARGS_LENGTH = 200;
-var MAX_STDERR_LENGTH = 500;
-function truncate(value, maxLength) {
-  if (value.length <= maxLength) {
-    return value;
-  }
-  return `${value.substring(0, maxLength)}...`;
-}
-function createToolError(toolName, args, exitCode, stderr8) {
-  const argsStr = truncate(args.join(" "), MAX_ARGS_LENGTH);
-  const stderrStr = truncate(stderr8.trim(), MAX_STDERR_LENGTH);
-  const parts = [`${toolName} failed (exit code ${String(exitCode)})`];
-  if (argsStr.length > 0) {
-    parts.push(`args: ${argsStr}`);
-  }
-  if (stderrStr.length > 0) {
-    parts.push(`stderr: ${stderrStr}`);
-  }
-  return new Error(parts.join(" | "));
-}
-function createValidationError(toolName, zodError) {
-  const parts = [];
-  for (let i = 0; i < zodError.issues.length; i++) {
-    const issue = zodError.issues[i];
-    if (issue === void 0) continue;
-    const path2 = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
-    parts.push(`${path2}: ${issue.message}`);
-  }
-  const detail = parts.length > 0 ? parts.join("; ") : "unknown validation error";
-  return new Error(`${toolName}: invalid options \u2014 ${detail}`);
-}
-
 // src/tools/dcm2xml.ts
 var Dcm2xmlCharset = {
   /** Use UTF-8 encoding (default). */
@@ -31278,8 +31290,14 @@ var KNOWN_VR_CODES = /* @__PURE__ */ new Set([
   "UT",
   "UV"
 ]);
+function decodeXmlEntities(value) {
+  return value.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&amp;/g, "&");
+}
+function decodeIfString(value) {
+  return typeof value === "string" ? decodeXmlEntities(value) : value;
+}
 function buildPnString(comp) {
-  const parts = [comp.FamilyName ?? "", comp.GivenName ?? "", comp.MiddleName ?? "", comp.NamePrefix ?? "", comp.NameSuffix ?? ""];
+  const parts = [comp.FamilyName ?? "", comp.GivenName ?? "", comp.MiddleName ?? "", comp.NamePrefix ?? "", comp.NameSuffix ?? ""].map(decodeXmlEntities);
   let last = parts.length - 1;
   for (; last >= 0; last--) {
     if (parts[last] !== "") break;
@@ -31318,9 +31336,9 @@ function convertBulkDataURI(attr, element) {
   const bulkArray = toArray(attr.BulkDataURI);
   const firstBulk = bulkArray[0];
   if (typeof firstBulk === "object" && firstBulk !== null && "@_uri" in firstBulk) {
-    element.BulkDataURI = safeString(firstBulk["@_uri"]);
+    element.BulkDataURI = decodeXmlEntities(safeString(firstBulk["@_uri"]));
   } else {
-    element.BulkDataURI = safeString(firstBulk);
+    element.BulkDataURI = decodeXmlEntities(safeString(firstBulk));
   }
 }
 function convertPNValue(attr, element) {
@@ -31364,7 +31382,7 @@ function convertRegularValue(attr, element, vr) {
   const values = [];
   const isNumeric = NUMERIC_JSON_VRS.has(vr);
   for (const v of valArray) {
-    const unwrapped = unwrapValue(v);
+    const unwrapped = decodeIfString(unwrapValue(v));
     values.push(isNumeric ? coerceNumeric(unwrapped) : unwrapped);
   }
   if (values.length > 0) element.Value = values;
@@ -33290,7 +33308,7 @@ async function dcmsend(options) {
     return err(result.error);
   }
   if (result.value.exitCode !== 0) {
-    return err(createToolError("dcmsend", args, result.value.exitCode, result.value.stderr));
+    return err(createToolError("dcmsend", args, result.value.exitCode, result.value.stderr, result.value.stdout));
   }
   return ok({ success: true, stdout: result.value.stdout, stderr: result.value.stderr });
 }
@@ -33445,10 +33463,10 @@ async function storescu(options) {
     return err(result.error);
   }
   if (result.value.exitCode !== 0) {
-    return err(createToolError("storescu", args, result.value.exitCode, result.value.stderr));
+    return err(createToolError("storescu", args, result.value.exitCode, result.value.stderr, result.value.stdout));
   }
   if (DIMSE_ERROR_PATTERN.test(result.value.stderr)) {
-    return err(createToolError("storescu", args, 0, result.value.stderr));
+    return err(createToolError("storescu", args, 0, result.value.stderr, result.value.stdout));
   }
   return ok({ success: true, stdout: result.value.stdout, stderr: result.value.stderr });
 }
@@ -37341,8 +37359,14 @@ var SenderEngine = class {
     // Bucket state (bucket mode only)
     __publicField(this, "currentBucket", []);
     __publicField(this, "bucketTimer");
+    // Abort wiring: stopController fires on stop(); combinedSignal also fires
+    // when the externally provided config.signal aborts. Passed into the
+    // executor and into delayInterruptible so stop() unblocks promptly.
+    __publicField(this, "stopController", new AbortController());
+    __publicField(this, "combinedSignal");
     this.config = config;
     this.effectiveMaxAssociations = config.configuredMaxAssociations;
+    this.combinedSignal = combineSignals(this.stopController.signal, config.signal);
   }
   // -----------------------------------------------------------------------
   // Public API
@@ -37368,6 +37392,7 @@ var SenderEngine = class {
   async stop() {
     if (this.isStopped) return;
     this.isStopped = true;
+    this.stopController.abort();
     this.clearBucketTimer();
     this.rejectBucket(`${this.config.senderName}: sender stopped`);
     this.rejectQueue(`${this.config.senderName}: sender stopped`);
@@ -37484,18 +37509,48 @@ var SenderEngine = class {
       }
     };
   }
-  /** Flushes the current bucket: combines all files, dispatches as one send. */
+  /**
+   * Flushes the current bucket. Entries with the same bucketParamsKey merge
+   * into one underlying call; differing keys split into separate calls,
+   * preserving first-occurrence order. Each group emits its own
+   * BUCKET_FLUSHED. If the number of groups exceeds available capacity,
+   * the surplus is queued and drains as capacity frees.
+   */
   flushBucketInternal(reason) {
     if (this.currentBucket.length === 0) return;
     const entries = [...this.currentBucket];
     this.currentBucket = [];
-    const bucketEntry = this.mergeBucketEntries(entries);
-    this.config.emitters.emitBucketFlushed({ fileCount: bucketEntry.files.length, reason });
-    if (this.activeAssociations < this.effectiveMaxAssociations) {
-      void this.executeEntry(bucketEntry);
-    } else {
-      this.queue.push(bucketEntry);
+    const groups = this.groupBucketByParams(entries);
+    for (const group of groups) {
+      const bucketEntry = this.mergeBucketEntries(group);
+      this.config.emitters.emitBucketFlushed({ fileCount: bucketEntry.files.length, reason });
+      if (this.activeAssociations < this.effectiveMaxAssociations) {
+        void this.executeEntry(bucketEntry);
+      } else {
+        this.queue.push(bucketEntry);
+      }
+    }
+  }
+  /**
+   * Groups bucket entries by bucketParamsKey while preserving first-occurrence
+   * order. Without a key function, returns a single group containing every
+   * entry (current behavior for callers that don't vary binaryParams).
+   */
+  groupBucketByParams(entries) {
+    const keyFn = this.config.bucketParamsKey;
+    if (keyFn === void 0) return [entries.slice()];
+    const groups = /* @__PURE__ */ new Map();
+    for (let i = 0; i < entries.length; i++) {
+      const entry = entries[i];
+      const key = keyFn(entry.binaryParams);
+      let group = groups.get(key);
+      if (group === void 0) {
+        group = [];
+        groups.set(key, group);
+      }
+      group.push(entry);
     }
+    return Array.from(groups.values());
   }
   /** Resets the bucket flush timer. */
   resetBucketTimer() {
@@ -37537,25 +37592,33 @@ var SenderEngine = class {
   /** Attempts the binary call up to maxAttempts times. Returns undefined on success. */
   async attemptSend(entry, maxAttempts, startMs) {
     let lastError;
-    const lastOutput = { stdout: "", stderr: "" };
+    let lastOutput = { stdout: "", stderr: "" };
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       if (this.isStopped) {
-        this.activeAssociations--;
-        entry.resolve(err(new Error(`${this.config.senderName}: sender stopped`)));
-        return void 0;
+        return this.resolveStopped(entry);
       }
-      const result = await this.config.executor(entry.files, entry.timeoutMs, entry.binaryParams, this.config.signal);
-      if (result.ok) {
-        this.handleSendSuccess(entry, startMs, result.value);
+      const outcome = await this.config.executor(entry.files, entry.timeoutMs, entry.binaryParams, this.combinedSignal);
+      lastOutput = { stdout: outcome.stdout, stderr: outcome.stderr };
+      if (outcome.error === void 0) {
+        this.handleSendSuccess(entry, startMs, lastOutput);
         return void 0;
       }
-      lastError = result.error;
+      if (this.isStopped) {
+        return this.resolveStopped(entry);
+      }
+      lastError = outcome.error;
       if (attempt < maxAttempts - 1) {
-        await delay2(this.config.retryDelayMs * (attempt + 1));
+        await delayInterruptible(this.config.retryDelayMs * (attempt + 1), this.combinedSignal);
       }
     }
     return { error: lastError ?? new Error(`${this.config.senderName}: send failed`), output: lastOutput };
   }
+  /** Resolves the entry as stopped and decrements activeAssociations. Used from attemptSend. */
+  resolveStopped(entry) {
+    this.activeAssociations--;
+    entry.resolve(err(new Error(`${this.config.senderName}: sender stopped`)));
+    return void 0;
+  }
   /** Handles a successful send: updates state, emits event, resolves promise. */
   handleSendSuccess(entry, startMs, output) {
     this.activeAssociations--;
@@ -37661,11 +37724,41 @@ var SenderEngine = class {
     });
   }
 };
-function delay2(ms) {
+function delayInterruptible(ms, signal) {
+  if (signal.aborted) return Promise.resolve();
   return new Promise((resolve) => {
-    setTimeout(resolve, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      resolve();
+    };
+    const timer = setTimeout(() => {
+      signal.removeEventListener("abort", onAbort);
+      resolve();
+    }, ms);
+    signal.addEventListener("abort", onAbort, { once: true });
   });
 }
+function combineSignals(primary, external) {
+  if (external === void 0) return primary;
+  if (primary.aborted) return primary;
+  if (external.aborted) {
+    const c = new AbortController();
+    c.abort(external.reason);
+    return c.signal;
+  }
+  const merged = new AbortController();
+  const onPrimary = () => {
+    merged.abort(primary.reason);
+    external.removeEventListener("abort", onExternal);
+  };
+  const onExternal = () => {
+    merged.abort(external.reason);
+    primary.removeEventListener("abort", onPrimary);
+  };
+  primary.addEventListener("abort", onPrimary, { once: true });
+  external.addEventListener("abort", onExternal, { once: true });
+  return merged.signal;
+}
 
 // src/senders/DicomSender.ts
 var DEFAULT_MAX_ASSOCIATIONS = 4;
@@ -37700,6 +37793,9 @@ var DicomSenderOptionsSchema = zod.z.object({
   required: zod.z.boolean().optional(),
   signal: zod.z.instanceof(AbortSignal).optional()
 }).strict();
+function storescuBucketKey(p) {
+  return JSON.stringify(p);
+}
 function createStorescuExecutor(options) {
   return async (files, timeoutMs, params, signal) => {
     const result = await storescu({
@@ -37721,8 +37817,13 @@ function createStorescuExecutor(options) {
       timeoutMs,
       signal
     });
-    if (!result.ok) return err(result.error);
-    return ok({ stdout: result.value.stdout, stderr: result.value.stderr });
+    if (!result.ok) {
+      const e = result.error;
+      const stdout = e instanceof ToolExecutionError ? e.stdout : "";
+      const stderr8 = e instanceof ToolExecutionError ? e.stderr : "";
+      return { stdout, stderr: stderr8, error: e };
+    }
+    return { stdout: result.value.stdout, stderr: result.value.stderr };
   };
 }
 function resolveConfig2(options) {
@@ -37779,6 +37880,7 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
       executor: createStorescuExecutor(options),
       signal: options.signal,
       senderName: "DicomSender",
+      bucketParamsKey: storescuBucketKey,
       emitters: {
         emitSendComplete: (data) => {
           senderRef.current.emit("SEND_COMPLETE", data);
@@ -37947,6 +38049,9 @@ var DicomSendOptionsSchema = zod.z.object({
   noUidChecks: zod.z.boolean().optional(),
   signal: zod.z.instanceof(AbortSignal).optional()
 }).strict();
+function dcmsendBucketKey(p) {
+  return JSON.stringify(p);
+}
 function createDcmsendExecutor(options) {
   return async (files, timeoutMs, params, signal) => {
     const result = await dcmsend({
@@ -37970,8 +38075,13 @@ function createDcmsendExecutor(options) {
       timeoutMs,
       signal
     });
-    if (!result.ok) return err(result.error);
-    return ok({ stdout: result.value.stdout, stderr: result.value.stderr });
+    if (!result.ok) {
+      const e = result.error;
+      const stdout = e instanceof ToolExecutionError ? e.stdout : "";
+      const stderr8 = e instanceof ToolExecutionError ? e.stderr : "";
+      return { stdout, stderr: stderr8, error: e };
+    }
+    return { stdout: result.value.stdout, stderr: result.value.stderr };
   };
 }
 function resolveConfig3(options) {
@@ -38028,6 +38138,7 @@ var DicomSend = class _DicomSend extends events.EventEmitter {
       executor: createDcmsendExecutor(options),
       signal: options.signal,
       senderName: "DicomSend",
+      bucketParamsKey: dcmsendBucketKey,
       emitters: {
         emitSendComplete: (data) => {
           senderRef.current.emit("SEND_COMPLETE", data);
@@ -38715,7 +38826,7 @@ function computeThroughput(succeeded, totalBytes, durationMs) {
     bytesPerSec: durationSec > 0 ? totalBytes / durationSec : 0
   };
 }
-function delay3(ms) {
+function delay2(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
   });
@@ -38862,7 +38973,7 @@ var DicomHammer = class _DicomHammer extends events.EventEmitter {
   /** Sends a single file, with optional delay. */
   async sendOneFile(file) {
     if (this.opts.delayMs > 0) {
-      await delay3(this.opts.delayMs);
+      await delay2(this.opts.delayMs);
     }
     const result = await dcmsend({
       host: this.opts.host,
@@ -39029,6 +39140,7 @@ exports.StoreSCP = StoreSCP;
 exports.StoreSCPPreset = StoreSCPPreset;
 exports.StorescpEvent = StorescpEvent;
 exports.SubdirectoryMode = SubdirectoryMode;
+exports.ToolExecutionError = ToolExecutionError;
 exports.TransferSyntax = TransferSyntax;
 exports.UIDSchema = UIDSchema;
 exports.UNIX_SEARCH_PATHS = UNIX_SEARCH_PATHS;