@ubercode/dcmtk 0.7.1 → 0.7.3

package/dist/tools.d.cts

@@ -1433,6 +1433,17 @@ declare const ProposedTransferSyntax: {
     readonly J2K_LOSSY: "j2kLossy";
     readonly JLS_LOSSLESS: "jlsLossless";
     readonly JLS_LOSSY: "jlsLossy";
+    readonly MPEG2: "mpeg2";
+    readonly MPEG2_HIGH: "mpeg2High";
+    readonly MPEG4: "mpeg4";
+    readonly MPEG4_BD: "mpeg4Bd";
+    readonly MPEG4_2_2D: "mpeg4_2_2d";
+    readonly MPEG4_2_3D: "mpeg4_2_3d";
+    readonly MPEG4_2_ST: "mpeg4_2_st";
+    readonly HEVC: "hevc";
+    readonly HEVC10: "hevc10";
+    readonly RLE: "rle";
+    readonly DEFLATED: "deflated";
 };
 type ProposedTransferSyntaxValue = (typeof ProposedTransferSyntax)[keyof typeof ProposedTransferSyntax];
 /** Options for {@link storescu}. */
@@ -1451,8 +1462,10 @@ interface StorescuOptions extends ToolBaseOptions {
     readonly scanDirectories?: boolean | undefined;
     /** Recurse into subdirectories (requires scanDirectories). */
     readonly recurse?: boolean | undefined;
-    /** Proposed transfer syntax for the association. */
-    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | undefined;
+    /** Proposed transfer syntax(es) for the association. 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;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
     /** Maximum receive PDU size in bytes (4096–131072). Maps to `--max-pdu`. */
@@ -1467,6 +1480,8 @@ interface StorescuOptions extends ToolBaseOptions {
     readonly dimseTimeout?: number | undefined;
     /** Disable hostname lookup for incoming associations. Maps to `-nh`. */
     readonly noHostnameLookup?: boolean | undefined;
+    /** Propose only the file's native transfer syntax. Maps to `-R`/`--required`. */
+    readonly required?: boolean | undefined;
 }
 /** Result of a successful C-STORE send. */
 interface StorescuResult {

package/dist/tools.d.ts

@@ -1433,6 +1433,17 @@ declare const ProposedTransferSyntax: {
     readonly J2K_LOSSY: "j2kLossy";
     readonly JLS_LOSSLESS: "jlsLossless";
     readonly JLS_LOSSY: "jlsLossy";
+    readonly MPEG2: "mpeg2";
+    readonly MPEG2_HIGH: "mpeg2High";
+    readonly MPEG4: "mpeg4";
+    readonly MPEG4_BD: "mpeg4Bd";
+    readonly MPEG4_2_2D: "mpeg4_2_2d";
+    readonly MPEG4_2_3D: "mpeg4_2_3d";
+    readonly MPEG4_2_ST: "mpeg4_2_st";
+    readonly HEVC: "hevc";
+    readonly HEVC10: "hevc10";
+    readonly RLE: "rle";
+    readonly DEFLATED: "deflated";
 };
 type ProposedTransferSyntaxValue = (typeof ProposedTransferSyntax)[keyof typeof ProposedTransferSyntax];
 /** Options for {@link storescu}. */
@@ -1451,8 +1462,10 @@ interface StorescuOptions extends ToolBaseOptions {
     readonly scanDirectories?: boolean | undefined;
     /** Recurse into subdirectories (requires scanDirectories). */
     readonly recurse?: boolean | undefined;
-    /** Proposed transfer syntax for the association. */
-    readonly proposedTransferSyntax?: ProposedTransferSyntaxValue | undefined;
+    /** Proposed transfer syntax(es) for the association. 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;
     /** Verbosity level for diagnostic output. `'verbose'` maps to `-v`, `'debug'` maps to `-d`. */
     readonly verbosity?: 'verbose' | 'debug' | undefined;
     /** Maximum receive PDU size in bytes (4096–131072). Maps to `--max-pdu`. */
@@ -1467,6 +1480,8 @@ interface StorescuOptions extends ToolBaseOptions {
     readonly dimseTimeout?: number | undefined;
     /** Disable hostname lookup for incoming associations. Maps to `-nh`. */
     readonly noHostnameLookup?: boolean | undefined;
+    /** Propose only the file's native transfer syntax. Maps to `-R`/`--required`. */
+    readonly required?: boolean | undefined;
 }
 /** Result of a successful C-STORE send. */
 interface StorescuResult {

package/dist/tools.js

@@ -2292,7 +2292,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=",
@@ -2305,8 +2316,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(),
@@ -2324,21 +2347,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]);
@@ -2378,7 +2401,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);
@@ -2405,6 +2434,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 = {