@ubercode/dcmtk 0.7.0 → 0.7.2

package/dist/index.cjs

@@ -33257,7 +33257,7 @@ var StorescuOptionsSchema = zod.z.object({
   acseTimeout: zod.z.number().int().positive().optional(),
   dimseTimeout: zod.z.number().int().positive().optional(),
   noHostnameLookup: zod.z.boolean().optional(),
-  noUidChecks: zod.z.boolean().optional(),
+  required: zod.z.boolean().optional(),
   proposedTransferSyntax: zod.z.enum([
     "uncompressed",
     "littleEndian",
@@ -33273,6 +33273,7 @@ var StorescuOptionsSchema = zod.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]);
@@ -33299,9 +33300,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);
   }
@@ -33317,6 +33315,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;
@@ -33342,6 +33343,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 = {
@@ -36892,8 +36896,8 @@ var DicomSenderOptionsSchema = zod.z.object({
   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(),
+  required: zod.z.boolean().optional(),
   signal: zod.z.instanceof(AbortSignal).optional()
 }).strict();
 function resolveConfig(options) {
@@ -36996,7 +37000,8 @@ var DicomSender = class _DicomSender extends events.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);
   }
@@ -37115,6 +37120,7 @@ var DicomSender = class _DicomSender extends events.EventEmitter {
         maxRetries: params.maxRetries,
         calledAETitle: params.calledAETitle,
         callingAETitle: params.callingAETitle,
+        required: params.required,
         resolve
       };
       if (this.activeAssociations < this.effectiveMaxAssociations) {
@@ -37143,8 +37149,8 @@ var DicomSender = class _DicomSender extends events.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();
@@ -37162,36 +37168,39 @@ var DicomSender = class _DicomSender extends events.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 {
@@ -37272,8 +37281,8 @@ var DicomSender = class _DicomSender extends events.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
     });