@ubercode/dcmtk 0.4.0 → 0.6.0

package/dist/servers.cjs

@@ -1557,6 +1557,45 @@ var ChangeSet = class _ChangeSet {
     return result;
   }
 };
+
+// src/dicom/walkTags.ts
+var DEFAULT_MAX_DEPTH = 16;
+function walkTags(data, options) {
+  const ctx = {
+    maxDepth: options?.maxDepth ?? DEFAULT_MAX_DEPTH,
+    vrSet: options?.vrFilter !== void 0 ? new Set(options.vrFilter) : void 0,
+    results: []
+  };
+  walkLevel(data, 0, "", ctx);
+  return ctx.results;
+}
+function walkLevel(data, depth, pathPrefix, ctx) {
+  const keys = Object.keys(data);
+  for (let i = 0; i < keys.length; i++) {
+    const tag = keys[i];
+    if (tag === void 0) continue;
+    const element = data[tag];
+    if (element === void 0) continue;
+    const vr = element.vr;
+    const path2 = pathPrefix.length > 0 ? `${pathPrefix}.${tag}` : tag;
+    if (ctx.vrSet === void 0 || ctx.vrSet.has(vr)) {
+      ctx.results.push({ tag, element, vr, depth, path: path2 });
+    }
+    if (vr === "SQ" && element.Value !== void 0 && depth < ctx.maxDepth) {
+      walkSequenceItems(element.Value, depth, path2, ctx);
+    }
+  }
+}
+function walkSequenceItems(items, depth, parentPath, ctx) {
+  for (let idx = 0; idx < items.length; idx++) {
+    const item = items[idx];
+    if (typeof item !== "object" || item === null) continue;
+    const itemPath = `${parentPath}[${idx}]`;
+    walkLevel(item, depth + 1, itemPath, ctx);
+  }
+}
+
+// src/dicom/DicomDataset.ts
 var HEX_TAG_KEY = /^[0-9A-Fa-f]{8}$/;
 function isDicomJsonElement(value) {
   return typeof value === "object" && value !== null && "vr" in value && typeof value["vr"] === "string";
@@ -1885,6 +1924,15 @@ var DicomDataset = class _DicomDataset {
     const result = collectWildcard(this.data, segments);
     return result.values;
   }
+  /**
+   * Walks all tags in this dataset, optionally filtering by VR and recursing into sequences.
+   *
+   * @param options - Optional VR filter and max depth
+   * @returns A readonly array of all matching tag entries
+   */
+  walkTags(options) {
+    return walkTags(this.data, options);
+  }
   // -----------------------------------------------------------------------
   // Convenience readonly getters
   // -----------------------------------------------------------------------
@@ -2097,15 +2145,32 @@ function convertSequence(attr, element) {
   }
   if (values.length > 0) element.Value = values;
 }
-function convertRegularValue(attr, element) {
+var NUMERIC_JSON_VRS = /* @__PURE__ */ new Set(["DS", "FL", "FD", "IS", "SL", "SS", "SV", "UL", "US", "UV"]);
+function unwrapValue(v) {
+  if (typeof v !== "object" || v === null) return v;
+  const obj = v;
+  if ("#text" in obj) return obj["#text"];
+  const keys = Object.keys(obj);
+  if (keys.length === 1 && keys[0] !== void 0 && keys[0].startsWith("@_")) {
+    return obj[keys[0]];
+  }
+  return v;
+}
+function coerceNumeric(value) {
+  if (typeof value === "number") return value;
+  if (typeof value !== "string") return value;
+  const trimmed = value.trim();
+  if (trimmed.length === 0) return value;
+  const num = Number(trimmed);
+  return Number.isNaN(num) ? value : num;
+}
+function convertRegularValue(attr, element, vr) {
   const valArray = toArray(attr.Value);
   const values = [];
+  const isNumeric = NUMERIC_JSON_VRS.has(vr);
   for (const v of valArray) {
-    if (typeof v === "object" && v !== null && "#text" in v) {
-      values.push(v["#text"]);
-    } else {
-      values.push(v);
-    }
+    const unwrapped = unwrapValue(v);
+    values.push(isNumeric ? coerceNumeric(unwrapped) : unwrapped);
   }
   if (values.length > 0) element.Value = values;
 }
@@ -2122,7 +2187,7 @@ function convertElement(attr) {
   } else if (element.vr === "SQ" && attr.Item !== void 0) {
     convertSequence(attr, element);
   } else if (attr.Value !== void 0) {
-    convertRegularValue(attr, element);
+    convertRegularValue(attr, element, vr);
   }
   return Object.freeze(element);
 }
@@ -2701,8 +2766,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(),
@@ -2710,6 +2776,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"
@@ -2838,6 +2907,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;
@@ -2851,8 +2971,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);
@@ -2905,6 +3028,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();
@@ -2963,6 +3087,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();
@@ -2971,13 +3108,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 = {
@@ -2989,6 +3120,7 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       associationDir: void 0,
       files: [],
       fileSizes: [],
+      outputLines: [],
       startAt: void 0,
       remoteSocket: void 0,
       workerSocket: void 0
@@ -3050,10 +3182,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) {
@@ -3101,6 +3238,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);
@@ -3118,19 +3256,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
   // -----------------------------------------------------------------------