@ubercode/dcmtk 0.7.0 → 0.7.2

package/dist/index.d.cts

@@ -289,10 +289,10 @@ interface DicomSenderOptions {
     readonly dimseTimeout?: number | undefined;
     /** Disable DNS hostname lookup (passed through to storescu `-nh`). Useful in containerized environments. */
     readonly noHostnameLookup?: boolean | undefined;
-    /** Disable UID validity checking (passed through to storescu `--no-uid-checks`). */
-    readonly noUidChecks?: boolean | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
+    /** Propose only each file's native transfer syntax (passed through to storescu `-R`). */
+    readonly required?: boolean | undefined;
     /** AbortSignal for external cancellation. */
     readonly signal?: AbortSignal | undefined;
 }
@@ -306,6 +306,8 @@ interface SendOptions {
     readonly calledAETitle?: string | undefined;
     /** Override calling AE Title for this send. */
     readonly callingAETitle?: string | undefined;
+    /** Override required flag for this send. */
+    readonly required?: boolean | undefined;
 }
 /** Result of a successful send operation. */
 interface SendResult {
@@ -536,6 +538,8 @@ declare class DicomSender extends EventEmitter<DicomSenderEventMap> {
     private enqueueBucket;
     /** Counts total files in the current bucket. */
     private countBucketFiles;
+    /** Merges bucket entries into a single QueueEntry. */
+    private mergeBucketEntries;
     /** Flushes the current bucket: combines all files, dispatches as one send. */
     private flushBucketInternal;
     /** Resets the bucket flush timer. */

package/dist/index.d.ts

@@ -289,10 +289,10 @@ interface DicomSenderOptions {
     readonly dimseTimeout?: number | undefined;
     /** Disable DNS hostname lookup (passed through to storescu `-nh`). Useful in containerized environments. */
     readonly noHostnameLookup?: boolean | undefined;
-    /** Disable UID validity checking (passed through to storescu `--no-uid-checks`). */
-    readonly noUidChecks?: boolean | undefined;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
+    /** Propose only each file's native transfer syntax (passed through to storescu `-R`). */
+    readonly required?: boolean | undefined;
     /** AbortSignal for external cancellation. */
     readonly signal?: AbortSignal | undefined;
 }
@@ -306,6 +306,8 @@ interface SendOptions {
     readonly calledAETitle?: string | undefined;
     /** Override calling AE Title for this send. */
     readonly callingAETitle?: string | undefined;
+    /** Override required flag for this send. */
+    readonly required?: boolean | undefined;
 }
 /** Result of a successful send operation. */
 interface SendResult {
@@ -536,6 +538,8 @@ declare class DicomSender extends EventEmitter<DicomSenderEventMap> {
     private enqueueBucket;
     /** Counts total files in the current bucket. */
     private countBucketFiles;
+    /** Merges bucket entries into a single QueueEntry. */
+    private mergeBucketEntries;
     /** Flushes the current bucket: combines all files, dispatches as one send. */
     private flushBucketInternal;
     /** Resets the bucket flush timer. */

package/dist/index.js

@@ -33232,7 +33232,7 @@ var StorescuOptionsSchema = z.object({
   acseTimeout: z.number().int().positive().optional(),
   dimseTimeout: z.number().int().positive().optional(),
   noHostnameLookup: z.boolean().optional(),
-  noUidChecks: z.boolean().optional(),
+  required: z.boolean().optional(),
   proposedTransferSyntax: z.enum([
     "uncompressed",
     "littleEndian",
@@ -33248,6 +33248,7 @@ var StorescuOptionsSchema = z.object({
   ]).optional()
 }).strict();
 var VERBOSITY_FLAGS20 = { verbose: "-v", debug: "-d" };
+var DIMSE_ERROR_PATTERN = /^E:.*(?:DIMSE Failed|Store Failed)/m;
 function pushNetworkArgs3(args, options) {
   if (options.verbosity !== void 0) {
     args.push(VERBOSITY_FLAGS20[options.verbosity]);
@@ -33274,9 +33275,6 @@ function pushNetworkArgs3(args, options) {
 function buildArgs34(options) {
   const args = [];
   pushNetworkArgs3(args, options);
-  if (options.noUidChecks === true) {
-    args.push("--no-uid-checks");
-  }
   if (options.callingAETitle !== void 0) {
     args.push("-aet", options.callingAETitle);
   }
@@ -33292,6 +33290,9 @@ function buildArgs34(options) {
   if (options.proposedTransferSyntax !== void 0) {
     args.push(PROPOSED_TS_FLAG_MAP[options.proposedTransferSyntax]);
   }
+  if (options.required === true) {
+    args.push("-R");
+  }
   args.push(options.host, String(options.port));
   args.push(...options.files);
   return args;
@@ -33317,6 +33318,9 @@ async function storescu(options) {
   if (result.value.exitCode !== 0) {
     return err(createToolError("storescu", args, result.value.exitCode, result.value.stderr));
   }
+  if (DIMSE_ERROR_PATTERN.test(result.value.stderr)) {
+    return err(createToolError("storescu", args, 0, result.value.stderr));
+  }
   return ok({ success: true, stdout: result.value.stdout, stderr: result.value.stderr });
 }
 var QueryModel = {
@@ -36867,8 +36871,8 @@ var DicomSenderOptionsSchema = z.object({
   acseTimeout: z.number().int().positive().optional(),
   dimseTimeout: z.number().int().positive().optional(),
   noHostnameLookup: z.boolean().optional(),
-  noUidChecks: z.boolean().optional(),
   verbosity: z.enum(["verbose", "debug"]).optional(),
+  required: z.boolean().optional(),
   signal: z.instanceof(AbortSignal).optional()
 }).strict();
 function resolveConfig(options) {
@@ -36971,7 +36975,8 @@ var DicomSender = class _DicomSender extends EventEmitter {
       timeoutMs: options?.timeoutMs ?? this.defaultTimeoutMs,
       maxRetries: options?.maxRetries ?? this.defaultMaxRetries,
       calledAETitle: options?.calledAETitle,
-      callingAETitle: options?.callingAETitle
+      callingAETitle: options?.callingAETitle,
+      required: options?.required
     };
     return this.dispatchSend(files, params);
   }
@@ -37090,6 +37095,7 @@ var DicomSender = class _DicomSender extends EventEmitter {
         maxRetries: params.maxRetries,
         calledAETitle: params.calledAETitle,
         callingAETitle: params.callingAETitle,
+        required: params.required,
         resolve
       };
       if (this.activeAssociations < this.effectiveMaxAssociations) {
@@ -37118,8 +37124,8 @@ var DicomSender = class _DicomSender extends EventEmitter {
         resolve(err(new Error("DicomSender: queue full")));
         return;
       }
-      const { timeoutMs, maxRetries, calledAETitle, callingAETitle } = params;
-      this.currentBucket.push({ files, resolve, timeoutMs, maxRetries, calledAETitle, callingAETitle });
+      const { timeoutMs, maxRetries, calledAETitle, callingAETitle, required } = params;
+      this.currentBucket.push({ files, resolve, timeoutMs, maxRetries, calledAETitle, callingAETitle, required });
       const totalFiles = this.countBucketFiles();
       if (totalFiles >= this.maxBucketSize) {
         this.clearBucketTimer();
@@ -37137,36 +37143,39 @@ var DicomSender = class _DicomSender extends EventEmitter {
     }
     return count;
   }
-  /** Flushes the current bucket: combines all files, dispatches as one send. */
-  flushBucketInternal(reason) {
-    if (this.currentBucket.length === 0) return;
-    const entries = [...this.currentBucket];
-    this.currentBucket = [];
+  /** Merges bucket entries into a single QueueEntry. */
+  mergeBucketEntries(entries) {
     const allFiles = [];
+    let timeoutMs = 0;
+    let maxRetries = 0;
     for (let i = 0; i < entries.length; i++) {
       for (let j = 0; j < entries[i].files.length; j++) {
         allFiles.push(entries[i].files[j]);
       }
-    }
-    let timeoutMs = 0;
-    let maxRetries = 0;
-    for (let i = 0; i < entries.length; i++) {
       if (entries[i].timeoutMs > timeoutMs) timeoutMs = entries[i].timeoutMs;
       if (entries[i].maxRetries > maxRetries) maxRetries = entries[i].maxRetries;
     }
-    this.emit("BUCKET_FLUSHED", { fileCount: allFiles.length, reason });
-    const bucketEntry = {
+    return {
       files: allFiles,
       timeoutMs,
       maxRetries,
       calledAETitle: entries[0]?.calledAETitle,
       callingAETitle: entries[0]?.callingAETitle,
+      required: entries[0]?.required,
       resolve: (result) => {
         for (let i = 0; i < entries.length; i++) {
           entries[i].resolve(result);
         }
       }
     };
+  }
+  /** Flushes the current bucket: combines all files, dispatches as one send. */
+  flushBucketInternal(reason) {
+    if (this.currentBucket.length === 0) return;
+    const entries = [...this.currentBucket];
+    this.currentBucket = [];
+    const bucketEntry = this.mergeBucketEntries(entries);
+    this.emit("BUCKET_FLUSHED", { fileCount: bucketEntry.files.length, reason });
     if (this.activeAssociations < this.effectiveMaxAssociations) {
       void this.executeEntry(bucketEntry);
     } else {
@@ -37247,8 +37256,8 @@ var DicomSender = class _DicomSender extends EventEmitter {
       acseTimeout: this.options.acseTimeout,
       dimseTimeout: this.options.dimseTimeout,
       noHostnameLookup: this.options.noHostnameLookup,
-      noUidChecks: this.options.noUidChecks,
       verbosity: this.options.verbosity,
+      required: entry.required ?? this.options.required,
       timeoutMs: entry.timeoutMs,
       signal: this.options.signal
     });