@ubercode/dcmtk 0.6.5 → 0.7.0

package/dist/{index-D_ew9kha.d.cts → index-AYvUunlI.d.cts}

@@ -1569,6 +1569,12 @@ interface DicomReceiverOptions {
     readonly dimseTimeout?: number | undefined;
     /** Maximum PDU receive size (passed through to Dcmrecv workers). */
     readonly maxPdu?: number | undefined;
+    /** Filename generation mode for received files (passed through to Dcmrecv workers). */
+    readonly filenameMode?: FilenameModeValue | undefined;
+    /** Extension appended to received filenames, e.g. `'.dcm'` (passed through to Dcmrecv workers). */
+    readonly filenameExtension?: string | undefined;
+    /** Storage mode for received files (passed through to Dcmrecv workers). */
+    readonly storageMode?: StorageModeValue | undefined;
     /** AbortSignal for external cancellation. */
     readonly signal?: AbortSignal | undefined;
 }

package/dist/{index-DHsEm87K.d.ts → index-C20fLU5U.d.ts}

@@ -1569,6 +1569,12 @@ interface DicomReceiverOptions {
     readonly dimseTimeout?: number | undefined;
     /** Maximum PDU receive size (passed through to Dcmrecv workers). */
     readonly maxPdu?: number | undefined;
+    /** Filename generation mode for received files (passed through to Dcmrecv workers). */
+    readonly filenameMode?: FilenameModeValue | undefined;
+    /** Extension appended to received filenames, e.g. `'.dcm'` (passed through to Dcmrecv workers). */
+    readonly filenameExtension?: string | undefined;
+    /** Storage mode for received files (passed through to Dcmrecv workers). */
+    readonly storageMode?: StorageModeValue | undefined;
     /** AbortSignal for external cancellation. */
     readonly signal?: AbortSignal | undefined;
 }

package/dist/index.cjs

@@ -33342,7 +33342,7 @@ async function storescu(options) {
   if (result.value.exitCode !== 0) {
     return err(createToolError("storescu", args, result.value.exitCode, result.value.stderr));
   }
-  return ok({ success: true, stderr: result.value.stderr });
+  return ok({ success: true, stdout: result.value.stdout, stderr: result.value.stderr });
 }
 var QueryModel = {
   WORKLIST: "worklist",
@@ -36197,6 +36197,9 @@ var DicomReceiverOptionsSchema = zod.z.object({
   acseTimeout: zod.z.number().int().positive().optional(),
   dimseTimeout: zod.z.number().int().positive().optional(),
   maxPdu: zod.z.number().int().min(4096).max(131072).optional(),
+  filenameMode: zod.z.enum(["default", "unique", "short-unique", "system-time"]).optional(),
+  filenameExtension: zod.z.string().min(1).optional(),
+  storageMode: zod.z.enum(["normal", "bit-preserving", "ignore"]).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"
@@ -36518,7 +36521,10 @@ var DicomReceiver = class _DicomReceiver extends events.EventEmitter {
       configProfile: this.options.configProfile,
       acseTimeout: this.options.acseTimeout,
       dimseTimeout: this.options.dimseTimeout,
-      maxPdu: this.options.maxPdu
+      maxPdu: this.options.maxPdu,
+      filenameMode: this.options.filenameMode,
+      filenameExtension: this.options.filenameExtension,
+      storageMode: this.options.storageMode
     });
   }
   /** Spawns a single Dcmrecv worker with an ephemeral port. */
@@ -36880,6 +36886,14 @@ var DicomSenderOptionsSchema = zod.z.object({
   retryDelayMs: zod.z.number().int().min(0).optional(),
   bucketFlushMs: zod.z.number().int().positive().optional(),
   maxBucketSize: zod.z.number().int().min(1).optional(),
+  maxPduReceive: zod.z.number().int().min(4096).max(131072).optional(),
+  maxPduSend: zod.z.number().int().min(4096).max(131072).optional(),
+  associationTimeout: zod.z.number().int().positive().optional(),
+  acseTimeout: zod.z.number().int().positive().optional(),
+  dimseTimeout: zod.z.number().int().positive().optional(),
+  noHostnameLookup: zod.z.boolean().optional(),
+  noUidChecks: zod.z.boolean().optional(),
+  verbosity: zod.z.enum(["verbose", "debug"]).optional(),
   signal: zod.z.instanceof(AbortSignal).optional()
 }).strict();
 function resolveConfig(options) {
@@ -36978,14 +36992,22 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
     if (files.length === 0) {
       return Promise.resolve(err(new Error("DicomSender: no files provided")));
     }
-    const timeoutMs = options?.timeoutMs ?? this.defaultTimeoutMs;
-    const maxRetries = options?.maxRetries ?? this.defaultMaxRetries;
+    const params = {
+      timeoutMs: options?.timeoutMs ?? this.defaultTimeoutMs,
+      maxRetries: options?.maxRetries ?? this.defaultMaxRetries,
+      calledAETitle: options?.calledAETitle,
+      callingAETitle: options?.callingAETitle
+    };
+    return this.dispatchSend(files, params);
+  }
+  /** Dispatches a send to the appropriate mode handler. */
+  dispatchSend(files, params) {
     switch (this.mode) {
       case "single":
       case "multiple":
-        return this.enqueueSend(files, timeoutMs, maxRetries);
+        return this.enqueueSend(files, params);
       case "bucket":
-        return this.enqueueBucket(files, timeoutMs, maxRetries);
+        return this.enqueueBucket(files, params);
       default:
         assertUnreachable(this.mode);
     }
@@ -37080,14 +37102,21 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
   // Single/Multiple mode: queue-based dispatch
   // -----------------------------------------------------------------------
   /** Enqueues a send and dispatches immediately if capacity allows. */
-  enqueueSend(files, timeoutMs, maxRetries) {
+  enqueueSend(files, params) {
     return new Promise((resolve) => {
       const totalQueued = this.queue.length + this.currentBucket.length;
       if (totalQueued >= this.maxQueueLength) {
         resolve(err(new Error("DicomSender: queue full")));
         return;
       }
-      const entry = { files, timeoutMs, maxRetries, resolve };
+      const entry = {
+        files,
+        timeoutMs: params.timeoutMs,
+        maxRetries: params.maxRetries,
+        calledAETitle: params.calledAETitle,
+        callingAETitle: params.callingAETitle,
+        resolve
+      };
       if (this.activeAssociations < this.effectiveMaxAssociations) {
         void this.executeEntry(entry);
       } else {
@@ -37107,14 +37136,15 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
   // Bucket mode: accumulate-then-flush
   // -----------------------------------------------------------------------
   /** Adds files to the current bucket and triggers flush if full. */
-  enqueueBucket(files, timeoutMs, maxRetries) {
+  enqueueBucket(files, params) {
     return new Promise((resolve) => {
       const totalQueued = this.queue.length + this.currentBucket.length;
       if (totalQueued >= this.maxQueueLength) {
         resolve(err(new Error("DicomSender: queue full")));
         return;
       }
-      this.currentBucket.push({ files, resolve, timeoutMs, maxRetries });
+      const { timeoutMs, maxRetries, calledAETitle, callingAETitle } = params;
+      this.currentBucket.push({ files, resolve, timeoutMs, maxRetries, calledAETitle, callingAETitle });
       const totalFiles = this.countBucketFiles();
       if (totalFiles >= this.maxBucketSize) {
         this.clearBucketTimer();
@@ -37154,6 +37184,8 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
       files: allFiles,
       timeoutMs,
       maxRetries,
+      calledAETitle: entries[0]?.calledAETitle,
+      callingAETitle: entries[0]?.callingAETitle,
       resolve: (result) => {
         for (let i = 0; i < entries.length; i++) {
           entries[i].resolve(result);
@@ -37189,17 +37221,24 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
     this.activeAssociations++;
     const startMs = Date.now();
     const maxAttempts = entry.maxRetries + 1;
-    const lastError = await this.attemptSend(entry, maxAttempts, startMs);
-    if (lastError === void 0) return;
+    const failure = await this.attemptSend(entry, maxAttempts, startMs);
+    if (failure === void 0) return;
     this.activeAssociations--;
     this.recordFailure();
-    this.emit("SEND_FAILED", { files: entry.files, error: lastError, attempts: maxAttempts });
-    entry.resolve(err(lastError));
+    this.emit("SEND_FAILED", {
+      files: entry.files,
+      error: failure.error,
+      attempts: maxAttempts,
+      stdout: failure.output.stdout,
+      stderr: failure.output.stderr
+    });
+    entry.resolve(err(failure.error));
     this.drainQueue();
   }
-  /** Attempts storescu up to maxAttempts times. Returns undefined on success, or the last error. */
+  /** Attempts storescu up to maxAttempts times. Returns undefined on success, or failure info. */
   async attemptSend(entry, maxAttempts, startMs) {
     let lastError;
+    const lastOutput = { stdout: "", stderr: "" };
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       if (this.isStopped) {
         this.activeAssociations--;
@@ -37208,7 +37247,7 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
       }
       const result = await this.callStorescu(entry);
       if (result.ok) {
-        this.handleSendSuccess(entry, startMs);
+        this.handleSendSuccess(entry, startMs, result.value);
         return void 0;
       }
       lastError = result.error;
@@ -37216,7 +37255,7 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
         await delay2(this.retryDelayMs * (attempt + 1));
       }
     }
-    return lastError ?? new Error("DicomSender: send failed");
+    return { error: lastError ?? new Error("DicomSender: send failed"), output: lastOutput };
   }
   /** Calls storescu with the configured options. */
   callStorescu(entry) {
@@ -37224,20 +37263,29 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
       host: this.options.host,
       port: this.options.port,
       files: [...entry.files],
-      calledAETitle: this.options.calledAETitle,
-      callingAETitle: this.options.callingAETitle,
+      calledAETitle: entry.calledAETitle ?? this.options.calledAETitle,
+      callingAETitle: entry.callingAETitle ?? this.options.callingAETitle,
       proposedTransferSyntax: this.options.proposedTransferSyntax,
+      maxPduReceive: this.options.maxPduReceive,
+      maxPduSend: this.options.maxPduSend,
+      associationTimeout: this.options.associationTimeout,
+      acseTimeout: this.options.acseTimeout,
+      dimseTimeout: this.options.dimseTimeout,
+      noHostnameLookup: this.options.noHostnameLookup,
+      noUidChecks: this.options.noUidChecks,
+      verbosity: this.options.verbosity,
       timeoutMs: entry.timeoutMs,
       signal: this.options.signal
     });
   }
   /** Handles a successful send: updates state, emits event, resolves promise. */
-  handleSendSuccess(entry, startMs) {
+  handleSendSuccess(entry, startMs, output) {
     this.activeAssociations--;
     const durationMs = Date.now() - startMs;
     this.recordSuccess();
-    this.emit("SEND_COMPLETE", { files: entry.files, fileCount: entry.files.length, durationMs });
-    entry.resolve(ok({ files: entry.files, fileCount: entry.files.length, durationMs }));
+    const data = { files: entry.files, fileCount: entry.files.length, durationMs, stdout: output.stdout, stderr: output.stderr };
+    this.emit("SEND_COMPLETE", data);
+    entry.resolve(ok(data));
     this.drainQueue();
   }
   // -----------------------------------------------------------------------