@ubercode/dcmtk 0.7.1 → 0.7.3

package/dist/index.d.cts

@@ -263,8 +263,10 @@ interface DicomSenderOptions {
     readonly mode?: SenderModeValue | undefined;
     /** Maximum concurrent storescu associations. Defaults to 4 (forced to 1 in single mode). */
     readonly maxAssociations?: number | undefined;
-    /** Proposed transfer syntax for associations. */
-    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | undefined;
+    /** Proposed transfer syntax(es) for associations. Pass an array to propose multiple. */
+    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | readonly ProposedTransferSyntaxValue[] | undefined;
+    /** Combine proposed transfer syntaxes into fewer presentation contexts. Maps to `+C`/`--combine`. */
+    readonly combineProposedTransferSyntaxes?: boolean | undefined;
     /** Maximum queued send requests before rejecting. Defaults to 1000. */
     readonly maxQueueLength?: number | undefined;
     /** Per-storescu timeout in milliseconds. Defaults to 30000. */
@@ -291,6 +293,8 @@ interface DicomSenderOptions {
     readonly noHostnameLookup?: 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;
 }
@@ -304,6 +308,12 @@ 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;
+    /** Override proposed transfer syntax(es) for this send. */
+    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | readonly ProposedTransferSyntaxValue[] | undefined;
+    /** Override combine proposed transfer syntaxes for this send. */
+    readonly combineProposedTransferSyntaxes?: boolean | undefined;
 }
 /** Result of a successful send operation. */
 interface SendResult {
@@ -476,6 +486,8 @@ declare class DicomSender extends EventEmitter<DicomSenderEventMap> {
      * @returns A Result containing the send result or an error
      */
     send(files: readonly string[], options?: SendOptions): Promise<Result<SendResult>>;
+    /** Builds SendParams from per-send options, applying instance defaults. */
+    private buildSendParams;
     /** Dispatches a send to the appropriate mode handler. */
     private dispatchSend;
     /**
@@ -534,6 +546,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

@@ -263,8 +263,10 @@ interface DicomSenderOptions {
     readonly mode?: SenderModeValue | undefined;
     /** Maximum concurrent storescu associations. Defaults to 4 (forced to 1 in single mode). */
     readonly maxAssociations?: number | undefined;
-    /** Proposed transfer syntax for associations. */
-    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | undefined;
+    /** Proposed transfer syntax(es) for associations. Pass an array to propose multiple. */
+    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | readonly ProposedTransferSyntaxValue[] | undefined;
+    /** Combine proposed transfer syntaxes into fewer presentation contexts. Maps to `+C`/`--combine`. */
+    readonly combineProposedTransferSyntaxes?: boolean | undefined;
     /** Maximum queued send requests before rejecting. Defaults to 1000. */
     readonly maxQueueLength?: number | undefined;
     /** Per-storescu timeout in milliseconds. Defaults to 30000. */
@@ -291,6 +293,8 @@ interface DicomSenderOptions {
     readonly noHostnameLookup?: 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;
 }
@@ -304,6 +308,12 @@ 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;
+    /** Override proposed transfer syntax(es) for this send. */
+    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | readonly ProposedTransferSyntaxValue[] | undefined;
+    /** Override combine proposed transfer syntaxes for this send. */
+    readonly combineProposedTransferSyntaxes?: boolean | undefined;
 }
 /** Result of a successful send operation. */
 interface SendResult {
@@ -476,6 +486,8 @@ declare class DicomSender extends EventEmitter<DicomSenderEventMap> {
      * @returns A Result containing the send result or an error
      */
     send(files: readonly string[], options?: SendOptions): Promise<Result<SendResult>>;
+    /** Builds SendParams from per-send options, applying instance defaults. */
+    private buildSendParams;
     /** Dispatches a send to the appropriate mode handler. */
     private dispatchSend;
     /**
@@ -534,6 +546,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

@@ -33200,7 +33200,18 @@ var ProposedTransferSyntax = {
   J2K_LOSSLESS: "j2kLossless",
   J2K_LOSSY: "j2kLossy",
   JLS_LOSSLESS: "jlsLossless",
-  JLS_LOSSY: "jlsLossy"
+  JLS_LOSSY: "jlsLossy",
+  MPEG2: "mpeg2",
+  MPEG2_HIGH: "mpeg2High",
+  MPEG4: "mpeg4",
+  MPEG4_BD: "mpeg4Bd",
+  MPEG4_2_2D: "mpeg4_2_2d",
+  MPEG4_2_3D: "mpeg4_2_3d",
+  MPEG4_2_ST: "mpeg4_2_st",
+  HEVC: "hevc",
+  HEVC10: "hevc10",
+  RLE: "rle",
+  DEFLATED: "deflated"
 };
 var PROPOSED_TS_FLAG_MAP = {
   [ProposedTransferSyntax.UNCOMPRESSED]: "-x=",
@@ -33213,8 +33224,20 @@ var PROPOSED_TS_FLAG_MAP = {
   [ProposedTransferSyntax.J2K_LOSSLESS]: "-xv",
   [ProposedTransferSyntax.J2K_LOSSY]: "-xw",
   [ProposedTransferSyntax.JLS_LOSSLESS]: "-xt",
-  [ProposedTransferSyntax.JLS_LOSSY]: "-xu"
+  [ProposedTransferSyntax.JLS_LOSSY]: "-xu",
+  [ProposedTransferSyntax.MPEG2]: "-xm",
+  [ProposedTransferSyntax.MPEG2_HIGH]: "-xh",
+  [ProposedTransferSyntax.MPEG4]: "-xn",
+  [ProposedTransferSyntax.MPEG4_BD]: "-xl",
+  [ProposedTransferSyntax.MPEG4_2_2D]: "-x2",
+  [ProposedTransferSyntax.MPEG4_2_3D]: "-x3",
+  [ProposedTransferSyntax.MPEG4_2_ST]: "-xo",
+  [ProposedTransferSyntax.HEVC]: "-x4",
+  [ProposedTransferSyntax.HEVC10]: "-x5",
+  [ProposedTransferSyntax.RLE]: "-xr",
+  [ProposedTransferSyntax.DEFLATED]: "-xd"
 };
+var PROPOSED_TS_VALUES = Object.values(ProposedTransferSyntax);
 var StorescuOptionsSchema = z.object({
   timeoutMs: z.number().int().positive().optional(),
   signal: z.instanceof(AbortSignal).optional(),
@@ -33232,21 +33255,21 @@ var StorescuOptionsSchema = z.object({
   acseTimeout: z.number().int().positive().optional(),
   dimseTimeout: z.number().int().positive().optional(),
   noHostnameLookup: z.boolean().optional(),
-  proposedTransferSyntax: z.enum([
-    "uncompressed",
-    "littleEndian",
-    "bigEndian",
-    "implicitVR",
-    "jpegLossless",
-    "jpeg8Bit",
-    "jpeg12Bit",
-    "j2kLossless",
-    "j2kLossy",
-    "jlsLossless",
-    "jlsLossy"
-  ]).optional()
+  required: z.boolean().optional(),
+  proposedTransferSyntax: z.union([z.enum(PROPOSED_TS_VALUES), z.array(z.enum(PROPOSED_TS_VALUES)).min(1)]).optional(),
+  combineProposedTransferSyntaxes: z.boolean().optional()
 }).strict();
+function pushProposedTsArgs(args, ts) {
+  if (typeof ts === "string") {
+    args.push(PROPOSED_TS_FLAG_MAP[ts]);
+  } else {
+    for (let i = 0; i < ts.length; i++) {
+      args.push(PROPOSED_TS_FLAG_MAP[ts[i]]);
+    }
+  }
+}
 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]);
@@ -33286,7 +33309,13 @@ function buildArgs34(options) {
     args.push("+r");
   }
   if (options.proposedTransferSyntax !== void 0) {
-    args.push(PROPOSED_TS_FLAG_MAP[options.proposedTransferSyntax]);
+    pushProposedTsArgs(args, options.proposedTransferSyntax);
+  }
+  if (options.combineProposedTransferSyntaxes === true) {
+    args.push("+C");
+  }
+  if (options.required === true) {
+    args.push("-R");
   }
   args.push(options.host, String(options.port));
   args.push(...options.files);
@@ -33313,6 +33342,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 = {
@@ -36838,19 +36870,8 @@ var DicomSenderOptionsSchema = z.object({
   callingAETitle: z.string().min(1).max(16).refine(isValidAETitle, { message: "AE Title contains invalid characters" }).optional(),
   mode: z.enum(["single", "multiple", "bucket"]).optional(),
   maxAssociations: z.number().int().min(1).max(MAX_ASSOCIATIONS_LIMIT).optional(),
-  proposedTransferSyntax: z.enum([
-    "uncompressed",
-    "littleEndian",
-    "bigEndian",
-    "implicitVR",
-    "jpegLossless",
-    "jpeg8Bit",
-    "jpeg12Bit",
-    "j2kLossless",
-    "j2kLossy",
-    "jlsLossless",
-    "jlsLossy"
-  ]).optional(),
+  proposedTransferSyntax: z.union([z.enum(PROPOSED_TS_VALUES), z.array(z.enum(PROPOSED_TS_VALUES)).min(1)]).optional(),
+  combineProposedTransferSyntaxes: z.boolean().optional(),
   maxQueueLength: z.number().int().min(1).optional(),
   timeoutMs: z.number().int().positive().optional(),
   maxRetries: z.number().int().min(0).optional(),
@@ -36864,6 +36885,7 @@ var DicomSenderOptionsSchema = z.object({
   dimseTimeout: z.number().int().positive().optional(),
   noHostnameLookup: z.boolean().optional(),
   verbosity: z.enum(["verbose", "debug"]).optional(),
+  required: z.boolean().optional(),
   signal: z.instanceof(AbortSignal).optional()
 }).strict();
 function resolveConfig(options) {
@@ -36962,13 +36984,19 @@ var DicomSender = class _DicomSender extends EventEmitter {
     if (files.length === 0) {
       return Promise.resolve(err(new Error("DicomSender: no files provided")));
     }
-    const params = {
+    return this.dispatchSend(files, this.buildSendParams(options));
+  }
+  /** Builds SendParams from per-send options, applying instance defaults. */
+  buildSendParams(options) {
+    return {
       timeoutMs: options?.timeoutMs ?? this.defaultTimeoutMs,
       maxRetries: options?.maxRetries ?? this.defaultMaxRetries,
       calledAETitle: options?.calledAETitle,
-      callingAETitle: options?.callingAETitle
+      callingAETitle: options?.callingAETitle,
+      required: options?.required,
+      proposedTransferSyntax: options?.proposedTransferSyntax,
+      combineProposedTransferSyntaxes: options?.combineProposedTransferSyntaxes
     };
-    return this.dispatchSend(files, params);
   }
   /** Dispatches a send to the appropriate mode handler. */
   dispatchSend(files, params) {
@@ -37085,6 +37113,9 @@ var DicomSender = class _DicomSender extends EventEmitter {
         maxRetries: params.maxRetries,
         calledAETitle: params.calledAETitle,
         callingAETitle: params.callingAETitle,
+        required: params.required,
+        proposedTransferSyntax: params.proposedTransferSyntax,
+        combineProposedTransferSyntaxes: params.combineProposedTransferSyntaxes,
         resolve
       };
       if (this.activeAssociations < this.effectiveMaxAssociations) {
@@ -37113,8 +37144,18 @@ 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, proposedTransferSyntax, combineProposedTransferSyntaxes } = params;
+      this.currentBucket.push({
+        files,
+        resolve,
+        timeoutMs,
+        maxRetries,
+        calledAETitle,
+        callingAETitle,
+        required,
+        proposedTransferSyntax,
+        combineProposedTransferSyntaxes
+      });
       const totalFiles = this.countBucketFiles();
       if (totalFiles >= this.maxBucketSize) {
         this.clearBucketTimer();
@@ -37132,36 +37173,41 @@ 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,
+      proposedTransferSyntax: entries[0]?.proposedTransferSyntax,
+      combineProposedTransferSyntaxes: entries[0]?.combineProposedTransferSyntaxes,
       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 {
@@ -37235,7 +37281,8 @@ var DicomSender = class _DicomSender extends EventEmitter {
       files: [...entry.files],
       calledAETitle: entry.calledAETitle ?? this.options.calledAETitle,
       callingAETitle: entry.callingAETitle ?? this.options.callingAETitle,
-      proposedTransferSyntax: this.options.proposedTransferSyntax,
+      proposedTransferSyntax: entry.proposedTransferSyntax ?? this.options.proposedTransferSyntax,
+      combineProposedTransferSyntaxes: entry.combineProposedTransferSyntaxes ?? this.options.combineProposedTransferSyntaxes,
       maxPduReceive: this.options.maxPduReceive,
       maxPduSend: this.options.maxPduSend,
       associationTimeout: this.options.associationTimeout,
@@ -37243,6 +37290,7 @@ var DicomSender = class _DicomSender extends EventEmitter {
       dimseTimeout: this.options.dimseTimeout,
       noHostnameLookup: this.options.noHostnameLookup,
       verbosity: this.options.verbosity,
+      required: entry.required ?? this.options.required,
       timeoutMs: entry.timeoutMs,
       signal: this.options.signal
     });