@medplum/agent 4.2.0 → 4.2.2

package/dist/cjs/index.cjs

@@ -1634,7 +1634,7 @@ var require_dbcs_codec = __commonJS({
             } else if (4080 < code && code <= 4095) {
               var len = 4095 - code + 2;
               var seq = [];
-              for (var m2 = 0; m2 < len; m2++)
+              for (var m = 0; m < len; m++)
                 seq.push(part.charCodeAt(l3++));
               writeTable[curAddr++] = SEQ_START - this.decodeTableSeq.length;
               this.decodeTableSeq.push(seq);
@@ -7947,9 +7947,9 @@ var require_dcmjs = __commonJS({
       const d_code = (dist2) => {
         return dist2 < 256 ? _dist_code[dist2] : _dist_code[256 + (dist2 >>> 7)];
       };
-      const put_short = (s, w2) => {
-        s.pending_buf[s.pending++] = w2 & 255;
-        s.pending_buf[s.pending++] = w2 >>> 8 & 255;
+      const put_short = (s, w3) => {
+        s.pending_buf[s.pending++] = w3 & 255;
+        s.pending_buf[s.pending++] = w3 >>> 8 & 255;
       };
       const send_bits = (s, value, length2) => {
         if (s.bi_valid > Buf_size - length2) {
@@ -7999,7 +7999,7 @@ var require_dcmjs = __commonJS({
         const base = desc.stat_desc.extra_base;
         const max_length = desc.stat_desc.max_length;
         let h4;
-        let n, m2;
+        let n, m;
         let bits;
         let xbits;
         let f3;
@@ -8046,13 +8046,13 @@ var require_dcmjs = __commonJS({
         for (bits = max_length; bits !== 0; bits--) {
           n = s.bl_count[bits];
           while (n !== 0) {
-            m2 = s.heap[--h4];
-            if (m2 > max_code) {
+            m = s.heap[--h4];
+            if (m > max_code) {
               continue;
             }
-            if (tree[m2 * 2 + 1] !== bits) {
-              s.opt_len += (bits - tree[m2 * 2 + 1]) * tree[m2 * 2];
-              tree[m2 * 2 + 1] = bits;
+            if (tree[m * 2 + 1] !== bits) {
+              s.opt_len += (bits - tree[m * 2 + 1]) * tree[m * 2];
+              tree[m * 2 + 1] = bits;
             }
             n--;
           }
@@ -8161,10 +8161,10 @@ var require_dcmjs = __commonJS({
         s.bi_buf = 0;
         s.bi_valid = 0;
       };
-      const smaller = (tree, n, m2, depth) => {
+      const smaller = (tree, n, m, depth) => {
         const _n2 = n * 2;
-        const _m2 = m2 * 2;
-        return tree[_n2] < tree[_m2] || tree[_n2] === tree[_m2] && depth[n] <= depth[m2];
+        const _m2 = m * 2;
+        return tree[_n2] < tree[_m2] || tree[_n2] === tree[_m2] && depth[n] <= depth[m];
       };
       const pqdownheap = (s, tree, k2) => {
         const v3 = s.heap[k2];
@@ -8221,7 +8221,7 @@ var require_dcmjs = __commonJS({
         const stree = desc.stat_desc.static_tree;
         const has_stree = desc.stat_desc.has_stree;
         const elems = desc.stat_desc.elems;
-        let n, m2;
+        let n, m;
         let max_code = -1;
         let node;
         s.heap_len = 0;
@@ -8263,15 +8263,15 @@ var require_dcmjs = __commonJS({
             1
             /*SMALLEST*/
           );
-          m2 = s.heap[
+          m = s.heap[
             1
             /*SMALLEST*/
           ];
           s.heap[--s.heap_max] = n;
-          s.heap[--s.heap_max] = m2;
-          tree[node * 2] = tree[n * 2] + tree[m2 * 2];
-          s.depth[node] = (s.depth[n] >= s.depth[m2] ? s.depth[n] : s.depth[m2]) + 1;
-          tree[n * 2 + 1] = tree[m2 * 2 + 1] = node;
+          s.heap[--s.heap_max] = m;
+          tree[node * 2] = tree[n * 2] + tree[m * 2];
+          s.depth[node] = (s.depth[n] >= s.depth[m] ? s.depth[n] : s.depth[m]) + 1;
+          tree[n * 2 + 1] = tree[m * 2 + 1] = node;
           s.heap[
             1
             /*SMALLEST*/
@@ -8671,20 +8671,20 @@ var require_dcmjs = __commonJS({
         }
       };
       const slide_hash = (s) => {
-        let n, m2;
+        let n, m;
         let p;
         let wsize = s.w_size;
         n = s.hash_size;
         p = n;
         do {
-          m2 = s.head[--p];
-          s.head[p] = m2 >= wsize ? m2 - wsize : 0;
+          m = s.head[--p];
+          s.head[p] = m >= wsize ? m - wsize : 0;
         } while (--n);
         n = wsize;
         p = n;
         do {
-          m2 = s.prev[--p];
-          s.prev[p] = m2 >= wsize ? m2 - wsize : 0;
+          m = s.prev[--p];
+          s.prev[p] = m >= wsize ? m - wsize : 0;
         } while (--n);
       };
       let HASH_ZLIB = (s, prev, data3) => (prev << s.hash_shift ^ data3) & s.hash_mask;
@@ -14032,8 +14032,8 @@ var require_dcmjs = __commonJS({
                   if (undef) {
                     var stack = 0;
                     while (1) {
-                      var g2 = stream.readUint16();
-                      if (g2 == 65534) {
+                      var g3 = stream.readUint16();
+                      if (g3 == 65534) {
                         var ge2 = stream.readUint16();
                         var itemLength = stream.readUint32();
                         stream.increment(-4);
@@ -19469,10 +19469,10 @@ var require_dcmjs = __commonJS({
         var sharedImageOrientationPatient = SharedFunctionalGroupsSequence.PlaneOrientationSequence ? SharedFunctionalGroupsSequence.PlaneOrientationSequence.ImageOrientationPatient : void 0;
         var sliceLength = Columns * Rows;
         var arrayBufferLength = sliceLength * imageIds.length * 2;
-        var M2 = 1;
-        var m2 = 0;
-        var tempBuffer = labelmapBufferArray[m2].slice(0);
-        var tempSegmentsOnFrame = cloneDeep(segmentsOnFrameArray[m2]);
+        var M = 1;
+        var m = 0;
+        var tempBuffer = labelmapBufferArray[m].slice(0);
+        var tempSegmentsOnFrame = cloneDeep(segmentsOnFrameArray[m]);
         var numberOfSegs = multiframe.SegmentSequence.length;
         for (var segmentIndexToProcess = 1; segmentIndexToProcess <= numberOfSegs; ++segmentIndexToProcess) {
           var _loop4 = function _loop42(_i2) {
@@ -19517,14 +19517,14 @@ var require_dcmjs = __commonJS({
             for (var j = 0, len2 = alignedPixelDataI.data.length; j < len2; ++j) {
               if (data3[j]) {
                 if (labelmap2DView[j] !== 0) {
-                  m2++;
-                  if (m2 >= M2) {
-                    labelmapBufferArray[m2] = new ArrayBuffer(arrayBufferLength);
-                    segmentsOnFrameArray[m2] = [];
-                    M2++;
+                  m++;
+                  if (m >= M) {
+                    labelmapBufferArray[m] = new ArrayBuffer(arrayBufferLength);
+                    segmentsOnFrameArray[m] = [];
+                    M++;
                   }
-                  tempBuffer = labelmapBufferArray[m2].slice(0);
-                  tempSegmentsOnFrame = cloneDeep(segmentsOnFrameArray[m2]);
+                  tempBuffer = labelmapBufferArray[m].slice(0);
+                  tempSegmentsOnFrame = cloneDeep(segmentsOnFrameArray[m]);
                   _i2 = 0;
                   break;
                 } else {
@@ -19549,11 +19549,11 @@ var require_dcmjs = __commonJS({
             _ret2 = _loop4(i2);
             if (_ret2 === 0) continue;
           }
-          labelmapBufferArray[m2] = tempBuffer.slice(0);
-          segmentsOnFrameArray[m2] = cloneDeep(tempSegmentsOnFrame);
-          m2 = 0;
-          tempBuffer = labelmapBufferArray[m2].slice(0);
-          tempSegmentsOnFrame = cloneDeep(segmentsOnFrameArray[m2]);
+          labelmapBufferArray[m] = tempBuffer.slice(0);
+          segmentsOnFrameArray[m] = cloneDeep(tempSegmentsOnFrame);
+          m = 0;
+          tempBuffer = labelmapBufferArray[m].slice(0);
+          tempSegmentsOnFrame = cloneDeep(segmentsOnFrameArray[m]);
         }
       }
       var getSegmentIndex = function getSegmentIndex2(multiframe, frame) {
@@ -20778,20 +20778,20 @@ var require_dcmjs = __commonJS({
         out[2] = z2 * scale2;
         return out;
       }
-      function transformMat4(out, a2, m2) {
+      function transformMat4(out, a2, m) {
         var x = a2[0], y3 = a2[1], z2 = a2[2];
-        var w2 = m2[3] * x + m2[7] * y3 + m2[11] * z2 + m2[15];
-        w2 = w2 || 1;
-        out[0] = (m2[0] * x + m2[4] * y3 + m2[8] * z2 + m2[12]) / w2;
-        out[1] = (m2[1] * x + m2[5] * y3 + m2[9] * z2 + m2[13]) / w2;
-        out[2] = (m2[2] * x + m2[6] * y3 + m2[10] * z2 + m2[14]) / w2;
+        var w3 = m[3] * x + m[7] * y3 + m[11] * z2 + m[15];
+        w3 = w3 || 1;
+        out[0] = (m[0] * x + m[4] * y3 + m[8] * z2 + m[12]) / w3;
+        out[1] = (m[1] * x + m[5] * y3 + m[9] * z2 + m[13]) / w3;
+        out[2] = (m[2] * x + m[6] * y3 + m[10] * z2 + m[14]) / w3;
         return out;
       }
-      function transformMat3(out, a2, m2) {
+      function transformMat3(out, a2, m) {
         var x = a2[0], y3 = a2[1], z2 = a2[2];
-        out[0] = x * m2[0] + y3 * m2[3] + z2 * m2[6];
-        out[1] = x * m2[1] + y3 * m2[4] + z2 * m2[7];
-        out[2] = x * m2[2] + y3 * m2[5] + z2 * m2[8];
+        out[0] = x * m[0] + y3 * m[3] + z2 * m[6];
+        out[1] = x * m[1] + y3 * m[4] + z2 * m[7];
+        out[2] = x * m[2] + y3 * m[5] + z2 * m[8];
         return out;
       }
       function transformQuat(out, a2, q2) {
@@ -20799,10 +20799,10 @@ var require_dcmjs = __commonJS({
         var x = a2[0], y3 = a2[1], z2 = a2[2];
         var uvx = qy * z2 - qz * y3, uvy = qz * x - qx * z2, uvz = qx * y3 - qy * x;
         var uuvx = qy * uvz - qz * uvy, uuvy = qz * uvx - qx * uvz, uuvz = qx * uvy - qy * uvx;
-        var w2 = qw * 2;
-        uvx *= w2;
-        uvy *= w2;
-        uvz *= w2;
+        var w22 = qw * 2;
+        uvx *= w22;
+        uvy *= w22;
+        uvz *= w22;
         uuvx *= 2;
         uuvy *= 2;
         uuvz *= 2;
@@ -26162,7 +26162,7 @@ var require_dcmjs_codecs_min = __commonJS({
         "use strict";
         e.exports = __WEBPACK_EXTERNAL_MODULE__111__;
       }, 190: (e, t, r6) => {
-        const { Implementation: s, StorageClass: o, TranscodeMap: i2, TransferSyntax: n } = r6(492), { Codec: a2 } = r6(258), l3 = r6(111), { DicomDict: c, DicomMessage: d3, DicomMetaDictionary: p, ReadBufferStream: h3, WriteBufferStream: m2 } = l3.data, u2 = l3.log;
+        const { Implementation: s, StorageClass: o, TranscodeMap: i2, TransferSyntax: n } = r6(492), { Codec: a2 } = r6(258), l3 = r6(111), { DicomDict: c, DicomMessage: d3, DicomMetaDictionary: p, ReadBufferStream: h3, WriteBufferStream: m } = l3.data, u2 = l3.log;
         e.exports = class {
           constructor(e2, t2, r7 = {}) {
             r7 = { ignoreErrors: true, ...r7 }, u2.level = "error", this.transferSyntaxUid = t2 || n.ImplicitVRLittleEndian, e2 instanceof ArrayBuffer ? t2 ? this._fromElementsBuffer(e2, t2, r7) : this._fromP10Buffer(e2) : this.elements = e2 || {};
@@ -26195,7 +26195,7 @@ var require_dcmjs_codecs_min = __commonJS({
           }
           getDicomDataset(e2, t2) {
             e2 = { fragmentMultiframe: false, ...e2 };
-            const r7 = t2 ? p.denaturalizeDataset(this.getElements(), { ...p.nameMap, ...t2 }) : p.denaturalizeDataset(this.getElements()), s2 = new m2();
+            const r7 = t2 ? p.denaturalizeDataset(this.getElements(), { ...p.nameMap, ...t2 }) : p.denaturalizeDataset(this.getElements()), s2 = new m();
             return d3.write(r7, s2, this.transferSyntaxUid, e2), s2.getBuffer();
           }
           getDicomPart10(e2, t2) {
@@ -26256,7 +26256,7 @@ var require_dcmjs_codecs_min = __commonJS({
             }
             function h3(e3, r8) {
               var n2, a3, l4, d4 = this, h4 = "loglevel";
-              function m3(e4) {
+              function m2(e4) {
                 var r9 = (s2[e4] || "silent").toUpperCase();
                 if (typeof window !== t2 && h4) {
                   try {
@@ -26284,7 +26284,7 @@ var require_dcmjs_codecs_min = __commonJS({
                   return void 0 === d4.levels[e4] && (e4 = void 0), e4;
                 }
               }
-              function g2() {
+              function g3() {
                 if (typeof window !== t2 && h4) {
                   try {
                     window.localStorage.removeItem(h4);
@@ -26304,11 +26304,11 @@ var require_dcmjs_codecs_min = __commonJS({
               "string" == typeof e3 ? h4 += ":" + e3 : "symbol" == typeof e3 && (h4 = void 0), d4.name = e3, d4.levels = { TRACE: 0, DEBUG: 1, INFO: 2, WARN: 3, ERROR: 4, SILENT: 5 }, d4.methodFactory = r8 || p, d4.getLevel = function() {
                 return null != l4 ? l4 : null != a3 ? a3 : n2;
               }, d4.setLevel = function(e4, t3) {
-                return l4 = f3(e4), false !== t3 && m3(l4), c.call(d4);
+                return l4 = f3(e4), false !== t3 && m2(l4), c.call(d4);
               }, d4.setDefaultLevel = function(e4) {
                 a3 = f3(e4), u2() || d4.setLevel(e4, false);
               }, d4.resetLevel = function() {
-                l4 = null, g2(), c.call(d4);
+                l4 = null, g3(), c.call(d4);
               }, d4.enableAll = function(e4) {
                 d4.setLevel(d4.levels.TRACE, e4);
               }, d4.disableAll = function(e4) {
@@ -26316,17 +26316,17 @@ var require_dcmjs_codecs_min = __commonJS({
               }, d4.rebuild = function() {
                 if (i2 !== d4 && (n2 = f3(i2.getLevel())), c.call(d4), i2 === d4) for (var e4 in o2) o2[e4].rebuild();
               }, n2 = f3(i2 ? i2.getLevel() : "WARN");
-              var w2 = u2();
-              null != w2 && (l4 = f3(w2)), c.call(d4);
+              var w3 = u2();
+              null != w3 && (l4 = f3(w3)), c.call(d4);
             }
             (i2 = new h3()).getLogger = function(e3) {
               if ("symbol" != typeof e3 && "string" != typeof e3 || "" === e3) throw new TypeError("You must supply a name when creating a logger.");
               var t3 = o2[e3];
               return t3 || (t3 = o2[e3] = new h3(e3, i2.methodFactory)), t3;
             };
-            var m2 = typeof window !== t2 ? window.log : void 0;
+            var m = typeof window !== t2 ? window.log : void 0;
             return i2.noConflict = function() {
-              return typeof window !== t2 && window.log === i2 && (window.log = m2), i2;
+              return typeof window !== t2 && window.log === i2 && (window.log = m), i2;
             }, i2.getLoggers = function() {
               return o2;
             }, i2.default = i2, i2;
@@ -26422,11 +26422,11 @@ var require_dcmjs_codecs_min = __commonJS({
         }
         e.exports = o;
       }, 237: (e, t, r6) => {
-        const { Codec: s, ExplicitVRBigEndianCodec: o, ExplicitVRLittleEndianCodec: i2, HtJpeg2000LosslessCodec: n, HtJpeg2000LosslessRpclCodec: a2, HtJpeg2000LossyCodec: l3, ImplicitVRLittleEndianCodec: c, Jpeg2000LosslessCodec: d3, Jpeg2000LossyCodec: p, JpegBaselineProcess1Codec: h3, JpegLosslessProcess14V1Codec: m2, JpegLsLosslessCodec: u2, JpegLsLossyCodec: g2, RleLosslessCodec: f3 } = r6(258), { Jpeg2000ProgressionOrder: w2, JpegSampleFactor: P, PhotometricInterpretation: y3, PixelRepresentation: x, PlanarConfiguration: C2, TransferSyntax: b2 } = r6(492), _2 = r6(234), I2 = r6(25), A2 = r6(190), S2 = { codecs: { Codec: s, ExplicitVRBigEndianCodec: o, ExplicitVRLittleEndianCodec: i2, HtJpeg2000LosslessCodec: n, HtJpeg2000LosslessRpclCodec: a2, HtJpeg2000LossyCodec: l3, ImplicitVRLittleEndianCodec: c, Jpeg2000LosslessCodec: d3, Jpeg2000LossyCodec: p, JpegBaselineProcess1Codec: h3, JpegLosslessProcess14V1Codec: m2, JpegLsLosslessCodec: u2, JpegLsLossyCodec: g2, RleLosslessCodec: f3 }, constants: { Jpeg2000ProgressionOrder: w2, JpegSampleFactor: P, PhotometricInterpretation: y3, PixelRepresentation: x, PlanarConfiguration: C2, TransferSyntax: b2 }, Context: _2, log: r6(547), NativeCodecs: I2, Transcoder: A2, version: r6(837) };
+        const { Codec: s, ExplicitVRBigEndianCodec: o, ExplicitVRLittleEndianCodec: i2, HtJpeg2000LosslessCodec: n, HtJpeg2000LosslessRpclCodec: a2, HtJpeg2000LossyCodec: l3, ImplicitVRLittleEndianCodec: c, Jpeg2000LosslessCodec: d3, Jpeg2000LossyCodec: p, JpegBaselineProcess1Codec: h3, JpegLosslessProcess14V1Codec: m, JpegLsLosslessCodec: u2, JpegLsLossyCodec: g3, RleLosslessCodec: f3 } = r6(258), { Jpeg2000ProgressionOrder: w3, JpegSampleFactor: P, PhotometricInterpretation: y3, PixelRepresentation: x, PlanarConfiguration: C2, TransferSyntax: b2 } = r6(492), _2 = r6(234), I2 = r6(25), A2 = r6(190), S2 = { codecs: { Codec: s, ExplicitVRBigEndianCodec: o, ExplicitVRLittleEndianCodec: i2, HtJpeg2000LosslessCodec: n, HtJpeg2000LosslessRpclCodec: a2, HtJpeg2000LossyCodec: l3, ImplicitVRLittleEndianCodec: c, Jpeg2000LosslessCodec: d3, Jpeg2000LossyCodec: p, JpegBaselineProcess1Codec: h3, JpegLosslessProcess14V1Codec: m, JpegLsLosslessCodec: u2, JpegLsLossyCodec: g3, RleLosslessCodec: f3 }, constants: { Jpeg2000ProgressionOrder: w3, JpegSampleFactor: P, PhotometricInterpretation: y3, PixelRepresentation: x, PlanarConfiguration: C2, TransferSyntax: b2 }, Context: _2, log: r6(547), NativeCodecs: I2, Transcoder: A2, version: r6(837) };
         e.exports = S2;
       }, 258: (e, t, r6) => {
         const { Jpeg2000ProgressionOrder: s, JpegSampleFactor: o, PhotometricInterpretation: i2, PlanarConfiguration: n, TransferSyntax: a2 } = r6(492), { FrameConverter: l3, Frames: c } = r6(859), d3 = r6(234), p = r6(25), h3 = r6(984);
-        class m2 {
+        class m {
           encode(e2, t2, r7 = {}) {
             throw new Error("encode should be implemented");
           }
@@ -26434,7 +26434,7 @@ var require_dcmjs_codecs_min = __commonJS({
             throw new Error("decode should be implemented");
           }
           static getCodec(e2) {
-            const t2 = { [a2.ImplicitVRLittleEndian]: u2, [a2.ExplicitVRLittleEndian]: g2, [a2.ExplicitVRBigEndian]: f3, [a2.RleLossless]: w2, [a2.JpegBaselineProcess1]: y3, [a2.JpegLosslessProcess14V1]: x, [a2.JpegLsLossless]: b2, [a2.JpegLsLossy]: _2, [a2.Jpeg2000Lossless]: A2, [a2.Jpeg2000Lossy]: S2, [a2.HtJpeg2000Lossless]: E2, [a2.HtJpeg2000LosslessRpcl]: v2, [a2.HtJpeg2000Lossy]: B2 }[e2];
+            const t2 = { [a2.ImplicitVRLittleEndian]: u2, [a2.ExplicitVRLittleEndian]: g3, [a2.ExplicitVRBigEndian]: f3, [a2.RleLossless]: w3, [a2.JpegBaselineProcess1]: y3, [a2.JpegLosslessProcess14V1]: x, [a2.JpegLsLossless]: b2, [a2.JpegLsLossy]: _2, [a2.Jpeg2000Lossless]: A2, [a2.Jpeg2000Lossy]: S2, [a2.HtJpeg2000Lossless]: E2, [a2.HtJpeg2000LosslessRpcl]: v2, [a2.HtJpeg2000Lossy]: B2 }[e2];
             if (!t2) throw new Error(`Codec for transfer syntax UID ${e2} is not implemented`);
             return new t2();
           }
@@ -26445,9 +26445,9 @@ var require_dcmjs_codecs_min = __commonJS({
               s2.unpackLow16 && (i4 = l3.unpackLow16(i4)), s2.convertYbrFullToRgb && (i4 = l3.ybrFullToRgb(i4)), s2.convertYbrFull422ToRgb && (i4 = l3.ybrFull422ToRgb(i4, o2.getWidth())), s2.updatePlanarConfiguration && (i4 = l3.changePlanarConfiguration(i4, e2.BitsAllocated, e2.SamplesPerPixel, n.Planar));
               const c2 = d3.fromDicomElements(e2);
               c2.setDecodedBuffer(i4);
-              const m3 = p[r7](c2, s2);
-              let u3 = m3.getEncodedBuffer();
-              u3.length % 2 != 0 && (u3 = h3.concatBuffers([u3, Uint8Array.from([0])])), a3.push(u3.buffer.slice(u3.byteOffset, u3.byteOffset + u3.byteLength)), Object.assign(e2, m3.toDicomElements());
+              const m2 = p[r7](c2, s2);
+              let u3 = m2.getEncodedBuffer();
+              u3.length % 2 != 0 && (u3 = h3.concatBuffers([u3, Uint8Array.from([0])])), a3.push(u3.buffer.slice(u3.byteOffset, u3.byteOffset + u3.byteLength)), Object.assign(e2, m2.toDicomElements());
             }
             return e2._vrMap = { PixelData: 1 === o2.getBytesAllocated() ? "OB" : "OW" }, e2.PixelData = a3, e2;
           }
@@ -26456,14 +26456,14 @@ var require_dcmjs_codecs_min = __commonJS({
             for (let t3 = 0; t3 < i3; t3++) {
               const i4 = o2.getFrameBuffer(t3), c2 = d3.fromDicomElements(e2);
               c2.setEncodedBuffer(i4);
-              const m3 = p[r7](c2, s2);
-              let u3 = m3.getDecodedBuffer();
-              u3.length % 2 != 0 && (u3 = h3.concatBuffers([u3, Uint8Array.from([0])])), s2.updatePlanarConfiguration && (u3 = l3.changePlanarConfiguration(u3, e2.BitsAllocated, e2.SamplesPerPixel, n.Interleaved)), a3.push(u3.buffer.slice(u3.byteOffset, u3.byteOffset + u3.byteLength)), Object.assign(e2, m3.toDicomElements());
+              const m2 = p[r7](c2, s2);
+              let u3 = m2.getDecodedBuffer();
+              u3.length % 2 != 0 && (u3 = h3.concatBuffers([u3, Uint8Array.from([0])])), s2.updatePlanarConfiguration && (u3 = l3.changePlanarConfiguration(u3, e2.BitsAllocated, e2.SamplesPerPixel, n.Interleaved)), a3.push(u3.buffer.slice(u3.byteOffset, u3.byteOffset + u3.byteLength)), Object.assign(e2, m2.toDicomElements());
             }
             return e2._vrMap = { PixelData: 1 === o2.getBytesAllocated() ? "OB" : "OW" }, e2.PixelData = [h3.concatBuffers(a3)], e2;
           }
         }
-        class u2 extends m2 {
+        class u2 extends m {
           encode(e2, t2, r7 = {}) {
             return e2;
           }
@@ -26471,7 +26471,7 @@ var require_dcmjs_codecs_min = __commonJS({
             return e2;
           }
         }
-        class g2 extends m2 {
+        class g3 extends m {
           encode(e2, t2, r7 = {}) {
             return e2;
           }
@@ -26479,7 +26479,7 @@ var require_dcmjs_codecs_min = __commonJS({
             return e2;
           }
         }
-        class f3 extends m2 {
+        class f3 extends m {
           encode(e2, t2, r7 = {}) {
             return this._swapPixelData(e2, t2);
           }
@@ -26499,7 +26499,7 @@ var require_dcmjs_codecs_min = __commonJS({
             return e2._vrMap = { PixelData: 1 === r7.getBytesAllocated() ? "OB" : "OW" }, e2.PixelData = [h3.concatBuffers(o2)], e2;
           }
         }
-        class w2 extends m2 {
+        class w3 extends m {
           encode(e2, t2, r7 = {}) {
             return this._baseEncodeImpl(e2, t2, "encodeRle", r7);
           }
@@ -26507,7 +26507,7 @@ var require_dcmjs_codecs_min = __commonJS({
             return this._baseDecodeImpl(e2, t2, "decodeRle", r7);
           }
         }
-        class P extends m2 {
+        class P extends m {
           encode(e2, t2, r7 = {}) {
             const s2 = { ...r7 };
             if (e2.PhotometricInterpretation === i2.YbrIct || e2.PhotometricInterpretation === i2.YbrRct) throw new Error(`Photometric Interpretation ${e2.PhotometricInterpretation} not supported by JPEG encoder`);
@@ -26547,7 +26547,7 @@ var require_dcmjs_codecs_min = __commonJS({
             return super.decode(e2, t2, r7);
           }
         }
-        class C2 extends m2 {
+        class C2 extends m {
           encode(e2, t2, r7 = {}) {
             const s2 = { ...r7 };
             if (e2.PhotometricInterpretation === i2.YbrPartial422 || e2.PhotometricInterpretation === i2.YbrPartial420) throw new Error(`Photometric Interpretation ${e2.PhotometricInterpretation} not supported by JPEG-LS encoder`);
@@ -26586,7 +26586,7 @@ var require_dcmjs_codecs_min = __commonJS({
             return super.decode(e2, t2, r7);
           }
         }
-        class I2 extends m2 {
+        class I2 extends m {
           encode(e2, t2, r7, s2 = {}) {
             const o2 = { ...s2 };
             if (e2.PhotometricInterpretation === i2.YbrPartial422 || e2.PhotometricInterpretation === i2.YbrPartial420) throw new Error(`Photometric Interpretation ${e2.PhotometricInterpretation} not supported by JPEG 2000 encoder`);
@@ -26650,7 +26650,7 @@ var require_dcmjs_codecs_min = __commonJS({
             return super.decode(e2, t2, "decodeHtJpeg2000", r7);
           }
         }
-        e.exports = { Codec: m2, ExplicitVRBigEndianCodec: f3, ExplicitVRLittleEndianCodec: g2, HtJpeg2000LosslessCodec: E2, HtJpeg2000LosslessRpclCodec: v2, HtJpeg2000LossyCodec: B2, ImplicitVRLittleEndianCodec: u2, Jpeg2000LosslessCodec: A2, Jpeg2000LossyCodec: S2, JpegBaselineProcess1Codec: y3, JpegLosslessProcess14V1Codec: x, JpegLsLosslessCodec: b2, JpegLsLossyCodec: _2, RleLosslessCodec: w2 };
+        e.exports = { Codec: m, ExplicitVRBigEndianCodec: f3, ExplicitVRLittleEndianCodec: g3, HtJpeg2000LosslessCodec: E2, HtJpeg2000LosslessRpclCodec: v2, HtJpeg2000LossyCodec: B2, ImplicitVRLittleEndianCodec: u2, Jpeg2000LosslessCodec: A2, Jpeg2000LossyCodec: S2, JpegBaselineProcess1Codec: y3, JpegLosslessProcess14V1Codec: x, JpegLsLosslessCodec: b2, JpegLsLossyCodec: _2, RleLosslessCodec: w3 };
       }, 492: (e) => {
         const t = { ImplicitVRLittleEndian: "1.2.840.10008.1.2", ExplicitVRLittleEndian: "1.2.840.10008.1.2.1", ExplicitVRBigEndian: "1.2.840.10008.1.2.2", RleLossless: "1.2.840.10008.1.2.5", JpegBaselineProcess1: "1.2.840.10008.1.2.4.50", JpegLosslessProcess14V1: "1.2.840.10008.1.2.4.70", JpegLsLossless: "1.2.840.10008.1.2.4.80", JpegLsLossy: "1.2.840.10008.1.2.4.81", Jpeg2000Lossless: "1.2.840.10008.1.2.4.90", Jpeg2000Lossy: "1.2.840.10008.1.2.4.91", JpegXlLossless: "1.2.840.10008.1.2.4.110", JpegXlRecompression: "1.2.840.10008.1.2.4.111", JpegXl: "1.2.840.10008.1.2.4.112", HtJpeg2000Lossless: "1.2.840.10008.1.2.4.201", HtJpeg2000LosslessRpcl: "1.2.840.10008.1.2.4.202", HtJpeg2000Lossy: "1.2.840.10008.1.2.4.203" };
         Object.freeze(t);
@@ -26833,8 +26833,8 @@ var require_dcmjs_codecs_min = __commonJS({
               return function() {
                 for (var t4 = "", n3 = arguments.length, p = Array(n3), h3 = 0; h3 < n3; h3++) p[h3] = arguments[h3];
                 if (a3 || !i2[r9]) {
-                  var m2 = o3.timestampFormatter(/* @__PURE__ */ new Date()), u2 = o3.levelFormatter(e4), g2 = o3.nameFormatter(r9);
-                  o3.format ? t4 += o3.format(u2, g2, m2) : (t4 += o3.template, l4 && (t4 = t4.replace(/%t/, m2)), c2 && (t4 = t4.replace(/%l/, u2)), d3 && (t4 = t4.replace(/%n/, g2))), p.length && "string" == typeof p[0] ? p[0] = t4 + " " + p[0] : p.unshift(t4);
+                  var m = o3.timestampFormatter(/* @__PURE__ */ new Date()), u2 = o3.levelFormatter(e4), g3 = o3.nameFormatter(r9);
+                  o3.format ? t4 += o3.format(u2, g3, m) : (t4 += o3.template, l4 && (t4 = t4.replace(/%t/, m)), c2 && (t4 = t4.replace(/%l/, u2)), d3 && (t4 = t4.replace(/%n/, g3))), p.length && "string" == typeof p[0] ? p[0] = t4 + " " + p[0] : p.unshift(t4);
                 }
                 s3.apply(void 0, p);
               };
@@ -27937,23 +27937,23 @@ var require_AsyncEventEmitter = __commonJS({
       return self2;
     };
     AsyncEventEmitter.prototype.once = function(type, listener) {
-      var self2 = this, g2;
+      var self2 = this, g3;
       if (typeof listener !== "function") {
         throw new TypeError("listener must be a function");
       }
       if (listener.length >= 2) {
-        g2 = function(e, next) {
-          self2.removeListener(type, g2);
+        g3 = function(e, next) {
+          self2.removeListener(type, g3);
           listener(e, next);
         };
       } else {
-        g2 = function(e) {
-          self2.removeListener(type, g2);
+        g3 = function(e) {
+          self2.removeListener(type, g3);
           listener(e);
         };
       }
-      g2.listener = listener;
-      self2.on(type, g2);
+      g3.listener = listener;
+      self2.on(type, g3);
       return self2;
     };
     AsyncEventEmitter.prototype.first = function(event, listener) {
@@ -29305,7 +29305,7 @@ var require_dcmjs_dimse_min = __commonJS({
         "use strict";
         e2.exports = t;
       }, 237: (e2, t2, s2) => {
-        const { Association: n2, PresentationContext: i3 } = s2(570), { Scp: r7, Server: a3 } = s2(538), { CCancelRequest: o2, CEchoRequest: c2, CEchoResponse: d4, CFindRequest: u2, CFindResponse: h3, CGetRequest: m2, CGetResponse: g2, CMoveRequest: l3, CMoveResponse: p, CStoreRequest: R2, CStoreResponse: S2, NActionRequest: y3, NActionResponse: f3, NCreateRequest: I2, NCreateResponse: C2, NDeleteRequest: P, NDeleteResponse: A2, NEventReportRequest: v2, NEventReportResponse: x, NGetRequest: w2, NGetResponse: U, NSetRequest: q2, NSetResponse: D2 } = s2(940), { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: M2, RejectReason: B2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $, StorageClass: j, TransferSyntax: V2, Uid: _2, UserIdentityType: G2 } = s2(492), z2 = s2(422), Q2 = s2(825), W2 = s2(139), J2 = s2(906), X2 = s2(73), H = { association: { Association: n2, PresentationContext: i3 }, Client: z2, constants: { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: M2, RejectReason: B2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $, StorageClass: j, TransferSyntax: V2, Uid: _2, UserIdentityType: G2 }, Dataset: Q2, Implementation: W2, log: s2(547), requests: { CCancelRequest: o2, CEchoRequest: c2, CFindRequest: u2, CGetRequest: m2, CMoveRequest: l3, CStoreRequest: R2, NActionRequest: y3, NCreateRequest: I2, NDeleteRequest: P, NEventReportRequest: v2, NGetRequest: w2, NSetRequest: q2 }, responses: { CEchoResponse: d4, CFindResponse: h3, CGetResponse: g2, CMoveResponse: p, CStoreResponse: S2, NActionResponse: f3, NCreateResponse: C2, NDeleteResponse: A2, NEventReportResponse: x, NGetResponse: U, NSetResponse: D2 }, Scp: r7, Server: a3, Statistics: J2, Transcoding: X2, version: s2(837) };
+        const { Association: n2, PresentationContext: i3 } = s2(570), { Scp: r7, Server: a3 } = s2(538), { CCancelRequest: o2, CEchoRequest: c2, CEchoResponse: d4, CFindRequest: u2, CFindResponse: h3, CGetRequest: m, CGetResponse: g3, CMoveRequest: l3, CMoveResponse: p, CStoreRequest: R2, CStoreResponse: S2, NActionRequest: y3, NActionResponse: f3, NCreateRequest: I2, NCreateResponse: C2, NDeleteRequest: P, NDeleteResponse: A2, NEventReportRequest: v2, NEventReportResponse: x, NGetRequest: w3, NGetResponse: U, NSetRequest: q2, NSetResponse: D2 } = s2(940), { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: M, RejectReason: B2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $, StorageClass: j, TransferSyntax: V2, Uid: _2, UserIdentityType: G2 } = s2(492), z2 = s2(422), Q2 = s2(825), W2 = s2(139), J2 = s2(906), X2 = s2(73), H = { association: { Association: n2, PresentationContext: i3 }, Client: z2, constants: { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: M, RejectReason: B2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $, StorageClass: j, TransferSyntax: V2, Uid: _2, UserIdentityType: G2 }, Dataset: Q2, Implementation: W2, log: s2(547), requests: { CCancelRequest: o2, CEchoRequest: c2, CFindRequest: u2, CGetRequest: m, CMoveRequest: l3, CStoreRequest: R2, NActionRequest: y3, NCreateRequest: I2, NDeleteRequest: P, NEventReportRequest: v2, NGetRequest: w3, NSetRequest: q2 }, responses: { CEchoResponse: d4, CFindResponse: h3, CGetResponse: g3, CMoveResponse: p, CStoreResponse: S2, NActionResponse: f3, NCreateResponse: C2, NDeleteResponse: A2, NEventReportResponse: x, NGetResponse: U, NSetResponse: D2 }, Scp: r7, Server: a3, Statistics: J2, Transcoding: X2, version: s2(837) };
         e2.exports = H;
       }, 278: (e2) => {
         "use strict";
@@ -29314,7 +29314,7 @@ var require_dcmjs_dimse_min = __commonJS({
         "use strict";
         e2.exports = s;
       }, 371: (e2, t2, s2) => {
-        const { Association: n2 } = s2(570), { AAbort: i3, AAssociateAC: r7, AAssociateRJ: a3, AAssociateRQ: o2, AReleaseRP: c2, AReleaseRQ: d4, PDataTF: u2, Pdv: h3, RawPdu: m2 } = s2(942), { CommandFieldType: g2, RawPduType: l3, Status: p } = s2(492), { CCancelRequest: R2, CEchoRequest: S2, CEchoResponse: y3, CFindRequest: f3, CFindResponse: I2, CGetRequest: C2, CGetResponse: P, CMoveRequest: A2, CMoveResponse: v2, Command: x, CStoreRequest: w2, CStoreResponse: U, NActionRequest: q2, NActionResponse: D2, NCreateRequest: E2, NCreateResponse: T, NDeleteRequest: b2, NDeleteResponse: O2, NEventReportRequest: N2, NEventReportResponse: M2, NGetRequest: B2, NGetResponse: L2, NSetRequest: F2, NSetResponse: k2, Response: $ } = s2(940), j = s2(825), V2 = s2(139), _2 = s2(906), G2 = s2(73), z2 = s2(547), { SmartBuffer: Q2 } = s2(766), { EOL: W2 } = s2(857), J2 = s2(733), X2 = s2(235);
+        const { Association: n2 } = s2(570), { AAbort: i3, AAssociateAC: r7, AAssociateRJ: a3, AAssociateRQ: o2, AReleaseRP: c2, AReleaseRQ: d4, PDataTF: u2, Pdv: h3, RawPdu: m } = s2(942), { CommandFieldType: g3, RawPduType: l3, Status: p } = s2(492), { CCancelRequest: R2, CEchoRequest: S2, CEchoResponse: y3, CFindRequest: f3, CFindResponse: I2, CGetRequest: C2, CGetResponse: P, CMoveRequest: A2, CMoveResponse: v2, Command: x, CStoreRequest: w3, CStoreResponse: U, NActionRequest: q2, NActionResponse: D2, NCreateRequest: E2, NCreateResponse: T, NDeleteRequest: b2, NDeleteResponse: O2, NEventReportRequest: N2, NEventReportResponse: M, NGetRequest: B2, NGetResponse: L2, NSetRequest: F2, NSetResponse: k2, Response: $ } = s2(940), j = s2(825), V2 = s2(139), _2 = s2(906), G2 = s2(73), z2 = s2(547), { SmartBuffer: Q2 } = s2(766), { EOL: W2 } = s2(857), J2 = s2(733), X2 = s2(235);
         class H extends J2 {
           constructor() {
             super();
@@ -29422,7 +29422,7 @@ var require_dcmjs_dimse_min = __commonJS({
               if (!t3) return void this.emit("done");
               const s3 = this.association.getAcceptedPresentationContextFromRequest(t3);
               if (s3) {
-                t3 instanceof w2 && t3.loadFullDatasetIfNeeded(), t3.setMessageId(this._getNextMessageId()), this.pending.push(t3);
+                t3 instanceof w3 && t3.loadFullDatasetIfNeeded(), t3.setMessageId(this._getNextMessageId()), this.pending.push(t3);
                 const n3 = { context: s3, command: t3 };
                 n3.command.on("done", () => {
                   e3();
@@ -29468,7 +29468,7 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
           async _processPdu(e3) {
-            const t3 = new m2(e3);
+            const t3 = new m(e3);
             try {
               switch (t3.readPdu(), t3.getType()) {
                 case l3.AAssociateRQ:
@@ -29513,76 +29513,76 @@ var require_dcmjs_dimse_min = __commonJS({
               const s3 = e3.getPdvs();
               for (let e4 = 0; e4 < s3.length; e4++) {
                 const n3 = s3[e4], i4 = this.association.getPresentationContext(n3.getPresentationContextId());
-                if (this.dimse && this.dimse.getCommandFieldType() === g2.CStoreRequest ? this.dimseStoreStream || (this.dimseStream = void 0, this.dimseStoreStream = this.createStoreWritableStream(i4, this.dimse), t3 = new Promise((e5) => this.dimseStoreStream.once("drain", e5))) : this.dimseStream || (this.dimseStream = X2.createWriteStream(), this.dimseStoreStream = void 0), !(this.dimseStream || this.dimseStoreStream).write(n3.getValue()) && t3 && await t3, n3.isLastFragment()) if (n3.isCommand()) {
+                if (this.dimse && this.dimse.getCommandFieldType() === g3.CStoreRequest ? this.dimseStoreStream || (this.dimseStream = void 0, this.dimseStoreStream = this.createStoreWritableStream(i4, this.dimse), t3 = new Promise((e5) => this.dimseStoreStream.once("drain", e5))) : this.dimseStream || (this.dimseStream = X2.createWriteStream(), this.dimseStoreStream = void 0), !(this.dimseStream || this.dimseStoreStream).write(n3.getValue()) && t3 && await t3, n3.isLastFragment()) if (n3.isCommand()) {
                   const e5 = new x(new j(this.dimseStream.toBuffer()));
                   switch (e5.getCommandFieldType()) {
-                    case g2.CEchoRequest:
+                    case g3.CEchoRequest:
                       this.dimse = Object.assign(new S2(), e5);
                       break;
-                    case g2.CEchoResponse:
+                    case g3.CEchoResponse:
                       this.dimse = Object.assign(new y3(), e5);
                       break;
-                    case g2.CFindRequest:
+                    case g3.CFindRequest:
                       this.dimse = Object.assign(new f3(), e5);
                       break;
-                    case g2.CFindResponse:
+                    case g3.CFindResponse:
                       this.dimse = Object.assign(new I2(), e5);
                       break;
-                    case g2.CStoreRequest:
-                      this.dimse = Object.assign(new w2(), e5);
+                    case g3.CStoreRequest:
+                      this.dimse = Object.assign(new w3(), e5);
                       break;
-                    case g2.CStoreResponse:
+                    case g3.CStoreResponse:
                       this.dimse = Object.assign(new U(), e5);
                       break;
-                    case g2.CMoveRequest:
+                    case g3.CMoveRequest:
                       this.dimse = Object.assign(new A2(), e5);
                       break;
-                    case g2.CMoveResponse:
+                    case g3.CMoveResponse:
                       this.dimse = Object.assign(new v2(), e5);
                       break;
-                    case g2.CGetRequest:
+                    case g3.CGetRequest:
                       this.dimse = Object.assign(new C2(), e5);
                       break;
-                    case g2.CGetResponse:
+                    case g3.CGetResponse:
                       this.dimse = Object.assign(new P(), e5);
                       break;
-                    case g2.NCreateRequest:
+                    case g3.NCreateRequest:
                       this.dimse = Object.assign(new E2(), e5);
                       break;
-                    case g2.NCreateResponse:
+                    case g3.NCreateResponse:
                       this.dimse = Object.assign(new T(), e5);
                       break;
-                    case g2.NActionRequest:
+                    case g3.NActionRequest:
                       this.dimse = Object.assign(new q2(), e5);
                       break;
-                    case g2.NActionResponse:
+                    case g3.NActionResponse:
                       this.dimse = Object.assign(new D2(), e5);
                       break;
-                    case g2.NDeleteRequest:
+                    case g3.NDeleteRequest:
                       this.dimse = Object.assign(new b2(), e5);
                       break;
-                    case g2.NDeleteResponse:
+                    case g3.NDeleteResponse:
                       this.dimse = Object.assign(new O2(), e5);
                       break;
-                    case g2.NEventReportRequest:
+                    case g3.NEventReportRequest:
                       this.dimse = Object.assign(new N2(), e5);
                       break;
-                    case g2.NEventReportResponse:
-                      this.dimse = Object.assign(new M2(), e5);
+                    case g3.NEventReportResponse:
+                      this.dimse = Object.assign(new M(), e5);
                       break;
-                    case g2.NGetRequest:
+                    case g3.NGetRequest:
                       this.dimse = Object.assign(new B2(), e5);
                       break;
-                    case g2.NGetResponse:
+                    case g3.NGetResponse:
                       this.dimse = Object.assign(new L2(), e5);
                       break;
-                    case g2.NSetRequest:
+                    case g3.NSetRequest:
                       this.dimse = Object.assign(new F2(), e5);
                       break;
-                    case g2.NSetResponse:
+                    case g3.NSetResponse:
                       this.dimse = Object.assign(new k2(), e5);
                       break;
-                    case g2.CCancelRequest:
+                    case g3.CCancelRequest:
                       this.dimse = Object.assign(new R2(), e5);
                       break;
                     default:
@@ -29590,7 +29590,7 @@ var require_dcmjs_dimse_min = __commonJS({
                   }
                   if (z2.info(`${this.logId} <- ${this.dimse.toString({ includeCommandDataset: this.logCommandDatasets, includeDataset: this.logDatasets })} [pc: ${n3.getPresentationContextId()}]`), !this.dimse.hasDataset()) return this._performDimse(i4, this.dimse), void (this.dimse = void 0);
                   this.dimseStream = void 0, this.dimseStoreStream = void 0;
-                } else if (this.dimse.getCommandFieldType() === g2.CStoreRequest) this.dimseStoreStream.end(), this.createDatasetFromStoreWritableStream(this.dimseStoreStream, i4, (e5) => {
+                } else if (this.dimse.getCommandFieldType() === g3.CStoreRequest) this.dimseStoreStream.end(), this.createDatasetFromStoreWritableStream(this.dimseStoreStream, i4, (e5) => {
                   this.dimse.setDataset(e5), this._performDimse(i4, this.dimse), this.dimseStream = void 0, this.dimseStoreStream = void 0, this.dimse = void 0;
                 });
                 else {
@@ -29607,35 +29607,35 @@ var require_dcmjs_dimse_min = __commonJS({
             if (t3 instanceof $) {
               const e4 = Object.assign(Object.create(Object.getPrototypeOf(t3)), t3), s3 = this.pending.find((e5) => e5.getMessageId() === t3.getMessageIdBeingRespondedTo());
               s3 && (s3.raiseResponseEvent(e4), e4.getStatus() !== p.Pending && s3.raiseDoneEvent());
-            } else t3.getCommandFieldType() === g2.CEchoRequest ? this.emit("cEchoRequest", t3, (t4) => {
+            } else t3.getCommandFieldType() === g3.CEchoRequest ? this.emit("cEchoRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.CFindRequest ? this.emit("cFindRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.CFindRequest ? this.emit("cFindRequest", t3, (t4) => {
               (Array.isArray(t4) ? t4 : [t4]).forEach((t5) => {
                 this._sendDimse({ context: e3, command: t5 });
               });
-            }) : t3.getCommandFieldType() === g2.CStoreRequest ? this.emit("cStoreRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.CStoreRequest ? this.emit("cStoreRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.CMoveRequest ? this.emit("cMoveRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.CMoveRequest ? this.emit("cMoveRequest", t3, (t4) => {
               (Array.isArray(t4) ? t4 : [t4]).forEach((t5) => {
                 this._sendDimse({ context: e3, command: t5 });
               });
-            }) : t3.getCommandFieldType() === g2.CGetRequest ? this.emit("cGetRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.CGetRequest ? this.emit("cGetRequest", t3, (t4) => {
               (Array.isArray(t4) ? t4 : [t4]).forEach((t5) => {
                 this._sendDimse({ context: e3, command: t5 });
               });
-            }) : t3.getCommandFieldType() === g2.NCreateRequest ? this.emit("nCreateRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.NCreateRequest ? this.emit("nCreateRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.NActionRequest ? this.emit("nActionRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.NActionRequest ? this.emit("nActionRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.NDeleteRequest ? this.emit("nDeleteRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.NDeleteRequest ? this.emit("nDeleteRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.NEventReportRequest ? this.emit("nEventReportRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.NEventReportRequest ? this.emit("nEventReportRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.NGetRequest ? this.emit("nGetRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.NGetRequest ? this.emit("nGetRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.NSetRequest ? this.emit("nSetRequest", t3, (t4) => {
+            }) : t3.getCommandFieldType() === g3.NSetRequest ? this.emit("nSetRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
-            }) : t3.getCommandFieldType() === g2.CCancelRequest && this.emit("cCancelRequest", t3);
+            }) : t3.getCommandFieldType() === g3.CCancelRequest && this.emit("cCancelRequest", t3);
           }
           _wrapSocket() {
             this.socket.setTimeout(this.connectTimeout), this.socket.on("connect", () => {
@@ -29671,7 +29671,7 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 422: (e2, t2, s2) => {
-        const { Association: n2, PresentationContext: i3 } = s2(570), { TransferSyntax: r7, UserIdentityType: a3 } = s2(492), { Request: o2 } = s2(940), c2 = s2(371), d4 = s2(906), u2 = s2(547), h3 = s2(733), m2 = s2(278), g2 = s2(756);
+        const { Association: n2, PresentationContext: i3 } = s2(570), { TransferSyntax: r7, UserIdentityType: a3 } = s2(492), { Request: o2 } = s2(940), c2 = s2(371), d4 = s2(906), u2 = s2(547), h3 = s2(733), m = s2(278), g3 = s2(756);
         e2.exports = class extends h3 {
           constructor() {
             super(), this.requests = [], this.additionalPresentationContexts = [], this.network = void 0, this.statistics = new d4();
@@ -29700,7 +29700,7 @@ var require_dcmjs_dimse_min = __commonJS({
             });
             let h4 = {};
             o3.securityOptions && (h4 = { key: o3.securityOptions.key, cert: o3.securityOptions.cert, ca: o3.securityOptions.ca, requestCert: o3.securityOptions.requestCert, rejectUnauthorized: o3.securityOptions.rejectUnauthorized, minVersion: o3.securityOptions.minVersion, maxVersion: o3.securityOptions.maxVersion, ciphers: o3.securityOptions.ciphers }), u2.info(`Connecting to ${e3}:${t3} ${o3.securityOptions ? "(TLS)" : ""}`);
-            const l3 = (o3.securityOptions ? g2 : m2).connect({ host: e3, port: t3, ...h4 }), p = new c2(l3, o3);
+            const l3 = (o3.securityOptions ? g3 : m).connect({ host: e3, port: t3, ...h4 }), p = new c2(l3, o3);
             p.on("connect", () => {
               this.emit("connected"), p.sendAssociationRequest(d5);
             }), p.on("associationAccepted", (e4) => {
@@ -29759,10 +29759,10 @@ var require_dcmjs_dimse_min = __commonJS({
         Object.freeze(u2);
         const h3 = { Success: 0, Cancel: 65024, Pending: 65280, ClassInstanceConflict: 281, DataSetSopClassMismatch: 43264, DuplicateSOPInstance: 273, DuplicateInvocation: 528, InvalidArgumentValue: 277, InvalidAttributeValue: 262, InvalidObjectInstance: 279, MissingAttribute: 288, MissingAttributeValue: 289, MistypedArgument: 530, MoveDestinationUnknown: 43009, NoSuchActionType: 291, NoSuchArgument: 276, NoSuchEventType: 275, NoSuchObjectInstance: 274, NoSuchSopClass: 280, NotAuthorized: 292, OutOfResourcesNumberOfMatches: 42753, OutOfResourcesSubOperations: 42754, ProcessingFailure: 272, ResourceLimitation: 531, SopClassNotSupported: 290, UnrecognizedOperation: 529 };
         Object.freeze(h3);
-        const m2 = { ApplicationContextName: "1.2.840.10008.3.1.1.1" };
-        Object.freeze(m2);
-        const g2 = { BasicTextSrStorage: "1.2.840.10008.5.1.4.1.1.88.11", BreastProjectionXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.13.1.4", BreastProjectionXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.13.1.5", BreastTomosynthesisImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.3", ChestCadSrStorage: "1.2.840.10008.5.1.4.1.1.88.65", ComprehensiveSrStorage: "1.2.840.10008.5.1.4.1.1.88.33", ComputedRadiographyImageStorage: "1.2.840.10008.5.1.4.1.1.1", CtImageStorage: "1.2.840.10008.5.1.4.1.1.2", DigitalIntraOralXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.3", DigitalIntraOralXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.3.1", DigitalMammographyXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.2", DigitalMammographyXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.2.1", DigitalXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.1", DigitalXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.1.1", EncapsulatedCdaStorage: "1.2.840.10008.5.1.4.1.1.104.2", EncapsulatedPdfStorage: "1.2.840.10008.5.1.4.1.1.104.1", EnhancedCtImageStorage: "1.2.840.10008.5.1.4.1.1.2.1", EnhancedMrColorImageStorage: "1.2.840.10008.5.1.4.1.1.4.3", EnhancedMrImageStorage: "1.2.840.10008.5.1.4.1.1.4.1", EnhancedPetImageStorage: "1.2.840.10008.5.1.4.1.1.130", EnhancedSrStorage: "1.2.840.10008.5.1.4.1.1.88.22", EnhancedXaImageStorage: "1.2.840.10008.5.1.4.1.1.12.1.1", EnhancedXrfImageStorage: "1.2.840.10008.5.1.4.1.1.12.2.1", IntravascularOpticalCoherenceTomographyImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.14.1", IntravascularOpticalCoherenceTomographyImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.14.2", LegacyConvertedEnhancedCTImageStorage: "1.2.840.10008.5.1.4.1.1.2.2", LegacyConvertedEnhancedMRImageStorage: "1.2.840.10008.5.1.4.1.1.4.4", LegacyConvertedEnhancedPETImageStorage: "1.2.840.10008.5.1.4.1.1.128.1", MammographyCadSrStorage: "1.2.840.10008.5.1.4.1.1.88.50", MrImageStorage: "1.2.840.10008.5.1.4.1.1.4", MultiframeGrayscaleByteSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.2", MultiframeGrayscaleWordSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.3", MultiframeSingleBitSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.1", MultiframeTrueColorSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.4", NuclearMedicineImageStorage: "1.2.840.10008.5.1.4.1.1.20", OphthalmicOpticalCoherenceTomographyEnFaceImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.7", OphthalmicPhotography16BitImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.2", OphthalmicPhotography8BitImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.1", OphthalmicTomographyImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.4", PositronEmissionTomographyImageStorage: "1.2.840.10008.5.1.4.1.1.128", RtImageStorage: "1.2.840.10008.5.1.4.1.1.481.1", SecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7", UltrasoundImageStorage: "1.2.840.10008.5.1.4.1.1.6.1", UltrasoundMultiframeImageStorage: "1.2.840.10008.5.1.4.1.1.3.1", VideoEndoscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.1.1", VideoMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.2.1", VideoPhotographicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.4.1", VlEndoscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.1", VlMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.2", VlPhotographicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.4", VlSlideCoordinatesMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.3", VlWholeSlideMicroscopyImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.6", WideFieldOphthalmicPhotography3dCoordinatesImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.6", WideFieldOphthalmicPhotographyStereographicProjectionImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.5", XRay3dAngiographicImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.1", XRay3dCraniofacialImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.2", XRayAngiographicImageStorage: "1.2.840.10008.5.1.4.1.1.12.1", XRayRadiationDoseSRStorage: "1.2.840.10008.5.1.4.1.1.88.67", XRayRadiofluoroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.12.2" };
-        Object.freeze(g2);
+        const m = { ApplicationContextName: "1.2.840.10008.3.1.1.1" };
+        Object.freeze(m);
+        const g3 = { BasicTextSrStorage: "1.2.840.10008.5.1.4.1.1.88.11", BreastProjectionXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.13.1.4", BreastProjectionXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.13.1.5", BreastTomosynthesisImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.3", ChestCadSrStorage: "1.2.840.10008.5.1.4.1.1.88.65", ComprehensiveSrStorage: "1.2.840.10008.5.1.4.1.1.88.33", ComputedRadiographyImageStorage: "1.2.840.10008.5.1.4.1.1.1", CtImageStorage: "1.2.840.10008.5.1.4.1.1.2", DigitalIntraOralXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.3", DigitalIntraOralXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.3.1", DigitalMammographyXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.2", DigitalMammographyXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.2.1", DigitalXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.1", DigitalXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.1.1", EncapsulatedCdaStorage: "1.2.840.10008.5.1.4.1.1.104.2", EncapsulatedPdfStorage: "1.2.840.10008.5.1.4.1.1.104.1", EnhancedCtImageStorage: "1.2.840.10008.5.1.4.1.1.2.1", EnhancedMrColorImageStorage: "1.2.840.10008.5.1.4.1.1.4.3", EnhancedMrImageStorage: "1.2.840.10008.5.1.4.1.1.4.1", EnhancedPetImageStorage: "1.2.840.10008.5.1.4.1.1.130", EnhancedSrStorage: "1.2.840.10008.5.1.4.1.1.88.22", EnhancedXaImageStorage: "1.2.840.10008.5.1.4.1.1.12.1.1", EnhancedXrfImageStorage: "1.2.840.10008.5.1.4.1.1.12.2.1", IntravascularOpticalCoherenceTomographyImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.14.1", IntravascularOpticalCoherenceTomographyImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.14.2", LegacyConvertedEnhancedCTImageStorage: "1.2.840.10008.5.1.4.1.1.2.2", LegacyConvertedEnhancedMRImageStorage: "1.2.840.10008.5.1.4.1.1.4.4", LegacyConvertedEnhancedPETImageStorage: "1.2.840.10008.5.1.4.1.1.128.1", MammographyCadSrStorage: "1.2.840.10008.5.1.4.1.1.88.50", MrImageStorage: "1.2.840.10008.5.1.4.1.1.4", MultiframeGrayscaleByteSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.2", MultiframeGrayscaleWordSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.3", MultiframeSingleBitSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.1", MultiframeTrueColorSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.4", NuclearMedicineImageStorage: "1.2.840.10008.5.1.4.1.1.20", OphthalmicOpticalCoherenceTomographyEnFaceImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.7", OphthalmicPhotography16BitImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.2", OphthalmicPhotography8BitImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.1", OphthalmicTomographyImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.4", PositronEmissionTomographyImageStorage: "1.2.840.10008.5.1.4.1.1.128", RtImageStorage: "1.2.840.10008.5.1.4.1.1.481.1", SecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7", UltrasoundImageStorage: "1.2.840.10008.5.1.4.1.1.6.1", UltrasoundMultiframeImageStorage: "1.2.840.10008.5.1.4.1.1.3.1", VideoEndoscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.1.1", VideoMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.2.1", VideoPhotographicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.4.1", VlEndoscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.1", VlMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.2", VlPhotographicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.4", VlSlideCoordinatesMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.3", VlWholeSlideMicroscopyImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.6", WideFieldOphthalmicPhotography3dCoordinatesImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.6", WideFieldOphthalmicPhotographyStereographicProjectionImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.5", XRay3dAngiographicImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.1", XRay3dCraniofacialImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.2", XRayAngiographicImageStorage: "1.2.840.10008.5.1.4.1.1.12.1", XRayRadiationDoseSRStorage: "1.2.840.10008.5.1.4.1.1.88.67", XRayRadiofluoroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.12.2" };
+        Object.freeze(g3);
         const l3 = { Verification: "1.2.840.10008.1.1", StudyRootQueryRetrieveInformationModelFind: "1.2.840.10008.5.1.4.1.2.2.1", ModalityWorklistInformationModelFind: "1.2.840.10008.5.1.4.31", ModalityPerformedProcedureStep: "1.2.840.10008.3.1.2.3.3", StudyRootQueryRetrieveInformationModelMove: "1.2.840.10008.5.1.4.1.2.2.2", StudyRootQueryRetrieveInformationModelGet: "1.2.840.10008.5.1.4.1.2.2.3", StorageCommitmentPushModel: "1.2.840.10008.1.20.1", BasicFilmSession: "1.2.840.10008.5.1.1.1", PrintJob: "1.2.840.10008.5.1.1.14", BasicAnnotationBox: "1.2.840.10008.5.1.1.15", Printer: "1.2.840.10008.5.1.1.16", PrinterConfigurationRetrieval: "1.2.840.10008.5.1.1.16.376", BasicGrayscalePrintManagementMeta: "1.2.840.10008.5.1.1.9", BasicColorPrintManagementMeta: "1.2.840.10008.5.1.1.18", BasicFilmBox: "1.2.840.10008.5.1.1.2", PresentationLut: "1.2.840.10008.5.1.1.23", BasicGrayscaleImageBox: "1.2.840.10008.5.1.1.4", BasicColorImageBox: "1.2.840.10008.5.1.1.4.1", InstanceAvailabilityNotification: "1.2.840.10008.5.1.4.33" };
         Object.freeze(l3);
         const p = { ImplicitVRLittleEndian: "1.2.840.10008.1.2", ExplicitVRLittleEndian: "1.2.840.10008.1.2.1", DeflatedExplicitVRLittleEndian: "1.2.840.10008.1.2.1.99", ExplicitVRBigEndian: "1.2.840.10008.1.2.2", RleLossless: "1.2.840.10008.1.2.5", JpegBaseline: "1.2.840.10008.1.2.4.50", JpegLossless: "1.2.840.10008.1.2.4.70", JpegLsLossless: "1.2.840.10008.1.2.4.80", JpegLsLossy: "1.2.840.10008.1.2.4.81", Jpeg2000Lossless: "1.2.840.10008.1.2.4.90", Jpeg2000Lossy: "1.2.840.10008.1.2.4.91", JpegXlLossless: "1.2.840.10008.1.2.4.110", JpegXlRecompression: "1.2.840.10008.1.2.4.111", JpegXl: "1.2.840.10008.1.2.4.112", HtJpeg2000Lossless: "1.2.840.10008.1.2.4.201", HtJpeg2000LosslessRpcl: "1.2.840.10008.1.2.4.202", HtJpeg2000Lossy: "1.2.840.10008.1.2.4.203" };
@@ -29770,9 +29770,9 @@ var require_dcmjs_dimse_min = __commonJS({
         const R2 = [p.ImplicitVRLittleEndian, p.ExplicitVRLittleEndian, p.ExplicitVRBigEndian, p.RleLossless, p.JpegBaseline, p.JpegLossless, p.JpegLsLossless, p.JpegLsLossy, p.Jpeg2000Lossless, p.Jpeg2000Lossy, p.HtJpeg2000Lossless, p.HtJpeg2000LosslessRpcl, p.HtJpeg2000Lossy];
         Object.freeze(R2);
         const S2 = { ImplementationClassUid: "1.2.826.0.1.3680043.10.854", ImplementationVersion: "DCMJS-DIMSE-V0.2", MaxPduLength: 262144 };
-        Object.freeze(S2), e2.exports = { AbortReason: a3, AbortSource: r7, CommandFieldType: s2, DefaultImplementation: S2, PresentationContextResult: n2, Priority: u2, RawPduType: t2, RejectReason: d4, RejectResult: o2, RejectSource: c2, SopClass: l3, Status: h3, StorageClass: g2, TranscodableTransferSyntaxes: R2, TransferSyntax: p, Uid: m2, UserIdentityType: i3 };
+        Object.freeze(S2), e2.exports = { AbortReason: a3, AbortSource: r7, CommandFieldType: s2, DefaultImplementation: S2, PresentationContextResult: n2, Priority: u2, RawPduType: t2, RejectReason: d4, RejectResult: o2, RejectSource: c2, SopClass: l3, Status: h3, StorageClass: g3, TranscodableTransferSyntaxes: R2, TransferSyntax: p, Uid: m, UserIdentityType: i3 };
       }, 538: (e2, t2, s2) => {
-        const { CEchoResponse: n2, CFindResponse: i3, CGetResponse: r7, CMoveResponse: a3, CStoreResponse: o2, NActionResponse: c2, NCreateResponse: d4, NDeleteResponse: u2, NEventReportResponse: h3, NGetResponse: m2, NSetResponse: g2 } = s2(940), l3 = s2(371), p = s2(906), R2 = s2(547), S2 = s2(733), y3 = s2(278), f3 = s2(756);
+        const { CEchoResponse: n2, CFindResponse: i3, CGetResponse: r7, CMoveResponse: a3, CStoreResponse: o2, NActionResponse: c2, NCreateResponse: d4, NDeleteResponse: u2, NEventReportResponse: h3, NGetResponse: m, NSetResponse: g3 } = s2(940), l3 = s2(371), p = s2(906), R2 = s2(547), S2 = s2(733), y3 = s2(278), f3 = s2(756);
         e2.exports = { Scp: class extends l3 {
           constructor(e3, t3) {
             super(e3, t3), this.on("associationRequested", (e4) => {
@@ -29847,10 +29847,10 @@ var require_dcmjs_dimse_min = __commonJS({
             R2.error("nEventReportRequest method must be implemented"), t3(h3.fromRequest(e3));
           }
           nGetRequest(e3, t3) {
-            R2.error("nGetRequest method must be implemented"), t3(m2.fromRequest(e3));
+            R2.error("nGetRequest method must be implemented"), t3(m.fromRequest(e3));
           }
           nSetRequest(e3, t3) {
-            R2.error("nSetRequest method must be implemented"), t3(g2.fromRequest(e3));
+            R2.error("nSetRequest method must be implemented"), t3(g3.fromRequest(e3));
           }
           cCancelRequest(e3) {
             R2.error("cCancelRequest method must be implemented");
@@ -29892,7 +29892,7 @@ var require_dcmjs_dimse_min = __commonJS({
         const n2 = s2(360), i3 = s2(707);
         i3.reg(n2), n2.enableAll(false), i3.apply(n2, { format: (e3, t3, s3) => `${s3} -- ${e3.toUpperCase()} --`, timestampFormatter: (e3) => e3.toISOString() }), e2.exports = n2;
       }, 570: (e2, t2, s2) => {
-        const { CGetRequest: n2, CStoreRequest: i3 } = s2(940), { CommandFieldType: r7, PresentationContextResult: a3, SopClass: o2, StorageClass: c2, TransferSyntax: d4, Uid: u2, UserIdentityType: h3 } = s2(492), m2 = s2(139), { EOL: g2 } = s2(857);
+        const { CGetRequest: n2, CStoreRequest: i3 } = s2(940), { CommandFieldType: r7, PresentationContextResult: a3, SopClass: o2, StorageClass: c2, TransferSyntax: d4, Uid: u2, UserIdentityType: h3 } = s2(492), m = s2(139), { EOL: g3 } = s2(857);
         class l3 {
           constructor(e3, t3, s3, n3) {
             this.pcId = e3, this.abstractSyntaxUid = t3, this.transferSyntaxes = [], s3 && this.transferSyntaxes.push(s3), this.result = n3 || a3.Proposed;
@@ -29950,12 +29950,12 @@ var require_dcmjs_dimse_min = __commonJS({
             const e3 = [];
             return e3.push(`Presentation Context:  ${this.getPresentationContextId()} [${this.getResultDescription()}]`), e3.push(`  Abstract:  ${this.getAbstractSyntaxUid()}`), this.getTransferSyntaxUids().forEach((t3) => {
               e3.push(`      Transfer:  ${t3}`);
-            }), e3.join(g2);
+            }), e3.join(g3);
           }
         }
         e2.exports = { Association: class {
           constructor(e3, t3) {
-            this.callingAeTitle = e3, this.calledAeTitle = t3, this.maxPduLength = m2.getMaxPduLength(), this.applicationContextName = u2.ApplicationContextName, this.implementationClassUid = m2.getImplementationClassUid(), this.implementationVersion = m2.getImplementationVersion(), this.presentationContexts = [], this.negotiateAsyncOps = false, this.maxAsyncOpsInvoked = 1, this.maxAsyncOpsPerformed = 1, this.negotiateUserIdentity = false, this.userIdentityType = h3.Username, this.userIdentityPositiveResponseRequested = false, this.userIdentityPrimaryField = "", this.userIdentitySecondaryField = "", this.negotiateUserIdentityServerResponse = false, this.userIdentityServerResponse = "";
+            this.callingAeTitle = e3, this.calledAeTitle = t3, this.maxPduLength = m.getMaxPduLength(), this.applicationContextName = u2.ApplicationContextName, this.implementationClassUid = m.getImplementationClassUid(), this.implementationVersion = m.getImplementationVersion(), this.presentationContexts = [], this.negotiateAsyncOps = false, this.maxAsyncOpsInvoked = 1, this.maxAsyncOpsPerformed = 1, this.negotiateUserIdentity = false, this.userIdentityType = h3.Username, this.userIdentityPositiveResponseRequested = false, this.userIdentityPrimaryField = "", this.userIdentitySecondaryField = "", this.negotiateUserIdentityServerResponse = false, this.userIdentityServerResponse = "";
           }
           getCallingAeTitle() {
             return this.callingAeTitle;
@@ -30129,7 +30129,7 @@ var require_dcmjs_dimse_min = __commonJS({
               e3.push(`  Presentation Context:  ${t3.id} [${s3.getResultDescription()}]`), e3.push(`      Abstract:  ${this._uidNameFromValue([o2, c2], s3.getAbstractSyntaxUid()) || s3.getAbstractSyntaxUid()}`), s3.getTransferSyntaxUids().forEach((t4) => {
                 e3.push(`      Transfer:  ${this._uidNameFromValue(d4, t4) || t4}`);
               });
-            }), e3.push(""), e3.join(g2);
+            }), e3.push(""), e3.join(g3);
           }
           _uidNameFromValue(e3, t3) {
             const s3 = Array.isArray(e3) ? Object.assign({}, ...e3) : e3;
@@ -30188,7 +30188,7 @@ var require_dcmjs_dimse_min = __commonJS({
         "use strict";
         e2.exports = o;
       }, 825: (e2, t2, s2) => {
-        const { StorageClass: n2, TransferSyntax: i3 } = s2(492), r7 = s2(139), { readFile: a3, readFileSync: o2, writeFile: c2, writeFileSync: d4 } = s2(896), { EOL: u2 } = s2(857), h3 = s2(111), { DicomDict: m2, DicomMessage: g2, DicomMetaDictionary: l3, ReadBufferStream: p, WriteBufferStream: R2 } = h3.data, S2 = h3.log;
+        const { StorageClass: n2, TransferSyntax: i3 } = s2(492), r7 = s2(139), { readFile: a3, readFileSync: o2, writeFile: c2, writeFileSync: d4 } = s2(896), { EOL: u2 } = s2(857), h3 = s2(111), { DicomDict: m, DicomMessage: g3, DicomMetaDictionary: l3, ReadBufferStream: p, WriteBufferStream: R2 } = h3.data, S2 = h3.log;
         class y3 {
           constructor(e3, t3, s3) {
             s3 = s3 || {}, s3 = { ignoreErrors: true, ...s3 }, S2.level = "error", this.transferSyntaxUid = t3 || i3.ImplicitVRLittleEndian, Buffer.isBuffer(e3) ? this.elements = this._fromElementsBuffer(e3, this.transferSyntaxUid, s3) : this.elements = e3 || {};
@@ -30210,11 +30210,11 @@ var require_dcmjs_dimse_min = __commonJS({
           }
           getDenaturalizedDataset(e3, t3) {
             const s3 = t3 ? l3.denaturalizeDataset(this.getElements(), { ...l3.nameMap, ...t3 }) : l3.denaturalizeDataset(this.getElements()), n3 = new R2();
-            return g2.write(s3, n3, this.transferSyntaxUid, e3), Buffer.from(n3.getBuffer());
+            return g3.write(s3, n3, this.transferSyntaxUid, e3), Buffer.from(n3.getBuffer());
           }
           getDenaturalizedCommandDataset(e3) {
             const t3 = l3.denaturalizeDataset(this.getElements()), s3 = new R2(), n3 = new R2();
-            return g2.write(t3, n3, i3.ImplicitVRLittleEndian, e3), g2.writeTagObject(s3, "00000000", "UL", n3.size, i3.ImplicitVRLittleEndian, e3), s3.concat(n3), Buffer.from(s3.getBuffer());
+            return g3.write(t3, n3, i3.ImplicitVRLittleEndian, e3), g3.writeTagObject(s3, "00000000", "UL", n3.size, i3.ImplicitVRLittleEndian, e3), s3.concat(n3), Buffer.from(s3.getBuffer());
           }
           static fromFile(e3, t3, s3) {
             if (!(void 0 !== t3 && t3 instanceof Function)) return this._fromP10Buffer(o2(e3), s3);
@@ -30228,7 +30228,7 @@ var require_dcmjs_dimse_min = __commonJS({
             });
           }
           toFile(e3, t3, s3, i4) {
-            const a4 = { _meta: { FileMetaInformationVersion: new Uint8Array([0, 1]).buffer, MediaStorageSOPClassUID: this.getElement("SOPClassUID") || n2.SecondaryCaptureImageStorage, MediaStorageSOPInstanceUID: this.getElement("SOPInstanceUID") || y3.generateDerivedUid(), TransferSyntaxUID: this.getTransferSyntaxUid(), ImplementationClassUID: r7.getImplementationClassUid(), ImplementationVersionName: r7.getImplementationVersion() }, ...this.getElements() }, o3 = l3.denaturalizeDataset(a4._meta), u3 = new m2(o3);
+            const a4 = { _meta: { FileMetaInformationVersion: new Uint8Array([0, 1]).buffer, MediaStorageSOPClassUID: this.getElement("SOPClassUID") || n2.SecondaryCaptureImageStorage, MediaStorageSOPInstanceUID: this.getElement("SOPInstanceUID") || y3.generateDerivedUid(), TransferSyntaxUID: this.getTransferSyntaxUid(), ImplementationClassUID: r7.getImplementationClassUid(), ImplementationVersionName: r7.getImplementationVersion() }, ...this.getElements() }, o3 = l3.denaturalizeDataset(a4._meta), u3 = new m(o3);
             u3.dict = s3 ? l3.denaturalizeDataset(a4, { ...l3.nameMap, ...s3 }) : l3.denaturalizeDataset(a4), t3 instanceof Function ? c2(e3, Buffer.from(u3.write(i4)), (e4) => {
               t3(e4 || void 0);
             }) : d4(e3, Buffer.from(u3.write(i4)));
@@ -30242,11 +30242,11 @@ var require_dcmjs_dimse_min = __commonJS({
           }
           static _fromP10Buffer(e3, t3) {
             t3 = t3 || {}, t3 = { ignoreErrors: true, ...t3 };
-            const s3 = g2.readFile(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength), t3), n3 = l3.naturalizeDataset(s3.meta).TransferSyntaxUID, i4 = l3.naturalizeDataset(s3.dict);
+            const s3 = g3.readFile(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength), t3), n3 = l3.naturalizeDataset(s3.meta).TransferSyntaxUID, i4 = l3.naturalizeDataset(s3.dict);
             return new y3(i4, n3);
           }
           _fromElementsBuffer(e3, t3, s3) {
-            const n3 = new p(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength)), r8 = t3 === i3.ImplicitVRLittleEndian ? i3.ImplicitVRLittleEndian : t3 === i3.ExplicitVRBigEndian ? i3.ExplicitVRBigEndian : i3.ExplicitVRLittleEndian, a4 = g2._read(n3, r8, s3);
+            const n3 = new p(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength)), r8 = t3 === i3.ImplicitVRLittleEndian ? i3.ImplicitVRLittleEndian : t3 === i3.ExplicitVRBigEndian ? i3.ExplicitVRBigEndian : i3.ExplicitVRLittleEndian, a4 = g3._read(n3, r8, s3);
             return l3.naturalizeDataset(a4);
           }
         }
@@ -30292,8 +30292,8 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 940: (e2, t2, s2) => {
-        const { CommandFieldType: n2, Priority: i3, SopClass: r7, Status: a3 } = s2(492), o2 = s2(825), { Mixin: c2 } = s2(429), { EOL: d4 } = s2(857), u2 = s2(733), h3 = s2(111), { DicomMetaDictionary: m2 } = h3.data;
-        class g2 {
+        const { CommandFieldType: n2, Priority: i3, SopClass: r7, Status: a3 } = s2(492), o2 = s2(825), { Mixin: c2 } = s2(429), { EOL: d4 } = s2(857), u2 = s2(733), h3 = s2(111), { DicomMetaDictionary: m } = h3.data;
+        class g3 {
           constructor(e3, t3) {
             this.commandDataset = e3 || new o2(), this.dataset = t3;
           }
@@ -30372,7 +30372,7 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
         }
-        class l3 extends c2(g2, u2) {
+        class l3 extends c2(g3, u2) {
           constructor(e3, t3, s3, i4) {
             switch (super(new o2({ CommandField: e3, CommandDataSetType: s3 ? 514 : 257 })), e3) {
               case n2.NGetRequest:
@@ -30435,7 +30435,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return `${super.toString(e3)} [id: ${this.getMessageId() || ""}]`;
           }
         }
-        class p extends g2 {
+        class p extends g3 {
           constructor(e3, t3, s3, i4, r8) {
             switch (super(new o2({ CommandField: e3, CommandDataSetType: s3 ? 514 : 257, Status: i4, ErrorComment: r8 })), e3) {
               case n2.NGetRequest:
@@ -30763,7 +30763,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class w2 extends l3 {
+        class w3 extends l3 {
           constructor(e3, t3, s3) {
             super(n2.NCreateRequest, e3, false), this.setAffectedSopInstanceUid(t3), this.setMetaSopClassUid(s3);
           }
@@ -30773,7 +30773,7 @@ var require_dcmjs_dimse_min = __commonJS({
             super(n2.NCreateResponse, e3, false, s3, i4), this.setAffectedSopInstanceUid(t3);
           }
           static fromRequest(e3) {
-            if (!(e3 instanceof w2)) throw new Error("Request should be an instance of NCreateRequest");
+            if (!(e3 instanceof w3)) throw new Error("Request should be an instance of NCreateRequest");
             const t3 = new U(e3.getAffectedSopClassUid(), e3.getAffectedSopInstanceUid(), a3.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
@@ -30854,14 +30854,14 @@ var require_dcmjs_dimse_min = __commonJS({
           getAttributeIdentifierList() {
             const e3 = this.getCommandDataset().getElement("AttributeIdentifierList"), t3 = [];
             return void 0 !== e3 && Array.isArray(e3) && e3.length > 0 && e3.forEach((e4) => {
-              const s3 = e4 >> 16, n3 = 65535 & e4, i4 = `(${this._getPaddedHexString(s3, 4)},${this._getPaddedHexString(n3, 4)})`, r8 = m2.dictionary[i4.toUpperCase()];
+              const s3 = e4 >> 16, n3 = 65535 & e4, i4 = `(${this._getPaddedHexString(s3, 4)},${this._getPaddedHexString(n3, 4)})`, r8 = m.dictionary[i4.toUpperCase()];
               r8 && t3.push(r8.name);
             }), t3;
           }
           setAttributeIdentifierList(e3) {
             const t3 = [];
-            Object.keys(m2.dictionary).forEach((s3) => {
-              const n3 = m2.dictionary[s3];
+            Object.keys(m.dictionary).forEach((s3) => {
+              const n3 = m.dictionary[s3];
               if ("DICOM" === n3.version && e3.includes(n3.name)) {
                 const e4 = parseInt(n3.tag.substring(1, 5), 16), s4 = parseInt(n3.tag.substring(6, 10), 16);
                 t3.push(e4 << 16 | 65535 & s4);
@@ -30873,13 +30873,13 @@ var require_dcmjs_dimse_min = __commonJS({
             return "0".repeat(t3 - s3.length) + s3;
           }
         }
-        class M2 extends p {
+        class M extends p {
           constructor(e3, t3, s3, i4) {
             super(n2.NGetResponse, e3, false, s3, i4), this.setAffectedSopInstanceUid(t3);
           }
           static fromRequest(e3) {
             if (!(e3 instanceof N2)) throw new Error("Request should be an instance of NGetRequest");
-            const t3 = new M2(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), a3.ProcessingFailure);
+            const t3 = new M(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), a3.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
@@ -30913,10 +30913,10 @@ var require_dcmjs_dimse_min = __commonJS({
             return new F2(e3.getAffectedSopClassUid(), e3.getMessageId());
           }
         }
-        e2.exports = { CCancelRequest: F2, CEchoRequest: R2, CEchoResponse: S2, CFindRequest: y3, CFindResponse: f3, CGetRequest: v2, CGetResponse: x, CMoveRequest: P, CMoveResponse: A2, Command: g2, CStoreRequest: I2, CStoreResponse: C2, NActionRequest: q2, NActionResponse: D2, NCreateRequest: w2, NCreateResponse: U, NDeleteRequest: E2, NDeleteResponse: T, NEventReportRequest: b2, NEventReportResponse: O2, NGetRequest: N2, NGetResponse: M2, NSetRequest: B2, NSetResponse: L2, Request: l3, Response: p };
+        e2.exports = { CCancelRequest: F2, CEchoRequest: R2, CEchoResponse: S2, CFindRequest: y3, CFindResponse: f3, CGetRequest: v2, CGetResponse: x, CMoveRequest: P, CMoveResponse: A2, Command: g3, CStoreRequest: I2, CStoreResponse: C2, NActionRequest: q2, NActionResponse: D2, NCreateRequest: w3, NCreateResponse: U, NDeleteRequest: E2, NDeleteResponse: T, NEventReportRequest: b2, NEventReportResponse: O2, NGetRequest: N2, NGetResponse: M, NSetRequest: B2, NSetResponse: L2, Request: l3, Response: p };
       }, 942: (e2, t2, s2) => {
         const { AbortReason: n2, AbortSource: i3, RawPduType: r7, RejectReason: a3, RejectResult: o2, RejectSource: c2, TransferSyntax: d4 } = s2(492), { SmartBuffer: u2 } = s2(766), { EOL: h3 } = s2(857);
-        class m2 {
+        class m {
           constructor(e3) {
             if (this.m16 = [], this.m32 = [], Buffer.isBuffer(e3)) return this.buffer = u2.fromBuffer(e3, "ascii"), void (this.type = this.buffer.readUInt8());
             this.buffer = u2.fromOptions({ encoding: "ascii" }), this.type = e3;
@@ -31007,7 +31007,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return s3 > 0 || n3 < e3.length ? e3.substring(s3, n3) : e3;
           }
         }
-        class g2 {
+        class g3 {
           constructor(e3, t3, s3, n3) {
             this.pcId = e3, this.value = t3, this.command = s3, this.last = n3;
           }
@@ -31051,7 +31051,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return this.reason;
           }
           write() {
-            const e3 = new m2(r7.AAbort);
+            const e3 = new m(r7.AAbort);
             return e3.writeByte("Reserved", 0), e3.writeByte("Reserved", 0), e3.writeByte("Source", this.source), e3.writeByte("Reason", this.reason), e3;
           }
           read(e3) {
@@ -31098,7 +31098,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return this.association;
           }
           write() {
-            const e3 = new m2(r7.AAssociateAC);
+            const e3 = new m(r7.AAssociateAC);
             return e3.writeUInt16("Version", 1), e3.writeByteMultiple("Reserved", 0, 2), e3.writeStringWithPadding("Called AE", this.association.getCalledAeTitle(), 16, " "), e3.writeStringWithPadding("Calling AE", this.association.getCallingAeTitle(), 16, " "), e3.writeByteMultiple("Reserved", 0, 32), e3.writeByte("Item-Type", 16), e3.writeByte("Reserved", 0), e3.markLength16("Item-Length"), e3.writeString("Application Context Name", this.association.getApplicationContextName()), e3.writeLength16(), this.association.getPresentationContexts().forEach((t3) => {
               const s3 = this.association.getPresentationContext(t3.id);
               e3.writeByte("Item-Type", 33), e3.writeByte("Reserved", 0), e3.markLength16("Item-Length"), e3.writeByte("Presentation Context ID", s3.getPresentationContextId()), e3.writeByte("Reserved", 0), e3.writeByte("Result", s3.getResult()), e3.writeByte("Reserved", 0), e3.writeByte("Item-Type", 64), e3.writeByte("Reserved", 0), e3.markLength16("Item-Length"), e3.writeString("Transfer Syntax UID", s3.getAcceptedTransferSyntaxUid() || d4.ImplicitVRLittleEndian), e3.writeLength16(), e3.writeLength16();
@@ -31163,7 +31163,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return this.reason;
           }
           write() {
-            const e3 = new m2(r7.AAssociateRJ);
+            const e3 = new m(r7.AAssociateRJ);
             return e3.writeByte("Reserved", 0), e3.writeByte("Result", this.result), e3.writeByte("Source", this.source), e3.writeByte("Reason", this.reason), e3;
           }
           read(e3) {
@@ -31233,7 +31233,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return this.association;
           }
           write() {
-            const e3 = new m2(r7.AAssociateRQ);
+            const e3 = new m(r7.AAssociateRQ);
             return e3.writeUInt16("Version", 1), e3.writeByteMultiple("Reserved", 0, 2), e3.writeStringWithPadding("Called AE", this.association.getCalledAeTitle(), 16, " "), e3.writeStringWithPadding("Calling AE", this.association.getCallingAeTitle(), 16, " "), e3.writeByteMultiple("Reserved", 0, 32), e3.writeByte("Item-Type", 16), e3.writeByte("Reserved", 0), e3.markLength16("Item-Length"), e3.writeString("Application Context Name", this.association.getApplicationContextName()), e3.writeLength16(), this.association.getPresentationContexts().forEach((t3) => {
               const s3 = this.association.getPresentationContext(t3.id);
               e3.writeByte("Item-Type", 32), e3.writeByte("Reserved", 0), e3.markLength16("Item-Length"), e3.writeByte("Presentation Context ID", s3.getPresentationContextId()), e3.writeByteMultiple("Reserved", 0, 3), e3.writeByte("Item-Type", 48), e3.writeByte("Reserved", 0), e3.markLength16("Item-Length"), e3.writeString("Abstract Syntax UID", s3.getAbstractSyntaxUid()), e3.writeLength16(), s3.getTransferSyntaxUids().forEach((t4) => {
@@ -31281,7 +31281,7 @@ var require_dcmjs_dimse_min = __commonJS({
           constructor() {
           }
           write() {
-            const e3 = new m2(r7.AReleaseRP);
+            const e3 = new m(r7.AReleaseRP);
             return e3.writeUInt32("Reserved", 0), e3;
           }
           read(e3) {
@@ -31294,7 +31294,7 @@ var require_dcmjs_dimse_min = __commonJS({
           constructor() {
           }
           write() {
-            const e3 = new m2(r7.AReleaseRQ);
+            const e3 = new m(r7.AReleaseRQ);
             return e3.writeUInt32("Reserved", 0), e3;
           }
           read(e3) {
@@ -31326,7 +31326,7 @@ var require_dcmjs_dimse_min = __commonJS({
             }), e3;
           }
           write() {
-            const e3 = new m2(r7.PDataTF);
+            const e3 = new m(r7.PDataTF);
             return this.pdvs.forEach((t3) => {
               t3.write(e3);
             }), e3;
@@ -31335,14 +31335,14 @@ var require_dcmjs_dimse_min = __commonJS({
             const t3 = e3.getLength();
             let s3 = 0;
             for (; s3 < t3; ) {
-              const t4 = new g2();
+              const t4 = new g3();
               s3 += t4.read(e3), this.pdvs.push(t4);
             }
           }
           toString() {
             return `(P-DATA-TF) [PDV count: ${this.getPdvCount()}, PDV length: ${this.getLengthOfPdvs()}]`;
           }
-        }, Pdv: g2, RawPdu: m2 };
+        }, Pdv: g3, RawPdu: m };
       } }, d3 = {}, function e2(t2) {
         var s2 = d3[t2];
         if (void 0 !== s2) return s2.exports;
@@ -31709,8 +31709,8 @@ function wo(r6, e, t) {
   if (!i2 || i2.length === 0) return;
   let o, s = "undefined", a2, c = t.path.lastIndexOf("."), u2 = t.path.substring(c + 1);
   for (let p of i2) {
-    let m2 = u2.replace("[x]", I(p.code));
-    if (o = n[m2], a2 = n["_" + m2], o !== void 0 || a2 !== void 0) {
+    let m = u2.replace("[x]", I(p.code));
+    if (o = n[m], a2 = n["_" + m], o !== void 0 || a2 !== void 0) {
       s = p.code;
       break;
     }
@@ -31898,10 +31898,10 @@ function ht(r6, e) {
   n.setUTCHours(0, 0, 0, 0);
   let i2 = t.getUTCFullYear(), o = t.getUTCMonth(), s = t.getUTCDate(), a2 = n.getUTCFullYear(), c = n.getUTCMonth(), u2 = n.getUTCDate(), p = a2 - i2;
   (c < o || c === o && u2 < s) && p--;
-  let m2 = a2 * 12 + c - (i2 * 12 + o);
-  u2 < s && m2--;
+  let m = a2 * 12 + c - (i2 * 12 + o);
+  u2 < s && m--;
   let x = Math.floor((n.getTime() - t.getTime()) / (1e3 * 60 * 60 * 24));
-  return { years: p, months: m2, days: x };
+  return { years: p, months: m, days: x };
 }
 function ne(r6, ...e) {
   let t = r6;
@@ -33205,7 +33205,7 @@ var $t = class {
     return this.masterSubEmitter || (this.masterSubEmitter = new Ye(...Array.from(this.criteriaEntries.keys()))), this.masterSubEmitter;
   }
 };
-var Yr = "4.2.0-8435fe590";
+var Yr = "4.2.2-aecf657d9";
 var ma = w.FHIR_JSON + ", */*; q=0.1";
 var ya = "https://api.medplum.com/";
 var ga = 1e3;
@@ -33510,8 +33510,8 @@ var Gt = class extends J {
   async createAttachment(t, n, i2, o, s) {
     let a2 = Ni(t, n, i2, o);
     if (a2.contentType === w.XML) {
-      let p = a2.data, m2;
-      p instanceof Blob ? m2 = await new Promise((x, U) => {
+      let p = a2.data, m;
+      p instanceof Blob ? m = await new Promise((x, U) => {
         let $ = new FileReader();
         $.onload = () => {
           if (!$.result) {
@@ -33520,24 +33520,24 @@ var Gt = class extends J {
           }
           x($.result);
         }, $.readAsText(p, "utf-8");
-      }) : ArrayBuffer.isView(p) ? m2 = new TextDecoder().decode(p) : m2 = p, m2.includes("<ClinicalDocument") && m2.includes("urn:hl7-org:v3") && (a2 = { ...a2, contentType: w.CDA_XML });
+      }) : ArrayBuffer.isView(p) ? m = new TextDecoder().decode(p) : m = p, m.includes("<ClinicalDocument") && m.includes("urn:hl7-org:v3") && (a2 = { ...a2, contentType: w.CDA_XML });
     }
     let c = s ?? (typeof n == "object" ? n : {}), u2 = await this.createBinary(a2, c);
     return { contentType: a2.contentType, url: u2.url, title: a2.filename };
   }
   createBinary(t, n, i2, o, s) {
-    let a2 = Ni(t, n, i2, o), c = s ?? (typeof n == "object" ? n : {}), { data: u2, contentType: p, filename: m2, securityContext: x, onProgress: U } = a2, $ = this.fhirUrl("Binary");
-    return m2 && $.searchParams.set("_filename", m2), x?.reference && this.setRequestHeader(c, "X-Security-Context", x.reference), U ? this.uploadwithProgress($, u2, p, U, c) : this.post($, u2, p, c);
+    let a2 = Ni(t, n, i2, o), c = s ?? (typeof n == "object" ? n : {}), { data: u2, contentType: p, filename: m, securityContext: x, onProgress: U } = a2, $ = this.fhirUrl("Binary");
+    return m && $.searchParams.set("_filename", m), x?.reference && this.setRequestHeader(c, "X-Security-Context", x.reference), U ? this.uploadwithProgress($, u2, p, U, c) : this.post($, u2, p, c);
   }
   uploadwithProgress(t, n, i2, o, s) {
     return new Promise((a2, c) => {
       let u2 = new XMLHttpRequest(), p = () => u2.abort();
       s?.signal?.addEventListener("abort", p);
-      let m2 = (x) => {
+      let m = (x) => {
         s?.signal?.removeEventListener("abort", p), x instanceof Error ? c(x) : a2(x);
       };
-      if (u2.responseType = "json", u2.onabort = () => m2(new DOMException("Request aborted", "AbortError")), u2.onerror = () => m2(new Error("Request error")), o && (u2.upload.onprogress = (x) => o(x), u2.upload.onload = (x) => o(x)), u2.onload = () => {
-        u2.status >= 200 && u2.status < 300 ? m2(u2.response) : m2(new d(st(u2.response || u2.statusText)));
+      if (u2.responseType = "json", u2.onabort = () => m(new DOMException("Request aborted", "AbortError")), u2.onerror = () => m(new Error("Request error")), o && (u2.upload.onprogress = (x) => o(x), u2.upload.onload = (x) => o(x)), u2.onload = () => {
+        u2.status >= 200 && u2.status < 300 ? m(u2.response) : m(new d(st(u2.response || u2.statusText)));
       }, u2.open("POST", t), u2.withCredentials = true, u2.setRequestHeader("Authorization", "Bearer " + this.accessToken), u2.setRequestHeader("Cache-Control", "no-cache, no-store, max-age=0"), u2.setRequestHeader("Content-Type", i2), this.options.extendedMode !== false && u2.setRequestHeader("X-Medplum", "extended"), s?.headers) {
         let x = s.headers;
         for (let [U, $] of Object.entries(x)) u2.setRequestHeader(U, $);
@@ -33547,7 +33547,7 @@ var Gt = class extends J {
   }
   async createPdf(t, n, i2, o) {
     if (!this.createPdfImpl) throw new Error("PDF creation not enabled");
-    let s = wa(t, n, i2, o), a2 = typeof n == "object" ? n : {}, { docDefinition: c, tableLayouts: u2, fonts: p, ...m2 } = s, x = await this.createPdfImpl(c, u2, p), U = { ...m2, data: x, contentType: "application/pdf" };
+    let s = wa(t, n, i2, o), a2 = typeof n == "object" ? n : {}, { docDefinition: c, tableLayouts: u2, fonts: p, ...m } = s, x = await this.createPdfImpl(c, u2, p), U = { ...m, data: x, contentType: "application/pdf" };
     return this.createBinary(U, a2);
   }
   createComment(t, n, i2) {
@@ -33594,7 +33594,8 @@ var Gt = class extends J {
     return this.get(`${this.fhirUrl(t, n)}/$graph?graph=${i2}`, o);
   }
   pushToAgent(t, n, i2, o, s, a2) {
-    return this.post(this.fhirUrl("Agent", me(t), "$push"), { destination: typeof n == "string" ? n : B(n), body: i2, contentType: o, waitForResponse: s }, w.FHIR_JSON, a2);
+    let { waitTimeout: c, ...u2 } = a2 ?? {};
+    return this.post(this.fhirUrl("Agent", me(t), "$push"), { destination: typeof n == "string" ? n : B(n), body: i2, contentType: o, waitForResponse: s, ...c !== void 0 ? { waitTimeout: c } : void 0 }, w.FHIR_JSON, u2);
   }
   getActiveLogin() {
     return this.storage.getObject("activeLogin");
@@ -33722,8 +33723,8 @@ var Gt = class extends J {
       if (p) return this.request("GET", p, { ...i2, body: void 0 });
     }
     if (s.status === 202 && i2.pollStatusOnAccepted) {
-      let m2 = await Li(s, u2) ?? o.statusUrl;
-      if (m2) return this.pollStatus(m2, i2, o);
+      let m = await Li(s, u2) ?? o.statusUrl;
+      if (m) return this.pollStatus(m, i2, o);
     }
     if (s.status >= 400) throw new d(st(u2));
     return u2;
@@ -34197,7 +34198,7 @@ async function ln(r6, e, t) {
   return n;
 }
 function Pc(r6) {
-  return /^\d+\.\d+\.\d+$/.test(r6);
+  return /^\d+\.\d+\.\d+(-[0-9a-z]{7})?$/.test(r6);
 }
 async function om(r6, e) {
   if (!Pc(e)) return false;
@@ -34214,8 +34215,13 @@ async function sm(r6) {
   return e.tag_name.slice(1);
 }
 
+// src/main.ts
+var import_node_child_process3 = require("node:child_process");
+var import_node_fs7 = require("node:fs");
+var import_node_path4 = __toESM(require("node:path"));
+
 // src/agent-main.ts
-var import_node_fs4 = require("node:fs");
+var import_node_fs5 = require("node:fs");
 
 // ../hl7/dist/esm/index.mjs
 var import_node_net = require("node:net");
@@ -34252,7 +34258,7 @@ var d2 = class extends a {
     this.socket = e, this.encoding = s, this.enhancedMode = r6, e.on("data", (n) => {
       try {
         if (this.appendData(n), n.at(-2) === 28 && n.at(-1) === 13) {
-          let o = Buffer.concat(this.chunks), g2 = o.subarray(1, o.length - 2), E2 = import_iconv_lite.default.decode(g2, this.encoding), k2 = io.parse(E2);
+          let o = Buffer.concat(this.chunks), p = o.subarray(1, o.length - 2), E2 = import_iconv_lite.default.decode(p, this.encoding), k2 = io.parse(E2);
           this.dispatchEvent(new h2(this, k2)), this.resetBuffer();
         }
       } catch (o) {
@@ -34296,7 +34302,7 @@ var d2 = class extends a {
     this.chunks = [];
   }
 };
-var u = class extends a {
+var f2 = class extends a {
   constructor(t) {
     super(), this.options = t, this.host = this.options.host, this.port = this.options.port, this.encoding = this.options.encoding, this.keepAlive = this.options.keepAlive ?? false, this.connectTimeout = this.options.connectTimeout ?? 3e4;
   }
@@ -34328,16 +34334,20 @@ var u = class extends a {
     this.socket && (this.socket.removeAllListeners(), this.socket.destroy(), this.socket = void 0), this.connection && (this.connection.close(), delete this.connection);
   }
 };
-var f2 = class {
+var g2 = class {
   constructor(t) {
     this.handler = t;
   }
   start(t, e, s = false) {
-    let r6 = import_node_net2.default.createServer((n) => {
-      let o = new d2(n, e, s);
-      this.handler(o);
-    });
-    r6.listen(t), this.server = r6;
+    let r6 = import_node_net2.default.createServer((o) => {
+      let p = new d2(o, e, s);
+      this.handler(p);
+    }), n = async (o) => {
+      o?.code === "EADDRINUSE" && (await _r(50), r6.close(), r6.listen(t));
+    };
+    r6.on("error", n), r6.once("listening", () => {
+      r6.off("error", n);
+    }), r6.listen(t), this.server = r6;
   }
   async stop() {
     return new Promise((t, e) => {
@@ -34358,10 +34368,10 @@ var f2 = class {
 
 // src/app.ts
 var import_node_child_process = require("node:child_process");
-var import_node_fs3 = require("node:fs");
+var import_node_fs4 = require("node:fs");
 var import_node_net3 = require("node:net");
-var import_node_os3 = require("node:os");
-var import_node_process = __toESM(require("node:process"));
+var import_node_os4 = require("node:os");
+var import_node_process2 = __toESM(require("node:process"));
 
 // ../../node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -34545,8 +34555,16 @@ var AgentDicomChannel = class extends BaseChannel {
     this.started = true;
     const address = new URL(this.getEndpoint().address);
     this.log.info(`Channel starting on ${address}`);
-    this.server.on("networkError", (e) => console.log("Network error: ", e));
-    this.server.listen(Number.parseInt(address.port, 10));
+    const port = Number.parseInt(address.port, 10);
+    this.server.on("networkError", async (err) => {
+      this.log.error("Network error: ", { err });
+      if (err?.code === "EADDRINUSE") {
+        await _r(50);
+        this.server.close();
+        this.server.listen(port);
+      }
+    });
+    this.server.listen(port);
     this.log.info("Channel started successfully");
   }
   async stop() {
@@ -34575,7 +34593,7 @@ var AgentHl7Channel = class extends BaseChannel {
     super(app, definition, endpoint);
     this.started = false;
     this.connections = /* @__PURE__ */ new Map();
-    this.server = new f2((connection) => this.handleNewConnection(connection));
+    this.server = new g2((connection) => this.handleNewConnection(connection));
     this.log = app.log.clone({ options: { prefix: `[HL7:${definition.name}] ` } });
   }
   start() {
@@ -34640,26 +34658,169 @@ var AgentHl7ChannelConnection = class {
   }
 };
 
-// src/upgrader-utils.ts
-var import_node_fs2 = require("node:fs");
+// src/pid.ts
+var import_node_fs2 = __toESM(require("node:fs"));
 var import_node_os2 = require("node:os");
-var import_node_path2 = require("node:path");
+var import_node_path2 = __toESM(require("node:path"));
+var import_node_process = __toESM(require("node:process"));
+var EXIT_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
+var pidLogger = new oo((msg) => `[PID]: ${msg}`);
+var pidFileApps = /* @__PURE__ */ new Set();
+var processExitListener = () => {
+  removeAllPidFiles();
+};
+var signalListener = () => {
+  removeAllPidFiles();
+  import_node_process.default.exit(0);
+};
+var uncaughtExceptionListener = (err) => {
+  pidLogger.error("Uncaught exception:", err);
+  removeAllPidFiles();
+  import_node_process.default.exit(1);
+};
+var agentCleanupSetup = false;
+function getPidFilePath(appName) {
+  switch ((0, import_node_os2.platform)()) {
+    case "linux":
+    case "darwin":
+      return import_node_path2.default.join((0, import_node_os2.tmpdir)(), "medplum-agent", `${appName}.pid`);
+    case "win32":
+      return import_node_path2.default.join("C:", "ProgramData", "MedplumAgent", "pids", `${appName}.pid`);
+    default:
+      throw new Error("Invalid OS");
+  }
+}
+function removePidFile(appName) {
+  const pidFilePath = getPidFilePath(appName);
+  if (import_node_fs2.default.existsSync(pidFilePath)) {
+    try {
+      import_node_fs2.default.unlinkSync(pidFilePath);
+      pidLogger.info(`PID file removed: ${pidFilePath}`);
+    } catch (err) {
+      pidLogger.error(`Error removing PID file: ${pidFilePath}`, err);
+    }
+  }
+  pidFileApps.delete(appName);
+}
+function forceKillApp(appName) {
+  const pid = getAppPid(appName);
+  if (pid === void 0) {
+    pidLogger.info(`${appName} not running, skipping killing app`);
+    return;
+  }
+  import_node_process.default.kill(pid, "SIGTERM");
+}
+function checkProcessExists(pid) {
+  try {
+    import_node_process.default.kill(pid, 0);
+    return true;
+  } catch (err) {
+    if (err.code === "ESRCH") {
+      return false;
+    }
+    if (err.code === "EPERM") {
+      return true;
+    }
+    throw err;
+  }
+}
+function isAppRunning(appName) {
+  return getAppPidState(appName) === "running";
+}
+function getAppPid(appName) {
+  const pidFilePath = getPidFilePath(appName);
+  if (!import_node_fs2.default.existsSync(pidFilePath)) {
+    return void 0;
+  }
+  const existingPidStr = import_node_fs2.default.readFileSync(pidFilePath, "utf8").trim();
+  const existingPid = Number.parseInt(existingPidStr, 10);
+  if (Number.isNaN(existingPid)) {
+    pidLogger.warn("PID file does not contain a valid numeric PID");
+    return void 0;
+  }
+  return existingPid;
+}
+function getAppPidState(appName) {
+  const pid = getAppPid(appName);
+  if (pid === void 0) {
+    return "clean";
+  }
+  pidLogger.info(`PID file for ${appName} already exists, checking if process is running`);
+  if (checkProcessExists(pid)) {
+    return "running";
+  }
+  return "stale";
+}
+function createPidFile(appName) {
+  const pid = import_node_process.default.pid;
+  const pidFilePath = getPidFilePath(appName);
+  const pidState = getAppPidState(appName);
+  if (pidState === "running") {
+    throw new Error(`${appName} already running`);
+  }
+  if (pidState === "stale") {
+    pidLogger.info("Stale PID file found. Overwriting...");
+    import_node_fs2.default.unlinkSync(pidFilePath);
+  }
+  ensureDirectoryExists(import_node_path2.default.dirname(pidFilePath));
+  import_node_fs2.default.writeFileSync(pidFilePath, pid.toString(), { flag: "wx" });
+  pidLogger.info(`PID file created at: ${pidFilePath}`);
+  pidFileApps.add(appName);
+  return pidFilePath;
+}
+function ensureDirectoryExists(directoryPath) {
+  if (!import_node_fs2.default.existsSync(directoryPath)) {
+    import_node_fs2.default.mkdirSync(directoryPath, { recursive: true });
+    pidLogger.info(`Directory created: ${directoryPath}`);
+  } else {
+    pidLogger.info(`Directory already exists: ${directoryPath}`);
+  }
+}
+async function waitForPidFile(appName, timeoutMs = 3e3) {
+  const startTime = Date.now();
+  while (!(0, import_node_fs2.existsSync)(getPidFilePath(appName))) {
+    if (Date.now() - startTime > timeoutMs) {
+      throw new Error("Timeout while waiting for PID file");
+    }
+    await _r(0);
+  }
+}
+function removeAllPidFiles() {
+  for (const appName of pidFileApps) {
+    removePidFile(appName);
+  }
+}
+function registerAgentCleanup() {
+  if (!agentCleanupSetup) {
+    import_node_process.default.on("exit", processExitListener);
+    for (const signal of EXIT_SIGNALS) {
+      import_node_process.default.on(signal, signalListener);
+    }
+    import_node_process.default.on("uncaughtException", uncaughtExceptionListener);
+    agentCleanupSetup = true;
+  }
+}
+
+// src/upgrader-utils.ts
+var import_node_fs3 = require("node:fs");
+var import_node_os3 = require("node:os");
+var import_node_path3 = require("node:path");
 var import_node_stream = require("node:stream");
-var UPGRADE_MANIFEST_PATH = (0, import_node_path2.resolve)(__dirname, "upgrade.json");
-var UPGRADER_LOG_PATH = (0, import_node_path2.resolve)(
+var UPGRADE_MANIFEST_PATH = (0, import_node_path3.resolve)(__dirname, "upgrade.json");
+var UPGRADER_LOG_PATH = (0, import_node_path3.resolve)(
   __dirname,
   `upgrader-logs-${(/* @__PURE__ */ new Date()).toISOString().replace(/:\s*/g, "-")}.txt`
 );
-var RELEASES_PATH = (0, import_node_path2.resolve)(__dirname);
-async function downloadRelease(version, path3) {
+var RELEASES_PATH = (0, import_node_path3.resolve)(__dirname);
+async function downloadRelease(version, path4) {
   const release = await ln("agent-upgrader", version);
-  const downloadUrl = parseDownloadUrl(release, (0, import_node_os2.platform)());
+  const downloadUrl = parseDownloadUrl(release, (0, import_node_os3.platform)());
   const { body } = await fetch(downloadUrl);
   if (!body) {
     throw new Error("Body not present on Response");
   }
   const readable = import_node_stream.Readable.fromWeb(body);
-  const writeStream = readable.pipe((0, import_node_fs2.createWriteStream)(path3));
+  const writeStream = readable.pipe((0, import_node_fs3.createWriteStream)(path4));
   return new Promise((resolve2) => {
     writeStream.once("close", resolve2);
   });
@@ -34685,7 +34846,7 @@ function parseDownloadUrl(release, os) {
 }
 function getReleaseBinPath(version) {
   let binaryName;
-  switch ((0, import_node_os2.platform)()) {
+  switch ((0, import_node_os3.platform)()) {
     case "win32":
       binaryName = `medplum-agent-installer-${version}.exe`;
       break;
@@ -34693,9 +34854,9 @@ function getReleaseBinPath(version) {
       binaryName = `medplum-agent-${version}-linux`;
       break;
     default:
-      throw new Error(`Unsupported platform: ${(0, import_node_os2.platform)()}`);
+      throw new Error(`Unsupported platform: ${(0, import_node_os3.platform)()}`);
   }
-  return (0, import_node_path2.resolve)(RELEASES_PATH, binaryName);
+  return (0, import_node_path3.resolve)(RELEASES_PATH, binaryName);
 }
 
 // src/app.ts
@@ -34731,8 +34892,8 @@ var App = class _App {
   async start() {
     this.log.info("Medplum service starting...");
     await this.startWebSocket();
-    await this.maybeFinalizeUpgrade();
     await this.reloadConfig();
+    await this.maybeFinalizeUpgrade();
     this.medplum.addEventListener("change", () => {
       if (!this.webSocket) {
         this.connectWebSocket().catch(this.log.error);
@@ -34743,10 +34904,10 @@ var App = class _App {
     this.log.info("Medplum service started successfully");
   }
   async maybeFinalizeUpgrade() {
-    if ((0, import_node_fs3.existsSync)(UPGRADE_MANIFEST_PATH)) {
-      const upgradeFile = (0, import_node_fs3.readFileSync)(UPGRADE_MANIFEST_PATH, { encoding: "utf-8" });
+    if ((0, import_node_fs4.existsSync)(UPGRADE_MANIFEST_PATH)) {
+      const upgradeFile = (0, import_node_fs4.readFileSync)(UPGRADE_MANIFEST_PATH, { encoding: "utf-8" });
       const upgradeDetails = JSON.parse(upgradeFile);
-      if (upgradeDetails.targetVersion === Yr.split("-")[0]) {
+      if (Yr.startsWith(upgradeDetails.targetVersion)) {
         await this.sendToWebSocket({
           type: "agent:upgrade:response",
           statusCode: 200,
@@ -34762,7 +34923,28 @@ var App = class _App {
         });
         this.log.error(errMsg);
       }
-      (0, import_node_fs3.rmSync)(UPGRADE_MANIFEST_PATH);
+      (0, import_node_fs4.unlinkSync)(UPGRADE_MANIFEST_PATH);
+      await this.tryToCreateAgentPidFile();
+      await waitForPidFile("medplum-upgrading-agent");
+      removePidFile("medplum-upgrading-agent");
+    }
+  }
+  async tryToCreateAgentPidFile() {
+    const maxAttempts = 1e3;
+    let attempt = 0;
+    let success = false;
+    while (!success) {
+      try {
+        createPidFile("medplum-agent");
+        success = true;
+      } catch (_err) {
+        this.log.info("Unable to create agent PID file, trying again...");
+        attempt++;
+        if (attempt === maxAttempts) {
+          throw new Error("Too many unsuccessful attempts to create agent PID file");
+        }
+        await _r(500);
+      }
     }
   }
   async startWebSocket() {
@@ -34899,7 +35081,7 @@ var App = class _App {
     });
   }
   async reloadConfig() {
-    const agent = await this.medplum.readResource("Agent", this.agentId);
+    const agent = await this.medplum.readResource("Agent", this.agentId, { cache: "no-cache" });
     const keepAlive = agent?.setting?.find((setting) => setting.name === "keepAlive")?.valueBoolean;
     if (!keepAlive && this.hl7Clients.size !== 0) {
       for (const client of this.hl7Clients.values()) {
@@ -34925,7 +35107,9 @@ var App = class _App {
     }
     const endpointPromises = [];
     for (const definition of channels) {
-      endpointPromises.push(this.medplum.readReference(definition.endpoint));
+      endpointPromises.push(
+        this.medplum.readReference(definition.endpoint, { cache: "no-cache" })
+      );
     }
     const endpoints = await Promise.all(endpointPromises);
     this.validateAgentEndpoints(channels, endpoints);
@@ -35086,7 +35270,7 @@ var App = class _App {
   }
   // This covers Windows, Linux, and Mac
   getPingCommand(host, count = 1) {
-    return (0, import_node_os3.platform)() === "win32" ? `ping /n ${count} ${host}` : `ping -c ${count} ${host}`;
+    return (0, import_node_os4.platform)() === "win32" ? `ping /n ${count} ${host}` : `ping -c ${count} ${host}`;
   }
   async tryPingHost(message) {
     try {
@@ -35153,7 +35337,8 @@ ${result}`);
     }
   }
   async tryUpgradeAgent(message) {
-    if ((0, import_node_os3.platform)() !== "win32") {
+    this.log.info(`Attempting to upgrade from ${Yr} to ${message.version ?? "latest"}...`);
+    if ((0, import_node_os4.platform)() !== "win32") {
       const errMsg = "Auto-upgrading is currently only supported on Windows";
       this.log.error(errMsg);
       await this.sendToWebSocket({
@@ -35163,6 +35348,17 @@ ${result}`);
       });
       return;
     }
+    const upgradeInProgress = this.isAgentUpgrading();
+    if (upgradeInProgress && !message.force) {
+      const errMsg = "Pending upgrade is already in progress";
+      this.log.error(errMsg);
+      await this.sendToWebSocket({
+        type: "agent:error",
+        callback: message.callback,
+        body: errMsg
+      });
+      return;
+    }
     let child;
     if (message.version && !await om("agent-upgrader", message.version)) {
       const versionTag = message.version ? `v${message.version}` : "latest";
@@ -35188,15 +35384,28 @@ ${result}`);
       }
       this.log.info(`Forcing upgrade from ${Yr} to ${targetVersion}`);
     }
+    if (upgradeInProgress && message.force) {
+      if (isAppRunning("medplum-upgrading-agent")) {
+        removePidFile("medplum-upgrading-agent");
+      }
+      if (isAppRunning("medplum-agent-upgrader")) {
+        forceKillApp("medplum-agent-upgrader");
+        removePidFile("medplum-agent-upgrader");
+      }
+      (0, import_node_fs4.unlinkSync)(UPGRADE_MANIFEST_PATH);
+    }
     try {
       const command = __filename;
-      const logFile = (0, import_node_fs3.openSync)(UPGRADER_LOG_PATH, "w+");
-      child = (0, import_node_child_process.spawn)(command, ["--upgrade"], { detached: true, stdio: ["ignore", logFile, logFile, "ipc"] });
+      const logFile = (0, import_node_fs4.openSync)(UPGRADER_LOG_PATH, "w+");
+      child = (0, import_node_child_process.spawn)(command, ["--upgrade"], {
+        detached: true,
+        stdio: ["ignore", logFile, logFile, "ipc"]
+      });
       child.unref();
       await new Promise((resolve2, reject) => {
         const childTimeout = setTimeout(
           () => reject(new Error("Timed out while waiting for message from child")),
-          5e3
+          15e3
         );
         child.on("message", (msg) => {
           clearTimeout(childTimeout);
@@ -35206,9 +35415,10 @@ ${result}`);
             reject(new Error(`Received unexpected message type ${msg.type} when expected type STARTED`));
           }
         });
-      });
-      child.on("error", (err) => {
-        this.log.error(Oe(err));
+        child.on("error", (err) => {
+          this.log.error(Oe(err));
+          reject(err);
+        });
       });
     } catch (err) {
       const versionTag = message.version ? `v${message.version}` : "latest";
@@ -35222,10 +35432,8 @@ ${result}`);
       return;
     }
     try {
-      await this.stop();
-      this.log.info("Successfully stopped agent network services");
       this.log.info("Writing upgrade manifest...", { previousVersion: Yr, targetVersion });
-      (0, import_node_fs3.writeFileSync)(
+      (0, import_node_fs4.writeFileSync)(
         UPGRADE_MANIFEST_PATH,
         JSON.stringify({
           previousVersion: Yr,
@@ -35240,7 +35448,7 @@ ${result}`);
       this.log.error(
         `Error while stopping agent or messaging child process as part of upgrade: ${Oe(err)}`
       );
-      import_node_process.default.exit(1);
+      import_node_process2.default.exit(1);
     }
   }
   async sendToWebSocket(message) {
@@ -35274,7 +35482,7 @@ ${result}`);
     } else {
       const encoding = address.searchParams.get("encoding") ?? void 0;
       const keepAlive = this.keepAlive;
-      client = new u({
+      client = new f2({
         host: address.hostname,
         port: Number.parseInt(address.port, 10),
         encoding,
@@ -35328,6 +35536,15 @@ ${result}`);
       }
     });
   }
+  isAgentUpgrading() {
+    if ((0, import_node_fs4.existsSync)(UPGRADE_MANIFEST_PATH)) {
+      return true;
+    }
+    if (isAppRunning("medplum-upgrading-agent") || isAppRunning("medplum-agent-upgrader")) {
+      return true;
+    }
+    return false;
+  }
 };
 
 // src/agent-main.ts
@@ -35342,7 +35559,7 @@ async function agentMain(argv) {
     console.log("    clientSecret: The OAuth client secret.");
     console.log("    agentId: The Medplum agent ID.");
     process.exit(0);
-  } else if ((0, import_node_fs4.existsSync)("agent.properties")) {
+  } else if ((0, import_node_fs5.existsSync)("agent.properties")) {
     args = readPropertiesFile("agent.properties");
   } else {
     console.log("Missing arguments");
@@ -35390,109 +35607,10 @@ function readCommandLineArgs(argv) {
 }
 function readPropertiesFile(fileName) {
   return Object.fromEntries(
-    (0, import_node_fs4.readFileSync)(fileName).toString().split("\n").map((line) => line.split("=").map((s) => s.trim()))
+    (0, import_node_fs5.readFileSync)(fileName).toString().split("\n").map((line) => line.split("=").map((s) => s.trim()))
   );
 }
 
-// src/pid.ts
-var import_node_fs5 = __toESM(require("node:fs"));
-var import_node_os4 = require("node:os");
-var import_node_path3 = __toESM(require("node:path"));
-var import_node_process2 = __toESM(require("node:process"));
-var EXIT_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
-var pidLogger = new oo((msg) => `[PID]: ${msg}`);
-var pidFilePaths = /* @__PURE__ */ new Set();
-var processExitListener = () => {
-  removeAllPidFiles();
-};
-var signalListener = () => {
-  removeAllPidFiles();
-  import_node_process2.default.exit(0);
-};
-var uncaughtExceptionListener = (err) => {
-  pidLogger.error("Uncaught exception:", err);
-  removeAllPidFiles();
-  import_node_process2.default.exit(1);
-};
-var agentCleanupSetup = false;
-function getPidFilePath(appName) {
-  switch ((0, import_node_os4.platform)()) {
-    case "linux":
-    case "darwin":
-      return import_node_path3.default.join((0, import_node_os4.tmpdir)(), "medplum-agent", `${appName}.pid`);
-    case "win32":
-      return import_node_path3.default.join("C:", "ProgramData", "MedplumAgent", "pids", `${appName}.pid`);
-    default:
-      throw new Error("Invalid OS");
-  }
-}
-function removePidFile(pidFilePath) {
-  if (import_node_fs5.default.existsSync(pidFilePath)) {
-    try {
-      import_node_fs5.default.unlinkSync(pidFilePath);
-      pidLogger.info(`PID file removed: ${pidFilePath}`);
-    } catch (err) {
-      pidLogger.error(`Error removing PID file: ${pidFilePath}`, err);
-    }
-  }
-  pidFilePaths.delete(pidFilePath);
-}
-function checkProcessExists(pid) {
-  try {
-    import_node_process2.default.kill(pid, 0);
-    return true;
-  } catch (err) {
-    if (err.code === "ESRCH") {
-      return false;
-    }
-    if (err.code === "EPERM") {
-      return true;
-    }
-    throw err;
-  }
-}
-function createPidFile(appName) {
-  const pid = import_node_process2.default.pid;
-  const pidFilePath = getPidFilePath(appName);
-  if (import_node_fs5.default.existsSync(pidFilePath)) {
-    const existingPid = import_node_fs5.default.readFileSync(pidFilePath, "utf8").trim();
-    pidLogger.info("Checking if process is running");
-    if (checkProcessExists(Number.parseInt(existingPid, 10))) {
-      throw new Error(`${appName} already running`);
-    }
-    pidLogger.info("Stale PID file found. Overwriting...");
-    import_node_fs5.default.unlinkSync(pidFilePath);
-  }
-  ensureDirectoryExists(import_node_path3.default.dirname(pidFilePath));
-  import_node_fs5.default.writeFileSync(pidFilePath, pid.toString(), { flag: "wx" });
-  pidLogger.info(`PID file created at: ${pidFilePath}`);
-  pidFilePaths.add(pidFilePath);
-  return pidFilePath;
-}
-function ensureDirectoryExists(directoryPath) {
-  if (!import_node_fs5.default.existsSync(directoryPath)) {
-    import_node_fs5.default.mkdirSync(directoryPath, { recursive: true });
-    pidLogger.info(`Directory created: ${directoryPath}`);
-  } else {
-    pidLogger.info(`Directory already exists: ${directoryPath}`);
-  }
-}
-function removeAllPidFiles() {
-  for (const pidFilePath of pidFilePaths) {
-    removePidFile(pidFilePath);
-  }
-}
-function registerAgentCleanup() {
-  if (!agentCleanupSetup) {
-    import_node_process2.default.on("exit", processExitListener);
-    for (const signal of EXIT_SIGNALS) {
-      import_node_process2.default.on(signal, signalListener);
-    }
-    import_node_process2.default.on("uncaughtException", uncaughtExceptionListener);
-    agentCleanupSetup = true;
-  }
-}
-
 // src/upgrader.ts
 var import_node_child_process2 = require("node:child_process");
 var import_node_fs6 = require("node:fs");
@@ -35510,11 +35628,8 @@ async function upgraderMain(argv) {
   let rejectOnTimeout;
   const disconnectedPromise = new Promise((resolve2, reject) => {
     rejectOnTimeout = () => reject(new Error("Timed out while waiting for IPC to disconnect"));
-    import_node_process3.default.once("disconnect", () => {
-      resolve2();
-    });
+    import_node_process3.default.once("disconnect", resolve2);
   });
-  import_node_process3.default.send({ type: "STARTED" });
   if (argv[3] && !Pc(argv[3])) {
     throw new Error("Invalid version specified");
   }
@@ -35525,20 +35640,14 @@ async function upgraderMain(argv) {
     await downloadRelease(version, binPath);
     globalLogger.info("Release successfully downloaded");
   }
+  import_node_process3.default.send({ type: "STARTED" });
   globalLogger.info("Waiting for parent to disconnect from IPC...");
   const disconnectTimeout = setTimeout(rejectOnTimeout, 5e3);
   await disconnectedPromise;
   clearTimeout(disconnectTimeout);
-  try {
-    globalLogger.info("Stopping running agent service...");
-    (0, import_node_child_process2.execSync)('net stop "Medplum Agent"');
-    globalLogger.info("Agent service stopped succesfully");
-  } catch (_err) {
-    globalLogger.info("Agent service not running, skipping stopping the service");
-  }
   try {
     globalLogger.info("Running installer silently", { binPath });
-    (0, import_node_child_process2.spawnSync)(binPath, ["/S"]);
+    (0, import_node_child_process2.spawnSync)(`"${binPath}" /S`, { windowsHide: true, shell: true });
     globalLogger.info(`Agent version ${version} successfully installed`);
   } catch (err) {
     globalLogger.error(`Error while attempting to run installer: ${Oe(err)}`);
@@ -35555,11 +35664,65 @@ async function upgraderMain(argv) {
 }
 
 // src/main.ts
+var TEMP_LOG_FILE = import_node_path4.default.join(
+  (0, import_node_path4.dirname)(UPGRADE_MANIFEST_PATH),
+  `stop-service-logs-${(/* @__PURE__ */ new Date()).toISOString().replace(/:\s*/g, "-")}.txt`
+);
 async function main(argv) {
   registerAgentCleanup();
   if (argv[2] === "--upgrade") {
     createPidFile("medplum-agent-upgrader");
     await upgraderMain(argv);
+  } else if (argv[2] === "--remove-old-services") {
+    const logFileFd = (0, import_node_fs7.openSync)(TEMP_LOG_FILE, "a");
+    let allAgentServices = [];
+    const currentServiceName = `MedplumAgent_${Yr}`;
+    while (!allAgentServices.includes(currentServiceName)) {
+      const output = (0, import_node_child_process3.execSync)('cmd.exe /c sc query type= service state= all | findstr /i "SERVICE_NAME.*MedplumAgent"');
+      (0, import_node_fs7.appendFileSync)(logFileFd, `${output}\r
+`, { encoding: "utf-8" });
+      allAgentServices = output.toString().trim().split("\n").map((line) => line.replace("SERVICE_NAME: ", "").trim());
+      (0, import_node_fs7.appendFileSync)(logFileFd, `All services: \r
+${allAgentServices.join("\r\n")}\r
+`, { encoding: "utf-8" });
+    }
+    const servicesToRemove = argv[3] === "--all" ? allAgentServices : allAgentServices.filter((serviceName) => serviceName !== `MedplumAgent_${Yr}`);
+    (0, import_node_fs7.appendFileSync)(logFileFd, `Medplum agent service to filter out: MedplumAgent_${Yr}\r
+`, {
+      encoding: "utf-8"
+    });
+    for (const serviceName of servicesToRemove) {
+      try {
+        (0, import_node_child_process3.execSync)(`net stop ${serviceName}`);
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${serviceName} stopped\r
+`, { encoding: "utf-8" });
+        console.log(`${serviceName} stopped`);
+      } catch (err) {
+        (0, import_node_fs7.appendFileSync)(logFileFd, `Failed to stop service: ${serviceName}\r
+`, { encoding: "utf-8" });
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${Oe(err)}\r
+`, { encoding: "utf-8" });
+        console.error(`Failed to stop service: ${serviceName}`);
+        console.error(Oe(err));
+      }
+      try {
+        (0, import_node_child_process3.execSync)(`sc.exe delete ${serviceName}`);
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${serviceName} deleted\r
+`, { encoding: "utf-8" });
+        console.log(`${serviceName} deleted`);
+      } catch (err) {
+        (0, import_node_fs7.appendFileSync)(logFileFd, `Failed to delete service: ${serviceName}\r
+`, { encoding: "utf-8" });
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${Oe(err)}\r
+`, { encoding: "utf-8" });
+        console.error(`Failed to delete service: ${serviceName}`);
+        console.error(Oe(err));
+      }
+    }
+    (0, import_node_fs7.closeSync)(logFileFd);
+  } else if ((0, import_node_fs7.existsSync)(UPGRADE_MANIFEST_PATH)) {
+    createPidFile("medplum-upgrading-agent");
+    await agentMain(argv);
   } else {
     createPidFile("medplum-agent");
     await agentMain(argv);