@ubercode/dcmtk 0.13.2 → 0.15.0

package/dist/dicom.js

@@ -30364,6 +30364,51 @@ var ChangeSet = class _ChangeSet {
     return result;
   }
 };
+
+// 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, stderr4, stdout = "") {
+  const argsStr = truncate(args.join(" "), MAX_ARGS_LENGTH);
+  const stderrStr = truncate(stderr4.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: stderr4, 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 path = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
+    parts.push(`${path}: ${issue.message}`);
+  }
+  const detail = parts.length > 0 ? parts.join("; ") : "unknown validation error";
+  return new Error(`${toolName}: invalid options \u2014 ${detail}`);
+}
 function killTree(pid) {
   try {
     kill(pid);
@@ -30525,39 +30570,6 @@ function resolveBinary(toolName) {
   const binaryName2 = isWindows2 ? `${toolName}.exe` : toolName;
   return ok(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, stderr4) {
-  const argsStr = truncate(args.join(" "), MAX_ARGS_LENGTH);
-  const stderrStr = truncate(stderr4.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 path = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
-    parts.push(`${path}: ${issue.message}`);
-  }
-  const detail = parts.length > 0 ? parts.join("; ") : "unknown validation error";
-  return new Error(`${toolName}: invalid options \u2014 ${detail}`);
-}
 var PN_REPS = ["Alphabetic", "Ideographic", "Phonetic"];
 var ARRAY_TAG_NAMES = /* @__PURE__ */ new Set(["DicomAttribute", "Value", "PersonName", "Item"]);
 var KNOWN_VR_CODES = /* @__PURE__ */ new Set([
@@ -30870,15 +30882,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 = z.object({