@ubercode/dcmtk 0.3.0 → 0.5.0

package/dist/servers.cjs

@@ -2201,19 +2201,28 @@ function repairJson(raw) {
 var Dcm2jsonOptionsSchema = zod.z.object({
   timeoutMs: zod.z.number().int().positive().optional(),
   signal: zod.z.instanceof(AbortSignal).optional(),
-  directOnly: zod.z.boolean().optional()
+  directOnly: zod.z.boolean().optional(),
+  verbosity: zod.z.enum(["verbose", "debug"]).optional()
 }).strict().optional();
-async function tryXmlPath(inputPath, timeoutMs, signal) {
+var VERBOSITY_FLAGS = { verbose: "-v", debug: "-d" };
+function buildVerbosityArgs(verbosity) {
+  if (verbosity !== void 0) {
+    return [VERBOSITY_FLAGS[verbosity]];
+  }
+  return [];
+}
+async function tryXmlPath(inputPath, timeoutMs, signal, verbosity) {
   const xmlBinary = resolveBinary("dcm2xml");
   if (!xmlBinary.ok) {
     return err(xmlBinary.error);
   }
-  const xmlResult = await execCommand(xmlBinary.value, ["-nat", inputPath], { timeoutMs, signal });
+  const xmlArgs = [...buildVerbosityArgs(verbosity), "-nat", inputPath];
+  const xmlResult = await execCommand(xmlBinary.value, xmlArgs, { timeoutMs, signal });
   if (!xmlResult.ok) {
     return err(xmlResult.error);
   }
   if (xmlResult.value.exitCode !== 0) {
-    return err(createToolError("dcm2xml", ["-nat", inputPath], xmlResult.value.exitCode, xmlResult.value.stderr));
+    return err(createToolError("dcm2xml", xmlArgs, xmlResult.value.exitCode, xmlResult.value.stderr));
   }
   const jsonResult = xmlToJson(xmlResult.value.stdout);
   if (!jsonResult.ok) {
@@ -2221,17 +2230,18 @@ async function tryXmlPath(inputPath, timeoutMs, signal) {
   }
   return ok({ data: jsonResult.value, source: "xml" });
 }
-async function tryDirectPath(inputPath, timeoutMs, signal) {
+async function tryDirectPath(inputPath, timeoutMs, signal, verbosity) {
   const jsonBinary = resolveBinary("dcm2json");
   if (!jsonBinary.ok) {
     return err(jsonBinary.error);
   }
-  const result = await execCommand(jsonBinary.value, [inputPath], { timeoutMs, signal });
+  const directArgs = [...buildVerbosityArgs(verbosity), inputPath];
+  const result = await execCommand(jsonBinary.value, directArgs, { timeoutMs, signal });
   if (!result.ok) {
     return err(result.error);
   }
   if (result.value.exitCode !== 0) {
-    return err(createToolError("dcm2json", [inputPath], result.value.exitCode, result.value.stderr));
+    return err(createToolError("dcm2json", directArgs, result.value.exitCode, result.value.stderr));
   }
   try {
     const repaired = repairJson(result.value.stdout);
@@ -2248,20 +2258,22 @@ async function dcm2json(inputPath, options) {
   }
   const timeoutMs = options?.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const signal = options?.signal;
+  const verbosity = options?.verbosity;
   if (options?.directOnly === true) {
-    return tryDirectPath(inputPath, timeoutMs, signal);
+    return tryDirectPath(inputPath, timeoutMs, signal, verbosity);
   }
-  const xmlResult = await tryXmlPath(inputPath, timeoutMs, signal);
+  const xmlResult = await tryXmlPath(inputPath, timeoutMs, signal, verbosity);
   if (xmlResult.ok) {
     return xmlResult;
   }
-  return tryDirectPath(inputPath, timeoutMs, signal);
+  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 TagModificationSchema = zod.z.object({
   tag: zod.z.string().regex(TAG_OR_PATH_PATTERN),
   value: zod.z.string()
 });
+var VERBOSITY_FLAGS2 = { verbose: "-v", debug: "-d" };
 var DcmodifyOptionsSchema = zod.z.object({
   timeoutMs: zod.z.number().int().positive().optional(),
   signal: zod.z.instanceof(AbortSignal).optional(),
@@ -2270,12 +2282,16 @@ var DcmodifyOptionsSchema = zod.z.object({
   erasePrivateTags: zod.z.boolean().optional(),
   noBackup: zod.z.boolean().optional(),
   insertIfMissing: zod.z.boolean().optional(),
-  ignoreMissingTags: zod.z.boolean().optional()
+  ignoreMissingTags: zod.z.boolean().optional(),
+  verbosity: zod.z.enum(["verbose", "debug"]).optional()
 }).strict().refine((data) => data.modifications.length > 0 || data.erasures !== void 0 && data.erasures.length > 0 || data.erasePrivateTags === true, {
   message: "At least one of modifications, erasures, or erasePrivateTags is required"
 });
 function buildArgs3(inputPath, options) {
   const args = [];
+  if (options.verbosity !== void 0) {
+    args.push(VERBOSITY_FLAGS2[options.verbosity]);
+  }
   if (options.noBackup !== false) {
     args.push("-nb");
   }
@@ -2685,8 +2701,9 @@ var DEFAULT_MAX_POOL_SIZE = 10;
 var DEFAULT_CONNECTION_TIMEOUT_MS = 1e4;
 var CONNECTION_RETRY_INTERVAL_MS = 500;
 var MAX_CONNECTION_RETRIES = 200;
+var MAX_OUTPUT_LINES_PER_ASSOCIATION = 500;
 var DicomReceiverOptionsSchema = zod.z.object({
-  port: zod.z.number().int().min(1).max(65535),
+  port: zod.z.number().int().min(0).max(65535),
   storageDir: zod.z.string().min(1).refine(isSafePath, { message: "path traversal detected in storageDir" }),
   aeTitle: zod.z.string().min(1).max(16).refine(isValidAETitle, { message: "AE Title contains invalid characters" }).optional(),
   minPoolSize: zod.z.number().int().min(1).max(100).optional(),
@@ -2694,6 +2711,9 @@ var DicomReceiverOptionsSchema = zod.z.object({
   connectionTimeoutMs: zod.z.number().int().positive().optional(),
   configFile: zod.z.string().min(1).refine(isSafePath, { message: "path traversal detected in configFile" }).optional(),
   configProfile: zod.z.string().min(1).optional(),
+  acseTimeout: zod.z.number().int().positive().optional(),
+  dimseTimeout: zod.z.number().int().positive().optional(),
+  maxPdu: zod.z.number().int().min(4096).max(131072).optional(),
   signal: zod.z.instanceof(AbortSignal).optional()
 }).strict().refine((data) => (data.minPoolSize ?? DEFAULT_MIN_POOL_SIZE) <= (data.maxPoolSize ?? DEFAULT_MAX_POOL_SIZE), {
   message: "minPoolSize must be <= maxPoolSize"
@@ -2822,6 +2842,57 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
   onAssociationComplete(listener) {
     return this.on("ASSOCIATION_COMPLETE", listener);
   }
+  /**
+   * Registers a listener for new associations (bubbled from workers).
+   *
+   * @param listener - Callback receiving association received data
+   * @returns this for chaining
+   */
+  onAssociationReceived(listener) {
+    return this.on("ASSOCIATION_RECEIVED", listener);
+  }
+  /**
+   * Registers a listener for C-STORE requests (bubbled from workers).
+   *
+   * @param listener - Callback receiving C-STORE request data
+   * @returns this for chaining
+   */
+  onCStoreRequest(listener) {
+    return this.on("C_STORE_REQUEST", listener);
+  }
+  /**
+   * Registers a listener for C-ECHO requests (bubbled from workers).
+   *
+   * @param listener - Callback receiving echo request data
+   * @returns this for chaining
+   */
+  onEchoRequest(listener) {
+    return this.on("ECHO_REQUEST", listener);
+  }
+  /**
+   * Registers a listener for refused associations (bubbled from workers).
+   *
+   * @param listener - Callback receiving refusing association data
+   * @returns this for chaining
+   */
+  onRefusingAssociation(listener) {
+    return this.on("REFUSING_ASSOCIATION", listener);
+  }
+  /**
+   * Routes an external socket to an idle worker.
+   *
+   * The pool must be started via `start()` before calling this method.
+   * Use this when managing your own TCP listener (e.g., protocol router).
+   *
+   * @param socket - An incoming net.Socket to route to a worker
+   */
+  handleSocket(socket) {
+    if (!this.started) {
+      socket.destroy(new Error("DicomReceiver: not started"));
+      return;
+    }
+    void this.handleConnection(socket);
+  }
   /** Current pool status. */
   get poolStatus() {
     let idle = 0;
@@ -2835,8 +2906,11 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
   // -----------------------------------------------------------------------
   // TCP proxy
   // -----------------------------------------------------------------------
-  /** Starts the TCP proxy on the configured port. */
+  /** Starts the TCP proxy on the configured port. Skips if port is 0. */
   startTcpProxy() {
+    if (this.options.port === 0) {
+      return Promise.resolve(ok(void 0));
+    }
     return new Promise((resolve) => {
       this.tcpServer = net__namespace.createServer((socket) => {
         void this.handleConnection(socket);
@@ -2889,6 +2963,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
     worker.associationDir = associationDir;
     worker.files = [];
     worker.fileSizes = [];
+    worker.outputLines = [];
     worker.startAt = Date.now();
     this.pipeConnection(worker, remoteSocket);
     void this.replenishPool();
@@ -2947,6 +3022,19 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
     }
     return ok(void 0);
   }
+  /** Creates a Dcmrecv instance with the pool's shared options. */
+  createDcmrecv(port, tempDir) {
+    return Dcmrecv.create({
+      port,
+      aeTitle: this.options.aeTitle ?? "DCMRECV",
+      outputDirectory: tempDir,
+      configFile: this.options.configFile,
+      configProfile: this.options.configProfile,
+      acseTimeout: this.options.acseTimeout,
+      dimseTimeout: this.options.dimseTimeout,
+      maxPdu: this.options.maxPdu
+    });
+  }
   /** Spawns a single Dcmrecv worker with an ephemeral port. */
   async spawnWorker() {
     const portResult = await allocatePort();
@@ -2955,13 +3043,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
     const tempDir = path__namespace.join(os__namespace.tmpdir(), `dcmrecv-pool-${String(port)}-${String(Date.now())}`);
     const mkdirResult = await ensureDirectory(tempDir);
     if (!mkdirResult.ok) return mkdirResult;
-    const createResult = Dcmrecv.create({
-      port,
-      aeTitle: this.options.aeTitle ?? "DCMRECV",
-      outputDirectory: tempDir,
-      configFile: this.options.configFile,
-      configProfile: this.options.configProfile
-    });
+    const createResult = this.createDcmrecv(port, tempDir);
     if (!createResult.ok) return createResult;
     const dcmrecv = createResult.value;
     const worker = {
@@ -2973,6 +3055,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       associationDir: void 0,
       files: [],
       fileSizes: [],
+      outputLines: [],
       startAt: void 0,
       remoteSocket: void 0,
       workerSocket: void 0
@@ -3034,10 +3117,15 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
   // -----------------------------------------------------------------------
   // Worker event wiring
   // -----------------------------------------------------------------------
-  /** Wires FILE_RECEIVED and ASSOCIATION_COMPLETE events on a worker. */
+  /** Wires all events on a worker: file handling, association lifecycle, output capture. */
   wireWorkerEvents(worker) {
     this.wireFileReceived(worker);
     this.wireAssociationComplete(worker);
+    this.wireAssociationReceived(worker);
+    this.wireCStoreRequest(worker);
+    this.wireEchoRequest(worker);
+    this.wireRefusingAssociation(worker);
+    this.wireOutputCapture(worker);
   }
   /** Wires FILE_RECEIVED from dcmrecv worker to handleFileReceived. */
   wireFileReceived(worker) {
@@ -3085,6 +3173,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       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);
@@ -3102,19 +3191,65 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
         totalBytes,
         bytesPerSecond,
         startAt,
-        endAt
+        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();
     });
   }
+  /** Bubbles ASSOCIATION_RECEIVED from dcmrecv worker. */
+  wireAssociationReceived(worker) {
+    worker.dcmrecv.onEvent("ASSOCIATION_RECEIVED", (data) => {
+      this.emit("ASSOCIATION_RECEIVED", {
+        associationId: worker.associationId ?? "",
+        callingAE: data.callingAE,
+        calledAE: data.calledAE,
+        source: data.source
+      });
+    });
+  }
+  /** Bubbles C_STORE_REQUEST from dcmrecv worker. */
+  wireCStoreRequest(worker) {
+    worker.dcmrecv.onEvent("C_STORE_REQUEST", (data) => {
+      this.emit("C_STORE_REQUEST", {
+        associationId: worker.associationId ?? "",
+        raw: data.raw
+      });
+    });
+  }
+  /** Bubbles ECHO_REQUEST from dcmrecv worker. */
+  wireEchoRequest(worker) {
+    worker.dcmrecv.onEvent("ECHO_REQUEST", () => {
+      this.emit("ECHO_REQUEST", {
+        associationId: worker.associationId ?? ""
+      });
+    });
+  }
+  /** Bubbles REFUSING_ASSOCIATION from dcmrecv worker. */
+  wireRefusingAssociation(worker) {
+    worker.dcmrecv.onEvent("REFUSING_ASSOCIATION", (data) => {
+      this.emit("REFUSING_ASSOCIATION", {
+        reason: data.reason
+      });
+    });
+  }
+  /** 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);
+      }
+    });
+  }
   // -----------------------------------------------------------------------
   // Abort signal
   // -----------------------------------------------------------------------