@medplum/agent 5.1.17 → 5.1.18

package/dist/cjs/index.cjs

@@ -7,7 +7,11 @@ var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -4927,6 +4931,7 @@ var require_range = __commonJS({
       return comp;
     };
     var isX = (id) => !id || id.toLowerCase() === "x" || id === "*";
+    var invalidXRangeOrder = (M2, m3, p2) => isX(M2) && !isX(m3) || isX(m3) && p2 && !isX(p2);
     var replaceTildes = (comp, options) => {
       return comp.trim().split(/\s+/).map((c2) => replaceTilde(c2, options)).join(" ");
     };
@@ -4986,9 +4991,9 @@ var require_range = __commonJS({
           debug("no pr");
           if (M2 === "0") {
             if (m3 === "0") {
-              ret = `>=${M2}.${m3}.${p2}${z2} <${M2}.${m3}.${+p2 + 1}-0`;
+              ret = `>=${M2}.${m3}.${p2} <${M2}.${m3}.${+p2 + 1}-0`;
             } else {
-              ret = `>=${M2}.${m3}.${p2}${z2} <${M2}.${+m3 + 1}.0-0`;
+              ret = `>=${M2}.${m3}.${p2} <${M2}.${+m3 + 1}.0-0`;
             }
           } else {
             ret = `>=${M2}.${m3}.${p2} <${+M2 + 1}.0.0-0`;
@@ -5007,6 +5012,9 @@ var require_range = __commonJS({
       const r6 = options.loose ? re2[t.XRANGELOOSE] : re2[t.XRANGE];
       return comp.replace(r6, (ret, gtlt, M2, m3, p2, pr) => {
         debug("xRange", comp, ret, gtlt, M2, m3, p2, pr);
+        if (invalidXRangeOrder(M2, m3, p2)) {
+          return comp;
+        }
         const xM = isX(M2);
         const xm = xM || isX(m3);
         const xp = xm || isX(p2);
@@ -19965,12 +19973,12 @@ var require_dcmjs = __commonJS({
           value: function xyz2LAB(xyz) {
             var whitePoint = Colors3.d65WhitePointXYZ();
             var X = xyz[0] / whitePoint[0];
-            var Y = xyz[1] / whitePoint[1];
-            var Z2 = xyz[2] / whitePoint[2];
+            var Y2 = xyz[1] / whitePoint[1];
+            var Z = xyz[2] / whitePoint[2];
             X = Colors3.labf(X);
-            Y = Colors3.labf(Y);
-            Z2 = Colors3.labf(Z2);
-            return [116 * Y - 16, 500 * (X - Y), 200 * (Y - Z2)];
+            Y2 = Colors3.labf(Y2);
+            Z = Colors3.labf(Z);
+            return [116 * Y2 - 16, 500 * (X - Y2), 200 * (Y2 - Z)];
           }
         }, {
           key: "lab2RGB",
@@ -35853,8 +35861,8 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 371(e2, t2, s2) {
-        const { Association: n2 } = s2(570), { AAbort: i2, AAssociateAC: r7, AAssociateRJ: o3, AAssociateRQ: a2, AReleaseRP: c3, AReleaseRQ: d3, PDataTF: u2, Pdv: h2, RawPdu: m3 } = s2(942), { CommandFieldType: g2, RawPduType: l, Status: p2 } = s2(492), { CCancelRequest: R3, CEchoRequest: S3, CEchoResponse: y3, CFindRequest: f2, CFindResponse: I2, CGetRequest: C3, CGetResponse: P2, CMoveRequest: v2, CMoveResponse: x2, Command: A3, CStoreRequest: U2, CStoreResponse: w, NActionRequest: D2, NActionResponse: q, NCreateRequest: E2, NCreateResponse: T2, NDeleteRequest: b3, NDeleteResponse: O3, NEventReportRequest: N3, NEventReportResponse: B3, NGetRequest: M2, NGetResponse: L2, NSetRequest: F2, NSetResponse: k2, Response: $2 } = s2(940), V2 = s2(825), j2 = s2(139), _2 = s2(906), G2 = s2(73), z2 = s2(547), { SmartBuffer: Q3 } = s2(766), { EOL: W3 } = s2(857), J = s2(0), X = s2(235);
-        class H2 extends J {
+        const { Association: n2 } = s2(570), { AAbort: i2, AAssociateAC: r7, AAssociateRJ: o3, AAssociateRQ: a2, AReleaseRP: c3, AReleaseRQ: d3, PDataTF: u2, Pdv: h2, RawPdu: m3 } = s2(942), { CommandFieldType: g2, RawPduType: l, Status: p2 } = s2(492), { CCancelRequest: R3, CEchoRequest: S3, CEchoResponse: y3, CFindRequest: f2, CFindResponse: I2, CGetRequest: C3, CGetResponse: P2, CMoveRequest: v2, CMoveResponse: x2, Command: A3, CStoreRequest: U2, CStoreResponse: w, NActionRequest: D2, NActionResponse: q, NCreateRequest: E2, NCreateResponse: T2, NDeleteRequest: b3, NDeleteResponse: O3, NEventReportRequest: N3, NEventReportResponse: B3, NGetRequest: M2, NGetResponse: L2, NSetRequest: F2, NSetResponse: k2, Response: $2 } = s2(940), V2 = s2(825), j2 = s2(139), _2 = s2(906), G2 = s2(73), z2 = s2(547), { SmartBuffer: Q3 } = s2(766), { EOL: W3 } = s2(857), J2 = s2(0), X = s2(235);
+        class H2 extends J2 {
           constructor() {
             super();
           }
@@ -35887,7 +35895,7 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
         }
-        e2.exports = class extends J {
+        e2.exports = class extends J2 {
           constructor(e3, t3) {
             super(), this.messageId = 0, this.socket = e3, this.requests = [], this.pending = [], this.dimseStream = void 0, this.dimseStoreStream = void 0, this.dimse = void 0, t3 = t3 || {}, this.connectTimeout = t3.connectTimeout || 18e4, this.associationTimeout = t3.associationTimeout || 6e4, this.pduTimeout = t3.pduTimeout || 6e4, this.logCommandDatasets = t3.logCommandDatasets || false, this.logDatasets = t3.logDatasets || false, this.datasetReadOptions = t3.datasetReadOptions || {}, this.datasetWriteOptions = t3.datasetWriteOptions || {}, this.datasetNameMap = t3.datasetNameMap || {}, this.datasetTranscodeOptions = t3.datasetTranscodeOptions || {}, this.logId = "", this.connected = false, this.connectedTime = void 0, this.lastPduTime = void 0, this.timeoutIntervalId = void 0, this.statistics = new _2(), this._wrapSocket();
           }
@@ -36830,7 +36838,7 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 237(e2, t2, s2) {
-        const { Association: n2, PresentationContext: i2 } = s2(570), { Scp: r7, Server: o3 } = s2(538), { CCancelRequest: a2, CEchoRequest: c3, CEchoResponse: d3, CFindRequest: u2, CFindResponse: h2, CGetRequest: m3, CGetResponse: g2, CMoveRequest: l, CMoveResponse: p2, CStoreRequest: R3, CStoreResponse: S3, NActionRequest: y3, NActionResponse: f2, NCreateRequest: I2, NCreateResponse: C3, NDeleteRequest: P2, NDeleteResponse: v2, NEventReportRequest: x2, NEventReportResponse: A3, NGetRequest: U2, NGetResponse: w, NSetRequest: D2, NSetResponse: q } = s2(940), { AbortReason: E2, AbortSource: T2, CommandFieldType: b3, PresentationContextResult: O3, Priority: N3, RawPduType: B3, RejectReason: M2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: V2, TransferSyntax: j2, Uid: _2, UserIdentityType: G2 } = s2(492), z2 = s2(422), Q3 = s2(825), W3 = s2(139), J = s2(906), X = s2(73), H2 = { association: { Association: n2, PresentationContext: i2 }, Client: z2, constants: { AbortReason: E2, AbortSource: T2, CommandFieldType: b3, PresentationContextResult: O3, Priority: N3, RawPduType: B3, RejectReason: M2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: V2, TransferSyntax: j2, Uid: _2, UserIdentityType: G2 }, Dataset: Q3, Implementation: W3, log: s2(547), requests: { CCancelRequest: a2, CEchoRequest: c3, CFindRequest: u2, CGetRequest: m3, CMoveRequest: l, CStoreRequest: R3, NActionRequest: y3, NCreateRequest: I2, NDeleteRequest: P2, NEventReportRequest: x2, NGetRequest: U2, NSetRequest: D2 }, responses: { CEchoResponse: d3, CFindResponse: h2, CGetResponse: g2, CMoveResponse: p2, CStoreResponse: S3, NActionResponse: f2, NCreateResponse: C3, NDeleteResponse: v2, NEventReportResponse: A3, NGetResponse: w, NSetResponse: q }, Scp: r7, Server: o3, Statistics: J, Transcoding: X, version: s2(837) };
+        const { Association: n2, PresentationContext: i2 } = s2(570), { Scp: r7, Server: o3 } = s2(538), { CCancelRequest: a2, CEchoRequest: c3, CEchoResponse: d3, CFindRequest: u2, CFindResponse: h2, CGetRequest: m3, CGetResponse: g2, CMoveRequest: l, CMoveResponse: p2, CStoreRequest: R3, CStoreResponse: S3, NActionRequest: y3, NActionResponse: f2, NCreateRequest: I2, NCreateResponse: C3, NDeleteRequest: P2, NDeleteResponse: v2, NEventReportRequest: x2, NEventReportResponse: A3, NGetRequest: U2, NGetResponse: w, NSetRequest: D2, NSetResponse: q } = s2(940), { AbortReason: E2, AbortSource: T2, CommandFieldType: b3, PresentationContextResult: O3, Priority: N3, RawPduType: B3, RejectReason: M2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: V2, TransferSyntax: j2, Uid: _2, UserIdentityType: G2 } = s2(492), z2 = s2(422), Q3 = s2(825), W3 = s2(139), J2 = s2(906), X = s2(73), H2 = { association: { Association: n2, PresentationContext: i2 }, Client: z2, constants: { AbortReason: E2, AbortSource: T2, CommandFieldType: b3, PresentationContextResult: O3, Priority: N3, RawPduType: B3, RejectReason: M2, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: V2, TransferSyntax: j2, Uid: _2, UserIdentityType: G2 }, Dataset: Q3, Implementation: W3, log: s2(547), requests: { CCancelRequest: a2, CEchoRequest: c3, CFindRequest: u2, CGetRequest: m3, CMoveRequest: l, CStoreRequest: R3, NActionRequest: y3, NCreateRequest: I2, NDeleteRequest: P2, NEventReportRequest: x2, NGetRequest: U2, NSetRequest: D2 }, responses: { CEchoResponse: d3, CFindResponse: h2, CGetResponse: g2, CMoveResponse: p2, CStoreResponse: S3, NActionResponse: f2, NCreateResponse: C3, NDeleteResponse: v2, NEventReportResponse: A3, NGetResponse: w, NSetResponse: q }, Scp: r7, Server: o3, Statistics: J2, Transcoding: X, version: s2(837) };
         e2.exports = H2;
       }, 547(e2, t2, s2) {
         const n2 = s2(360), i2 = s2(707);
@@ -45883,11 +45891,11 @@ var require_http = __commonJS({
       _doBatch(options, callback, auth, path4) {
         this.batchOptions.push(options);
         if (this.batchOptions.length === 1) {
-          const me = this;
+          const me2 = this;
           this.batchCallback = callback;
           this.batchTimeoutID = setTimeout(function() {
-            me.batchTimeoutID = -1;
-            me._doBatchRequest(me.batchCallback, auth, path4);
+            me2.batchTimeoutID = -1;
+            me2._doBatchRequest(me2.batchCallback, auth, path4);
           }, this.batchInterval);
         }
         if (this.batchOptions.length === this.batchCount) {
@@ -52773,7 +52781,7 @@ module.exports = __toCommonJS(main_exports);
 var Lo = Object.defineProperty;
 var No = (r6, e, t) => e in r6 ? Lo(r6, e, { enumerable: true, configurable: true, writable: true, value: t }) : r6[e] = t;
 var c = (r6, e, t) => No(r6, typeof e != "symbol" ? e + "" : e, t);
-var K = class {
+var Y = class {
   constructor(e = 10) {
     c(this, "max");
     c(this, "cache");
@@ -52898,7 +52906,7 @@ var fr = class {
     return this.infixParselets[e.id === "Symbol" ? e.value : e.id];
   }
 };
-function oe(r6) {
+function se(r6) {
   if (r6 !== void 0) return Array.isArray(r6) ? r6 : [r6];
 }
 var ft = "http://hl7.org";
@@ -52909,11 +52917,11 @@ var yr = "not-found";
 var vr = "unauthorized";
 var gt = "accepted";
 var Fn = { resourceType: "OperationOutcome", id: yr, issue: [{ severity: "error", code: "not-found", details: { text: "Not found" } }] };
-var Ne = { resourceType: "OperationOutcome", id: vr, issue: [{ severity: "error", code: "login", details: { text: "Unauthorized" } }] };
-var Un = { ...Ne, issue: [...Ne.issue, { severity: "error", code: "expired", details: { text: "Token expired" } }] };
-var Tr = { ...Ne, issue: [...Ne.issue, { severity: "error", code: "invalid", details: { text: "Token not issued for this audience" } }] };
+var Fe = { resourceType: "OperationOutcome", id: vr, issue: [{ severity: "error", code: "login", details: { text: "Unauthorized" } }] };
+var Un = { ...Fe, issue: [...Fe.issue, { severity: "error", code: "expired", details: { text: "Token expired" } }] };
+var Tr = { ...Fe, issue: [...Fe.issue, { severity: "error", code: "invalid", details: { text: "Token not issued for this audience" } }] };
 function P(r6, e) {
-  return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "invalid", details: { text: r6 }, ...e ? { expression: oe(e) } : void 0 }] };
+  return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "invalid", details: { text: r6 }, ...e ? { expression: se(e) } : void 0 }] };
 }
 function T(r6, e, t, n) {
   return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: t ?? "structure", details: { text: r6 }, ...e ? { expression: e } : void 0, ...n ? { diagnostics: n } : void 0 }] };
@@ -52935,9 +52943,9 @@ var f = class extends Error {
   }
 };
 function yt(r6) {
-  return r6 instanceof f ? r6.outcome : ze(r6) ? r6 : P(Se(r6));
+  return r6 instanceof f ? r6.outcome : ze(r6) ? r6 : P(be(r6));
 }
-function Se(r6) {
+function be(r6) {
   return r6 ? typeof r6 == "string" ? r6 : Sr(r6) ? r6.message : ze(r6) ? Bn(r6) : typeof r6 == "object" && "code" in r6 && typeof r6.code == "string" ? r6.code : JSON.stringify(r6) : "Unknown error";
 }
 function Bn(r6) {
@@ -52961,7 +52969,7 @@ var $n = { Element: { elements: { id: { type: [{ code: "string" }] }, extension:
 function Pr(r6) {
   return new Rr(r6).parse();
 }
-var Ee = jn($n);
+var Re = jn($n);
 var Ar = /* @__PURE__ */ Object.create(null);
 var Hn = /* @__PURE__ */ Object.create(null);
 var jo = { "http://hl7.org/fhir/StructureDefinition/MoneyQuantity": "MoneyQuantity", "http://hl7.org/fhir/StructureDefinition/SimpleQuantity": "SimpleQuantity", "http://hl7.org/fhir/uv/sql-on-fhir/StructureDefinition/ViewDefinition": "ViewDefinition" };
@@ -52978,19 +52986,19 @@ function Or(r6) {
   if (!r6?.name) throw new Error("Failed loading StructureDefinition from bundle");
   if (r6.resourceType !== "StructureDefinition") return;
   let e = Pr(r6), t = jo[r6.url], n, i;
-  t ? (n = Ee, i = t) : r6.url === `http://hl7.org/fhir/StructureDefinition/${r6.type}` || r6.url === `https://medplum.com/fhir/StructureDefinition/${r6.type}` || r6.type?.startsWith("http://") || r6.type?.startsWith("https://") ? (n = Ee, i = r6.type) : (n = Jn(r6.url), i = r6.type), n[i] = e;
+  t ? (n = Re, i = t) : r6.url === `http://hl7.org/fhir/StructureDefinition/${r6.type}` || r6.url === `https://medplum.com/fhir/StructureDefinition/${r6.type}` || r6.type?.startsWith("http://") || r6.type?.startsWith("https://") ? (n = Re, i = r6.type) : (n = Jn(r6.url), i = r6.type), n[i] = e;
   for (let o2 of e.innerTypes) o2.parentType = e, n[o2.name] = o2;
   Ar[r6.url] = e;
 }
 function Yn(r6) {
-  return !!Ee[r6];
+  return !!Re[r6];
 }
-function Re(r6, e) {
+function Ce(r6, e) {
   if (e) {
     let t = Jn(e)[r6];
     if (t) return t;
   }
-  return Ee[r6];
+  return Re[r6];
 }
 function Xn(r6) {
   return !!Ar[r6];
@@ -53039,12 +53047,12 @@ var Rr = class {
     return this.checkFieldExit(), this.innerTypes.length > 0 && (this.resourceSchema.innerTypes = this.innerTypes), this.resourceSchema;
   }
   checkFieldEnter(e, t) {
-    this.isInnerType(e) && this.enterInnerType(e), this.slicingContext && !Fe(this.slicingContext.path, e?.path) && (this.slicingContext = void 0), e.slicing && !this.slicingContext && this.enterSlice(e, t);
+    this.isInnerType(e) && this.enterInnerType(e), this.slicingContext && !Ue(this.slicingContext.path, e?.path) && (this.slicingContext = void 0), e.slicing && !this.slicingContext && this.enterSlice(e, t);
   }
   enterInnerType(e) {
-    for (; this.backboneContext && !Fe(this.backboneContext?.path, e.path); ) this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
+    for (; this.backboneContext && !Ue(this.backboneContext?.path, e.path); ) this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
     let t = Cr(e);
-    this.backboneContext = { type: { name: t, type: t, path: e.path, title: e.label, description: e.definition, elements: {}, constraints: this.parseElementDefinition(e).constraints, innerTypes: [] }, path: e.path, parent: Fe(this.backboneContext?.path, e.path) ? this.backboneContext : this.backboneContext?.parent };
+    this.backboneContext = { type: { name: t, type: t, path: e.path, title: e.label, description: e.definition, elements: {}, constraints: this.parseElementDefinition(e).constraints, innerTypes: [] }, path: e.path, parent: Ue(this.backboneContext?.path, e.path) ? this.backboneContext : this.backboneContext?.parent };
   }
   enterSlice(e, t) {
     Go(e) && !this.peek()?.sliceName || (t.slicing = { discriminator: (e.slicing?.discriminator ?? []).map((n) => {
@@ -53053,9 +53061,9 @@ var Rr = class {
     }), slices: [], ordered: e.slicing?.ordered ?? false, rule: e.slicing?.rules }, this.slicingContext = { field: t.slicing, path: e.path ?? "" });
   }
   checkFieldExit(e = void 0) {
-    if (this.backboneContext && !Fe(this.backboneContext.path, e?.path)) if (this.backboneContext.parent) do
+    if (this.backboneContext && !Ue(this.backboneContext.path, e?.path)) if (this.backboneContext.parent) do
       this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
-    while (this.backboneContext && !Fe(this.backboneContext.path, e?.path));
+    while (this.backboneContext && !Ue(this.backboneContext.path, e?.path));
     else this.innerTypes.push(this.backboneContext.type), this.backboneContext = void 0;
   }
   next() {
@@ -53074,7 +53082,7 @@ var Rr = class {
   }
   isInnerType(e) {
     let t = this.peek();
-    return !!(Fe(e?.path, t?.path) && e.type?.some((n) => ["BackboneElement", "Element"].includes(n.code)));
+    return !!(Ue(e?.path, t?.path) && e.type?.some((n) => ["BackboneElement", "Element"].includes(n.code)));
   }
   parseSliceStart(e) {
     if (!this.slicingContext) throw new Error(`Invalid slice start before discriminator: ${e.sliceName} (${e.id})`);
@@ -53083,7 +53091,7 @@ var Rr = class {
   parseElementDefinitionType(e) {
     return (e.type ?? []).map((t) => {
       let n;
-      return (t.code === "BackboneElement" || t.code === "Element") && (n = Cr(e)), n || (n = pe(t, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")?.valueUrl), n || (n = t.code ?? ""), { code: n, targetProfile: t.targetProfile, profile: t.profile };
+      return (t.code === "BackboneElement" || t.code === "Element") && (n = Cr(e)), n || (n = fe(t, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")?.valueUrl), n || (n = t.code ?? ""), { code: n, targetProfile: t.targetProfile, profile: t.profile };
     });
   }
   parseElementDefinition(e) {
@@ -53100,7 +53108,7 @@ function Er(r6, e = "") {
 function Ho(r6, e) {
   return r6 ? e && r6.startsWith(e) ? r6.substring(e.length + 1) : r6 : "";
 }
-function Fe(r6, e) {
+function Ue(r6, e) {
   return !r6 || !e ? false : e.startsWith(r6 + ".") || e === r6;
 }
 function zn(r6) {
@@ -53122,7 +53130,7 @@ function zo(r6, e, t) {
   let n = e ? e + "." : "";
   return r6 === void 0 ? { type: "undefined", value: void 0, path: `${n}${t}` } : Array.isArray(r6) ? r6.map((i, o2) => ({ ...i, path: `${n}${t}[${o2}]` })) : { ...r6, path: `${n}${t}` };
 }
-var Jo = new K(1e3);
+var Jo = new Y(1e3);
 var Tt = { canonical: /^\S*$/, code: /^[^\s]+( [^\s]+)*$/, date: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2]\d|3[0-1]))?)?$/, dateTime: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2]\d|3[0-1])(T([01]\d|2[0-3])(:[0-5]\d:([0-5]\d|60)(\.\d{1,9})?)?)?)?(Z|[+-]((0\d|1[0-3]):[0-5]\d|14:00)?)?)?$/, id: /^[A-Za-z0-9\-.]{1,64}$/, instant: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2]\d|3[0-1])T([01]\d|2[0-3]):[0-5]\d:([0-5]\d|60)(\.\d{1,9})?(Z|[+-]((0\d|1[0-3]):[0-5]\d|14:00))$/, markdown: /^[\r\n\t\u0020-\uFFFF]+$/, oid: /^urn:oid:[0-2](\.(0|[1-9]\d*))+$/, string: /^[\r\n\t\u0020-\uFFFF]+$/, time: /^([01]\d|2[0-3]):[0-5]\d:([0-5]\d|60)(\.\d{1,9})?$/, uri: /^\S*$/, url: /^\S*$/, uuid: /^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/, xhtml: /.*/ };
 function h(r6) {
   return [{ type: d.boolean, value: r6 }];
@@ -53240,7 +53248,7 @@ function Et(r6, e) {
     case "Date":
       return ai(t);
     case "DateTime":
-      return Be(t);
+      return We(t);
     case "Time":
       return typeof t == "string" && !!/^T\d/.exec(t);
     case "Period":
@@ -53254,11 +53262,11 @@ function Et(r6, e) {
 function ai(r6) {
   return typeof r6 == "string" && !!Tt.date.exec(r6);
 }
-function Be(r6) {
+function We(r6) {
   return typeof r6 == "string" && !!Tt.dateTime.exec(r6);
 }
 function ci(r6) {
-  return !!(r6 && typeof r6 == "object" && ("start" in r6 && Be(r6.start) || "end" in r6 && Be(r6.end)));
+  return !!(r6 && typeof r6 == "object" && ("start" in r6 && We(r6.start) || "end" in r6 && We(r6.end)));
 }
 function V(r6) {
   return !!(r6 && typeof r6 == "object" && "value" in r6 && typeof r6.value == "number");
@@ -53293,16 +53301,16 @@ function cs(r6, e) {
 function Xe(r6, e) {
   return I(r6, e) && "id" in r6 && typeof r6.id == "string";
 }
-function Ce(r6) {
+function Pe(r6) {
   let e = O(r6) ?? "undefined/undefined", t = ls(r6);
   return t === e ? { reference: e } : { reference: e, display: t };
 }
 function O(r6) {
-  if (Q(r6)) return r6.reference;
+  if (z(r6)) return r6.reference;
   if (Xe(r6)) return `${r6.resourceType}/${r6.id}`;
 }
-function Pe(r6) {
-  if (r6) return Q(r6) ? r6.reference.split("/")[1] : r6.id;
+function Ae(r6) {
+  if (r6) return z(r6) ? r6.reference.split("/")[1] : r6.id;
 }
 function us(r6) {
   return r6.resourceType === "Patient" || r6.resourceType === "Practitioner" || r6.resourceType === "RelatedPerson";
@@ -53347,7 +53355,7 @@ function Pt(r6, e) {
   let v2 = Math.floor((n.getTime() - t.getTime()) / (1e3 * 60 * 60 * 24));
   return { years: p2, months: g2, days: v2 };
 }
-function pe(r6, ...e) {
+function fe(r6, ...e) {
   let t = r6;
   for (let n = 0; n < e.length && t; n++) t = t?.extension?.find((i) => i.url === e[n]);
   return t;
@@ -53380,19 +53388,19 @@ function ms(r6) {
 function A(r6) {
   if (r6 == null) return true;
   let e = typeof r6;
-  return e === "string" || e === "object" ? !se(r6) : false;
+  return e === "string" || e === "object" ? !ae(r6) : false;
 }
-function se(r6) {
+function ae(r6) {
   if (r6 == null) return false;
   let e = typeof r6;
   return e === "string" && r6 !== "" || e === "object" && ("length" in r6 && r6.length > 0 || Object.keys(r6).length > 0);
 }
-function fe(r6, e, t) {
+function me(r6, e, t) {
   return r6 === e || A(r6) && A(e) ? true : A(r6) || A(e) ? false : Array.isArray(r6) && Array.isArray(e) ? hs(r6, e) : Array.isArray(r6) || Array.isArray(e) ? false : C(r6) && C(e) ? gs(r6, e, t) : (C(r6) || C(e), false);
 }
 function hs(r6, e) {
   if (r6.length !== e.length) return false;
-  for (let t = 0; t < r6.length; t++) if (!fe(r6[t], e[t])) return false;
+  for (let t = 0; t < r6.length; t++) if (!me(r6[t], e[t])) return false;
   return true;
 }
 function gs(r6, e, t) {
@@ -53402,7 +53410,7 @@ function gs(r6, e, t) {
   t === "meta" && (n.delete("versionId"), n.delete("lastUpdated"), n.delete("author"));
   for (let i of n) {
     let o2 = r6[i], s = e[i];
-    if (!fe(o2, s, i)) return false;
+    if (!me(o2, s, i)) return false;
   }
   return true;
 }
@@ -53443,7 +53451,7 @@ var Kr = (r6, e) => new Promise((t, n) => {
     clearTimeout(i), n(e.signal?.reason);
   }, { once: true });
 });
-function qe(r6, e, t) {
+function je(r6, e, t) {
   let n = [];
   for (let i = 0; i < t - 1; i++) {
     let o2 = r6.indexOf(e);
@@ -53471,7 +53479,7 @@ function Si(r6) {
   return typeof r6 == "object" && !Array.isArray(r6) && !(r6 instanceof URLSearchParams) && (r6 = Object.fromEntries(Object.entries(r6).filter((e) => e[1] !== void 0))), new URLSearchParams(r6).toString();
 }
 var ws = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-_]*[A-Za-z0-9])$/;
-function Cd(r6) {
+function Ad(r6) {
   return ws.test(r6);
 }
 var y = Object.freeze([]);
@@ -53479,25 +53487,25 @@ function Ze(r6, e) {
   if (!r6) return "";
   let t = [];
   if (r6.prefix && e?.prefix !== false && t.push(...r6.prefix), r6.given && t.push(...r6.given), r6.family && t.push(r6.family), r6.suffix && e?.suffix !== false && t.push(...r6.suffix), r6.use && (e?.all || e?.use) && t.push("[" + r6.use + "]"), t.length === 0) {
-    let n = we(r6.text);
+    let n = Oe(r6.text);
     if (n) return n;
   }
   return t.join(" ").trim();
 }
 function Ye(r6) {
   if (!r6) return "";
-  let e = we(r6.text);
+  let e = Oe(r6.text);
   return e || (r6.coding ? r6.coding.map((t) => Ei(t)).join(", ") : "");
 }
 function Ei(r6, e) {
-  let t = we(r6?.display);
+  let t = Oe(r6?.display);
   if (t) {
-    let n = e ? we(r6?.code) : void 0;
+    let n = e ? Oe(r6?.code) : void 0;
     return `${t}${n ? " (" + n + ")" : ""}`;
   }
-  return we(r6?.code) ?? "";
+  return Oe(r6?.code) ?? "";
 }
-function we(r6) {
+function Oe(r6) {
   return typeof r6 == "string" ? r6 : void 0;
 }
 var d = { Address: "Address", Age: "Age", Annotation: "Annotation", Attachment: "Attachment", BackboneElement: "BackboneElement", CodeableConcept: "CodeableConcept", Coding: "Coding", ContactDetail: "ContactDetail", ContactPoint: "ContactPoint", Contributor: "Contributor", Count: "Count", DataRequirement: "DataRequirement", Distance: "Distance", Dosage: "Dosage", Duration: "Duration", Element: "Element", ElementDefinition: "ElementDefinition", Expression: "Expression", Extension: "Extension", HumanName: "HumanName", Identifier: "Identifier", MarketingStatus: "MarketingStatus", Meta: "Meta", Money: "Money", MoneyQuantity: "MoneyQuantity", Narrative: "Narrative", ParameterDefinition: "ParameterDefinition", Period: "Period", Population: "Population", ProdCharacteristic: "ProdCharacteristic", ProductShelfLife: "ProductShelfLife", Quantity: "Quantity", Range: "Range", Ratio: "Ratio", Reference: "Reference", RelatedArtifact: "RelatedArtifact", SampledData: "SampledData", Signature: "Signature", SimpleQuantity: "SimpleQuantity", SubstanceAmount: "SubstanceAmount", SystemString: "http://hl7.org/fhirpath/System.String", Timing: "Timing", TriggerDefinition: "TriggerDefinition", UsageContext: "UsageContext", base64Binary: "base64Binary", boolean: "boolean", canonical: "canonical", code: "code", date: "date", dateTime: "dateTime", decimal: "decimal", id: "id", instant: "instant", integer: "integer", markdown: "markdown", oid: "oid", positiveInt: "positiveInt", string: "string", time: "time", unsignedInt: "unsignedInt", uri: "uri", url: "url", uuid: "uuid", xhtml: "xhtml" };
@@ -53523,7 +53531,7 @@ function Us(r6) {
   return r6.length === 1 ? r6[0] : r6.map(N).join("");
 }
 function Ct(r6, e, t) {
-  let n = Re(r6, t);
+  let n = Ce(r6, t);
   if (n) return Ai(n.elements, e);
 }
 function Ai(r6, e) {
@@ -53540,11 +53548,11 @@ function Ai(r6, e) {
 function I(r6, e) {
   return !(!r6 || typeof r6 != "object" || !("resourceType" in r6) || e && r6.resourceType !== e);
 }
-function Q(r6, e) {
+function z(r6, e) {
   return r6 && typeof r6 == "object" && "reference" in r6 && typeof r6.reference == "string" ? e ? r6.reference.match(new RegExp(`^${e}(/|\\?)`)) !== null : true : false;
 }
 var $ = { types: {} };
-function je(r6) {
+function $e(r6) {
   if (r6.startsWith("T")) return r6 + "T00:00:00.000Z".substring(r6.length);
   if (r6.length <= 10) return r6;
   try {
@@ -53553,7 +53561,7 @@ function je(r6) {
     return r6;
   }
 }
-var ae = () => [];
+var ce = () => [];
 var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) => h(e.length !== 0), exists: (r6, e, t) => t ? h(e.some((n) => j(t.eval(r6, [n])))) : h(e.length > 0 && e.every((n) => !A(n.value))), all: (r6, e, t) => h(e.every((n) => j(t.eval(r6, [n])))), allTrue: (r6, e) => {
   for (let t of e) if (!t.value) return h(false);
   return h(true);
@@ -53568,16 +53576,16 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   return h(false);
 }, subsetOf: (r6, e, t) => {
   if (e.length === 0) return h(true);
-  let n = t.eval(r6, Oe(r6));
+  let n = t.eval(r6, Ie(r6));
   return n.length === 0 ? h(false) : h(e.every((i) => n.some((o2) => o2.value === i.value)));
 }, supersetOf: (r6, e, t) => {
-  let n = t.eval(r6, Oe(r6));
+  let n = t.eval(r6, Ie(r6));
   return n.length === 0 ? h(true) : e.length === 0 ? h(false) : h(n.every((i) => e.some((o2) => o2.value === i.value)));
 }, count: (r6, e) => [{ type: d.integer, value: e.length }], distinct: (r6, e) => {
   let t = [];
   for (let n of e) t.some((i) => i.value === n.value) || t.push(n);
   return t;
-}, isDistinct: (r6, e) => h(e.length === _.distinct(r6, e).length), where: (r6, e, t) => e.filter((n) => j(t.eval(r6, [n]))), select: (r6, e, t) => e.flatMap((n) => t.eval({ parent: r6, variables: { $this: n } }, [n])), repeat: ae, ofType: (r6, e, t) => e.filter((n) => n.type === t.name), single: (r6, e) => {
+}, isDistinct: (r6, e) => h(e.length === _.distinct(r6, e).length), where: (r6, e, t) => e.filter((n) => j(t.eval(r6, [n]))), select: (r6, e, t) => e.flatMap((n) => t.eval({ parent: r6, variables: { $this: n } }, [n])), repeat: ce, ofType: (r6, e, t) => e.filter((n) => n.type === t.name), single: (r6, e) => {
   if (e.length > 1) throw new Error("Expected input length one for single()");
   return e.length === 0 ? [] : e.slice(0, 1);
 }, first: (r6, e) => e.length === 0 ? [] : e.slice(0, 1), last: (r6, e) => e.length === 0 ? [] : e.slice(-1, e.length), tail: (r6, e) => e.length === 0 ? [] : e.slice(1, e.length), skip: (r6, e, t) => {
@@ -53590,21 +53598,21 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   return n <= 0 ? [] : e.slice(0, n);
 }, intersect: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, Oe(r6)), i = [];
+  let n = t.eval(r6, Ie(r6)), i = [];
   for (let o2 of e) !i.some((s) => s.value === o2.value) && n.some((s) => s.value === o2.value) && i.push(o2);
   return i;
 }, exclude: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, Oe(r6)), i = [];
+  let n = t.eval(r6, Ie(r6)), i = [];
   for (let o2 of e) n.some((s) => s.value === o2.value) || i.push(o2);
   return i;
 }, union: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, Oe(r6));
+  let n = t.eval(r6, Ie(r6));
   return bt([...e, ...n]);
 }, combine: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, Oe(r6));
+  let n = t.eval(r6, Ie(r6));
   return [...e, ...n];
 }, htmlChecks: (r6, e, t) => [b(true)], iif: (r6, e, t, n, i) => {
   let o2 = t.eval(r6, e);
@@ -53612,7 +53620,7 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   return j(o2) ? n.eval(r6, e) : i ? i.eval(r6, e) : [];
 }, toBoolean: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
+  let [{ value: t }] = te(e, 1);
   if (typeof t == "boolean") return [{ type: d.boolean, value: t }];
   if (typeof t == "number" && (t === 0 || t === 1)) return h(!!t);
   if (typeof t == "string") {
@@ -53623,48 +53631,48 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   return [];
 }, convertsToBoolean: (r6, e) => e.length === 0 ? [] : h(_.toBoolean(r6, e).length === 1), toInteger: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
+  let [{ value: t }] = te(e, 1);
   return typeof t == "number" ? [{ type: d.integer, value: t }] : typeof t == "string" && /^[+-]?\d+$/.exec(t) ? [{ type: d.integer, value: Number.parseInt(t, 10) }] : typeof t == "boolean" ? [{ type: d.integer, value: t ? 1 : 0 }] : [];
 }, convertsToInteger: (r6, e) => e.length === 0 ? [] : h(_.toInteger(r6, e).length === 1), toDate: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
-  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: d.date, value: je(t) }] : [];
+  let [{ value: t }] = te(e, 1);
+  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: d.date, value: $e(t) }] : [];
 }, convertsToDate: (r6, e) => e.length === 0 ? [] : h(_.toDate(r6, e).length === 1), toDateTime: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
-  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: d.dateTime, value: je(t) }] : [];
+  let [{ value: t }] = te(e, 1);
+  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: d.dateTime, value: $e(t) }] : [];
 }, convertsToDateTime: (r6, e) => e.length === 0 ? [] : h(_.toDateTime(r6, e).length === 1), toDecimal: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
+  let [{ value: t }] = te(e, 1);
   return typeof t == "number" ? [{ type: d.decimal, value: t }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?$/.exec(t) ? [{ type: d.decimal, value: Number.parseFloat(t) }] : typeof t == "boolean" ? [{ type: d.decimal, value: t ? 1 : 0 }] : [];
 }, convertsToDecimal: (r6, e) => e.length === 0 ? [] : h(_.toDecimal(r6, e).length === 1), toQuantity: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
+  let [{ value: t }] = te(e, 1);
   return V(t) ? [{ type: d.Quantity, value: t }] : typeof t == "number" ? [{ type: d.Quantity, value: { value: t, unit: "1" } }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?/.exec(t) ? [{ type: d.Quantity, value: { value: Number.parseFloat(t), unit: "1" } }] : typeof t == "boolean" ? [{ type: d.Quantity, value: { value: t ? 1 : 0, unit: "1" } }] : [];
 }, convertsToQuantity: (r6, e) => e.length === 0 ? [] : h(_.toQuantity(r6, e).length === 1), toString: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
+  let [{ value: t }] = te(e, 1);
   return t == null ? [] : V(t) ? [{ type: d.string, value: `${t.value} '${t.unit}'` }] : [{ type: d.string, value: t.toString() }];
 }, convertsToString: (r6, e) => e.length === 0 ? [] : h(_.toString(r6, e).length === 1), toTime: (r6, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = ee(e, 1);
+  let [{ value: t }] = te(e, 1);
   if (typeof t == "string") {
     let n = /^T?(\d{2}(:\d{2}(:\d{2})?)?)/.exec(t);
-    if (n) return [{ type: d.time, value: je("T" + n[1]) }];
+    if (n) return [{ type: d.time, value: $e("T" + n[1]) }];
   }
   return [];
 }, convertsToTime: (r6, e) => e.length === 0 ? [] : h(_.toTime(r6, e).length === 1), indexOf: (r6, e, t) => H((n, i) => n.indexOf(i), r6, e, t), substring: (r6, e, t, n) => H((i, o2, s) => {
   let a = o2, u2 = s ? a + s : i.length;
   return a < 0 || a >= i.length ? void 0 : i.substring(a, u2);
-}, r6, e, t, n), startsWith: (r6, e, t) => H((n, i) => n.startsWith(i), r6, e, t), endsWith: (r6, e, t) => H((n, i) => n.endsWith(i), r6, e, t), contains: (r6, e, t) => H((n, i) => n.includes(i), r6, e, t), upper: (r6, e) => H((t) => t.toUpperCase(), r6, e), lower: (r6, e) => H((t) => t.toLowerCase(), r6, e), replace: (r6, e, t, n) => H((i, o2, s) => i.replaceAll(o2, s), r6, e, t, n), matches: (r6, e, t) => H((n, i) => !!new RegExp(i).exec(n), r6, e, t), replaceMatches: (r6, e, t, n) => H((i, o2, s) => i.replaceAll(new RegExp(o2, "g"), s.replaceAll(/\$\{(\w+)\}/g, "$<$1>")), r6, e, t, n), length: (r6, e) => H((t) => t.length, r6, e), toChars: (r6, e) => H((t) => t ? t.split("") : void 0, r6, e), encode: ae, decode: ae, escape: ae, unescape: ae, trim: ae, split: ae, join: (r6, e, t) => {
-  let n = t?.eval(r6, Oe(r6))[0]?.value ?? "";
+}, r6, e, t, n), startsWith: (r6, e, t) => H((n, i) => n.startsWith(i), r6, e, t), endsWith: (r6, e, t) => H((n, i) => n.endsWith(i), r6, e, t), contains: (r6, e, t) => H((n, i) => n.includes(i), r6, e, t), upper: (r6, e) => H((t) => t.toUpperCase(), r6, e), lower: (r6, e) => H((t) => t.toLowerCase(), r6, e), replace: (r6, e, t, n) => H((i, o2, s) => i.replaceAll(o2, s), r6, e, t, n), matches: (r6, e, t) => H((n, i) => !!new RegExp(i).exec(n), r6, e, t), replaceMatches: (r6, e, t, n) => H((i, o2, s) => i.replaceAll(new RegExp(o2, "g"), s.replaceAll(/\$\{(\w+)\}/g, "$<$1>")), r6, e, t, n), length: (r6, e) => H((t) => t.length, r6, e), toChars: (r6, e) => H((t) => t ? t.split("") : void 0, r6, e), encode: ce, decode: ce, escape: ce, unescape: ce, trim: ce, split: ce, join: (r6, e, t) => {
+  let n = t?.eval(r6, Ie(r6))[0]?.value ?? "";
   if (typeof n != "string") throw new TypeError("Separator must be a string.");
   return [{ type: d.string, value: e.map((i) => i.value?.toString() ?? "").join(n) }];
-}, abs: (r6, e) => Z(Math.abs, r6, e), ceiling: (r6, e) => Z(Math.ceil, r6, e), exp: (r6, e) => Z(Math.exp, r6, e), floor: (r6, e) => Z(Math.floor, r6, e), ln: (r6, e) => Z(Math.log, r6, e), log: (r6, e, t) => Z((n, i) => Math.log(n) / Math.log(i), r6, e, t), power: (r6, e, t) => Z(Math.pow, r6, e, t), round: (r6, e, ...t) => Z((n, i = 0) => {
+}, abs: (r6, e) => ee(Math.abs, r6, e), ceiling: (r6, e) => ee(Math.ceil, r6, e), exp: (r6, e) => ee(Math.exp, r6, e), floor: (r6, e) => ee(Math.floor, r6, e), ln: (r6, e) => ee(Math.log, r6, e), log: (r6, e, t) => ee((n, i) => Math.log(n) / Math.log(i), r6, e, t), power: (r6, e, t) => ee(Math.pow, r6, e, t), round: (r6, e, ...t) => ee((n, i = 0) => {
   if (typeof i != "number" || i < 0) throw new Error("Invalid precision provided to round()");
   let o2 = Math.pow(10, i);
   return Math.round(n * o2) / o2;
-}, r6, e, ...t), sqrt: (r6, e) => Z(Math.sqrt, r6, e), truncate: (r6, e) => Z((t) => Math.trunc(t), r6, e), children: ae, descendants: ae, trace: (r6, e, t) => e, now: () => [{ type: d.dateTime, value: (/* @__PURE__ */ new Date()).toISOString() }], timeOfDay: () => [{ type: d.time, value: (/* @__PURE__ */ new Date()).toISOString().substring(11) }], today: () => [{ type: d.date, value: (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) }], between: (r6, e, t, n, i) => {
+}, r6, e, ...t), sqrt: (r6, e) => ee(Math.sqrt, r6, e), truncate: (r6, e) => ee((t) => Math.trunc(t), r6, e), children: ce, descendants: ce, trace: (r6, e, t) => e, now: () => [{ type: d.dateTime, value: (/* @__PURE__ */ new Date()).toISOString() }], timeOfDay: () => [{ type: d.time, value: (/* @__PURE__ */ new Date()).toISOString().substring(11) }], today: () => [{ type: d.date, value: (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) }], between: (r6, e, t, n, i) => {
   let o2 = _.toDateTime(r6, t.eval(r6, e));
   if (o2.length === 0) throw new Error("Invalid start date");
   let s = _.toDateTime(r6, n.eval(r6, e));
@@ -53675,7 +53683,7 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   return [{ type: d.Quantity, value: { value: u2[a], unit: a } }];
 }, is: (r6, e, t) => {
   let n = "";
-  return t instanceof B ? n = t.name : t instanceof te && (n = t.left.name + "." + t.right.name), n ? e.map((i) => ({ type: d.boolean, value: Et(i, n) })) : [];
+  return t instanceof B ? n = t.name : t instanceof re && (n = t.left.name + "." + t.right.name), n ? e.map((i) => ({ type: d.boolean, value: Et(i, n) })) : [];
 }, not: (r6, e) => _.toBoolean(r6, e).map((t) => ({ type: d.boolean, value: !t.value })), resolve: (r6, e) => e.map((t) => {
   let n = t.value, i;
   if (typeof n == "string") i = n;
@@ -53708,35 +53716,35 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   let n = e[0].value;
   if (!n?.reference) return [];
   let i = "";
-  return t instanceof B && (i = t.name), i && !n.reference.startsWith(i + "/") ? [] : [{ type: d.id, value: Pe(n) }];
+  return t instanceof B && (i = t.name), i && !n.reference.startsWith(i + "/") ? [] : [{ type: d.id, value: Ae(n) }];
 }, extension: (r6, e, t) => {
   let n = t.eval(r6, e)[0].value, i = e?.[0]?.value;
   if (i) {
-    let o2 = pe(i, n);
+    let o2 = fe(i, n);
     if (o2) return [{ type: d.Extension, value: o2 }];
   }
   return [];
 } };
 function H(r6, e, t, ...n) {
   if (t.length === 0) return [];
-  let [{ value: i }] = ee(t, 1);
+  let [{ value: i }] = te(t, 1);
   if (typeof i != "string") throw new TypeError("String function cannot be called with non-string");
   let o2 = n.map((a) => a?.eval(e, t)[0]?.value), s = r6(i, ...o2);
   return s === void 0 ? [] : Array.isArray(s) ? s.map(b) : [b(s)];
 }
-function Z(r6, e, t, ...n) {
+function ee(r6, e, t, ...n) {
   if (t.length === 0) return [];
-  let [{ value: i }] = ee(t, 1), o2 = V(i), s = o2 ? i.value : i;
+  let [{ value: i }] = te(t, 1), o2 = V(i), s = o2 ? i.value : i;
   if (typeof s != "number") throw new TypeError("Math function cannot be called with non-number");
   let a = r6(s, ...n.map((p2) => p2.eval(e, t)[0]?.value)), u2 = o2 ? d.Quantity : t[0].type, l = o2 ? { ...i, value: a } : a;
   return [{ type: u2, value: l }];
 }
-function ee(r6, e) {
+function te(r6, e) {
   if (r6.length !== e) throw new Error(`Expected ${e} arguments`);
   for (let t of r6) if (t == null) throw new Error("Expected non-null argument");
   return r6;
 }
-function Oe(r6) {
+function Ie(r6) {
   let e = r6;
   for (; e.parent?.variables.$this; ) e = e.parent;
   return [e.variables.$this];
@@ -53800,7 +53808,7 @@ var kt = class extends dt {
     return this.operator + this.child.toString();
   }
 };
-var ye = class extends R {
+var xe = class extends R {
   constructor(e, t) {
     super("as", e, t);
   }
@@ -53851,7 +53859,7 @@ var Mt = class extends R {
     return n ? h(i.some((o2) => Ke(n, o2)[0].value)) : [];
   }
 };
-var te = class extends R {
+var re = class extends R {
   constructor(e, t) {
     super(".", e, t);
   }
@@ -53862,7 +53870,7 @@ var te = class extends R {
     return `${this.left.toString()}.${this.right.toString()}`;
   }
 };
-var Ie = class extends R {
+var ke = class extends R {
   constructor(e, t) {
     super("|", e, t);
   }
@@ -53907,7 +53915,7 @@ var Ft = class extends R {
     return ii(Br(n, i));
   }
 };
-var ke = class extends R {
+var Ve = class extends R {
   constructor(e, t) {
     super("is", e, t);
   }
@@ -53954,7 +53962,7 @@ var qt = class extends R {
     return i?.value === true || n?.value === false ? h(true) : !n || !i ? [] : h(false);
   }
 };
-var re = class {
+var ne = class {
   constructor(e, t) {
     c(this, "name");
     c(this, "args");
@@ -53969,7 +53977,7 @@ var re = class {
     return `${this.name}(${this.args.map((e) => e.toString()).join(", ")})`;
   }
 };
-var Ve = class {
+var De = class {
   constructor(e, t) {
     c(this, "left");
     c(this, "expr");
@@ -53997,51 +54005,51 @@ var Gs = { parse(r6) {
 var Qs = { parse(r6, e) {
   let t = r6.consumeAndParse();
   if (!r6.match("]")) throw new Error("Parse error: expected `]`");
-  return new Ve(e, t);
+  return new De(e, t);
 }, precedence: S.Indexer };
 var zs = { parse(r6, e) {
   if (!(e instanceof B)) throw new Error("Unexpected parentheses");
   let t = [];
   for (; !r6.match(")"); ) t.push(r6.consumeAndParse()), r6.match(",");
-  return new re(e.name, t);
+  return new ne(e.name, t);
 }, precedence: S.FunctionCall };
 function Js(r6) {
   let e = r6.split(" "), t = Number.parseFloat(e[0]), n = e[1];
   return n?.startsWith("'") && n.endsWith("'") ? n = n.substring(1, n.length - 1) : n = "{" + n + "}", { value: t, unit: n };
 }
 function rt() {
-  return new pt().registerPrefix("String", { parse: (r6, e) => new G({ type: d.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r6, e) => new G({ type: d.dateTime, value: je(e.value) }) }).registerPrefix("Quantity", { parse: (r6, e) => new G({ type: d.Quantity, value: Js(e.value) }) }).registerPrefix("Number", { parse: (r6, e) => new G({ type: e.value.includes(".") ? d.decimal : d.integer, value: Number.parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new G({ type: d.boolean, value: true }) }).registerPrefix("false", { parse: () => new G({ type: d.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r6, e) => new B(e.value) }).registerPrefix("{}", { parse: () => new It() }).registerPrefix("(", Gs).registerInfix("[", Qs).registerInfix("(", zs).prefix("+", S.UnaryAdd, (r6, e) => new kt("+", e, (t) => t)).prefix("-", S.UnarySubtract, (r6, e) => new F("-", e, e, (t, n) => -n)).infixLeft(".", S.Dot, (r6, e, t) => new te(r6, t)).infixLeft("/", S.Divide, (r6, e, t) => new F("/", r6, t, (n, i) => n / i)).infixLeft("*", S.Multiply, (r6, e, t) => new F("*", r6, t, (n, i) => n * i)).infixLeft("+", S.Add, (r6, e, t) => new F("+", r6, t, (n, i) => n + i)).infixLeft("-", S.Subtract, (r6, e, t) => new F("-", r6, t, (n, i) => n - i)).infixLeft("|", S.Union, (r6, e, t) => new Ie(r6, t)).infixLeft("=", S.Equals, (r6, e, t) => new _t(r6, t)).infixLeft("!=", S.NotEquals, (r6, e, t) => new Lt(r6, t)).infixLeft("~", S.Equivalent, (r6, e, t) => new Nt(r6, t)).infixLeft("!~", S.NotEquivalent, (r6, e, t) => new Ft(r6, t)).infixLeft("<", S.LessThan, (r6, e, t) => new F("<", r6, t, (n, i) => n < i)).infixLeft("<=", S.LessThanOrEquals, (r6, e, t) => new F("<=", r6, t, (n, i) => n <= i)).infixLeft(">", S.GreaterThan, (r6, e, t) => new F(">", r6, t, (n, i) => n > i)).infixLeft(">=", S.GreaterThanOrEquals, (r6, e, t) => new F(">=", r6, t, (n, i) => n >= i)).infixLeft("&", S.Ampersand, (r6, e, t) => new Vt(r6, t)).infixLeft("and", S.And, (r6, e, t) => new Ut(r6, t)).infixLeft("as", S.As, (r6, e, t) => new ye(r6, t)).infixLeft("contains", S.Contains, (r6, e, t) => new Dt(r6, t)).infixLeft("div", S.Divide, (r6, e, t) => new F("div", r6, t, (n, i) => Math.trunc(n / i))).infixLeft("in", S.In, (r6, e, t) => new Mt(r6, t)).infixLeft("is", S.Is, (r6, e, t) => new ke(r6, t)).infixLeft("mod", S.Modulo, (r6, e, t) => new F("mod", r6, t, (n, i) => n % i)).infixLeft("or", S.Or, (r6, e, t) => new Bt(r6, t)).infixLeft("xor", S.Xor, (r6, e, t) => new Wt(r6, t)).infixLeft("implies", S.Implies, (r6, e, t) => new qt(r6, t));
+  return new pt().registerPrefix("String", { parse: (r6, e) => new G({ type: d.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r6, e) => new G({ type: d.dateTime, value: $e(e.value) }) }).registerPrefix("Quantity", { parse: (r6, e) => new G({ type: d.Quantity, value: Js(e.value) }) }).registerPrefix("Number", { parse: (r6, e) => new G({ type: e.value.includes(".") ? d.decimal : d.integer, value: Number.parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new G({ type: d.boolean, value: true }) }).registerPrefix("false", { parse: () => new G({ type: d.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r6, e) => new B(e.value) }).registerPrefix("{}", { parse: () => new It() }).registerPrefix("(", Gs).registerInfix("[", Qs).registerInfix("(", zs).prefix("+", S.UnaryAdd, (r6, e) => new kt("+", e, (t) => t)).prefix("-", S.UnarySubtract, (r6, e) => new F("-", e, e, (t, n) => -n)).infixLeft(".", S.Dot, (r6, e, t) => new re(r6, t)).infixLeft("/", S.Divide, (r6, e, t) => new F("/", r6, t, (n, i) => n / i)).infixLeft("*", S.Multiply, (r6, e, t) => new F("*", r6, t, (n, i) => n * i)).infixLeft("+", S.Add, (r6, e, t) => new F("+", r6, t, (n, i) => n + i)).infixLeft("-", S.Subtract, (r6, e, t) => new F("-", r6, t, (n, i) => n - i)).infixLeft("|", S.Union, (r6, e, t) => new ke(r6, t)).infixLeft("=", S.Equals, (r6, e, t) => new _t(r6, t)).infixLeft("!=", S.NotEquals, (r6, e, t) => new Lt(r6, t)).infixLeft("~", S.Equivalent, (r6, e, t) => new Nt(r6, t)).infixLeft("!~", S.NotEquivalent, (r6, e, t) => new Ft(r6, t)).infixLeft("<", S.LessThan, (r6, e, t) => new F("<", r6, t, (n, i) => n < i)).infixLeft("<=", S.LessThanOrEquals, (r6, e, t) => new F("<=", r6, t, (n, i) => n <= i)).infixLeft(">", S.GreaterThan, (r6, e, t) => new F(">", r6, t, (n, i) => n > i)).infixLeft(">=", S.GreaterThanOrEquals, (r6, e, t) => new F(">=", r6, t, (n, i) => n >= i)).infixLeft("&", S.Ampersand, (r6, e, t) => new Vt(r6, t)).infixLeft("and", S.And, (r6, e, t) => new Ut(r6, t)).infixLeft("as", S.As, (r6, e, t) => new xe(r6, t)).infixLeft("contains", S.Contains, (r6, e, t) => new Dt(r6, t)).infixLeft("div", S.Divide, (r6, e, t) => new F("div", r6, t, (n, i) => Math.trunc(n / i))).infixLeft("in", S.In, (r6, e, t) => new Mt(r6, t)).infixLeft("is", S.Is, (r6, e, t) => new Ve(r6, t)).infixLeft("mod", S.Modulo, (r6, e, t) => new F("mod", r6, t, (n, i) => n % i)).infixLeft("or", S.Or, (r6, e, t) => new Bt(r6, t)).infixLeft("xor", S.Xor, (r6, e, t) => new Wt(r6, t)).infixLeft("implies", S.Implies, (r6, e, t) => new qt(r6, t));
 }
 var Ks = rt();
 var m = { EQUALS: "eq", NOT_EQUALS: "ne", GREATER_THAN: "gt", LESS_THAN: "lt", GREATER_THAN_OR_EQUALS: "ge", LESS_THAN_OR_EQUALS: "le", STARTS_AFTER: "sa", ENDS_BEFORE: "eb", APPROXIMATELY: "ap", CONTAINS: "contains", STARTS_WITH: "sw", EXACT: "exact", TEXT: "text", NOT: "not", ABOVE: "above", BELOW: "below", IN: "in", NOT_IN: "not-in", OF_TYPE: "of-type", MISSING: "missing", PRESENT: "present", IDENTIFIER: "identifier", ITERATE: "iterate" };
 var en = { contains: m.CONTAINS, exact: m.EXACT, above: m.ABOVE, below: m.BELOW, text: m.TEXT, not: m.NOT, in: m.IN, "not-in": m.NOT_IN, "of-type": m.OF_TYPE, missing: m.MISSING, identifier: m.IDENTIFIER, iterate: m.ITERATE };
 var tn = { eq: m.EQUALS, ne: m.NOT_EQUALS, lt: m.LESS_THAN, le: m.LESS_THAN_OR_EQUALS, gt: m.GREATER_THAN, ge: m.GREATER_THAN_OR_EQUALS, sa: m.STARTS_AFTER, eb: m.ENDS_BEFORE, ap: m.APPROXIMATELY, sw: m.STARTS_WITH };
 var ia = [m.MISSING, m.PRESENT];
-var fa = new K(1e3);
-var Me = { READ: "read", VREAD: "vread", UPDATE: "update", DELETE: "delete", HISTORY: "history", CREATE: "create", SEARCH: "search" };
-var Pa = [Me.READ, Me.VREAD, Me.HISTORY, Me.SEARCH];
-var af = { FIRST: "first", APPLICATION: "application" };
-function z() {
+var fa = new Y(1e3);
+var _e = { READ: "read", VREAD: "vread", UPDATE: "update", DELETE: "delete", HISTORY: "history", CREATE: "create", SEARCH: "search" };
+var Pa = [_e.READ, _e.VREAD, _e.HISTORY, _e.SEARCH];
+var uf = { FIRST: "first", APPLICATION: "application" };
+function J() {
   return typeof window < "u";
 }
 function rn() {
   return typeof Buffer < "u" ? Buffer : void 0;
 }
-var ce = { assign(r6) {
-  z() && globalThis.location.assign(r6);
+var ue = { assign(r6) {
+  J() && globalThis.location.assign(r6);
 }, reload() {
-  z() && globalThis.location.reload();
+  J() && globalThis.location.reload();
 }, getSearch() {
-  return z() ? globalThis.location.search : "";
+  return J() ? globalThis.location.search : "";
 }, getPathname() {
-  return z() ? globalThis.location.pathname : "";
+  return J() ? globalThis.location.pathname : "";
 }, getLocation() {
-  return z() ? globalThis.location.toString() : "";
+  return J() ? globalThis.location.toString() : "";
 }, getOrigin() {
-  return z() ? globalThis.location.protocol + "//" + globalThis.location.host + "/" : "";
+  return J() ? globalThis.location.protocol + "//" + globalThis.location.host + "/" : "";
 } };
 function Oa(r6) {
-  if (z()) {
+  if (J()) {
     let t = window.atob(r6), n = Uint8Array.from(t, (i) => i.codePointAt(0));
     return new window.TextDecoder().decode(n);
   }
@@ -54050,7 +54058,7 @@ function Oa(r6) {
   throw new Error("Unable to decode base64");
 }
 function Gt(r6) {
-  if (z()) {
+  if (J()) {
     let t = new window.TextEncoder().encode(r6), n = String.fromCodePoint.apply(null, t);
     return window.btoa(n);
   }
@@ -54070,7 +54078,7 @@ function nn() {
 async function qi(r6) {
   return crypto.subtle.digest("SHA-256", new TextEncoder().encode(r6));
 }
-function ne() {
+function ie() {
   return typeof crypto < "u" && "randomUUID" in crypto ? crypto.randomUUID() : "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replaceAll(/[xy]/g, (r6) => {
     let e = Math.trunc(Math.random() * 16);
     return (r6 === "x" ? e : e & 3 | 8).toString(16);
@@ -54106,7 +54114,7 @@ var on = class {
     return this.listeners[e]?.length ?? 0;
   }
 };
-var ie = class {
+var oe = class {
   constructor() {
     c(this, "emitter", new on());
   }
@@ -54166,7 +54174,7 @@ function ja(r6, e, t, n) {
 }
 function $a(r6, e, t, n, i) {
   if (i.set(e.key, (i.get(e.key) ?? 0) + 1), n.reference) {
-    if (!Q(e.reference)) throw new f(T(`context[${t}] is invalid. Expected key '${e.key}' to be a reference.`));
+    if (!z(e.reference)) throw new f(T(`context[${t}] is invalid. Expected key '${e.key}' to be a reference.`));
   } else ja(r6, e.resource, t, n);
 }
 function Ha(r6, e) {
@@ -54187,9 +54195,9 @@ function un(r6, e, t, n) {
   if (typeof t != "object") throw new f(T("context must be a context object or array of context objects."));
   if (an.includes(e) && !n) throw new f(T(`The '${e}' event must contain a 'context.versionId'.`));
   let i = Array.isArray(t) ? t : [t];
-  return Ha(e, i), { timestamp: (/* @__PURE__ */ new Date()).toISOString(), id: ne(), event: { "hub.topic": r6, "hub.event": e, context: i, ...n ? { "context.versionId": n } : {} } };
+  return Ha(e, i), { timestamp: (/* @__PURE__ */ new Date()).toISOString(), id: ie(), event: { "hub.topic": r6, "hub.event": e, context: i, ...n ? { "context.versionId": n } : {} } };
 }
-var Qt = class extends ie {
+var Qt = class extends oe {
   constructor(t) {
     super();
     c(this, "subRequest");
@@ -54343,18 +54351,18 @@ var ln = class {
     return Array.from(this.data.keys())[e];
   }
 };
-var He = { Event: typeof globalThis.Event < "u" ? globalThis.Event : void 0, ErrorEvent: void 0, CloseEvent: void 0 };
+var Q = { Event: typeof globalThis.Event < "u" ? globalThis.Event : void 0, ErrorEvent: void 0, CloseEvent: void 0 };
 var Xi = false;
 function Qa() {
   if (typeof globalThis.Event > "u") throw new Error("Unable to lazy init events for ReconnectingWebSocket. globalThis.Event is not defined yet");
-  He.Event = globalThis.Event, He.ErrorEvent = class extends Event {
+  Q.Event = globalThis.Event, Q.ErrorEvent = class extends Event {
     constructor(t, n) {
       super("error", n);
       c(this, "message");
       c(this, "error");
       this.message = t.message, this.error = t;
     }
-  }, He.CloseEvent = class extends Event {
+  }, Q.CloseEvent = class extends Event {
     constructor(t = 1e3, n = "", i) {
       super("close", i);
       c(this, "code");
@@ -54367,12 +54375,26 @@ function Qa() {
 function za(r6, e) {
   if (!r6) throw new Error(e);
 }
+function Ja() {
+}
 function Yt(r6) {
+  if (r6 instanceof Q.CloseEvent) {
+    let e = r6;
+    return new Q.CloseEvent(e.code, e.reason, void 0);
+  }
+  if (r6 instanceof Q.ErrorEvent) {
+    let e = r6;
+    return new Q.ErrorEvent(e.error ?? new Error(e.message), void 0);
+  }
   return new r6.constructor(r6.type, r6);
 }
-var _e = { maxReconnectionDelay: 1e4, minReconnectionDelay: 1e3 + Math.random() * 4e3, minUptime: 5e3, reconnectionDelayGrowFactor: 1.3, connectionTimeout: 4e3, maxRetries: 1 / 0, maxEnqueuedMessages: 1 / 0, startClosed: false, debug: false };
+function Ka(r6, e) {
+  let t = r6;
+  return t.error instanceof Error ? new Q.ErrorEvent(t.error, e) : new Q.ErrorEvent(new Error(t.message || "WebSocket error"), e);
+}
+var Le = { maxReconnectionDelay: 1e4, minReconnectionDelay: 1e3 + Math.random() * 4e3, minUptime: 5e3, reconnectionDelayGrowFactor: 1.3, connectionTimeout: 4e3, maxRetries: 1 / 0, maxEnqueuedMessages: 1 / 0, startClosed: false, debug: false };
 var Zi = false;
-var Xt = class r extends ie {
+var Xt = class r extends oe {
   constructor(t, n, i = {}) {
     Xi || (Qa(), Xi = true);
     super();
@@ -54395,14 +54417,15 @@ var Xt = class r extends ie {
     c(this, "onopen", null);
     c(this, "_handleOpen", (t2) => {
       this._debug("open event");
-      let { minUptime: n2 = _e.minUptime } = this._options;
+      let { minUptime: n2 = Le.minUptime } = this._options;
       clearTimeout(this._connectTimeout), this._uptimeTimeout = setTimeout(() => this._acceptOpen(), n2), za(this._ws, "WebSocket is not defined"), this._ws.binaryType = this._binaryType, this._messageQueue.forEach((i2) => this._ws?.send(i2)), this._messageQueue = [], this.onopen && this.onopen(t2), this.dispatchEvent(Yt(t2));
     });
     c(this, "_handleMessage", (t2) => {
       this._debug("message event"), this.onmessage && this.onmessage(t2), this.dispatchEvent(Yt(t2));
     });
     c(this, "_handleError", (t2) => {
-      this._debug("error event", t2.message), this._disconnect(void 0, t2.message === "TIMEOUT" ? "timeout" : void 0), this.onerror && this.onerror(t2), this._debug("exec error listeners"), this.dispatchEvent(Yt(t2)), this._connect();
+      let n2 = Ka(t2, this);
+      this._debug("error event", n2.message), this._disconnect(void 0, n2.message === "TIMEOUT" ? "timeout" : void 0), this.onerror && this.onerror(n2), this._debug("exec error listeners"), this.dispatchEvent(Yt(n2)), this._connect();
     });
     c(this, "_handleClose", (t2) => {
       this._debug("close event"), this._clearTimeouts(), this._shouldReconnect && this._connect(), this.onclose && this.onclose(t2), this.dispatchEvent(Yt(t2));
@@ -54477,7 +54500,7 @@ var Xt = class r extends ie {
   send(t) {
     if (this._ws?.readyState === this.OPEN) this._debug("send", t), this._ws.send(t);
     else {
-      let { maxEnqueuedMessages: n = _e.maxEnqueuedMessages } = this._options;
+      let { maxEnqueuedMessages: n = Le.maxEnqueuedMessages } = this._options;
       this._messageQueue.length < n && (this._debug("enqueue", t), this._messageQueue.push(t));
     }
   }
@@ -54485,7 +54508,7 @@ var Xt = class r extends ie {
     this._options.debug && this._debugLogger("RWS>", ...t);
   }
   _getNextDelay() {
-    let { reconnectionDelayGrowFactor: t = _e.reconnectionDelayGrowFactor, minReconnectionDelay: n = _e.minReconnectionDelay, maxReconnectionDelay: i = _e.maxReconnectionDelay } = this._options, o2 = 0;
+    let { reconnectionDelayGrowFactor: t = Le.reconnectionDelayGrowFactor, minReconnectionDelay: n = Le.minReconnectionDelay, maxReconnectionDelay: i = Le.maxReconnectionDelay } = this._options, o2 = 0;
     return this._retryCount > 0 && (o2 = n * Math.pow(t, this._retryCount - 1), o2 > i && (o2 = i)), this._debug("next delay", o2), o2;
   }
   _wait() {
@@ -54496,9 +54519,9 @@ var Xt = class r extends ie {
   _connect() {
     if (this._connectLock || !this._shouldReconnect) return;
     this._connectLock = true;
-    let { maxRetries: t = _e.maxRetries, connectionTimeout: n = _e.connectionTimeout } = this._options;
+    let { maxRetries: t = Le.maxRetries, connectionTimeout: n = Le.connectionTimeout } = this._options;
     if (this._retryCount >= t) {
-      this._debug("max retries reached", this._retryCount, ">=", t);
+      this._connectLock = false, this._debug("max retries reached", this._retryCount, ">=", t);
       return;
     }
     this._retryCount++, this._debug("connect", this._retryCount), this._removeListeners(), this._wait().then(() => {
@@ -54510,19 +54533,19 @@ var Xt = class r extends ie {
       let i = this._options.WebSocket || WebSocket;
       this._debug("connect", { url: this._url, protocols: this._protocols }), this._ws = this._protocols ? new i(this._url, this._protocols) : new i(this._url), this._ws.binaryType = this._binaryType, this._connectLock = false, this._addListeners(), this._connectTimeout = setTimeout(() => this._handleTimeout(), n);
     }).catch((i) => {
-      this._connectLock = false, this._handleError(new He.ErrorEvent(Error(i.message), this));
+      this._connectLock = false, this._handleError(new Q.ErrorEvent(Error(i.message), this));
     });
   }
   _handleTimeout() {
-    this._debug("timeout event"), this._handleError(new He.ErrorEvent(Error("TIMEOUT"), this));
+    this._debug("timeout event"), this._handleError(new Q.ErrorEvent(Error("TIMEOUT"), this));
   }
   _disconnect(t = 1e3, n) {
-    if (this._clearTimeouts(), !!this._ws) {
-      this._removeListeners();
-      try {
-        this._ws.close(t, n), this._handleClose(new He.CloseEvent(t, n, this));
-      } catch {
-      }
+    if (this._clearTimeouts(), !this._ws) return;
+    let i = this._ws;
+    this._removeListeners(), i.addEventListener("error", Ja);
+    try {
+      i.close(t, n), this._handleClose(new Q.CloseEvent(t, n, this));
+    } catch {
     }
   }
   _acceptOpen() {
@@ -54538,8 +54561,8 @@ var Xt = class r extends ie {
     clearTimeout(this._connectTimeout), clearTimeout(this._uptimeTimeout);
   }
 };
-var Ja = [WebSocket.CLOSING, WebSocket.CLOSED];
-var at = class extends ie {
+var Ya = [WebSocket.CLOSING, WebSocket.CLOSED];
+var at = class extends oe {
   constructor(...t) {
     super();
     c(this, "criteria");
@@ -54611,7 +54634,7 @@ var Zt = class {
           return;
         }
         if (o2.type === "handshake") {
-          let a = Pe(o2.subscription), u2 = { type: "connect", payload: { subscriptionId: a } };
+          let a = Ae(o2.subscription), u2 = { type: "connect", payload: { subscriptionId: a } };
           this.masterSubEmitter?.dispatchEvent(u2);
           let l = this.criteriaEntriesBySubscriptionId.get(a);
           if (!l) {
@@ -54622,7 +54645,7 @@ var Zt = class {
           return;
         }
         this.masterSubEmitter?.dispatchEvent({ type: "message", payload: i });
-        let s = this.criteriaEntriesBySubscriptionId.get(Pe(o2.subscription));
+        let s = this.criteriaEntriesBySubscriptionId.get(Ae(o2.subscription));
         if (!s) {
           console.warn("Received notification for criteria the SubscriptionManager is not listening for");
           return;
@@ -54635,7 +54658,7 @@ var Zt = class {
         for (let o2 of this.getAllCriteriaEmitters()) o2.dispatchEvent({ ...i });
       }
     }), e.addEventListener("error", (t) => {
-      let n = { type: "error", payload: new f({ resourceType: "OperationOutcome", issue: [{ severity: "error", code: "exception", details: { text: "WebSocket connection closed due to an error" }, diagnostics: t.error ? Se(t.error) : t.message }] }) };
+      let n = { type: "error", payload: new f({ resourceType: "OperationOutcome", issue: [{ severity: "error", code: "exception", details: { text: "WebSocket connection closed due to an error" }, diagnostics: t.error ? be(t.error) : t.message }] }) };
       this.masterSubEmitter?.dispatchEvent(n);
       for (let i of this.getAllCriteriaEmitters()) i.dispatchEvent({ ...n });
     }), e.addEventListener("close", () => {
@@ -54681,7 +54704,7 @@ var Zt = class {
     let n = this.criteriaEntries.get(e);
     if (n) {
       if (!t) return n.bareCriteria;
-      for (let i of n.criteriaWithProps) if (fe(t, i.subscriptionProps)) return i;
+      for (let i of n.criteriaWithProps) if (me(t, i.subscriptionProps)) return i;
     }
   }
   getAllCriteriaEmitters() {
@@ -54700,7 +54723,7 @@ var Zt = class {
     let s = this.criteriaEntries.get(t);
     n ? s.criteriaWithProps = s.criteriaWithProps.filter((a) => {
       let u2 = a.subscriptionProps;
-      return !fe(n, u2);
+      return !me(n, u2);
     }) : s.bareCriteria = void 0, !s.bareCriteria && s.criteriaWithProps.length === 0 && (this.criteriaEntries.delete(t), this.masterSubEmitter?._removeCriteria(t)), i && this.criteriaEntriesBySubscriptionId.delete(i), o2 && this.sendUnbind(o2);
   }
   async subscribeToCriteria(e) {
@@ -54727,7 +54750,7 @@ var Zt = class {
       if (this.isStale(e, t)) return;
       e.token = i, e.tokenExpiry = new Date(s).getTime(), this.criteriaEntriesBySubscriptionId.set(e.subscriptionId, e), this.sendBind(i);
     } catch (n) {
-      console.error(Se(n)), e.generation === t && !this.isEntryGettingRemoved(e) && (e.state = e.state === "refreshing" ? "active" : "idle"), this.emitError(e, n);
+      console.error(be(n)), e.generation === t && !this.isEntryGettingRemoved(e) && (e.state = e.state === "refreshing" ? "active" : "idle"), this.emitError(e, n);
     }
   }
   checkTokenExpirations() {
@@ -54780,7 +54803,7 @@ var Zt = class {
     return this.masterSubEmitter || (this.masterSubEmitter = new at(...Array.from(this.criteriaEntries.keys()))), this.masterSubEmitter;
   }
   async reconnectIfNeeded() {
-    Ja.includes(this.getWebSocket().readyState) && await new Promise((e) => {
+    Ya.includes(this.getWebSocket().readyState) && await new Promise((e) => {
       let t = () => {
         this.getWebSocket().removeEventListener("open", t), e();
       };
@@ -54791,20 +54814,20 @@ var Zt = class {
 function st(r6) {
   return r6.bareCriteria ? [r6.bareCriteria, ...r6.criteriaWithProps] : r6.criteriaWithProps;
 }
-var Ka = new K(1e3);
-var pn = "5.1.17-3a68674";
-var Za = k.FHIR_JSON + ", */*; q=0.1";
-var ec = "https://api.medplum.com/";
-var tc = 1e3;
-var rc = 6e4;
-var nc = 0;
-var ic = 3e5;
-var oc = "Binary/";
+var Xa = new Y(1e3);
+var pn = "5.1.18-97e1dd8";
+var tc = k.FHIR_JSON + ", */*; q=0.1";
+var rc = "https://api.medplum.com/";
+var nc = 1e3;
+var ic = 6e4;
+var oc = 0;
+var sc = 3e5;
+var ac = "Binary/";
 var eo = { resourceType: "Device", id: "system", deviceName: [{ type: "model-name", name: "System" }] };
 var Ge = { ClientCredentials: "client_credentials", AuthorizationCode: "authorization_code", RefreshToken: "refresh_token", JwtBearer: "urn:ietf:params:oauth:grant-type:jwt-bearer", TokenExchange: "urn:ietf:params:oauth:grant-type:token-exchange", PreAuthorizedCode: "urn:ietf:params:oauth:grant-type:pre-authorized_code" };
-var sc = { AccessToken: "urn:ietf:params:oauth:token-type:access_token", RefreshToken: "urn:ietf:params:oauth:token-type:refresh_token", IdToken: "urn:ietf:params:oauth:token-type:id_token", Saml1Token: "urn:ietf:params:oauth:token-type:saml1", Saml2Token: "urn:ietf:params:oauth:token-type:saml2" };
-var ac = { JwtBearer: "urn:ietf:params:oauth:client-assertion-type:jwt-bearer" };
-var er = class extends ie {
+var cc = { AccessToken: "urn:ietf:params:oauth:token-type:access_token", RefreshToken: "urn:ietf:params:oauth:token-type:refresh_token", IdToken: "urn:ietf:params:oauth:token-type:id_token", Saml1Token: "urn:ietf:params:oauth:token-type:saml1", Saml2Token: "urn:ietf:params:oauth:token-type:saml2" };
+var uc = { JwtBearer: "urn:ietf:params:oauth:client-assertion-type:jwt-bearer" };
+var er = class extends oe {
   constructor(t) {
     super();
     c(this, "options");
@@ -54846,7 +54869,7 @@ var er = class extends ie {
     c(this, "keyValueClient");
     c(this, "logLevel");
     if (t?.baseUrl && !t.baseUrl.startsWith("http")) throw new Error("Base URL must start with http or https");
-    this.options = t ?? {}, this.fetch = t?.fetch ?? cc(), this.storage = t?.storage ?? new ot(void 0, t?.storagePrefix), this.createPdfImpl = t?.createPdf, this.baseUrl = Yr(t?.baseUrl ?? ec), this.fhirBaseUrl = U(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = U(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = U(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = U(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.fhircastHubUrl = U(this.baseUrl, t?.fhircastHubUrl ?? "fhircast/STU3"), this.cdsServicesUrl = U(this.baseUrl, t?.cdsServicesUrl ?? "cds-services"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.credentialsInHeader = t?.authCredentialsMethod === "header", this.defaultHeaders = t?.defaultHeaders ?? {}, this.onUnauthenticated = t?.onUnauthenticated, this.refreshGracePeriod = t?.refreshGracePeriod ?? ic, this.logLevel = this.initializeLogLevel(t), this.maxRetries = t?.maxRetries ?? 2, this.maxRetryTime = t?.maxRetryTime ?? 2e3, this.cacheTime = t?.cacheTime ?? (z() ? rc : nc), this.cacheTime > 0 ? this.requestCache = new K(t?.resourceCacheSize ?? tc) : this.requestCache = void 0, t?.autoBatchTime ? (this.autoBatchTime = t.autoBatchTime, this.autoBatchQueue = []) : (this.autoBatchTime = 0, this.autoBatchQueue = void 0), t?.accessToken && this.setAccessToken(t.accessToken), this.storage.getInitPromise === void 0 ? (t?.accessToken || this.attemptResumeActiveLogin().catch(console.error), this.initPromise = Promise.resolve(), this.dispatchEvent({ type: "storageInitialized" })) : (this.initComplete = false, this.initPromise = this.storage.getInitPromise(), this.initPromise.then(() => {
+    this.options = t ?? {}, this.fetch = t?.fetch ?? lc(), this.storage = t?.storage ?? new ot(void 0, t?.storagePrefix), this.createPdfImpl = t?.createPdf, this.baseUrl = Yr(t?.baseUrl ?? rc), this.fhirBaseUrl = U(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = U(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = U(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = U(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.fhircastHubUrl = U(this.baseUrl, t?.fhircastHubUrl ?? "fhircast/STU3"), this.cdsServicesUrl = U(this.baseUrl, t?.cdsServicesUrl ?? "cds-services"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.credentialsInHeader = t?.authCredentialsMethod === "header", this.defaultHeaders = t?.defaultHeaders ?? {}, this.onUnauthenticated = t?.onUnauthenticated, this.refreshGracePeriod = t?.refreshGracePeriod ?? sc, this.logLevel = this.initializeLogLevel(t), this.maxRetries = t?.maxRetries ?? 2, this.maxRetryTime = t?.maxRetryTime ?? 2e3, this.cacheTime = t?.cacheTime ?? (J() ? ic : oc), this.cacheTime > 0 ? this.requestCache = new Y(t?.resourceCacheSize ?? nc) : this.requestCache = void 0, t?.autoBatchTime ? (this.autoBatchTime = t.autoBatchTime, this.autoBatchQueue = []) : (this.autoBatchTime = 0, this.autoBatchQueue = void 0), t?.accessToken && this.setAccessToken(t.accessToken), this.storage.getInitPromise === void 0 ? (t?.accessToken || this.attemptResumeActiveLogin().catch(console.error), this.initPromise = Promise.resolve(), this.dispatchEvent({ type: "storageInitialized" })) : (this.initComplete = false, this.initPromise = this.storage.getInitPromise(), this.initPromise.then(() => {
       t?.accessToken || this.attemptResumeActiveLogin().catch(console.error), this.initComplete = true, this.dispatchEvent({ type: "storageInitialized" });
     }).catch((n) => {
       console.error(n), this.initComplete = true, this.dispatchEvent({ type: "storageInitFailed", payload: { error: n } });
@@ -54948,7 +54971,7 @@ var er = class extends ie {
     await this.post(this.logoutUrl, {}), this.clear();
   }
   async signInWithRedirect(t) {
-    let i = new URLSearchParams(ce.getSearch()).get("code");
+    let i = new URLSearchParams(ue.getSearch()).get("code");
     if (!i) {
       await this.requestAuthorization(t);
       return;
@@ -54956,15 +54979,15 @@ var er = class extends ie {
     return this.processCode(i);
   }
   signOutWithRedirect() {
-    ce.assign(this.logoutUrl);
+    ue.assign(this.logoutUrl);
   }
   async signInWithExternalAuth(t, n, i, o2, s = true) {
     let a = o2;
-    s && (a = await this.ensureCodeChallenge(o2)), ce.assign(this.getExternalAuthRedirectUri(t, n, i, a, s));
+    s && (a = await this.ensureCodeChallenge(o2)), ue.assign(this.getExternalAuthRedirectUri(t, n, i, a, s));
   }
   async exchangeExternalAccessToken(t, n, i) {
     if (n = n ?? this.clientId, !n) throw new Error("MedplumClient is missing clientId");
-    let o2 = { grant_type: Ge.TokenExchange, subject_token_type: sc.AccessToken, client_id: n, subject_token: t };
+    let o2 = { grant_type: Ge.TokenExchange, subject_token_type: cc.AccessToken, client_id: n, subject_token: t };
     return i && (o2.membership_id = i), this.fetchTokens(o2);
   }
   getExternalAuthRedirectUri(t, n, i, o2, s = true) {
@@ -55147,22 +55170,22 @@ var er = class extends ie {
     if (a.contentType === k.XML) {
       let p2 = a.data, g2;
       p2 instanceof Blob ? g2 = await new Promise((v2, M2) => {
-        let J = new FileReader();
-        J.onload = () => {
-          if (!J.result) {
+        let K = new FileReader();
+        K.onload = () => {
+          if (!K.result) {
             M2(new Error("Failed to load file"));
             return;
           }
-          v2(J.result);
-        }, J.readAsText(p2, "utf-8");
+          v2(K.result);
+        }, K.readAsText(p2, "utf-8");
       }) : ArrayBuffer.isView(p2) ? g2 = new TextDecoder().decode(p2) : g2 = p2, g2.includes("<ClinicalDocument") && g2.includes("urn:hl7-org:v3") && (a = { ...a, contentType: k.CDA_XML });
     }
     let u2 = s ?? (typeof n == "object" ? n : {}), l = await this.createBinary(a, u2);
     return { contentType: a.contentType, url: l.url, title: a.filename };
   }
   createBinary(t, n, i, o2, s) {
-    let a = no(t, n, i, o2), u2 = s ?? (typeof n == "object" ? n : {}), { data: l, contentType: p2, filename: g2, securityContext: v2, onProgress: M2 } = a, J = this.fhirUrl("Binary");
-    return g2 && J.searchParams.set("_filename", g2), v2?.reference && this.setRequestHeader(u2, "X-Security-Context", v2.reference), M2 ? this.uploadwithProgress(J, l, p2, M2, u2) : this.post(J, l, p2, u2);
+    let a = no(t, n, i, o2), u2 = s ?? (typeof n == "object" ? n : {}), { data: l, contentType: p2, filename: g2, securityContext: v2, onProgress: M2 } = a, K = this.fhirUrl("Binary");
+    return g2 && K.searchParams.set("_filename", g2), v2?.reference && this.setRequestHeader(u2, "X-Security-Context", v2.reference), M2 ? this.uploadwithProgress(K, l, p2, M2, u2) : this.post(K, l, p2, u2);
   }
   uploadwithProgress(t, n, i, o2, s) {
     return new Promise((a, u2) => {
@@ -55175,19 +55198,19 @@ var er = class extends ie {
         l.status >= 200 && l.status < 300 ? g2(l.response) : g2(new f(yt(l.response || l.statusText)));
       }, l.open("POST", t), l.withCredentials = true, l.setRequestHeader("Authorization", "Bearer " + this.accessToken), l.setRequestHeader("Cache-Control", "no-cache, no-store, max-age=0"), l.setRequestHeader("Content-Type", i), this.options.extendedMode !== false && l.setRequestHeader("X-Medplum", "extended"), s?.headers) {
         let v2 = s.headers;
-        for (let [M2, J] of Object.entries(v2)) l.setRequestHeader(M2, J);
+        for (let [M2, K] of Object.entries(v2)) l.setRequestHeader(M2, K);
       }
       l.send(n);
     });
   }
   async createPdf(t, n, i, o2) {
     if (!this.createPdfImpl) throw new Error("PDF creation not enabled");
-    let s = dc(t, n, i, o2), a = typeof n == "object" ? n : {}, { docDefinition: u2, tableLayouts: l, fonts: p2, ...g2 } = s, v2 = await this.createPdfImpl(u2, l, p2), M2 = { ...g2, data: v2, contentType: "application/pdf" };
+    let s = fc(t, n, i, o2), a = typeof n == "object" ? n : {}, { docDefinition: u2, tableLayouts: l, fonts: p2, ...g2 } = s, v2 = await this.createPdfImpl(u2, l, p2), M2 = { ...g2, data: v2, contentType: "application/pdf" };
     return this.createBinary(M2, a);
   }
   createComment(t, n, i) {
     let o2 = this.getProfile(), s, a;
-    return t.resourceType === "Encounter" && (s = Ce(t), a = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a = t.subject), t.resourceType === "Patient" && (a = Ce(t)), this.createResource({ resourceType: "Communication", status: "completed", basedOn: [Ce(t)], encounter: s, subject: a, sender: o2 ? Ce(o2) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i);
+    return t.resourceType === "Encounter" && (s = Pe(t), a = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a = t.subject), t.resourceType === "Patient" && (a = Pe(t)), this.createResource({ resourceType: "Communication", status: "completed", basedOn: [Pe(t)], encounter: s, subject: a, sender: o2 ? Pe(o2) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i);
   }
   async updateResource(t, n) {
     if (!t.resourceType) throw new Error("Missing resourceType");
@@ -55230,7 +55253,7 @@ var er = class extends ie {
   }
   pushToAgent(t, n, i, o2, s, a) {
     let { waitTimeout: u2, returnAck: l, ...p2 } = a ?? {};
-    return this.post(this.fhirUrl("Agent", Pe(t), "$push"), { destination: typeof n == "string" ? n : O(n), body: i, contentType: o2, waitForResponse: s, ...u2 !== void 0 ? { waitTimeout: u2 } : void 0, ...l !== void 0 ? { returnAck: l } : void 0 }, k.FHIR_JSON, p2);
+    return this.post(this.fhirUrl("Agent", Ae(t), "$push"), { destination: typeof n == "string" ? n : O(n), body: i, contentType: o2, waitForResponse: s, ...u2 !== void 0 ? { waitTimeout: u2 } : void 0, ...l !== void 0 ? { returnAck: l } : void 0 }, k.FHIR_JSON, p2);
   }
   getCdsServices(t) {
     return this.get(this.cdsServicesUrl, t);
@@ -55308,13 +55331,13 @@ var er = class extends ie {
   async downloadResponse(t, n = {}) {
     this.refreshPromise && await this.refreshPromise;
     let i = t.toString();
-    i.startsWith(oc) && (t = this.fhirUrl(i));
+    i.startsWith(ac) && (t = this.fhirUrl(i));
     let o2 = n.headers;
     return o2 || (o2 = {}, n.headers = o2), o2.Accept || (o2.Accept = "*/*"), this.addFetchOptionsDefaults(n), this.fetchWithRetry(t.toString(), n);
   }
   async createMedia(t, n) {
     let { additionalFields: i, ...o2 } = t, s = await this.createResource({ resourceType: "Media", status: "preparation", content: { contentType: t.contentType }, ...i });
-    o2.securityContext || (o2.securityContext = Ce(s));
+    o2.securityContext || (o2.securityContext = Pe(s));
     let a = await this.createAttachment(o2, n);
     return this.updateResource({ ...s, status: "completed", content: a });
   }
@@ -55323,7 +55346,7 @@ var er = class extends ie {
   }
   async createDocumentReference(t, n) {
     let { additionalFields: i, ...o2 } = t, s = await this.createResource({ resourceType: "DocumentReference", status: "current", content: [{ attachment: { contentType: t.contentType } }], ...i });
-    o2.securityContext || (o2.securityContext = Ce(s));
+    o2.securityContext || (o2.securityContext = Pe(s));
     let a = await this.createAttachment(o2, n);
     return this.updateResource({ ...s, content: [{ attachment: a }] });
   }
@@ -55404,7 +55427,7 @@ var er = class extends ie {
     for (let o2 = 0; o2 <= i; o2++) try {
       this.logLevel !== "none" && this.logRequest(t, n);
       let s = await this.fetch(t, n);
-      if (this.logLevel !== "none" && this.logResponse(s), this.setCurrentRateLimit(s), o2 >= i || !pc(s)) return s;
+      if (this.logLevel !== "none" && this.logResponse(s), this.setCurrentRateLimit(s), o2 >= i || !mc(s)) return s;
       let a = this.getRetryDelay(o2), u2 = n.maxRetryTime ?? this.maxRetryTime;
       if (a > u2) return s;
       await Kr(a, { signal: n.signal });
@@ -55473,7 +55496,7 @@ var er = class extends ie {
   addFetchOptionsDefaults(t) {
     Object.entries(this.defaultHeaders).forEach(([n, i]) => {
       this.setRequestHeader(t, n, i);
-    }), this.setRequestHeader(t, "Accept", Za, true), this.options.extendedMode !== false && this.setRequestHeader(t, "X-Medplum", "extended"), t.body && this.setRequestHeader(t, "Content-Type", k.FHIR_JSON, true), this.accessToken ? this.setRequestHeader(t, "Authorization", "Bearer " + this.accessToken) : this.basicAuth && this.setRequestHeader(t, "Authorization", "Basic " + this.basicAuth), t.cache || (t.cache = "no-cache"), t.credentials || (t.credentials = "include");
+    }), this.setRequestHeader(t, "Accept", tc, true), this.options.extendedMode !== false && this.setRequestHeader(t, "X-Medplum", "extended"), t.body && this.setRequestHeader(t, "Content-Type", k.FHIR_JSON, true), this.accessToken ? this.setRequestHeader(t, "Authorization", "Bearer " + this.accessToken) : this.basicAuth && this.setRequestHeader(t, "Authorization", "Basic " + this.basicAuth), t.cache || (t.cache = "no-cache"), t.credentials || (t.credentials = "include");
   }
   setRequestContentType(t, n) {
     this.setRequestHeader(t, "Content-Type", n);
@@ -55498,7 +55521,7 @@ var er = class extends ie {
   }
   handleUnauthenticated(t, n) {
     if (this.refresh()) return this.request(t, n);
-    throw this.clear(), this.onUnauthenticated?.(), new f(Ne);
+    throw this.clear(), this.onUnauthenticated?.(), new f(Fe);
   }
   async startPkce() {
     let t = nn();
@@ -55514,10 +55537,10 @@ var er = class extends ie {
   }
   async requestAuthorization(t) {
     let n = await this.ensureCodeChallenge(t ?? {}), i = new URL(this.authorizeUrl);
-    i.searchParams.set("response_type", "code"), i.searchParams.set("state", this.storage.getString("pkceState")), i.searchParams.set("client_id", n.clientId ?? this.clientId), i.searchParams.set("redirect_uri", n.redirectUri ?? ce.getOrigin()), i.searchParams.set("code_challenge_method", n.codeChallengeMethod), i.searchParams.set("code_challenge", n.codeChallenge), i.searchParams.set("scope", n.scope ?? "openid profile"), ce.assign(i.toString());
+    i.searchParams.set("response_type", "code"), i.searchParams.set("state", this.storage.getString("pkceState")), i.searchParams.set("client_id", n.clientId ?? this.clientId), i.searchParams.set("redirect_uri", n.redirectUri ?? ue.getOrigin()), i.searchParams.set("code_challenge_method", n.codeChallengeMethod), i.searchParams.set("code_challenge", n.codeChallenge), i.searchParams.set("scope", n.scope ?? "openid profile"), ue.assign(i.toString());
   }
   processCode(t, n) {
-    let i = { grant_type: Ge.AuthorizationCode, code: t, client_id: n?.clientId ?? this.clientId ?? "", redirect_uri: n?.redirectUri ?? ce.getOrigin() }, o2 = this.storage.getString("codeVerifier");
+    let i = { grant_type: Ge.AuthorizationCode, code: t, client_id: n?.clientId ?? this.clientId ?? "", redirect_uri: n?.redirectUri ?? ue.getOrigin() }, o2 = this.storage.getString("codeVerifier");
     return o2 && (i.code_verifier = o2), this.fetchTokens(i);
   }
   refreshIfExpired(t) {
@@ -55543,7 +55566,7 @@ var er = class extends ie {
     return this.clientId = t, this.fetchTokens({ grant_type: Ge.JwtBearer, client_id: t, assertion: n, scope: i });
   }
   async startJwtAssertionLogin(t) {
-    return this.fetchTokens({ grant_type: Ge.ClientCredentials, client_assertion_type: ac.JwtBearer, client_assertion: t });
+    return this.fetchTokens({ grant_type: Ge.ClientCredentials, client_assertion_type: uc.JwtBearer, client_assertion: t });
   }
   setBasicAuth(t, n) {
     this.clientId = t, this.clientSecret = n, this.basicAuth = Gt(t + ":" + n);
@@ -55619,10 +55642,10 @@ var er = class extends ie {
   setupStorageListener() {
     try {
       window.addEventListener("storage", (t) => {
-        if (t.key === null) ce.reload();
+        if (t.key === null) ue.reload();
         else if (t.key === this.storage.makeKey("activeLogin")) {
           let n = t.oldValue ? JSON.parse(t.oldValue) : void 0, i = t.newValue ? JSON.parse(t.newValue) : void 0;
-          n?.profile.reference !== i?.profile.reference || !this.checkSessionDetailsMatchLogin(i) ? ce.reload() : i ? this.setAccessToken(i.accessToken, i.refreshToken) : this.clear();
+          n?.profile.reference !== i?.profile.reference || !this.checkSessionDetailsMatchLogin(i) ? ue.reload() : i ? this.setAccessToken(i.accessToken, i.refreshToken) : this.clear();
         }
       });
     } catch {
@@ -55641,7 +55664,7 @@ var er = class extends ie {
     return this.getSubscriptionManager().getMasterEmitter();
   }
 };
-function cc() {
+function lc() {
   if (!globalThis.fetch) throw new Error("Fetch not available in this environment");
   return globalThis.fetch.bind(globalThis);
 }
@@ -55656,29 +55679,29 @@ function ro(r6) {
   let e = r6.entry?.map((t) => t.resource) ?? [];
   return Object.assign(e, { bundle: r6 });
 }
-function uc(r6) {
+function dc(r6) {
   return C(r6) && "data" in r6 && "contentType" in r6;
 }
 function no(r6, e, t, n) {
-  return uc(r6) ? r6 : { data: r6, filename: e, contentType: t, onProgress: n };
+  return dc(r6) ? r6 : { data: r6, filename: e, contentType: t, onProgress: n };
 }
-function lc(r6) {
+function pc(r6) {
   return C(r6) && "docDefinition" in r6;
 }
-function dc(r6, e, t, n) {
-  return lc(r6) ? r6 : { docDefinition: r6, filename: e, tableLayouts: t, fonts: n };
+function fc(r6, e, t, n) {
+  return pc(r6) ? r6 : { docDefinition: r6, filename: e, tableLayouts: t, fonts: n };
 }
-function pc(r6) {
+function mc(r6) {
   return r6.status === 429 || r6.status >= 500;
 }
-var Rc = [...tt, "->", "<<", ">>", "=="];
-var Ac = rt().registerInfix("->", { precedence: S.Arrow }).registerInfix(";", { precedence: S.Semicolon });
-var Hc = " ".repeat(2);
-var Qc = [...tt, "eq", "ne", "co"];
-var zc = { eq: m.EXACT, ne: m.NOT_EQUALS, co: m.CONTAINS, sw: m.STARTS_WITH, ew: void 0, gt: m.GREATER_THAN, lt: m.LESS_THAN, ge: m.GREATER_THAN_OR_EQUALS, le: m.LESS_THAN_OR_EQUALS, ap: m.APPROXIMATELY, sa: m.STARTS_AFTER, eb: m.ENDS_BEFORE, pr: m.PRESENT, po: void 0, ss: void 0, sb: void 0, in: m.IN, ni: m.NOT_IN, re: m.EQUALS, identifier: m.IDENTIFIER };
-var Kc = rt();
-var Yc = { AA: "OK", AE: "Application Error", AR: "Application Reject", CA: "Commit Accept", CE: "Commit Error", CR: "Commit Reject" };
-var Te = class {
+var Pc = [...tt, "->", "<<", ">>", "=="];
+var Oc = rt().registerInfix("->", { precedence: S.Arrow }).registerInfix(";", { precedence: S.Semicolon });
+var Qc = " ".repeat(2);
+var Jc = [...tt, "eq", "ne", "co"];
+var Kc = { eq: m.EXACT, ne: m.NOT_EQUALS, co: m.CONTAINS, sw: m.STARTS_WITH, ew: void 0, gt: m.GREATER_THAN, lt: m.LESS_THAN, ge: m.GREATER_THAN_OR_EQUALS, le: m.LESS_THAN_OR_EQUALS, ap: m.APPROXIMATELY, sa: m.STARTS_AFTER, eb: m.ENDS_BEFORE, pr: m.PRESENT, po: void 0, ss: void 0, sb: void 0, in: m.IN, ni: m.NOT_IN, re: m.EQUALS, identifier: m.IDENTIFIER };
+var Xc = rt();
+var Zc = { AA: "OK", AE: "Application Error", AR: "Application Reject", CA: "Commit Accept", CE: "Commit Error", CR: "Commit Reject" };
+var Se = class {
   constructor(e = "\r", t = "|", n = "^", i = "~", o2 = "\\", s = "&") {
     c(this, "segmentSeparator");
     c(this, "fieldSeparator");
@@ -55696,7 +55719,7 @@ var Te = class {
   }
 };
 var Ro = class r2 {
-  constructor(e, t = new Te()) {
+  constructor(e, t = new Se()) {
     c(this, "context");
     c(this, "_segments");
     c(this, "segmentsByName");
@@ -55745,7 +55768,7 @@ var Ro = class r2 {
   }
   buildAck(e) {
     let t = /* @__PURE__ */ new Date(), n = this.getSegment("MSH"), i = n?.getField(3)?.toString() ?? "", o2 = n?.getField(4)?.toString() ?? "", s = n?.getField(5)?.toString() ?? "", a = n?.getField(6)?.toString() ?? "", u2 = n?.getField(10)?.toString() ?? "", l = n?.getField(12)?.toString() ?? "2.5.1", p2 = e?.ackCode ?? "AA";
-    return new r2([new lt(["MSH", this.context.getMsh2(), s, a, i, o2, Zc(t), "", this.buildAckMessageType(n), t.getTime().toString(), "P", l], this.context), new lt(["MSA", p2, u2, Yc[p2]], this.context), ...e?.errSegment ? [e.errSegment] : []]);
+    return new r2([new lt(["MSH", this.context.getMsh2(), s, a, i, o2, tu(t), "", this.buildAckMessageType(n), t.getTime().toString(), "P", l], this.context), new lt(["MSA", p2, u2, Zc[p2]], this.context), ...e?.errSegment ? [e.errSegment] : []]);
   }
   buildAckMessageType(e) {
     let t = e?.getField(9), n = t?.getComponent(2), i = t?.getComponent(3), o2 = "ACK";
@@ -55756,7 +55779,7 @@ var Ro = class r2 {
       let i = new Error("Invalid HL7 message");
       throw i.type = "entity.parse.failed", i;
     }
-    let t = new Te("\r", e.charAt(3), e.charAt(4), e.charAt(5), e.charAt(6), e.charAt(7)), n = new r2(e.split(/[\r\n]+/), t);
+    let t = new Se("\r", e.charAt(3), e.charAt(4), e.charAt(5), e.charAt(6), e.charAt(7)), n = new r2(e.split(/[\r\n]+/), t);
     return n.cachedString = e, n;
   }
   setSegment(e, t) {
@@ -55791,7 +55814,7 @@ function Co(r6) {
   return e;
 }
 var lt = class r3 {
-  constructor(e, t = new Te()) {
+  constructor(e, t = new Se()) {
     c(this, "context");
     c(this, "name");
     c(this, "_fields");
@@ -55814,8 +55837,8 @@ var lt = class r3 {
   }
   getField(e) {
     if (this.name === "MSH") {
-      if (e === 1) return new ue([[this.context.getMsh1()]], this.context);
-      if (e === 2) return new ue([[this.context.getMsh2()]], this.context);
+      if (e === 1) return new le([[this.context.getMsh1()]], this.context);
+      if (e === 2) return new le([[this.context.getMsh2()]], this.context);
       if (e > 2) return this.parseField(e - 1);
     }
     return this.parseField(e);
@@ -55824,7 +55847,7 @@ var lt = class r3 {
     let t = this._fields[e];
     if (t === void 0) return;
     if (typeof t != "string") return t;
-    let n = ue.parse(t, this.context);
+    let n = le.parse(t, this.context);
     return n.onModified = () => {
       this.cachedString = void 0, this.onModified?.();
     }, this._fields[e] = n, n;
@@ -55835,7 +55858,7 @@ var lt = class r3 {
   toString() {
     return this.cachedString ??= this._fields.map((e) => typeof e == "string" ? e : e.toString()).join(this.context.fieldSeparator), this.cachedString;
   }
-  static parse(e, t = new Te()) {
+  static parse(e, t = new Se()) {
     let n = new r3(e.split(t.fieldSeparator), t);
     return n.cachedString = e, n;
   }
@@ -55844,12 +55867,12 @@ var lt = class r3 {
       if (e === 1 || e === 2) return false;
       if (e > 2) {
         let n = e - 1;
-        for (; this._fields.length <= n; ) this._fields.push(new ue([[""]], this.context));
-        return this._fields[n] = typeof t == "string" ? ue.parse(t, this.context) : t, this.invalidateCache(), true;
+        for (; this._fields.length <= n; ) this._fields.push(new le([[""]], this.context));
+        return this._fields[n] = typeof t == "string" ? le.parse(t, this.context) : t, this.invalidateCache(), true;
       }
     }
-    for (; this._fields.length <= e; ) this._fields.push(new ue([[""]], this.context));
-    return this._fields[e] = typeof t == "string" ? ue.parse(t, this.context) : t, this.invalidateCache(), true;
+    for (; this._fields.length <= e; ) this._fields.push(new le([[""]], this.context));
+    return this._fields[e] = typeof t == "string" ? le.parse(t, this.context) : t, this.invalidateCache(), true;
   }
   setComponent(e, t, n, i, o2 = 0) {
     let s = this.getField(e);
@@ -55865,8 +55888,8 @@ var lt = class r3 {
     for (let t of this._fields) typeof t != "string" && (t.onModified = e);
   }
 };
-var ue = class r4 {
-  constructor(e, t = new Te()) {
+var le = class r4 {
+  constructor(e, t = new Se()) {
     c(this, "context");
     c(this, "components");
     c(this, "onModified");
@@ -55883,7 +55906,7 @@ var ue = class r4 {
   toString() {
     return this.cachedString ??= this.components.map((e) => e.join(this.context.componentSeparator)).join(this.context.repetitionSeparator), this.cachedString;
   }
-  static parse(e, t = new Te()) {
+  static parse(e, t = new Se()) {
     let n = new r4(e.split(t.repetitionSeparator).map((i) => i.split(t.componentSeparator)), t);
     return n.cachedString = e, n;
   }
@@ -55905,12 +55928,12 @@ var ue = class r4 {
     this.cachedString = void 0, this.onModified?.();
   }
 };
-function Zc(r6) {
+function tu(r6) {
   let e = r6 instanceof Date ? r6 : new Date(r6), n = e.toISOString().replaceAll(/[-:T]/g, "").replace(/(\.\d+)?Z$/, ""), i = e.getUTCMilliseconds();
   return i > 0 && (n += "." + i.toString()), n;
 }
 var Qe = { NONE: 0, ERROR: 1, WARN: 2, INFO: 3, DEBUG: 4 };
-var eu = ["NONE", "ERROR", "WARN", "INFO", "DEBUG"];
+var ru = ["NONE", "ERROR", "WARN", "INFO", "DEBUG"];
 var Po = class r5 {
   constructor(e, t = {}, n = Qe.INFO, i = {}) {
     c(this, "write");
@@ -55948,10 +55971,10 @@ var Po = class r5 {
       i = { ...n };
       for (let [o2, s] of Object.entries(i)) s instanceof Error && (i[o2] = lr(s));
     }
-    this.write(JSON.stringify({ level: eu[e], timestamp: (/* @__PURE__ */ new Date()).toISOString(), msg: this.prefix ? `${this.prefix}${t}` : t, ...i, ...this.metadata }));
+    this.write(JSON.stringify({ level: ru[e], timestamp: (/* @__PURE__ */ new Date()).toISOString(), msg: this.prefix ? `${this.prefix}${t}` : t, ...i, ...this.metadata }));
   }
 };
-function Jh(r6) {
+function Yh(r6) {
   let e = Qe[r6.toUpperCase()];
   if (e === void 0) throw new Error(`Invalid log level: ${r6}`);
   return e;
@@ -55970,9 +55993,9 @@ function lr(r6, e = 0, t = 10) {
   return n;
 }
 var Cn = `${ft}/fhir/StructureDefinition/patient-preferredPharmacy`;
-var bu = "https://meta.medplum.com/releases";
+var Ru = "https://meta.medplum.com/releases";
 var An = /* @__PURE__ */ new Map();
-function Eu(r6) {
+function Cu(r6) {
   let e = r6;
   if (!e.tag_name?.startsWith("v")) throw new Error("Manifest missing valid tag_name starting with a 'v' (eg. v5.1.15)");
   let t = e.assets;
@@ -55985,7 +56008,7 @@ function Eu(r6) {
 async function wn(r6, e, t) {
   let n = e ? An.get(e) : void 0;
   if (!n) {
-    let i = e ? `v${e}` : "latest", o2 = new URL(`${bu}/${i}.json`);
+    let i = e ? `v${e}` : "latest", o2 = new URL(`${Ru}/${i}.json`);
     if (o2.searchParams.set("a", r6), o2.searchParams.set("c", pn), t) for (let [u2, l] of Object.entries(t)) o2.searchParams.set(u2, l);
     let s = await fetch(o2.toString());
     if (s.status !== 200) {
@@ -55993,20 +56016,20 @@ async function wn(r6, e, t) {
       try {
         u2 = (await s.json()).message;
       } catch (l) {
-        console.error(`Failed to parse message from body: ${Se(l)}`);
+        console.error(`Failed to parse message from body: ${be(l)}`);
       }
       throw new Error(`Received status code ${s.status} while fetching manifest for version '${e ?? "latest"}'. Message: ${u2}`);
     }
     let a = await s.json();
-    Eu(a), n = a, An.set(n.tag_name.slice(1), n);
+    Cu(a), n = a, An.set(n.tag_name.slice(1), n);
   }
   return n;
 }
-function Ru(r6) {
+function Pu(r6) {
   return /^\d+\.\d+\.\d+(-[0-9a-z]{7})?$/.test(r6);
 }
-async function Gg(r6, e) {
-  if (!Ru(e)) return false;
+async function zg(r6, e) {
+  if (!Pu(e)) return false;
   try {
     await wn(r6, e);
   } catch {
@@ -56014,7 +56037,7 @@ async function Gg(r6, e) {
   }
   return true;
 }
-async function Qg(r6) {
+async function Jg(r6) {
   let e = await wn(r6);
   if (!e.tag_name.startsWith("v")) throw new Error(`Invalid release name found. Release tag '${e.tag_name}' did not start with 'v'`);
   return e.tag_name.slice(1);
@@ -56126,7 +56149,7 @@ var v = class extends m2 {
         return;
       }
       let l = c2.message.getSegment("MSA")?.getField(1)?.toString()?.toUpperCase();
-      l && (h2.returnAck === af.APPLICATION && l === "CA" || (h2.timer && clearTimeout(h2.timer), h2.resolve(c2.message), this.deletePendingMessage(a)));
+      l && (h2.returnAck === uf.APPLICATION && l === "CA" || (h2.timer && clearTimeout(h2.timer), h2.resolve(c2.message), this.deletePendingMessage(a)));
     });
   }
   isClosed() {
@@ -56179,7 +56202,7 @@ var v = class extends m2 {
       let r6;
       t?.timeoutMs && (r6 = setTimeout(() => {
         this.deletePendingMessage(c2), n(new f({ resourceType: "OperationOutcome", issue: [{ severity: "error", code: "timeout", details: { text: "Client timeout" }, diagnostics: `Request timed out after waiting ${t.timeoutMs} milliseconds for response` }] }));
-      }, t.timeoutMs)), this.setPendingMessage(c2, { message: e, resolve: s, reject: n, returnAck: t?.returnAck ?? af.APPLICATION, timer: r6 }), this.sendImpl(e);
+      }, t.timeoutMs)), this.setPendingMessage(c2, { message: e, resolve: s, reject: n, returnAck: t?.returnAck ?? uf.APPLICATION, timer: r6 }), this.sendImpl(e);
     });
   }
   async close() {
@@ -56627,7 +56650,7 @@ var ByteStreamChannelConnection = class {
       }
     } catch (err2) {
       this.channel.log.error(`Byte stream error occurred - check channel logs`);
-      this.channel.channelLog.error(`Byte stream error: ${Se(err2)}`);
+      this.channel.channelLog.error(`Byte stream error: ${be(err2)}`);
     }
   }
   write(data2) {
@@ -56644,6 +56667,7 @@ var DEFAULT_PING_TIMEOUT = 3600;
 var DEFAULT_LOG_LIMIT = 20;
 var MAX_LOG_LIMIT = 1e3;
 var MAX_MISSED_HEARTBEATS = 1;
+var MAX_NOT_LIVE_HEARTBEATS = 2;
 var DEFAULT_MAX_CLIENTS_PER_REMOTE = 5;
 var CLIENT_RELEASE_COUNTDOWN_MS = 1e4;
 var HEARTBEAT_PERIOD_MS = 1e4;
@@ -66437,12 +66461,12 @@ var Colors = /* @__PURE__ */ (function() {
     value: function xyz2LAB(xyz) {
       var whitePoint = Colors2.d65WhitePointXYZ();
       var X = xyz[0] / whitePoint[0];
-      var Y = xyz[1] / whitePoint[1];
-      var Z2 = xyz[2] / whitePoint[2];
+      var Y2 = xyz[1] / whitePoint[1];
+      var Z = xyz[2] / whitePoint[2];
       X = Colors2.labf(X);
-      Y = Colors2.labf(Y);
-      Z2 = Colors2.labf(Z2);
-      return [116 * Y - 16, 500 * (X - Y), 200 * (Y - Z2)];
+      Y2 = Colors2.labf(Y2);
+      Z = Colors2.labf(Z);
+      return [116 * Y2 - 16, 500 * (X - Y2), 200 * (Y2 - Z)];
     }
   }, {
     key: "lab2RGB",
@@ -73325,7 +73349,7 @@ var AgentDicomChannel = class extends BaseChannel {
               calledAeTitle: this.association?.getCalledAeTitle()
             },
             dataset: dicomJson2,
-            binary: binary ? Ce(binary) : void 0
+            binary: binary ? Pe(binary) : void 0
           };
           App.instance.addToWebSocketQueue({
             type: "agent:transmit:request",
@@ -73339,7 +73363,7 @@ var AgentDicomChannel = class extends BaseChannel {
           response2.setStatus(dimse.constants.Status.Success);
         } catch (err2) {
           _DcmjsDimseScp.channel.log.error(`DICOM error - check channel logs`);
-          _DcmjsDimseScp.channel.channelLog.error(`DICOM error: ${Se(err2)}`);
+          _DcmjsDimseScp.channel.channelLog.error(`DICOM error: ${be(err2)}`);
           response2.setStatus(dimse.constants.Status.ProcessingFailure);
         }
         return response2;
@@ -73782,12 +73806,12 @@ var AgentHl7ChannelConnection = class {
       }
     } catch (err2) {
       this.channel.log.error(`HL7 error occurred - check channel logs`);
-      this.channel.channelLog.error(`HL7 error: ${Se(err2)}`);
+      this.channel.channelLog.error(`HL7 error: ${be(err2)}`);
     }
   }
   async handleError(event) {
-    this.channel.log.error(`HL7 connection error: ${Se(event.error)}`);
-    this.channel.channelLog.error(`HL7 connection error: ${Se(event.error)}`);
+    this.channel.log.error(`HL7 connection error: ${be(event.error)}`);
+    this.channel.channelLog.error(`HL7 connection error: ${be(event.error)}`);
   }
   handleEnhancedAckSent(event) {
     const hl7Message = event.message;
@@ -74182,13 +74206,13 @@ var Hl7ClientPool = class {
       this.closeAndRemoveClient(client);
       if (this.keepAlive) {
         this.log.error(
-          `Persistent connection to remote 'mllp://${this.host}:${this.port}' encountered error: '${Se(event.error)}' - Closing connection...`
+          `Persistent connection to remote 'mllp://${this.host}:${this.port}' encountered error: '${be(event.error)}' - Closing connection...`
         );
       }
     });
     client.addEventListener("warning", (event) => {
       this.log.warn(
-        `Connection to remote 'mllp://${this.host}:${this.port}' warning: '${Se(event.error)}'`
+        `Connection to remote 'mllp://${this.host}:${this.port}' warning: '${be(event.error)}'`
       );
     });
     return client;
@@ -74250,7 +74274,7 @@ function cleanupLoggerConfig(config, configPathRoot = "config") {
     warnings.push(`${configPathRoot}.filesToKeep must be a valid integer`);
     config.filesToKeep = void 0;
   }
-  if (typeof config.logLevel !== "undefined" && !(typeof config.logLevel === "number" && eu[config.logLevel] !== void 0)) {
+  if (typeof config.logLevel !== "undefined" && !(typeof config.logLevel === "number" && ru[config.logLevel] !== void 0)) {
     warnings.push(`${configPathRoot}.logLevel must be a valid log level between LogLevel.NONE and LogLevel.DEBUG`);
     config.logLevel = void 0;
   }
@@ -74288,16 +74312,16 @@ function parseLoggerConfigFromArgs(args) {
     if (!propName.startsWith("logger.") || propVal === void 0) {
       continue;
     }
-    const [_2, configType, settingName] = qe(propName, ".", 3);
+    const [_2, configType, settingName] = je(propName, ".", 3);
     if (!LOGGER_CONFIG_KEYS.includes(settingName)) {
       warnings.push(`${propName} is not a valid setting name`);
     }
     let configValue;
     if (settingName === "logLevel") {
       try {
-        configValue = Jh(propVal);
+        configValue = Yh(propVal);
       } catch (err2) {
-        warnings.push(`Error while parsing ${propName}: ${Se(err2)}`);
+        warnings.push(`Error while parsing ${propName}: ${be(err2)}`);
       }
     } else if (LOGGER_CONFIG_INTEGER_KEYS.includes(settingName)) {
       try {
@@ -74698,8 +74722,9 @@ var _App = class _App {
     __publicField(this, "heartbeatPeriod", HEARTBEAT_PERIOD_MS);
     // 10 seconds
     __publicField(this, "heartbeatTimer");
-    __publicField(this, "heartbeatEmitter", new ie());
+    __publicField(this, "heartbeatEmitter", new oe());
     __publicField(this, "outstandingHeartbeats", 0);
+    __publicField(this, "notLiveHeartbeats", 0);
     __publicField(this, "webSocket");
     __publicField(this, "webSocketWorker");
     __publicField(this, "live", false);
@@ -74732,7 +74757,7 @@ var _App = class _App {
     this.medplum.addEventListener("change", () => {
       if (!this.webSocket) {
         this.connectWebSocket().catch((err2) => {
-          this.log.error(Se(err2));
+          this.log.error(be(err2));
         });
       } else {
         this.startWebSocketWorker();
@@ -74804,27 +74829,42 @@ var _App = class _App {
   }
   async startWebSocket() {
     await this.connectWebSocket();
-    this.heartbeatTimer = setInterval(() => this.heartbeat(), this.heartbeatPeriod);
+    this.heartbeatTimer = setInterval(() => {
+      this.heartbeat().catch((err2) => {
+        this.log.error(`Error during heartbeat: ${be(err2)}`);
+      });
+    }, this.heartbeatPeriod);
   }
   async heartbeat() {
     this.heartbeatEmitter.dispatchEvent({ type: "heartbeat" });
     if (!this.webSocket) {
       this.log.warn("WebSocket not connected");
       this.connectWebSocket().catch((err2) => {
-        this.log.error(Se(err2));
+        this.log.error(be(err2));
       });
       return;
     }
-    if (this.live) {
-      if (this.outstandingHeartbeats > MAX_MISSED_HEARTBEATS) {
-        this.outstandingHeartbeats = 0;
+    if (!this.live) {
+      this.notLiveHeartbeats += 1;
+      if (this.notLiveHeartbeats > MAX_NOT_LIVE_HEARTBEATS) {
+        this.notLiveHeartbeats = 0;
+        this.log.warn("Not connected to Medplum server after multiple heartbeat periods. Attempting to reconnect...");
         this.webSocket.reconnect();
-        this.log.info("Disconnected from Medplum server. Attempting to reconnect...");
-        return;
       }
-      this.outstandingHeartbeats += 1;
-      await this.sendToWebSocket({ type: "agent:heartbeat:request" });
-      this.lastHeartbeatSentTime = Date.now();
+      return;
+    }
+    this.notLiveHeartbeats = 0;
+    if (this.outstandingHeartbeats > MAX_MISSED_HEARTBEATS) {
+      this.outstandingHeartbeats = 0;
+      this.webSocket.reconnect();
+      this.log.info("Disconnected from Medplum server. Attempting to reconnect...");
+      return;
+    }
+    this.outstandingHeartbeats += 1;
+    await this.sendToWebSocket({ type: "agent:heartbeat:request" });
+    this.lastHeartbeatSentTime = Date.now();
+    if (this.webSocketQueue.length > 0) {
+      this.startWebSocketWorker();
     }
   }
   async connectWebSocket() {
@@ -74842,11 +74882,15 @@ var _App = class _App {
       }
     });
     this.webSocket.addEventListener("open", async () => {
-      await this.sendToWebSocket({
-        type: "agent:connect:request",
-        accessToken: this.medplum.getAccessToken(),
-        agentId: this.agentId
-      });
+      try {
+        await this.sendToWebSocket({
+          type: "agent:connect:request",
+          accessToken: this.medplum.getAccessToken(),
+          agentId: this.agentId
+        });
+      } catch (err2) {
+        this.log.error(`Error sending connect request: ${be(err2)}`);
+      }
     });
     this.webSocket.addEventListener("close", () => {
       if (!this.shutdown && this.live) {
@@ -74866,6 +74910,8 @@ var _App = class _App {
           case "connected":
           case "agent:connect:response":
             this.live = true;
+            this.notLiveHeartbeats = 0;
+            this.outstandingHeartbeats = 0;
             this.startWebSocketWorker();
             this.log.info("Successfully connected to Medplum server");
             break;
@@ -74923,7 +74969,7 @@ var _App = class _App {
             } catch (err2) {
               await this.sendToWebSocket({
                 type: "agent:error",
-                body: Se(err2),
+                body: be(err2),
                 callback: command.callback
               });
             }
@@ -74951,7 +74997,7 @@ var _App = class _App {
           }
         }
       } catch (err2) {
-        const errMsg = `WebSocket error on incoming message: ${Se(err2)}`;
+        const errMsg = `WebSocket error on incoming message: ${be(err2)}`;
         this.log.error(errMsg);
         try {
           await this.sendToWebSocket({
@@ -74960,7 +75006,7 @@ var _App = class _App {
             callback: command?.callback
           });
         } catch (sendErr) {
-          this.log.error(`Failed to send agent:error response: ${Se(sendErr)}`);
+          this.log.error(`Failed to send agent:error response: ${be(sendErr)}`);
         }
       }
     });
@@ -74996,7 +75042,7 @@ var _App = class _App {
       const results = await Promise.allSettled(Array.from(this.hl7Clients.values()).map((pool) => pool.closeAll()));
       for (const result of results) {
         if (result.status === "rejected") {
-          this.log.error(Se(result.reason));
+          this.log.error(be(result.reason));
         }
       }
       this.hl7Clients.clear();
@@ -75122,7 +75168,7 @@ var _App = class _App {
         }
       } catch (err2) {
         errors.push(err2);
-        this.log.error(Se(err2));
+        this.log.error(be(err2));
       }
     }
     if (errors.length) {
@@ -75140,7 +75186,7 @@ var _App = class _App {
             (err2) => ({
               severity: "error",
               code: "invalid",
-              details: { text: Se(err2) }
+              details: { text: be(err2) }
             })
           )
         ]
@@ -75161,7 +75207,7 @@ var _App = class _App {
       return;
     }
     for (const err2 of errors) {
-      this.log.error(Se(err2));
+      this.log.error(be(err2));
     }
     throw new f({
       resourceType: "OperationOutcome",
@@ -75177,7 +75223,7 @@ var _App = class _App {
           (err2) => ({
             severity: "error",
             code: "invalid",
-            details: { text: Se(err2) }
+            details: { text: be(err2) }
           })
         )
       ]
@@ -75205,7 +75251,7 @@ var _App = class _App {
         parsedEndpoint = new URL(endpoint.address);
       } catch (err2) {
         throw new Error(
-          `Error while validating endpoint address for channel '${channel.name}': ${Se(err2)}`
+          `Error while validating endpoint address for channel '${channel.name}': ${be(err2)}`
         );
       }
       if (seenPorts.has(parsedEndpoint.port)) {
@@ -75246,7 +75292,7 @@ var _App = class _App {
       const channelType = getChannelType(endpoint);
       return this.createChannel(channelType, definition, endpoint);
     } catch (err2) {
-      this.log.error(Se(err2));
+      this.log.error(be(err2));
       return void 0;
     }
   }
@@ -75307,9 +75353,11 @@ var _App = class _App {
     if (this.webSocketWorker) {
       return;
     }
-    this.webSocketWorker = this.trySendToWebSocket().then(() => {
+    this.webSocketWorker = this.trySendToWebSocket().catch((err2) => {
+      this.log.error(`WebSocket worker error: ${be(err2)}`);
+    }).finally(() => {
       this.webSocketWorker = void 0;
-    }).catch((err2) => console.log("WebSocket worker error", err2));
+    });
   }
   async trySendToWebSocket() {
     if (this.live) {
@@ -75319,14 +75367,13 @@ var _App = class _App {
           try {
             await this.sendToWebSocket(msg);
           } catch (err2) {
-            this.log.error(`WebSocket error while attempting to send message: ${Se(err2)}`);
+            this.log.error(`WebSocket error while attempting to send message: ${be(err2)}`);
             this.webSocketQueue.unshift(msg);
             throw err2;
           }
         }
       }
     }
-    this.webSocketWorker = void 0;
   }
   trySendToHl7Connection() {
     while (this.hl7Queue.length > 0) {
@@ -75356,7 +75403,7 @@ IPv6 is currently unsupported.`;
         this.log.error(errMsg);
         throw new Error(errMsg);
       }
-      if (!((0, import_node_net4.isIPv4)(message.remote) || Cd(message.remote))) {
+      if (!((0, import_node_net4.isIPv4)(message.remote) || Ad(message.remote))) {
         const errMsg = `Attempted to ping an invalid host.
 
 "${message.remote}" is not a valid IPv4 address or a resolvable hostname.`;
@@ -75395,7 +75442,7 @@ ${result}`);
         body: result
       });
     } catch (err2) {
-      this.log.error(`Error during ping attempt to ${message.remote ?? "NO_HOST_GIVEN"}: ${Se(err2)}`);
+      this.log.error(`Error during ping attempt to ${message.remote ?? "NO_HOST_GIVEN"}: ${be(err2)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75403,7 +75450,7 @@ ${result}`);
         remote: message.remote,
         callback: message.callback,
         statusCode: 400,
-        body: Se(err2)
+        body: be(err2)
       });
     }
   }
@@ -75431,7 +75478,7 @@ ${result}`);
       return;
     }
     let child;
-    if (message.version && !await Gg("agent-upgrader", message.version)) {
+    if (message.version && !await zg("agent-upgrader", message.version)) {
       const versionTag = message.version ? `v${message.version}` : "latest";
       const errMsg = `Error during upgrading to version '${versionTag}'. '${message.version}' is not a valid version`;
       this.log.error(errMsg);
@@ -75442,7 +75489,7 @@ ${result}`);
       });
       return;
     }
-    const targetVersion = message.version ?? await Qg("agent-upgrader");
+    const targetVersion = message.version ?? await Jg("agent-upgrader");
     if (pn.startsWith(targetVersion)) {
       if (!message?.force) {
         this.log.info(`Attempted to upgrade to version ${targetVersion}, but agent is already on that version`);
@@ -75482,7 +75529,7 @@ ${result}`);
       parseDownloadUrl(release, (0, import_node_os4.platform)());
     } catch (err2) {
       const versionTag = message.version ? `v${message.version}` : "latest";
-      const errMsg = `Error during upgrading to version '${versionTag}': ${Se(err2)}`;
+      const errMsg = `Error during upgrading to version '${versionTag}': ${be(err2)}`;
       this.log.error(errMsg);
       await this.sendToWebSocket({
         type: "agent:error",
@@ -75516,13 +75563,13 @@ ${result}`);
           }
         });
         child.on("error", (err2) => {
-          this.log.error(Se(err2));
+          this.log.error(be(err2));
           reject(err2);
         });
       });
     } catch (err2) {
       const versionTag = message.version ? `v${message.version}` : "latest";
-      const errMsg = `Error during upgrading to version '${versionTag}': ${Se(err2)}`;
+      const errMsg = `Error during upgrading to version '${versionTag}': ${be(err2)}`;
       this.log.error(errMsg);
       await this.sendToWebSocket({
         type: "agent:error",
@@ -75546,7 +75593,7 @@ ${result}`);
       child.disconnect();
     } catch (err2) {
       this.log.error(
-        `Error while stopping agent or messaging child process as part of upgrade: ${Se(err2)}`
+        `Error while stopping agent or messaging child process as part of upgrade: ${be(err2)}`
       );
       import_node_process2.default.exit(1);
     }
@@ -75560,10 +75607,10 @@ ${result}`);
         callback: command.callback
       });
     } catch (err2) {
-      this.log.error(Se(err2));
+      this.log.error(be(err2));
       await this.sendToWebSocket({
         type: "agent:error",
-        body: Se(err2),
+        body: be(err2),
         callback: command.callback
       });
     }
@@ -75588,10 +75635,10 @@ ${result}`);
         callback: command.callback
       });
     } catch (err2) {
-      this.log.error(Se(err2));
+      this.log.error(be(err2));
       await this.sendToWebSocket({
         type: "agent:error",
-        body: Se(err2),
+        body: be(err2),
         callback: command.callback
       });
     }
@@ -75632,7 +75679,7 @@ ${result}`);
     try {
       msgReturnAck = this.parseReturnAck(message.returnAck);
     } catch (err2) {
-      this.log.error(Se(err2));
+      this.log.error(be(err2));
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75640,7 +75687,7 @@ ${result}`);
         callback: message.callback,
         contentType: k.TEXT,
         statusCode: 400,
-        body: Se(err2)
+        body: be(err2)
       });
       return;
     }
@@ -75648,9 +75695,9 @@ ${result}`);
     try {
       defaultReturnAck = this.parseReturnAck(address.searchParams.get("defaultReturnAck"));
     } catch (err2) {
-      this.log.warn(`${Se(err2)} - falling back to default return ACK behavior of 'first'.`);
+      this.log.warn(`${be(err2)} - falling back to default return ACK behavior of 'first'.`);
     }
-    const returnAck = msgReturnAck ?? defaultReturnAck ?? af.FIRST;
+    const returnAck = msgReturnAck ?? defaultReturnAck ?? uf.FIRST;
     let pool;
     if (this.hl7Clients.has(message.remote)) {
       pool = this.hl7Clients.get(message.remote);
@@ -75693,7 +75740,7 @@ ${result}`);
     try {
       client = pool.getClient();
     } catch (err2) {
-      this.log.error(`Failed to get client from pool: ${Se(err2)}`);
+      this.log.error(`Failed to get client from pool: ${be(err2)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75701,7 +75748,7 @@ ${result}`);
         callback: message.callback,
         contentType: k.TEXT,
         statusCode: 400,
-        body: Se(err2)
+        body: be(err2)
       });
       return;
     }
@@ -75717,7 +75764,7 @@ ${result}`);
         body: response2.toString()
       });
     }).catch((err2) => {
-      this.log.error(`HL7 error: ${Se(err2)}`);
+      this.log.error(`HL7 error: ${be(err2)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75725,7 +75772,7 @@ ${result}`);
         callback: message.callback,
         contentType: k.TEXT,
         statusCode: 400,
-        body: Se(err2)
+        body: be(err2)
       });
       forceClose = true;
     }).finally(() => {
@@ -75753,10 +75800,10 @@ ${result}`);
     }
     const normalizedValue = rawValue.toLowerCase();
     if (normalizedValue === "application") {
-      return af.APPLICATION;
+      return uf.APPLICATION;
     }
     if (normalizedValue === "first") {
-      return af.FIRST;
+      return uf.FIRST;
     }
     throw new Error(`Invalid value for returnAck; expected: 'first' or 'application', received: ${rawValue}`);
   }
@@ -75804,7 +75851,7 @@ async function agentMain(argv) {
       await medplum.startClientLogin(clientId, clientSecret);
       loggedIn = true;
     } catch (err2) {
-      console.error("Failed to login", { err: Se(err2) });
+      console.error("Failed to login", { err: be(err2) });
       console.log("Retrying login in 10 seconds...");
       await Kr(RETRY_WAIT_DURATION_MS);
     }
@@ -75819,7 +75866,7 @@ async function agentMain(argv) {
   for (const warning of warnings) {
     mainLogger.warn(warning);
   }
-  const app = new App(medplum, agentId, args.logLevel ? Jh(args.logLevel) : void 0, {
+  const app = new App(medplum, agentId, args.logLevel ? Yh(args.logLevel) : void 0, {
     mainLogger,
     channelLogger
   });
@@ -75865,10 +75912,10 @@ async function upgraderMain(argv) {
       rejectOnTimeout = () => reject(new Error("Timed out while waiting for IPC to disconnect"));
       import_node_process3.default.once("disconnect", resolve2);
     });
-    if (argv[3] && !Ru(argv[3])) {
+    if (argv[3] && !Pu(argv[3])) {
       throw new Error("Invalid version specified");
     }
-    version = argv[3] ?? await Qg("agent-upgrader");
+    version = argv[3] ?? await Jg("agent-upgrader");
     binPath = getReleaseBinPath(version);
     if (!(0, import_node_fs6.existsSync)(binPath)) {
       globalLogger.info(`Could not find binary at "${binPath}". Downloading release from GitHub...`);
@@ -75876,7 +75923,7 @@ async function upgraderMain(argv) {
       globalLogger.info("Release successfully downloaded");
     }
   } catch (err2) {
-    import_node_process3.default.send({ type: "ERROR", err: Se(err2) });
+    import_node_process3.default.send({ type: "ERROR", err: be(err2) });
     throw err2;
   }
   import_node_process3.default.send({ type: "STARTED" });
@@ -75897,7 +75944,7 @@ async function upgraderMain(argv) {
     (0, import_node_child_process2.spawnSync)(`"${binPath}" /S`, { windowsHide: true, shell: true });
     globalLogger.info(`Agent version ${version} successfully installed`);
   } catch (err2) {
-    globalLogger.error(`Error while attempting to run installer: ${Se(err2)}`);
+    globalLogger.error(`Error while attempting to run installer: ${be(err2)}`);
     globalLogger.error("Failed to run installer, attempting to restart agent service...");
     try {
       (0, import_node_child_process2.execSync)('net start "Medplum Agent"');
@@ -75947,10 +75994,10 @@ ${allAgentServices.join("\r\n")}\r
       } catch (err2) {
         (0, import_node_fs7.appendFileSync)(logFileFd, `Failed to stop service: ${serviceName}\r
 `, { encoding: "utf-8" });
-        (0, import_node_fs7.appendFileSync)(logFileFd, `${Se(err2)}\r
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${be(err2)}\r
 `, { encoding: "utf-8" });
         console.error(`Failed to stop service: ${serviceName}`);
-        console.error(Se(err2));
+        console.error(be(err2));
       }
       try {
         (0, import_node_child_process3.execSync)(`sc.exe delete ${serviceName}`);
@@ -75960,10 +76007,10 @@ ${allAgentServices.join("\r\n")}\r
       } catch (err2) {
         (0, import_node_fs7.appendFileSync)(logFileFd, `Failed to delete service: ${serviceName}\r
 `, { encoding: "utf-8" });
-        (0, import_node_fs7.appendFileSync)(logFileFd, `${Se(err2)}\r
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${be(err2)}\r
 `, { encoding: "utf-8" });
         console.error(`Failed to delete service: ${serviceName}`);
-        console.error(Se(err2));
+        console.error(be(err2));
       }
     }
     (0, import_node_fs7.closeSync)(logFileFd);